Moving static files, adding robots, adding sitemap

.gitignore

@@ -25,4 +25,7 @@ pnpm-debug.log*
 
 # exclude default png images
 static/**/*.png
-!static/embed.png
+!static/assets/embed.png
+!static/assets/lurker.png
+!static/assets/padoru.png
+!static/assets/fedora.png

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,
+  sitemap: true,
-    base: '/',
+  base: '/',
-    outDir: 'public',
+  outDir: 'public',
-    publicDir: 'static',
+  publicDir: 'static',
-    site: 'https://firq.dev/'
+  site: 'https://firq.dev/',
+  integrations: [sitemap()]
 });

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==",
+			"integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="
-			"optional": true,
-			"peer": true
 		},
 		"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==",
+			"integrity": "sha512-93+VvleD3mXwlLI/xASjw0FzKcwzl3OdTCzm1LaRfqgS21gfFtK3zDXM5Op9TeeMsJVOaJ2VRDpT9q4Y3d0AvA=="
-			"optional": true,
-			"peer": true
 		},
 		"@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",

package.json

@@ -11,6 +11,7 @@
 		"astro": "astro"
 	},
 	"dependencies": {
+		"@astrojs/sitemap": "^1.2.1",
 		"astro": "^2.0.2",
 		"iconoir": "^6.1.0"
 	}

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 ce_img: string = `/assets/ce/${link}.webp`
-const mlb_ce: string = `/ce/mlb.webp`
+const mlb_ce: string = `/assets/ce/mlb.webp`
 let mlb_image: string = 'mlbalign'
 
 if (mlb === 'false') {

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')`
 ---
 
 <a href={link} target="_blank" rel="noopener noreferrer" aria-label={site}>

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`
 ---
 
 <a href={link} target="_blank" rel="noopener noreferrer">

src/components/navbar.astro

@@ -3,7 +3,7 @@
 
 <header>
   <a href="/" rel="noopener noreferrer" aria-label="Home">
-    <img src="/logo.svg" alt="" />
+    <img src="/assets/logo.svg" alt="" />
   </a>
   <ul class="desktop">
     <slot />

src/components/servantCard.astro

@@ -13,8 +13,8 @@ export interface Props {
 const { bond10, ml, image_bond, image_servant, np, skills, level, name } =
   Astro.props
 
-const servant_img: string = `/servant/${image_servant}.webp`
+const servant_img: string = `/assets/servant/${image_servant}.webp`
-const bondce_img: string = `/ce/bond-ce/${image_bond}.webp`
+const bondce_img: string = `/assets/ce/bond-ce/${image_bond}.webp`
 let bondce_css: string = 'bond-ce'
 
 if (bond10 === 'false') {

src/components/taCard.astro

@@ -16,7 +16,7 @@ const options_date: Intl.DateTimeFormatOptions = {
 }
 
 const formatted_date = new Date(date).toLocaleDateString('de-DE', options_date)
-const icon: string = `background: url('/ta_icons/${image}.webp')`
+const icon: string = `background: url('/assets/ta_icons/${image}.webp')`
 
 let hasuser = ''
 if (user !== undefined) {

src/components/technologyCard.astro

@@ -7,7 +7,7 @@ export interface Props {
 
 const { image, link, title } = Astro.props
 
-const icon: string = `background-image: url('/technologies/${image}.webp')`
+const icon: string = `background-image: url('/assets/technologies/${image}.webp')`
 ---
 
 <a href={link} target="_blank" rel="noopener noreferrer" aria-label={title}>

src/layouts/Layout.astro

@@ -1,7 +1,7 @@
 ---
 import Navbar from '../components/navbar.astro'
 import NavbarEntry from '../components/navbarEntry.astro'
-import navdata from '../../static/_navdata.json'
+import navdata from '../../static/assets/data/_navdata.json'
 
 export interface Props {
   title: string
@@ -29,15 +29,16 @@ if (currentpage !== 'home') {
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width" />
-    <link rel="icon" type="image/ico" href="/favicon.ico" />
+    <link rel="icon" type="image/ico" href="/assets/favicon.ico" />
     <meta name="generator" content={Astro.generator} />
     <meta property="og:title" content={title} />
     <meta property="og:url" content={currPage} />
     <meta name="description" content={description} />
     <meta property="og:description" content={description} />
-    <meta property="og:image" content="/embed.png" />
+    <meta property="og:image" content="/assets/embed.png" />
     <meta property="og:type" content="website" />
     <meta property="og:locale" content="en_US" />
+    <link rel="sitemap" href="/sitemap-index.xml" />
     <title>{title}</title>
     <link
       rel="stylesheet"

src/layouts/customFooter.astro

@@ -37,7 +37,7 @@
       rel="noopener noreferrer">FGO Timers here</a
     >
     <div class="sticky-image-wrapper">
-      <img src="/lurker.png" alt="" />
+      <img src="/assets/lurker.png" alt="" />
     </div>
   </div>
   <br />
@@ -51,7 +51,7 @@
       >his site here</a
     >
     <div class="sticky-image-wrapper">
-      <img src="/fedora.png" alt="" />
+      <img src="/assets/fedora.png" alt="" />
     </div>
   </div>
   <br />
@@ -62,7 +62,7 @@
       rel="noopener noreferrer">AnthonyJ</a
     > for providing me with the custom Shishou favicon.
     <div class="sticky-image-wrapper">
-      <img src="/padoru.png" alt="" />
+      <img src="/assets/padoru.png" alt="" />
     </div>
   </div>
 </footer>

src/pages/about.astro

@@ -4,38 +4,11 @@ import AboutSection from '../layouts/aboutSection.astro'
 
 import ContactSection from '../layouts/contactSection.astro'
 import ContactCard from '../components/contactCard.astro'
-import contactdata from '../../static/_contactdata.json'
+import contactdata from '../../static/assets/data/_contactdata.json'
 
 import CustomFooter from '../layouts/customFooter.astro'
 import TechnologyCard from '../components/technologyCard.astro'
-
+import technologydata from '../../static/assets/data/_technologydata.json'
-const techologydata = [
-  {
-    title: 'Astro',
-    link: 'https://astro.build',
-    image: 'astro',
-  },
-  {
-    title: 'GitLab',
-    link: 'https://gitlab.io',
-    image: 'gitlab',
-  },
-  {
-    title: 'Typescript',
-    link: 'https://www.typescriptlang.org/',
-    image: 'typescript',
-  },
-  {
-    title: 'Alpine Linux',
-    link: 'https://alpinelinux.org/',
-    image: 'alpine-linux',
-  },
-  {
-    title: 'Ubuntu',
-    link: 'https://ubuntu.com/',
-    image: 'ubuntu',
-  },
-]
 
 const description =
   "A summary of the technologies used as well as my contact information. You'll also find disclaimers and thank you notes for the people that helped me."
@@ -51,7 +24,7 @@ const description =
     general, and first project using Typescript.
   </AboutSection>
   <AboutSection title="Technologies used">
-    {techologydata.map((item) => <TechnologyCard {...item} />)}
+    {technologydata.map((item) => <TechnologyCard {...item} />)}
   </AboutSection>
   <ContactSection title="Contact me">
     {contactdata.map((item) => <ContactCard {...item} />)}

src/pages/index.astro

@@ -3,7 +3,7 @@ import Layout from '../layouts/Layout.astro'
 import Hero from '../components/hero.astro'
 import BaseSection from '../layouts/baseSection.astro'
 import FavouriteCard from '../components/favouriteCard.astro'
-import favouritesdata from '../../static/_favouritesdata.json'
+import favouritesdata from '../../static/assets/data/_favouritesdata.json'
 
 const description =
   'The very own page of Firq for providing informating about TA servants, listing past TA achievements and (in the future) hosting a blog for talking about FGO, Programming and other stuff'

src/pages/servants.astro

@@ -3,10 +3,10 @@ import Layout from '../layouts/Layout.astro'
 import BaseSection from '../layouts/baseSection.astro'
 
 import ServantCard from '../components/servantCard.astro'
-import servantdata from '../../static/_servantdata.json'
+import servantdata from '../../static/assets/data/_servantdata.json'
 
 import CeCard from '../components/ceCard.astro'
-import cedata from '../../static/_cedata.json'
+import cedata from '../../static/assets/data/_cedata.json'
 
 const description =
   'A list of all the servants and ces that Firq can offer up on support for TA.'

src/pages/ta-collection.astro

@@ -9,8 +9,8 @@ import Layout from '../layouts/Layout.astro'
 
 import TaSection from '../layouts/taSection.astro'
 import TaCard from '../components/taCard.astro'
-import tadata from '../../static/_tadata.json'
+import tadata from '../../static/assets/data/_tadata.json'
-import featured_data from '../../static/_featureddata.json'
+import featured_data from '../../static/assets/data/_featureddata.json'
 
 const important_data = tadata.filter(function (el) {
   return [

static/assets/data/_technologydata.json

@@ -0,0 +1,27 @@
+[
+    {
+      "title": "Astro",
+      "link": "https://astro.build",
+      "image": "astro"
+    },
+    {
+      "title": "GitLab",
+      "link": "https://gitlab.io",
+      "image": "gitlab"
+    },
+    {
+      "title": "Typescript",
+      "link": "https://www.typescriptlang.org/",
+      "image": "typescript"
+    },
+    {
+      "title": "Alpine Linux",
+      "link": "https://alpinelinux.org/",
+      "image": "alpine-linux"
+    },
+    {
+      "title": "Ubuntu",
+      "link": "https://ubuntu.com/",
+      "image": "ubuntu"
+    }
+  ]