diff --git a/package.json b/package.json index cb829b3e81affab84b52d0dd5cab30ce36fe6a08..556c59d232a41d8830f2c35a0cab92706049b523 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "react-dom": "^17.0.2" }, "devDependencies": { + "@fontsource/inter": "^4.2.2", "@styled-icons/feather": "^10.18.0", "@styled-icons/simple-icons": "^10.33.0", "@types/node": "^14.14.41", diff --git a/pages/about.tsx b/pages/about.tsx index 9df778e2bdcf20694da6c89d27c2a1aecc07dbe1..99ba684ed9e536795b65840783ec4f82fb4f26fc 100644 --- a/pages/about.tsx +++ b/pages/about.tsx @@ -11,9 +11,6 @@ export default function Home({ content }: { content: string }) { <title>About Revolt</title> <link rel="icon" href="/favicon.ico" /> <meta name="viewport" content="width=device-width, initial-scale=0.9, user-scalable=0" /> - - <link rel="preconnect" href="https://fonts.gstatic.com" /> - <link href="https://fonts.googleapis.com/css2?family=Inter:wght@500;600&display=swap" rel="stylesheet" /> </Head> <main> <Navbar /> diff --git a/pages/aup.tsx b/pages/aup.tsx index 3650c551e2d5755f1f18ea208b805596c0096528..04026a4563c4157dd23fe112360a8c8fe8cc3650 100644 --- a/pages/aup.tsx +++ b/pages/aup.tsx @@ -11,9 +11,6 @@ export default function Home({ content }: { content: string }) { <title>Acceptable Usage Policy - Revolt</title> <link rel="icon" href="/favicon.ico" /> <meta name="viewport" content="width=device-width, initial-scale=0.9, user-scalable=0" /> - - <link rel="preconnect" href="https://fonts.gstatic.com" /> - <link href="https://fonts.googleapis.com/css2?family=Inter:wght@500;600&display=swap" rel="stylesheet" /> </Head> <main> <Navbar /> diff --git a/pages/index.tsx b/pages/index.tsx index a5ed5a404131fbefac9ca460b0d9fde2cc2d9fd7..cdd318f5cd54f0b3c62af48b9d8fc232926dbd29 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -31,9 +31,6 @@ export default function Home() { <meta property="og:image:width" content="1280" /> <meta property="og:image:height" content="720" /> - <link rel="preconnect" href="https://fonts.gstatic.com" /> - <link href="https://fonts.googleapis.com/css2?family=Inter:wght@500;600&display=swap" rel="stylesheet" /> - <script async defer data-domain='revolt.chat' src='https://plausible.insrt.uk/js/plausible.js' /> { // Firefox only: Scroll snapping. diff --git a/pages/privacy.tsx b/pages/privacy.tsx index 0209397b1d8a3ee1d3ea73fda15f8670e24f3d2e..a652e05efe0da2f22986cad35ccc4cbaf44ef1d2 100644 --- a/pages/privacy.tsx +++ b/pages/privacy.tsx @@ -11,9 +11,6 @@ export default function Home({ content }: { content: string }) { <title>Privacy Policy - Revolt</title> <link rel="icon" href="/favicon.ico" /> <meta name="viewport" content="width=device-width, initial-scale=0.9, user-scalable=0" /> - - <link rel="preconnect" href="https://fonts.gstatic.com" /> - <link href="https://fonts.googleapis.com/css2?family=Inter:wght@500;600&display=swap" rel="stylesheet" /> </Head> <main> <Navbar /> diff --git a/pages/roadmap.tsx b/pages/roadmap.tsx new file mode 100644 index 0000000000000000000000000000000000000000..99ba684ed9e536795b65840783ec4f82fb4f26fc --- /dev/null +++ b/pages/roadmap.tsx @@ -0,0 +1,32 @@ +import Head from 'next/head'; +import { Footer } from '../components/Footer'; +import { Navbar } from '../components/Navbar'; +import styles from '../styles/Legal.module.scss'; +import { Markdown } from '../components/Markdown'; + +export default function Home({ content }: { content: string }) { + return ( + <div> + <Head> + <title>About Revolt</title> + <link rel="icon" href="/favicon.ico" /> + <meta name="viewport" content="width=device-width, initial-scale=0.9, user-scalable=0" /> + </Head> + <main> + <Navbar /> + <div className={styles.content}> + <Markdown content={content} /> + </div> + <Footer /> + </main> + </div> + ); +} + +export async function getStaticProps() { + const { readFile } = require('fs/promises'); + const file = await readFile('./legal/About.md'); + const content = file.toString(); + + return { props: { content } } +} diff --git a/pages/terms.tsx b/pages/terms.tsx index f8d2de71712c967ce5b6b7d1ca36536d2a8ff780..baaea7158f80a51bebb2f2d7d3d94ddaee7adb2f 100644 --- a/pages/terms.tsx +++ b/pages/terms.tsx @@ -11,9 +11,6 @@ export default function Home({ content }: { content: string }) { <title>Terms of Service - Revolt</title> <link rel="icon" href="/favicon.ico" /> <meta name="viewport" content="width=device-width, initial-scale=0.9, user-scalable=0" /> - - <link rel="preconnect" href="https://fonts.gstatic.com" /> - <link href="https://fonts.googleapis.com/css2?family=Inter:wght@500;600&display=swap" rel="stylesheet" /> </Head> <main> <Navbar /> diff --git a/styles/global.scss b/styles/global.scss index 8d1d5f64582666786714388c675da1fe1fb3b1df..0f8f8f6d71c56ffbe0a02d9279afe1d77f119cf3 100644 --- a/styles/global.scss +++ b/styles/global.scss @@ -1,5 +1,8 @@ @import 'elements.scss'; +@import "~@fontsource/inter/500.css"; +@import "~@fontsource/inter/600.css"; + * { -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; diff --git a/yarn.lock b/yarn.lock index 3c0c2503dfcf39475fdf7f0d8c45c33950d04390..c99137d257e9e4202da38db4a9b12a2b541caf13 100644 --- a/yarn.lock +++ b/yarn.lock @@ -158,6 +158,11 @@ resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== +"@fontsource/inter@^4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@fontsource/inter/-/inter-4.2.2.tgz#efe97167aac992db3fadf60ea0dd72aacd3e1fc4" + integrity sha512-lvR1PQe+8FTTd3YRW84KGcgUR8leZ7S3aY+51MQ90MQHI0VQe3cDH6T6jjs1qTm+wPmWfdSVjN8ugvNZpGUnvA== + "@hapi/accept@5.0.1": version "5.0.1" resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-5.0.1.tgz#068553e867f0f63225a506ed74e899441af53e10"