332f89e · urbit.org · git.iko.soy

components/BasicPage.js+6−4

compare with master

unifiedsplit

@@ -2,12 +2,14 @@ import { useRouter } from "next/router";

2import Head from "next/head";

3import Meta from "../components/Meta";

4import ErrorPage from "../pages/404";

5+import {

5−import Container from "./Container";

6+ Container,

7+ SingleColumn,

8+ Section,

9+ Markdown,

10+} from "foundation-design-system";

6import Header from "./Header";

11import Header from "./Header";

7import Footer from "./Footer";

12import Footer from "./Footer";

8−import SingleColumn from "./SingleColumn";

9−import Section from "./Section";

10−import Markdown from "foundation-design-system";

11import classNames from "classnames";

13import classNames from "classnames";

12import { TableOfContents } from "./TableOfContents";

14import { TableOfContents } from "./TableOfContents";

13

15

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";

2import { useState, useEffect, useRef } from "react";

3import { useRouter } from "next/router";

4import { TableOfContents } from "./TableOfContents";

components/Footer.js+3−131

@@ -1,134 +1,6 @@

1−import Link from "next/link";

1+import { Footer as FooterComponent } from "foundation-design-system";

2−import SingleColumn from "./SingleColumn";

3−import Section from "./Section";

4−import { contact } from "../lib/constants";

2+import { footerData } from "../lib/constants";

5

3

6export default function Footer() {

4export default function Footer() {

7− return (

5+ return <FooterComponent data={footerData} />;

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− );

134}

6}

components/GrantProgramOverview.js+6−4

@@ -4,13 +4,15 @@ import Link from "next/link";

4import Head from "next/head";

5import Meta from "../components/Meta";

6import ErrorPage from "../pages/404";

7+import {

7−import Container from "./Container";

8+ Container,

9+ Section,

10+ SingleColumn,

11+ Markdown,

12+} from "foundation-design-system";

8import Header from "./Header";

13import Header from "./Header";

9import Footer from "./Footer";

14import Footer from "./Footer";

10−import SingleColumn from "./SingleColumn";

11−import Section from "./Section";

12import { DateTime } from "luxon";

15import { DateTime } from "luxon";

13−import Markdown from "foundation-design-system";

14

16

15export default function GrantProgramOverview({

17export default function GrantProgramOverview({

16 post,

18 post,

components/Header.js−2

@@ -2,9 +2,7 @@ import Link from "next/link";

2import { useRouter } from "next/router";

3import { useState, useEffect } from "react";

4import classnames from "classnames";

5−import path from "path";

6import MenuTray from "../components/MenuTray";

5import MenuTray from "../components/MenuTray";

7−import Section from "../components/Section";

8import { capitalize } from "../lib/lib";

6import { capitalize } from "../lib/lib";

9

7

10function ActiveLink({ children, href, className, currentPath }) {

8function 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";

2

3const Description = ({ description, fallback, markdown }) => {

4 return (

components/gateway/Gateway404.js+1−3

@@ -1,7 +1,5 @@

1import GatewayHeader from "./GatewayHeader";

2−import Container from "../Container";

2+import { Container, SingleColumn, Section } from "foundation-design-system";

3−import SingleColumn from "../SingleColumn";

4−import Section from "../Section";

5import Link from "next/link";

3import Link from "next/link";

6

4

7const Gateway404 = ({ type }) => {

5const Gateway404 = ({ type }) => {

lib/constants.js+83

@@ -63,3 +63,86 @@ export const updatesKeys = [

63 "author",

64 "ship",

65];

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 @@

43 "tailwindcss": "^3.0.24"

44 }

45 },

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− },

63 "node_modules/@babel/runtime": {

46 "node_modules/@babel/runtime": {

64 "version": "7.18.3",

47 "version": "7.18.3",

65 "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz",

48 "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz",

@@ -77,9 +60,9 @@

77 "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="

60 "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="

78 },

61 },

79 "node_modules/@markdoc/markdoc": {

62 "node_modules/@markdoc/markdoc": {

80− "version": "0.1.3",

63+ "version": "0.1.2",

81− "resolved": "https://registry.npmjs.org/@markdoc/markdoc/-/markdoc-0.1.3.tgz",

64+ "resolved": "https://registry.npmjs.org/@markdoc/markdoc/-/markdoc-0.1.2.tgz",

82− "integrity": "sha512-4n2cobUSeOob+237wZhpNiOEHCSfOydlQnKHTFdRY6ug/DupXGaxkkkszJYQxRftiMs8jmb10XvVO1svEYD43Q==",

65+ "integrity": "sha512-3p+JTC1A0eqBdrl2UOIRoy+FLKtG1mh81R3Zzdm7FJiQIMt2mJmqmVQNDf3Md62G9rTtbj0ZuxlEattMbaslbw==",

83 "engines": {

66 "engines": {

84 "node": ">=14.7.0"

67 "node": ">=14.7.0"

85 }

68 }

@@ -590,9 +573,9 @@

590 }

573 }

591 },

574 },

592 "node_modules/caniuse-lite": {

575 "node_modules/caniuse-lite": {

593− "version": "1.0.30001357",

576+ "version": "1.0.30001358",

594− "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001357.tgz",

577+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz",

595− "integrity": "sha512-b+KbWHdHePp+ZpNj+RDHFChZmuN+J5EvuQUlee9jOQIUAdhv9uvAZeEtUeLAknXbkiu1uxjQ9NLp1ie894CuWg==",

578+ "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw==",

596 "funding": [

579 "funding": [

597 {

580 {

598 "type": "opencollective",

581 "type": "opencollective",

@@ -860,9 +843,9 @@

860 }

843 }

861 },

844 },

862 "node_modules/electron-to-chromium": {

845 "node_modules/electron-to-chromium": {

863− "version": "1.4.162",

846+ "version": "1.4.163",

864− "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.162.tgz",

847+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.163.tgz",

865− "integrity": "sha512-JrMk3tR2rnBojfAipp9nGh/vcWyBHeNsAVBqehtk4vq0o1bE4sVw19ICeidNx3u0i2yg4X8BvyUIM/yo2vO9aA=="

848+ "integrity": "sha512-c9q94pUVqIdc8hyr7jZDB4bNEoNF3QJ7y35lnddMD+mXtiv5GsL1bT/RmfW/KEOmvlNg5Oy1qioiy4tA7e864Q=="

866 },

849 },

867 "node_modules/end-of-stream": {

850 "node_modules/end-of-stream": {

868 "version": "1.4.4",

851 "version": "1.4.4",

@@ -1108,14 +1091,12 @@

1108 },

1091 },

1109 "node_modules/foundation-design-system": {

1092 "node_modules/foundation-design-system": {

1110 "version": "0.0.0",

1093 "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",

1112 "license": "MIT",

1095 "license": "MIT",

1113 "dependencies": {

1096 "dependencies": {

1114− "@babel/polyfill": "^7.12.1",

1115− "@markdoc/markdoc": "^0.1.2",

1097+ "@markdoc/markdoc": "0.1.2",

1116 "core-js": "^3.23.1",

1098 "core-js": "^3.23.1",

1117 "html-react-parser": "^1.4.14",

1099 "html-react-parser": "^1.4.14",

1118− "markdoc": "^0.1.3",

1119 "patch-package": "^6.4.7",

1100 "patch-package": "^6.4.7",

1120 "prism-react-renderer": "^1.3.3",

1101 "prism-react-renderer": "^1.3.3",

1121 "prismjs": "^1.28.0"

1102 "prismjs": "^1.28.0"

@@ -1123,8 +1104,11 @@

1123 "peerDependencies": {

1104 "peerDependencies": {

1124 "@tailwindcss/aspect-ratio": "^0.4.0",

1105 "@tailwindcss/aspect-ratio": "^0.4.0",

1125 "autoprefixer": "^10.4.7",

1106 "autoprefixer": "^10.4.7",

1107+ "classnames": "^2.3.1",

1126 "next": "^12.1.6",

1108 "next": "^12.1.6",

1127 "postcss": "^8.4.14",

1109 "postcss": "^8.4.14",

1110+ "react": "^17.0.2",

1111+ "react-dom": "^17.0.2",

1128 "tailwindcss": "^3.1.3"

1112 "tailwindcss": "^3.1.3"

1129 }

1113 }

1130 },

1114 },

@@ -1659,20 +1643,6 @@

1659 "node": ">=12"

1643 "node": ">=12"

1660 }

1644 }

1661 },

1645 },

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− },

1676 "node_modules/merge-stream": {

1646 "node_modules/merge-stream": {

1677 "version": "2.0.0",

1647 "version": "2.0.0",

1678 "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",

1648 "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",

@@ -1831,15 +1801,6 @@

1831 "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",

1801 "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",

1832 "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="

1802 "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="

1833 },

1803 },

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− },

1843 "node_modules/node-releases": {

1804 "node_modules/node-releases": {

1844 "version": "2.0.5",

1805 "version": "2.0.5",

1845 "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",

1806 "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",

@@ -2919,22 +2880,6 @@

2919 }

2880 }

2920 },

2881 },

2921 "dependencies": {

2882 "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− },

2938 "@babel/runtime": {

2883 "@babel/runtime": {

2939 "version": "7.18.3",

2884 "version": "7.18.3",

2940 "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz",

2885 "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.18.3.tgz",

@@ -2949,9 +2894,9 @@

2949 "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="

2894 "integrity": "sha512-trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="

2950 },

2895 },

2951 "@markdoc/markdoc": {

2896 "@markdoc/markdoc": {

2952− "version": "0.1.3",

2897+ "version": "0.1.2",

2953− "resolved": "https://registry.npmjs.org/@markdoc/markdoc/-/markdoc-0.1.3.tgz",

2898+ "resolved": "https://registry.npmjs.org/@markdoc/markdoc/-/markdoc-0.1.2.tgz",

2954− "integrity": "sha512-4n2cobUSeOob+237wZhpNiOEHCSfOydlQnKHTFdRY6ug/DupXGaxkkkszJYQxRftiMs8jmb10XvVO1svEYD43Q=="

2899+ "integrity": "sha512-3p+JTC1A0eqBdrl2UOIRoy+FLKtG1mh81R3Zzdm7FJiQIMt2mJmqmVQNDf3Md62G9rTtbj0ZuxlEattMbaslbw=="

2955 },

2900 },

2956 "@next/env": {

2901 "@next/env": {

2957 "version": "12.1.6",

2902 "version": "12.1.6",

@@ -3239,9 +3184,9 @@

3239 "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="

3184 "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA=="

3240 },

3185 },

3241 "caniuse-lite": {

3186 "caniuse-lite": {

3242− "version": "1.0.30001357",

3187+ "version": "1.0.30001358",

3243− "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001357.tgz",

3188+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001358.tgz",

3244− "integrity": "sha512-b+KbWHdHePp+ZpNj+RDHFChZmuN+J5EvuQUlee9jOQIUAdhv9uvAZeEtUeLAknXbkiu1uxjQ9NLp1ie894CuWg=="

3189+ "integrity": "sha512-hvp8PSRymk85R20bsDra7ZTCpSVGN/PAz9pSAjPSjKC+rNmnUk5vCRgJwiTT/O4feQ/yu/drvZYpKxxhbFuChw=="

3245 },

3190 },

3246 "chalk": {

3191 "chalk": {

3247 "version": "2.4.2",

3192 "version": "2.4.2",

@@ -3435,9 +3380,9 @@

3435 }

3380 }

3436 },

3381 },

3437 "electron-to-chromium": {

3382 "electron-to-chromium": {

3438− "version": "1.4.162",

3383+ "version": "1.4.163",

3439− "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.162.tgz",

3384+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.163.tgz",

3440− "integrity": "sha512-JrMk3tR2rnBojfAipp9nGh/vcWyBHeNsAVBqehtk4vq0o1bE4sVw19ICeidNx3u0i2yg4X8BvyUIM/yo2vO9aA=="

3385+ "integrity": "sha512-c9q94pUVqIdc8hyr7jZDB4bNEoNF3QJ7y35lnddMD+mXtiv5GsL1bT/RmfW/KEOmvlNg5Oy1qioiy4tA7e864Q=="

3441 },

3386 },

3442 "end-of-stream": {

3387 "end-of-stream": {

3443 "version": "1.4.4",

3388 "version": "1.4.4",

@@ -3611,14 +3556,12 @@

3611 "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="

3556 "integrity": "sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA=="

3612 },

3557 },

3613 "foundation-design-system": {

3558 "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",

3615 "from": "foundation-design-system@github:urbit/foundation-design-system",

3560 "from": "foundation-design-system@github:urbit/foundation-design-system",

3616 "requires": {

3561 "requires": {

3617− "@babel/polyfill": "^7.12.1",

3618− "@markdoc/markdoc": "^0.1.2",

3562+ "@markdoc/markdoc": "0.1.2",

3619 "core-js": "^3.23.1",

3563 "core-js": "^3.23.1",

3620 "html-react-parser": "^1.4.14",

3564 "html-react-parser": "^1.4.14",

3621− "markdoc": "^0.1.3",

3622 "patch-package": "^6.4.7",

3565 "patch-package": "^6.4.7",

3623 "prism-react-renderer": "^1.3.3",

3566 "prism-react-renderer": "^1.3.3",

3624 "prismjs": "^1.28.0"

3567 "prismjs": "^1.28.0"

@@ -4008,14 +3951,6 @@

4008 "resolved": "https://registry.npmjs.org/luxon/-/luxon-2.4.0.tgz",

3951 "resolved": "https://registry.npmjs.org/luxon/-/luxon-2.4.0.tgz",

4009 "integrity": "sha512-w+NAwWOUL5hO0SgwOHsMBAmZ15SoknmQXhSO0hIbJCAmPKSsGeK8MlmhYh2w6Iib38IxN2M+/ooXWLbeis7GuA=="

3952 "integrity": "sha512-w+NAwWOUL5hO0SgwOHsMBAmZ15SoknmQXhSO0hIbJCAmPKSsGeK8MlmhYh2w6Iib38IxN2M+/ooXWLbeis7GuA=="

4010 },

3953 },

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− },

4019 "merge-stream": {

3954 "merge-stream": {

4020 "version": "2.0.0",

3955 "version": "2.0.0",

4021 "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",

3956 "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",

@@ -4119,11 +4054,6 @@

4119 "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",

4054 "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",

4120 "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="

4055 "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="

4121 },

4056 },

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− },

4127 "node-releases": {

4057 "node-releases": {

4128 "version": "2.0.5",

4058 "version": "2.0.5",

4129 "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",

4059 "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",

pages/404.js+1−3

@@ -1,10 +1,8 @@

1import Head from "next/head";

2import Meta from "../components/Meta";

3−import Container from "../components/Container";

3+import { Container, SingleColumn, Section } from "foundation-design-system";

4−import SingleColumn from "../components/SingleColumn";

5import Header from "../components/Header";

4import Header from "../components/Header";

6import Footer from "../components/Footer";

5import Footer from "../components/Footer";

7−import Section from "../components/Section";

8

6

9export default function NotFound(props) {

7export default function NotFound(props) {

10 const post = {

8 const post = {

pages/[slug].js+1−1

@@ -1,7 +1,7 @@

1import { getPostBySlug } from "../lib/lib";

2import BasicPage from "../components/BasicPage";

3import { getPostSlugs } from "../lib/lib";

4−import Markdown from "foundation-design-system";

4+import { Markdown } from "foundation-design-system";

5

6export default function Post({ post, markdown, search, index }) {

7 return (

pages/applications/[[...application]].js+6−4

@@ -3,11 +3,13 @@ import Link from "next/link";

3import { getPage } from "../../lib/lib";

4import { join } from "path";

5import CopyLink from "../../components/CopyLink";

6−import Container from "../../components/Container";

6+import {

7+ Container,

7−import SingleColumn from "../../components/SingleColumn";

8+ SingleColumn,

8−import Section from "../../components/Section";

9+ Section,

10+ Markdown,

11+} from "foundation-design-system";

9import ob from "urbit-ob";

12import ob from "urbit-ob";

10−import Markdown from "foundation-design-system";

11import GatewayHeader from "../../components/gateway/GatewayHeader";

13import GatewayHeader from "../../components/gateway/GatewayHeader";

12import Gateway404 from "../../components/gateway/Gateway404";

14import Gateway404 from "../../components/gateway/Gateway404";

13import MetadataBlock from "../../components/gateway/MetadataBlock";

15import MetadataBlock from "../../components/gateway/MetadataBlock";

pages/applications/submit.js+1−3

@@ -1,7 +1,5 @@

1import Link from "next/link";

2−import Container from "../../components/Container";

2+import { Container, Section, SingleColumn } from "foundation-design-system";

3−import Section from "../../components/Section";

4−import SingleColumn from "../../components/SingleColumn";

5import { useInputChange } from "../../lib/hooks";

3import { useInputChange } from "../../lib/hooks";

6import Head from "next/head";

4import Head from "next/head";

7import Meta from "../../components/Meta";

5import Meta from "../../components/Meta";

pages/blog.js+1−3

@@ -1,12 +1,10 @@

1import Head from "next/head";

2import Meta from "../components/Meta";

3import Link from "next/link";

4−import Container from "../components/Container";

4+import { Container, SingleColumn, Section } from "foundation-design-system";

5import Footer from "../components/Footer";

6import Header from "../components/Header";

7−import SingleColumn from "../components/SingleColumn";

8import BackgroundImage from "../components/BackgroundImage";

7import BackgroundImage from "../components/BackgroundImage";

9−import Section from "../components/Section";

10import { getAllPosts, formatDate, generateDisplayDate } from "../lib/lib";

8import { getAllPosts, formatDate, generateDisplayDate } from "../lib/lib";

11import { contact } from "../lib/constants";

9import { contact } from "../lib/constants";

12

10

pages/blog/[slug].js+6−4

@@ -11,15 +11,17 @@ import Head from "next/head";

11import Link from "next/link";

12import Meta from "../../components/Meta";

13import ErrorPage from "../404";

14−import Container from "../../components/Container";

14+import {

15+ Container,

16+ Markdown,

17+ SingleColumn,

18+ Section,

19+} from "foundation-design-system";

15import Header from "../../components/Header";

20import Header from "../../components/Header";

16import Footer from "../../components/Footer";

21import Footer from "../../components/Footer";

17−import SingleColumn from "../../components/SingleColumn";

18−import Section from "../../components/Section";

19import Contact from "../../components/Contact";

22import Contact from "../../components/Contact";

20import PostPreview from "../../components/PostPreview";

23import PostPreview from "../../components/PostPreview";

21import TwoUp from "../../components/TwoUp";

24import TwoUp from "../../components/TwoUp";

22−import Markdown from "foundation-design-system";

23

25

24export default function Post({

26export default function Post({

25 post,

27 post,

pages/community/[[...slug]].js+1−1

@@ -5,7 +5,7 @@ import classnames from "classnames";

5import { join } from "path";

6import { getPage } from "../../lib/lib";

7import Meta from "../../components/Meta";

8−import Markdown from "foundation-design-system";

8+import { Markdown } from "foundation-design-system";

9import ContentArea from "../../components/ContentArea";

10import Sidebar from "../../components/Sidebar";

11import communityTree from "../../cache/community.json";

pages/docs/[[...slug]].js+1−1

@@ -7,7 +7,7 @@ import { join } from "path";

7import { getPreviousPost, getNextPost, getPage } from "../../lib/lib";

8import Meta from "../../components/Meta";

9import Pagination from "../../components/Pagination";

10−import Markdown from "foundation-design-system";

10+import { Markdown } from "foundation-design-system";

11import ContentArea from "../../components/ContentArea";

12import Sidebar from "../../components/Sidebar";

13import docsPageTree from "../../cache/docs.json";

pages/events.js+1−3

@@ -3,11 +3,9 @@ import Link from "next/link";

3import { DateTime } from "luxon";

4

5import Meta from "../components/Meta";

6−import Container from "../components/Container";

6+import { Container, SingleColumn, Section } from "foundation-design-system";

7import Footer from "../components/Footer";

8import Header from "../components/Header";

9−import SingleColumn from "../components/SingleColumn";

10−import Section from "../components/Section";

11import EventPreview from "../components/EventPreview";

9import EventPreview from "../components/EventPreview";

12import { contact } from "../lib/constants";

10import { contact } from "../lib/constants";

13import { getAllEvents, generateRealtimeDate } from "../lib/lib";

11import { getAllEvents, generateRealtimeDate } from "../lib/lib";

pages/events/[slug].js+6−4

@@ -9,14 +9,16 @@ import {

9} from "../../lib/lib";

10import Head from "next/head";

11import Meta from "../../components/Meta";

12−import Container from "../../components/Container";

12+import {

13+ Container,

14+ Markdown,

15+ SingleColumn,

16+ Section,

13−import Markdown from "foundation-design-system";

17+} from "foundation-design-system";

14import Header from "../../components/Header";

18import Header from "../../components/Header";

15import Footer from "../../components/Footer";

19import Footer from "../../components/Footer";

16−import SingleColumn from "../../components/SingleColumn";

17import Contact from "../../components/Contact";

20import Contact from "../../components/Contact";

18import EventPreview from "../../components/EventPreview";

21import EventPreview from "../../components/EventPreview";

19−import Section from "../../components/Section";

20import TwoUp from "../../components/TwoUp";

22import TwoUp from "../../components/TwoUp";

21

23

22import {

24import {

pages/getting-started/[[...slug]].js+1−1

@@ -5,7 +5,7 @@ import { useRouter } from "next/router";

5import classnames from "classnames";

6import { join } from "path";

7import { getPage } from "../../lib/lib";

8−import Markdown from "foundation-design-system";

8+import { Markdown } from "foundation-design-system";

9import ContentArea from "../../components/ContentArea";

10import Sidebar from "../../components/Sidebar";

11import GettingStartedTree from "../../cache/getting-started.json";

pages/grants.js+1−3

@@ -2,11 +2,9 @@ import Head from "next/head";

2import Meta from "../components/Meta";

3import Link from "next/link";

4import { useRouter } from "next/router";

5−import Container from "../components/Container";

5+import { Container, SingleColumn, Section } from "foundation-design-system";

6import Footer from "../components/Footer";

7import Header from "../components/Header";

8−import SingleColumn from "../components/SingleColumn";

9−import Section from "../components/Section";

10import GrantPreview from "../components/GrantPreview";

8import GrantPreview from "../components/GrantPreview";

11import JoinGroup from "../components/JoinGroup";

9import JoinGroup from "../components/JoinGroup";

12import omit from "lodash.omit";

10import omit from "lodash.omit";

pages/grants/[slug].js+6−4

@@ -5,13 +5,15 @@ import Link from "next/link";

5import Meta from "../../components/Meta";

6import classnames from "classnames";

7import ErrorPage from "../404";

8−import Container from "../../components/Container";

8+import {

9+ Container,

10+ Markdown,

11+ SingleColumn,

12+ Section,

9−import Markdown from "foundation-design-system";

13+} from "foundation-design-system";

10import Header from "../../components/Header";

14import Header from "../../components/Header";

11import Footer from "../../components/Footer";

15import Footer from "../../components/Footer";

12−import SingleColumn from "../../components/SingleColumn";

13import ob from "urbit-ob";

16import ob from "urbit-ob";

14−import Section from "../../components/Section";

15import { DateTime } from "luxon";

17import { DateTime } from "luxon";

16

18

17export default function Grant({ post, markdown, search }) {

19export default function Grant({ post, markdown, search }) {

pages/grants/apprenticeships.js+1−1

@@ -1,6 +1,6 @@

1import { getPostBySlug } from "../../lib/lib";

2import GrantProgramOverview from "../../components/GrantProgramOverview";

3−import Markdown from "foundation-design-system";

3+import { Markdown } from "foundation-design-system";

4

5export default function Post({ post, markdown, search }) {

6 return (

pages/grants/bounties.js+1−1

@@ -1,6 +1,6 @@

1import { getPostBySlug } from "../../lib/lib";

2import GrantProgramOverview from "../../components/GrantProgramOverview";

3−import Markdown from "foundation-design-system";

3+import { Markdown } from "foundation-design-system";

4

5export default function Post({ post, markdown, search }) {

6 return (

pages/grants/proposals.js+1−1

@@ -1,6 +1,6 @@

1import { getPostBySlug } from "../../lib/lib";

2import GrantProgramOverview from "../../components/GrantProgramOverview";

3−import Markdown from "foundation-design-system";

3+import { Markdown } from "foundation-design-system";

4

5export default function Post({ post, markdown, search }) {

6 return (

pages/groups/[[...group]].js+6−4

@@ -3,11 +3,13 @@ import Link from "next/link";

3import { getPage } from "../../lib/lib";

4import { join } from "path";

5import CopyLink from "../../components/CopyLink";

6−import Container from "../../components/Container";

6+import {

7+ Container,

7−import SingleColumn from "../../components/SingleColumn";

8+ SingleColumn,

8−import Section from "../../components/Section";

9+ Section,

10+ Markdown,

11+} from "foundation-design-system";

9import ob from "urbit-ob";

12import ob from "urbit-ob";

10−import Markdown from "foundation-design-system";

11import GatewayHeader from "../../components/gateway/GatewayHeader";

13import GatewayHeader from "../../components/gateway/GatewayHeader";

12import Gateway404 from "../../components/gateway/Gateway404";

14import Gateway404 from "../../components/gateway/Gateway404";

13import MetadataBlock from "../../components/gateway/MetadataBlock";

15import MetadataBlock from "../../components/gateway/MetadataBlock";

pages/groups/submit.js+1−3

@@ -1,8 +1,6 @@

1import Link from "next/link";

2import { useState } from "react";

3−import Container from "../../components/Container";

3+import { Container, Section, SingleColumn } from "foundation-design-system";

4−import Section from "../../components/Section";

5−import SingleColumn from "../../components/SingleColumn";

6import { useInputChange } from "../../lib/hooks";

4import { useInputChange } from "../../lib/hooks";

7import Head from "next/head";

5import Head from "next/head";

8import Meta from "../../components/Meta";

6import Meta from "../../components/Meta";

pages/ids/[id].js+6−4

@@ -2,9 +2,12 @@ import Head from "next/head";

2import Link from "next/link";

3import { getPage, getAllPosts } from "../../lib/lib";

4import { join } from "path";

5−import Container from "../../components/Container";

5+import {

6+ Container,

6−import SingleColumn from "../../components/SingleColumn";

7+ SingleColumn,

7−import Section from "../../components/Section";

8+ Section,

9+ Markdown,

10+} from "foundation-design-system";

8import ob from "urbit-ob";

11import ob from "urbit-ob";

9import ResourceCard from "../../components/gateway/ResourceCard";

12import ResourceCard from "../../components/gateway/ResourceCard";

10import GatewayHeader from "../../components/gateway/GatewayHeader";

13import GatewayHeader from "../../components/gateway/GatewayHeader";

@@ -13,7 +16,6 @@ import MetadataBlock from "../../components/gateway/MetadataBlock";

13import MetadataLink from "../../components/gateway/MetadataLink";

16import MetadataLink from "../../components/gateway/MetadataLink";

14import Description from "../../components/gateway/Description";

17import Description from "../../components/gateway/Description";

15import axios from "axios";

18import axios from "axios";

16−import Markdown from "foundation-design-system";

17

19

18const IdPage = ({ data, markdown, applications, groups, network, params }) => {

20const IdPage = ({ data, markdown, applications, groups, network, params }) => {

19 let { id } = params;

21 let { id } = params;

pages/ids/submit.js+1−3

@@ -1,7 +1,5 @@

1import Link from "next/link";

2−import Container from "../../components/Container";

2+import { Container, SingleColumn, Section } from "foundation-design-system";

3−import Section from "../../components/Section";

4−import SingleColumn from "../../components/SingleColumn";

5import { useInputChange } from "../../lib/hooks";

3import { useInputChange } from "../../lib/hooks";

6import ob from "urbit-ob";

4import ob from "urbit-ob";

7import Sigil from "../../components/Sigil";

5import Sigil from "../../components/Sigil";

pages/index.js+1−3

@@ -3,9 +3,7 @@ import Link from "next/link";

3import React from "react";

4import { DateTime } from "luxon";

5

6−import Container from "../components/Container";

6+import { Container, Section, SingleColumn } from "foundation-design-system";

7−import Section from "../components/Section";

8−import SingleColumn from "../components/SingleColumn";

9import Header from "../components/Header";

7import Header from "../components/Header";

10import Footer from "../components/Footer";

8import Footer from "../components/Footer";

11import Contact from "../components/Contact";

9import Contact from "../components/Contact";

pages/media.js+1−3

@@ -1,11 +1,9 @@

1import Head from "next/head";

2import Link from "next/link";

3import Meta from "../components/Meta";

4−import Container from "../components/Container";

4+import { Container, SingleColumn, Section } from "foundation-design-system";

5import Footer from "../components/Footer";

6import Header from "../components/Header";

7−import SingleColumn from "../components/SingleColumn";

8−import Section from "../components/Section";

9import { getAllPosts } from "../lib/lib";

7import { getAllPosts } from "../lib/lib";

10

8

11export function MediaPreview({ event, dir, className }) {

9export function MediaPreview({ event, dir, className }) {

pages/media/[slug].js+6−4

@@ -9,13 +9,15 @@ import Head from "next/head";

9import Link from "next/link";

10import Meta from "../../components/Meta";

11import ErrorPage from "../404";

12−import Container from "../../components/Container";

12+import {

13+ Container,

14+ Markdown,

15+ SingleColumn,

16+ Section,

13−import Markdown from "foundation-design-system";

17+} from "foundation-design-system";

14import Header from "../../components/Header";

18import Header from "../../components/Header";

15import Footer from "../../components/Footer";

19import Footer from "../../components/Footer";

16−import SingleColumn from "../../components/SingleColumn";

17import Contact from "../../components/Contact";

20import Contact from "../../components/Contact";

18−import Section from "../../components/Section";

19

21

20export default function MediaPage({ post, markdown, search }) {

22export default function MediaPage({ post, markdown, search }) {

21 const router = useRouter();

23 const router = useRouter();

pages/understanding-urbit/[[...slug]].js+1−1

@@ -5,7 +5,7 @@ import { useRouter } from "next/router";

5import classnames from "classnames";

6import { join } from "path";

7import { getPage, getPreviousPost, getNextPost } from "../../lib/lib";

8−import Markdown from "foundation-design-system";

8+import { Markdown } from "foundation-design-system";

9import ContentArea from "../../components/ContentArea";

10import Sidebar from "../../components/Sidebar";

11import Pagination from "../../components/Pagination";

pages/updates.js+1−3

@@ -1,11 +1,9 @@

1import Head from "next/head";

2import Meta from "../components/Meta";

3import Link from "next/link";

4−import Container from "../components/Container";

4+import { Container, SingleColumn, Section } from "foundation-design-system";

5import Footer from "../components/Footer";

6import Header from "../components/Header";

7−import SingleColumn from "../components/SingleColumn";

8−import Section from "../components/Section";

9import { getAllPosts, formatDate, generateDisplayDate } from "../lib/lib";

7import { getAllPosts, formatDate, generateDisplayDate } from "../lib/lib";

10

8

11export default function Updates({ posts, search }) {

9export default function Updates({ posts, search }) {

pages/updates/[slug].js+6−4

@@ -10,12 +10,14 @@ import {

10import Head from "next/head";

11import Meta from "../../components/Meta";

12import ErrorPage from "../404";

13−import Container from "../../components/Container";

13+import {

14+ Container,

15+ Markdown,

16+ SingleColumn,

17+ Section,

14−import Markdown from "foundation-design-system";

18+} from "foundation-design-system";

15import Header from "../../components/Header";

19import Header from "../../components/Header";

16import Footer from "../../components/Footer";

20import Footer from "../../components/Footer";

17−import SingleColumn from "../../components/SingleColumn";

18−import Section from "../../components/Section";

19import Contact from "../../components/Contact";

21import Contact from "../../components/Contact";

20

22

21export default function Post({ post, markdown, search }) {

23export default function Post({ post, markdown, search }) {

pages/using/[[...slug]].js+1−1

@@ -6,7 +6,7 @@ import { useState } from "react";

6import classnames from "classnames";

7import { join } from "path";

8import { getPage } from "../../lib/lib";

9−import Markdown from "foundation-design-system";

9+import { Markdown } from "foundation-design-system";

10import ContentArea from "../../components/ContentArea";

11import Sidebar from "../../components/Sidebar";

12import UsingTree from "../../cache/using.json";