ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-04 10:52:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'collections-config-changes' into next-ota

Browse Source
This commit is contained in:
Chris Johnson 2019-01-18 13:08:00 -08:00
commit 4b4ef4195a
6 changed files with 91 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lib/collections.hoon
View File

@ -103,7 +103,7 @@
name=@t name=@t
description=@t description=@t
:: ::
owner=@p author=@p
:: ::
date-created=@da date-created=@da
last-modified=@da last-modified=@da
@ -259,7 +259,7 @@
[%s a] [%s a]
:- %name [%s name.con] :- %name [%s name.con]
:- %desc [%s description.con] :- %desc [%s description.con]
:- %owner (ship:enjs:format owner.con) :- %author (ship:enjs:format author.con)
:- %date-created (time:enjs:format date-created.con) :- %date-created (time:enjs:format date-created.con)
:- %last-modified (time:enjs:format last-modified.con) :- %last-modified (time:enjs:format last-modified.con)
:- %type [%s type.con] :- %type [%s type.con]
@ -339,7 +339,8 @@
|= [pax=path conf=config] |= [pax=path conf=config]
^- json ^- json
%- pairs:enjs:format %- pairs:enjs:format
:~ ['owner' [%s (crip (scow %p owner.conf))]] :~ ['author' [%s (crip (scow %p author.conf))]]
['host' [%s (crip (scow %p p.full-path.conf))]]
['path' [%a (turn pax |=(a=@ta `json`[%s a]))]] ['path' [%a (turn pax |=(a=@ta `json`[%s a]))]]
['name' [%s name.conf]] ['name' [%s name.conf]]
['date' [%s (crip (scow %da last-modified.conf))]] ['date' [%s (crip (scow %da last-modified.conf))]]
@ -352,7 +353,8 @@
~/ %coll-item-notify ~/ %coll-item-notify
|= [pax=path raw=raw-item now=@da byk=beak] |= [pax=path raw=raw-item now=@da byk=beak]
^- json ^- json
=/ owner (fall (~(get by meta.raw) %owner) ~.anon) =/ author (fall (~(get by meta.raw) %author) ~.anon)
=/ host (fall (~(get by meta.raw) %host) ~.anon)
=/ dat (fall (~(get by meta.raw) %last-modified) (scot %da now)) =/ dat (fall (~(get by meta.raw) %last-modified) (scot %da now))
=/ nom (fall (~(get by meta.raw) %name) ~.no-title) =/ nom (fall (~(get by meta.raw) %name) ~.no-title)
=/ typ (fall (~(get by meta.raw) %type) ~.no-type) =/ typ (fall (~(get by meta.raw) %type) ~.no-type)
@ -380,7 +382,8 @@
~ ~
:: ::
%- pairs:enjs:format %- pairs:enjs:format
:~ ['owner' [%s owner]] :~ ['author' [%s author]]
['host' [%s host]]
['path' [%a (turn pax |=(a=@ta `json`[%s a]))]] ['path' [%a (turn pax |=(a=@ta `json`[%s a]))]]
['name' [%s nom]] ['name' [%s nom]]
['date' [%s dat]] ['date' [%s dat]]
@ -548,7 +551,7 @@
%- my %- my
:~ [%name name.a] :~ [%name name.a]
[%comments ?:(comments.a ~..y ~..n)] [%comments ?:(comments.a ~..y ~..n)]
[%owner (scot %p src.bol)] [%author (scot %p src.bol)]
[%host (scot %p our.bol)] [%host (scot %p our.bol)]
[%date-created (snag 0 (flop pax.a))] [%date-created (snag 0 (flop pax.a))]
[%last-modified dat] [%last-modified dat]
@ -576,7 +579,7 @@
=. content.a (crip (weld (trip content.a) "\0a")) =. content.a (crip (weld (trip content.a) "\0a"))
=/ front=(map knot cord) =/ front=(map knot cord)
%- my %- my
:~ [%owner (scot %p src.bol)] :~ [%author (scot %p src.bol)]
[%host (scot %p our.bol)] [%host (scot %p our.bol)]
[%date-created dat] [%date-created dat]
[%last-modified dat] [%last-modified dat]
@ -650,11 +653,11 @@
?: ?& (~(has by meta.raw.new) %comments) ?: ?& (~(has by meta.raw.new) %comments)
=('.y' (~(got by meta.raw.new) %comments)) =('.y' (~(got by meta.raw.new) %comments))
== ==
=/ owner=(unit @ta) (~(get by meta.raw.new) %owner) =/ author=(unit @ta) (~(get by meta.raw.new) %author)
=/ owner-p=@p =/ author-p=@p
?~ owner our.bol ?~ author our.bol
(fall (rush u.owner ;~(pfix sig fed:ag)) our.bol) (fall (rush u.author ;~(pfix sig fed:ag)) our.bol)
(ta-generate-comments pax owner-p) (ta-generate-comments pax author-p)
ta-this ta-this
:: ::
== ==
@ -791,11 +794,11 @@
?& =('.y' (fall (~(get by meta.new) %comments) '.n')) ?& =('.y' (fall (~(get by meta.new) %comments) '.n'))
=('.n' (fall (~(get by meta.old) %comments) '.n')) =('.n' (fall (~(get by meta.old) %comments) '.n'))
== ==
=/ owner=(unit @ta) (~(get by meta.new) %owner) =/ author=(unit @ta) (~(get by meta.new) %author)
=/ owner-p=@p =/ author-p=@p
?~ owner our.bol ?~ author our.bol
(fall (rush u.owner ;~(pfix sig fed:ag)) our.bol) (fall (rush u.author ;~(pfix sig fed:ag)) our.bol)
(ta-generate-comments pax owner-p) (ta-generate-comments pax author-p)
:: ::
=? ta-this =? ta-this
?& =('.n' (fall (~(get by meta.new) %comments) '.n')) ?& =('.n' (fall (~(get by meta.new) %comments) '.n'))
@ -872,7 +875,7 @@
:: ::
++ ta-generate-comments ++ ta-generate-comments
~/ %coll-ta-generate-comments ~/ %coll-ta-generate-comments
|= [pax=path owner=ship] |= [pax=path author=ship]
^+ ta-this ^+ ta-this
=/ sup=path [%collections-config (flop pax)] =/ sup=path [%collections-config (flop pax)]
=/ bek byk.bol(r [%da now.bol]) =/ bek byk.bol(r [%da now.bol])
@ -882,7 +885,7 @@
:* [bek sup] :* [bek sup]
'comments' 'comments'
'comments' 'comments'
owner author
dat dat
dat dat
%comments %comments

6
mar/collections/config.hoon
View File

@ -18,7 +18,7 @@
(cat 3 'name: ' name.con) (cat 3 'name: ' name.con)
(cat 3 'description: ' description.con) (cat 3 'description: ' description.con)
:: ::
(cat 3 'owner: ' (scot %p owner.con)) (cat 3 'author: ' (scot %p author.con))
:: ::
(cat 3 'date-created: ' (scot %da date-created.con)) (cat 3 'date-created: ' (scot %da date-created.con))
(cat 3 'last-modified: ' (scot %da last-modified.con)) (cat 3 'last-modified: ' (scot %da last-modified.con))
@ -42,7 +42,7 @@
?> ?= $: full-path=@t ?> ?= $: full-path=@t
name=@t name=@t
desc=@t desc=@t
owner=@t author=@t
dc=@t dc=@t
lm=@t lm=@t
type=@t type=@t
@ -64,7 +64,7 @@
:: ::
(rash desc.txs ;~(pfix (jest 'description: ') (cook crip (star next)))) (rash desc.txs ;~(pfix (jest 'description: ') (cook crip (star next))))
:: ::
(rash owner.txs ;~(pfix (jest 'owner: ~') fed:ag)) (rash author.txs ;~(pfix (jest 'author: ~') fed:ag))
:: ::
%+ rash dc.txs %+ rash dc.txs
;~ pfix ;~ pfix

22
ren/collections/elem.hoon
View File

@ -113,7 +113,7 @@
=/ ht (hedtal:collections +.elm) =/ ht (hedtal:collections +.elm)
=/ title (fall (~(get by meta.raw) %name) -.s.bem.gas) =/ title (fall (~(get by meta.raw) %name) -.s.bem.gas)
=/ date (fall (~(get by meta.raw) %date-created) 'missing date') =/ date (fall (~(get by meta.raw) %date-created) 'missing date')
=/ owner (fall (~(get by meta.raw) %owner) 'anonymous') =/ author (fall (~(get by meta.raw) %author) 'anonymous')
:: ::
;div.mb-18.mt-4 ;div.mb-18.mt-4
;+ elm ;+ elm
@ -141,20 +141,20 @@
|= [nom=knot ite=item:collections] |= [nom=knot ite=item:collections]
^- manx ^- manx
?> ?=(%raw -.ite) ?> ?=(%raw -.ite)
=/ owner (fall (~(get by meta.raw.ite) %owner) 'anonymous') =/ author (fall (~(get by meta.raw.ite) %author) 'anonymous')
=/ host (fall (~(get by meta.raw.ite) %host) 'anonymous') =/ host (fall (~(get by meta.raw.ite) %host) 'anonymous')
=/ date (fall (~(get by meta.raw.ite) %date-created) 'missing date') =/ date (fall (~(get by meta.raw.ite) %date-created) 'missing date')
;li.mb-6 ;li.mb-6
;div.flex.align-center ;div.flex.align-center
;div.mr-2 ;div.mr-2
=urb-component "Sigil" =urb-component "Sigil"
=urb-ship "{(trip owner)}" =urb-ship "{(trip author)}"
=urb-size "18" =urb-size "18"
=urb-suffix "true"; =urb-suffix "true";
;div ;div
;a.vanilla.text-mono.text-small.text-700.mr-4 ;a.vanilla.text-mono.text-small.text-700.mr-4
=href "/~~/{(trip host)}/==/web/landscape/profile" =href "/~~/{(trip host)}/==/web/landscape/profile"
; {(trip owner)} ; {(trip author)}
== ==
== ==
;div.text-host-breadcrumb ;div.text-host-breadcrumb
@ -210,7 +210,7 @@
;h2.mt-0.mb-0 ;h2.mt-0.mb-0
;a(href lnk): {(trip name.meta.col)} ;a(href lnk): {(trip name.meta.col)}
== ==
;div.who.text-mono.text-600: {<owner.meta.col>} ;div.who.text-mono.text-600: {<author.meta.col>}
;div.meta-cont ;div.meta-cont
;div.com-count.ml-12 ;div.com-count.ml-12
; {(trip (scot %ud ~(wyt by data.col)))} comments ; {(trip (scot %ud ~(wyt by data.col)))} comments
@ -227,7 +227,7 @@
(scag 5 c.elm) (scag 5 c.elm)
=/ title (fall (~(get by meta.raw) %name) nom) =/ title (fall (~(get by meta.raw) %name) nom)
=/ date (fall (~(get by meta.raw) %date-created) 'missing date') =/ date (fall (~(get by meta.raw) %date-created) 'missing date')
=/ owner (fall (~(get by meta.raw) %owner) 'anonymous') =/ author (fall (~(get by meta.raw) %author) 'anonymous')
=/ lnk=tape =/ lnk=tape
"/~~/{(scow %p p.bem.gas)}/=={(spud (flop s.bem.gas))}/{(trip nom)}" "/~~/{(scow %p p.bem.gas)}/=={(spud (flop s.bem.gas))}/{(trip nom)}"
:: ::
@ -238,7 +238,7 @@
;a(href lnk): {(trip title)} ;a(href lnk): {(trip title)}
;a(href lnk): *{hed.ht} ;a(href lnk): *{hed.ht}
== ==
;div.who.text-mono.text-600: {(trip owner)} ;div.who.text-mono.text-600: {(trip author)}
;div.snippet ;div.snippet
;* tal.ht ;* tal.ht
== ==
@ -262,7 +262,7 @@
;a(href lnk): {(trip title)} ;a(href lnk): {(trip title)}
;a(href lnk): *{hed.ht} ;a(href lnk): *{hed.ht}
== ==
;div.text-mono.text-small.text-300.mt-1.mb-1: {<owner.meta.col>} ;div.text-mono.text-small.text-300.mt-1.mb-1: {<author.meta.col>}
;div ;div
;div.icon-label.justify-start ;div.icon-label.justify-start
;div(urb-component "IconComment"); ;div(urb-component "IconComment");
@ -291,7 +291,7 @@
%collection %collection
=* met meta.col.itm =* met meta.col.itm
:~ [%urb-name (trip name.met)] :~ [%urb-name (trip name.met)]
[%urb-owner (scow %p owner.met)] [%urb-author (scow %p author.met)]
[%urb-host (scow %p p.full-path.met)] [%urb-host (scow %p p.full-path.met)]
[%urb-date-created (scow %da date-created.met)] [%urb-date-created (scow %da date-created.met)]
[%urb-last-modified (scow %da last-modified.met)] [%urb-last-modified (scow %da last-modified.met)]
@ -301,7 +301,7 @@
%raw %raw
=/ met ~(got by meta.raw.itm) =/ met ~(got by meta.raw.itm)
:~ [%urb-name (trip (met %name))] :~ [%urb-name (trip (met %name))]
[%urb-owner (trip (met %owner))] [%urb-author (trip (met %author))]
[%urb-host (trip (met %host))] [%urb-host (trip (met %host))]
[%urb-date-created (trip (met %date-created))] [%urb-date-created (trip (met %date-created))]
[%urb-last-modified (trip (met %last-modified))] [%urb-last-modified (trip (met %last-modified))]
@ -311,7 +311,7 @@
%both %both
=/ met ~(got by meta.raw.itm) =/ met ~(got by meta.raw.itm)
:~ [%urb-name (trip (met %name))] :~ [%urb-name (trip (met %name))]
[%urb-owner (trip (met %owner))] [%urb-author (trip (met %author))]
[%urb-host (trip (met %host))] [%urb-host (trip (met %host))]
[%urb-date-created (trip (met %date-created))] [%urb-date-created (trip (met %date-created))]
[%urb-last-modified (trip (met %last-modified))] [%urb-last-modified (trip (met %last-modified))]

2
web/landscape/js/index-min.js vendored
View File

File diff suppressed because one or more lines are too long

2
web/landscape/profile.hoon
View File

@ -8,7 +8,7 @@
-- --
^- manx ^- manx
;div ;div
;input(type "hidden", name "urb-metadata", urb-structure-type "header-profile", urb-owner "{(scow %p p.bem.gas)}"); ;input(type "hidden", name "urb-metadata", urb-structure-type "header-profile", urb-author "{(scow %p p.bem.gas)}");
;div.container ;div.container
;div.row ;div.row
;div.flex-col-2; ;div.flex-col-2;

2
web/landscape/profile/settings.hoon
View File

@ -10,7 +10,7 @@
.^(@p %j /(scot %p p.bem.gas)/code/(scot r.bem.gas)/(scot %p p.bem.gas)) .^(@p %j /(scot %p p.bem.gas)/code/(scot r.bem.gas)/(scot %p p.bem.gas))
^- manx ^- manx
;div ;div
;input(type "hidden", name "urb-metadata", urb-structure-type "header-profile", urb-owner "{(scow %p p.bem.gas)}"); ;input(type "hidden", name "urb-metadata", urb-structure-type "header-profile", urb-author "{(scow %p p.bem.gas)}");
;div.container(urb-devices "") ;div.container(urb-devices "")
;div.row.mt-4 ;div.row.mt-4
;div.flex-col-2; ;div.flex-col-2;