From eae17aa4fe246bfb96ca7d77a59600f42e98ac48 Mon Sep 17 00:00:00 2001 From: Puneet Saraswat <61435908+saraswatpuneet@users.noreply.github.com> Date: Tue, 29 Oct 2024 12:37:49 -0500 Subject: [PATCH 01/35] Open local dev docs for feature branch (#40) ## Details - Set link to localhost for `Dev Docs` for local development Closes #30 --- src/components/Header/NavItems.svelte | 10 ++-------- src/routes/docs/+layout.svelte | 15 +++++++++++++++ src/routes/docs/+page.svelte | 1 + 3 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 src/routes/docs/+layout.svelte create mode 100644 src/routes/docs/+page.svelte diff --git a/src/components/Header/NavItems.svelte b/src/components/Header/NavItems.svelte index 96e96d87..062b10f0 100644 --- a/src/components/Header/NavItems.svelte +++ b/src/components/Header/NavItems.svelte @@ -3,7 +3,7 @@ export let textColor: string; export let section: number; export let isDesktop: boolean = true; - + import { base } from '$app/paths'; let isOnHomePage = $page.url.pathname === '/'; @@ -14,13 +14,7 @@ > {/if} -Dev Docs. +Dev Docs. + import Header from '../../components/Header/Header.svelte'; + import Footer from '../../components/Footer.svelte'; + + const logoHex = '#5E69FF'; + const navColor = 'navy'; + + +
+
+
+ +
+
+
diff --git a/src/routes/docs/+page.svelte b/src/routes/docs/+page.svelte new file mode 100644 index 00000000..42b00557 --- /dev/null +++ b/src/routes/docs/+page.svelte @@ -0,0 +1 @@ +
From bc2306817211577f36173a4e4d013d1a3c714f1c Mon Sep 17 00:00:00 2001 From: Joe Caputo Date: Wed, 30 Oct 2024 10:31:51 -0400 Subject: [PATCH 02/35] feat: swap in Footer component from @frequency-chain/style-guide (#43) - also fix tailwindow.config.js to use 'extend' property, else Tailwind classes from the package don't come through always - Closes #36 ## Screenshot(s) Desktop: ![image](https://github.com/user-attachments/assets/0cf2479b-0ab0-4dc9-a463-9858ed115259) Mobile/small screen: ![image](https://github.com/user-attachments/assets/b6637fef-97be-422a-88cc-b00c59e00783) Please delete options that are not relevant. - [X] Content Change (Required approval in Slack: `#frequency-xyz` and remember that changes along the way trigger re-approval.) - [ ] Approved HE (Required for technical wording) - [ ] Approved CM - [ ] Approved UO # How to Test? 1. Pull branch 2. Run `npm run dev -- --open` 3. Visually verify that the footer matches the screenshots 4. # Checklist: - [x] I have performed a self-review of my code - [x] I have commented my code & PR, particularly in hard-to-understand areas - [x] I have checked at all the breakpoints to make sure it works on all screen sizes --- .github/workflows/ci.yml | 1 + .github/workflows/deploy.yml | 2 +- .github/workflows/pr-deploy.yml | 2 +- .tool-versions | 2 +- package-lock.json | 6 +-- src/components/Footer.svelte | 11 ------ src/routes/(home)/+layout.svelte | 2 +- src/routes/docs/+layout.svelte | 2 +- src/routes/privacy/+layout.svelte | 2 +- tailwind.config.js | 62 ++++++++++++++++--------------- 10 files changed, 42 insertions(+), 50 deletions(-) delete mode 100644 src/components/Footer.svelte diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47040d5b..2b3a5898 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,6 +36,7 @@ jobs: with: node-version: 20 cache: 'npm' + - name: Install Dependencies run: npm ci diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 80c6aff7..158d7050 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -42,7 +42,7 @@ jobs: cache: npm - name: Install dependencies - run: npm install + run: npm ci - name: Build env: diff --git a/.github/workflows/pr-deploy.yml b/.github/workflows/pr-deploy.yml index 3783873a..3a0e4094 100644 --- a/.github/workflows/pr-deploy.yml +++ b/.github/workflows/pr-deploy.yml @@ -34,7 +34,7 @@ jobs: cache: npm - name: Install dependencies - run: npm install + run: npm ci - name: Build env: diff --git a/.tool-versions b/.tool-versions index 7bd5f0bf..f31e6b02 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -nodejs 20.10.0 +nodejs 20.18.0 diff --git a/package-lock.json b/package-lock.json index 16cf2c21..75f90d43 100644 --- a/package-lock.json +++ b/package-lock.json @@ -638,9 +638,9 @@ } }, "node_modules/@floating-ui/dom": { - "version": "1.6.11", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.11.tgz", - "integrity": "sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ==", + "version": "1.6.12", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.12.tgz", + "integrity": "sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==", "dependencies": { "@floating-ui/core": "^1.6.0", "@floating-ui/utils": "^0.2.8" diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte deleted file mode 100644 index 099d5256..00000000 --- a/src/components/Footer.svelte +++ /dev/null @@ -1,11 +0,0 @@ - - -
diff --git a/src/routes/(home)/+layout.svelte b/src/routes/(home)/+layout.svelte index ba0519e9..8ed4946b 100644 --- a/src/routes/(home)/+layout.svelte +++ b/src/routes/(home)/+layout.svelte @@ -1,5 +1,5 @@ diff --git a/src/routes/docs/+layout.svelte b/src/routes/docs/+layout.svelte index e46f8e2b..df924a72 100644 --- a/src/routes/docs/+layout.svelte +++ b/src/routes/docs/+layout.svelte @@ -1,6 +1,6 @@ + + diff --git a/src/routes/docs/components/DocsMain.svelte b/src/routes/docs/components/DocsMain.svelte new file mode 100644 index 00000000..f36e3b86 --- /dev/null +++ b/src/routes/docs/components/DocsMain.svelte @@ -0,0 +1,24 @@ + + +
+
+ +
+

Build with Frequency

+

Better with You

+

+ Everything here is open source. Our development roadmap is focused on our mission of reclaiming the social graph + for the common good and is guided by our principles. Infrastructure for the Next Generation Decentralized Social + Internet. +

+

+ If this is your first visit, the DSNP whitepaper is a good place to start. Where you go after depends on your + goals: the navigation panel gives some useful entry points. +

+
+
+
diff --git a/src/routes/docs/components/Placeholder.svelte b/src/routes/docs/components/Placeholder.svelte new file mode 100644 index 00000000..cd482f20 --- /dev/null +++ b/src/routes/docs/components/Placeholder.svelte @@ -0,0 +1,2 @@ + +
From 9b6572f5d242ca198c17063e8dde466f7bb05c89 Mon Sep 17 00:00:00 2001 From: eNddy Date: Thu, 31 Oct 2024 15:56:15 -0700 Subject: [PATCH 04/35] chore(Header): use style-guide header (#46) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [](url)Replace current header with header from the style-guide library. Closes #35 Screenshot 2024-10-31 at 3 29 19 PM Screenshot 2024-10-31 at 3 29 12 PM Screenshot 2024-10-31 at 3 29 31 PM --------- Co-authored-by: Claire Olmstead --- package-lock.json | 8 ++--- package.json | 2 +- src/components/Header/Header.svelte | 53 +++++------------------------ 3 files changed, 14 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index 75f90d43..4ae66bee 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "name": "frequency-xyz", "version": "0.0.1", "dependencies": { - "@frequency-chain/style-guide": "^0.1.9" + "@frequency-chain/style-guide": "^0.1.11" }, "devDependencies": { "@playwright/test": "^1.48.2", @@ -652,9 +652,9 @@ "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==" }, "node_modules/@frequency-chain/style-guide": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/@frequency-chain/style-guide/-/style-guide-0.1.9.tgz", - "integrity": "sha512-wBrOVkXzcwaM5pTrZzyM+YTfpFoD3MKqTA56awWwe/ymXjYqxYOqITSqv5D8yH+8KAT9ovLcWVvJd5x1kw2NuQ==", + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/@frequency-chain/style-guide/-/style-guide-0.1.11.tgz", + "integrity": "sha512-Aw1kCB+gec1zzqbCaPYeK9X1b9IDPfae+t5xScv8uVUC9gfHV5esXtl8DquReL2AwMtz/G+8hpi8UAypLsS1yw==", "dependencies": { "@storybook/addons": "^7.6.17", "bits-ui": "^0.21.16", diff --git a/package.json b/package.json index 74e6c8fc..fb5a7d94 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,6 @@ }, "type": "module", "dependencies": { - "@frequency-chain/style-guide": "^0.1.9" + "@frequency-chain/style-guide": "^0.1.11" } } diff --git a/src/components/Header/Header.svelte b/src/components/Header/Header.svelte index 9c6452fc..e3223aac 100644 --- a/src/components/Header/Header.svelte +++ b/src/components/Header/Header.svelte @@ -1,55 +1,20 @@ -