Merge remote-tracking branch 'visi/collections' into collections-test

This commit is contained in:
Anton Dyudin 2018-03-27 12:44:46 -07:00
commit 5bfeab483e
13 changed files with 17520 additions and 2981 deletions

View File

@ -121,7 +121,7 @@
==
==
;=
;div(data-component "Subscribe", data-circle "{(scow %p p.bem.gas)}/collection_~{(trip +<:s.bem.gas)}_~{(trip p.topic)}");
;div(urb-component "Subscribe", urb-circle "{(scow %p p.bem.gas)}/collection_~{(trip +<:s.bem.gas)}_~{(trip p.topic)}");
==
;div.row.content.mb-18
+{q.content}
@ -139,7 +139,7 @@
::
|= [c=@da d=[mod=@da who=@p wat=wain]]
;li
;div.da.text-mono.ml-12(data-urb-elapsed "{(esoo:colls mod.d)}");
;div.da.text-mono.ml-12(urb-component "Elapsed", urb-timestring "{(esoo:colls mod.d)}");
;div.com.ml-12.mb-6
;div.who.text-mono
;a(href "")
@ -152,7 +152,7 @@
==
==
==
;div.ml-12(data-component "CommentCreate", data-coll "{(trip +<:s.bem.gas)}", data-top "{(trip p.topic)}");
;div.ml-12(urb-component "CommentCreate", urb-coll "{(trip +<:s.bem.gas)}", urb-top "{(trip p.topic)}");
==
==
~

View File

@ -4,7 +4,6 @@
;title: Nutalk
;meta(charset "utf-8");
;meta(name "viewport", content "width=device-width, initial-scale=1, shrink-to-fit=no");
;script@"/~~/pages/elapsed.js";
;link(rel "stylesheet", href "/~~/pages/nutalk/css/index.css");
==
;body
@ -24,7 +23,7 @@
;a/"/~~/pages/nutalk": Inbox
==
==
;div(data-component-header "");
;div(urb-component-header "");
==
==
;div.container

View File

@ -1,5 +1,5 @@
/= gas /$ fuel:html
/= content /% /collections-topic-full/
^- manx
;div#edit(data-component "TopicCreatePage", data-coll "{(trip +<:s.bem.gas)}", data-top "{(trip -:s.bem.gas)}", data-top-text "{(trip (of-wain:format wat.info.content))}");
;div#edit(urb-component "TopicCreatePage", urb-coll "{(trip +<:s.bem.gas)}", urb-top "{(trip -:s.bem.gas)}", urb-text "{(trip (of-wain:format wat.info.content))}");

View File

@ -30,7 +30,7 @@
==
==
;=
;div(data-component "Subscribe", data-circle "{(scow %p p.bem.gas)}/collection_~{(trip -:s.bem.gas)}");
;div(urb-component "Subscribe", urb-circle "{(scow %p p.bem.gas)}/collection_~{(trip -:s.bem.gas)}");
==
;ul
;* %+ turn
@ -52,7 +52,7 @@
; {(trip (scot %p who.info.top.topi))}
==
;div.meta-cont
;div.da.text-mono(data-urb-elapsed "{(esoo:colls mod.info.top.topi)}");
;div.da.text-mono(urb-component "Elapsed", urb-timestring "{(esoo:colls mod.info.top.topi)}");
;div.com-count.ml-12
; {(trip (scot %ud (lent ~(tap by coms.top.topi))))} comments
==
@ -82,7 +82,7 @@
==
==
;li.notes.mb-8
;div.da.text-mono(data-urb-elapsed "{(esoo:colls mod.info.top.topi)}");
;div.da.text-mono(urb-component "Elapsed", urb-timestring "{(esoo:colls mod.info.top.topi)}");
;div.h3.mt-0.text-mono.note-uuid
;a(href "/~~/collections/{(trip -.s.bem.gas)}/{(trip t)}"): {(trip t)}
==

View File

@ -35,7 +35,7 @@
==
==
;=
;div(data-component "Subscribe", data-circle "{(scow %p p.bem.gas)}/collection_~{(trip +<:s.bem.gas)}_~{(trip -:s.bem.gas)}");
;div(urb-component "Subscribe", urb-circle "{(scow %p p.bem.gas)}/collection_~{(trip +<:s.bem.gas)}_~{(trip -:s.bem.gas)}");
==
;div.row.content.mb-18
+{content}
@ -53,7 +53,7 @@
::
|= [c=@da d=[mod=@da who=@p wat=wain]]
;li
;div.da.text-mono.ml-12(data-urb-elapsed "{(esoo:colls mod.d)}");
;div.da.text-mono.ml-12(urb-component "Elapsed", urb-timestring "{(esoo:colls mod.d)}");
;div.com.ml-12.mb-6
;div.who.text-mono
;a(href "")
@ -66,7 +66,7 @@
==
==
==
;div.ml-12(data-component "CommentCreate", data-coll "{(trip +<:s.bem.gas)}", data-top "{(trip -:s.bem.gas)}");
;div.ml-12(urb-component "CommentCreate", urb-coll "{(trip +<:s.bem.gas)}", urb-top "{(trip -:s.bem.gas)}");
==
==
~

View File

@ -1,3 +1,3 @@
^- manx
;div(data-component "InboxPage");
;div(urb-component "InboxPage");

View File

@ -1,3 +1,3 @@
^- manx
;div(data-component "CollectionCreatePage");
;div(urb-component "CollectionCreatePage");

View File

@ -4,14 +4,14 @@
/= configs /: /===/web/collections
/^ (map knot config:collections) /_ /collections-config/
=/ id %+ fall
%- %~ get
by
qix.gas
%- %~ get
by
qix.gas
==
%coll
''
:: get either the indicated config or the latest
=/ config-pair/(pair knot config:collections)
=/ config-pair/(pair knot config:collections)
?: =(id 'latest')
=/ sorted-configs %+ sort
~(tap by configs)
@ -21,8 +21,8 @@
i:-.sorted-configs
:- id
%- need
%- %~ get
by
%- %~ get
by
configs
==
id
@ -37,5 +37,5 @@ id
; @now
==
==
;div(data-component "TopicCreatePage", data-coll "{(trip p.config-pair)}");
;div(urb-component "TopicCreatePage", urb-coll "{(trip p.config-pair)}");
==

View File

@ -16,7 +16,7 @@
;a/"/~~/nutalk/pages/preview": Preview
==
;div(data-component "PostEditTextarea");
;div(urb-component "PostEditTextarea");
==
==
==

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,3 @@
^- manx
;div(data-component "StreamPage");
;div(urb-component "StreamPage");

View File

@ -1,3 +1,3 @@
^- manx
;div(data-component "StreamCreatePage");
;div(urb-component "StreamCreatePage");

View File

@ -1,3 +1,3 @@
^- manx
;div(data-component "StreamCreatePage");
;div(urb-component "StreamCreatePage");