git.iko.soy/urbit.org
on master help sign in
pages: import footer, container, section, singlecolumn from design system dependency
commit332f89e9a5e6dad9285777609fcf7f7b64fde5bf authorMatilde Park <matilde.park@urbit.org> dateTue 21 Jun 2022, 00:01 (4 years ago) parent79cd0ad
39 files changed+193−349
compare with master
unifiedsplit
components/BasicPage.js+6−4 components/Container.js−8 components/ContentArea.js+1−1 components/Footer.js+3−131 components/GrantProgramOverview.js+6−4 components/Header.js−2 components/Section.js−21 components/SingleColumn.js−8 components/gateway/Description.js+1−1 components/gateway/Gateway404.js+1−3 lib/constants.js+83 package-lock.json+25−95 pages/404.js+1−3 pages/[slug].js+1−1 pages/applications/[[...application]].js+6−4 pages/applications/submit.js+1−3 pages/blog.js+1−3 pages/blog/[slug].js+6−4 pages/community/[[...slug]].js+1−1 pages/docs/[[...slug]].js+1−1 pages/events.js+1−3 pages/events/[slug].js+6−4 pages/getting-started/[[...slug]].js+1−1 pages/grants.js+1−3 pages/grants/[slug].js+6−4 pages/grants/apprenticeships.js+1−1 pages/grants/bounties.js+1−1 pages/grants/proposals.js+1−1 pages/groups/[[...group]].js+6−4 pages/groups/submit.js+1−3 pages/ids/[id].js+6−4 pages/ids/submit.js+1−3 pages/index.js+1−3 pages/media.js+1−3 pages/media/[slug].js+6−4 pages/understanding-urbit/[[...slug]].js+1−1 pages/updates.js+1−3 pages/updates/[slug].js+6−4 pages/using/[[...slug]].js+1−1
components/BasicPage.js+6−4
@@ -2,12 +2,14 @@ import { useRouter } from "next/router";
22import Head from "next/head";
33import Meta from "../components/Meta";
44import ErrorPage from "../pages/404";
5−import Container from "./Container";
5+import {
6+ Container,
7+ SingleColumn,
8+ Section,
9+ Markdown,
10+} from "foundation-design-system";
611import Header from "./Header";
712import Footer from "./Footer";
8−import SingleColumn from "./SingleColumn";
9−import Section from "./Section";
10−import Markdown from "foundation-design-system";
1113import classNames from "classnames";
1214import { TableOfContents } from "./TableOfContents";
1315
components/Container.jsdeleted−8
@@ -1,8 +0,0 @@
1−// Ensures the root container is always 100vw, min 100vh, and centers all children along the y-axis
2−export default function Container({ children }) {
3− return (
4− <div className="flex flex-col min-h-screen w-screen max-w-full items-center">
5− {children}
6− </div>
7− );
8−}
components/ContentArea.js+1−1
@@ -1,4 +1,4 @@
1−import Section from "./Section";
1+import { Section } from "foundation-design-system";
22import { useState, useEffect, useRef } from "react";
33import { useRouter } from "next/router";
44import { TableOfContents } from "./TableOfContents";
components/Footer.js+3−131
@@ -1,134 +1,6 @@
1−import Link from "next/link";
2−import SingleColumn from "./SingleColumn";
3−import Section from "./Section";
4−import { contact } from "../lib/constants";
1+import { Footer as FooterComponent } from "foundation-design-system";
2+import { footerData } from "../lib/constants";
53
64export default function Footer() {
7− return (
8− <footer className="bg-wall-100 mt-20 w-full flex justify-center">
9− <SingleColumn>
10− <Section short className="flex flex-row flex-wrap">
11− <div className="w-1/2 md:w-1/3 flex flex-col shrink">
12− <h4 className="mt-16 mb-8">Use Urbit</h4>
13− <Link href="/getting-started" passHref>
14− <a className="type-bold text-wall-500">Getting Started</a>
15− </Link>
16− <Link href="/using" passHref>
17− <a className="type-bold text-wall-500">User's Manual</a>
18− </Link>
19− <Link href="https://github.com/urbit/port/releases" passHref>
20− <a className="type-bold text-wall-500">Urbit Client</a>
21− </Link>
22− <Link href="https://github.com/urbit/urbit/releases" passHref>
23− <a className="type-bold text-wall-500">Urbit Binaries</a>
24− </Link>
25− {
26− // <Link href="">
27− // <div>
28− // <a className="mt-2 type-bold text-wall-500">Urbit Apps</a>
29− // </div>
30− // </Link>
31− }
32− <Link href="/getting-started/planet/#hosting-providers" passHref>
33− <a className="type-bold text-wall-500">Hosting Providers</a>
34− </Link>
35− </div>
36− <div className="w-1/2 md:w-1/3 flex flex-col shrink">
37− <h4 className="mt-16 mb-8">About</h4>
38− <Link href="/understanding-urbit" passHref>
39− <a className="type-bold text-wall-500">What's Urbit?</a>
40− </Link>
41− <Link href="/understanding-urbit/urbit-id" passHref>
42− <a className="type-bold text-wall-500">Urbit ID</a>
43− </Link>
44− <Link href="/understanding-urbit/urbit-os" passHref>
45− <a className="type-bold text-wall-500">Urbit OS</a>
46− </Link>
47− <Link href="/audits" passHref>
48− <a className="type-bold text-wall-500">Security Audits</a>
49− </Link>
50− <Link href="/faq" passHref>
51− <a className="type-bold text-wall-500">FAQ</a>
52− </Link>
53− <Link href="https://media.urbit.org/whitepaper.pdf" passHref>
54− <a className="type-bold text-wall-500">Whitepaper</a>
55− </Link>
56− </div>
57− <div className="w-1/2 md:w-1/3 flex flex-col shrink">
58− <h4 className="mt-16 mb-8">News</h4>
59− <Link href="/blog" passHref>
60− <a className="type-bold text-wall-500">Blog</a>
61− </Link>
62− <Link href="/events" passHref>
63− <a className="type-bold text-wall-500">Events</a>
64− </Link>
65− <Link href="/updates" passHref>
66− <a className="type-bold text-wall-500">Updates</a>
67− </Link>
68− </div>
69−
70− <div className="w-1/2 md:w-1/3 flex flex-col">
71− <h4 className="mt-16 mb-8">Develop</h4>
72− <Link href="/docs" passHref>
73− <a className="type-bold text-wall-500">Documentation</a>
74− </Link>
75− <Link href="https://github.com/urbit" passHref>
76− <a className="type-bold text-wall-500">Github</a>
77− </Link>
78− <Link
79− href="https://github.com/urbit/awesome-urbit#http-apis-airlock"
80− passHref
81− >
82− <a className="type-bold text-wall-500">Airlock APIs</a>
83− </Link>
84− </div>
85− <div className="w-1/2 md:w-1/3 flex flex-col">
86− <h4 className="mt-16 mb-8">Contribute</h4>
87− <Link href="https://github.com/urbit/urbit/issues" passHref>
88− <a className="type-bold text-wall-500">Issue Tracker</a>
89− </Link>
90− <Link href="/grants" passHref>
91− <a className="type-bold text-wall-500">Urbit Grants</a>
92− </Link>
93− </div>
94−
95− <div className="w-1/2 md:w-1/3 flex flex-col">
96− <h4 className="mt-16 mb-8">Community</h4>
97− <Link
98− href="https://groups.google.com/a/urbit.org/g/dev?pli=1"
99− passHref
100− >
101− <a className="type-bold text-wall-500">Dev Mailing List</a>
102− </Link>
103− <Link href="https://github.com/urbit/azimuth" passHref>
104− <a className="type-bold text-wall-500">Governance</a>
105− </Link>
106− <Link href="https://twitter.com/urbit" passHref>
107− <a className="type-bold text-wall-500">Twitter</a>
108− </Link>
109− </div>
110− </Section>
111− <Section className="flex flex-col md:flex-row">
112− <div className="md:w-1/3">
113− <Link href="/privacy" passHref>
114− <a className="type-bold text-wall-500">Privacy Policy</a>
115− </Link>
116− </div>
117− <div className="md:w-1/3">
118− <Link href="/terms-of-service" passHref>
119− <a className="type-bold text-wall-500">Terms of Service</a>
120− </Link>
121− </div>
122− <div className="md:w-1/3">
123− <a
124− href={"mailto:" + contact.email}
125− className="type-bold text-wall-500"
126− >
127− {contact.email}
128− </a>
129− </div>
130− </Section>
131− </SingleColumn>
132− </footer>
133− );
5+ return <FooterComponent data={footerData} />;
1346}
components/GrantProgramOverview.js+6−4
@@ -4,13 +4,15 @@ import Link from "next/link";
44import Head from "next/head";
55import Meta from "../components/Meta";
66import ErrorPage from "../pages/404";
7−import Container from "./Container";
7+import {
8+ Container,
9+ Section,
10+ SingleColumn,
11+ Markdown,
12+} from "foundation-design-system";
813import Header from "./Header";
914import Footer from "./Footer";
10−import SingleColumn from "./SingleColumn";
11−import Section from "./Section";
1215import { DateTime } from "luxon";
13−import Markdown from "foundation-design-system";
1416
1517export default function GrantProgramOverview({
1618 post,
components/Header.js−2
@@ -2,9 +2,7 @@ import Link from "next/link";
22import { useRouter } from "next/router";
33import { useState, useEffect } from "react";
44import classnames from "classnames";
5−import path from "path";
65import MenuTray from "../components/MenuTray";
7−import Section from "../components/Section";
86import { capitalize } from "../lib/lib";
97
108function ActiveLink({ children, href, className, currentPath }) {
components/Section.jsdeleted−21
@@ -1,21 +0,0 @@
1−import classnames from "classnames";
2−
3−// Provides a flexible layout building block
4−export default function Section({
5− children,
6− className = "",
7− short = false,
8− narrow = false,
9−}) {
10− const spacing = classnames({
11− "py-8": short,
12− "py-20": !short,
13− "layout-narrow": narrow,
14− layout: !narrow,
15− });
16− return (
17− <section className={`w-full px-4 md:px-8 ${spacing} ${className}`}>
18− {children}
19− </section>
20− );
21−}
components/SingleColumn.jsdeleted−8
@@ -1,8 +0,0 @@
1−// Provides a limited-width column with all children center-aligned along the vertical axis
2−export default function SingleColumn({ children }) {
3− return (
4− <div className="flex flex-col w-full items-center max-w-screen-2xl">
5− {children}
6− </div>
7− );
8−}
components/gateway/Description.js+1−1
@@ -1,4 +1,4 @@
1−import Markdown from "foundation-design-system";
1+import { Markdown } from "foundation-design-system";
22
33const Description = ({ description, fallback, markdown }) => {
44 return (
components/gateway/Gateway404.js+1−3
@@ -1,7 +1,5 @@
11import GatewayHeader from "./GatewayHeader";
2−import Container from "../Container";
3−import SingleColumn from "../SingleColumn";
4−import Section from "../Section";
2+import { Container, SingleColumn, Section } from "foundation-design-system";
53import Link from "next/link";
64
75const Gateway404 = ({ type }) => {
lib/constants.js+83
@@ -63,3 +63,86 @@ export const updatesKeys = [
6363 "author",
6464 "ship",
6565];
66+
67+export const footerData = [
68+ [
69+ {
70+ title: "Use Urbit",
71+ links: [
72+ {
73+ title: "Getting Started",
74+ href: "/getting-started",
75+ },
76+ { title: "User's Manual", href: "/using" },
77+ {
78+ title: "Urbit Client",
79+ href: "https://github.com/urbit/port/releases",
80+ },
81+ {
82+ title: "Urbit Binaries",
83+ href: "https://github.com/urbit/urbit/releases",
84+ },
85+ {
86+ title: "Hosting Providers",
87+ href: "http://localhost:3000/getting-started/planet#hosting-providers",
88+ },
89+ ],
90+ },
91+ {
92+ title: "About",
93+ links: [
94+ { title: "What's Urbit?", href: "/understanding-urbit" },
95+ { title: "Urbit ID", href: "/understanding-urbit/urbit-id" },
96+ { title: "Urbit OS", href: "/understanding-urbit/urbit-os" },
97+ { title: "Security Audits", href: "/audits" },
98+ { title: "FAQ", href: "/faq" },
99+ { title: "Whitepaper", href: "https://media.urbit.org/whitepaper.pdf" },
100+ ],
101+ },
102+ {
103+ title: "News",
104+ links: [
105+ { title: "Blog", href: "/blog" },
106+ { title: "Events", href: "/events" },
107+ { title: "Updates", href: "/updates" },
108+ ],
109+ },
110+ {
111+ title: "Develop",
112+ links: [
113+ { title: "Documentation", href: "/docs" },
114+ { title: "GitHub", href: "https://github.com/urbit" },
115+ {
116+ title: "Airlock APIs",
117+ href: "https://github.com/urbit/awesome-urbit#http-apis-airlock",
118+ },
119+ ],
120+ },
121+ {
122+ title: "Contribute",
123+ links: [
124+ {
125+ title: "Issue Tracker",
126+ href: "https://github.com/urbit/urbit/issues",
127+ },
128+ { title: "Urbit Grants", href: "/grants" },
129+ ],
130+ },
131+ {
132+ title: "Community",
133+ links: [
134+ {
135+ title: "Dev Mailing List",
136+ href: "https://groups.google.com/a/urbit.org/g/dev?pli=1",
137+ },
138+ { title: "Governance", href: "https://github.com/urbit/azimuth" },
139+ { title: "Twitter", href: "https://twitter.com/urbit" },
140+ ],
141+ },
142+ ],
143+ [
144+ { title: "Privacy Policy", href: "/privacy" },
145+ { title: "Terms of Service", href: "/terms-of-service" },
146+ { title: `${contact.email}`, href: `mailto:${contact.email}` },
147+ ],
148+];
package-lock.json+25−95
@@ -43,23 +43,6 @@
4343 "tailwindcss": "^3.0.24"
4444 }
4545 },
46− "node_modules/@babel/polyfill": {
47− "version": "7.12.1",
48− "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz",
49− "integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==",
50− "deprecated": "🚨 This package has been deprecated in favor of separate inclusion of a polyfill and regenerator-runtime (when needed). See the @babel/polyfill docs (https://babeljs.io/docs/en/babel-polyfill) for more information.",
51− "dependencies": {
52− "core-js": "^2.6.5",
53− "regenerator-runtime": "^0.13.4"
54− }
55− },
56− "node_modules/@babel/polyfill/node_modules/core-js": {
57− "version": "2.6.12",
58− "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
59− "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
60− "deprecated": "core-js@<3.4 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Please, upgrade your dependencies to the actual version of core-js.",
61− "hasInstallScript": true
62− },
6346 "node_modules/@babel/runtime": {
6447 "version": "7.18.3",
6548 "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz",
@@ -77,9 +60,9 @@
7760 "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
7861 },
7962 "node_modules/@markdoc/markdoc": {
80− "version": "0.1.3",
81− "resolved": "https://registry.npmjs.org/@markdoc/markdoc/-/markdoc-0.1.3.tgz",
82− "integrity": "sha512-4n2cobUSeOob+237wZhpNiOEHCSfOydlQnKHTFdRY6ug/DupXGaxkkkszJYQxRftiMs8jmb10XvVO1svEYD43Q==",
63+ "version": "0.1.2",
64+ "resolved": "https://registry.npmjs.org/@markdoc/markdoc/-/markdoc-0.1.2.tgz",
65+ "integrity": "sha512-3p+JTC1A0eqBdrl2UOIRoy+FLKtG1mh81R3Zzdm7FJiQIMt2mJmqmVQNDf3Md62G9rTtbj0ZuxlEattMbaslbw==",
8366 "engines": {
8467 "node": ">=14.7.0"
8568 }
@@ -590,9 +573,9 @@
590573 }
591574 },
592575 "node_modules/caniuse-lite": {
593− "version": "1.0.30001357",
594− "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001357.tgz",
595− "integrity": "sha512-b+KbWHdHePp+ZpNj+RDHFChZmuN+J5EvuQUlee9jOQIUAdhv9uvAZeEtUeLAknXbkiu1uxjQ9NLp1ie894CuWg==",
576+ "version": "1.0.30001358",
577+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz",
578+ "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==",
596579 "funding": [
597580 {
598581 "type": "opencollective",
@@ -860,9 +843,9 @@
860843 }
861844 },
862845 "node_modules/electron-to-chromium": {
863− "version": "1.4.162",
864− "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.162.tgz",
865− "integrity": "sha512-JrMk3tR2rnBojfAipp9nGh/vcWyBHeNsAVBqehtk4vq0o1bE4sVw19ICeidNx3u0i2yg4X8BvyUIM/yo2vO9aA=="
846+ "version": "1.4.163",
847+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.163.tgz",
848+ "integrity": "sha512-c9q94pUVqIdc8hyr7jZDB4bNEoNF3QJ7y35lnddMD+mXtiv5GsL1bT/RmfW/KEOmvlNg5Oy1qioiy4tA7e864Q=="
866849 },
867850 "node_modules/end-of-stream": {
868851 "version": "1.4.4",
@@ -1108,14 +1091,12 @@
11081091 },
11091092 "node_modules/foundation-design-system": {
11101093 "version": "0.0.0",
1111− "resolved": "git+ssh://git@github.com/urbit/foundation-design-system.git#91ad7d92baead8128a4bdf8718299398865a76d7",
1094+ "resolved": "git+ssh://git@github.com/urbit/foundation-design-system.git#a31bcd08731d3b787e2739ebf740a7c6b5a278d2",
11121095 "license": "MIT",
11131096 "dependencies": {
1114− "@babel/polyfill": "^7.12.1",
1115− "@markdoc/markdoc": "^0.1.2",
1097+ "@markdoc/markdoc": "0.1.2",
11161098 "core-js": "^3.23.1",
11171099 "html-react-parser": "^1.4.14",
1118− "markdoc": "^0.1.3",
11191100 "patch-package": "^6.4.7",
11201101 "prism-react-renderer": "^1.3.3",
11211102 "prismjs": "^1.28.0"
@@ -1123,8 +1104,11 @@
11231104 "peerDependencies": {
11241105 "@tailwindcss/aspect-ratio": "^0.4.0",
11251106 "autoprefixer": "^10.4.7",
1107+ "classnames": "^2.3.1",
11261108 "next": "^12.1.6",
11271109 "postcss": "^8.4.14",
1110+ "react": "^17.0.2",
1111+ "react-dom": "^17.0.2",
11281112 "tailwindcss": "^3.1.3"
11291113 }
11301114 },
@@ -1659,20 +1643,6 @@
16591643 "node": ">=12"
16601644 }
16611645 },
1662− "node_modules/markdoc": {
1663− "version": "0.1.3",
1664− "resolved": "https://registry.npmjs.org/markdoc/-/markdoc-0.1.3.tgz",
1665− "integrity": "sha512-4X9A4dcNv1EPcrKIAtpd+jgcn8J7x+qUaUEeDnu/InnZ02jBlOzjlOPTbNxDjh/POHxHFZckBbOiFhQ7V8mXiw==",
1666− "dependencies": {
1667− "node-markdown": ">=0.1.0"
1668− },
1669− "bin": {
1670− "markdoc": "bin.js"
1671− },
1672− "engines": {
1673− "node": "*"
1674− }
1675− },
16761646 "node_modules/merge-stream": {
16771647 "version": "2.0.0",
16781648 "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -1831,15 +1801,6 @@
18311801 "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
18321802 "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
18331803 },
1834− "node_modules/node-markdown": {
1835− "version": "0.1.1",
1836− "resolved": "https://registry.npmjs.org/node-markdown/-/node-markdown-0.1.1.tgz",
1837− "integrity": "sha512-1BN+BEA0IVhZWgjryNjzVSUbTxwbSFvdoAsOBk6ih6fDkdFBhMNoFgfD1r5ysrBsCD8JbO0ceSk9ml9ty4EdTA==",
1838− "deprecated": "highlight is deprecated in favor of \"highliht.js\"",
1839− "engines": {
1840− "node": "*"
1841− }
1842− },
18431804 "node_modules/node-releases": {
18441805 "version": "2.0.5",
18451806 "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",
@@ -2919,22 +2880,6 @@
29192880 }
29202881 },
29212882 "dependencies": {
2922− "@babel/polyfill": {
2923− "version": "7.12.1",
2924− "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.12.1.tgz",
2925− "integrity": "sha512-X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==",
2926− "requires": {
2927− "core-js": "^2.6.5",
2928− "regenerator-runtime": "^0.13.4"
2929− },
2930− "dependencies": {
2931− "core-js": {
2932− "version": "2.6.12",
2933− "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
2934− "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
2935− }
2936− }
2937− },
29382883 "@babel/runtime": {
29392884 "version": "7.18.3",
29402885 "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz",
@@ -2949,9 +2894,9 @@
29492894 "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="
29502895 },
29512896 "@markdoc/markdoc": {
2952− "version": "0.1.3",
2953− "resolved": "https://registry.npmjs.org/@markdoc/markdoc/-/markdoc-0.1.3.tgz",
2954− "integrity": "sha512-4n2cobUSeOob+237wZhpNiOEHCSfOydlQnKHTFdRY6ug/DupXGaxkkkszJYQxRftiMs8jmb10XvVO1svEYD43Q=="
2897+ "version": "0.1.2",
2898+ "resolved": "https://registry.npmjs.org/@markdoc/markdoc/-/markdoc-0.1.2.tgz",
2899+ "integrity": "sha512-3p+JTC1A0eqBdrl2UOIRoy+FLKtG1mh81R3Zzdm7FJiQIMt2mJmqmVQNDf3Md62G9rTtbj0ZuxlEattMbaslbw=="
29552900 },
29562901 "@next/env": {
29572902 "version": "12.1.6",
@@ -3239,9 +3184,9 @@
32393184 "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="
32403185 },
32413186 "caniuse-lite": {
3242− "version": "1.0.30001357",
3243− "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001357.tgz",
3244− "integrity": "sha512-b+KbWHdHePp+ZpNj+RDHFChZmuN+J5EvuQUlee9jOQIUAdhv9uvAZeEtUeLAknXbkiu1uxjQ9NLp1ie894CuWg=="
3187+ "version": "1.0.30001358",
3188+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz",
3189+ "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw=="
32453190 },
32463191 "chalk": {
32473192 "version": "2.4.2",
@@ -3435,9 +3380,9 @@
34353380 }
34363381 },
34373382 "electron-to-chromium": {
3438− "version": "1.4.162",
3439− "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.162.tgz",
3440− "integrity": "sha512-JrMk3tR2rnBojfAipp9nGh/vcWyBHeNsAVBqehtk4vq0o1bE4sVw19ICeidNx3u0i2yg4X8BvyUIM/yo2vO9aA=="
3383+ "version": "1.4.163",
3384+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.163.tgz",
3385+ "integrity": "sha512-c9q94pUVqIdc8hyr7jZDB4bNEoNF3QJ7y35lnddMD+mXtiv5GsL1bT/RmfW/KEOmvlNg5Oy1qioiy4tA7e864Q=="
34413386 },
34423387 "end-of-stream": {
34433388 "version": "1.4.4",
@@ -3611,14 +3556,12 @@
36113556 "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="
36123557 },
36133558 "foundation-design-system": {
3614− "version": "git+ssh://git@github.com/urbit/foundation-design-system.git#91ad7d92baead8128a4bdf8718299398865a76d7",
3559+ "version": "git+ssh://git@github.com/urbit/foundation-design-system.git#a31bcd08731d3b787e2739ebf740a7c6b5a278d2",
36153560 "from": "foundation-design-system@github:urbit/foundation-design-system",
36163561 "requires": {
3617− "@babel/polyfill": "^7.12.1",
3618− "@markdoc/markdoc": "^0.1.2",
3562+ "@markdoc/markdoc": "0.1.2",
36193563 "core-js": "^3.23.1",
36203564 "html-react-parser": "^1.4.14",
3621− "markdoc": "^0.1.3",
36223565 "patch-package": "^6.4.7",
36233566 "prism-react-renderer": "^1.3.3",
36243567 "prismjs": "^1.28.0"
@@ -4008,14 +3951,6 @@
40083951 "resolved": "https://registry.npmjs.org/luxon/-/luxon-2.4.0.tgz",
40093952 "integrity": "sha512-w+NAwWOUL5hO0SgwOHsMBAmZ15SoknmQXhSO0hIbJCAmPKSsGeK8MlmhYh2w6Iib38IxN2M+/ooXWLbeis7GuA=="
40103953 },
4011− "markdoc": {
4012− "version": "0.1.3",
4013− "resolved": "https://registry.npmjs.org/markdoc/-/markdoc-0.1.3.tgz",
4014− "integrity": "sha512-4X9A4dcNv1EPcrKIAtpd+jgcn8J7x+qUaUEeDnu/InnZ02jBlOzjlOPTbNxDjh/POHxHFZckBbOiFhQ7V8mXiw==",
4015− "requires": {
4016− "node-markdown": ">=0.1.0"
4017− }
4018− },
40193954 "merge-stream": {
40203955 "version": "2.0.0",
40213956 "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -4119,11 +4054,6 @@
41194054 "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
41204055 "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
41214056 },
4122− "node-markdown": {
4123− "version": "0.1.1",
4124− "resolved": "https://registry.npmjs.org/node-markdown/-/node-markdown-0.1.1.tgz",
4125− "integrity": "sha512-1BN+BEA0IVhZWgjryNjzVSUbTxwbSFvdoAsOBk6ih6fDkdFBhMNoFgfD1r5ysrBsCD8JbO0ceSk9ml9ty4EdTA=="
4126− },
41274057 "node-releases": {
41284058 "version": "2.0.5",
41294059 "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",
pages/404.js+1−3
@@ -1,10 +1,8 @@
11import Head from "next/head";
22import Meta from "../components/Meta";
3−import Container from "../components/Container";
4−import SingleColumn from "../components/SingleColumn";
3+import { Container, SingleColumn, Section } from "foundation-design-system";
54import Header from "../components/Header";
65import Footer from "../components/Footer";
7−import Section from "../components/Section";
86
97export default function NotFound(props) {
108 const post = {
pages/[slug].js+1−1
@@ -1,7 +1,7 @@
11import { getPostBySlug } from "../lib/lib";
22import BasicPage from "../components/BasicPage";
33import { getPostSlugs } from "../lib/lib";
4−import Markdown from "foundation-design-system";
4+import { Markdown } from "foundation-design-system";
55
66export default function Post({ post, markdown, search, index }) {
77 return (
pages/applications/[[...application]].js+6−4
@@ -3,11 +3,13 @@ import Link from "next/link";
33import { getPage } from "../../lib/lib";
44import { join } from "path";
55import CopyLink from "../../components/CopyLink";
6−import Container from "../../components/Container";
7−import SingleColumn from "../../components/SingleColumn";
8−import Section from "../../components/Section";
6+import {
7+ Container,
8+ SingleColumn,
9+ Section,
10+ Markdown,
11+} from "foundation-design-system";
912import ob from "urbit-ob";
10−import Markdown from "foundation-design-system";
1113import GatewayHeader from "../../components/gateway/GatewayHeader";
1214import Gateway404 from "../../components/gateway/Gateway404";
1315import MetadataBlock from "../../components/gateway/MetadataBlock";
pages/applications/submit.js+1−3
@@ -1,7 +1,5 @@
11import Link from "next/link";
2−import Container from "../../components/Container";
3−import Section from "../../components/Section";
4−import SingleColumn from "../../components/SingleColumn";
2+import { Container, Section, SingleColumn } from "foundation-design-system";
53import { useInputChange } from "../../lib/hooks";
64import Head from "next/head";
75import Meta from "../../components/Meta";
pages/blog.js+1−3
@@ -1,12 +1,10 @@
11import Head from "next/head";
22import Meta from "../components/Meta";
33import Link from "next/link";
4−import Container from "../components/Container";
4+import { Container, SingleColumn, Section } from "foundation-design-system";
55import Footer from "../components/Footer";
66import Header from "../components/Header";
7−import SingleColumn from "../components/SingleColumn";
87import BackgroundImage from "../components/BackgroundImage";
9−import Section from "../components/Section";
108import { getAllPosts, formatDate, generateDisplayDate } from "../lib/lib";
119import { contact } from "../lib/constants";
1210
pages/blog/[slug].js+6−4
@@ -11,15 +11,17 @@ import Head from "next/head";
1111import Link from "next/link";
1212import Meta from "../../components/Meta";
1313import ErrorPage from "../404";
14−import Container from "../../components/Container";
14+import {
15+ Container,
16+ Markdown,
17+ SingleColumn,
18+ Section,
19+} from "foundation-design-system";
1520import Header from "../../components/Header";
1621import Footer from "../../components/Footer";
17−import SingleColumn from "../../components/SingleColumn";
18−import Section from "../../components/Section";
1922import Contact from "../../components/Contact";
2023import PostPreview from "../../components/PostPreview";
2124import TwoUp from "../../components/TwoUp";
22−import Markdown from "foundation-design-system";
2325
2426export default function Post({
2527 post,
pages/community/[[...slug]].js+1−1
@@ -5,7 +5,7 @@ import classnames from "classnames";
55import { join } from "path";
66import { getPage } from "../../lib/lib";
77import Meta from "../../components/Meta";
8−import Markdown from "foundation-design-system";
8+import { Markdown } from "foundation-design-system";
99import ContentArea from "../../components/ContentArea";
1010import Sidebar from "../../components/Sidebar";
1111import communityTree from "../../cache/community.json";
pages/docs/[[...slug]].js+1−1
@@ -7,7 +7,7 @@ import { join } from "path";
77import { getPreviousPost, getNextPost, getPage } from "../../lib/lib";
88import Meta from "../../components/Meta";
99import Pagination from "../../components/Pagination";
10−import Markdown from "foundation-design-system";
10+import { Markdown } from "foundation-design-system";
1111import ContentArea from "../../components/ContentArea";
1212import Sidebar from "../../components/Sidebar";
1313import docsPageTree from "../../cache/docs.json";
pages/events.js+1−3
@@ -3,11 +3,9 @@ import Link from "next/link";
33import { DateTime } from "luxon";
44
55import Meta from "../components/Meta";
6−import Container from "../components/Container";
6+import { Container, SingleColumn, Section } from "foundation-design-system";
77import Footer from "../components/Footer";
88import Header from "../components/Header";
9−import SingleColumn from "../components/SingleColumn";
10−import Section from "../components/Section";
119import EventPreview from "../components/EventPreview";
1210import { contact } from "../lib/constants";
1311import { getAllEvents, generateRealtimeDate } from "../lib/lib";
pages/events/[slug].js+6−4
@@ -9,14 +9,16 @@ import {
99} from "../../lib/lib";
1010import Head from "next/head";
1111import Meta from "../../components/Meta";
12−import Container from "../../components/Container";
13−import Markdown from "foundation-design-system";
12+import {
13+ Container,
14+ Markdown,
15+ SingleColumn,
16+ Section,
17+} from "foundation-design-system";
1418import Header from "../../components/Header";
1519import Footer from "../../components/Footer";
16−import SingleColumn from "../../components/SingleColumn";
1720import Contact from "../../components/Contact";
1821import EventPreview from "../../components/EventPreview";
19−import Section from "../../components/Section";
2022import TwoUp from "../../components/TwoUp";
2123
2224import {
pages/getting-started/[[...slug]].js+1−1
@@ -5,7 +5,7 @@ import { useRouter } from "next/router";
55import classnames from "classnames";
66import { join } from "path";
77import { getPage } from "../../lib/lib";
8−import Markdown from "foundation-design-system";
8+import { Markdown } from "foundation-design-system";
99import ContentArea from "../../components/ContentArea";
1010import Sidebar from "../../components/Sidebar";
1111import GettingStartedTree from "../../cache/getting-started.json";
pages/grants.js+1−3
@@ -2,11 +2,9 @@ import Head from "next/head";
22import Meta from "../components/Meta";
33import Link from "next/link";
44import { useRouter } from "next/router";
5−import Container from "../components/Container";
5+import { Container, SingleColumn, Section } from "foundation-design-system";
66import Footer from "../components/Footer";
77import Header from "../components/Header";
8−import SingleColumn from "../components/SingleColumn";
9−import Section from "../components/Section";
108import GrantPreview from "../components/GrantPreview";
119import JoinGroup from "../components/JoinGroup";
1210import omit from "lodash.omit";
pages/grants/[slug].js+6−4
@@ -5,13 +5,15 @@ import Link from "next/link";
55import Meta from "../../components/Meta";
66import classnames from "classnames";
77import ErrorPage from "../404";
8−import Container from "../../components/Container";
9−import Markdown from "foundation-design-system";
8+import {
9+ Container,
10+ Markdown,
11+ SingleColumn,
12+ Section,
13+} from "foundation-design-system";
1014import Header from "../../components/Header";
1115import Footer from "../../components/Footer";
12−import SingleColumn from "../../components/SingleColumn";
1316import ob from "urbit-ob";
14−import Section from "../../components/Section";
1517import { DateTime } from "luxon";
1618
1719export default function Grant({ post, markdown, search }) {
pages/grants/apprenticeships.js+1−1
@@ -1,6 +1,6 @@
11import { getPostBySlug } from "../../lib/lib";
22import GrantProgramOverview from "../../components/GrantProgramOverview";
3−import Markdown from "foundation-design-system";
3+import { Markdown } from "foundation-design-system";
44
55export default function Post({ post, markdown, search }) {
66 return (
pages/grants/bounties.js+1−1
@@ -1,6 +1,6 @@
11import { getPostBySlug } from "../../lib/lib";
22import GrantProgramOverview from "../../components/GrantProgramOverview";
3−import Markdown from "foundation-design-system";
3+import { Markdown } from "foundation-design-system";
44
55export default function Post({ post, markdown, search }) {
66 return (
pages/grants/proposals.js+1−1
@@ -1,6 +1,6 @@
11import { getPostBySlug } from "../../lib/lib";
22import GrantProgramOverview from "../../components/GrantProgramOverview";
3−import Markdown from "foundation-design-system";
3+import { Markdown } from "foundation-design-system";
44
55export default function Post({ post, markdown, search }) {
66 return (
pages/groups/[[...group]].js+6−4
@@ -3,11 +3,13 @@ import Link from "next/link";
33import { getPage } from "../../lib/lib";
44import { join } from "path";
55import CopyLink from "../../components/CopyLink";
6−import Container from "../../components/Container";
7−import SingleColumn from "../../components/SingleColumn";
8−import Section from "../../components/Section";
6+import {
7+ Container,
8+ SingleColumn,
9+ Section,
10+ Markdown,
11+} from "foundation-design-system";
912import ob from "urbit-ob";
10−import Markdown from "foundation-design-system";
1113import GatewayHeader from "../../components/gateway/GatewayHeader";
1214import Gateway404 from "../../components/gateway/Gateway404";
1315import MetadataBlock from "../../components/gateway/MetadataBlock";
pages/groups/submit.js+1−3
@@ -1,8 +1,6 @@
11import Link from "next/link";
22import { useState } from "react";
3−import Container from "../../components/Container";
4−import Section from "../../components/Section";
5−import SingleColumn from "../../components/SingleColumn";
3+import { Container, Section, SingleColumn } from "foundation-design-system";
64import { useInputChange } from "../../lib/hooks";
75import Head from "next/head";
86import Meta from "../../components/Meta";
pages/ids/[id].js+6−4
@@ -2,9 +2,12 @@ import Head from "next/head";
22import Link from "next/link";
33import { getPage, getAllPosts } from "../../lib/lib";
44import { join } from "path";
5−import Container from "../../components/Container";
6−import SingleColumn from "../../components/SingleColumn";
7−import Section from "../../components/Section";
5+import {
6+ Container,
7+ SingleColumn,
8+ Section,
9+ Markdown,
10+} from "foundation-design-system";
811import ob from "urbit-ob";
912import ResourceCard from "../../components/gateway/ResourceCard";
1013import GatewayHeader from "../../components/gateway/GatewayHeader";
@@ -13,7 +16,6 @@ import MetadataBlock from "../../components/gateway/MetadataBlock";
1316import MetadataLink from "../../components/gateway/MetadataLink";
1417import Description from "../../components/gateway/Description";
1518import axios from "axios";
16−import Markdown from "foundation-design-system";
1719
1820const IdPage = ({ data, markdown, applications, groups, network, params }) => {
1921 let { id } = params;
pages/ids/submit.js+1−3
@@ -1,7 +1,5 @@
11import Link from "next/link";
2−import Container from "../../components/Container";
3−import Section from "../../components/Section";
4−import SingleColumn from "../../components/SingleColumn";
2+import { Container, SingleColumn, Section } from "foundation-design-system";
53import { useInputChange } from "../../lib/hooks";
64import ob from "urbit-ob";
75import Sigil from "../../components/Sigil";
pages/index.js+1−3
@@ -3,9 +3,7 @@ import Link from "next/link";
33import React from "react";
44import { DateTime } from "luxon";
55
6−import Container from "../components/Container";
7−import Section from "../components/Section";
8−import SingleColumn from "../components/SingleColumn";
6+import { Container, Section, SingleColumn } from "foundation-design-system";
97import Header from "../components/Header";
108import Footer from "../components/Footer";
119import Contact from "../components/Contact";
pages/media.js+1−3
@@ -1,11 +1,9 @@
11import Head from "next/head";
22import Link from "next/link";
33import Meta from "../components/Meta";
4−import Container from "../components/Container";
4+import { Container, SingleColumn, Section } from "foundation-design-system";
55import Footer from "../components/Footer";
66import Header from "../components/Header";
7−import SingleColumn from "../components/SingleColumn";
8−import Section from "../components/Section";
97import { getAllPosts } from "../lib/lib";
108
119export function MediaPreview({ event, dir, className }) {
pages/media/[slug].js+6−4
@@ -9,13 +9,15 @@ import Head from "next/head";
99import Link from "next/link";
1010import Meta from "../../components/Meta";
1111import ErrorPage from "../404";
12−import Container from "../../components/Container";
13−import Markdown from "foundation-design-system";
12+import {
13+ Container,
14+ Markdown,
15+ SingleColumn,
16+ Section,
17+} from "foundation-design-system";
1418import Header from "../../components/Header";
1519import Footer from "../../components/Footer";
16−import SingleColumn from "../../components/SingleColumn";
1720import Contact from "../../components/Contact";
18−import Section from "../../components/Section";
1921
2022export default function MediaPage({ post, markdown, search }) {
2123 const router = useRouter();
pages/understanding-urbit/[[...slug]].js+1−1
@@ -5,7 +5,7 @@ import { useRouter } from "next/router";
55import classnames from "classnames";
66import { join } from "path";
77import { getPage, getPreviousPost, getNextPost } from "../../lib/lib";
8−import Markdown from "foundation-design-system";
8+import { Markdown } from "foundation-design-system";
99import ContentArea from "../../components/ContentArea";
1010import Sidebar from "../../components/Sidebar";
1111import Pagination from "../../components/Pagination";
pages/updates.js+1−3
@@ -1,11 +1,9 @@
11import Head from "next/head";
22import Meta from "../components/Meta";
33import Link from "next/link";
4−import Container from "../components/Container";
4+import { Container, SingleColumn, Section } from "foundation-design-system";
55import Footer from "../components/Footer";
66import Header from "../components/Header";
7−import SingleColumn from "../components/SingleColumn";
8−import Section from "../components/Section";
97import { getAllPosts, formatDate, generateDisplayDate } from "../lib/lib";
108
119export default function Updates({ posts, search }) {
pages/updates/[slug].js+6−4
@@ -10,12 +10,14 @@ import {
1010import Head from "next/head";
1111import Meta from "../../components/Meta";
1212import ErrorPage from "../404";
13−import Container from "../../components/Container";
14−import Markdown from "foundation-design-system";
13+import {
14+ Container,
15+ Markdown,
16+ SingleColumn,
17+ Section,
18+} from "foundation-design-system";
1519import Header from "../../components/Header";
1620import Footer from "../../components/Footer";
17−import SingleColumn from "../../components/SingleColumn";
18−import Section from "../../components/Section";
1921import Contact from "../../components/Contact";
2022
2123export default function Post({ post, markdown, search }) {
pages/using/[[...slug]].js+1−1
@@ -6,7 +6,7 @@ import { useState } from "react";
66import classnames from "classnames";
77import { join } from "path";
88import { getPage } from "../../lib/lib";
9−import Markdown from "foundation-design-system";
9+import { Markdown } from "foundation-design-system";
1010import ContentArea from "../../components/ContentArea";
1111import Sidebar from "../../components/Sidebar";
1212import UsingTree from "../../cache/using.json";