From 94b1f6b0ae387b7fcb0714a4c6e213212097a100 Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Fri, 2 Nov 2018 14:04:52 +0100 Subject: Directory stuff --- shardweb/lib/templates/chat/chat.html.eex | 4 +- shardweb/lib/templates/directory/view.html.eex | 75 +++++++++++++++++++++++-- shardweb/lib/templates/identity/view.html.eex | 3 +- shardweb/lib/templates/layout/app.html.eex | 8 +++ shardweb/lib/templates/page/shard_list.html.eex | 8 +-- 5 files changed, 87 insertions(+), 11 deletions(-) (limited to 'shardweb/lib/templates') diff --git a/shardweb/lib/templates/chat/chat.html.eex b/shardweb/lib/templates/chat/chat.html.eex index 499e14d..947e4c3 100644 --- a/shardweb/lib/templates/chat/chat.html.eex +++ b/shardweb/lib/templates/chat/chat.html.eex @@ -4,11 +4,11 @@

<%= if @public do %> #<%= @chan %> - public chat room <% else %> <%= @nicks %> - private chat <% end %> + <%= @manifest |> ShardURI.from_manifest %> +

    diff --git a/shardweb/lib/templates/directory/view.html.eex b/shardweb/lib/templates/directory/view.html.eex index 43ded97..b4cbfaf 100644 --- a/shardweb/lib/templates/directory/view.html.eex +++ b/shardweb/lib/templates/directory/view.html.eex @@ -3,7 +3,7 @@

    <%= @name %> - directory contents + <%= @manifest |> ShardURI.from_manifest %>

      @@ -18,6 +18,11 @@
    1. <%= @name %> + <%= if @public do %> + (public) + <% else %> + (private) + <% end %>
    @@ -30,18 +35,80 @@ Name Shard - Id + + URI - <%= for {name, manifest} <- dir_contents(@conn, @shard) do %> + <%= for {name, {manifest, stored}} <- dir_contents(@conn, @manifest) do %> + <%= if stored do %> + + <% else %> + + <% end %> <%= name %> <%= render ShardWeb.PageView, "shard_entry.html", conn: @conn, manifest: manifest %> - <%= (SData.term_hash manifest) |> Base.encode16 %> + + <%= form_for @conn, directory_path(@conn, :dir_rm), [class: "form-inline", style: "display: inline"], fn f -> %> + <%= hidden_input f, :dir_name, value: @name %> + <%= hidden_input f, :dir_public, value: @public %> + <%= hidden_input f, :item_name, value: name %> + <%= submit "Remove", [class: "btn btn-xs btn-danger"] %> + <% end %> + <%= form_for @conn, directory_path(@conn, :dir_set_stored), [class: "form-inline", style: "display: inline"], fn f -> %> + <%= hidden_input f, :dir_name, value: @name %> + <%= hidden_input f, :dir_public, value: @public %> + <%= hidden_input f, :item_name, value: name %> + <%= hidden_input f, :item_stored, value: (if stored do "false" else "true" end) %> + <%= if stored do %> + <%= submit "Don't store", [class: "btn btn-xs btn-warning"] %> + <% else %> + <%= submit "Store", [class: "btn btn-xs btn-success"] %> + <% end %> + <% end %> + + <%= manifest |> ShardURI.from_manifest %> <% end %> +<%= if @owner == @pk do %> +
    Add existing item + <%= form_for @conn, directory_path(@conn, :dir_add), [class: "form-horizontal"], fn f -> %> + <%= hidden_input f, :dir_name, value: @name %> + <%= hidden_input f, :dir_public, value: @public %> +
    + <%= label :add_name, "Name:", class: ["col-sm-2 control-label"] %> +
    + <%= text_input f, :add_name, [class: "form-control", value: ""] %> +
    +
    +
    + <%= label :add_uri, "URI:", class: ["col-sm-2 control-label"] %> +
    + <%= text_input f, :add_uri, [class: "form-control", placeholder: "example: shard:identity:xxx"] %> +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    + +
    +
    + <%= submit "Add", [class: "btn btn-default"] %> +
    +
    + <% end %> +
    +<% end %> diff --git a/shardweb/lib/templates/identity/view.html.eex b/shardweb/lib/templates/identity/view.html.eex index 3fb5a3f..c5dfaf2 100644 --- a/shardweb/lib/templates/identity/view.html.eex +++ b/shardweb/lib/templates/identity/view.html.eex @@ -2,7 +2,8 @@

    - <%= @view_nick %> <%= @view_pk |> Base.encode16 %> + <%= @view_nick %> + <%= @manifest |> ShardURI.from_manifest %>

    1. diff --git a/shardweb/lib/templates/layout/app.html.eex b/shardweb/lib/templates/layout/app.html.eex index 1310131..bd5e3b2 100644 --- a/shardweb/lib/templates/layout/app.html.eex +++ b/shardweb/lib/templates/layout/app.html.eex @@ -127,6 +127,14 @@
        + +
      • "> + "> My public stuff +
        • +
      • "> + "> My private stuff +
        • +
      • "> Chat rooms
          "> diff --git a/shardweb/lib/templates/page/shard_list.html.eex b/shardweb/lib/templates/page/shard_list.html.eex index dd846d8..3fffef7 100644 --- a/shardweb/lib/templates/page/shard_list.html.eex +++ b/shardweb/lib/templates/page/shard_list.html.eex @@ -23,21 +23,21 @@ Shard - Id + URI - <%= for {id, manifest, why_have_it} <- shard_list() do %> + <%= for {_id, manifest, why_have_it} <- shard_list() do %> <%= case why_have_it do %> <% {:cached, _} -> %>cache <% {:pinned, _, _} -> %>pinned - <% {:req, a, _} -> %>req (<%= MapSet.size(a) %>) + <% {:req, a, _} -> %>req (<%= MapSet.size(a) %>) <% end %> <%= render "shard_entry.html", conn: @conn, manifest: manifest, pk: @pk %> - <%= id |> Base.encode16 %> + <%= manifest |> ShardURI.from_manifest %> <% end %> -- cgit v1.2.3