From 6ae219abff4d1fc3096c5a356d7c48f2b1e1e54a Mon Sep 17 00:00:00 2001 From: Yufa <112290188+01001101CK@users.noreply.github.com> Date: Thu, 4 Sep 2025 16:00:25 -0700 Subject: [PATCH 1/6] add a 404 page Signed-off-by: Yufa <112290188+01001101CK@users.noreply.github.com> --- src/layouts/base.css | 1 + src/pages/404.astro | 109 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 src/pages/404.astro diff --git a/src/layouts/base.css b/src/layouts/base.css index c05440b..8a5e997 100644 --- a/src/layouts/base.css +++ b/src/layouts/base.css @@ -11,6 +11,7 @@ --colorBlueBright6: #196d9a; --colorBlueDull3: #b0ccd7; --colorBlueDull6: #58646b; + --colorBorderLight: #e0e0e0; --colorBlue1: #bcdfe9; --colorBlue2: #38ced6; --colorBlue3: #116d9a; diff --git a/src/pages/404.astro b/src/pages/404.astro new file mode 100644 index 0000000..891462f --- /dev/null +++ b/src/pages/404.astro @@ -0,0 +1,109 @@ +--- +import PageLayout from "~/layouts/PageLayout.astro"; +--- + + +
+
+
404: NOT_FOUND
+
Code: `NOT_FOUND`
+
+ You've drifted into uncharted waters. Navigate back to the surface? +
+
+ + Home Page +
+ + + From 807d5387bd5e672c44ba39ca2c4656eea04239bf Mon Sep 17 00:00:00 2001 From: Yufa <112290188+01001101CK@users.noreply.github.com> Date: Tue, 16 Sep 2025 14:35:32 -0700 Subject: [PATCH 2/6] 1) reduce the number of extra colors in the color scheme. 2) remove specific .dark theme --- src/layouts/base.css | 1 - src/pages/404.astro | 46 ++++++++++---------------------------------- 2 files changed, 10 insertions(+), 37 deletions(-) diff --git a/src/layouts/base.css b/src/layouts/base.css index 8a5e997..c05440b 100644 --- a/src/layouts/base.css +++ b/src/layouts/base.css @@ -11,7 +11,6 @@ --colorBlueBright6: #196d9a; --colorBlueDull3: #b0ccd7; --colorBlueDull6: #58646b; - --colorBorderLight: #e0e0e0; --colorBlue1: #bcdfe9; --colorBlue2: #38ced6; --colorBlue3: #116d9a; diff --git a/src/pages/404.astro b/src/pages/404.astro index 891462f..7b4204c 100644 --- a/src/pages/404.astro +++ b/src/pages/404.astro @@ -29,8 +29,8 @@ import PageLayout from "~/layouts/PageLayout.astro"; } .error-box { - background: var(--colorSandLight); - border: 1px solid var(--colorBorderLight); + background: var(--colorSandBackground); + border: 1px solid var(--colorSandLight); border-radius: 8px; padding: 2rem; margin-bottom: 2rem; @@ -44,66 +44,40 @@ import PageLayout from "~/layouts/PageLayout.astro"; font-family: var(--fontFamilyHeading); font-size: var(--fontSizeLarge); font-weight: var(--fontWeightBold); - color: var(--colorBlackIsh); + color: var(--colorSandForeground); margin-bottom: 0.5rem; } .error-code { font-family: var(--fontFamilyBody); font-size: var(--fontSizeSmall); - color: var(--colorBlackIsh); + color: var(--colorSandForeground); margin-bottom: 1rem; } .error-message { font-family: var(--fontFamilyBody); font-size: var(--fontSizeSmall); - color: var(--colorBlackIsh); + color: var(--colorSandForeground); line-height: 1.5; } .home-link { - background: var(--colorSandLight); - border: 1px solid var(--colorBlue3); + background: var(--colorSandBackground); + border: 1px solid var(--colorSandForeground); border-radius: 4px; - color: var(--colorBlue3); + color: var(--colorSandForeground); text-decoration: none; padding: 0.75rem 1.5rem; font-family: var(--fontFamilyBody); font-size: var(--fontSizeSmall); text-align: center; - transition: all var(--transitionMedium); + transition: all var(--colorBlue3); display: inline-block; } .home-link:hover { background: var(--colorBlue3); - color: var(--colorWhiteIsh); - } - - :global(.dark) .error-container { - background: var(--colorSandLight); - } - - :global(.dark) .error-box { - background: var(--colorSandBackground); - border-color: var(--colorBlueDull3); - } - - :global(.dark) .error-title, - :global(.dark) .error-code, - :global(.dark) .error-message { - color: var(--colorSandForeground); - } - - :global(.dark) .home-link { - background: var(--colorSandBackground); - border-color: var(--colorBlue2); - color: var(--colorWhiteIsh); - } - - :global(.dark) .home-link:hover { - background: var(--colorBlue3); - color: var(--colorButtonColor); + color: var(--colorForegroundAccent); } From c268431f38d173ac4aa5d44f38cc61f8de88542a Mon Sep 17 00:00:00 2001 From: Yufa <112290188+01001101CK@users.noreply.github.com> Date: Tue, 28 Oct 2025 16:24:31 -0700 Subject: [PATCH 3/6] Update src/pages/404.astro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change div to h1 Co-authored-by: Josh Goldberg ✨ --- src/pages/404.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/404.astro b/src/pages/404.astro index 7b4204c..6662aa7 100644 --- a/src/pages/404.astro +++ b/src/pages/404.astro @@ -5,7 +5,7 @@ import PageLayout from "~/layouts/PageLayout.astro";
-
404: NOT_FOUND
+

404: NOT_FOUND

Code: `NOT_FOUND`
You've drifted into uncharted waters. Navigate back to the surface? From 3a1829f0f8f7e34bfbee169b9bbc71b7f937b5fd Mon Sep 17 00:00:00 2001 From: Yufa <112290188+01001101CK@users.noreply.github.com> Date: Tue, 28 Oct 2025 16:25:15 -0700 Subject: [PATCH 4/6] Update src/pages/404.astro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit making the box more prominent Co-authored-by: Josh Goldberg ✨ --- src/pages/404.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/404.astro b/src/pages/404.astro index 6662aa7..0c2bcf8 100644 --- a/src/pages/404.astro +++ b/src/pages/404.astro @@ -23,7 +23,7 @@ import PageLayout from "~/layouts/PageLayout.astro"; align-items: center; justify-content: center; min-height: 60vh; - padding: 2rem; + padding: 0 2rem 4rem; height: 100vh; background: var(--colorSandBackground); } From 6d38354784fd4c3c42d8175663d13a487330b328 Mon Sep 17 00:00:00 2001 From: Yufa <112290188+01001101CK@users.noreply.github.com> Date: Tue, 28 Oct 2025 16:25:58 -0700 Subject: [PATCH 5/6] Update src/pages/404.astro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit use existing button component Co-authored-by: Josh Goldberg ✨ --- src/pages/404.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/404.astro b/src/pages/404.astro index 0c2bcf8..cd0ebad 100644 --- a/src/pages/404.astro +++ b/src/pages/404.astro @@ -12,7 +12,7 @@ import PageLayout from "~/layouts/PageLayout.astro";
- Home Page +
From 9dfc0cab4c217d45850749146d1f04f886ee4491 Mon Sep 17 00:00:00 2001 From: Yufa <112290188+01001101CK@users.noreply.github.com> Date: Tue, 4 Nov 2025 10:31:10 -0800 Subject: [PATCH 6/6] - Fixed Node.js engine warning - added pnpm.peerDependencyRules in package.json to allow @astrojs/markdown-remark v6 and astro v5 for packages that haven't updated their peer dependency ranges. - Upgraded dependencies --- astro.config.ts | 3 --- package.json | 13 ++++++++++++- pnpm-lock.yaml | 11 +++++++---- src/components/ImagesAndTextTwoColumn.astro | 8 ++------ src/components/explainers/ExplainerImages.astro | 6 +----- src/pages/404.astro | 2 +- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/astro.config.ts b/astro.config.ts index a144d59..e03a164 100644 --- a/astro.config.ts +++ b/astro.config.ts @@ -6,9 +6,6 @@ export default defineConfig({ adapter: vercel({ webAnalytics: { enabled: true }, }), - experimental: { - responsiveImages: true, - }, integrations: [konamiEmojiBlast()], output: "server", redirects: { diff --git a/package.json b/package.json index 3ed6e49..b1e38d9 100644 --- a/package.json +++ b/package.json @@ -77,9 +77,20 @@ "typescript-eslint": "^8.32.1" }, "engines": { - "node": "20.11.0" + "node": ">=20.11.0" }, "publishConfig": { "provenance": true + }, + "pnpm": { + "peerDependencyRules": { + "allowedVersions": { + "@astrojs/markdown-remark": "6", + "astro": "5" + } + }, + "ignoredBuiltDependencies": [ + "sharp" + ] } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a7809fd..0654efd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1236,6 +1236,7 @@ packages: '@vercel/edge@1.2.1': resolution: {integrity: sha512-1++yncEyIAi68D3UEOlytYb1IUcIulMWdoSzX2h9LuSeeyR7JtaIgR8DcTQ6+DmYOQn+5MCh6LY+UmK6QBByNA==} + deprecated: This package is deprecated. You should to use `@vercel/functions` instead. '@vercel/nft@0.29.3': resolution: {integrity: sha512-aVV0E6vJpuvImiMwU1/5QKkw2N96BRFE7mBYGS7FhXUoS6V7SarQ+8tuj33o7ofECz8JtHpmQ9JW+oVzOoB7MA==} @@ -1736,8 +1737,8 @@ packages: emmet@2.4.11: resolution: {integrity: sha512-23QPJB3moh/U9sT4rQzGgeyyGIrcM+GH5uVYg2C6wZIxAIJq7Ng3QLT79tl8FUwDXhyq9SusfknOrofAKqvgyQ==} - emoji-blast@0.10.2: - resolution: {integrity: sha512-3VrqajirPj8QeQxQeMHUfD+03H64XTEVPGRjxP5rjDCVEC5NGF3FgutMpU5scIOhcuzG23Qvs32k0Pnj+hRzGA==} + emoji-blast@0.11.0: + resolution: {integrity: sha512-RYy1ZjHqYQLjOkficpqzvAzGfE1GUcn1Bp7Ec1wq0lVIoRgNLMx4lRZWo9p0HsEawrI9Zmh0mloLXcf8ewIzfQ==} engines: {node: '>=18'} emoji-regex@10.4.0: @@ -1858,6 +1859,7 @@ packages: eslint-plugin-markdown@5.1.0: resolution: {integrity: sha512-SJeyKko1K6GwI0AN6xeCDToXDkfKZfXcexA6B+O2Wr2btUS9GrC+YgwSyVli5DJnctUHjFXcQ2cqTaAmVoLi2A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + deprecated: Please use @eslint/markdown instead peerDependencies: eslint: '>=8' @@ -3255,6 +3257,7 @@ packages: source-map@0.8.0-beta.0: resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==} engines: {node: '>= 8'} + deprecated: The work that was done in this beta branch won't be included in future versions space-separated-tokens@2.0.2: resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==} @@ -5540,7 +5543,7 @@ snapshots: '@emmetio/abbreviation': 2.3.3 '@emmetio/css-abbreviation': 2.1.8 - emoji-blast@0.10.2: {} + emoji-blast@0.11.0: {} emoji-regex@10.4.0: {} @@ -6330,7 +6333,7 @@ snapshots: konami-emoji-blast@0.5.9: dependencies: - emoji-blast: 0.10.2 + emoji-blast: 0.11.0 konami-code-js: 0.8.3 levn@0.4.1: diff --git a/src/components/ImagesAndTextTwoColumn.astro b/src/components/ImagesAndTextTwoColumn.astro index d91e15f..03a7c08 100644 --- a/src/components/ImagesAndTextTwoColumn.astro +++ b/src/components/ImagesAndTextTwoColumn.astro @@ -23,7 +23,7 @@ interface Props {
- +
@@ -37,11 +37,7 @@ interface Props {
- { - Astro.props.images.secondary.map((image) => ( - - )) - } + {Astro.props.images.secondary.map((image) => )}
diff --git a/src/components/explainers/ExplainerImages.astro b/src/components/explainers/ExplainerImages.astro index be57511..6d45b13 100644 --- a/src/components/explainers/ExplainerImages.astro +++ b/src/components/explainers/ExplainerImages.astro @@ -44,11 +44,7 @@ function computeImageSizes(
- + { Astro.props.photos.secondary.map((secondary, i) => (