diff --git a/.gitignore b/.gitignore index 99852fc..a7cd545 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,7 @@ pnpm-debug.log* # exclude default png images static/**/*.png -!static/embed.png \ No newline at end of file +!static/assets/embed.png +!static/assets/lurker.png +!static/assets/padoru.png +!static/assets/fedora.png \ No newline at end of file diff --git a/astro.config.mjs b/astro.config.mjs index bb6d99e..b870a24 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -1,10 +1,14 @@ import { defineConfig } from 'astro/config'; +// https://astro.build/config +import sitemap from "@astrojs/sitemap"; + // https://astro.build/config export default defineConfig({ - sitemap: true, - base: '/', - outDir: 'public', - publicDir: 'static', - site: 'https://firq.dev/' -}); + sitemap: true, + base: '/', + outDir: 'public', + publicDir: 'static', + site: 'https://firq.dev/', + integrations: [sitemap()] +}); \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index dd9e883..cc1ca31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "@firq/fgosite", "version": "0.1.1", "dependencies": { + "@astrojs/sitemap": "^1.2.1", "astro": "^2.0.2", "iconoir": "^6.1.0" } @@ -90,6 +91,15 @@ "node": ">=16.12.0" } }, + "node_modules/@astrojs/sitemap": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@astrojs/sitemap/-/sitemap-1.2.1.tgz", + "integrity": "sha512-nlKP1qc1ENZ61w+ep5RdsObjYWso4QdLGC5WyzssnKkgVDijHT61s/tHFfBWHhxqdjcw4x1V1um/eSQZPDTR3Q==", + "dependencies": { + "sitemap": "^7.1.1", + "zod": "^3.17.3" + } + }, "node_modules/@astrojs/telemetry": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@astrojs/telemetry/-/telemetry-2.0.0.tgz", @@ -995,9 +1005,7 @@ "node_modules/@types/node": { "version": "18.14.6", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz", - "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA==", - "optional": true, - "peer": true + "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA==" }, "node_modules/@types/parse5": { "version": "6.0.3", @@ -1009,6 +1017,14 @@ "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==" }, + "node_modules/@types/sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@types/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw==", + "dependencies": { + "@types/node": "*" + } + }, "node_modules/@types/unist": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", @@ -1119,6 +1135,11 @@ "node": ">=4" } }, + "node_modules/arg": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", + "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==" + }, "node_modules/argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -4077,6 +4098,11 @@ "suf-log": "^2.5.3" } }, + "node_modules/sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, "node_modules/section-matter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", @@ -4168,6 +4194,29 @@ "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" }, + "node_modules/sitemap": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-7.1.1.tgz", + "integrity": "sha512-mK3aFtjz4VdJN0igpIJrinf3EO8U8mxOPsTBzSsy06UtjZQJ3YY3o3Xa7zSc5nMqcMrRwlChHZ18Kxg0caiPBg==", + "dependencies": { + "@types/node": "^17.0.5", + "@types/sax": "^1.2.1", + "arg": "^5.0.0", + "sax": "^1.2.4" + }, + "bin": { + "sitemap": "dist/cli.js" + }, + "engines": { + "node": ">=12.0.0", + "npm": ">=5.6.0" + } + }, + "node_modules/sitemap/node_modules/@types/node": { + "version": "17.0.45", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz", + "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==" + }, "node_modules/slash": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", @@ -5028,6 +5077,15 @@ "prismjs": "^1.28.0" } }, + "@astrojs/sitemap": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@astrojs/sitemap/-/sitemap-1.2.1.tgz", + "integrity": "sha512-nlKP1qc1ENZ61w+ep5RdsObjYWso4QdLGC5WyzssnKkgVDijHT61s/tHFfBWHhxqdjcw4x1V1um/eSQZPDTR3Q==", + "requires": { + "sitemap": "^7.1.1", + "zod": "^3.17.3" + } + }, "@astrojs/telemetry": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@astrojs/telemetry/-/telemetry-2.0.0.tgz", @@ -5614,9 +5672,7 @@ "@types/node": { "version": "18.14.6", "resolved": "https://registry.npmjs.org/@types/node/-/node-18.14.6.tgz", - "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA==", - "optional": true, - "peer": true + "integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA==" }, "@types/parse5": { "version": "6.0.3", @@ -5628,6 +5684,14 @@ "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-1.20.2.tgz", "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==" }, + "@types/sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@types/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-pSAff4IAxJjfAXUG6tFkO7dsSbTmf8CtUpfhhZ5VhkRpC4628tJhh3+V6H1E+/Gs9piSzYKT5yzHO5M4GG9jkw==", + "requires": { + "@types/node": "*" + } + }, "@types/unist": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.6.tgz", @@ -5718,6 +5782,11 @@ "color-convert": "^1.9.0" } }, + "arg": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", + "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==" + }, "argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -7639,6 +7708,11 @@ "suf-log": "^2.5.3" } }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, "section-matter": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", @@ -7716,6 +7790,24 @@ "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" }, + "sitemap": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/sitemap/-/sitemap-7.1.1.tgz", + "integrity": "sha512-mK3aFtjz4VdJN0igpIJrinf3EO8U8mxOPsTBzSsy06UtjZQJ3YY3o3Xa7zSc5nMqcMrRwlChHZ18Kxg0caiPBg==", + "requires": { + "@types/node": "^17.0.5", + "@types/sax": "^1.2.1", + "arg": "^5.0.0", + "sax": "^1.2.4" + }, + "dependencies": { + "@types/node": { + "version": "17.0.45", + "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz", + "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==" + } + } + }, "slash": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz", diff --git a/package.json b/package.json index 728073d..1669075 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "astro": "astro" }, "dependencies": { + "@astrojs/sitemap": "^1.2.1", "astro": "^2.0.2", "iconoir": "^6.1.0" } diff --git a/src/components/ceCard.astro b/src/components/ceCard.astro index 9f773ae..de9fc5d 100644 --- a/src/components/ceCard.astro +++ b/src/components/ceCard.astro @@ -7,8 +7,8 @@ export interface Props { const { mlb, link, name } = Astro.props -const ce_img: string = `/ce/${link}.webp` -const mlb_ce: string = `/ce/mlb.webp` +const ce_img: string = `/assets/ce/${link}.webp` +const mlb_ce: string = `/assets/ce/mlb.webp` let mlb_image: string = 'mlbalign' if (mlb === 'false') { diff --git a/src/components/contactCard.astro b/src/components/contactCard.astro index 190990d..47ac3a1 100644 --- a/src/components/contactCard.astro +++ b/src/components/contactCard.astro @@ -6,7 +6,7 @@ export interface Props { } const { image, link, site } = Astro.props -const icon: string = `background-image: url('/social/${image}.webp')` +const icon: string = `background-image: url('/assets/social/${image}.webp')` --- diff --git a/src/components/favouriteCard.astro b/src/components/favouriteCard.astro index 3b68f7a..51dd363 100644 --- a/src/components/favouriteCard.astro +++ b/src/components/favouriteCard.astro @@ -8,7 +8,7 @@ export interface Props { const { link, image, origin, name } = Astro.props -const img: string = `/favourites/${image}.webp` +const img: string = `/assets/favourites/${image}.webp` --- diff --git a/src/components/navbar.astro b/src/components/navbar.astro index 060830c..a8fe435 100644 --- a/src/components/navbar.astro +++ b/src/components/navbar.astro @@ -3,7 +3,7 @@
- +