From 7ac448f78c3dbd3083dda6291e5f7cc151d0db37 Mon Sep 17 00:00:00 2001
From: nimbleghost <132819643+nimbleghost@users.noreply.github.com>
Date: Mon, 26 Jun 2023 22:05:33 +0200
Subject: [PATCH] Add version info to web app

---
 Dockerfile-build                   | 2 +-
 Makefile                           | 2 +-
 web/package.json                   | 2 +-
 web/src/components/Preferences.jsx | 7 +++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Dockerfile-build b/Dockerfile-build
index f8af256b..4aea3ccb 100644
--- a/Dockerfile-build
+++ b/Dockerfile-build
@@ -24,7 +24,7 @@ RUN make docs-build
 ADD ./web/package.json ./web/package-lock.json ./web/
 RUN make web-deps
 ADD ./web ./web
-RUN make web-build
+RUN make VERSION=$VERSION COMMIT=$COMMIT web-build
 
 # cli & server
 ADD go.mod go.sum main.go ./
diff --git a/Makefile b/Makefile
index 8cb75238..1511c40e 100644
--- a/Makefile
+++ b/Makefile
@@ -137,7 +137,7 @@ web: web-deps web-build
 
 web-build:
 	cd web \
-		&& npm run build \
+		&& VITE_NTFY_VERSION=$(VERSION) VITE_NTFY_COMMIT=$(COMMIT) npm run build \
 		&& mv build/index.html build/app.html \
 		&& rm -rf ../server/site \
 		&& mv build ../server/site \
diff --git a/web/package.json b/web/package.json
index 2e52635a..8fc09501 100644
--- a/web/package.json
+++ b/web/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "start": "NODE_OPTIONS=\"--enable-source-maps\" vite",
+    "start": "VITE_NTFY_COMMIT=$(git rev-parse --short HEAD) NODE_OPTIONS=\"--enable-source-maps\" vite",
     "build": "vite build",
     "serve": "vite preview",
     "format": "prettier . --write",
diff --git a/web/src/components/Preferences.jsx b/web/src/components/Preferences.jsx
index f6bd9963..327a9df5 100644
--- a/web/src/components/Preferences.jsx
+++ b/web/src/components/Preferences.jsx
@@ -71,6 +71,7 @@ const Preferences = () => (
       <Reservations />
       <Users />
       <Appearance />
+      <VersionInfo />
     </Stack>
   </Container>
 );
@@ -491,6 +492,12 @@ const Appearance = () => {
   );
 };
 
+const VersionInfo = () => (
+  <Typography textAlign="center">
+    ntfy {import.meta.env.DEV ? "dev" : import.meta.env.VITE_NTFY_VERSION} ({import.meta.env.VITE_NTFY_COMMIT})
+  </Typography>
+);
+
 const Language = () => {
   const { t, i18n } = useTranslation();
   const labelId = "prefLanguage";