From 5bb2ffe80d259792493bc21ed296730735838694 Mon Sep 17 00:00:00 2001 From: Andreas Kollegger Date: Fri, 17 Jan 2025 15:21:58 +0000 Subject: [PATCH] (web) revised footer to be full-width site footer (was page/content footer) --- astro.config.mjs | 2 +- package-lock.json | 173 ++++++++++-------- package.json | 8 +- src/components/GrPageFrame.astro | 106 +++++++++++ .../{GrFooter.astro => GrSiteFooter.astro} | 36 +--- src/content/config.ts | 3 +- 6 files changed, 219 insertions(+), 109 deletions(-) create mode 100644 src/components/GrPageFrame.astro rename src/components/{GrFooter.astro => GrSiteFooter.astro} (81%) diff --git a/astro.config.mjs b/astro.config.mjs index 8f51623..394e0e1 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -116,7 +116,7 @@ export default defineConfig({ ] }], components: { - Footer: './src/components/GrFooter.astro' + PageFrame: './src/components/GrPageFrame.astro', } }), tailwind({applyBaseStyles: false})] }); diff --git a/package-lock.json b/package-lock.json index b4fcabf..bda4ad6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,13 +9,13 @@ "version": "0.0.1", "dependencies": { "@astrojs/check": "^0.9.4", - "@astrojs/starlight": "^0.30.5", + "@astrojs/starlight": "^0.31.0", "@astrojs/starlight-tailwind": "^3.0.0", "@astrojs/tailwind": "^5.1.4", - "@effect/platform-node": "^0.68.1", - "astro": "^5.1.4", + "@effect/platform-node": "^0.68.2", + "astro": "^5.1.6", "date-fns": "^4.1.0", - "effect": "^3.12.1", + "effect": "^3.12.2", "sharp": "^0.33.5", "tailwindcss": "^3.4.17", "typescript": "^5.7.3", @@ -134,9 +134,9 @@ } }, "node_modules/@astrojs/mdx": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@astrojs/mdx/-/mdx-4.0.4.tgz", - "integrity": "sha512-w68BeD6K3mjyZbLtg9+ahCs+uFxDXfwD2Lb8zBwBOyDvAFvkgG4VqqHP+hwAUvgxLuH3GbadQhV1fv7NEbrxPg==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/@astrojs/mdx/-/mdx-4.0.5.tgz", + "integrity": "sha512-JhMCm4wf94PNHQDWKyez2ZVLcG5R6Cyjk8TmpqYVRrOTuU3GIWeDAoum7Q1p05SFD+nYwvXOcv42/m8pE3Ylug==", "license": "MIT", "dependencies": { "@astrojs/markdown-remark": "6.0.1", @@ -184,18 +184,18 @@ } }, "node_modules/@astrojs/starlight": { - "version": "0.30.5", - "resolved": "https://registry.npmjs.org/@astrojs/starlight/-/starlight-0.30.5.tgz", - "integrity": "sha512-enQISKa2K3DtFqU55PT8zskCT7180DJwOT9yFVh9MYT4csolvCBu2RVjQeXu7z+3hoLHvCcofN8FshCLA+iQQQ==", + "version": "0.31.0", + "resolved": "https://registry.npmjs.org/@astrojs/starlight/-/starlight-0.31.0.tgz", + "integrity": "sha512-O70j7m42wp0EcX26Vsm8i37KSlcoHNFY6VLMbJKWKel6XRHS+IVG6AePcpBNS1I+FKkkcagTFJfy3X3n2dDo4Q==", "license": "MIT", "dependencies": { - "@astrojs/mdx": "^4.0.1", - "@astrojs/sitemap": "^3.1.6", - "@pagefind/default-ui": "^1.0.3", + "@astrojs/mdx": "^4.0.5", + "@astrojs/sitemap": "^3.2.1", + "@pagefind/default-ui": "^1.3.0", "@types/hast": "^3.0.4", "@types/js-yaml": "^4.0.9", "@types/mdast": "^4.0.4", - "astro-expressive-code": "^0.38.3", + "astro-expressive-code": "^0.40.0", "bcp-47": "^2.1.0", "hast-util-from-html": "^2.0.1", "hast-util-select": "^6.0.2", @@ -206,7 +206,7 @@ "mdast-util-directive": "^3.0.0", "mdast-util-to-markdown": "^2.1.0", "mdast-util-to-string": "^4.0.0", - "pagefind": "^1.0.3", + "pagefind": "^1.3.0", "rehype": "^13.0.1", "rehype-format": "^5.0.0", "remark-directive": "^3.0.0", @@ -215,7 +215,7 @@ "vfile": "^6.0.2" }, "peerDependencies": { - "astro": "^5.0.0" + "astro": "^5.1.5" } }, "node_modules/@astrojs/starlight-tailwind": { @@ -339,9 +339,9 @@ } }, "node_modules/@effect/platform": { - "version": "0.72.1", - "resolved": "https://registry.npmjs.org/@effect/platform/-/platform-0.72.1.tgz", - "integrity": "sha512-hCnO9cWsz0yns5lYVxCPBEmy9RAqcTZ7USYgwpFBLpcpNo3uzzVnU69gfBxyq2sYvTHF7yYvH1J42NfOdnof0w==", + "version": "0.72.2", + "resolved": "https://registry.npmjs.org/@effect/platform/-/platform-0.72.2.tgz", + "integrity": "sha512-7oWNTyrlkDoopA2kEm2s3M1VAJETnIK/bVlW4qqEVbKLern8znPotIx1fRNtTIUANPKhUMclC3Jt+R+3UEUdUw==", "license": "MIT", "peer": true, "dependencies": { @@ -349,37 +349,37 @@ "multipasta": "^0.2.5" }, "peerDependencies": { - "effect": "^3.12.1" + "effect": "^3.12.2" } }, "node_modules/@effect/platform-node": { - "version": "0.68.1", - "resolved": "https://registry.npmjs.org/@effect/platform-node/-/platform-node-0.68.1.tgz", - "integrity": "sha512-bN0Gd/C7yOjq7liooajvWC+Ev2BBcrGOfUuuY3ZOSc8Jwm1beyDW1Hl6W95FSiHIom/VCFxdv+2yVj7EYe7Zbg==", + "version": "0.68.2", + "resolved": "https://registry.npmjs.org/@effect/platform-node/-/platform-node-0.68.2.tgz", + "integrity": "sha512-+eufA82A1ObZWrWDPPcCCRpo+WZ5J32oeA3VDSiznqKcd97FxlHMf4M8WoHt/sx4zxpKrGPwTlnKXCTENiXU0Q==", "license": "MIT", "dependencies": { - "@effect/platform-node-shared": "^0.22.1", + "@effect/platform-node-shared": "^0.22.2", "mime": "^3.0.0", "undici": "^7.1.0", "ws": "^8.18.0" }, "peerDependencies": { - "@effect/platform": "^0.72.1", - "effect": "^3.12.1" + "@effect/platform": "^0.72.2", + "effect": "^3.12.2" } }, "node_modules/@effect/platform-node-shared": { - "version": "0.22.1", - "resolved": "https://registry.npmjs.org/@effect/platform-node-shared/-/platform-node-shared-0.22.1.tgz", - "integrity": "sha512-ammGqV0Y73uwN2lLHXMhd4pTGZ/5Fqpb4fHOL6NjaTO1Hf9Ji/qqRwNy1+buRuGkXCWIAgeaysEVI7ltms8/pw==", + "version": "0.22.2", + "resolved": "https://registry.npmjs.org/@effect/platform-node-shared/-/platform-node-shared-0.22.2.tgz", + "integrity": "sha512-LRmcC2NSzxdJLXc22tHuTau63Mn/TjOz5UKEAcVCOrNTnDx1zXTP4UwDTkvlko6P8PEUElMqjcUOr2jwR19/UQ==", "license": "MIT", "dependencies": { "@parcel/watcher": "^2.4.1", "multipasta": "^0.2.5" }, "peerDependencies": { - "@effect/platform": "^0.72.1", - "effect": "^3.12.1" + "@effect/platform": "^0.72.2", + "effect": "^3.12.2" } }, "node_modules/@emmetio/abbreviation": { @@ -848,9 +848,9 @@ } }, "node_modules/@expressive-code/core": { - "version": "0.38.3", - "resolved": "https://registry.npmjs.org/@expressive-code/core/-/core-0.38.3.tgz", - "integrity": "sha512-s0/OtdRpBONwcn23O8nVwDNQqpBGKscysejkeBkwlIeHRLZWgiTVrusT5Idrdz1d8cW5wRk9iGsAIQmwDPXgJg==", + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@expressive-code/core/-/core-0.40.0.tgz", + "integrity": "sha512-vKRxKaDVhSozGPETcPOB7NF8sn1ICZoO/UfUWs/4o+XmDIOSX7cBQX8BVukenvSksdv5Aaf/teuGzjxX0a7Ibw==", "license": "MIT", "dependencies": { "@ctrl/tinycolor": "^4.0.4", @@ -865,31 +865,31 @@ } }, "node_modules/@expressive-code/plugin-frames": { - "version": "0.38.3", - "resolved": "https://registry.npmjs.org/@expressive-code/plugin-frames/-/plugin-frames-0.38.3.tgz", - "integrity": "sha512-qL2oC6FplmHNQfZ8ZkTR64/wKo9x0c8uP2WDftR/ydwN/yhe1ed7ZWYb8r3dezxsls+tDokCnN4zYR594jbpvg==", + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@expressive-code/plugin-frames/-/plugin-frames-0.40.0.tgz", + "integrity": "sha512-lIbGPFy29Oaf0zV9BNLH6wRPqINz69KUz7PHCUqT3/Mptgp942CzNynbuaZeNPU10quNV072EsOMim569NmSyA==", "license": "MIT", "dependencies": { - "@expressive-code/core": "^0.38.3" + "@expressive-code/core": "^0.40.0" } }, "node_modules/@expressive-code/plugin-shiki": { - "version": "0.38.3", - "resolved": "https://registry.npmjs.org/@expressive-code/plugin-shiki/-/plugin-shiki-0.38.3.tgz", - "integrity": "sha512-kqHnglZeesqG3UKrb6e9Fq5W36AZ05Y9tCREmSN2lw8LVTqENIeCIkLDdWtQ5VoHlKqwUEQFTVlRehdwoY7Gmw==", + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@expressive-code/plugin-shiki/-/plugin-shiki-0.40.0.tgz", + "integrity": "sha512-1sb7S/FL1Oqr+MX4Up/LLTFmmlLfd2NyQA+I5TL1PKHHZKptCohmuyekvnPUmMLMnDlm0u2iuR2qxBpjElhf5g==", "license": "MIT", "dependencies": { - "@expressive-code/core": "^0.38.3", - "shiki": "^1.22.2" + "@expressive-code/core": "^0.40.0", + "shiki": "^1.26.1" } }, "node_modules/@expressive-code/plugin-text-markers": { - "version": "0.38.3", - "resolved": "https://registry.npmjs.org/@expressive-code/plugin-text-markers/-/plugin-text-markers-0.38.3.tgz", - "integrity": "sha512-dPK3+BVGTbTmGQGU3Fkj3jZ3OltWUAlxetMHI6limUGCWBCucZiwoZeFM/WmqQa71GyKRzhBT+iEov6kkz2xVA==", + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/@expressive-code/plugin-text-markers/-/plugin-text-markers-0.40.0.tgz", + "integrity": "sha512-NvorTEKWHfSE8yg9aUJn6Kb2zUah8VxvCg4HwnHq62AMW8Yu1WwtjLgqCiLIA17EcWlWKsq5dfs4q0K/hVe0mQ==", "license": "MIT", "dependencies": { - "@expressive-code/core": "^0.38.3" + "@expressive-code/core": "^0.40.0" } }, "node_modules/@img/sharp-darwin-arm64": { @@ -2631,9 +2631,9 @@ } }, "node_modules/astro": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/astro/-/astro-5.1.4.tgz", - "integrity": "sha512-V0XD2GlwUweCROYv+QKs97p7I1cZ6mYycU3VKGbJv2l55suTTy766F/MtHgoM/VAFdPBn488MUvDAYx85gf/Zw==", + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/astro/-/astro-5.1.6.tgz", + "integrity": "sha512-LpTazCIW6syxFePi65gg2ptqqC2kR+PDRym3V23hEQj5yCf+T0t5v9qtp3fW0/+6G+JvP0EprCfCRTt7h/hexg==", "license": "MIT", "dependencies": { "@astrojs/compiler": "^2.10.3", @@ -2704,17 +2704,21 @@ "npm": ">=9.6.5", "pnpm": ">=7.1.0" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/astrodotbuild" + }, "optionalDependencies": { "sharp": "^0.33.3" } }, "node_modules/astro-expressive-code": { - "version": "0.38.3", - "resolved": "https://registry.npmjs.org/astro-expressive-code/-/astro-expressive-code-0.38.3.tgz", - "integrity": "sha512-Tvdc7RV0G92BbtyEOsfJtXU35w41CkM94fOAzxbQP67Wj5jArfserJ321FO4XA7WG9QMV0GIBmQq77NBIRDzpQ==", + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/astro-expressive-code/-/astro-expressive-code-0.40.0.tgz", + "integrity": "sha512-dsnUTXAOwiRLnIjqTcb4dhpsa7BDNImaXlkN0fFrJx2CumZe0tW+pgwTWqxv3haejo9KKih2j6UTMVRq1cTpig==", "license": "MIT", "dependencies": { - "rehype-expressive-code": "^0.38.3" + "rehype-expressive-code": "^0.40.0" }, "peerDependencies": { "astro": "^4.0.0-beta || ^5.0.0-beta || ^3.3.0" @@ -3495,9 +3499,9 @@ "license": "MIT" }, "node_modules/effect": { - "version": "3.12.1", - "resolved": "https://registry.npmjs.org/effect/-/effect-3.12.1.tgz", - "integrity": "sha512-aAZdh56Yp1ehOFYeMcHHctTtxfqm6kkOdZFTXK6Zf0QoaKKc1hPG6ocjrKOc0axE8JbG4eZw351ogNLrM4vo9w==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/effect/-/effect-3.12.2.tgz", + "integrity": "sha512-PslVtcxwapLj95icHZJ/ribCS4O26I4o8ga9zzSdLqRTPRBobwbLTJ2E/Bzim5knJjTutfNdVHOGzl8FW03K5Q==", "license": "MIT", "dependencies": { "fast-check": "^3.23.1" @@ -3766,15 +3770,15 @@ } }, "node_modules/expressive-code": { - "version": "0.38.3", - "resolved": "https://registry.npmjs.org/expressive-code/-/expressive-code-0.38.3.tgz", - "integrity": "sha512-COM04AiUotHCKJgWdn7NtW2lqu8OW8owAidMpkXt1qxrZ9Q2iC7+tok/1qIn2ocGnczvr9paIySgGnEwFeEQ8Q==", + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/expressive-code/-/expressive-code-0.40.0.tgz", + "integrity": "sha512-yBauWlZ6/G4S7WMfQdENbxpwr0qKHabu5w/uFLoTb3xvg2eo4ttk0aAy0IJTm/0+v12YaCG+Gt5Va0AEnTEXng==", "license": "MIT", "dependencies": { - "@expressive-code/core": "^0.38.3", - "@expressive-code/plugin-frames": "^0.38.3", - "@expressive-code/plugin-shiki": "^0.38.3", - "@expressive-code/plugin-text-markers": "^0.38.3" + "@expressive-code/core": "^0.40.0", + "@expressive-code/plugin-frames": "^0.40.0", + "@expressive-code/plugin-shiki": "^0.40.0", + "@expressive-code/plugin-text-markers": "^0.40.0" } }, "node_modules/extend": { @@ -5104,9 +5108,9 @@ } }, "node_modules/mdast-util-mdx-jsx": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-3.1.3.tgz", - "integrity": "sha512-bfOjvNt+1AcbPLTFMFWY149nJz0OjmewJs3LQQ5pIyVGxP4CdOqNVJL6kTaM5c68p8q82Xv3nCyFfUnuEcH3UQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/mdast-util-mdx-jsx/-/mdast-util-mdx-jsx-3.2.0.tgz", + "integrity": "sha512-lj/z8v0r6ZtsN/cGNNtemmmfoLAFZnjMbNyLzBafjzikOM+glrjNHPlf6lQDOTccj9n5b0PPihEBbhneMyGs1Q==", "license": "MIT", "dependencies": { "@types/estree-jsx": "^1.0.0", @@ -6617,16 +6621,17 @@ } }, "node_modules/prettier": { - "version": "2.8.7", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz", - "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz", + "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==", "license": "MIT", "optional": true, + "peer": true, "bin": { - "prettier": "bin-prettier.js" + "prettier": "bin/prettier.cjs" }, "engines": { - "node": ">=10.13.0" + "node": ">=14" }, "funding": { "url": "https://github.com/prettier/prettier?sponsor=1" @@ -6849,12 +6854,12 @@ } }, "node_modules/rehype-expressive-code": { - "version": "0.38.3", - "resolved": "https://registry.npmjs.org/rehype-expressive-code/-/rehype-expressive-code-0.38.3.tgz", - "integrity": "sha512-RYSSDkMBikoTbycZPkcWp6ELneANT4eTpND1DSRJ6nI2eVFUwTBDCvE2vO6jOOTaavwnPiydi4i/87NRyjpdOA==", + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/rehype-expressive-code/-/rehype-expressive-code-0.40.0.tgz", + "integrity": "sha512-nxZYcFYD3ceqX0VkFIWwJ6gcWasJ+af50MoLqXOg08stgYhgvyWkjqaVCVBpZoBmAQDu9Jkl3xzqUcse8DUfaA==", "license": "MIT", "dependencies": { - "expressive-code": "^0.38.3" + "expressive-code": "^0.40.0" } }, "node_modules/rehype-format": { @@ -9503,6 +9508,22 @@ "prettier": "2.8.7" } }, + "node_modules/yaml-language-server/node_modules/prettier": { + "version": "2.8.7", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.7.tgz", + "integrity": "sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==", + "license": "MIT", + "optional": true, + "bin": { + "prettier": "bin-prettier.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/yaml-language-server/node_modules/request-light": { "version": "0.5.8", "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.5.8.tgz", diff --git a/package.json b/package.json index ca2bb66..b22838a 100644 --- a/package.json +++ b/package.json @@ -12,13 +12,13 @@ }, "dependencies": { "@astrojs/check": "^0.9.4", - "@astrojs/starlight": "^0.30.5", + "@astrojs/starlight": "^0.31.0", "@astrojs/starlight-tailwind": "^3.0.0", "@astrojs/tailwind": "^5.1.4", - "@effect/platform-node": "^0.68.1", - "astro": "^5.1.4", + "@effect/platform-node": "^0.68.2", + "astro": "^5.1.6", "date-fns": "^4.1.0", - "effect": "^3.12.1", + "effect": "^3.12.2", "sharp": "^0.33.5", "tailwindcss": "^3.4.17", "typescript": "^5.7.3", diff --git a/src/components/GrPageFrame.astro b/src/components/GrPageFrame.astro new file mode 100644 index 0000000..f0880d4 --- /dev/null +++ b/src/components/GrPageFrame.astro @@ -0,0 +1,106 @@ +--- +import MobileMenuToggle from '@astrojs/starlight/components/MobileMenuToggle.astro'; +import type { Props } from '@astrojs/starlight/props'; +import GrSiteFooter from './GrSiteFooter.astro'; +const { hasSidebar } = Astro.props; +--- + +
+
+ { + hasSidebar && ( + + ) + } +
+ +
+
+ +
+
+ + \ No newline at end of file diff --git a/src/components/GrFooter.astro b/src/components/GrSiteFooter.astro similarity index 81% rename from src/components/GrFooter.astro rename to src/components/GrSiteFooter.astro index 80dad22..42ef26c 100644 --- a/src/components/GrFooter.astro +++ b/src/components/GrSiteFooter.astro @@ -8,22 +8,14 @@ import neo4jLogoImage from "../assets/images/neo4j-logo-white.png"; ---