diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..1a2f5bd --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +lts/* \ No newline at end of file diff --git a/astro.config.ts b/astro.config.ts index c622789..514f6ca 100644 --- a/astro.config.ts +++ b/astro.config.ts @@ -20,6 +20,7 @@ export default defineConfig({ }, }), ], + devToolbar: { enabled: false }, server: { port: 12499, host: true, diff --git a/bun.lockb b/bun.lockb index b0ba212..e7dda1b 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/package.json b/package.json index 48d4b34..2aff2f1 100644 --- a/package.json +++ b/package.json @@ -10,15 +10,20 @@ "astro": "astro", "upgrade": "ncu", "script:download-payload-sdk": "bun run scripts/download-payload-sdk.ts", - "script:download-currencies": "bun run scripts/download-currencies.ts" + "script:download-currencies": "bun run scripts/download-currencies.ts", + "script:download-wording-keys": "bun run scripts/download-wording-keys.ts" + }, + "engines": { + "npm": ">=10.0.0", + "node": ">=19.7.0" }, "dependencies": { - "@astrojs/check": "^0.5.4", - "@astrojs/node": "^8.2.0", + "@astrojs/check": "^0.5.6", + "@astrojs/node": "^8.2.1", "@fontsource-variable/murecho": "^5.0.17", "@fontsource-variable/vollkorn": "^5.0.19", "accept-language": "^3.0.18", - "astro": "4.3.7", + "astro": "4.4.6", "astro-icon": "^1.1.0", "node-cache": "^5.1.2", "tippy.js": "^6.3.7", @@ -26,13 +31,13 @@ "zod": "^3.22.4" }, "devDependencies": { - "@iconify-json/material-symbols": "^1.1.72", + "@iconify-json/material-symbols": "^1.1.73", "@types/ua-parser-js": "^0.7.39", "astro-meta-tags": "^0.2.1", "autoprefixer": "^10.4.17", - "bun-types": "^1.0.26", + "bun-types": "^1.0.29", "npm-check-updates": "^16.14.15", - "postcss-preset-env": "^9.3.0", + "postcss-preset-env": "^9.4.0", "ts-node": "^10.9.2", "typescript": "^5.3.3" } diff --git a/src/components/AppLayout/AppEmptyLayout.astro b/src/components/AppLayout/AppEmptyLayout.astro index dad44e9..0a3bb11 100644 --- a/src/components/AppLayout/AppEmptyLayout.astro +++ b/src/components/AppLayout/AppEmptyLayout.astro @@ -1,16 +1,23 @@ --- import Html from "./components/Html.astro"; -import Topbar from "./components/Topbar.astro"; +import Topbar from "./components/Topbar/Topbar.astro"; import Footer from "./components/Footer.astro"; -import type { ComponentProps } from "astro/types"; +import type { ParentPage } from "src/shared/payload/payload-sdk"; +import AppLayoutBackgroundImg from "./components/AppLayoutBackgroundImg.astro"; interface Props { - parentPages?: ComponentProps["parentPages"]; + parentPages?: ParentPage[]; metaTitle?: string; hideFooterLinks?: boolean; + backgroundIllustration?: string | undefined; } -const { metaTitle, hideFooterLinks = false, parentPages } = Astro.props; +const { + metaTitle, + hideFooterLinks = false, + parentPages, + backgroundIllustration, +} = Astro.props; --- { @@ -19,6 +26,11 @@ const { metaTitle, hideFooterLinks = false, parentPages } = Astro.props;
+ { + backgroundIllustration && ( + + ) + }
diff --git a/src/components/AppLayout/AppLayout.astro b/src/components/AppLayout/AppLayout.astro index 4151ea0..126a206 100644 --- a/src/components/AppLayout/AppLayout.astro +++ b/src/components/AppLayout/AppLayout.astro @@ -1,7 +1,7 @@ --- import Html from "./components/Html.astro"; import AppLayoutBackgroundImg from "./components/AppLayoutBackgroundImg.astro"; -import Topbar from "./components/Topbar.astro"; +import Topbar from "./components/Topbar/Topbar.astro"; import Footer from "./components/Footer.astro"; import AppLayoutTitle from "./components/AppLayoutTitle.astro"; import type { ComponentProps } from "astro/types"; diff --git a/src/components/AppLayout/components/AppLayoutBackgroundImg.astro b/src/components/AppLayout/components/AppLayoutBackgroundImg.astro index 06bd78a..2c2b1bd 100644 --- a/src/components/AppLayout/components/AppLayoutBackgroundImg.astro +++ b/src/components/AppLayout/components/AppLayoutBackgroundImg.astro @@ -25,7 +25,6 @@ const styleNoScript = ` } {alt} -