urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-28 05:22:27 +03:00
Code Issues Packages Projects Releases Wiki Activity

finish merge

Browse Source
This commit is contained in:
Will Hanlen 2024-05-28 21:58:14 +02:00
parent 12d47a5eaf
commit d25e091d94
23 changed files with 119 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/arvo/app/neo.hoon
View File

@ -1044,7 +1044,7 @@
~| con-pith/pith
|%
++ grab !<(stud:neo (slot 4 vax))
++ thru !<(stud:neo (slot 10 vax))
++ thru ~| pith !<(stud:neo (slot 10 vax))
++ grow !<(stud:neo (slot 11 vax))
++ run (slot 3 vax)
++ sink

2
pkg/arvo/neo/cod/std/src/con/accel-htmx.hoon
View File

@ -38,7 +38,7 @@
;*
%+ turn (gulf 1 10)
|= y=@
=/ val=(unit pail:neo) (~(get by kids.bowl) ~[ud/x ud/y])
=/ val=(unit pail:neo) ~::(~(get by kids.bowl) ~[ud/x ud/y])
=/ vaf (fall val [%accel-cell !>(*accel-cell)])
;td.border
;+

4
pkg/arvo/neo/cod/std/src/con/circle-htmx.hoon
View File

@ -1,5 +1,5 @@
/@ circle
:- [%circle %htmx]
:- [%circle %$ %htmx]
|= circle
|= =bowl:neo
|^
@ -19,7 +19,7 @@
;*
%+ turn
%+ murn
~(tap in ~(key by kids.bowl))
~ ::~(tap in ~(key by kids.bowl))
|= =pith ((soft ship) ->:pith)
|= =ship
^- manx

8
pkg/arvo/neo/cod/std/src/con/diary-htmx.hoon
View File

@ -11,10 +11,10 @@
=style "max-width: 650px;"
;+ form-put-entry
;*
%+ turn
%+ sort ~(tap of:neo kids.bowl)
|= [a=[=pith *] b=[=pith *]]
(gth ->.pith.a ->.pith.b)
%+ turn ~
:: %+ sort ~(tap of:neo kids.bowl)
:: |= [a=[=pith *] b=[=pith *]]
:: (gth ->.pith.a ->.pith.b)
link-entry
==
==

6
pkg/arvo/neo/cod/std/src/con/folder-htmx.hoon
View File

@ -65,13 +65,13 @@
::
++ shrubs
;div.fc.g2
;+ ?. =(0 ~(wyt by kids.bowl)) ;/("")
;div.p5.f3.fc.jc.ac: none yet
::;+ ?. =(0 (lent (~(tap of kids.bowl) /))) ;/("")
::;div.p5.f3.fc.jc.ac: none yet
;*
%+ turn folder
|= name=@tas
=/ pith ~[name]
=/ =pail:neo (~(got by kids.bowl) pith)
=/ =pail:neo pail:(~(got of:neo kids.bowl) pith)
=/ =stud:neo p.pail
=/ =path (pout (welp here.bowl pith))
=/ label

8
pkg/arvo/neo/cod/std/src/con/home-htmx.hoon
View File

@ -54,10 +54,10 @@
=hx-swap "none"
=hx-indicator "#indicator-{id}"
;*
%+ turn
%+ welp apps.home
%~ tap in
(~(dif in ~(key by kids.bowl)) `(set pith)`(silt apps.home))
%+ turn apps.home
:: %+ welp apps.home
:: %~ tap in
:: (~(dif in ~(key by kids.bowl)) `(set pith)`(silt apps.home))
|= =pith
=/ =path (pout (welp here.bowl pith))
;div.relative.br2

12
pkg/arvo/neo/cod/std/src/con/planner-htmx.hoon
View File

@ -116,10 +116,10 @@
%- sort
:_ |= [a=pent b=pent]
(lth when.q.a when.q.b)
%+ murn ~(tap by kids.bowl)
|= [=pith =pail:neo]
%+ murn ~(tap of:neo kids.bowl)
|= [=pith =idea:neo]
^- (unit pent)
=/ entry !<(planner-entry q.pail)
=/ entry !<(planner-entry q.pail.idea)
?. ?&
(gte when.entry d)
(lth when.entry (add d ~d1))
@ -137,10 +137,10 @@
%- sort
:_ |= [a=pent b=pent]
(gth when.q.a when.q.b)
%+ murn ~(tap by kids.bowl)
|= [=pith =pail:neo]
%+ murn ~(tap of:neo kids.bowl)
|= [=pith =idea:neo]
^- (unit pent)
=/ entry !<(planner-entry q.pail)
=/ entry !<(planner-entry q.pail.idea)
?. ?&
(gte d when.entry)
(lte d (add when.entry length.entry))

2
pkg/arvo/neo/src/std/con/task-diff-htmx.hoon → pkg/arvo/neo/cod/std/src/con/task-diff-htmx.hoon
View File

@ -1,5 +1,5 @@
/@ task-diff
:- [%task-diff %htmx]
:- [%task-diff %$ %htmx]
|= t=task-diff
|= =bowl:neo
;div.loading

4
pkg/arvo/neo/src/std/con/txt-htmx.hoon → pkg/arvo/neo/cod/std/src/con/txt-htmx.hoon
View File

@ -1,6 +1,6 @@
/@ txt
/- _/feather-icons
:- [%txt %htmx]
/- feather-icons
:- [%txt %$ %htmx]
|= =txt
|= =bowl:neo
;form.fc.p2.wf.hf.relative

53
pkg/arvo/neo/cod/std/src/imp/accel-cell.hoon
View File

@ -5,7 +5,7 @@
|%
++ render-hoon
|= [code=@t a=vase b=vase]
^- pail:neo
^- (unit (each vase tang))
=/ code
%- crip
:: (trip 10) = tape of newline
@ -15,16 +15,10 @@
=/ mul
%- mule
|.
%+ slap
%+ with-faces:ford:neo !>(..zuse)
:~ neo/!>(neo)
a/a
b/b
==
%+ slap
%+ slop
%+ slop
!>(..zuse)
!>(..zuse)
a(p [%face %a p.a])
b(p [%face %b p.b])
(ream code)
@ -53,59 +47,64 @@
++ get-deps-vases
|= =bowl:neo
^- [vase vase]
=/ a=(unit (pair pith cane:neo))
=/ a=(unit (pair pith lore:neo))
(~(get by deps.bowl) %a)
=/ b=(unit (pair pith cane:neo))
=/ b=(unit (pair pith lore:neo))
(~(get by deps.bowl) %b)
=/ va
?~ a !>(~)
(maybe-promote-vase pail.q.u.a)
=/ =idea:neo (~(got of:neo q.u.a) /)
(maybe-promote-vase pail.idea)
=/ vb
?~ b !>(~)
(maybe-promote-vase pail.q.u.b)
=/ =idea:neo (~(got of:neo q.u.b) /)
(maybe-promote-vase pail.idea)
[va vb]
::
++ update
|= [cell=accel-cell =bowl:neo]
^- (quip card:neo vase)
^- (quip card:neo pail:neo)
=/ vavb=[vase vase] (get-deps-vases bowl)
=. result.cell
(render-hoon code.cell vavb)
:_ !>(cell)
:_ accel-cell/!>(cell)
?~ target.cell ~
?~ result.cell ~
?- -.u.result.cell
?- -.u.result.cell
%.n ~
%.y [pith.u.target.cell %poke [stud.u.target.cell p.u.result.cell]]~
==
--
|%
++ state %accel-cell
++ state pro/%accel-cell
++ poke (sy %rely ~)
++ kids *kids:neo
++ deps
%- ~(gas by *deps:neo)
:~ [%a | [%pail %sig] ~]
[%b | [%pail %sig] ~]
:~ [%a | [pro/%pail (sy %sig ~)] ~]
[%b | [pro/%pail (sy %sig ~)] ~]
==
::
++ form
^- form:neo
|_ [=bowl:neo =ever:neo state-vase=vase *]
::|_ [=bowl:neo =ever:neo state-vase=vase *]
|_ [=bowl:neo =aeon:neo =pail:neo]
++ poke
|= [=stud:neo vax=vase]
^- (quip card:neo vase)
?. =(stud %rely)
[~ state-vase]
^- (quip card:neo pail:neo)
?. =(stud %rely)
[~ pail]
=+ !<([=term =stem:neo] vax)
?> ?=(%x -.q.stem)
=/ cell !<(accel-cell state-vase)
=/ cell !<(accel-cell q.pail)
(update cell bowl)
::
++ init
|= old=(unit vase)
^- (quip card:neo vase)
=/ cell !<(accel-cell (need old))
(update cell bowl)
|= old=(unit pail:neo)
^- (quip card:neo pail:neo)
?~ old
[~ accel-cell/!>(*accel-cell)]
=/ cell !<(accel-cell q.u.old)
(update cell bowl)
--
--

32
pkg/arvo/neo/cod/std/src/imp/accel.hoon
View File

@ -11,54 +11,58 @@
|= col=@ud
%+ turn (gulf rowstart rowend)
|= row=@ud
[(welp here.bowl #/[ud/col]/[ud/row]) %make %accel-cell `!>(['~' ~ ~ ~ ~]) ~]
[(welp here.bowl #/[ud/col]/[ud/row]) %make %accel-cell `accel-cell/!>(['~' ~ ~ ~ ~]) ~]
--
::
^- firm:neo
^- kook:neo
|%
++ state %accel
++ state pro/%accel
++ poke (sy %accel-diff ~)
++ kids
%- ~(gas by *kids:neo)
:- ~
:- %y
%- ~(gas by *lads:neo)
:~ :- [|/%ud |/%ud |]
[%accel-cell %sig]
[pro/%accel-cell (sy %sig ~)]
==
++ deps *deps:neo
++ form
^- form:neo
|_ [=bowl:neo =ever:neo sta=vase *]
::|_ [=bowl:neo =ever:neo sta=vase *]
|_ [=bowl:neo =aeon:neo =pail:neo]
++ init
|= old=(unit vase)
|= old=(unit pail:neo)
^- (quip card:neo pail:neo)
=/ width 10
=/ height 10
:_ !>([width height])
:_ accel/!>([width height])
(make-cells bowl 1 width 1 height)
::
++ poke
|= [=stud:neo vax=vase]
^- (quip card:neo vase)
^- (quip card:neo pail:neo)
?> =(%accel-diff stud)
=/ state !<(accel sta)
=/ state !<(accel q.pail)
=/ poke !<(accel-diff vax)
?> =(our ship.src):bowl
?- -.poke
%inc-width
=/ new (add 1 width.state)
:_ !>([new height.state])
:_ accel/!>([new height.state])
(make-cells bowl new new 1 height.state)
::
%inc-height
=/ new (add 1 height.state)
:_ !>([width.state new])
:_ accel/!>([width.state new])
(make-cells bowl 1 width.state new new)
::
%new
:_ sta
:_ accel/q.pail
=; conf
:~ :- (welp here.bowl ~[[ud/row.poke] [ud/column.poke]])
:* %make
%accel-cell
`!>([text.poke ~ refa.poke refb.poke target.poke])
`accel-cell/!>([text.poke ~ refa.poke refb.poke target.poke])
conf
==
==

3
pkg/arvo/neo/cod/std/src/imp/diary.hoon
View File

@ -38,7 +38,8 @@
++ init
|= old=(unit pail:neo)
^- (quip card:neo pail:neo)
?^ old `u.old
:- ~
?^ old u.old
diary/!>(*diary)
--
--

23
pkg/arvo/neo/cod/std/src/imp/folder.hoon
View File

@ -1,39 +1,38 @@
/@ folder
/@ folder-diff
^- firm:neo
^- kook:neo
|%
++ state %folder
++ state pro/%folder
++ poke (sy %folder %folder-diff ~)
++ kids *kids:neo
++ deps *deps:neo
++ form
^- form:neo
|_ [=bowl:neo =ever:neo sta=vase *]
|_ [=bowl:neo =aeon:neo =pail:neo]
++ init
|= new=(unit vase)
^- (quip card:neo vase)
|= new=(unit pail:neo)
^- (quip card:neo pail:neo)
:- ~
?~ new
!>(*folder)
u.new
?^ new u.new
folder/!>(*folder)
::
++ poke
|= [=stud:neo vax=vase]
^- (quip card:neo vase)
^- (quip card:neo pail:neo)
?+ stud !!
%folder-diff
=/ poke !<(folder-diff vax)
=/ this !<(folder sta)
=/ this !<(folder q.pail)
?- -.poke
%make
:_ !>([name.poke this])
:_ folder/!>([name.poke this])
:~ [(snoc here.bowl name.poke) %make stud.poke ~ ~]
==
::
%tomb
:- ~
=/ i (need (find ~[name.poke] this))
!>((oust [i 1] this))
folder/!>((oust [i 1] this))
==
==
--

1
pkg/arvo/neo/cod/std/src/imp/hawk-eyre.hoon
View File

@ -23,6 +23,7 @@
=/ [eyre-id=@ta req=inbound-request:eyre] task
=/ lin (parse-request-line:serv url.request.req)
=/ inner=pith:neo (pave:neo (slag 2 site.lin))
?> ?=([[%p @] *] inner)
~& inner/inner
=/ args (~(gas by *(map @t @t)) args.lin)
=/ =crew:neo (~(gas by *crew:neo) src/inner ~)

26
pkg/arvo/neo/cod/std/src/imp/home.hoon
View File

@ -1,32 +1,32 @@
/@ home
^- firm:neo
^- kook:neo
|%
++ state %home
++ state pro/%home
++ poke (sy %home ~)
++ kids *kids:neo
++ deps *deps:neo
++ form
^- form:neo
|_ [=bowl:neo =ever:neo sta=vase *]
|_ [=bowl:neo =aeon:neo =pail:neo]
++ init
|= old=(unit vase)
^- (quip card:neo vase)
:_ !>(*home)
|= old=(unit pail:neo)
^- (quip card:neo pail:neo)
:_ home/!>(*home)
:~ [#/[p/our.bowl]/home/diary %make %diary ~ ~]
[#/[p/our.bowl]/home/tasks %make %task `!>(['' | ~]) ~]
[#/[p/our.bowl]/home/sail %make %sail `!>(['' 'prose p3' ~]) ~]
[#/[p/our.bowl]/home/tasks %make %task `task/!>(['' | ~]) ~]
[#/[p/our.bowl]/home/sail %make %sail `sail/!>(['' 'prose p3' ~]) ~]
[#/[p/our.bowl]/home/accel %make %accel ~ ~]
[#/[p/our.bowl]/home/iframes/wiki %make %iframe `!>('https://docs.urbit.org') ~]
[#/[p/our.bowl]/home/iframes/wiki %make %iframe `iframe/!>('https://docs.urbit.org') ~]
[#/[p/our.bowl]/home/circle %make %circle ~ ~]
[#/[p/our.bowl]/home/files %make %folder ~ ~]
[#/[p/our.bowl]/home/planner %make %planner ~ ~]
==
++ poke
|= [=stud:neo vax=vase]
^- (quip card:neo vase)
?+ stud !!
|= =pail:neo
^- (quip card:neo pail:neo)
?+ p.pail !!
%home
[~ vax]
[~ pail]
==
--
--

2
pkg/arvo/neo/cod/std/src/imp/iframe.hoon
View File

@ -1 +1 @@
~
~

25
pkg/arvo/neo/cod/std/src/imp/planner-entry.hoon
View File

@ -1,24 +1 @@
/@ planner-entry
^- firm:neo
|%
++ state %planner-entry
++ poke ~
++ kids *kids:neo
++ deps *deps:neo
++ form
^- form:neo
|_ [=bowl:neo =ever:neo sta=vase *]
++ init
|= new=(unit vase)
^- (quip card:neo vase)
:- ~
?~ new
!>(*planner-entry)
u.new
::
++ poke
|= [=stud:neo vax=vase]
^- (quip card:neo vase)
!!
--
--
~

36
pkg/arvo/neo/cod/std/src/imp/planner.hoon
View File

@ -1,62 +1,64 @@
/@ planner
/@ planner-diff
/@ planner-entry
^- firm:neo
^- kook:neo
|%
++ state %planner
++ state pro/%planner
++ poke (sy %planner-diff ~)
++ kids
%- ~(gas by *kids:neo)
:- ~
:- %y
%- ~(gas by *lads:neo)
:~ :- [|/%da |]
[%planner-entry %sig]
[pro/%planner-entry (sy %sig ~)]
==
++ deps *deps:neo
++ form
^- form:neo
|_ [=bowl:neo =ever:neo sta=vase *]
|_ [=bowl:neo =aeon:neo =pail:neo]
++ init
|= new=(unit vase)
^- (quip card:neo vase)
|= new=(unit pail:neo)
^- (quip card:neo pail:neo)
:- ~
?~ new
!>([now.bowl (add now.bowl ~d30)])
planner/!>([now.bowl (add now.bowl ~d30)])
u.new
::
++ poke
|= [=stud:neo vax=vase]
^- (quip card:neo vase)
^- (quip card:neo pail:neo)
?+ stud !!
%planner-diff
=/ poke !<(planner-diff vax)
=/ this !<(planner sta)
=/ this !<(planner q.pail)
?- -.poke
%make
:_ !>(this)
:_ planner/!>(this)
^- (list card:neo)
:~
:- (snoc here.bowl [%da now.bowl])
[%make %planner-entry `!>(entry.poke) ~]
[%make %planner-entry `planner-entry/!>(entry.poke) ~]
==
::
%edit
:_ !>(this)
:_ planner/!>(this)
^- (list card:neo)
:~
:- (snoc here.bowl [%da id.poke])
[%make %planner-entry `!>(entry.poke) ~]
[%make %planner-entry `planner-entry/!>(entry.poke) ~]
==
::
%move
:- ~
!> this(start start.poke, end end.poke)
planner/!>(this(start start.poke, end end.poke))
::
%tomb
:_ !>(this)
:_ planner/!>(this)
^- (list card:neo)
:~
:- (snoc here.bowl [%da id.poke])
=/ entry [*@da %event *@dr '' &]
[%make %planner-entry `!>(entry) ~]
[%make %planner-entry `planner-entry/!>(entry) ~]
==
==
==

7
pkg/arvo/neo/cod/std/src/imp/sky-eyre-handler.hoon
View File

@ -66,8 +66,8 @@
*/
'''
==
:: ;style: {(trip feather-css)}
:: ;style: {(trip reset-css)}
:: ;style: {(trip feather-css)}
:: ;style: {(trip reset-css)}
;script
;+ ;/
"""
@ -76,9 +76,6 @@
jQuery.fn.emit=function (name)\{(this[0]).dispatchEvent(new Event(name, \{ bubbles: true, cancelable: true, composed: true })); return this;};
"""
==
:: ;script: {(trip date-now)}
:: ;script: {(trip atom-input)}
:: ;script: {(trip multiline-input)}
:: ;script: {(trip a-i-r)}
:: ;+ favicon
:: ;+ manifest

2
pkg/arvo/neo/cod/std/src/lib/html-utils.hoon
View File

@ -1,4 +1,4 @@
/+ manx-utils
/- manx-utils
|%
++ mx
|_ a=manx

22
pkg/arvo/neo/src/std/imp/iframe.hoon
View File

@ -1,22 +0,0 @@
/@ iframe
|%
++ state %iframe
++ poke (sy %iframe ~)
++ kids *kids:neo
++ deps *deps:neo
++ form
^- form:neo
|_ [=bowl:neo =ever:neo state-vase=vase *]
++ poke
|= [=stud:neo vax=vase]
^- (quip card:neo vase)
?> =(%iframe stud)
=/ new (iframe !<(iframe vax))
`!>(new)
++ init
|= vas=(unit vase)
:- ~
?~ vas !>(*iframe)
u.vas
--
--

21
pkg/arvo/neo/src/std/imp/sail.hoon
View File

@ -1,21 +0,0 @@
/@ sail
|%
++ state %sail
++ poke (sy %sail ~)
++ kids *kids:neo
++ deps *deps:neo
++ form
^- form:neo
|_ [=bowl:neo =ever:neo state-vase=vase *]
++ poke
|= [=stud:neo vax=vase]
^- (quip card:neo vase)
?> =(stud %sail)
`vax
++ init
|= vas=(unit vase)
:- ~
?~ vas !>(*sail)
u.vas
--
--

22
pkg/arvo/neo/src/std/imp/txt.hoon
View File

@ -1,22 +0,0 @@
/@ txt
|%
++ state %txt
++ poke (sy %txt ~)
++ kids *kids:neo
++ deps *deps:neo
++ form
^- form:neo
|_ [=bowl:neo =ever:neo state-vase=vase *]
++ poke
|= [=stud:neo vax=vase]
^- (quip card:neo vase)
?> =(%txt stud)
=/ new (txt !<(txt vax))
`!>(new)
++ init
|= vas=(unit vase)
:- ~
?~ vas !>(*txt)
u.vas
--
--