aboutsummaryrefslogtreecommitdiff
path: root/shardweb/lib
diff options
context:
space:
mode:
Diffstat (limited to 'shardweb/lib')
-rw-r--r--shardweb/lib/controllers/chat_controller.ex8
-rw-r--r--shardweb/lib/controllers/directory_controller.ex63
-rw-r--r--shardweb/lib/controllers/identity_controller.ex4
-rw-r--r--shardweb/lib/router.ex3
-rw-r--r--shardweb/lib/shard_uri.ex42
-rw-r--r--shardweb/lib/templates/chat/chat.html.eex4
-rw-r--r--shardweb/lib/templates/directory/view.html.eex75
-rw-r--r--shardweb/lib/templates/identity/view.html.eex3
-rw-r--r--shardweb/lib/templates/layout/app.html.eex8
-rw-r--r--shardweb/lib/templates/page/shard_list.html.eex8
-rw-r--r--shardweb/lib/views/directory_view.ex2
11 files changed, 191 insertions, 29 deletions
diff --git a/shardweb/lib/controllers/chat_controller.ex b/shardweb/lib/controllers/chat_controller.ex
index 080ee61..1ca66d4 100644
--- a/shardweb/lib/controllers/chat_controller.ex
+++ b/shardweb/lib/controllers/chat_controller.ex
@@ -4,11 +4,13 @@ defmodule ShardWeb.ChatController do
def chat(conn, %{"chan" => chan}) do
conn = put_gon(conn, chat_channel: "chat:" <> chan)
- shard = %SApp.Chat.Manifest{channel: chan} |> SData.term_hash
+ manifest = %SApp.Chat.Manifest{channel: chan}
+ shard = manifest |> SData.term_hash
render conn, "chat.html",
public: true,
shard: shard,
+ manifest: manifest,
chan: chan
end
@@ -37,10 +39,12 @@ defmodule ShardWeb.ChatController do
|> Enum.map(&SApp.Identity.get_nick/1)
|> Enum.join(", ")
- shard = [conn.assigns.pk | pk_list] |> SApp.Chat.PrivChat.Manifest.new |> SData.term_hash
+ manifest = [conn.assigns.pk | pk_list] |> SApp.Chat.PrivChat.Manifest.new
+ shard = manifest |> SData.term_hash
render conn, "chat.html",
public: false,
+ manifest: manifest,
shard: shard,
nicks: name
else
diff --git a/shardweb/lib/controllers/directory_controller.ex b/shardweb/lib/controllers/directory_controller.ex
index 1e3a0b0..10fdec2 100644
--- a/shardweb/lib/controllers/directory_controller.ex
+++ b/shardweb/lib/controllers/directory_controller.ex
@@ -1,29 +1,64 @@
defmodule ShardWeb.DirectoryController do
use ShardWeb, :controller
- def view_pub(conn, %{"owner" => owner, "name" => name}) do
- owner = Base.decode16! owner
- shard = %SApp.Directory.Manifest{public: true, owner: owner, name: name}
- pid = Shard.Manager.find_or_start shard
+ def view_pub(conn, args) do
+ view(conn, true, args)
+ end
- render conn, "view.html",
- public: true,
- shard: shard,
- pid: pid,
- owner: owner,
- name: name
+ def view_priv(conn, args) do
+ view(conn, false, args)
end
- def view_priv(conn, %{"owner" => owner, "name" => name}) do
+ def view(conn, public, %{"owner" => owner, "name" => name}=args) do
owner = Base.decode16! owner
- shard = %SApp.Directory.Manifest{public: false, owner: owner, name: name}
- pid = Shard.Manager.find_or_start shard
+ manifest = %SApp.Directory.Manifest{public: public, owner: owner, name: name}
+ shard = SData.term_hash manifest
+ pid = Shard.Manager.find_or_start manifest
render conn, "view.html",
- public: false,
+ public: public,
shard: shard,
+ manifest: manifest,
pid: pid,
owner: owner,
name: name
end
+
+ def dir_add(conn, %{"dir_name" => dir_name, "dir_public" => dir_public, "add_name" => add_name, "add_uri" => add_uri, "add_stored" => add_stored}) do
+ dir_public = (dir_public == "true")
+
+ manifest = %SApp.Directory.Manifest{public: dir_public, owner: conn.assigns.pk, name: dir_name}
+ shard = SData.term_hash manifest
+ pid = Shard.Manager.find_or_start manifest
+
+ item_manifest = ShardURI.to_manifest(add_uri)
+ SApp.Directory.add_item(pid, add_name, item_manifest, (add_stored == "yes"))
+
+ redirect conn, to: directory_path(conn, (if dir_public do :view_pub else :view_priv end), conn.assigns.pk|>Base.encode16, dir_name)
+ end
+
+ def dir_rm(conn, %{"dir_name" => dir_name, "dir_public" => dir_public, "item_name" => rm_name}) do
+ dir_public = (dir_public == "true")
+
+ manifest = %SApp.Directory.Manifest{public: dir_public, owner: conn.assigns.pk, name: dir_name}
+ shard = SData.term_hash manifest
+ pid = Shard.Manager.find_or_start manifest
+
+ SApp.Directory.rm_item(pid, rm_name)
+
+ redirect conn, to: directory_path(conn, (if dir_public do :view_pub else :view_priv end), conn.assigns.pk|>Base.encode16, dir_name)
+ end
+
+ def dir_set_stored(conn, %{"dir_name" => dir_name, "dir_public" => dir_public, "item_name" => item_name, "item_stored" => item_stored}) do
+ dir_public = (dir_public == "true")
+ item_stored = (item_stored == "true")
+
+ manifest = %SApp.Directory.Manifest{public: dir_public, owner: conn.assigns.pk, name: dir_name}
+ shard = SData.term_hash manifest
+ pid = Shard.Manager.find_or_start manifest
+
+ SApp.Directory.set_stored(pid, item_name, item_stored)
+
+ redirect conn, to: directory_path(conn, (if dir_public do :view_pub else :view_priv end), conn.assigns.pk|>Base.encode16, dir_name)
+ end
end
diff --git a/shardweb/lib/controllers/identity_controller.ex b/shardweb/lib/controllers/identity_controller.ex
index 962a888..7452453 100644
--- a/shardweb/lib/controllers/identity_controller.ex
+++ b/shardweb/lib/controllers/identity_controller.ex
@@ -11,7 +11,8 @@ defmodule ShardWeb.IdentityController do
def view(conn, %{"pk" => pk}) do
{:ok, pk} = Base.decode16(pk)
- shard = %SApp.Identity.Manifest{pk: pk} |> SData.term_hash
+ manifest = %SApp.Identity.Manifest{pk: pk}
+ shard = manifest |> SData.term_hash
pid = Shard.Manager.find_proc shard
if pid == nil do
@@ -21,6 +22,7 @@ defmodule ShardWeb.IdentityController do
view_pk: pk,
view_nick: SApp.Identity.get_nick(pk),
shard: shard,
+ manifest: manifest,
pid: pid
end
end
diff --git a/shardweb/lib/router.ex b/shardweb/lib/router.ex
index 61f8209..3f78afd 100644
--- a/shardweb/lib/router.ex
+++ b/shardweb/lib/router.ex
@@ -31,6 +31,9 @@ defmodule ShardWeb.Router do
get "/pub/:owner/:name", DirectoryController, :view_pub
get "/priv/:owner/:name", DirectoryController, :view_priv
+ post "/dir/add", DirectoryController, :dir_add
+ post "/dir/rm", DirectoryController, :dir_rm
+ post "/dir/set_stored", DirectoryController, :dir_set_stored
get "/chat/:chan", ChatController, :chat
get "/pm/:people_list", ChatController, :privchat
diff --git a/shardweb/lib/shard_uri.ex b/shardweb/lib/shard_uri.ex
new file mode 100644
index 0000000..71c0904
--- /dev/null
+++ b/shardweb/lib/shard_uri.ex
@@ -0,0 +1,42 @@
+defmodule ShardURI do
+ @moduledoc"""
+ Convert Shard manifests to and from strings.
+ """
+
+ def from_manifest(m) do
+ case m do
+ %SApp.Chat.Manifest{channel: chan} -> "shard:chat:#{chan}"
+ %SApp.Chat.PrivChat.Manifest{pk_list: pk_list} ->
+ "shard:privchat:#{pk_list|>Enum.map(&Base.encode16/1)|>Enum.join(",")}"
+ %SApp.Identity.Manifest{pk: pk} ->
+ "shard:identity:#{pk|>Base.encode16}"
+ %SApp.Directory.Manifest{owner: owner, public: true, name: name} ->
+ "shard:dir:pub:#{owner|>Base.encode16}:#{name}"
+ %SApp.Directory.Manifest{owner: owner, public: false, name: name} ->
+ "shard:dir:priv:#{owner|>Base.encode16}:#{name}"
+ end
+ end
+
+ def to_manifest(p) do
+ case p do
+ "shard:chat:" <> chan ->
+ %SApp.Chat.Manifest{channel: chan}
+ "shard:privchat:" <> pklist ->
+ pklist
+ |> String.split(",")
+ |> Enum.map(&parse_pk/1)
+ |> SApp.Chat.PrivChat.Manifest.new()
+ "shard:identity:" <> pk ->
+ %SApp.Identity.Manifest{pk: parse_pk pk}
+ "shard:dir:pub:" <> <<pk::bytes-size(64)>> <> ":" <> name ->
+ %SApp.Directory.Manifest{owner: parse_pk(pk), public: true, name: name}
+ "shard:dir:priv:" <> <<pk::bytes-size(64)>> <> ":" <> name ->
+ %SApp.Directory.Manifest{owner: parse_pk(pk), public: false, name: name}
+ end
+ end
+
+ def parse_pk(pkstr) do
+ 64 = byte_size pkstr
+ Base.decode16! pkstr
+ end
+end
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 @@
<h1 class="page-header">
<%= if @public do %>
#<%= @chan %>
- <small>public chat room</small>
<% else %>
<%= @nicks %>
- <small>private chat</small>
<% end %>
+ <small class="shard_uri"><%= @manifest |> ShardURI.from_manifest %></small>
+
</h1>
<ol class="breadcrumb">
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 @@
<div class="col-lg-12">
<h1 class="page-header">
<%= @name %>
- <small>directory contents</small>
+ <small class="shard_uri"><%= @manifest |> ShardURI.from_manifest %></small>
</h1>
<ol class="breadcrumb">
@@ -18,6 +18,11 @@
</li>
<li class="active">
<i class="fa fa-folder"></i> <%= @name %>
+ <%= if @public do %>
+ (public)
+ <% else %>
+ (private)
+ <% end %>
</li>
</ol>
</div>
@@ -30,18 +35,80 @@
<tr>
<th>Name</th>
<th>Shard</th>
- <th>Id</th>
+ <th style="width: 150px"></th>
+ <th>URI</th>
</tr>
- <%= for {name, manifest} <- dir_contents(@conn, @shard) do %>
+ <%= for {name, {manifest, stored}} <- dir_contents(@conn, @manifest) do %>
<tr>
<td>
+ <%= if stored do %>
+ <i class="fa fa-save"></i>
+ <% else %>
+ <i class="fa fa-link"></i>
+ <% end %>
<strong><%= name %></strong>
</td>
<td>
<%= render ShardWeb.PageView, "shard_entry.html", conn: @conn, manifest: manifest %>
</td>
- <td><small><%= (SData.term_hash manifest) |> Base.encode16 %></small></td>
+ <td>
+ <%= 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 %>
+ </td>
+ <td><small class="shard_uri"><%= manifest |> ShardURI.from_manifest %></small></td>
</tr>
<% end %>
</table>
+<%= if @owner == @pk do %>
+ <fieldset><legend>Add existing item</legend>
+ <%= 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 %>
+ <div class="form-group">
+ <%= label :add_name, "Name:", class: ["col-sm-2 control-label"] %>
+ <div class="col-sm-10">
+ <%= text_input f, :add_name, [class: "form-control", value: ""] %>
+ </div>
+ </div>
+ <div class="form-group">
+ <%= label :add_uri, "URI:", class: ["col-sm-2 control-label"] %>
+ <div class="col-sm-10">
+ <%= text_input f, :add_uri, [class: "form-control", placeholder: "example: shard:identity:xxx"] %>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-2 control-label">Stored?</label>
+ <div class="col-sm-10">
+ <div class="radio">
+ <label><%= radio_button f, :add_stored, "yes" %>Stored <i class="fa fa-save"></i></label>
+ </div>
+ <div class="radio">
+ <label><%= radio_button f, :add_stored, "no" %>Linked <i class="fa fa-link"></i></label>
+ </div>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-sm-offset-2 col-sm-10">
+ <%= submit "Add", [class: "btn btn-default"] %>
+ </div>
+ </div>
+ <% end %>
+ </fieldset>
+<% 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 @@
<div class="row">
<div class="col-lg-12">
<h1 class="page-header">
- <%= @view_nick %> <small><%= @view_pk |> Base.encode16 %></small>
+ <%= @view_nick %>
+ <small class="shard_uri"><%= @manifest |> ShardURI.from_manifest %></small>
</h1>
<ol class="breadcrumb">
<li>
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 @@
<!-- Sidebar Menu Items - These collapse to the responsive navigation menu on small screens -->
<div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav side-nav">
+
+ <li class="<%= if @view_module == ShardWeb.Directoryview and @view_template == "view.html" do "active" else "" end %>">
+ <a href="<%= directory_path(@conn, :view_pub, Base.encode16(@pk), "collection") %>"><i class="fa fa-fw fa-globe"></i> My public stuff</a>
+ </li>
+ <li class="<%= if @view_module == ShardWeb.Directoryview and @view_template == "view.html" do "active" else "" end %>">
+ <a href="<%= directory_path(@conn, :view_priv, Base.encode16(@pk), "collection") %>"><i class="fa fa-fw fa-folder"></i> My private stuff</a>
+ </li>
+
<li class="<%= if @view_module == ShardWeb.ChatView and @view_template == "chat.html" and @public do "active" else "" end %>">
<a href="javascript:;" data-toggle="collapse" data-target="#demo"><i class="fa fa-fw fa-hashtag"></i> Chat rooms <i class="fa fa-fw fa-caret-down"></i></a>
<ul id="demo" class="<%= if not (@view_module == ShardWeb.ChatView and @view_template == "chat.html" and @public) do "collapse" else "" end %>">
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 @@
<tr>
<th></th>
<th>Shard</th>
- <th>Id</th>
+ <th>URI</th>
</tr>
- <%= for {id, manifest, why_have_it} <- shard_list() do %>
+ <%= for {_id, manifest, why_have_it} <- shard_list() do %>
<tr>
<td>
<%= case why_have_it do %>
<% {:cached, _} -> %><span class="label label-warning">cache</span>
<% {:pinned, _, _} -> %><span class="label label-success">pinned</span>
- <% {:req, a, _} -> %><span class="label label-default">req (<%= MapSet.size(a) %>)</span>
+ <% {:req, a, _} -> %><span class="label label-success">req (<%= MapSet.size(a) %>)</span>
<% end %>
</td>
<td>
<%= render "shard_entry.html", conn: @conn, manifest: manifest, pk: @pk %>
</td>
- <td><small><%= id |> Base.encode16 %></small></td>
+ <td><small class="shard_uri"><%= manifest |> ShardURI.from_manifest %></small></td>
</tr>
<% end %>
</table>
diff --git a/shardweb/lib/views/directory_view.ex b/shardweb/lib/views/directory_view.ex
index acbd950..ea31482 100644
--- a/shardweb/lib/views/directory_view.ex
+++ b/shardweb/lib/views/directory_view.ex
@@ -4,6 +4,6 @@ defmodule ShardWeb.DirectoryView do
def dir_contents(_conn, manifest) do
IO.puts(inspect manifest)
pid = Shard.Manager.find_or_start manifest
- SApp.Directory.get_files pid
+ SApp.Directory.get_items pid
end
end
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 09:47:39 +0000