From ca2cb911bad1b30dbfa4c99b459e8e5ec5f4026a Mon Sep 17 00:00:00 2001
From: Topvennie <vincent@vallaeys.com>
Date: Sun, 20 Oct 2024 15:04:31 +0200
Subject: [PATCH 1/4] vinvoor: footer

---
 vinvoor/src/App.tsx             | 18 ++++++++++---
 vinvoor/src/footer/Footer.tsx   | 47 +++++++++++++++++++++++++++++++++
 vinvoor/src/hooks/useVersion.ts | 12 +++++++++
 vinvoor/src/types/version.ts    | 17 ++++++++++++
 4 files changed, 90 insertions(+), 4 deletions(-)
 create mode 100644 vinvoor/src/footer/Footer.tsx
 create mode 100644 vinvoor/src/hooks/useVersion.ts
 create mode 100644 vinvoor/src/types/version.ts

diff --git a/vinvoor/src/App.tsx b/vinvoor/src/App.tsx
index 4bde83d..9f58639 100644
--- a/vinvoor/src/App.tsx
+++ b/vinvoor/src/App.tsx
@@ -2,12 +2,13 @@ import { Box, Container } from "@mui/material";
 import { useState } from "react";
 import { Navigate, Outlet, useOutlet } from "react-router-dom";
 import { LoadingSkeleton } from "./components/LoadingSkeleton";
+import { Footer } from "./footer/Footer";
+import { useUser } from "./hooks/useUser";
 import { NavBar } from "./navbar/NavBar";
 import { Overview } from "./overview/Overview";
-import { WelcomePage } from "./WelcomePage";
-import { randomInt } from "./util/util";
 import "./themes/background.css";
-import { useUser } from "./hooks/useUser";
+import { randomInt } from "./util/util";
+import { WelcomePage } from "./WelcomePage";
 
 export const App = () => {
   const userQuery = useUser();
@@ -16,11 +17,19 @@ export const App = () => {
   const [backgroundSix] = useState(() => randomInt(0, 50) === 1);
 
   return (
-    <Box className={backgroundSix ? "Six" : ""}>
+    <Box
+      className={backgroundSix ? "Six" : ""}
+      sx={{
+        display: "flex",
+        flexDirection: "column",
+        minHeight: "100vh",
+      }}
+    >
       <NavBar />
       <Container
         maxWidth="xl"
         sx={{
+          flexGrow: 1,
           my: "2%",
         }}
       >
@@ -39,6 +48,7 @@ export const App = () => {
           )}
         </LoadingSkeleton>
       </Container>
+      <Footer />
     </Box>
   );
 };
diff --git a/vinvoor/src/footer/Footer.tsx b/vinvoor/src/footer/Footer.tsx
new file mode 100644
index 0000000..7626b8e
--- /dev/null
+++ b/vinvoor/src/footer/Footer.tsx
@@ -0,0 +1,47 @@
+import { Box, Container, Icon, Link } from "@mui/material";
+import { TypographyG } from "../components/TypographyG";
+import { useVersion } from "../hooks/useVersion";
+import ZeusIcon from "/zeus.svg";
+
+export const Footer = () => {
+  const { data: version } = useVersion();
+
+  return (
+  <Container disableGutters maxWidth="xl">
+    <Box
+      sx={{
+        display: "flex",
+        justifyContent: "space-between",
+        alignItems: "center",
+      }}
+    >
+      <TypographyG width="33%">
+        {version?.version ?? ""}
+      </TypographyG>
+      <TypographyG
+        sx={{
+          height: "100%",
+          display: "flex",
+          alignItems: "center",
+          width: "33%",
+          justifyContent: "center"
+        }}
+      >
+        Made with ❤️ by
+        <Link href="http://zeus.gent">
+          <Icon sx={{ pl: "4px", height: "40px", display: "flex", alignItems: "center", width: "60px" }}>
+            <img
+              src={ZeusIcon}
+              alt="Zeus Icon"
+              style={{ height: "auto", width: "40px" }}
+            />
+          </Icon>
+        </Link>
+      </TypographyG>
+      <Link href="https://github.com/ZeusWPI/ZeSS" width="33%" textAlign="end">
+        Github © 2024
+      </Link>
+    </Box>
+  </Container>
+  )
+};
diff --git a/vinvoor/src/hooks/useVersion.ts b/vinvoor/src/hooks/useVersion.ts
new file mode 100644
index 0000000..4135037
--- /dev/null
+++ b/vinvoor/src/hooks/useVersion.ts
@@ -0,0 +1,12 @@
+import { useQuery } from "@tanstack/react-query";
+import { convertVersionJSON, Version, VersionJSON } from '../types/version';
+import { getApi } from "../util/fetch";
+
+const ENDPOINT = "version";
+
+export const useVersion = () =>
+  useQuery<Version>({
+    queryKey: ["version"],
+    queryFn: () => getApi<Version, VersionJSON>(ENDPOINT, convertVersionJSON),
+    retry: 1
+  })
diff --git a/vinvoor/src/types/version.ts b/vinvoor/src/types/version.ts
new file mode 100644
index 0000000..7cdc308
--- /dev/null
+++ b/vinvoor/src/types/version.ts
@@ -0,0 +1,17 @@
+// External
+
+export interface VersionJSON {
+  version: string;
+}
+
+// Internal
+
+export interface Version {
+  version: string;
+}
+
+// Converters
+
+export const convertVersionJSON = (versionJSON: VersionJSON): Version => ({
+  ...versionJSON,
+});

From 4b69967429fcba1c382e0b89ef45113f60acb394 Mon Sep 17 00:00:00 2001
From: Topvennie <vincent@vallaeys.com>
Date: Sun, 20 Oct 2024 15:09:07 +0200
Subject: [PATCH 2/4] vinvoor: format

---
 vinvoor/src/footer/Footer.tsx   | 72 +++++++++++++++++++--------------
 vinvoor/src/hooks/useVersion.ts |  6 +--
 2 files changed, 44 insertions(+), 34 deletions(-)

diff --git a/vinvoor/src/footer/Footer.tsx b/vinvoor/src/footer/Footer.tsx
index 7626b8e..6475ce1 100644
--- a/vinvoor/src/footer/Footer.tsx
+++ b/vinvoor/src/footer/Footer.tsx
@@ -7,41 +7,51 @@ export const Footer = () => {
   const { data: version } = useVersion();
 
   return (
-  <Container disableGutters maxWidth="xl">
-    <Box
-      sx={{
-        display: "flex",
-        justifyContent: "space-between",
-        alignItems: "center",
-      }}
-    >
-      <TypographyG width="33%">
-        {version?.version ?? ""}
-      </TypographyG>
-      <TypographyG
+    <Container disableGutters maxWidth="xl">
+      <Box
         sx={{
-          height: "100%",
           display: "flex",
+          justifyContent: "space-between",
           alignItems: "center",
-          width: "33%",
-          justifyContent: "center"
         }}
       >
-        Made with ❤️ by
-        <Link href="http://zeus.gent">
-          <Icon sx={{ pl: "4px", height: "40px", display: "flex", alignItems: "center", width: "60px" }}>
-            <img
-              src={ZeusIcon}
-              alt="Zeus Icon"
-              style={{ height: "auto", width: "40px" }}
-            />
-          </Icon>
+        <TypographyG width="33%">{version?.version ?? ""}</TypographyG>
+        <TypographyG
+          sx={{
+            height: "100%",
+            display: "flex",
+            alignItems: "center",
+            width: "33%",
+            justifyContent: "center",
+          }}
+        >
+          Made with ❤️ by
+          <Link href="http://zeus.gent">
+            <Icon
+              sx={{
+                pl: "4px",
+                height: "40px",
+                display: "flex",
+                alignItems: "center",
+                width: "60px",
+              }}
+            >
+              <img
+                src={ZeusIcon}
+                alt="Zeus Icon"
+                style={{ height: "auto", width: "40px" }}
+              />
+            </Icon>
+          </Link>
+        </TypographyG>
+        <Link
+          href="https://github.com/ZeusWPI/ZeSS"
+          width="33%"
+          textAlign="end"
+        >
+          Github © 2024
         </Link>
-      </TypographyG>
-      <Link href="https://github.com/ZeusWPI/ZeSS" width="33%" textAlign="end">
-        Github © 2024
-      </Link>
-    </Box>
-  </Container>
-  )
+      </Box>
+    </Container>
+  );
 };
diff --git a/vinvoor/src/hooks/useVersion.ts b/vinvoor/src/hooks/useVersion.ts
index 4135037..b1087ec 100644
--- a/vinvoor/src/hooks/useVersion.ts
+++ b/vinvoor/src/hooks/useVersion.ts
@@ -1,5 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
-import { convertVersionJSON, Version, VersionJSON } from '../types/version';
+import { convertVersionJSON, Version, VersionJSON } from "../types/version";
 import { getApi } from "../util/fetch";
 
 const ENDPOINT = "version";
@@ -8,5 +8,5 @@ export const useVersion = () =>
   useQuery<Version>({
     queryKey: ["version"],
     queryFn: () => getApi<Version, VersionJSON>(ENDPOINT, convertVersionJSON),
-    retry: 1
-  })
+    retry: 1,
+  });

From ec75ebefd37e12de06b0f17d87d206e4862afbd9 Mon Sep 17 00:00:00 2001
From: Hannes Klinckaert <hannes-dev@mailbox.org>
Date: Thu, 24 Oct 2024 13:42:56 +0200
Subject: [PATCH 3/4] vingo: add backend version endpoint

---
 vingo/src/main.rs        |  3 ++-
 vingo/src/routes/info.rs | 12 ++++++++++++
 vingo/src/routes/mod.rs  |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 vingo/src/routes/info.rs

diff --git a/vingo/src/main.rs b/vingo/src/main.rs
index 73950cf..0341d2a 100644
--- a/vingo/src/main.rs
+++ b/vingo/src/main.rs
@@ -8,7 +8,7 @@ use std::{
 };
 
 use chrono::Local;
-use routes::{auth, cards, days, leaderboard, scans, seasons, settings};
+use routes::{auth, cards, days, info, leaderboard, scans, seasons, settings};
 
 use axum::{
     middleware::from_fn,
@@ -102,6 +102,7 @@ fn open_routes() -> Router<AppState> {
         .route("/login", post(auth::login))
         .route("/auth/callback", get(auth::callback))
         .route("/scans", post(scans::add))
+        .route("/version", get(info::version))
 }
 
 fn authenticated_routes() -> Router<AppState> {
diff --git a/vingo/src/routes/info.rs b/vingo/src/routes/info.rs
new file mode 100644
index 0000000..fcc1bef
--- /dev/null
+++ b/vingo/src/routes/info.rs
@@ -0,0 +1,12 @@
+use axum::Json;
+use serde::{Deserialize, Serialize};
+
+#[derive(Serialize, Deserialize)]
+pub struct Version {
+    version: String,
+}
+pub async fn version() -> Json<Version> {
+    return Json(Version {
+        version: env!("CARGO_PKG_VERSION").to_string(),
+    });
+}
diff --git a/vingo/src/routes/mod.rs b/vingo/src/routes/mod.rs
index 45e62ef..b7fa9ba 100644
--- a/vingo/src/routes/mod.rs
+++ b/vingo/src/routes/mod.rs
@@ -1,6 +1,7 @@
 pub mod auth;
 pub mod cards;
 pub mod days;
+pub mod info;
 pub mod leaderboard;
 pub mod scans;
 pub mod seasons;

From 2fe5ea0b17cde218ffc0787a8da322a9a56c9719 Mon Sep 17 00:00:00 2001
From: Hannes Klinckaert <hannes-dev@mailbox.org>
Date: Thu, 24 Oct 2024 13:45:26 +0200
Subject: [PATCH 4/4] vingo: set proper version

---
 vingo/Cargo.lock | 2 +-
 vingo/Cargo.toml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/vingo/Cargo.lock b/vingo/Cargo.lock
index d2714b2..a4a6fa3 100644
--- a/vingo/Cargo.lock
+++ b/vingo/Cargo.lock
@@ -3047,7 +3047,7 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "vingo"
-version = "0.1.0"
+version = "1.1.0"
 dependencies = [
  "axum",
  "chrono",
diff --git a/vingo/Cargo.toml b/vingo/Cargo.toml
index 66c7528..0215dda 100644
--- a/vingo/Cargo.toml
+++ b/vingo/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "vingo"
-version = "0.1.0"
+version = "1.1.0"
 edition = "2021"
 
 [workspace]