From eeabc4e66f04e6019b060ee65b4300f4490012c0 Mon Sep 17 00:00:00 2001
From: Firq <firelp42@gmail.com>
Date: Sun, 31 Dec 2023 16:50:29 +0100
Subject: [PATCH] Added version to About Page

---
 .vscode/settings.json          | 12 ++++++++++++
 astro.config.mjs               |  2 --
 package-lock.json              |  4 ++--
 package.json                   |  2 +-
 src/components/navbar.astro    |  2 +-
 src/layouts/customFooter.astro | 33 ++++++++++++++++++++++-----------
 6 files changed, 38 insertions(+), 17 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..ff5ea15
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,12 @@
+{
+    "files.exclude": {
+        "**/.git": true,
+        "**/.svn": true,
+        "**/.hg": true,
+        "**/CVS": true,
+        "**/.DS_Store": true,
+        "**/Thumbs.db": true,
+        "**/__pycache__": true
+    },
+    "hide-files.files": []
+}
\ No newline at end of file
diff --git a/astro.config.mjs b/astro.config.mjs
index 67b6fa8..4313843 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -1,8 +1,6 @@
 import { defineConfig } from 'astro/config';
 
 import sitemap from "@astrojs/sitemap";
-
-// https://astro.build/config
 import mdx from "@astrojs/mdx";
 
 // https://astro.build/config
diff --git a/package-lock.json b/package-lock.json
index 81bfedb..360a68b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "@firq/fgosite",
-	"version": "0.1.18",
+	"version": "0.1.19",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "@firq/fgosite",
-			"version": "0.1.18",
+			"version": "0.1.19",
 			"dependencies": {
 				"@astro-community/astro-embed-youtube": "^0.4.3",
 				"@astrojs/check": "^0.3.3",
diff --git a/package.json b/package.json
index b2724d1..e754596 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@firq/fgosite",
 	"type": "module",
-	"version": "0.1.19",
+	"version": "0.1.20",
 	"private": true,
 	"scripts": {
 		"dev": "astro dev",
diff --git a/src/components/navbar.astro b/src/components/navbar.astro
index eeaf8ba..1fecde2 100644
--- a/src/components/navbar.astro
+++ b/src/components/navbar.astro
@@ -34,7 +34,7 @@ const hamburger_src_url = `url("${hamburger.src}")`;
     line-height: 1.5em;
   }
   header > a {
-    padding-left: 16px;
+    margin-left: 16px;
     padding-top: 8px;
     display: block;
     height: 48px;
diff --git a/src/layouts/customFooter.astro b/src/layouts/customFooter.astro
index 915eed2..d0732ec 100644
--- a/src/layouts/customFooter.astro
+++ b/src/layouts/customFooter.astro
@@ -3,23 +3,27 @@ import okita from '../assets/okita.png'
 import atlas from '../assets/atlas.png'
 import foxcat from '../assets/lurker.png'
 import padoru from '../assets/padoru.png'
-import { Image } from 'astro:assets';
+import { Image } from 'astro:assets'
+
+import packagejson from '../../package.json'
+const version = packagejson.version
+const release = `https://forgejo.neshweb.net/Firq/firq-dev-website/releases/tag/${version}`
 ---
 
 <footer>
   <div>
-    “Fate/Grand Order” is a trademark of Notes Co., Ltd. | Game Assets © Aniplex
-    Inc. used under fair use. | View <a
+    “Fate/Grand Order” is a trademark of Notes Co., Ltd. | Game Assets ©
+    Aniplex Inc. used under fair use. | View <a
       class="linker"
       href="https://fate-go.us"
       target="_blank"
       rel="noopener noreferrer">the official website</a
     > for more information.<br />
-    I am in no way affiliated with Fate/Grand Order, Aniplex, Type Moon or Lasengle.
-    I claim no ownership of any of the assets used that are created by any of the
-    mentioned companies.<br />
-    All of the opinions expressed are my own and may not reflect those of the asset
-    providers.
+     I am in no way affiliated with Fate/Grand Order, Aniplex, Type Moon or
+    Lasengle. I claim no ownership of any of the assets used that are created by
+    any of the mentioned companies.<br />
+     All of the opinions expressed are my own and may not reflect those of the
+    asset providers.
   </div>
   <br />
   <div>
@@ -38,8 +42,8 @@ import { Image } from 'astro:assets';
       href="https://mitsunee.com"
       target="_blank"
       rel="noopener noreferrer">Mitsunee</a
-    > for the support when building this site. I could not have done it without you
-    🧡 Check out <a
+    > for the support when building this site. I could not have done it without
+    you 🧡 Check out <a
       href="https://fgo.mitsunee.com"
       target="_blank"
       rel="noopener noreferrer">FGO Timers here</a
@@ -54,7 +58,8 @@ import { Image } from 'astro:assets';
       href="https://mastodon.neshweb.net/@neshura"
       target="_blank"
       rel="noopener noreferrer">Neshura</a
-    > for providing me with a place to develop, store and host this site. Check out
+    > for providing me with a place to develop, store and host this site. Check
+    out
     <a href="https://www.neshweb.net" target="_blank" rel="noopener noreferrer"
       >his site here</a
     >
@@ -73,6 +78,12 @@ import { Image } from 'astro:assets';
       <Image src={padoru} alt="Hashire sori yo ..." />
     </div>
   </div>
+  <br />
+  <div>
+    Website version: <a href={release} target="_blank" rel="noopener noreferrer"
+      >{version}</a
+    >
+  </div>
 </footer>
 
 <style>
-- 
2.39.2