From 145711fa5d53b11298eaa172da898ebdff5b9fd2 Mon Sep 17 00:00:00 2001
From: jude <jude@jellywx.com>
Date: Sun, 8 Oct 2023 12:21:38 +0100
Subject: [PATCH] Add version strings to files

---
 Cargo.toml                        | 2 +-
 web/Cargo.toml                    | 2 +-
 web/src/routes/dashboard/mod.rs   | 6 ++++--
 web/templates/dashboard.html.tera | 8 ++++----
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 92d5067..0c083ea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reminder-rs"
-version = "1.6.45"
+version = "1.6.46"
 authors = ["Jude Southworth <judesouthworth@pm.me>"]
 edition = "2021"
 license = "AGPL-3.0 only"
diff --git a/web/Cargo.toml b/web/Cargo.toml
index 652e492..c963e62 100644
--- a/web/Cargo.toml
+++ b/web/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "reminder_web"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["jellywx <judesouthworth@pm.me>"]
 edition = "2018"
 
diff --git a/web/src/routes/dashboard/mod.rs b/web/src/routes/dashboard/mod.rs
index f0add8a..56a19d5 100644
--- a/web/src/routes/dashboard/mod.rs
+++ b/web/src/routes/dashboard/mod.rs
@@ -661,7 +661,8 @@ async fn create_database_channel(
 #[get("/")]
 pub async fn dashboard_home(cookies: &CookieJar<'_>) -> Result<Template, Redirect> {
     if cookies.get_private("userid").is_some() {
-        let map: HashMap<&str, String> = HashMap::new();
+        let mut map = HashMap::new();
+        map.insert("version", env!("CARGO_PKG_VERSION"));
         Ok(Template::render("dashboard", &map))
     } else {
         Err(Redirect::to("/login/discord"))
@@ -671,7 +672,8 @@ pub async fn dashboard_home(cookies: &CookieJar<'_>) -> Result<Template, Redirec
 #[get("/<_..>")]
 pub async fn dashboard(cookies: &CookieJar<'_>) -> Result<Template, Redirect> {
     if cookies.get_private("userid").is_some() {
-        let map: HashMap<&str, String> = HashMap::new();
+        let mut map = HashMap::new();
+        map.insert("version", env!("CARGO_PKG_VERSION"));
         Ok(Template::render("dashboard", &map))
     } else {
         Err(Redirect::to("/login/discord"))
diff --git a/web/templates/dashboard.html.tera b/web/templates/dashboard.html.tera
index 6d078cb..980f318 100644
--- a/web/templates/dashboard.html.tera
+++ b/web/templates/dashboard.html.tera
@@ -27,7 +27,7 @@
     <link rel="stylesheet" href="/static/css/bulma.min.css">
     <link rel="stylesheet" href="/static/css/fa.css">
     <link rel="stylesheet" href="/static/css/font.css">
-    <link rel="stylesheet" href="/static/css/style.css">
+    <link rel="stylesheet" href="/static/css/style.css?v{{ version }}">
     <link rel="stylesheet" href="/static/css/dtsel.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/tributejs/5.1.3/tribute.css" integrity="sha512-GnwBnXd+ZGO9CdP343MUr0jCcJXCr++JVtQRnllexRW2IDq4Zvrh/McTQjooAKnSUbXZ7wamp7AQSweTnfMVoA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 
@@ -381,9 +381,9 @@
 <script src="/static/js/iro.js"></script>
 <script src="/static/js/dtsel.js"></script>
 
-<script src="/static/js/interval.js"></script>
-<script src="/static/js/timezone.js" defer></script>
-<script src="/static/js/main.js" defer></script>
+<script src="/static/js/interval.js?v{{ version }}"></script>
+<script src="/static/js/timezone.js?v{{ version }}" defer></script>
+<script src="/static/js/main.js?v{{ version }}" defer></script>
 
 </body>
 </html>