From a7a046abd83dbda6ed3b9fc4d2250960e59883d8 Mon Sep 17 00:00:00 2001
From: SrIzan10 <66965250+SrIzan10@users.noreply.github.com>
Date: Sun, 29 Jun 2025 18:22:09 +0000
Subject: [PATCH] feat: show version in user dropdown

---
 .github/workflows/docker.yml                  |  6 ++++++
 apps/web/next.config.mjs                      |  9 +++++++++
 apps/web/package.json                         |  2 +-
 apps/web/src/components/app/NavBar/NavBar.tsx | 11 +++++++++++
 dev/docker-compose.yml                        |  3 +--
 packages/db/package.json                      |  3 ++-
 packages/hono-ws/package.json                 |  5 +++--
 7 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index b850d3a..4366990 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -29,6 +29,10 @@ jobs:
           images: srizan10/hclive
           tags: latest
 
+      - name: Set outputs
+        id: vars
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
@@ -41,6 +45,8 @@ jobs:
           secrets: |
             TURBO_TOKEN=${{ secrets.TURBO_TOKEN }}
             TURBO_TEAM=${{ secrets.TURBO_TEAM }}
+          build-args: |
+            commit=${{ steps.vars.outputs.sha_short }}
   db:
     name: Push db to Docker Hub
     runs-on: ubuntu-latest
diff --git a/apps/web/next.config.mjs b/apps/web/next.config.mjs
index e3ad6d0..d447a44 100644
--- a/apps/web/next.config.mjs
+++ b/apps/web/next.config.mjs
@@ -7,6 +7,13 @@ const LIVE_SERVER_URL =
   process.env.NODE_ENV === 'production'
     ? 'https://backend.hctv.srizan.dev'
     : 'http://localhost:8888';
+import { readFileSync } from 'node:fs';
+import { execSync } from 'node:child_process';
+
+const packageJson = JSON.parse(readFileSync('./package.json', 'utf8'));
+const { version } = packageJson;
+const commit = process.env.commit || execSync('git rev-parse --short HEAD')
+  .toString().trim();
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   images: {
@@ -22,6 +29,8 @@ const nextConfig = {
   },
   env: {
     LIVE_SERVER_URL,
+    commit,
+    version,
   },
   reactStrictMode: false,
   output: 'standalone',
diff --git a/apps/web/package.json b/apps/web/package.json
index 78969ca..f11b26c 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hctv/web",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/apps/web/src/components/app/NavBar/NavBar.tsx b/apps/web/src/components/app/NavBar/NavBar.tsx
index d52502b..1bacd76 100644
--- a/apps/web/src/components/app/NavBar/NavBar.tsx
+++ b/apps/web/src/components/app/NavBar/NavBar.tsx
@@ -88,6 +88,17 @@ export default function Navbar(props: Props) {
                 <DropdownMenuGroup>
                   <ThemeSwitcher />
                 </DropdownMenuGroup>
+                <DropdownMenuGroup>
+                  <p className="text-gray-500 dark:text-gray-400 text-sm px-2">
+                    v{process.env.version}-{process.env.NODE_ENV === 'development' ? 'dev' : 'prod'}, commit{' '}
+                    <Link
+                      href={`https://github.com/SrIzan10/hctv/commit/${process.env.commit}`}
+                      target="_blank"
+                    >
+                      {process.env.commit}
+                    </Link>
+                  </p>
+                </DropdownMenuGroup>
               </DropdownMenuContent>
             </DropdownMenu>
           ) : (
diff --git a/dev/docker-compose.yml b/dev/docker-compose.yml
index d093337..f278c47 100644
--- a/dev/docker-compose.yml
+++ b/dev/docker-compose.yml
@@ -1,7 +1,6 @@
 services:
   psql:
     image: postgres
-    user: 1000:1000
     environment:
       POSTGRES_USER: postgres
       # my condolences
@@ -29,7 +28,7 @@ services:
       - ./nginx.conf:/etc/nginx/templates/nginx.conf.template
       - ./html:/var/www/html
       - /dev/shm/hls:/dev/shm/hls
-    image: flv-module
+    image: srizan10/flv-module
     entrypoint:
       - /bin/sh
       - -c
diff --git a/packages/db/package.json b/packages/db/package.json
index 1265a49..0c312a4 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -17,7 +17,8 @@
     "db:generate": "prisma generate",
     "db:migrate": "prisma migrate dev",
     "db:deploy": "prisma migrate deploy",
-    "build": "prisma generate && tsc --build"
+    "build": "prisma generate && tsc --build",
+    "dev": "tsc --watch --preserveWatchOutput"
   },
   "devDependencies": {
     "@types/node": "^24.0.1",
diff --git a/packages/hono-ws/package.json b/packages/hono-ws/package.json
index 6762a13..307ca5d 100644
--- a/packages/hono-ws/package.json
+++ b/packages/hono-ws/package.json
@@ -9,8 +9,9 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsup ./src/index.ts --format esm,cjs --dts"
-  },
+    "build": "tsup ./src/index.ts --format esm,cjs --dts",
+    "dev": "tsup ./src/index.ts --format esm,cjs --dts --watch"
+ },
   "exports": {
     ".": {
       "types": "./dist/index.d.mts",