Merge pull request #202 from ZeusWPI/feature/show-version

Show Zauth version in footer
ZeusWPI · Jun 10, 2022 · 4a37726 · 4a37726
2 parents f89e87a + 3d9adf4
commit 4a37726
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -65,6 +65,8 @@ use std::str::FromStr;
 pub struct DbConn(PgConnection);
 pub type ConcreteConnection = PgConnection;
 
+pub const ZAUTH_VERSION: &str = env!("CARGO_PKG_VERSION");
+
 #[get("/favicon.ico")]
 pub fn favicon() -> &'static str {
 	""

diff --git a/src/views/template.rs b/src/views/template.rs
@@ -5,8 +5,13 @@ macro_rules! template {
 			use askama::Template;
 			#[derive(Template, Debug)]
 			#[template(path = $template_name)]
-			struct TemplateStruct {}
-			TemplateStruct{}
+			struct TemplateStruct {
+				#[allow(dead_code)]
+				zauth_version: &'static str
+			}
+			TemplateStruct {
+				zauth_version: crate::ZAUTH_VERSION,
+			}
 		}
 	};
 
@@ -16,11 +21,14 @@ macro_rules! template {
 			#[derive(Template, Debug)]
 			#[template(path = $template_name)]
 			struct TemplateStruct {
+				#[allow(dead_code)]
+				zauth_version: &'static str,
 				$(
 					$name: $type,
 				)+
 			}
 			TemplateStruct {
+				zauth_version: crate::ZAUTH_VERSION,
 				$(
 					$name: $value,
 				)+

diff --git a/templates/layout.html b/templates/layout.html
@@ -32,7 +32,7 @@
 			<div class="columns is-multiline is-justify-content-space-between">
 				<!-- Copyright -->
 				<div class="column is-narrow">
-					<a href="/">Zauth</a> by <a href="https://zeus.gent" target="_blank">Zeus WPI</a>
+					<a href="https://github.com/ZeusWPI/zauth/releases/tag/v{{ zauth_version }}">Zauth v{{ zauth_version }}</a> by <a href="https://zeus.gent" target="_blank">Zeus WPI</a>
 				</div>
 
 				<!-- Change theme -->