diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index f7ad125..1db6783 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -1,8 +1,7 @@ name: Deploy SvelteKit to GitHub Pages on: - push: - branches: [main] + workflow_dispatch: # allows manual trigger permissions: contents: read @@ -22,10 +21,9 @@ jobs: - uses: actions/setup-node@v4 with: node-version-file: .nvmrc - cache: npm # cache node_modules for faster builds - name: Install dependencies - run: npm ci # ci (not install) to install exact versions from package-lock.json + run: npm i # Build the SvelteKit project - name: Build project diff --git a/.nvmrc b/.nvmrc index 6bb91c7..aa8f8f1 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v22.17.0 \ No newline at end of file +v22.22.0 \ No newline at end of file diff --git a/README.md b/README.md index 2d2d397..67b78e1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # SCN website (operated by LCL) -Code repo for the seattlecommunitynetwork.org website. +Code repo for the https://seattlecommunitynetwork.org website. This site is built using [SvelteKit](https://svelte.dev/docs/kit/introduction). SvelteKit supports building fully static sites - which is how this site is built. SvelteKit uses NodeJS to run the static site build. diff --git a/create-redirects.js b/create-redirects.js index 7841aa4..5c929b2 100644 --- a/create-redirects.js +++ b/create-redirects.js @@ -3,8 +3,7 @@ import { existsSync, mkdirSync } from 'fs'; const redirects = [ ['/aboutUs.html', "/about-us"], - ['/ourSites.html', "/our-sites"], - ['/donate.html', "/donate"] + ['/ourSites.html', "/our-sites"] ]; const template = diff --git a/e2e/donate.test.ts b/e2e/donate.test.ts index b17ed66..1e4107b 100644 --- a/e2e/donate.test.ts +++ b/e2e/donate.test.ts @@ -2,7 +2,7 @@ import { expect, test } from '@playwright/test'; import { expectH1AndTitle } from './lib/lib'; test.beforeEach(async ({ page }) => { - await page.goto('/donate/'); + await page.goto('/donate'); }); test.describe('Donate', () => { diff --git a/e2e/our-sites.test.ts b/e2e/our-sites.test.ts index 7ddf40e..bc2710d 100644 --- a/e2e/our-sites.test.ts +++ b/e2e/our-sites.test.ts @@ -26,8 +26,7 @@ test.describe('Our Sites', () => { }); }); - // skip for now, destination page is down - test.skip('main CTAs link correctly', async ({ page }) => { + test('main CTAs link correctly', async ({ page }) => { await expectLinks({ page, pageName: 'our-sites', diff --git a/eslint.config.js b/eslint.config.js index 06a955a..d56eb84 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -27,6 +27,7 @@ export default ts.config( // https://github.com/sveltejs/eslint-plugin-svelte/issues/1353 'svelte/no-navigation-without-resolve': 'off', + 'svelte/require-each-key': 'off' } }, diff --git a/messages/en.json b/messages/en.json index 7d79cab..8fbb3e7 100644 --- a/messages/en.json +++ b/messages/en.json @@ -208,7 +208,7 @@ "pages.sites.sites.iframe.title": "Sites and Estimated LTE Coverage Map", "pages.sites.sites.paragraphs.1": "For more specific information on signal strength, upload speed, and more:", "pages.sites.sites.cta": "Visit Our Map Page", - "pages.sites.sites.href": "https://coverage.seattlecommunitynetwork.org/", + "pages.sites.sites.href": "https://map.seattlecommunitynetwork.org/", diff --git a/src/lib/components/Footer.svelte b/src/lib/components/Footer.svelte index 8a2d58b..c7d5a09 100644 --- a/src/lib/components/Footer.svelte +++ b/src/lib/components/Footer.svelte @@ -32,7 +32,7 @@

{m['common.mission.desc']()}

- {#each buttons as { href, cta} (href)} + {#each buttons as { href, cta}}
diff --git a/src/lib/components/Header.svelte b/src/lib/components/Header.svelte index 1aa4d9d..4ee9311 100644 --- a/src/lib/components/Header.svelte +++ b/src/lib/components/Header.svelte @@ -68,7 +68,7 @@