From 63623d56f48334c3a6a72d13308cbfb85cf6aa9b Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 6 Oct 2026 13:58:53 +0000 Subject: [PATCH 1/3] feature: React app shell, routing, theming, header/footer/settings, loader and error components (migration phase 2) Co-Authored-By: Vibha Seshadri --- react/e2e/shell.spec.ts | 80 ++ react/e2e/smoke.spec.ts | 6 - react/eslint.config.js | 4 + react/index.html | 24 + react/package-lock.json | 908 +++++++++++++++++- react/package.json | 4 + react/src/App.scss | 24 + react/src/App.test.tsx | 76 +- react/src/App.tsx | 61 +- react/src/core/Footer/Footer.scss | 22 + react/src/core/Footer/Footer.test.tsx | 13 + react/src/core/Footer/Footer.tsx | 14 + react/src/core/Header/Header.scss | 126 +++ react/src/core/Header/Header.test.tsx | 55 ++ react/src/core/Header/Header.tsx | 59 ++ .../core/SettingsDialog/SettingsDialog.scss | 78 ++ .../SettingsDialog/SettingsDialog.test.tsx | 78 ++ .../core/SettingsDialog/SettingsDialog.tsx | 86 ++ react/src/feeds/Feed.tsx | 18 + react/src/item-details/ItemDetails.tsx | 11 + react/src/main.tsx | 1 + .../components/ErrorMessage/ErrorMessage.scss | 118 +++ .../ErrorMessage/ErrorMessage.test.tsx | 13 + .../components/ErrorMessage/ErrorMessage.tsx | 25 + .../src/shared/components/Loader/Loader.scss | 110 +++ .../shared/components/Loader/Loader.test.tsx | 10 + react/src/shared/components/Loader/Loader.tsx | 9 + react/src/shared/hooks/usePageViews.ts | 20 + react/src/shared/utils/a11y.ts | 11 + react/src/styles/_media.scss | 3 + react/src/styles/_theme_variables.scss | 37 + react/src/styles/_themes.scss | 255 +++++ react/src/styles/index.scss | 44 + react/src/test/renderWithProviders.tsx | 35 + react/src/user/UserProfile.tsx | 11 + react/tsconfig.node.json | 2 +- react/vite.config.ts | 5 + 37 files changed, 2423 insertions(+), 33 deletions(-) create mode 100644 react/e2e/shell.spec.ts delete mode 100644 react/e2e/smoke.spec.ts create mode 100644 react/src/App.scss create mode 100644 react/src/core/Footer/Footer.scss create mode 100644 react/src/core/Footer/Footer.test.tsx create mode 100644 react/src/core/Footer/Footer.tsx create mode 100644 react/src/core/Header/Header.scss create mode 100644 react/src/core/Header/Header.test.tsx create mode 100644 react/src/core/Header/Header.tsx create mode 100644 react/src/core/SettingsDialog/SettingsDialog.scss create mode 100644 react/src/core/SettingsDialog/SettingsDialog.test.tsx create mode 100644 react/src/core/SettingsDialog/SettingsDialog.tsx create mode 100644 react/src/feeds/Feed.tsx create mode 100644 react/src/item-details/ItemDetails.tsx create mode 100644 react/src/shared/components/ErrorMessage/ErrorMessage.scss create mode 100644 react/src/shared/components/ErrorMessage/ErrorMessage.test.tsx create mode 100644 react/src/shared/components/ErrorMessage/ErrorMessage.tsx create mode 100644 react/src/shared/components/Loader/Loader.scss create mode 100644 react/src/shared/components/Loader/Loader.test.tsx create mode 100644 react/src/shared/components/Loader/Loader.tsx create mode 100644 react/src/shared/hooks/usePageViews.ts create mode 100644 react/src/shared/utils/a11y.ts create mode 100644 react/src/styles/_media.scss create mode 100644 react/src/styles/_theme_variables.scss create mode 100644 react/src/styles/_themes.scss create mode 100644 react/src/styles/index.scss create mode 100644 react/src/test/renderWithProviders.tsx create mode 100644 react/src/user/UserProfile.tsx diff --git a/react/e2e/shell.spec.ts b/react/e2e/shell.spec.ts new file mode 100644 index 000000000..03c52f94e --- /dev/null +++ b/react/e2e/shell.spec.ts @@ -0,0 +1,80 @@ +import { expect, test } from '@playwright/test'; + +const FEEDS = ['news', 'newest', 'show', 'ask', 'jobs'] as const; + +test.describe('app shell routing', () => { + test('redirects / to /news/1', async ({ page }) => { + await page.goto('/'); + await expect(page).toHaveURL(/\/news\/1$/); + await expect(page.getByTestId('feed')).toHaveAttribute('data-feed-type', 'news'); + }); + + for (const feed of FEEDS) { + test(`deep link /${feed}/2 resolves the ${feed} feed`, async ({ page }) => { + await page.goto(`/${feed}/2`); + const feedEl = page.getByTestId('feed'); + await expect(feedEl).toHaveAttribute('data-feed-type', feed); + await expect(feedEl).toHaveAttribute('data-page', '2'); + }); + } + + test('header navigation updates the URL and active link', async ({ page }) => { + await page.goto('/news/1'); + const nav = page.getByRole('navigation'); + for (const [label, feed] of [ + ['new', 'newest'], + ['show', 'show'], + ['ask', 'ask'], + ['jobs', 'jobs'], + ] as const) { + await nav.getByRole('link', { name: label, exact: true }).click(); + await expect(page).toHaveURL(new RegExp(`/${feed}/1$`)); + await expect(nav.getByRole('link', { name: label, exact: true })).toHaveClass(/active/); + await expect(page.getByTestId('feed')).toHaveAttribute('data-feed-type', feed); + } + await page.getByRole('link', { name: 'Logo' }).click(); + await expect(page).toHaveURL(/\/news\/1$/); + }); + + test('item and user routes load', async ({ page }) => { + await page.goto('/item/8863'); + await expect(page.getByTestId('item-details')).toHaveAttribute('data-item-id', '8863'); + await page.goto('/user/pg'); + await expect(page.getByTestId('user-profile')).toHaveAttribute('data-user-id', 'pg'); + }); +}); + +test.describe('theming', () => { + test('switches and persists themes from the settings dialog', async ({ page }) => { + await page.goto('/news/1'); + const root = page.getByTestId('theme-root'); + await expect(root).toHaveClass('default'); + const headerBg = () => page.locator('#header').evaluate((el) => getComputedStyle(el).backgroundColor); + expect(await headerBg()).toBe('rgb(185, 43, 39)'); + + await page.getByRole('button', { name: 'Settings' }).click(); + const dialog = page.getByRole('dialog', { name: 'Settings' }); + await expect(dialog).toBeVisible(); + + await dialog.getByRole('radio', { name: 'Night' }).check(); + await expect(root).toHaveClass('night'); + expect(await headerBg()).toBe('rgb(38, 50, 56)'); + + await dialog.getByRole('radio', { name: 'Black (AMOLED)' }).check(); + await expect(root).toHaveClass('amoledblack'); + expect(await headerBg()).toBe('rgb(0, 0, 0)'); + + await dialog.getByRole('button', { name: 'Close settings' }).click(); + await expect(dialog).toBeHidden(); + + await page.reload(); + await expect(root).toHaveClass('amoledblack'); + expect(await page.evaluate(() => localStorage.getItem('theme'))).toBe('amoledblack'); + }); + + test('defaults to the night theme when the OS prefers dark mode', async ({ page }) => { + await page.emulateMedia({ colorScheme: 'dark' }); + await page.goto('/news/1'); + await expect(page.getByTestId('theme-root')).toHaveClass('night'); + }); +}); diff --git a/react/e2e/smoke.spec.ts b/react/e2e/smoke.spec.ts deleted file mode 100644 index a50dcdee9..000000000 --- a/react/e2e/smoke.spec.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { expect, test } from '@playwright/test'; - -test('app boots', async ({ page }) => { - await page.goto('/'); - await expect(page.getByRole('heading', { name: 'React HN' })).toBeVisible(); -}); diff --git a/react/eslint.config.js b/react/eslint.config.js index 9bb7b93c4..ba365c304 100644 --- a/react/eslint.config.js +++ b/react/eslint.config.js @@ -23,5 +23,9 @@ export default tseslint.config( 'react-refresh/only-export-components': ['warn', { allowConstantExport: true }], }, }, + { + files: ['src/test/**', 'src/**/*.test.{ts,tsx}'], + rules: { 'react-refresh/only-export-components': 'off' }, + }, prettier ); diff --git a/react/index.html b/react/index.html index f6a67ffd8..c1f2d846e 100644 --- a/react/index.html +++ b/react/index.html @@ -10,9 +10,33 @@ + +
+
+ + +
diff --git a/react/package-lock.json b/react/package-lock.json index ba5d96efc..eb3fc3676 100644 --- a/react/package-lock.json +++ b/react/package-lock.json @@ -7,6 +7,9 @@ "": { "name": "react-hnpwa", "version": "0.0.0", + "dependencies": { + "react-router-dom": "^6.30.6" + }, "devDependencies": { "@eslint/js": "^9.39.5", "@playwright/test": "^1.63.0", @@ -28,6 +31,7 @@ "prettier": "^3.9.9", "react": "^18.3.1", "react-dom": "^18.3.1", + "sass": "^1.105.1", "typescript": "~5.6", "typescript-eslint": "^8.71.1", "vite": "^5.4.21", @@ -375,6 +379,15 @@ "dev": true, "license": "MIT" }, + "node_modules/@bufbuild/protobuf": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.16.0.tgz", + "integrity": "sha512-FWa0sPlqYGJgpTs6OxBRcL/AW4JT0OIO+W1ajerluoTVh8CV0B7XM1qsNCRgnkSCkRCgOICKHRQlY17jrsm0+Q==", + "dev": true, + "license": "(Apache-2.0 AND BSD-3-Clause)", + "optional": true, + "peer": true + }, "node_modules/@csstools/color-helpers": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.1.0.tgz", @@ -1199,6 +1212,294 @@ "node": "^22.20 || ^24.12 || >=25" } }, + "node_modules/@parcel/watcher": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.6.0.tgz", + "integrity": "sha512-7FNeNl8NCE7aINx7WXiKQrPYZWC/hvrTsmk6zmxbI7LTXE7hVek/n8AfVgpe2y82zl3w0HvCHN0bVKMBoJcC0w==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "dependencies": { + "detect-libc": "^2.0.3", + "is-glob": "^4.0.3", + "node-addon-api": "^7.0.0", + "picomatch": "^4.0.4" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "@parcel/watcher-android-arm64": "2.6.0", + "@parcel/watcher-darwin-arm64": "2.6.0", + "@parcel/watcher-darwin-x64": "2.6.0", + "@parcel/watcher-freebsd-x64": "2.6.0", + "@parcel/watcher-linux-arm-glibc": "2.6.0", + "@parcel/watcher-linux-arm-musl": "2.6.0", + "@parcel/watcher-linux-arm64-glibc": "2.6.0", + "@parcel/watcher-linux-arm64-musl": "2.6.0", + "@parcel/watcher-linux-x64-glibc": "2.6.0", + "@parcel/watcher-linux-x64-musl": "2.6.0", + "@parcel/watcher-win32-arm64": "2.6.0", + "@parcel/watcher-win32-x64": "2.6.0" + } + }, + "node_modules/@parcel/watcher-android-arm64": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.6.0.tgz", + "integrity": "sha512-trgpLSCKRC/huFjXX/Smh+0sWe4+YtKfktIToiMl59ghz7z+qkH6kMvNnUbLyRs9N11t8l4svSCs1+5B3rOAhA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-arm64": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.6.0.tgz", + "integrity": "sha512-Y3QV0gl7Q1zbfueunkWIERICbEojQFCgpyG7YqOGNFLsckXyI1xu9mAIUpKY9QBYzBtSkN8dBPwd3yiAO9ovMw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-x64": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.6.0.tgz", + "integrity": "sha512-Ohv6OpzhUfKYD7Beb8kDvG0jbIxORCYY1JRdZnaBtnjjkJxgD7ZVL0nw2sCYd0yTMKTvz3nnTnOF3cDifK+kvw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-freebsd-x64": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.6.0.tgz", + "integrity": "sha512-5HmXvDgs8VK+74jF9y9/2FE3/OnlcKmc56tjmSrEuZjpSZOGL+fvAu+HKJBdPs9uwoP2hE6TlSUpXZ/C5jUFmQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-glibc": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.6.0.tgz", + "integrity": "sha512-Ps/hui3A+vMbjdqlqAowK2ZL8+BO8dBjxeWXj6npTBs3jx4wWmbPpaLuqwrQrSqIVMCnpWo238bJ1U37GhQOYg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-musl": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.6.0.tgz", + "integrity": "sha512-9c6AUHgHoG+IY88MRIHupztQiQnrbqHYQjkM2btA+Bf/wQnQMuiD0Wfk1EVv3TlNT3x41uU71rn6E4xh/+zvkw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-glibc": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.6.0.tgz", + "integrity": "sha512-yHRqS2owEXe6Hic9z6Mh1ECsCd+ODVOGvZDyciqRd21+v+o+DnXMOrw50DSpIG2sb8GPEaPPmfeCAWKPJdq46g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-musl": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.6.0.tgz", + "integrity": "sha512-WhB2e/V7rqdHHWZusBSPuy5Ei8S6lSz6FE5TKKQz5h3a0O+C+mhY7vxU9b/stqvMb8beLnPY82ZrFTLKs+SrKA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-glibc": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.6.0.tgz", + "integrity": "sha512-ulGE6x6Oz6iAwg75T8YQSoguBWasniIbX+QWpaYPcCnDOpdWX3k+4xbEYPZVLxOuoJI+svJJPD3sEj8G7lrQ3A==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-x64-musl": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.6.0.tgz", + "integrity": "sha512-tkBYKt7YQrjIJWYDnto2YgO8MRkjlMTSNoRHzsXinBqbLdeOM3L32wPZJvIZxqaLMfSlS/4sUjH/6STVP/XDLw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-arm64": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.6.0.tgz", + "integrity": "sha512-gIZAP23jaHjGWasY/TY6yL7NHFClf0Ga7FN+iINvk+KN94rhm94lYZhFsbYFNcA04/onvGD9kKmiJLJB2HbNwQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-win32-x64": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.6.0.tgz", + "integrity": "sha512-cA+/pXV2YkfxlIcXOQ5fSWqAzzPyD78/x5qbK/I0vUkrlYHA8TIz+MXjAbGouguKVSI4bOmkTSJ1/poVSsgt+A==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -1226,6 +1527,15 @@ "node": ">=20" } }, + "node_modules/@remix-run/router": { + "version": "1.23.4", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.4.tgz", + "integrity": "sha512-q7j5geK7xs3UJSdm9/iytUNclBnLmYx1EnSeCFXHPeutdqgIMeFeHtUZgS3EhlKxdBEAu8OwtJCwmLrEzpSs7Q==", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/@rolldown/pluginutils": { "version": "1.0.0-beta.27", "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz", @@ -2512,6 +2822,22 @@ "node": ">= 16" } }, + "node_modules/chokidar": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz", + "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==", + "dev": true, + "license": "MIT", + "dependencies": { + "readdirp": "^5.0.0" + }, + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "url": "https://paulmillr.com/funding/" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -2532,6 +2858,19 @@ "dev": true, "license": "MIT" }, + "node_modules/colorjs.io": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.7.1.tgz", + "integrity": "sha512-LY7OHnJZxHwT5UlzNa9bbhHHDbzB6yE5+3MIPwJEQKRvSCt/T4G7epsj+9j2BExUIIfXFIJGsIXUKdfrK9Q5tA==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/color" + } + }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -2685,6 +3024,17 @@ "node": ">=6" } }, + "node_modules/detect-libc": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", + "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "engines": { + "node": ">=8" + } + }, "node_modules/dom-accessibility-api": { "version": "0.5.16", "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", @@ -3478,6 +3828,13 @@ "node": ">= 4" } }, + "node_modules/immutable": { + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.9.tgz", + "integrity": "sha512-m8nVez3rwrgmWxtLMt1ZYXB2Lv7OKYn/disyxAlSDYAlKSlFoPPfIAmAM/M5xqL4m4C/wAPw7S2/CNaUii1Hxg==", + "dev": true, + "license": "MIT" + }, "node_modules/import-fresh": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", @@ -3636,7 +3993,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true, "license": "MIT" }, "node_modules/js-yaml": { @@ -3801,7 +4157,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, "license": "MIT", "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" @@ -3987,6 +4342,14 @@ "dev": true, "license": "MIT" }, + "node_modules/node-addon-api": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz", + "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==", + "dev": true, + "license": "MIT", + "optional": true + }, "node_modules/node-releases": { "version": "2.0.57", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.57.tgz", @@ -4294,7 +4657,6 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", - "dev": true, "license": "MIT", "dependencies": { "loose-envify": "^1.1.0" @@ -4307,7 +4669,6 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", - "dev": true, "license": "MIT", "dependencies": { "loose-envify": "^1.1.0", @@ -4334,27 +4695,73 @@ "node": ">=0.10.0" } }, - "node_modules/redent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", - "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", - "dev": true, + "node_modules/react-router": { + "version": "6.30.6", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.30.6.tgz", + "integrity": "sha512-5HfK7k5im7LTOB0EqCQmfvy4C13G92Ssj1VTmouTK3AJvyjKTnFuCV0vcMAD/JS+JC4DvDIBRrlAeJIFjh5VWg==", "license": "MIT", "dependencies": { - "indent-string": "^4.0.0", - "strip-indent": "^3.0.0" + "@remix-run/router": "1.23.4" }, "engines": { - "node": ">=8" + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8" } }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true, + "node_modules/react-router-dom": { + "version": "6.30.6", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.30.6.tgz", + "integrity": "sha512-0RHKZz7wwffvkU+2MFVT2NnjK44ssLEV+m0CAJaS2Ksmorrwj7WxH00jO0SOCW26/tINUnJHToXblDs33I38YQ==", "license": "MIT", - "engines": { + "dependencies": { + "@remix-run/router": "1.23.4", + "react-router": "6.30.6" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "react": ">=16.8", + "react-dom": ">=16.8" + } + }, + "node_modules/readdirp": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.1.1.tgz", + "integrity": "sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 20.19.0" + }, + "funding": { + "type": "individual", + "url": "https://paulmillr.com/funding/" + } + }, + "node_modules/redent": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", + "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", + "dev": true, + "license": "MIT", + "dependencies": { + "indent-string": "^4.0.0", + "strip-indent": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true, + "license": "MIT", + "engines": { "node": ">=4" } }, @@ -4411,6 +4818,18 @@ "dev": true, "license": "MIT" }, + "node_modules/rxjs": { + "version": "7.8.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", + "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==", + "dev": true, + "license": "Apache-2.0", + "optional": true, + "peer": true, + "dependencies": { + "tslib": "^2.1.0" + } + }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -4418,6 +4837,413 @@ "dev": true, "license": "MIT" }, + "node_modules/sass": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.105.1.tgz", + "integrity": "sha512-1CnAWPyrrnVQzXGB/DUep1vYCKCm1CIBr+YxjjiW6wk9qtzemnGP4qicH56T2F9S4Hjtv/Ne3jDz8JqfdDU4oA==", + "dev": true, + "license": "MIT", + "dependencies": { + "chokidar": "^5.0.0", + "immutable": "^5.1.5", + "source-map-js": ">=0.6.2 <2.0.0" + }, + "bin": { + "sass": "sass.js" + }, + "engines": { + "node": ">=20.19.0" + }, + "optionalDependencies": { + "@parcel/watcher": "^2.4.1" + } + }, + "node_modules/sass-embedded": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.105.1.tgz", + "integrity": "sha512-9tKxXG4rq+oGTZUlQehWZwHxBTL80EiB8IWk9AEqz8uOqg910t88JIYbN92eMCxokQ5vrYSQxg15bh0o/3hh3w==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "@bufbuild/protobuf": "^2.5.0", + "colorjs.io": "^0.7.0", + "immutable": "^5.1.5", + "rxjs": "^7.4.0", + "supports-color": "^8.1.1", + "sync-child-process": "^1.0.2", + "varint": "^6.0.0" + }, + "bin": { + "sass": "dist/bin/sass.js" + }, + "engines": { + "node": ">=20.19.0" + }, + "optionalDependencies": { + "sass-embedded-all-unknown": "1.105.1", + "sass-embedded-android-arm": "1.105.1", + "sass-embedded-android-arm64": "1.105.1", + "sass-embedded-android-riscv64": "1.105.1", + "sass-embedded-android-x64": "1.105.1", + "sass-embedded-darwin-arm64": "1.105.1", + "sass-embedded-darwin-x64": "1.105.1", + "sass-embedded-linux-arm": "1.105.1", + "sass-embedded-linux-arm64": "1.105.1", + "sass-embedded-linux-musl-arm": "1.105.1", + "sass-embedded-linux-musl-arm64": "1.105.1", + "sass-embedded-linux-musl-riscv64": "1.105.1", + "sass-embedded-linux-musl-x64": "1.105.1", + "sass-embedded-linux-riscv64": "1.105.1", + "sass-embedded-linux-x64": "1.105.1", + "sass-embedded-unknown-all": "1.105.1", + "sass-embedded-win32-arm64": "1.105.1", + "sass-embedded-win32-x64": "1.105.1" + } + }, + "node_modules/sass-embedded-all-unknown": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-all-unknown/-/sass-embedded-all-unknown-1.105.1.tgz", + "integrity": "sha512-kN0G03K9KoUbSf72t7ZvxAudcB4Wbf0M0XFaPc1gaF94jEPUb0xLCQUIPIDPH2Kx8vpYZ/GzzgF7USsB6rUYfw==", + "cpu": [ + "!arm", + "!arm64", + "!riscv64", + "!x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "sass": "1.105.1" + } + }, + "node_modules/sass-embedded-android-arm": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.105.1.tgz", + "integrity": "sha512-WYltUXkUP9jDaUq4uUiLgZXyYO5c72sa/TvpO4E2MMRdS+WJWgrPUDyvO+DpMR9gKWIm0QQ5cCEYnPDgovjVJw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-android-arm64": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.105.1.tgz", + "integrity": "sha512-lWnIFmW3gL4ZDfZgjeUfxazmA0zlwSS/ADe2q9XmP0W2UfM9kuvrXdWvp6KjZOCv0CrTYVQMrIUj8Of1L2M24Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-android-riscv64": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.105.1.tgz", + "integrity": "sha512-lWity0qhyQyPgkHUfZz+4IeD0r6mcAqG9KzOwVSjUrcSR9xAfWFKYAtHTA05R28ymyXf2Sf2+XfNV7YkxLgkUQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-android-x64": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.105.1.tgz", + "integrity": "sha512-FRGZuIZ9eS3qutYPFqz8u12Ti9ccyWKWb7F7rKRI1BkIEmLZV1rC862dUGnTV2d9Tk9qbSAXL71t8alUR+fzIA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-darwin-arm64": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.105.1.tgz", + "integrity": "sha512-75qVpHj0qwJKWOo+ZA5NPVFnOGfRrUiBdnLR0dPqsvzp3acvb5gBevptqTtJjVWubpYRIjcRdDDjmeWoXnfacQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-darwin-x64": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.105.1.tgz", + "integrity": "sha512-5TV8xyZrOO89ky752favkTuyz9O2hOB2aMoiUpMTk0rFr+UVANcXdIrEvJ9WKoqTHaszim7un3jADumunpW7zQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-arm": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.105.1.tgz", + "integrity": "sha512-Ng9GWIF6heTrwc9r/FFY9oUSoaylV2zcS296Qo2re3tJfLMWR37O2JUMyzPT+vtkRs8k3JOE6jTFVlXYnz4EAA==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-arm64": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.105.1.tgz", + "integrity": "sha512-arALlVQkXjxN1RPaQR41vbDYXrTIdXwPtEzBWRkOg7FdIN/dSohY8ik96M6M3MSc+niV/UIC7BO47PcspzJGpw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-musl-arm": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.105.1.tgz", + "integrity": "sha512-7u932XawHxGZvuYV4pOqcCvQi05yMONDmNDxVNh8Q7KmpytQP7mnyxBOYWStiw/p665AVL6BYGe7WY/vzCcWGw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-musl-arm64": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.105.1.tgz", + "integrity": "sha512-KizYVR3d70U67iLgKdF+HCKBdQYUxYiv0YWCS3zl6GwNGIbGXlkOtnjxus41CKTA4oOK0KsSus9P5zwhOBjiYA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-musl-riscv64": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.105.1.tgz", + "integrity": "sha512-gs84BgRBVNMX5fHRU3wxc3HuJjl0dUmZFpcVIaDDEVhnp5oXFLQp+gEu0xBBAurTzCHVpPU6GlGK6B1gRKmbhg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-musl-x64": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.105.1.tgz", + "integrity": "sha512-jFSRc1BSoCo0bw6GXmBWQMzdj0FBl2FTKSRqQSye3vmlI9O466DwBK4OQL9HRp6MGdY9IQFFMZLPZo5LJWIPsQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-riscv64": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.105.1.tgz", + "integrity": "sha512-tkZs6OvA+omJgSf8EaPQavq6M7bJNLm88eKt3yzYnBy0dVGMao4+lyRb/EnsgIq2R/B2lhxUHhSVNWAcY5bgXw==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-linux-x64": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.105.1.tgz", + "integrity": "sha512-YF4OyymSlm26OcdPovIZL1blzjTxf5yN/rzgTmoGqAjEk57+yIuYo+7jBCgSQZFov8Rn4uHhZT+u0cpzxNFMRg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-unknown-all": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-unknown-all/-/sass-embedded-unknown-all-1.105.1.tgz", + "integrity": "sha512-bd2zDf+MdoPdRDH1awSQ+IL67vHvCbiKsWJ95XchPg3I67zQlXjTSf9KqRiE6twjNT1fRV82JUKoc0Hf6CUmfQ==", + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "!android", + "!darwin", + "!linux", + "!win32" + ], + "peer": true, + "dependencies": { + "sass": "1.105.1" + } + }, + "node_modules/sass-embedded-win32-arm64": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.105.1.tgz", + "integrity": "sha512-Zpp/RWYL8ZzpLzBrs+/UVMEHOHx7sw4nlq2R52dKQ0qv/0V8oKemAy41PZyLir3c+S2C+YViYyfnFfQLRTAzuA==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded-win32-x64": { + "version": "1.105.1", + "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.105.1.tgz", + "integrity": "sha512-DM8EkMDzEsxnYoy11nyA5I4jr8lOV1TVQ/drNYvFQA9undiMzZD+7SkRA0OnCrgD1uCT+uRArCHSpNiiYVks+g==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/sass-embedded/node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, "node_modules/saxes": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", @@ -4435,7 +5261,6 @@ "version": "0.23.2", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", - "dev": true, "license": "MIT", "dependencies": { "loose-envify": "^1.1.0" @@ -4661,6 +5486,33 @@ "dev": true, "license": "MIT" }, + "node_modules/sync-child-process": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/sync-child-process/-/sync-child-process-1.0.2.tgz", + "integrity": "sha512-8lD+t2KrrScJ/7KXCSyfhT3/hRq78rC0wBFqNJXv3mZyn6hW2ypM05JmlSvtqRbeq6jqA94oHbxAr2vYsJ8vDA==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "dependencies": { + "sync-message-port": "^1.0.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, + "node_modules/sync-message-port": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/sync-message-port/-/sync-message-port-1.2.0.tgz", + "integrity": "sha512-gAQ9qrUN/UCypHtGFbbe7Rc/f9bzO88IwrG8TDo/aMKAApKyD6E3W4Cm0EfhfBb6Z6SKt59tTCTfD+n1xmAvMg==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true, + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/test-exclude": { "version": "7.0.2", "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.2.tgz", @@ -4835,6 +5687,15 @@ "typescript": ">=4.8.4" } }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "dev": true, + "license": "0BSD", + "optional": true, + "peer": true + }, "node_modules/type-check": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", @@ -4934,6 +5795,15 @@ "punycode": "^2.1.0" } }, + "node_modules/varint": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz", + "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==", + "dev": true, + "license": "MIT", + "optional": true, + "peer": true + }, "node_modules/vite": { "version": "5.4.21", "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz", diff --git a/react/package.json b/react/package.json index fc447ffed..c192db45d 100644 --- a/react/package.json +++ b/react/package.json @@ -44,9 +44,13 @@ "prettier": "^3.9.9", "react": "^18.3.1", "react-dom": "^18.3.1", + "sass": "^1.105.1", "typescript": "~5.6", "typescript-eslint": "^8.71.1", "vite": "^5.4.21", "vitest": "^2.1.9" + }, + "dependencies": { + "react-router-dom": "^6.30.6" } } diff --git a/react/src/App.scss b/react/src/App.scss new file mode 100644 index 000000000..1bbfee0f4 --- /dev/null +++ b/react/src/App.scss @@ -0,0 +1,24 @@ +@use './styles/media' as *; + +.body-cover { + width: 100%; + z-index: 0; + position: fixed; + height: 100%; +} + +.wrapper { + position: relative; + width: 85%; + min-height: 80px; + margin: 0 auto; + font-family: + 'HelveticaNeue-Light', 'Helvetica Neue Light', 'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif; + font-size: 15px; + height: 100%; + line-height: 1.3; + + @media #{$mobile-only} { + width: 100%; + } +} diff --git a/react/src/App.test.tsx b/react/src/App.test.tsx index 6ce47535f..11294be30 100644 --- a/react/src/App.test.tsx +++ b/react/src/App.test.tsx @@ -1,9 +1,77 @@ -import { render, screen } from '@testing-library/react'; -import App from './App'; +import { act, render, screen } from '@testing-library/react'; +import App, { AppRoutes } from './App'; +import { FEED_NAMES } from './shared/models/feed-type'; +import { renderWithProviders, stubMatchMedia } from './test/renderWithProviders'; + +describe('App routing', () => { + it('redirects / to /news/1', async () => { + renderWithProviders(, { route: '/' }); + expect(await screen.findByTestId('feed')).toHaveAttribute('data-feed-type', 'news'); + expect(screen.getByTestId('location')).toHaveTextContent(/^\/news\/1$/); + }); + + it.each(FEED_NAMES)('renders the %s feed with the page param', (feedType) => { + renderWithProviders(, { route: `/${feedType}/3` }); + const feed = screen.getByTestId('feed'); + expect(feed).toHaveAttribute('data-feed-type', feedType); + expect(feed).toHaveAttribute('data-page', '3'); + }); + + it('lazy-loads the item details route', async () => { + renderWithProviders(, { route: '/item/8863' }); + expect(await screen.findByTestId('item-details')).toHaveAttribute('data-item-id', '8863'); + }); + + it('lazy-loads the user route', async () => { + renderWithProviders(, { route: '/user/pg' }); + expect(await screen.findByTestId('user-profile')).toHaveAttribute('data-user-id', 'pg'); + }); + + it.each(['/news', '/item', '/user', '/unknown/1'])('renders only the shell for unmatched %s', (route) => { + renderWithProviders(, { route }); + expect(screen.queryByTestId('theme-root')).not.toBeInTheDocument(); + expect(screen.queryByTestId('feed')).not.toBeInTheDocument(); + }); + + it('wraps the shell in header, footer and the persisted theme class', () => { + localStorage.setItem('theme', 'amoledblack'); + renderWithProviders(, { route: '/news/1' }); + expect(screen.getByTestId('theme-root')).toHaveClass('amoledblack'); + expect(screen.getByRole('banner')).toBeInTheDocument(); + expect(screen.getByRole('link', { name: 'GitHub' })).toBeInTheDocument(); + }); +}); describe('App', () => { - it('renders the app heading', () => { + it('boots with the browser router and redirects to /news/1', async () => { + stubMatchMedia(); + window.history.replaceState(null, '', '/'); render(); - expect(screen.getByRole('heading', { name: 'React HN' })).toBeInTheDocument(); + expect(await screen.findByTestId('feed')).toHaveAttribute('data-feed-type', 'news'); + expect(window.location.pathname).toBe('/news/1'); + }); +}); + +describe('page views', () => { + afterEach(() => { + delete window.ga; + }); + + it('reports the redirected URL and subsequent navigations to Google Analytics', async () => { + const ga = vi.fn(); + window.ga = ga; + renderWithProviders(, { route: '/' }); + await screen.findByTestId('feed'); + expect(ga).toHaveBeenCalledWith('set', 'page', '/news/1'); + expect(ga).toHaveBeenCalledWith('send', 'pageview'); + expect(ga).not.toHaveBeenCalledWith('set', 'page', '/'); + + ga.mockClear(); + await act(async () => screen.getByRole('link', { name: 'show' }).click()); + expect(ga).toHaveBeenCalledWith('set', 'page', '/show/1'); + }); + + it('does nothing when analytics is not loaded', () => { + expect(() => renderWithProviders(, { route: '/news/1' })).not.toThrow(); }); }); diff --git a/react/src/App.tsx b/react/src/App.tsx index f8e3a019f..23dbae89f 100644 --- a/react/src/App.tsx +++ b/react/src/App.tsx @@ -1,8 +1,63 @@ +import { lazy, Suspense } from 'react'; +import { BrowserRouter, Navigate, Outlet, Route, Routes } from 'react-router-dom'; +import { Header } from './core/Header/Header'; +import { Footer } from './core/Footer/Footer'; +import { Loader } from './shared/components/Loader/Loader'; +import { FEED_NAMES } from './shared/models/feed-type'; +import { SettingsProvider } from './shared/services/SettingsProvider'; +import { useSettings } from './shared/services/useSettings'; +import { usePageViews } from './shared/hooks/usePageViews'; +import Feed from './feeds/Feed'; +import './App.scss'; + +const ItemDetails = lazy(() => import('./item-details/ItemDetails')); +const UserProfile = lazy(() => import('./user/UserProfile')); + +export function AppLayout() { + const { settings } = useSettings(); + usePageViews(); + + return ( +
+
+
+
+ }> + + +
+
+
+ ); +} + +/** Mirrors src/app/app.routes.ts (plus the lazy item/user child routes). */ +export function AppRoutes() { + return ( + + }> + } /> + {FEED_NAMES.map((feedType) => ( + } + /> + ))} + } /> + } /> + + + ); +} + function App() { return ( -
-

React HN

-
+ + + + + ); } diff --git a/react/src/core/Footer/Footer.scss b/react/src/core/Footer/Footer.scss new file mode 100644 index 000000000..a087d740d --- /dev/null +++ b/react/src/core/Footer/Footer.scss @@ -0,0 +1,22 @@ +@use '../../styles/media' as *; + +#footer { + position: relative; + padding: 10px; + height: 60px; + letter-spacing: 0.7px; + text-align: center; + + a { + font-weight: bold; + text-decoration: none; + + &:hover { + text-decoration: underline; + } + } + + @media #{$mobile-only} { + display: none; + } +} diff --git a/react/src/core/Footer/Footer.test.tsx b/react/src/core/Footer/Footer.test.tsx new file mode 100644 index 000000000..358769ebd --- /dev/null +++ b/react/src/core/Footer/Footer.test.tsx @@ -0,0 +1,13 @@ +import { render, screen } from '@testing-library/react'; +import { Footer } from './Footer'; + +describe('Footer', () => { + it('links to the project on GitHub in a new tab', () => { + render(