2983739 · urbit.org · git.iko.soy

git.iko.soy/urbit.org

on master help sign in

fix build script, fix docs build and sidebar

2983739Morgan Sutherland8 years ago

partials/doc-wrap.hoon+1−1

compare with master

unifiedsplit

@@ -3,7 +3,7 @@

3/= content /, /web/docs/learn /partials-kids-plus/

4 /web/docs/reference /partials-kids-plus/

5 /web/docs/getting-started /partials-kids-plus/

6− /web/docs/introduction /partials-kids-plus/

6+ /web/docs/concepts /partials-kids-plus/

7 /web/docs /elem/

8 ==

9/= sidebar /partials-sidebar/

partials/sidebar.hoon+153−18

@@ -1,4 +1,5 @@

1−/= learn-list

1+:: Getting Started

2+/= get-started-list

2 /; |= $= a

3 /; |= $= a

3 $:

4 $:

4 (map knot cord)

5 (map knot cord)

@@ -11,7 +12,7 @@

11 ~

12 ~

12 ==

13 ==

13 a

14 a

14− /: /===/web/docs/learn

15+ /: /===/web/docs/getting-started

15 /^ $:

16 /^ $:

16 (map knot cord)

17 (map knot cord)

17 %+ map knot

18 %+ map knot

@@ -45,7 +46,8 @@

45 ==

46 ==

47 ==

48 ==

49+:: Using

48−/= intro-list

50+/= use-list

49 /; |= $= a

51 /; |= $= a

50 $:

52 $:

51 (map knot cord)

53 (map knot cord)

@@ -58,7 +60,7 @@

58 ~

60 ~

59 ==

61 ==

60 a

62 a

61− /: /===/web/docs/introduction

63+ /: /===/web/docs/using

62 /^ $:

64 /^ $:

63 (map knot cord)

65 (map knot cord)

64 %+ map knot

66 %+ map knot

@@ -92,7 +94,8 @@

92 ==

94 ==

93 ==

95 ==

94 ==

96 ==

97+:: Concepts

95−/= ref-list

98+/= concept-list

96 /; |= $= a

99 /; |= $= a

97 $:

100 $:

98 (map knot cord)

101 (map knot cord)

@@ -105,7 +108,7 @@

105 ~

108 ~

106 ==

109 ==

107 a

110 a

108− /: /===/web/docs/reference

111+ /: /===/web/docs/concepts

109 /^ $:

112 /^ $:

110 (map knot cord)

113 (map knot cord)

111 %+ map knot

114 %+ map knot

@@ -139,7 +142,8 @@

139 ==

142 ==

140 ==

143 ==

141 ==

144 ==

145+:: Learn

142−/= use-list

146+/= learn-list

143 /; |= $= a

147 /; |= $= a

144 $:

148 $:

145 (map knot cord)

149 (map knot cord)

@@ -152,7 +156,55 @@

152 ~

156 ~

153 ==

157 ==

154 a

158 a

155− /: /===/web/docs/getting-started

159+ /: /===/web/docs/learn

160+ /^ $:

161+ (map knot cord)

162+ %+ map knot

163+ $:

164+ (map knot cord)

165+ (map knot [(map knot cord) (map knot (map knot cord)) ~])

166+ ~

167+ ==

168+ ~

169+ ==

170+ /. /front/

171+ /^ %+ map knot

172+ $:

173+ (map knot cord)

174+ (map knot [(map knot cord) (map knot (map knot cord)) ~])

175+ ~

176+ ==

177+ /_

178+ /^ $:

179+ (map knot cord)

180+ (map knot [(map knot cord) (map knot (map knot cord)) ~])

181+ ~

182+ ==

183+ /. /front/

184+ /^ (map knot [(map knot cord) (map knot (map knot cord)) ~])

185+ /_

186+ /^ [(map knot cord) (map knot (map knot cord)) ~]

187+ /.

188+ /front/

189+ /_ /front/

190+ ==

191+ ==

192+ ==

193+:: Reference

194+/= ref-list

195+ /; |= $= a

196+ $:

197+ (map knot cord)

198+ %+ map knot

199+ $:

200+ (map knot cord)

201+ (map knot [(map knot cord) (map knot (map knot cord)) ~])

202+ ~

203+ ==

204+ ~

205+ ==

206+ a

207+ /: /===/web/docs/reference

156 /^ $:

208 /^ $:

157 (map knot cord)

209 (map knot cord)

158 %+ map knot

210 %+ map knot

@@ -188,13 +240,13 @@

188 ==

240 ==

189^- manx

241^- manx

190;ol.list-reset.h-font.mt-6

242;ol.list-reset.h-font.mt-6

191−:: section: getting started

243+:: section: Getting Started

192 ;li.mb-4

244 ;li.mb-4

193 ;a.h-font.text-600(href "/docs/getting-started"): Getting Started

245 ;a.h-font.text-600(href "/docs/getting-started"): Getting Started

194 ;ol.list-reset.h-font

246 ;ol.list-reset.h-font

195 ;* %+ turn

247 ;* %+ turn

196 %+ sort

248 %+ sort

197− ~(tap by -.+.use-list)

249+ ~(tap by -.+.get-started-list)

198 |= $: $= a

250 |= $: $= a

199 %+ pair knot

251 %+ pair knot

200 $:

252 $:

@@ -271,13 +323,96 @@

271 ==

323 ==

272 ==

324 ==

273 ==

325 ==

274− :: section: Introduction

326+:: section: Using

327+ ;li.mb-4

328+ ;a.h-font.text-600(href "/docs/using"): Using

329+ ;ol.list-reset.h-font

330+ ;* %+ turn

331+ %+ sort

332+ ~(tap by -.+.use-list)

333+ |= $: $= a

334+ %+ pair knot

335+ $:

336+ (map knot cord)

337+ (map knot [(map knot cord) (map knot (map knot cord)) ~])

338+ ~

339+ ==

340+ $= b

341+ %+ pair knot

342+ $:

343+ (map knot cord)

344+ (map knot [(map knot cord) (map knot (map knot cord)) ~])

345+ ~

346+ ==

347+ ==

348+ =/ sort-a (slav %ud (fall (~(get by -.q.a) %sort) '100.000'))

349+ =/ sort-b (slav %ud (fall (~(get by -.q.b) %sort) '100.000'))

350+ (lth sort-a sort-b)

351+ |= $= a

352+ %+ pair knot

353+ $:

354+ (map knot cord)

355+ (map knot [(map knot cord) (map knot (map knot cord)) ~])

356+ ~

357+ ==

358+ =/ title (~(get by -.q.a) %title)

359+ =/ parent p.a

360+ =/ one

361+ ;ol.list-reset.h-font

362+ ;*

363+ %+ turn

364+ %+ sort ~(tap by -.+.q.a)

365+ |= $: $= a

366+ %+ pair knot [(map knot cord) (map knot (map knot cord)) ~]

367+ $= b

368+ %+ pair knot [(map knot cord) (map knot (map knot cord)) ~]

369+ ==

370+ =/ sort-a (slav %ud (fall (~(get by -.q.a) %sort) '100.000'))

371+ =/ sort-b (slav %ud (fall (~(get by -.q.b) %sort) '100.000'))

372+ (lth sort-a sort-b)

373+ |= $= b

374+ %+ pair knot [(map knot cord) (map knot (map knot cord)) ~]

375+ =/ oneparen p.b

376+ =/ onetitle (~(get by -.q.b) %title)

377+ =/ two

378+ ;ol.list-reset.h-font

379+ ;*

380+ %+ turn

381+ %+ sort ~(tap by -.+.q.b)

382+ |= $: $= a (pair knot (map knot cord))

383+ $= b (pair knot (map knot cord))

384+ ==

385+ =/ sort-a (slav %ud (fall (~(get by q.a) %sort) '100.000'))

386+ =/ sort-b (slav %ud (fall (~(get by q.b) %sort) '100.000'))

387+ (lth sort-a sort-b)

388+

389+ |= $= c (pair knot (map knot cord))

390+ =/ twoparen p.c

391+ =/ sectitle (fall (~(get by q.c) %title) '')

392+ ;li

393+ ;a.h-font(href "/docs/using/{(trip parent)}/{(trip oneparen)}/{(trip twoparen)}"): {(trip sectitle)}

394+ ==

395+ ==

396+ ?~ onetitle

397+ ;li;

398+ ;li

399+ ;a.h-font(href "/docs/using/{(trip parent)}/{(trip oneparen)}"): {(trip (need onetitle))}

400+ ;+ two

401+ ==

402+ ==

403+ ;li

404+ ;a.h-font(href "/docs/using/{(trip parent)}"): {(trip (need title))}

405+ ;+ one

406+ ==

407+ ==

408+ ==

409+ :: Section: Concepts

275 ;li.mb-4

410 ;li.mb-4

276− ;a.h-font.text-600(href "/docs/introduction"): Introduction

411+ ;a.h-font.text-600(href "/docs/concepts"): Concepts

277 ;ol

412 ;ol

278 ;* %+ turn

413 ;* %+ turn

279 %+ sort

414 %+ sort

280− ~(tap by -.+.intro-list)

415+ ~(tap by -.+.concept-list)

281 |= $: $= a

416 |= $: $= a

282 %+ pair knot

417 %+ pair knot

283 $:

418 $:

@@ -338,23 +473,23 @@

338 =/ twoparen p.c

473 =/ twoparen p.c

339 =/ sectitle (fall (~(get by q.c) %title) '')

474 =/ sectitle (fall (~(get by q.c) %title) '')

340 ;li

475 ;li

341− ;a.h-font(href "/docs/introduction/{(trip parent)}/{(trip oneparen)}/{(trip twoparen)}"): {(trip sectitle)}

476+ ;a.h-font(href "/docs/concepts/{(trip parent)}/{(trip oneparen)}/{(trip twoparen)}"): {(trip sectitle)}

342 ==

477 ==

343 ==

478 ==

344 ?~ onetitle

479 ?~ onetitle

345 ;li;

480 ;li;

346 ;li

481 ;li

347− ;a.h-font(href "/docs/introduction/{(trip parent)}/{(trip oneparen)}"): {(trip (need onetitle))}

482+ ;a.h-font(href "/docs/concepts/{(trip parent)}/{(trip oneparen)}"): {(trip (need onetitle))}

348 ;+ two

483 ;+ two

349 ==

484 ==

350 ==

485 ==

351 ;li

486 ;li

352− ;a.h-font(href "/docs/introduction/{(trip parent)}"): {(trip (need title))}

487+ ;a.h-font(href "/docs/concepts/{(trip parent)}"): {(trip (need title))}

353 ;+ one

488 ;+ one

354 ==

489 ==

355 ==

490 ==

356 ==

491 ==

357−:: section: learn

492+:: Section: Learn

358;li.mb-4

493;li.mb-4

359 ;a.h-font.text-600(href "/docs/learn"): Learn

494 ;a.h-font.text-600(href "/docs/learn"): Learn

360 ;ol.list-reset.h-font

495 ;ol.list-reset.h-font

@@ -437,7 +572,7 @@

437 ==

572 ==

438 ==

573 ==

439==

574==

440−:: section: Reference

575+:: Section: Reference

441;li.mb-4

576;li.mb-4

442 ;a.h-font.text-600(href "/docs/reference"): Reference

577 ;a.h-font.text-600(href "/docs/reference"): Reference

443 ;ol.list-reset.h-font

578 ;ol.list-reset.h-font

scripts/build+3−4

@@ -59,16 +59,15 @@ read -n1 -s -r -p $'- Wait for sync, then run |static in your urbit again, wait

60# Copy results of second render (docs) to dist folder

62−cp -rn $ship/.urb/put/web/* $dist # cp -n prevents overwriting existing folders

62+rsync -av --ignore-existing $ship/.urb/put/web/* $dist

64# Remove unecessary files

66−rm -rf $dist/posts/update

67rm -rf $dist/index

66rm -rf $dist/index

68−rm -rf $dist/js/*

70# Copy js directory

68# Copy js directory

70+rm -rf $dist/js/*

72cp -r $site/static-site/js $dist

71cp -r $site/static-site/js $dist

74−echo -e "- Find your website in $dist"

73+echo -e "- Find your website in $dist"

static-site/docs+1−1

Submodule changed.