chore(release): 0.0.2-alpha.10

this is to help prevent errors in the build and release stuff in git

.env-example

@@ -50,3 +50,11 @@ GP_PASSWORD=
 # how often to check for new/updated queries in min
 QUERY_TIME_TYPE=m #valid options are m, h 
 QUERY_CHECK=1
+
+
+# Oauth setup
+PROVIDER=""
+CLIENT_ID=""
+CLIENT_SECRET=""
+CLIENT_SCOPES="openid profile email groups"
+DISCOVERY_URL=""

.gitea/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,66 @@
+---
+name: Bug Report
+about: Report something that is broken or not working correctly
+title: "[BUG] "
+ref: "main"
+labels:
+
+- bug
+
+---
+
+# Summary
+
+Briefly explain the issue.
+
+---
+
+# Steps To Reproduce
+
+1. Go to ...
+2. Click ...
+3. Scan ...
+4. Error occurs ...
+
+---
+
+# Expected Behavior
+
+What should have happened?
+
+---
+
+# Actual Behavior
+
+What actually happened instead?
+
+---
+
+# Severity
+
+- [ ] Low
+- [ ] Medium
+- [ ] High
+- [ ] Critical
+
+---
+
+# Environment
+
+Example:
+
+- Production
+- Development
+- Zebra Scanner
+- Mobile Device
+- Windows Server
+- Docker
+
+---
+
+# Logs / Screenshots
+
+Paste logs or upload screenshots here.
+
+```txt
+Paste logs here

.gitea/ISSUE_TEMPLATE/config.yaml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.gitea/ISSUE_TEMPLATE/enhancement.md

@@ -0,0 +1,47 @@
+---
+name: Enhancement
+about: Improve or refine an existing feature
+title: "[ENHANCEMENT] "
+ref: "main"
+labels: 
+
+- enhancement
+---
+
+# Existing Feature
+
+What current feature or workflow is being improved?
+
+Example:
+
+- Notifications
+- Scanner Login
+- Release Monitor
+- Printing
+- Auth
+
+---
+
+# Proposed Improvement
+
+Describe the improvement.
+
+---
+
+# Expected Benefit
+
+Why would this improvement help?
+
+---
+
+# Impact
+
+- [ ] Small
+- [ ] Medium
+- [ ] Large
+
+---
+
+# Additional Notes
+
+Anything else worth mentioning.

.gitea/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,40 @@
+---
+name: Feature Request
+about: Suggest a brand new feature or module
+title: "[FEATURE] "
+ref: "main"
+labels: 
+
+- feature
+---
+
+# Problem Statement
+
+What problem are you trying to solve?
+
+---
+
+# Proposed Solution
+
+Describe the feature you would like added.
+
+---
+
+# Alternatives Considered
+
+Any other ideas, workarounds, or approaches?
+
+---
+
+# Priority
+
+- [ ] Nice to Have
+- [ ] Medium Priority
+- [ ] High Priority
+- [ ] Critical
+
+---
+
+# Additional Context
+
+Add mockups, screenshots, examples, or notes here.

.gitea/workflows/docker-build.yml

@@ -12,20 +12,20 @@ jobs:
     steps:
       - name: Checkout (local)
         run: |
-          git clone https://git.tuffraid.net/cowch/lst_v3.git .
+          git clone http://10.75.9.150:3100/cowch/lst_v3.git .
           git checkout ${{ gitea.sha }}
 
       - name: Login to registry
-        run: echo "${{ secrets.PASSWORD }}" | docker login git.tuffraid.net -u "cowch" --password-stdin
+        run: echo "${{ secrets.PASSWORD }}" | docker login 10.75.9.150:3100 -u "cowch" --password-stdin
 
       - name: Build image
         run: |
           docker build \
-            -t git.tuffraid.net/cowch/lst_v3:latest \
-            -t git.tuffraid.net/cowch/lst_v3:${{ gitea.sha }} \
+            -t 10.75.9.150:3100/cowch/lst_v3:latest \
+            -t 10.75.9.150:3100/cowch/lst_v3:${{ gitea.sha }} \
             .
 
       - name: Push
         run: |
-          docker push git.tuffraid.net/cowch/lst_v3:latest
-          docker push git.tuffraid.net/cowch/lst_v3:${{ gitea.sha }}
+          docker push 10.75.9.150:3100/cowch/lst_v3:latest
+          docker push 10.75.9.150:3100/cowch/lst_v3:${{ gitea.sha }}

.gitea/workflows/release.yml

@@ -14,12 +14,12 @@ jobs:
       # Examples:
       #   http://gitea.internal.lan:3000
       #   https://gitea-origin.yourdomain.local
-      GITEA_INTERNAL_URL: "https://git.tuffraid.net"
+      GITEA_INTERNAL_URL: "http://10.75.9.150:3100" #"https://git.tuffraid.net"
 
       # Internal/origin registry host. Usually same host as above, but without protocol.
       # Example:
       #   gitea.internal:3000
-      REGISTRY_HOST: "git.tuffraid.net"
+      REGISTRY_HOST:  "10.75.9.150:3100" #"git.tuffraid.net"
 
     steps:
       - name: Check out repository

.gitignore

@@ -149,3 +149,4 @@ dist
 .yarn/install-state.gz
 .pnp.*
 
+frontend/.tanstack/tmp/2249110e-da91fb0b1b87b6c4cc3e2c2cd25037fd

CHANGELOG.md

@@ -1,5 +1,158 @@
 # All Changes to LST can be found below.
 
+## [0.0.2-alpha.10](https://git.tuffraid.net/cowch/lst_v3/compare/v0.0.2-alpha.9...v0.0.2-alpha.10) (2026-05-08)
+
+
+### 🌟 Enhancements
+
+* **analytics:** added in backend anaylitics ([9edafc9](https://git.tuffraid.net/cowch/lst_v3/commits/9edafc9d2810f339d197c10dfc6a037b3352d81f))
+* **api hits:** added in api hits for monitoring ([2721bb2](https://git.tuffraid.net/cowch/lst_v3/commits/2721bb2a3bf1f829591d26a0716f74c4f7fc0c79))
+* **scanner:** added in lanechecks ([87803ee](https://git.tuffraid.net/cowch/lst_v3/commits/87803eed43069b73de3f66e6524bb45da9c46334))
+
+
+### 🐛 Bug fixes
+
+* **scan user:** typo ([d8869b1](https://git.tuffraid.net/cowch/lst_v3/commits/d8869b103b80e4208b3928a370a9524ef33d25cd))
+* **schema:** typo in add_date ([7d7d991](https://git.tuffraid.net/cowch/lst_v3/commits/7d7d9911223905d6767b87d2471b6607a90f1ea7))
+* **spelling:** corrected the spelling on the file ([0459cd7](https://git.tuffraid.net/cowch/lst_v3/commits/0459cd788aaad6ac54a67e23f798ce5e5a437394))
+
+
+### 📝 Chore
+
+* **file:** name changes.. spelled wrong ([5fa70da](https://git.tuffraid.net/cowch/lst_v3/commits/5fa70da90ca290ee45088e9c8eb06ba48a6677af))
+* **server:** removed a console log that shouldnt be there ([1dba774](https://git.tuffraid.net/cowch/lst_v3/commits/1dba774abc54bf20850c3f26d49926e86d59712d))
+
+
+### 🛠️ Code Refactor
+
+* **analyitics:** finished analyitics as a base ([4424c74](https://git.tuffraid.net/cowch/lst_v3/commits/4424c742d24dc230b2bc1782e33535184c378cf0))
+* **scan:** bump in build and style update ([505d7ce](https://git.tuffraid.net/cowch/lst_v3/commits/505d7cea5d2f52fc4a3ec1edff1878be703c4034))
+* **scanner:** added toasts in to make it look better ([edb3668](https://git.tuffraid.net/cowch/lst_v3/commits/edb366854825f4c24ab5d77cf88759465d067f00))
+
+
+### 📝 Testing Code
+
+* **scanusers:** added in scan users as test ([1ff5e50](https://git.tuffraid.net/cowch/lst_v3/commits/1ff5e5032f9c8bf81f972dc99d6c86ba8d3936c6))
+
+
+### 📈 Project changes
+
+* **template:** bug in getting the template to work correctly ([e9b0101](https://git.tuffraid.net/cowch/lst_v3/commits/e9b01010954624aed738cd6e4b82fccbba195cc4))
+* **templates:** added in templates for the repo to make it more easy to manage and add in new ideas ([ca885fb](https://git.tuffraid.net/cowch/lst_v3/commits/ca885fb01a3c8bc22694c2e05269c43fcd4de70e))
+* **templates:** force useage ([6d8499b](https://git.tuffraid.net/cowch/lst_v3/commits/6d8499bfb85f7b9131b1ec7b31a17c4256d0f0cf))
+
+## [0.0.2-alpha.9](https://git.tuffraid.net/cowch/lst_v3/compare/v0.0.2-alpha.8...v0.0.2-alpha.9) (2026-05-06)
+
+
+### 🛠️ Code Refactor
+
+* **mobile:** valildation of server after each scan ([4ca74de](https://git.tuffraid.net/cowch/lst_v3/commits/4ca74de2795cea7244e38697d16afe2822164ed6))
+* **scanner:** added in running number ([a38e2e0](https://git.tuffraid.net/cowch/lst_v3/commits/a38e2e033977b725538e9a9046098d94194d549e))
+* **scanner:** finished login stuff for current routes ([1241253](https://git.tuffraid.net/cowch/lst_v3/commits/12412536d10981013053c39d156c6c9cb0babd11))
+
+
+### 📝 Testing Code
+
+* **scanner:** lane check ([d99449d](https://git.tuffraid.net/cowch/lst_v3/commits/d99449ddc4e2777c1b0fe9189ba0a7c01fe1dd8f))
+
+
+### 📈 Project Builds
+
+* **builds:** changed to ip as its on the same server ([3552ca3](https://git.tuffraid.net/cowch/lst_v3/commits/3552ca31f9f7b3bcbe557a145e7eb154bfdae79c))
+* **release:** bypass cloudflare upload limit ([b578f05](https://git.tuffraid.net/cowch/lst_v3/commits/b578f05d6482f9b6f30febeee6ab0b708a70f68b))
+
+## [0.0.2-alpha.8](https://git.tuffraid.net/cowch/lst_v3/compare/v0.0.2-alpha.7...v0.0.2-alpha.8) (2026-05-06)
+
+
+### 🌟 Enhancements
+
+* **mobile:** auth added in ([ba30281](https://git.tuffraid.net/cowch/lst_v3/commits/ba30281e59040513a036fb7413e372457d04a7c8))
+
+## [0.0.2-alpha.7](https://git.tuffraid.net/cowch/lst_v3/compare/v0.0.2-alpha.6...v0.0.2-alpha.7) (2026-05-06)
+
+
+### 🌟 Enhancements
+
+* **intial auth:** intial auth setup for the scanner ([cd13360](https://git.tuffraid.net/cowch/lst_v3/commits/cd13360cfb931daca50fd7b111e1c8f8ab09a909))
+* **mobile:** new route for the ehs launcher ([649ae1e](https://git.tuffraid.net/cowch/lst_v3/commits/649ae1ee9f245a9b5d308ea8a636357bf72b1e34))
+* **mobile:** shadcn like and tailwind added to make things look yummy ([7d2f048](https://git.tuffraid.net/cowch/lst_v3/commits/7d2f048932b77269568149de34351840b75486e2))
+* **mobile:** update notifications and more error handling added ([30ffd84](https://git.tuffraid.net/cowch/lst_v3/commits/30ffd843c725da79ed035e2d9564f60a6babcda8))
+* **scanner:** more work on the scanner and can now scan to prod no lst right now ([77b4533](https://git.tuffraid.net/cowch/lst_v3/commits/77b4533dea8314fd4fb81a597995cabd041fe188))
+* **servers:** added iowa ebm ([8446dbc](https://git.tuffraid.net/cowch/lst_v3/commits/8446dbc955462235b9df35c501354761661e4f6a))
+
+
+### 🐛 Bug fixes
+
+* **mobile:** typo for version checking ([0b7318f](https://git.tuffraid.net/cowch/lst_v3/commits/0b7318f8566d15414edd3cd67c89fa5346058ab0))
+
+
+### 🛠️ Code Refactor
+
+* **docker compose:** changed to have the correct url that will be used as this is for auth ([4e0cf8c](https://git.tuffraid.net/cowch/lst_v3/commits/4e0cf8c54c4dfd68edba7e733518846a47c55064))
+* **gp connection:** added in gp ip into env if not there use static name for dns ([36995e9](https://git.tuffraid.net/cowch/lst_v3/commits/36995e9fb42cfa1b72c096b8860866d70b86e70c))
+* **mobile:** more look and feel work ([bb6155c](https://git.tuffraid.net/cowch/lst_v3/commits/bb6155c9692220542a52664848abf0b9eee91a43))
+* **mobile:** moved the versioning lookup at at the mobile folder plus renamed ([bddc9ac](https://git.tuffraid.net/cowch/lst_v3/commits/bddc9aca0d2da2b2f53dec1250276d7a076a8601))
+* **scanner:** format changes ([518c0a8](https://git.tuffraid.net/cowch/lst_v3/commits/518c0a8c19a4bff0b757bbd06ca5460d3565d8bd))
+
+
+### 📈 Project Builds
+
+* **scripts:** changing how the relase works so it purposly builds before it trys to release ([83a542d](https://git.tuffraid.net/cowch/lst_v3/commits/83a542d1b7beafe394949c001917f2b25056fac2))
+
+## [0.0.2-alpha.6](https://git.tuffraid.net/cowch/lst_v3/compare/v0.0.2-alpha.1...v0.0.2-alpha.6) (2026-04-23)
+
+## [0.0.2-alpha.1](https://git.tuffraid.net/cowch/lst_v3/compare/v0.0.2-alpha.0...v0.0.2-alpha.1) (2026-04-23)
+
+## [0.0.2-alpha.0](https://git.tuffraid.net/cowch/lst_v3/compare/v0.0.1...v0.0.2-alpha.0) (2026-04-23)
+
+## [0.0.1](https://git.tuffraid.net/cowch/lst_v3/compare/v0.0.1-alpha.5...v0.0.1) (2026-04-23)
+
+
+### 🐛 Bug fixes
+
+* **frontend:** lingering import crashed us ([781025d](https://git.tuffraid.net/cowch/lst_v3/commits/781025dca00e9dd4b2ad9b283be944ed91bbc1e5))
+
+
+### 📝 Chore
+
+* **doc remove:** removed a doc and put it in the real area for docs ([a593bb2](https://git.tuffraid.net/cowch/lst_v3/commits/a593bb2baafd0166a178b80cd76dd8862f240e11))
+
+## [0.0.1-alpha.5](https://git.tuffraid.net/cowch/lst_v3/compare/v0.0.1-alpha.4...v0.0.1-alpha.5) (2026-04-23)
+
+
+### 🌟 Enhancements
+
+* **admin:** moved server build/update to full app ([cb00add](https://git.tuffraid.net/cowch/lst_v3/commits/cb00addee96b3ecccf2694f85cb7882cac9c7e3d))
+* **lstmobile:** intial scanner setup kinda working ([3734d9d](https://git.tuffraid.net/cowch/lst_v3/commits/3734d9daac143ad8fb4404c59990bc4f546f365b))
+* **oidc:** added in so we could use an oidc to login as well :D ([f7276ca](https://git.tuffraid.net/cowch/lst_v3/commits/f7276ca2d722e30da65bbead23dc9bd57df25aa7))
+* **servers:** added marked tree in to the mix ([4d53af0](https://git.tuffraid.net/cowch/lst_v3/commits/4d53af033876d81e0d38c148c15cb0af6f3d5bf0))
+
+
+### 🐛 Bug fixes
+
+* **datamart:** fixes to correct how we handle activations of new features and legacy queries ([b832d7a](https://git.tuffraid.net/cowch/lst_v3/commits/b832d7aa1ecd063be1bbb7e969617fc7a6376ffa))
+* **datamart:** if we do not have 2.0 warehousing activate we need to use legacy ([5b1c885](https://git.tuffraid.net/cowch/lst_v3/commits/5b1c88546ff9a42dc572450fe05ad68015edb627))
+* **gp:** weird issue with db username and password ([d6328ab](https://git.tuffraid.net/cowch/lst_v3/commits/d6328ab764c3626aef99727b873003384951d299))
+* **inventory:** changes to accruatly adjust the query and check the feature set ([32517d0](https://git.tuffraid.net/cowch/lst_v3/commits/32517d0c98c42a0f0f60135b4a9951c4090ccd58))
+* **logistics:** historical issue where it was being really weird ([cfbc156](https://git.tuffraid.net/cowch/lst_v3/commits/cfbc1565172f7c2e27f0a1593fe8e99b00d91bb7))
+* **logistics:** purchasing monitoring was going off every 5th min instead of every 5 min ([3639c1b](https://git.tuffraid.net/cowch/lst_v3/commits/3639c1b77c597a94816bfedd0892f0c8980c6403))
+* **ocp:** fixes to make sure we always hav printer.data as an array or dont do anything ([fb3cd85](https://git.tuffraid.net/cowch/lst_v3/commits/fb3cd85b411315cac0abd22d050ee88929754833))
+* **psi:** refactor psi queries ([a1eeade](https://git.tuffraid.net/cowch/lst_v3/commits/a1eeadeec438f7c5c6d31f190fee5c22f83dc6b0))
+
+
+### 📝 Chore
+
+* **clean:** removed bruno api a proper api doc will be added to lst later ([f716de1](https://git.tuffraid.net/cowch/lst_v3/commits/f716de1a58a4a4c02d9a0a375444ceecea4a018b))
+* **scripts:** added in a helper to remove old stuff ([de5df2b](https://git.tuffraid.net/cowch/lst_v3/commits/de5df2b00b1c6fe7c53d6ea075b4cf7e0fb845f9))
+
+
+### 🛠️ Code Refactor
+
+* **scanner:** more basic work to get the scanner just running ([82f8369](https://git.tuffraid.net/cowch/lst_v3/commits/82f8369640b2b0ff63dd640dc0aa0609a42c7dda))
+* **servers:** added mcd and stp1 ([88cef2a](https://git.tuffraid.net/cowch/lst_v3/commits/88cef2a56c390b692866658ce519e59ffeaf4c17))
+* **server:** server updates can now only be done from a dev pc ([7962463](https://git.tuffraid.net/cowch/lst_v3/commits/7962463927c4c5d2e12db9a0dd536b0f29fc65b2))
+* **sql:** changed sql connection to ip:port ([a6d53f0](https://git.tuffraid.net/cowch/lst_v3/commits/a6d53f0266f1edc3f3946cd1f07d893c8a98d9c7))
+
 ## [0.0.1-alpha.4](https://git.tuffraid.net/cowch/lst_v3/compare/v0.0.1-alpha.3...v0.0.1-alpha.4) (2026-04-15)
 
 

backend/admin/admin.routes.ts

@@ -1,12 +1,18 @@
 import type { Express } from "express";
 import { requireAuth } from "../middleware/auth.middleware.js";
+import { routeHitMiddleware } from "../middleware/routeHit.middleware.js";
 import build from "./admin.build.js";
 import update from "./admin.updateServer.js";
 
 export const setupAdminRoutes = (baseUrl: string, app: Express) => {
 	//stats will be like this as we dont need to change this
-	app.use(`${baseUrl}/api/admin/build`, requireAuth, build);
-	app.use(`${baseUrl}/api/admin/build`, requireAuth, update);
+	app.use(`${baseUrl}/api/admin/build`, requireAuth, routeHitMiddleware, build);
+	app.use(
+		`${baseUrl}/api/admin/build`,
+		requireAuth,
+		routeHitMiddleware,
+		update,
+	);
 
 	// all other system should be under /api/system/*
 };

backend/app.ts

@@ -3,6 +3,7 @@ import { fileURLToPath } from "node:url";
 import { toNodeHandler } from "better-auth/node";
 import express from "express";
 import morgan from "morgan";
+import { umamiConfig } from "./configs/umami.config.js";
 import { createLogger } from "./logger/logger.controller.js";
 import { setupRoutes } from "./routeHandler.routes.js";
 import { auth } from "./utils/auth.utils.js";
@@ -33,6 +34,22 @@ const createApp = async () => {
 	app.use(express.json());
 	setupRoutes(baseUrl, app);
 
+	app.get(`${baseUrl}/api/lst-config.js`, (_, res) => {
+		res.type("application/javascript");
+		res.setHeader("Cache-Control", "no-store");
+
+		res.send(`
+		window.LST_CONFIG = {
+			appName: ${JSON.stringify(umamiConfig.appName ?? "LST")},
+			site: ${JSON.stringify(umamiConfig.site ?? "unknown")},
+			server: ${JSON.stringify(umamiConfig.server ?? "unknown")},
+			appVersion: ${JSON.stringify(umamiConfig.appVersion ?? "dev")},
+			umamiHost: ${JSON.stringify(umamiConfig.umamiHost ?? "")},
+			umamiWebsiteId: ${JSON.stringify(umamiConfig.umamiWebsiteId ?? "")}
+		};
+	`);
+	});
+
 	app.use(
 		`${baseUrl}/app`,
 		express.static(join(__dirname, "../frontend/dist")),

backend/auth/auth.routes.ts

@@ -1,9 +1,11 @@
 import type { Express } from "express";
+import { routeHitMiddleware } from "../middleware/routeHit.middleware.js";
 import login from "./login.route.js";
 import register from "./register.route.js";
 
 export const setupAuthRoutes = (baseUrl: string, app: Express) => {
 	//setup all the routes
+	app.use(routeHitMiddleware);
 	app.use(`${baseUrl}/api/authentication/login`, login);
 	app.use(`${baseUrl}/api/authentication/register`, register);
 };

backend/configs/gpSql.config.ts

@@ -1,10 +1,16 @@
 import type sql from "mssql";
 
+// TODO : Remove this later and get it onto the env
 const username = "gpviewer";
 const password = "gp$$ViewOnly!";
 
+const port = process.env.SQL_PORT
+	? Number.parseInt(process.env.SQL_PORT, 10)
+	: undefined;
+
 export const gpSqlConfig: sql.config = {
-	server: `USMCD1VMS011`,
+	server: `${process.env.GP_SERVER ?? "USMCD1VMS011"}`,
+	port: port,
 	database: `ALPLA`,
 	user: username,
 	password: password,

backend/configs/prodSql.config.ts

@@ -1,7 +1,13 @@
 import type sql from "mssql";
+
+const port = process.env.SQL_PORT
+	? Number.parseInt(process.env.SQL_PORT, 10)
+	: undefined;
+
 export const prodSqlConfig: sql.config = {
 	server: `${process.env.PROD_SERVER}`,
 	database: `AlplaPROD_${process.env.PROD_PLANT_TOKEN}_cus`,
+	port: port,
 	user: process.env.PROD_USER,
 	password: process.env.PROD_PASSWORD,
 	options: {

backend/configs/umami.config.ts

@@ -0,0 +1,21 @@
+export type UmamiRuntimeConfig = {
+	appName: string;
+	site: string;
+	server: string;
+	appVersion: string;
+	umamiHost: string;
+	umamiWebsiteId: string;
+};
+
+export const umamiConfig: UmamiRuntimeConfig = {
+	appName: process.env.APP_NAME ?? "LST",
+	site: process.env.URL ?? "unknown",
+	server: process.env.PROD_PLANT_TOKEN ?? "unknown", // could also be server name based on our setup.
+	appVersion: process.env.NODE_ENV ?? "dev",
+	umamiHost: process.env.UMAMI_HOST ?? "",
+	umamiWebsiteId: process.env.UMAMI_WEBSITE_ID ?? "",
+};
+
+export function isUmamiEnabled() {
+	return Boolean(umamiConfig.umamiHost && umamiConfig.umamiWebsiteId);
+}

backend/datamart/datamart.controller.ts

@@ -249,7 +249,6 @@ export const runDatamartQuery = async (data: Data) => {
 				);
 
 				break;
-
 			case "psiDeliveryData":
 				datamartQuery = datamartQuery
 					.replace("[startDate]", `${data.options.startDate}`)

backend/datamart/datamart.routes.ts

@@ -1,5 +1,5 @@
 import type { Express } from "express";
-
+import { routeHitMiddleware } from "../middleware/routeHit.middleware.js";
 import { apiReturn } from "../utils/returnHelper.utils.js";
 import { datamartData } from "./datamartData.utlis.js";
 import runQuery from "./getDatamart.route.js";
@@ -30,7 +30,7 @@ export const setupDatamartRoutes = (baseUrl: string, app: Express) => {
 	// });
 
 	//setup all the routes
-
+	app.use(routeHitMiddleware);
 	app.use(`${baseUrl}/api/datamart`, runQuery);
 
 	// just sending a get on datamart will return all the queries that we can call.

backend/db/db.controller.ts

@@ -1,6 +1,8 @@
 import { drizzle } from "drizzle-orm/postgres-js";
 import postgres from "postgres";
 
+import * as scanUserSchema from "./schema/scanUsers.js";
+
 const dbURL = `postgres://${process.env.DATABASE_USER}:${process.env.DATABASE_PASSWORD}@${process.env.DATABASE_HOST}:${process.env.DATABASE_PORT}/${process.env.DATABASE_DB}`;
 
 const queryClient = postgres(dbURL, {
@@ -13,4 +15,10 @@ const queryClient = postgres(dbURL, {
 	},
 });
 
-export const db = drizzle({ client: queryClient });
+//export const db = drizzle({ client: queryClient });
+
+export const db = drizzle(queryClient, {
+	schema: {
+		...scanUserSchema,
+	},
+});

backend/db/schema/analytics.schema.ts

@@ -0,0 +1,21 @@
+import { integer, pgTable, text, timestamp, uuid } from "drizzle-orm/pg-core";
+
+export const analytics = pgTable("analytics", {
+	id: uuid("id").defaultRandom().primaryKey(),
+
+	createdAt: timestamp("created_at").defaultNow().notNull(),
+
+	method: text("method").notNull(),
+	routePattern: text("route_pattern").notNull(),
+	actualPath: text("actual_path").notNull(),
+
+	statusCode: integer("status_code").notNull(),
+	durationMs: integer("duration_ms").notNull(),
+
+	module: text("module"),
+	userId: text("user_id"),
+	userEmail: text("user_email"),
+
+	ipAddress: text("ip_address"),
+	userAgent: text("user_agent"),
+});

backend/db/schema/dailyAnalytics.schema.ts

@@ -0,0 +1,33 @@
+import {
+	date,
+	integer,
+	pgTable,
+	text,
+	timestamp,
+	uuid,
+} from "drizzle-orm/pg-core";
+
+export const analyticsDaily = pgTable("analytics_daily", {
+	id: uuid("id").defaultRandom().primaryKey(),
+
+	businessDate: date("business_date").notNull(),
+
+	method: text("method").notNull(),
+	routePattern: text("route_pattern").notNull(),
+	module: text("module").notNull(),
+
+	totalHits: integer("total_hits").notNull(),
+	uniqueUsers: integer("unique_users").notNull(),
+
+	successCount: integer("success_count").notNull(),
+	errorCount: integer("error_count").notNull(),
+
+	avgDurationMs: integer("avg_duration_ms").notNull(),
+	maxDurationMs: integer("max_duration_ms").notNull(),
+
+	firstHitAt: timestamp("first_hit_at").notNull(),
+	lastHitAt: timestamp("last_hit_at").notNull(),
+
+	createdAt: timestamp("created_at").defaultNow().notNull(),
+	updatedAt: timestamp("updated_at").defaultNow().notNull(),
+});

backend/db/schema/scanUsers.ts

@@ -0,0 +1,48 @@
+import {
+	boolean,
+	jsonb,
+	pgEnum,
+	pgTable,
+	text,
+	timestamp,
+	unique,
+	uuid,
+} from "drizzle-orm/pg-core";
+import { createInsertSchema, createSelectSchema } from "drizzle-zod";
+import type z from "zod";
+
+export const mobileRoleEnum = pgEnum("mobile_role", [
+	"user",
+	"lead",
+	"manager",
+	"admin",
+]);
+
+export const scanUser = pgTable(
+	"scan_users",
+	{
+		id: uuid("id").defaultRandom().primaryKey(),
+		name: text("name").notNull(), // the user that will be using the scanner
+		scannerId: text("scanner_id").unique().notNull(),
+		pinNumber: text("pin_number").unique().notNull(),
+		pinHash: text("pin_hash").notNull(),
+		excludedCommand: jsonb("excluded_commands").default([]),
+		role: mobileRoleEnum("role").notNull().default("user"),
+		active: boolean("active").default(true),
+		lastScan: timestamp("last_scan").defaultNow(),
+		add_Date: timestamp("add_Date").defaultNow(),
+		upd_date: timestamp("upd_date").defaultNow(),
+	},
+	(table) => ({
+		userNotificationUnique: unique("scan_user_unique").on(
+			table.scannerId,
+			table.pinNumber,
+		),
+	}),
+);
+
+export const scanUserSchema = createSelectSchema(scanUser);
+export const newsSanUserSchema = createInsertSchema(scanUser);
+
+export type ScanUser = z.infer<typeof scanUserSchema>;
+export type NewScanUser = z.infer<typeof newsSanUserSchema>;

backend/db/schema/scanlog.schema.ts

@@ -0,0 +1,22 @@
+import { jsonb, pgTable, text, timestamp, uuid } from "drizzle-orm/pg-core";
+import { createInsertSchema, createSelectSchema } from "drizzle-zod";
+import type z from "zod";
+
+export const scanLog = pgTable("scan_log", {
+	id: uuid("id").defaultRandom().primaryKey(),
+	user: text("user"),
+	scannerId: text("scanner_id"),
+	message: text("message").notNull(),
+	prompt: text("prompt"),
+	commandDescription: text("command_description"),
+	runningNumber: text("running_number").default("0"),
+	status: text("status"),
+	lines: jsonb("lines").default([]),
+	add_Date: timestamp("add_date").defaultNow(),
+});
+
+export const scanLogSchema = createSelectSchema(scanLog);
+export const newScanLogSchema = createInsertSchema(scanLog);
+
+export type Printer = z.infer<typeof scanLogSchema>;
+export type NewPrinter = z.infer<typeof newScanLogSchema>;

backend/gpSql/gpSql.routes.ts

@@ -1,5 +1,6 @@
 import { type Express, Router } from "express";
 import { requireAuth } from "../middleware/auth.middleware.js";
+import { routeHitMiddleware } from "../middleware/routeHit.middleware.js";
 import restart from "./gpSqlRestart.route.js";
 import start from "./gpSqlStart.route.js";
 import stop from "./gpSqlStop.route.js";
@@ -8,6 +9,7 @@ export const setupGPSqlRoutes = (baseUrl: string, app: Express) => {
 	// Apply auth to entire router
 	const router = Router();
 	router.use(requireAuth);
+	app.use(routeHitMiddleware);
 
 	router.use(start);
 	router.use(stop);

backend/gpSql/gpSqlConnection.controller.ts

@@ -13,7 +13,9 @@ let attempt = 0;
 const maxAttempts = 10;
 
 export const connectGPSql = async () => {
-	const serverUp = await checkHostnamePort(`USMCD1VMS011:1433`);
+	const serverUp = await checkHostnamePort(
+		`${process.env.GP_SERVER ?? "usmcd1vms011"}:1433`,
+	);
 	if (!serverUp) {
 		// we will try to reconnect
 		connected = false;
@@ -53,13 +55,14 @@ export const connectGPSql = async () => {
 			notify: false,
 		});
 	} catch (error) {
+		console.log(error);
 		reconnectToSql;
 		return returnFunc({
 			success: false,
 			level: "error",
 			module: "system",
 			subModule: "db",
-			message: "Failed to connect to the prod sql server.",
+			message: "Failed to connect to the gp sql server.",
 			data: [error],
 			notify: false,
 		});
@@ -118,7 +121,9 @@ export const reconnectToSql = async () => {
 
 		await new Promise((res) => setTimeout(res, delayStart));
 
-		const serverUp = await checkHostnamePort(`${process.env.PROD_SERVER}:1433`);
+		const serverUp = await checkHostnamePort(
+			`${process.env.GP_SERVER ?? "usmcd1vms011"}:1433`,
+		);
 
 		if (!serverUp) {
 			delayStart = Math.min(delayStart * 2, 30000); // exponential backoff until up to 30000

backend/middleware/routeHit.middleware.ts

@@ -0,0 +1,83 @@
+// routeHit.middleware.ts
+
+import type { NextFunction, Request, Response } from "express";
+import {
+	createRouteHit,
+	shouldIgnoreRoute,
+} from "../utils/analyticRouteHits.utils.js";
+
+export function routeHitMiddleware(
+	req: Request,
+	res: Response,
+	next: NextFunction,
+) {
+	const start = performance.now();
+
+	res.on("finish", () => {
+		const actualPath = getActualPath(req);
+
+		if (shouldIgnoreRoute(actualPath)) {
+			return;
+		}
+
+		const durationMs = Math.round(performance.now() - start);
+
+		const routePattern = getRoutePattern(req) as string;
+		const module = getModuleName(req);
+
+		void createRouteHit({
+			method: req.method,
+			routePattern,
+			actualPath,
+			statusCode: res.statusCode,
+			durationMs,
+			module,
+
+			// adjust these names to your Better Auth/session shape
+			userId: req.user?.id ?? null,
+			userEmail: req.user?.email ?? null,
+
+			ipAddress: req.ip ?? null,
+			userAgent: req.get("user-agent") ?? null,
+		}).catch((err) => {
+			console.error("Failed to save route hit", err);
+		});
+	});
+
+	next();
+}
+
+function getActualPath(req: Request) {
+	return req.originalUrl.split("?")[0] ?? req.path ?? "unknown";
+}
+
+function getRoutePattern(req: Request) {
+	const baseUrl = req.baseUrl || "";
+	const routePath = req.route?.path;
+
+	if (typeof routePath === "string") {
+		return `${baseUrl}${routePath}`;
+	}
+
+	return getActualPath(req);
+}
+
+function getModuleName(req: Request) {
+	const path = req.originalUrl.split("?")[0];
+
+	if (path?.includes("/printers")) return "printers";
+	if (path?.includes("/releases")) return "releases";
+	if (path?.includes("/quality")) return "quality";
+	if (path?.includes("/scanner")) return "scanner";
+	if (path?.includes("/settings")) return "settings";
+	if (path?.includes("/users")) return "users";
+	if (path?.includes("/mobile")) return "mobile";
+	if (path?.includes("/servers")) return "servers";
+	if (path?.includes("/logistics")) return "servers";
+	if (path?.includes("/ocp")) return "ocp";
+	if (path?.includes("/auth")) return "auth";
+	if (path?.includes("/datamart")) return "datamart";
+	if (path?.includes("/opendock")) return "opendock";
+
+	return "unknown";
+}

backend/mobile/downloadApps.route.ts

@@ -11,26 +11,10 @@ const __dirname = path.dirname(__filename);
 const downloadDir = path.resolve(__dirname, "../../downloads/mobile");
 
 const currentApk = {
-	packageName: "net.alpla.lst.mobile",
-	versionName: "0.0.1-alpha",
-	versionCode: 1,
-	minSupportedVersionCode: 1,
 	fileName: "lst-mobile.apk",
 };
 
-router.get("/version", async (req, res) => {
-	const baseUrl = `${req.protocol}://${req.get("host")}`;
-
-	res.json({
-		packageName: currentApk.packageName,
-		versionName: currentApk.versionName,
-		versionCode: currentApk.versionCode,
-		minSupportedVersionCode: currentApk.minSupportedVersionCode,
-		downloadUrl: `${baseUrl}/lst/api/mobile/apk/latest`,
-	});
-});
-
-router.get("/apk/latest", (_, res) => {
+router.get("/latest", (_, res) => {
 	const apkPath = path.join(downloadDir, currentApk.fileName);
 
 	if (!fs.existsSync(apkPath)) {
@@ -46,4 +30,17 @@ router.get("/apk/latest", (_, res) => {
 	return res.sendFile(apkPath);
 });
 
+router.get("/ehs", (_, res) => {
+	const apkPath = path.join(downloadDir, "EHS.apk");
+
+	if (!fs.existsSync(apkPath)) {
+		return res.status(404).json({ success: false, message: "APK not found" });
+	}
+
+	res.setHeader("Content-Type", "application/vnd.android.package-archive");
+	res.setHeader("Content-Disposition", `attachment; filename="EHS.apk}"`);
+
+	return res.sendFile(apkPath);
+});
+
 export default router;

backend/mobile/laneCheck.ts

@@ -0,0 +1,34 @@
+import { Router } from "express";
+import { runProdApi } from "../utils/prodEndpoint.utils.js";
+import { apiReturn } from "../utils/returnHelper.utils.js";
+
+const router = Router();
+
+router.post("/", async (req, res) => {
+	const body = req.body;
+
+	const lane = body.lane.split("#");
+
+	console.log(lane[2]);
+	const laneData = await runProdApi({
+		method: "post",
+		endpoint: "/public/v1.1/Warehousing/GetWarehouseUnits",
+		data: [
+			{
+				laneIds: [lane[2]],
+			},
+		],
+	});
+
+	return apiReturn(res, {
+		success: true,
+		level: "info",
+		module: "mobile",
+		subModule: "lane check",
+		message: `all data for lane Id: ${lane}`,
+		data: laneData?.data ?? [],
+		status: 200,
+	});
+});
+
+export default router;

backend/mobile/mobile.routes.ts

@@ -0,0 +1,23 @@
+import type { Express } from "express";
+import { routeHitMiddleware } from "../middleware/routeHit.middleware.js";
+import downloads from "./downloadApps.route.js";
+import lanes from "./laneCheck.js";
+import authPin from "./mobileAuth.route.js";
+import newPin from "./mobilePin.route.js";
+import logs from "./scanLogs.route.js";
+import version from "./version.route.js";
+
+export const setupMobileRoutes = (baseUrl: string, app: Express) => {
+	//stats will be like this as we dont need to change this
+
+	app.use(routeHitMiddleware);
+
+	app.use(`${baseUrl}/api/mobile/version`, version);
+	app.use(`${baseUrl}/api/mobile/apk`, downloads);
+	app.use(`${baseUrl}/api/mobile/logs`, logs);
+	app.use(`${baseUrl}/api/mobile/auth`, authPin);
+	app.use(`${baseUrl}/api/mobile/pin`, newPin);
+	app.use(`${baseUrl}/api/mobile/laneCheck`, lanes);
+
+	// all other system should be under /api/system/*
+};

backend/mobile/mobileAuth.route.ts

@@ -0,0 +1,343 @@
+import bcrypt from "bcryptjs";
+import { eq, sql } from "drizzle-orm";
+import { Router } from "express";
+import z from "zod";
+import { db } from "../db/db.controller.js";
+import {
+	type NewScanUser,
+	type ScanUser,
+	scanUser,
+} from "../db/schema/scanUsers.js";
+import { requireAuth } from "../middleware/auth.middleware.js";
+import { apiReturn, returnFunc } from "../utils/returnHelper.utils.js";
+import { tryCatch } from "../utils/trycatch.utils.js";
+
+const r = Router();
+
+export async function hashPin(pin: string) {
+	//   if (!/^\d{6}$/.test(pin)) {
+	//     throw new Error("PIN must be exactly 6 digits");
+	//   }
+
+	return bcrypt.hashSync(pin, 12);
+}
+
+const registerSchema = z.object({
+	name: z.string().min(2).max(100),
+	pinNumber: z.string(),
+	scannerId: z
+		.string()
+		.min(1)
+		.max(500)
+		.optional()
+		.describe("if you leave blank it will be the same as your username"),
+	role: z
+		.enum(["user", "lead", "manager", "admin"])
+		.optional()
+		.describe("What roles are available to use."),
+	pinHash: z.string().optional(),
+});
+
+r.post("/pin", async (req, res) => {
+	const { pin } = req.body;
+
+	if (!pin || pin.length !== 6) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `Pin number must be a min of 6 digits`,
+			data: [],
+			status: 401,
+		});
+	}
+
+	// const user = await db
+	// 	.select()
+	// 	.from(scanUser)
+	// 	.where(eq(scanUser.pinNumber, parseInt(pin, 10)));
+
+	const user = await db.query.scanUser.findFirst({
+		where: (u, { eq }) => eq(u.pinNumber, pin),
+	});
+
+	if (!user) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `Invalid login please try again.`,
+			data: [],
+			status: 401,
+		});
+	}
+
+	const validPin = bcrypt.compareSync(pin, user.pinHash);
+
+	if (!validPin) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `Invalid pin please try again.`,
+			data: [],
+			status: 401,
+		});
+	}
+
+	return apiReturn(res, {
+		success: true,
+		level: "info",
+		module: "mobile",
+		subModule: "auth",
+		message: `Welcome back ${user.name}`,
+		data: user as ScanUser | any,
+		status: 200,
+	});
+});
+
+r.post("/user", async (req, res) => {
+	try {
+		// validate the body is correct before accepting it
+		let validated = registerSchema.parse(req.body);
+
+		validated = {
+			...validated,
+			pinHash: await hashPin(validated.pinNumber.toString()),
+		};
+
+		const values: NewScanUser = {
+			name: validated.name,
+			pinNumber: validated.pinNumber,
+			pinHash: validated.pinHash ?? "",
+			scannerId: validated.scannerId ?? "",
+		};
+
+		const newUser = await db.insert(scanUser).values(values).returning();
+
+		apiReturn(res, {
+			success: true,
+			level: "info", //connect.success ? "info" : "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `${validated.name} was just created`,
+			data: newUser as any,
+			status: 200, //connect.success ? 200 : 400,
+		});
+	} catch (err) {
+		if (err instanceof z.ZodError) {
+			const flattened = z.flattenError(err);
+			// return res.status(400).json({
+			// 	error: "Validation failed",
+			// 	details: flattened,
+			// });
+
+			return apiReturn(res, {
+				success: false,
+				level: "error", //connect.success ? "info" : "error",
+				module: "mobile",
+				subModule: "auth",
+				message: "Validation failed",
+				data: [flattened.fieldErrors],
+				status: 400, //connect.success ? 200 : 400,
+			});
+		}
+
+		return apiReturn(res, {
+			success: false,
+			level: "error", //connect.success ? "info" : "error",
+			module: "mobile",
+			subModule: "auth",
+			message:
+				"This User already exist with this pin or scanner id please try again",
+			data: [err],
+			status: 400, //connect.success ? 200 : 400,
+		});
+	}
+});
+
+r.get("/user", requireAuth, async (_, res) => {
+	const { data, error } = await tryCatch(db.select().from(scanUser));
+
+	// await trackLstEvent({
+	// 	eventName: "mobile_get_users",
+	// 	url: "/mobile/users",
+	// 	eventData: {
+	// 		module: "mobile",
+	// 	},
+	// });
+
+	if (error) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `There was an error getting the user`,
+			data: error as any,
+			status: 400,
+		});
+	}
+
+	if (!data) {
+		return apiReturn(res, {
+			success: true,
+			level: "info",
+			module: "mobile",
+			subModule: "auth",
+			message: `There are no users you should add one . `,
+			data: [],
+			status: 200,
+		});
+	}
+
+	return apiReturn(res, {
+		success: true,
+		level: "info",
+		module: "mobile",
+		subModule: "auth",
+		message: `All users. `,
+		data,
+		status: 200,
+	});
+});
+
+r.patch("/user/:id", requireAuth, async (req, res) => {
+	const updates: Record<string, unknown | null> = {};
+	const { id } = req.params;
+
+	const { data, error } = await tryCatch(
+		db.query.scanUser.findFirst({
+			where: (u, { eq }) => eq(u.id, `${id}`),
+		}),
+	);
+
+	if (error) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `There was an error getting the user`,
+			data: error as any,
+			status: 400,
+		});
+	}
+
+	if (!data) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `Invalid user id was passed over. `,
+			data: [],
+			status: 400,
+		});
+	}
+
+	if (req.body?.name !== undefined) {
+		updates.name = req.body.name;
+	}
+
+	if (req.body?.pinNumber !== undefined) {
+		const existing = await db.query.scanUser.findFirst({
+			where: (u, { eq }) => eq(u.pinHash, req.body.pinNumber),
+		});
+
+		if (existing)
+			return returnFunc({
+				success: false,
+				level: "error",
+				module: "mobile",
+				subModule: "auth",
+				message: `${req.body.pinNumber} already exists please try again`,
+				data: [],
+				notify: false,
+				room: "",
+			});
+		updates.pinNumber = req.body.pinNumber;
+		updates.pinHash = await hashPin(req.body.pinNumber);
+	}
+
+	if (req.body?.scannerId !== undefined) {
+		updates.scannerId = req.body.scannerId;
+	}
+
+	if (req.body?.active !== undefined) {
+		updates.active = req.body.active;
+	}
+
+	if (req.body?.excludedCommand !== undefined) {
+		updates.excludedCommand = req.body.excludedCommand;
+	}
+
+	if (req.body?.role !== undefined) {
+		updates.role = req.body.role;
+	}
+
+	updates.upd_date = sql`NOW()`;
+
+	const updatedSetting = await db
+		.update(scanUser)
+		.set(updates)
+		.where(eq(scanUser.id, `${id}`))
+		.returning();
+
+	return apiReturn(res, {
+		success: true,
+		level: "info",
+		module: "mobile",
+		subModule: "user",
+		message: `User ${data.name} was updated. `,
+		data: updatedSetting,
+		status: 200,
+	});
+});
+
+r.delete("/user/:id", requireAuth, async (req, res) => {
+	const { id } = req.params;
+
+	const { data, error } = await tryCatch(
+		db.delete(scanUser).where(eq(scanUser.id, `${id}`)),
+	);
+
+	if (error) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `There was an error deleting the user`,
+			data: error as any,
+			status: 400,
+		});
+	}
+
+	if (!data) {
+		return apiReturn(res, {
+			success: false,
+			level: "error",
+			module: "mobile",
+			subModule: "auth",
+			message: `There was no user to delete. `,
+			data: [],
+			status: 400,
+		});
+	}
+
+	return apiReturn(res, {
+		success: true,
+		level: "info",
+		module: "mobile",
+		subModule: "user",
+		message: `User was deleted. `,
+		data: data ?? [],
+		status: 200,
+	});
+});
+
+export default r;

backend/mobile/mobilePin.route.ts

@@ -0,0 +1,21 @@
+import { Router } from "express";
+import { generateUniquePin } from "../utils/generateScannerPin.utils.js";
+import { apiReturn } from "../utils/returnHelper.utils.js";
+
+const r = Router();
+
+r.get("/new", async (_, res) => {
+	const getPin = await generateUniquePin();
+
+	return apiReturn(res, {
+		success: getPin.success,
+		level: getPin.level,
+		module: "mobile",
+		subModule: "auth",
+		message: getPin.message,
+		data: getPin.data,
+		status: getPin.success ? 200 : 400,
+	});
+});
+
+export default r;

backend/mobile/scanLogs.route.ts

@@ -0,0 +1,37 @@
+import { Router } from "express";
+
+import { db } from "../db/db.controller.js";
+import { scanLog } from "../db/schema/scanlog.schema.js";
+import { apiReturn } from "../utils/returnHelper.utils.js";
+
+const router = Router();
+
+router.post("/", async (req, res) => {
+	const body = req.body;
+
+	const newLog = await db
+		.insert(scanLog)
+		.values({
+			scannerId: body.scannerId,
+			message: body.message,
+			prompt: body.prompt,
+			commandDescription: body.commandDescription,
+			status: body.status,
+			lines: body.lines,
+			user: body.user,
+			runningNumber: body.runningNumber,
+		})
+		.returning();
+
+	return apiReturn(res, {
+		success: true,
+		level: "info",
+		module: "mobile",
+		subModule: "scan logs",
+		message: `New log from ${body.scannerId}`,
+		data: newLog,
+		status: 200,
+	});
+});
+
+export default router;

backend/mobile/version.route.ts

@@ -0,0 +1,40 @@
+import fs from "node:fs";
+import { and, eq } from "drizzle-orm";
+import { Router } from "express";
+import path from "path";
+import { db } from "../db/db.controller.js";
+import { settings } from "../db/schema/settings.schema.js";
+
+const router = Router();
+
+const projectRoot = path.resolve("./lstMobile"); // adjust as needed
+const appJsonPath = path.join(projectRoot, "app.json");
+
+router.get("/", async (req, res) => {
+	const baseUrl = `${req.protocol}://${req.get("host")}`;
+	const mobileSettings = await db
+		.select()
+		.from(settings)
+		.where(
+			and(
+				eq(settings.moduleName, "mobile"),
+				eq(settings.settingType, "standard"),
+			),
+		);
+
+	const raw = fs.readFileSync(appJsonPath, "utf-8");
+	const config = JSON.parse(raw);
+
+	const exp = config.expo;
+
+	res.json({
+		packageName: exp.android?.package,
+		versionName: exp.version,
+		versionCode: exp.android?.versionCode,
+		minSupportedVersionCode: exp?.android?.minSupportedVersionCode ?? 0,
+		downloadUrl: `${baseUrl}/lst/api/mobile/apk/latest`,
+		settings: mobileSettings,
+	});
+});
+
+export default router;

backend/notification/notification.minLevel.ts

@@ -0,0 +1,113 @@
+import { eq } from "drizzle-orm";
+import { db } from "../db/db.controller.js";
+import { notifications } from "../db/schema/notifications.schema.js";
+import { prodQuery } from "../prodSql/prodSqlQuery.controller.js";
+import {
+	type SqlQuery,
+	sqlQuerySelector,
+} from "../prodSql/prodSqlQuerySelector.utils.js";
+import { returnFunc } from "../utils/returnHelper.utils.js";
+import { sendEmail } from "../utils/sendEmail.utils.js";
+import { tryCatch } from "../utils/trycatch.utils.js";
+
+/**
+ *
+ */
+const func = async (data: any, emails: string) => {
+	// get the actual notification as items will be updated between intervals if no one touches
+	const { data: l, error: le } = (await tryCatch(
+		db.select().from(notifications).where(eq(notifications.id, data.id)),
+	)) as any;
+
+	if (le) {
+		return returnFunc({
+			success: false,
+			level: "error",
+			module: "notification",
+			subModule: "query",
+			message: `${data.name} encountered an error while trying to get initial info`,
+			data: [le],
+			notify: true,
+		});
+	}
+
+	// search the query db for the query by name
+	const sqlQuery = sqlQuerySelector(`${data.name}`) as SqlQuery;
+	// create the ignore audit logs ids
+	const ignoreIds = l[0].options[0]?.auditId
+		? `${l[0].options[0]?.auditId}`
+		: "0";
+
+	// run the check
+	const { data: queryRun, error } = await tryCatch(
+		prodQuery(
+			sqlQuery.query
+				.replace("[intervalCheck]", l[0].interval)
+				.replace("[ignoreList]", ignoreIds),
+			`Running notification query: ${l[0].name}`,
+		),
+	);
+
+	if (error) {
+		return returnFunc({
+			success: false,
+			level: "error",
+			module: "notification",
+			subModule: "query",
+			message: `Data for: ${l[0].name} encountered an error while trying to get it`,
+			data: [error],
+			notify: true,
+		});
+	}
+
+	if (queryRun.data.length > 0) {
+		// update the latest audit id
+		const { error: dbe } = await tryCatch(
+			db
+				.update(notifications)
+				.set({ options: [{ auditId: `${queryRun.data[0].id}` }] })
+				.where(eq(notifications.id, data.id)),
+		);
+
+		if (dbe) {
+			return returnFunc({
+				success: false,
+				level: "error",
+				module: "notification",
+				subModule: "query",
+				message: `Data for: ${l[0].name} encountered an error while trying to get it`,
+				data: [dbe],
+				notify: true,
+			});
+		}
+
+		// send the email
+
+		const sentEmail = await sendEmail({
+			email: emails,
+			subject: "Alert! Label Reprinted",
+			template: "reprintLabels",
+			context: {
+				items: queryRun.data,
+			},
+		});
+
+		if (!sentEmail?.success) {
+			return returnFunc({
+				success: false,
+				level: "error",
+				module: "email",
+				subModule: "notification",
+				message: `${l[0].name} failed to send the email`,
+				data: [sentEmail],
+				notify: true,
+			});
+		}
+	} else {
+		console.log("doing nothing as there is nothing to do.");
+	}
+	// TODO send the error to systemAdmin users so they do not always need to be on the notifications.
+	// these errors are defined per notification.
+};
+
+export default func;

backend/notification/notification.routes.ts

@@ -1,5 +1,6 @@
 import type { Express } from "express";
 import { requireAuth } from "../middleware/auth.middleware.js";
+import { routeHitMiddleware } from "../middleware/routeHit.middleware.js";
 import manual from "./notification.manualTrigger.js";
 import getNotifications from "./notification.route.js";
 import updateNote from "./notification.update.route.js";
@@ -10,13 +11,48 @@ import updateSub from "./notificationSub.update.route.js";
 
 export const setupNotificationRoutes = (baseUrl: string, app: Express) => {
 	//stats will be like this as we dont need to change this
-	app.use(`${baseUrl}/api/notification`, requireAuth, getNotifications);
-	app.use(`${baseUrl}/api/notification`, requireAuth, updateNote);
-	app.use(`${baseUrl}/api/notification/manual`, requireAuth, manual);
-	app.use(`${baseUrl}/api/notification/sub`, requireAuth, subs);
-	app.use(`${baseUrl}/api/notification/sub`, requireAuth, newSub);
-	app.use(`${baseUrl}/api/notification/sub`, requireAuth, updateSub);
-	app.use(`${baseUrl}/api/notification/sub`, requireAuth, deleteSub);
+	app.use(
+		`${baseUrl}/api/notification`,
+		requireAuth,
+		routeHitMiddleware,
+		getNotifications,
+	);
+	app.use(
+		`${baseUrl}/api/notification`,
+		requireAuth,
+		routeHitMiddleware,
+		updateNote,
+	);
+	app.use(
+		`${baseUrl}/api/notification/manual`,
+		requireAuth,
+		routeHitMiddleware,
+		manual,
+	);
+	app.use(
+		`${baseUrl}/api/notification/sub`,
+		requireAuth,
+		routeHitMiddleware,
+		subs,
+	);
+	app.use(
+		`${baseUrl}/api/notification/sub`,
+		requireAuth,
+		routeHitMiddleware,
+		newSub,
+	);
+	app.use(
+		`${baseUrl}/api/notification/sub`,
+		requireAuth,
+		routeHitMiddleware,
+		updateSub,
+	);
+	app.use(
+		`${baseUrl}/api/notification/sub`,
+		requireAuth,
+		routeHitMiddleware,
+		deleteSub,
+	);
 
 	// all other system should be under /api/system/*
 };

backend/ocp/ocp.routes.ts

@@ -1,6 +1,7 @@
 import { type Express, Router } from "express";
 import { requireAuth } from "../middleware/auth.middleware.js";
 import { featureCheck } from "../middleware/featureActive.middleware.js";
+import { routeHitMiddleware } from "../middleware/routeHit.middleware.js";
 import listener from "./ocp.printer.listener.js";
 import update from "./ocp.printer.update.js";
 
@@ -17,6 +18,8 @@ export const setupOCPRoutes = (baseUrl: string, app: Express) => {
 	// auth routes below here
 	router.use(requireAuth);
 
+	app.use(routeHitMiddleware);
+
 	router.use(update);
 	//router.use("");
 

backend/opendock/opendock.routes.ts

@@ -1,6 +1,7 @@
 import { type Express, Router } from "express";
 import { requireAuth } from "../middleware/auth.middleware.js";
 import { featureCheck } from "../middleware/featureActive.middleware.js";
+import { routeHitMiddleware } from "../middleware/routeHit.middleware.js";
 import getApt from "./opendockGetRelease.route.js";
 
 export const setupOpendockRoutes = (baseUrl: string, app: Express) => {
@@ -13,6 +14,7 @@ export const setupOpendockRoutes = (baseUrl: string, app: Express) => {
 
 	// we need to make sure we are authenticated to see the releases
 	router.use(requireAuth);
+	app.use(routeHitMiddleware);
 
 	router.use(getApt);
 	app.use(`${baseUrl}/api/opendock`, router);

backend/prodSql/prodSql.routes.ts

@@ -1,5 +1,6 @@
 import { type Express, Router } from "express";
 import { requireAuth } from "../middleware/auth.middleware.js";
+import { routeHitMiddleware } from "../middleware/routeHit.middleware.js";
 import restart from "./prodSqlRestart.route.js";
 import start from "./prodSqlStart.route.js";
 import stop from "./prodSqlStop.route.js";
@@ -8,6 +9,7 @@ export const setupProdSqlRoutes = (baseUrl: string, app: Express) => {
 	// Apply auth to entire router
 	const router = Router();
 	router.use(requireAuth);
+	app.use(routeHitMiddleware);
 
 	router.use(start);
 	router.use(stop);

backend/routeHandler.routes.ts

@@ -5,6 +5,7 @@ import { setupAuthRoutes } from "./auth/auth.routes.js";
 import { setupApiDocsRoutes } from "./configs/scaler.config.js";
 import { setupDatamartRoutes } from "./datamart/datamart.routes.js";
 import { setupGPSqlRoutes } from "./gpSql/gpSql.routes.js";
+import { setupMobileRoutes } from "./mobile/mobile.routes.js";
 import { setupNotificationRoutes } from "./notification/notification.routes.js";
 import { setupOCPRoutes } from "./ocp/ocp.routes.js";
 import { setupOpendockRoutes } from "./opendock/opendock.routes.js";
@@ -27,4 +28,5 @@ export const setupRoutes = (baseUrl: string, app: Express) => {
 	setupNotificationRoutes(baseUrl, app);
 	setupOCPRoutes(baseUrl, app);
 	setupTCPRoutes(baseUrl, app);
+	setupMobileRoutes(baseUrl, app);
 };

backend/server.ts

@@ -18,6 +18,11 @@ import { setupSocketIORoutes } from "./socket.io/serverSetup.js";
 import { serversChecks } from "./system/serverData.controller.js";
 import { baseSettingValidationCheck } from "./system/settingsBase.controller.js";
 import { startTCPServer } from "./tcpServer/tcp.server.js";
+import {
+	aggregateRouteHitsForBusinessDay,
+	cleanupOldRouteHits,
+	runRouteHitAnalyticsCron,
+} from "./utils/analyticRouteHits.utils.js";
 import { createCronJob } from "./utils/croner.utils.js";
 import { sendEmail } from "./utils/sendEmail.utils.js";
 
@@ -68,10 +73,16 @@ const start = async () => {
 		createCronJob("logsCleanup", "0 15 5 * * *", () => dbCleanup("logs", 120));
 		historicalSchedule();
 
+		createCronJob("aggregateHits", "0 0 7 * * *", async () =>
+			runRouteHitAnalyticsCron(),
+		);
+
+		createCronJob("cleanHitsUp", "0 0 7 * * *", () => cleanupOldRouteHits());
 		// one shots only needed to run on server startups
 		createNotifications();
 		startNotifications();
 		serversChecks();
+		aggregateRouteHitsForBusinessDay();
 	}, 5 * 1000);
 
 	process.on("uncaughtException", async (err) => {

backend/system/serverData.controller.ts

@@ -34,7 +34,7 @@ const servers: NewServerData[] = [
 		name: "Lima",
 		server: "USLIM1VMS006",
 		plantToken: "uslim1",
-		idAddress: "10.53.0.26",
+		idAddress: "10.53.0.26", // port opened 3000 2222
 		greatPlainsPlantCode: "50",
 		contactEmail: "",
 		contactPhone: "",
@@ -56,7 +56,7 @@ const servers: NewServerData[] = [
 		name: "Dayton",
 		server: "usday1VMS006",
 		plantToken: "usday1",
-		idAddress: "10.44.0.56",
+		idAddress: "10.44.0.56", // ports opened 3000 and 2222
 		greatPlainsPlantCode: "80",
 		contactEmail: "",
 		contactPhone: "",
@@ -96,8 +96,75 @@ const servers: NewServerData[] = [
 		serverLoc: "D$\\LST_V3",
 		buildNumber: 1,
 	},
+	{
+		name: "McDonough",
+		server: "USMCD1VMS006",
+		plantToken: "usmcd1",
+		idAddress: "10.193.0.26",
+		greatPlainsPlantCode: "10",
+		contactEmail: "",
+		contactPhone: "",
+		serverLoc: "D$\\LST_V3",
+		buildNumber: 1,
+	},
+	{
+		name: "St. Peters",
+		server: "USSTP1VMS006",
+		plantToken: "usstp1",
+		idAddress: "10.37.0.26",
+		greatPlainsPlantCode: "45",
+		contactEmail: "",
+		contactPhone: "",
+		serverLoc: "D$\\LST_V3",
+		buildNumber: 1,
+	},
+	{
+		name: "Marked Tree",
+		server: "USMAR1VMS006",
+		plantToken: "usmar1",
+		idAddress: "10.206.9.26", // 3000,2222 requested REQ0236838
+		greatPlainsPlantCode: "90",
+		contactEmail: "",
+		contactPhone: "",
+		serverLoc: "D$\\LST_V3",
+		buildNumber: 1,
+	},
+	{
+		name: "Iowa City EBM",
+		server: "USIOW1VMS006",
+		plantToken: "usiow1",
+		idAddress: "10.75.0.26",
+		greatPlainsPlantCode: "30",
+		contactEmail: "",
+		contactPhone: "",
+		serverLoc: "D$\\LST_V3",
+		buildNumber: 1,
+	},
+	{
+		name: "Bowling Green 1",
+		server: "USBOW1VMS006",
+		plantToken: "usbow1",
+		idAddress: "10.25.0.26", //  3000 is open REQ0236527 2222 already open
+		greatPlainsPlantCode: "55",
+		contactEmail: "",
+		contactPhone: "",
+		serverLoc: "D$\\LST_V3",
+		buildNumber: 1,
+	},
+	{
+		name: "Bethlehem",
+		server: "USBET1VMS006",
+		plantToken: "usbet1",
+		idAddress: "10.25.0.26",
+		greatPlainsPlantCode: "75",
+		contactEmail: "",
+		contactPhone: "",
+		serverLoc: "D$\\LST_V3",
+		buildNumber: 1,
+	},
 ];
 
+// notes here for when it comes time to pull in all the server address info [test1_AlplaPROD2.0_Read].[masterData].[Plant] has everything from every server :D
 export const serversChecks = async () => {
 	const log = createLogger({ module: "system", subModule: "serverData" });
 	const { data, error } = await tryCatch(
@@ -130,3 +197,9 @@ export const serversChecks = async () => {
 		log.info({}, "All Servers were added/updated");
 	}
 };
+
+// Communication from logistic network to logisticsSupportTool (for printers and scanners)
+
+// network justification
+
+// scanners and printers are on dhcp

backend/system/settingsBase.controller.ts

@@ -76,6 +76,16 @@ const newSettings: NewSetting[] = [
 		roles: ["admin"],
 		seedVersion: 1,
 	},
+	{
+		name: "mobile",
+		value: "0",
+		active: false,
+		description: "LST Android Mobile app",
+		moduleName: "mobile",
+		settingType: "feature",
+		roles: ["admin"],
+		seedVersion: 1,
+	},
 
 	// standard settings
 	{
@@ -304,6 +314,38 @@ const newSettings: NewSetting[] = [
 		roles: ["admin"],
 		seedVersion: 1,
 	},
+	{
+		name: "laneCheck",
+		value: "0",
+		active: false,
+		description:
+			"Allows the driver to scan a lane and see what is in the lane and details about each pallet.",
+		moduleName: "mobile",
+		settingType: "standard",
+		roles: ["admin"],
+		seedVersion: 1,
+	},
+	{
+		name: "dockScan",
+		value: "0",
+		active: false,
+		description:
+			"Enables dock door scanning, must have a dock scanner setup for this to work.",
+		moduleName: "mobile",
+		settingType: "standard",
+		roles: ["admin"],
+		seedVersion: 1,
+	},
+	{
+		name: "cycleCounting",
+		value: "0",
+		active: false,
+		description: "Enables a cycle count to be triggered from the scanner.",
+		moduleName: "mobile",
+		settingType: "standard",
+		roles: ["admin"],
+		seedVersion: 1,
+	},
 ];
 
 export const baseSettingValidationCheck = async () => {

backend/system/system.routes.ts

@@ -1,15 +1,15 @@
 import type { Express } from "express";
 import { requireAuth } from "../middleware/auth.middleware.js";
+import { routeHitMiddleware } from "../middleware/routeHit.middleware.js";
 import getServers from "./serverData.route.js";
 import getSettings from "./settings.route.js";
 import updSetting from "./settingsUpdate.route.js";
 import stats from "./stats.route.js";
-import mobile from "./system.mobileApp.js";
 
 export const setupSystemRoutes = (baseUrl: string, app: Express) => {
 	//stats will be like this as we dont need to change this
+	app.use(routeHitMiddleware);
 	app.use(`${baseUrl}/api/stats`, stats);
-	app.use(`${baseUrl}/api/mobile`, mobile);
 	app.use(`${baseUrl}/api/settings`, getSettings);
 	app.use(`${baseUrl}/api/servers`, getServers);
 	app.use(`${baseUrl}/api/settings`, requireAuth, updSetting);

backend/tcpServer/tcp.routes.ts

@@ -1,14 +1,21 @@
 import type { Express } from "express";
 import { requireAuth } from "../middleware/auth.middleware.js";
+import { routeHitMiddleware } from "../middleware/routeHit.middleware.js";
 import restart from "./tcpRestart.route.js";
 import start from "./tcpStart.route.js";
 import stop from "./tcpStop.route.js";
 
 export const setupTCPRoutes = (baseUrl: string, app: Express) => {
 	//stats will be like this as we dont need to change this
-	app.use(`${baseUrl}/api/tcp/start`, requireAuth, start);
-	app.use(`${baseUrl}/api/tcp/stop`, requireAuth, stop);
-	app.use(`${baseUrl}/api/tcp/restart`, requireAuth, restart);
+
+	app.use(`${baseUrl}/api/tcp/start`, requireAuth, routeHitMiddleware, start);
+	app.use(`${baseUrl}/api/tcp/stop`, requireAuth, routeHitMiddleware, stop);
+	app.use(
+		`${baseUrl}/api/tcp/restart`,
+		requireAuth,
+		routeHitMiddleware,
+		restart,
+	);
 
 	// all other system should be under /api/system/*
 };

backend/utils/analyticRouteHits.utils.ts

@@ -0,0 +1,141 @@
+import { and, count, countDistinct, gte, lt, sql } from "drizzle-orm";
+import { db } from "../db/db.controller.js";
+import { analytics } from "../db/schema/analytics.schema.js";
+import { analyticsDaily } from "../db/schema/dailyAnalytics.schema.js";
+
+export const ignoredRoutePrefixes = [
+	"/health",
+	"/favicon.ico",
+	"/socket.io",
+	"/lst/api/ws",
+	"/lst-config.js",
+];
+
+export function shouldIgnoreRoute(path: string) {
+	return ignoredRoutePrefixes.some((prefix) => path.startsWith(prefix));
+}
+
+type CreateRouteHitInput = {
+	method: string;
+	routePattern: string;
+	actualPath: string;
+	statusCode: number;
+	durationMs: number;
+	module?: string | null;
+	userId?: string | null;
+	userEmail?: string | null;
+	ipAddress?: string | null;
+	userAgent?: string | null;
+};
+
+export async function createRouteHit(input: CreateRouteHitInput) {
+	await db.insert(analytics).values(input);
+}
+
+function getPreviousBusinessDayWindow(date = new Date()) {
+	const end = new Date(date);
+	end.setHours(7, 0, 0, 0);
+
+	const start = new Date(end);
+	start.setDate(start.getDate() - 1);
+
+	const businessDate = start.toISOString().slice(0, 10);
+
+	return {
+		start,
+		end,
+		businessDate,
+	};
+}
+
+export async function runRouteHitAnalyticsCron(): Promise<void> {
+	const result = await aggregateRouteHitsForBusinessDay();
+
+	await cleanupOldRouteHits();
+
+	console.log("Route hit analytics aggregated", result);
+}
+
+export async function aggregateRouteHitsForBusinessDay() {
+	const { start, end, businessDate } = getPreviousBusinessDayWindow();
+
+	const rows = await db
+		.select({
+			businessDate: sql<string>`${businessDate}`,
+			method: analytics.method,
+			routePattern: analytics.routePattern,
+			module: sql<string>`COALESCE(${analytics.module}, 'unknown')`,
+
+			totalHits: count(),
+			uniqueUsers: countDistinct(analytics.userId),
+
+			successCount: sql<number>`
+			COUNT(*) FILTER (WHERE ${analytics.statusCode} < 400)
+		`,
+			errorCount: sql<number>`
+			COUNT(*) FILTER (WHERE ${analytics.statusCode} >= 400)
+		`,
+
+			avgDurationMs: sql<number>`
+			COALESCE(ROUND(AVG(${analytics.durationMs})), 0)
+		`,
+			maxDurationMs: sql<number>`
+			COALESCE(MAX(${analytics.durationMs}), 0)
+		`,
+
+			firstHitAt: sql<Date>`
+			COALESCE(MIN(${analytics.createdAt}), NOW())
+		`,
+			lastHitAt: sql<Date>`
+			COALESCE(MAX(${analytics.createdAt}), NOW())
+		`,
+		})
+		.from(analytics)
+		.where(and(gte(analytics.createdAt, start), lt(analytics.createdAt, end)))
+		.groupBy(
+			analytics.method,
+			analytics.routePattern,
+			sql`COALESCE(${analytics.module}, 'unknown')`,
+		);
+
+	if (rows.length === 0) {
+		return {
+			businessDate,
+			inserted: 0,
+		};
+	}
+
+	await db
+		.insert(analyticsDaily)
+		.values(rows)
+		.onConflictDoUpdate({
+			target: [
+				analyticsDaily.businessDate,
+				analyticsDaily.method,
+				analyticsDaily.routePattern,
+				analyticsDaily.module,
+			],
+			set: {
+				totalHits: sql`excluded.total_hits`,
+				uniqueUsers: sql`excluded.unique_users`,
+				successCount: sql`excluded.success_count`,
+				errorCount: sql`excluded.error_count`,
+				avgDurationMs: sql`excluded.avg_duration_ms`,
+				maxDurationMs: sql`excluded.max_duration_ms`,
+				firstHitAt: sql`excluded.first_hit_at`,
+				lastHitAt: sql`excluded.last_hit_at`,
+				updatedAt: sql`now()`,
+			},
+		});
+
+	return {
+		businessDate,
+		inserted: rows.length,
+	};
+}
+
+export async function cleanupOldRouteHits() {
+	await db
+		.delete(analytics)
+		.where(lt(analytics.createdAt, sql`now() - interval '4 days'`));
+}

backend/utils/auth.utils.ts

@@ -2,6 +2,7 @@ import { betterAuth } from "better-auth";
 import { drizzleAdapter } from "better-auth/adapters/drizzle";
 import {
 	admin as adminPlugin,
+	genericOAuth,
 	// apiKey,
 	// createAuthMiddleware,
 	//customSession,
@@ -16,6 +17,46 @@ import { ac, admin, systemAdmin, user } from "./auth.permissions.js";
 import { allowedOrigins } from "./cors.utils.js";
 import { sendEmail } from "./sendEmail.utils.js";
 
+function decodeJwtPayload<T = Record<string, unknown>>(jwt: string): T {
+	const parts = jwt.split(".");
+	if (parts.length < 2) {
+		throw new Error("Invalid JWT");
+	}
+
+	const payload = parts[1]?.replace(/-/g, "+").replace(/_/g, "/");
+
+	const padded = payload?.padEnd(
+		payload.length + ((4 - (payload.length % 4)) % 4),
+		"=",
+	);
+
+	const json = Buffer.from(padded ?? "", "base64").toString("utf8");
+	return JSON.parse(json) as T;
+}
+
+function normalizeGroups(groups?: unknown): string[] {
+	if (!Array.isArray(groups)) return [];
+
+	return groups
+		.filter((g): g is string => typeof g === "string")
+		.map((g) => g.trim().toLowerCase())
+		.filter((g) => g.length > 0);
+}
+
+type VoidAuthClaims = {
+	sub: string;
+	name?: string;
+	preferred_username?: string;
+	email?: string;
+	email_verified?: boolean;
+	groups?: string[];
+	picture?: string;
+	iss?: string;
+	aud?: string;
+	exp?: number;
+	iat?: number;
+};
+
 export const schema = {
 	user: rawSchema.user,
 	session: rawSchema.session,
@@ -25,9 +66,73 @@ export const schema = {
 	apiKey: rawSchema.apikey, // 🔑 rename to apiKey
 };
 
+const hasOAuth =
+	Boolean(process.env.PROVIDER) &&
+	Boolean(process.env.CLIENT_ID) &&
+	Boolean(process.env.CLIENT_SECRET) &&
+	Boolean(process.env.DISCOVERY_URL);
+
+if (!hasOAuth) {
+	console.warn("Missing oauth data.");
+}
+
+const oauthPlugins = hasOAuth
+	? [
+			genericOAuth({
+				config: [
+					{
+						providerId: process.env.PROVIDER!,
+						clientId: process.env.CLIENT_ID!,
+						clientSecret: process.env.CLIENT_SECRET!,
+						discoveryUrl: process.env.DISCOVERY_URL!,
+						scopes: (process.env.CLIENT_SCOPES ?? "")
+							.split(/[,\s]+/)
+							.filter(Boolean),
+						pkce: true,
+						requireIssuerValidation: true,
+						redirectURI: `${process.env.URL}/lst/api/auth/oauth2/callback/${process.env.PROVIDER!}`,
+						getUserInfo: async (tokens) => {
+							if (!tokens.idToken) {
+								throw new Error("VoidAuth did not return an idToken");
+							}
+
+							const claims = decodeJwtPayload<VoidAuthClaims>(tokens.idToken);
+							const groups = normalizeGroups(claims.groups);
+
+							return {
+								id: claims.sub,
+								email: claims.email ?? "",
+								name:
+									claims.name ??
+									claims.preferred_username ??
+									claims.email ??
+									"Unknown User",
+								image: claims.picture ?? null,
+								emailVerified: Boolean(claims.email_verified),
+								groups,
+								username: claims.preferred_username ?? null,
+							} as any;
+						},
+
+						mapProfileToUser: async (profile) => {
+							return {
+								name: profile.name,
+								role: profile.groups?.includes("lst_admins")
+									? "systemAdmin"
+									: profile.groups?.includes("admins")
+										? "admin"
+										: "user",
+							};
+						},
+					},
+				],
+			}),
+		]
+	: [];
+
 export const auth = betterAuth({
 	appName: "lst",
-	baseURL: process.env.URL,
+	baseURL: `${process.env.URL}/lst/api/auth`,
 	database: drizzleAdapter(db, {
 		provider: "pg",
 		schema,
@@ -42,6 +147,14 @@ export const auth = betterAuth({
 			},
 		},
 	},
+	account: {
+		encryptOAuthTokens: true,
+		updateAccountOnSignIn: true,
+		accountLinking: {
+			enabled: true,
+			trustedProviders: ["voidauth"],
+		},
+	},
 	plugins: [
 		jwt({ jwt: { expirationTime: "1h" } }),
 		//apiKey(),
@@ -63,6 +176,7 @@ export const auth = betterAuth({
 				return true;
 			},
 		}),
+		...oauthPlugins,
 
 		// customSession(async ({ user, session }) => {
 		// 	const roles = await db
@@ -121,7 +235,7 @@ export const auth = betterAuth({
 		},
 	},
 	cookie: {
-		path: "/lst/app",
+		path: "/lst",
 		sameSite: "lax",
 		secure: false,
 		httpOnly: true,

backend/utils/generateScannerPin.utils.ts

@@ -0,0 +1,39 @@
+import { db } from "../db/db.controller.js";
+import { returnFunc } from "./returnHelper.utils.js";
+
+export function generateSixDigitPin() {
+	return Math.floor(100000 + Math.random() * 900000).toString();
+}
+
+export async function generateUniquePin() {
+	for (let i = 0; i < 10; i++) {
+		const pin = generateSixDigitPin();
+
+		const existing = await db.query.scanUser.findFirst({
+			where: (u, { eq }) => eq(u.pinHash, pin), // ⚠️ we'll fix this below
+		});
+
+		if (!existing)
+			return returnFunc({
+				success: true,
+				level: "info",
+				module: "utils",
+				subModule: "genPin",
+				message: "New pin generated",
+				data: [{ pin: pin }],
+				notify: false,
+				room: "",
+			});
+	}
+
+	return returnFunc({
+		success: false,
+		level: "error",
+		module: "utils",
+		subModule: "genPin",
+		message: "Failed to generate unique PIN after 10 attempts",
+		data: [],
+		notify: true,
+		room: "",
+	});
+}

backend/utils/returnHelper.utils.ts

@@ -15,7 +15,8 @@ export interface ReturnHelper<T = unknown[]> {
 		| "purchase"
 		| "tcp"
 		| "logistics"
-		| "admin";
+		| "admin"
+		| "mobile";
 	subModule: string;
 
 	level: "info" | "error" | "debug" | "fatal" | "warn";

backend/utils/umami.utils.ts

@@ -0,0 +1,61 @@
+import { isUmamiEnabled, umamiConfig } from "../configs/umami.config.js";
+
+type TrackLstEventInput = {
+	eventName: string;
+	eventData?: Record<string, unknown>;
+	url?: string;
+	hostname?: string;
+};
+
+export async function trackLstEvent({
+	eventName,
+	eventData,
+	url = "/backend",
+	hostname = umamiConfig.server,
+}: TrackLstEventInput): Promise<void> {
+	if (!isUmamiEnabled()) return;
+
+	try {
+		await fetch(`${umamiConfig.umamiHost}/api/send`, {
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+				"User-Agent": "LST-Backend",
+			},
+			body: JSON.stringify({
+				type: "event",
+				payload: {
+					website: umamiConfig.umamiWebsiteId,
+					name: eventName,
+					url,
+					hostname,
+					language: "en-US",
+					screen: "backend",
+					data: {
+						app: umamiConfig.appName,
+						site: umamiConfig.site,
+						server: umamiConfig.server,
+						appVersion: umamiConfig.appVersion,
+						source: "backend",
+						...eventData,
+					},
+				},
+			}),
+		});
+	} catch (err) {
+		console.error("Failed to send Umami backend event", err);
+	}
+}
+
+/*
+await trackLstEvent({
+	eventName: "label_print_completed",
+	url: "/backend/printers",
+	eventData: {
+		module: "printers",
+		printerName,
+		labelType,
+	},
+});
+
+*/

backend/utils/utils.routes.ts

@@ -1,7 +1,9 @@
 import type { Express } from "express";
+import { routeHitMiddleware } from "../middleware/routeHit.middleware.js";
 import getActiveJobs from "./cronerActiveJobs.route.js";
 import jobStatusChange from "./cronerStatusChange.route.js";
 export const setupUtilsRoutes = (baseUrl: string, app: Express) => {
+	app.use(routeHitMiddleware);
 	app.use(`${baseUrl}/api/utils/croner`, getActiveJobs);
 	app.use(`${baseUrl}/api/utils/croner`, jobStatusChange);
 };

brunoApi/auth/Login.bru

@@ -1,37 +0,0 @@
-meta {
-  name: Login
-  type: http
-  seq: 1
-}
-
-post {
-  url: {{url}}/api/auth/sign-in/email
-  body: json
-  auth: inherit
-}
-
-headers {
-  Origin: http://localhost:3000
-}
-
-body:json {
-  {
-    "email": "blake.matthes@alpla.com",
-    "password": "nova0511"
-  }
-}
-
-script:post-response {
-  // // grab the raw Set-Cookie header
-  // const cookies = res.headers["set-cookie"];
-  
-  // const sessionCookie = cookies[0].split(";")[0];
-  
-  // // Save it as an environment variable
-  // bru.setEnvVar("session_cookie", sessionCookie);
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/auth/Register.bru

@@ -1,35 +0,0 @@
-meta {
-  name: Register
-  type: http
-  seq: 2
-}
-
-post {
-  url: {{url}}/api/authentication/register
-  body: json
-  auth: inherit
-}
-
-body:json {
-  {
-    "name":"Blake", // option when in the frontend as we will pass over as username if not added
-    "username": "matthes01",
-    "email": "blake.matthes@alpla.com",
-    "password": "nova0511"
-  }
-}
-
-script:post-response {
-  // // grab the raw Set-Cookie header
-  // const cookies = res.headers["set-cookie"];
-  
-  // const sessionCookie = cookies[0].split(";")[0];
-  
-  // // Save it as an environment variable
-  // bru.setEnvVar("session_cookie", sessionCookie);
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/auth/folder.bru

@@ -1,8 +0,0 @@
-meta {
-  name: auth
-  seq: 5
-}
-
-auth {
-  mode: inherit
-}

brunoApi/auth/getSession.bru

@@ -1,16 +0,0 @@
-meta {
-  name: getSession
-  type: http
-  seq: 3
-}
-
-get {
-  url: {{url}}/api/auth/get-session
-  body: none
-  auth: inherit
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/bruno.json

@@ -1,9 +0,0 @@
-{
-  "version": "1",
-  "name": "lst_v3",
-  "type": "collection",
-  "ignore": [
-    "node_modules",
-    ".git"
-  ]
-}

brunoApi/collection.bru

@@ -1,3 +0,0 @@
-docs {
-  All Api endpoints to the logistics support tool
-}

brunoApi/datamart/Get queries.bru

@@ -1,16 +0,0 @@
-meta {
-  name: Get queries
-  type: http
-  seq: 1
-}
-
-get {
-  url: {{url}}/api/datamart
-  body: none
-  auth: inherit
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/datamart/Run Query.bru

@@ -1,27 +0,0 @@
-meta {
-  name: Run Query
-  type: http
-  seq: 2
-}
-
-get {
-  url: {{url}}/api/datamart/:name?articles=118,120&startDate=2026-01-01&endDate=2026-12-31&all=x
-  body: none
-  auth: inherit
-}
-
-params:query {
-  articles: 118,120
-  startDate: 2026-01-01
-  endDate: 2026-12-31
-  all: x
-}
-
-params:path {
-  name: deliveryByDateRange
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/datamart/folder.bru

@@ -1,8 +0,0 @@
-meta {
-  name: datamart
-  seq: 2
-}
-
-auth {
-  mode: inherit
-}

brunoApi/environments/lstv3.bru

@@ -1,7 +0,0 @@
-vars {
-  url: http://localhost:3000/lst
-  readerIp: 10.44.14.215
-}
-vars:secret [
-  token
-]

brunoApi/notifications/Get All notifications.bru

@@ -1,20 +0,0 @@
-meta {
-  name: Get All notifications.
-  type: http
-  seq: 1
-}
-
-get {
-  url: {{url}}/api/notification
-  body: none
-  auth: inherit
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}
-
-docs {
-  Passing all as a query param will return all queries active and none active
-}

brunoApi/notifications/Subscribe to notification.bru

@@ -1,24 +0,0 @@
-meta {
-  name: Subscribe to notification
-  type: http
-  seq: 2
-}
-
-post {
-  url: {{url}}/api/notification/sub
-  body: json
-  auth: inherit
-}
-
-body:json {
-  {
-    "userId":"m6AbQXFwOXoX3YKLfwWgq2LIdDqS5jqv",
-    "notificationId": "0399eb2a-39df-48b7-9f1c-d233cec94d2e",
-    "emails": ["blake.matthes@alpla.com","blake.matthes@alpla.com"]
-  }
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/notifications/folder.bru

@@ -1,8 +0,0 @@
-meta {
-  name: notifications
-  seq: 7
-}
-
-auth {
-  mode: inherit
-}

brunoApi/notifications/remove sub notification.bru

@@ -1,24 +0,0 @@
-meta {
-  name: remove sub notification
-  type: http
-  seq: 4
-}
-
-delete {
-  url: {{url}}/api/notification/sub
-  body: json
-  auth: inherit
-}
-
-body:json {
-  {
-    "userId":"0kHd6Kkdub4GW6rK1qa1yjWwqXtvykqT",
-    "notificationId": "0399eb2a-39df-48b7-9f1c-d233cec94d2e",
-    "emails": ["blake.mattes@alpla.com"]
-  }
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/notifications/subscriptions.bru

@@ -1,16 +0,0 @@
-meta {
-  name: subscriptions
-  type: http
-  seq: 5
-}
-
-get {
-  url: {{url}}/api/notification/sub
-  body: json
-  auth: inherit
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/notifications/update notification.bru

@@ -1,31 +0,0 @@
-meta {
-  name: update notification
-  type: http
-  seq: 6
-}
-
-patch {
-  url: {{url}}/api/notification/:id
-  body: json
-  auth: inherit
-}
-
-params:path {
-  id: 0399eb2a-39df-48b7-9f1c-d233cec94d2e
-}
-
-body:json {
-  {
-    "active" : true,
-    "options": []
-  }
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}
-
-docs {
-  Passing all as a query param will return all queries active and none active
-}

brunoApi/notifications/update sub notification.bru

@@ -1,24 +0,0 @@
-meta {
-  name: update sub notification
-  type: http
-  seq: 3
-}
-
-patch {
-  url: {{url}}/api/notification/sub
-  body: json
-  auth: inherit
-}
-
-body:json {
-  {
-    "userId":"m6AbQXFwOXoX3YKLfwWgq2LIdDqS5jqv",
-    "notificationId": "0399eb2a-39df-48b7-9f1c-d233cec94d2e",
-    "emails": ["cowchmonkey@gmail.com"]
-  }
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/ocp/Printer Listenter.bru

@@ -1,22 +0,0 @@
-meta {
-  name: Printer Listenter
-  type: http
-  seq: 1
-}
-
-post {
-  url: {{url}}/api/ocp/printer/listener/line_1
-  body: json
-  auth: inherit
-}
-
-body:json {
-  {
-    "message":"xnvjdhhgsdfr"
-  }
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/ocp/folder.bru

@@ -1,8 +0,0 @@
-meta {
-  name: ocp
-  seq: 9
-}
-
-auth {
-  mode: inherit
-}

brunoApi/opendock/GetApt.bru

@@ -1,16 +0,0 @@
-meta {
-  name: GetApt
-  type: http
-  seq: 1
-}
-
-get {
-  url: {{url}}/api/opendock
-  body: none
-  auth: inherit
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/prodSql/Sql Start.bru

@@ -1,16 +0,0 @@
-meta {
-  name: Sql Start
-  type: http
-  seq: 4
-}
-
-post {
-  url: {{url}}/api/system/prodsql/start
-  body: none
-  auth: inherit
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/prodSql/Sql restart.bru

@@ -1,16 +0,0 @@
-meta {
-  name: Sql restart
-  type: http
-  seq: 4
-}
-
-post {
-  url: {{url}}/api/system/prodsql/restart
-  body: none
-  auth: inherit
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/prodSql/Sql stop.bru

@@ -1,16 +0,0 @@
-meta {
-  name: Sql stop
-  type: http
-  seq: 4
-}
-
-post {
-  url: {{url}}/api/system/prodsql/stop
-  body: none
-  auth: inherit
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/prodSql/folder.bru

@@ -1,8 +0,0 @@
-meta {
-  name: prodSql
-  seq: 6
-}
-
-auth {
-  mode: inherit
-}

brunoApi/rfidReaders/folder.bru

@@ -1,8 +0,0 @@
-meta {
-  name: rfidReaders
-  seq: 8
-}
-
-auth {
-  mode: inherit
-}

brunoApi/rfidReaders/reader.bru

@@ -1,20 +0,0 @@
-meta {
-  name: reader
-  type: http
-  seq: 2
-}
-
-post {
-  url: https://usday1prod.alpla.net/lst/old/api/rfid/mgtevents/line3.1
-  body: json
-  auth: inherit
-}
-
-body:json {
-  {}
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/rfidReaders/readerSpecific/Config.bru

@@ -1,20 +0,0 @@
-meta {
-  name: Config
-  type: http
-  seq: 2
-}
-
-get {
-  url: https://{{readerIp}}/cloud/config
-  body: none
-  auth: bearer
-}
-
-auth:bearer {
-  token: {{token}}
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/rfidReaders/readerSpecific/Login.bru

@@ -1,32 +0,0 @@
-meta {
-  name: Login
-  type: http
-  seq: 1
-}
-
-get {
-  url: https://{{readerIp}}/cloud/localRestLogin
-  body: none
-  auth: basic
-}
-
-auth:basic {
-  username: admin
-  password: Zebra123!
-}
-
-script:post-response {
-  const body = res.getBody();
-  
-  if (body.message) {
-    bru.setEnvVar("token", body.message);
-  } else {
-    bru.setEnvVar("token", "error");
-  }
-  
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/rfidReaders/readerSpecific/Update Config.bru

@@ -1,237 +0,0 @@
-meta {
-  name: Update Config
-  type: http
-  seq: 3
-}
-
-put {
-  url: https://{{readerIp}}/cloud/config
-  body: json
-  auth: bearer
-}
-
-headers {
-  Content-Type: application/json
-}
-
-auth:bearer {
-  token: {{token}}
-}
-
-body:json {
-  {
-    "GPIO-LED": {
-      "GPODefaults": {
-        "1": "HIGH",
-        "2": "HIGH",
-        "3": "HIGH",
-        "4": "HIGH"
-      },
-      "LEDDefaults": {
-        "3": "GREEN"
-      },
-      "TAG_READ": [
-        {
-          "pin": 1,
-          "state": "HIGH",
-          "type": "GPO"
-        }
-      ]
-    },
-    "READER-GATEWAY": {
-      "batching": [
-        {
-          "maxPayloadSizePerReport": 256000,
-          "reportingInterval": 2000
-        },
-        {
-          "maxPayloadSizePerReport": 256000,
-          "reportingInterval": 2000
-        }
-      ],
-      "endpointConfig": {
-        "data": {
-          "event": {
-            "connections": [
-              {
-                "additionalOptions": {
-                  "retention": {
-                    "maxEventRetentionTimeInMin": 500,
-                    "maxNumEvents": 150000,
-                    "throttle": 100
-                  }
-                },
-                "description": "",
-                "name": "LST",
-                "options": {
-                  "URL": "https://usday1prod.alpla.net/lst/old/api/rfid/taginfo/line3.4",
-                  "security": {
-                    "CACertificateFileLocation": "",
-                    "authenticationOptions": {},
-                    "authenticationType": "NONE",
-                    "verifyHost": false,
-                    "verifyPeer": false
-                  }
-                },
-                "type": "httpPost"
-              },
-              {
-                "additionalOptions": {
-                  "retention": {
-                    "maxEventRetentionTimeInMin": 500,
-                    "maxNumEvents": 150000,
-                    "throttle": 100
-                  }
-                },
-                "description": "",
-                "name": "mgt",
-                "options": {
-                  "URL": "https://usday1prod.alpla.net/lst/old/api/rfid/mgtevents/line3.4",
-                  "security": {
-                    "CACertificateFileLocation": "",
-                    "authenticationOptions": {},
-                    "authenticationType": "NONE",
-                    "verifyHost": false,
-                    "verifyPeer": false
-                  }
-                },
-                "type": "httpPost"
-              }
-            ]
-          }
-        }
-      },
-      "managementEventConfig": {
-        "errors": {
-          "antenna": false,
-          "cpu": {
-            "reportIntervalInSec": 1800,
-            "threshold": 90
-          },
-          "database": true,
-          "flash": {
-            "reportIntervalInSec": 1800,
-            "threshold": 90
-          },
-          "ntp": true,
-          "radio": true,
-          "radio_control": true,
-          "ram": {
-            "reportIntervalInSec": 1800,
-            "threshold": 90
-          },
-          "reader_gateway": true,
-          "userApp": {
-            "reportIntervalInSec": 1800,
-            "threshold": 120
-          }
-        },
-        "gpiEvents": true,
-        "gpoEvents": true,
-        "heartbeat": {
-          "fields": {
-            "radio_control": [
-              "ANTENNAS",
-              "RADIO_ACTIVITY",
-              "RADIO_CONNECTION",
-              "CPU",
-              "RAM",
-              "UPTIME",
-              "NUM_ERRORS",
-              "NUM_WARNINGS",
-              "NUM_TAG_READS",
-              "NUM_TAG_READS_PER_ANTENNA",
-              "NUM_DATA_MESSAGES_TXED",
-              "NUM_RADIO_PACKETS_RXED"
-            ],
-            "reader_gateway": [
-              "NUM_DATA_MESSAGES_RXED",
-              "NUM_MANAGEMENT_EVENTS_TXED",
-              "NUM_DATA_MESSAGES_TXED",
-              "NUM_DATA_MESSAGES_RETAINED",
-              "NUM_DATA_MESSAGES_DROPPED",
-              "CPU",
-              "RAM",
-              "UPTIME",
-              "NUM_ERRORS",
-              "NUM_WARNINGS",
-              "INTERFACE_CONNECTION_STATUS",
-              "NOLOCKQ_DEPTH"
-            ],
-            "system": [
-              "CPU",
-              "FLASH",
-              "NTP",
-              "RAM",
-              "SYSTEMTIME",
-              "TEMPERATURE",
-              "UPTIME",
-              "GPO",
-              "GPI",
-              "POWER_NEGOTIATION",
-              "POWER_SOURCE",
-              "MAC_ADDRESS",
-              "HOSTNAME"
-            ],
-            "userapps": [
-              "STATUS",
-              "CPU",
-              "RAM",
-              "UPTIME",
-              "NUM_DATA_MESSAGES_RXED",
-              "NUM_DATA_MESSAGES_TXED",
-              "INCOMING_DATA_BUFFER_PERCENTAGE_REMAINING",
-              "OUTGOING_DATA_BUFFER_PERCENTAGE_REMAINING"
-            ]
-          },
-          "interval": 60
-        },
-        "userappEvents": true,
-        "warnings": {
-          "cpu": {
-            "reportIntervalInSec": 1800,
-            "threshold": 80
-          },
-          "database": true,
-          "flash": {
-            "reportIntervalInSec": 1800,
-            "threshold": 80
-          },
-          "ntp": true,
-          "radio_api": true,
-          "radio_control": true,
-          "ram": {
-            "reportIntervalInSec": 1800,
-            "threshold": 80
-          },
-          "reader_gateway": true,
-          "temperature": {
-            "ambient": 75,
-            "pa": 105
-          },
-          "userApp": {
-            "reportIntervalInSec": 1800,
-            "threshold": 60
-          }
-        }
-      },
-      "retention": [
-        {
-          "maxEventRetentionTimeInMin": 500,
-          "maxNumEvents": 150000,
-          "throttle": 100
-        },
-        {
-          "maxEventRetentionTimeInMin": 500,
-          "maxNumEvents": 150000,
-          "throttle": 100
-        }
-      ]
-    }
-  }
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/rfidReaders/readerSpecific/folder.bru

@@ -1,12 +0,0 @@
-meta {
-  name: readerSpecific
-}
-
-auth {
-  mode: basic
-}
-
-auth:basic {
-  username: admin
-  password: Zebra123!
-}

brunoApi/system/Get Settings.bru

@@ -1,20 +0,0 @@
-meta {
-  name: Get Settings
-  type: http
-  seq: 3
-}
-
-get {
-  url: {{url}}/api/settings
-  body: none
-  auth: inherit
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}
-
-docs {
-  returns all settings
-}

brunoApi/system/Status.bru

@@ -1,16 +0,0 @@
-meta {
-  name: Status
-  type: http
-  seq: 1
-}
-
-get {
-  url: {{url}}/api/stats
-  body: none
-  auth: inherit
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/system/updateSetting.bru

@@ -1,33 +0,0 @@
-meta {
-  name: updateSetting
-  type: http
-  seq: 2
-}
-
-patch {
-  url: {{url}}/api/settings/opendock_sync
-  body: json
-  auth: inherit
-}
-
-body:json {
-  {
-    "value" : "1",
-    "active": "true"
-  }
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}
-
-docs {
-  Allows the changing of a setting based on the parameter.
-  
-  * when a setting that is being changed is a feature there will be some backgound logic that will stop that features processes and no long work.
-  
-  * when the setting is being changed is system the entire app will do a full restart
-  
-  * when a seeting is being changed and is standard nothing will happen until the next action is completed. example someone prints a label and you changed the default to 120 second from 90 seconds
-}

brunoApi/utils/Active Jobs.bru

@@ -1,16 +0,0 @@
-meta {
-  name: Active Jobs
-  type: http
-  seq: 5
-}
-
-get {
-  url: {{url}}/api/utils/croner
-  body: none
-  auth: inherit
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

brunoApi/utils/Change job status.bru

@@ -1,22 +0,0 @@
-meta {
-  name: Change job status
-  type: http
-  seq: 2
-}
-
-patch {
-  url: {{url}}/api/utils/croner/stop
-  body: json
-  auth: inherit
-}
-
-body:json {
-  {
-    "name": "open-dock-monitor"
-  }
-}
-
-settings {
-  encodeUrl: true
-  timeout: 0
-}

docker-compose.yml

@@ -12,48 +12,39 @@ services:
             #- "${VITE_PORT:-4200}:4200"
             - "3600:3000"
         dns:
-            - 10.193.9.250
-            - 10.193.9.251   # your internal DNS server
-        dns_search:
-            - alpla.net      # or your internal search suffix
+            - 10.44.9.250
+            - 10.44.9.251   # your internal DNS server
+            - 1.1.1.1
         environment:
             - NODE_ENV=production
             - LOG_LEVEL=info
-            - EXTERNAL_URL=http://192.168.8.222:3600
-            - DATABASE_HOST=host.docker.internal # if running on the same docker then do this
-            - DATABASE_PORT=5433
+            - URL=http://localhost:3600
+            - DATABASE_HOST=postgres # if running on the same docker then do this
+            - DATABASE_PORT=5432
             - DATABASE_USER=${DATABASE_USER}
             - DATABASE_PASSWORD=${DATABASE_PASSWORD}
             - DATABASE_DB=${DATABASE_DB}
-            - PROD_SERVER=${PROD_SERVER}
+            - PROD_SERVER=10.75.9.56 #${PROD_SERVER}
             - PROD_PLANT_TOKEN=${PROD_PLANT_TOKEN}
             - PROD_USER=${PROD_USER}
             - PROD_PASSWORD=${PROD_PASSWORD}
+            - GP_SERVER=10.193.9.31
+            - SQL_PORT=1433
             - BETTER_AUTH_SECRET=${BETTER_AUTH_SECRET}
             - BETTER_AUTH_URL=${URL}
-        # for all host including prod servers, plc's, printers, or other de
-#         extra_hosts:
-#             - "${PROD_SERVER}:${PROD_IP}"
+            - OPENDOCK_URL=${OPENDOCK_URL}
+            - OPENDOCK_PASSWORD=${OPENDOCK_PASSWORD}
+            - DEFAULT_DOCK=${DEFAULT_DOCK}
+            - DEFAULT_LOAD_TYPE=${DEFAULT_LOAD_TYPE}
+            - DEFAULT_CARRIER=${DEFAULT_CARRIER}
 
-#         networks:
-#             - default
-#             - logisticsNetwork
-#             #- mlan1
-# networks:
-#     logisticsNetwork:
-#         driver: macvlan
-#         driver_opts:
-#             parent: eth0
-#         ipam:
-#             config:
-#                 - subnet: ${LOGISTICS_NETWORK}
-#                   gateway: ${LOGISTICS_GATEWAY}
+        #for all host including prod servers, plc's, printers, or other de
+        networks:
+            - docker-network 
+            - pgNetwork
 
-#     mlan1:
-#         driver: macvlan
-#         driver_opts:
-#             parent: eth0
-#         ipam:
-#             config:
-#                 - subnet: ${MLAN1_NETWORK}
-#                   gateway: ${MLAN1_GATEWAY}
+networks:
+  docker-network:
+    external: true
+  pgNetwork:
+    external: true

frontend/index.html

@@ -7,7 +7,15 @@
     <title>Logistics Support Tool</title>
   </head>
   <body>
+<script>
+	const configScript = document.createElement("script");
+	configScript.src = `${window.location.origin}/lst/api/lst-config.js`;
+	configScript.defer = false;
+	document.head.appendChild(configScript);
+</script>
     <div id="root"></div>
+    <script defer src="https://stats.tuffraid.net/script.js" data-website-id="49bc2489-3930-4358-a13d-1cc609336572"></script>
+    
     <script type="module" src="/src/main.tsx"></script>
   </body>
 </html>

frontend/src/components/Sidebar/AdminBar.tsx

@@ -1,5 +1,5 @@
 import { Link } from "@tanstack/react-router";
-import { Bell, Logs, Server, Settings } from "lucide-react";
+import { Bell, Logs, Server, Settings, UsersRound } from "lucide-react";
 
 import {
 	SidebarGroup,
@@ -56,22 +56,22 @@ export default function AdminSidebar({ session }: any) {
 			module: "admin",
 			active: true,
 		},
-		// {
-		// 	title: "Modules",
-		// 	url: "/admin/modules",
-		// 	icon: Settings,
-		// 	role: ["systemAdmin", "admin"],
-		// 	module: "admin",
-		// 	active: true,
-		// },
-		// {
-		// 	title: "Servers",
-		// 	url: "/admin/servers",
-		// 	icon: Server,
-		// 	role: ["systemAdmin", "admin"],
-		// 	module: "admin",
-		// 	active: true,
-		// },
+		{
+			title: "Users",
+			url: "/admin/users",
+			icon: UsersRound,
+			role: ["systemAdmin", "admin"],
+			module: "admin",
+			active: true,
+		},
+		{
+			title: "Scan users",
+			url: "/admin/scanUsers",
+			icon: UsersRound,
+			role: ["systemAdmin", "admin"],
+			module: "admin",
+			active: true,
+		},
 	];
 	return (
 		<SidebarGroup>

frontend/src/components/Sidebar/DocBar.tsx

@@ -36,6 +36,17 @@ const docs = [
 			},
 		],
 	},
+	{
+		title: "Mobile",
+		url: "/updateInstructions",
+		isActive: false,
+		items: [
+			{
+				title: "Settings",
+				url: "/mobile-settings",
+			},
+		],
+	},
 ];
 export default function DocBar() {
 	const { setOpen } = useSidebar();

frontend/src/components/Sidebar/MobileBar.tsx

@@ -0,0 +1,49 @@
+import { Link } from "@tanstack/react-router";
+import { ScanText, ScrollText } from "lucide-react";
+import {
+	SidebarGroup,
+	SidebarGroupContent,
+	SidebarGroupLabel,
+	SidebarMenu,
+	SidebarMenuButton,
+	SidebarMenuItem,
+	useSidebar,
+} from "../ui/sidebar";
+
+export default function MobileBar({ session }: any) {
+	const { setOpen } = useSidebar();
+	const items = [
+		{
+			title: "Update Instructions",
+			url: "/",
+			icon: ScrollText,
+		},
+		{
+			title: "Scan Log",
+			url: "/",
+			icon: ScanText,
+		},
+	];
+
+	console.log(session);
+
+	return (
+		<SidebarGroup>
+			<SidebarGroupLabel>Mobile</SidebarGroupLabel>
+			<SidebarGroupContent>
+				<SidebarMenu>
+					{items.map((item) => (
+						<SidebarMenuItem key={item.title}>
+							<SidebarMenuButton asChild>
+								<Link to={item.url} onClick={() => setOpen(false)}>
+									<item.icon />
+									<span>{item.title}</span>
+								</Link>
+							</SidebarMenuButton>
+						</SidebarMenuItem>
+					))}
+				</SidebarMenu>
+			</SidebarGroupContent>
+		</SidebarGroup>
+	);
+}

frontend/src/components/Sidebar/sidebar.tsx

@@ -8,6 +8,7 @@ import {
 import { useSession } from "@/lib/auth-client";
 import AdminSidebar from "./AdminBar";
 import DocBar from "./DocBar";
+import MobileBar from "./MobileBar";
 
 export function AppSidebar() {
 	const { data: session } = useSession();
@@ -22,7 +23,8 @@ export function AppSidebar() {
 				<SidebarMenu>
 					<SidebarMenuItem>
 						<SidebarContent>
-							<DocBar/>
+							<DocBar />
+							<MobileBar session={session} />
 							{session &&
 								(session.user.role === "admin" ||
 									session.user.role === "systemAdmin") && (

frontend/src/docs/notifications/updateInstructions.tsx

@@ -0,0 +1,3 @@
+export default function updateInstructions() {
+	return <div>updateInstructions</div>;
+}

frontend/src/lib/auth-client.ts

@@ -1,4 +1,4 @@
-import { adminClient } from "better-auth/client/plugins";
+import { adminClient, genericOAuthClient } from "better-auth/client/plugins";
 import { createAuthClient } from "better-auth/react";
 import { ac, admin, systemAdmin, user } from "./auth-permissions";
 
@@ -13,6 +13,7 @@ export const authClient = createAuthClient({
 				systemAdmin,
 			},
 		}),
+		genericOAuthClient(),
 	],
 });
 

frontend/src/lib/queries/getScanUsers.ts

@@ -0,0 +1,25 @@
+import { keepPreviousData, queryOptions } from "@tanstack/react-query";
+import axios from "axios";
+
+export function getScanUsers() {
+	return queryOptions({
+		queryKey: ["getScanUsers"],
+		queryFn: () => fetch(),
+		staleTime: 5000,
+		refetchOnWindowFocus: true,
+		placeholderData: keepPreviousData,
+	});
+}
+
+const fetch = async () => {
+	if (window.location.hostname === "localhost") {
+		await new Promise((res) => setTimeout(res, 1500));
+	}
+
+	const { data } = await axios.get("/lst/api/mobile/auth/user", {
+		withCredentials: true,
+		timeout: 5000,
+	});
+
+	return data.data;
+};

frontend/src/lib/tableStuff/LstTable.tsx

@@ -11,6 +11,15 @@ import {
 import React, { useState } from "react";
 import { Button } from "../../components/ui/button";
 import { ScrollArea, ScrollBar } from "../../components/ui/scroll-area";
+import {
+	Select,
+	SelectContent,
+	SelectGroup,
+	SelectItem,
+	SelectLabel,
+	SelectTrigger,
+	SelectValue,
+} from "../../components/ui/select";
 import {
 	Table,
 	TableBody,
@@ -26,15 +35,23 @@ type LstTableType = {
 	tableClassName?: string;
 	data: any;
 	columns: any;
+	height?: string;
+	pageSize?: number;
 };
 export default function LstTable({
 	className = "",
 	tableClassName = "",
 	data,
 	columns,
+	height = "h-full",
+	pageSize = 5,
 }: LstTableType) {
 	const [sorting, setSorting] = useState<SortingState>([]);
 	const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
+	const [pagination, setPagination] = useState({
+		pageIndex: 0, //initial page index
+		pageSize: pageSize, //default page size
+	});
 	//console.log(data);
 
 	const table = useReactTable({
@@ -46,24 +63,33 @@ export default function LstTable({
 		getSortedRowModel: getSortedRowModel(),
 		onColumnFiltersChange: setColumnFilters,
 		getFilteredRowModel: getFilteredRowModel(),
+		onPaginationChange: setPagination,
 		//renderSubComponent: ({ row }: { row: any }) => <ExpandedRow row={row} />,
 		//getRowCanExpand: () => true,
+		// columnResizeMode: "onChange",
 		filterFns: {},
 		state: {
 			sorting,
+			pagination,
 			columnFilters,
 		},
 	});
 	return (
 		<div className={className}>
-			<ScrollArea className="w-full rounded-md border whitespace-nowrap">
+			<div>{/* TODO: Add table header in here like title */}</div>
+			<ScrollArea
+				className={`w-full rounded-md border whitespace-nowrap ${height}`}
+			>
 				<Table className={cn("w-full", tableClassName)}>
 					<TableHeader>
 						{table.getHeaderGroups().map((headerGroup) => (
 							<TableRow key={headerGroup.id}>
 								{headerGroup.headers.map((header) => {
 									return (
-										<TableHead key={header.id}>
+										<TableHead
+											key={header.id}
+											className="sticky top-0 z-20 bg-background"
+										>
 											{header.isPlaceholder
 												? null
 												: flexRender(
@@ -76,6 +102,7 @@ export default function LstTable({
 							</TableRow>
 						))}
 					</TableHeader>
+
 					<TableBody>
 						{table.getRowModel().rows.length ? (
 							table.getRowModel().rows.map((row) => (
@@ -107,14 +134,23 @@ export default function LstTable({
 				<ScrollBar orientation="horizontal" />
 				<ScrollBar orientation="vertical" />
 			</ScrollArea>
+
 			<div className="flex items-center justify-end space-x-2 py-4">
+				<Button
+					variant="outline"
+					size="sm"
+					onClick={() => table.firstPage()}
+					disabled={!table.getCanPreviousPage()}
+				>
+					{"<<"}
+				</Button>
 				<Button
 					variant="outline"
 					size="sm"
 					onClick={() => table.previousPage()}
 					disabled={!table.getCanPreviousPage()}
 				>
-					Previous
+					{"<"}
 				</Button>
 				<Button
 					variant="outline"
@@ -122,8 +158,42 @@ export default function LstTable({
 					onClick={() => table.nextPage()}
 					disabled={!table.getCanNextPage()}
 				>
-					Next
+					{">"}
 				</Button>
+				<Button
+					variant="outline"
+					size="sm"
+					onClick={() => table.lastPage()}
+					disabled={!table.getCanNextPage()}
+				>
+					{">>"}
+				</Button>
+				<Select
+					value={pagination.pageSize.toString()}
+					onValueChange={(e) =>
+						setPagination({
+							...pagination,
+							pageSize: e === "all" ? data.length : parseInt(e, 10),
+						})
+					}
+				>
+					<SelectTrigger className="w-16">
+						<SelectValue
+							//id={field.name}
+							placeholder="Select Page"
+						/>
+					</SelectTrigger>
+					<SelectContent>
+						<SelectGroup>
+							<SelectLabel>Page Size</SelectLabel>
+							<SelectItem value="5">5</SelectItem>
+							<SelectItem value="10">10</SelectItem>
+							<SelectItem value="50">50</SelectItem>
+							<SelectItem value="100">100</SelectItem>
+							<SelectItem value="all">All</SelectItem>
+						</SelectGroup>
+					</SelectContent>
+				</Select>
 			</div>
 		</div>
 	);

frontend/src/lib/umami.utils.ts

@@ -0,0 +1,65 @@
+type RuntimeConfig = {
+	appName: string;
+	site: string;
+	server: string;
+	appVersion: string;
+	umamiHost: string;
+	umamiWebsiteId: string;
+};
+
+declare global {
+	interface Window {
+		LST_CONFIG?: RuntimeConfig;
+		umami?: {
+			track: (eventName: string, eventData?: Record<string, unknown>) => void;
+		};
+	}
+}
+
+export const runtimeConfig: RuntimeConfig = {
+	appName: window.LST_CONFIG?.appName ?? "LST",
+	site: window.LST_CONFIG?.site ?? "unknown",
+	server: window.LST_CONFIG?.server ?? "unknown",
+	appVersion: window.LST_CONFIG?.appVersion ?? "dev",
+	umamiHost: window.LST_CONFIG?.umamiHost ?? "",
+	umamiWebsiteId: window.LST_CONFIG?.umamiWebsiteId ?? "",
+};
+
+export function loadUmami() {
+	if (!runtimeConfig.umamiHost) return;
+	if (!runtimeConfig.umamiWebsiteId) return;
+	if (document.querySelector("script[data-website-id]")) return;
+
+	const script = document.createElement("script");
+	script.defer = true;
+	script.src = `${runtimeConfig.umamiHost}/script.js`;
+	script.setAttribute("data-website-id", runtimeConfig.umamiWebsiteId);
+
+	document.head.appendChild(script);
+}
+
+export function trackLstEvent(
+	eventName: string,
+	eventData?: Record<string, unknown>,
+) {
+	window.umami?.track(eventName, {
+		app: runtimeConfig.appName,
+		site: runtimeConfig.site,
+		server: runtimeConfig.server,
+		appVersion: runtimeConfig.appVersion,
+		...eventData,
+	});
+}
+
+/*
+
+event type
+
+		trackLstEvent("exampleClick", {
+			module: "example",
+			action: "test_click",
+			label: "Example Button",
+			page: window.location.pathname,
+		});
+
+*/

frontend/src/main.tsx

@@ -4,6 +4,7 @@ import ReactDOM from "react-dom/client";
 import "./index.css";
 import { createRouter, RouterProvider } from "@tanstack/react-router";
 import socket from "./lib/socket.io";
+import { loadUmami } from "./lib/umami.utils";
 // Import the generated route tree
 import { routeTree } from "./routeTree.gen";
 
@@ -38,6 +39,7 @@ declare module "@tanstack/react-router" {
 // Render the app
 const rootElement = document.getElementById("root")!;
 if (!rootElement.innerHTML) {
+	loadUmami();
 	const root = ReactDOM.createRoot(rootElement);
 	root.render(
 		<StrictMode>

frontend/src/routeTree.gen.ts

@@ -15,6 +15,7 @@ import { Route as DocsIndexRouteImport } from './routes/docs/index'
 import { Route as DocsSplatRouteImport } from './routes/docs/$'
 import { Route as AdminSettingsRouteImport } from './routes/admin/settings'
 import { Route as AdminServersRouteImport } from './routes/admin/servers'
+import { Route as AdminScanUsersRouteImport } from './routes/admin/scanUsers'
 import { Route as AdminNotificationsRouteImport } from './routes/admin/notifications'
 import { Route as AdminLogsRouteImport } from './routes/admin/logs'
 import { Route as authLoginRouteImport } from './routes/(auth)/login'
@@ -52,6 +53,11 @@ const AdminServersRoute = AdminServersRouteImport.update({
   path: '/admin/servers',
   getParentRoute: () => rootRouteImport,
 } as any)
+const AdminScanUsersRoute = AdminScanUsersRouteImport.update({
+  id: '/admin/scanUsers',
+  path: '/admin/scanUsers',
+  getParentRoute: () => rootRouteImport,
+} as any)
 const AdminNotificationsRoute = AdminNotificationsRouteImport.update({
   id: '/admin/notifications',
   path: '/admin/notifications',
@@ -89,6 +95,7 @@ export interface FileRoutesByFullPath {
   '/login': typeof authLoginRoute
   '/admin/logs': typeof AdminLogsRoute
   '/admin/notifications': typeof AdminNotificationsRoute
+  '/admin/scanUsers': typeof AdminScanUsersRoute
   '/admin/servers': typeof AdminServersRoute
   '/admin/settings': typeof AdminSettingsRoute
   '/docs/$': typeof DocsSplatRoute
@@ -103,6 +110,7 @@ export interface FileRoutesByTo {
   '/login': typeof authLoginRoute
   '/admin/logs': typeof AdminLogsRoute
   '/admin/notifications': typeof AdminNotificationsRoute
+  '/admin/scanUsers': typeof AdminScanUsersRoute
   '/admin/servers': typeof AdminServersRoute
   '/admin/settings': typeof AdminSettingsRoute
   '/docs/$': typeof DocsSplatRoute
@@ -118,6 +126,7 @@ export interface FileRoutesById {
   '/(auth)/login': typeof authLoginRoute
   '/admin/logs': typeof AdminLogsRoute
   '/admin/notifications': typeof AdminNotificationsRoute
+  '/admin/scanUsers': typeof AdminScanUsersRoute
   '/admin/servers': typeof AdminServersRoute
   '/admin/settings': typeof AdminSettingsRoute
   '/docs/$': typeof DocsSplatRoute
@@ -134,6 +143,7 @@ export interface FileRouteTypes {
     | '/login'
     | '/admin/logs'
     | '/admin/notifications'
+    | '/admin/scanUsers'
     | '/admin/servers'
     | '/admin/settings'
     | '/docs/$'
@@ -148,6 +158,7 @@ export interface FileRouteTypes {
     | '/login'
     | '/admin/logs'
     | '/admin/notifications'
+    | '/admin/scanUsers'
     | '/admin/servers'
     | '/admin/settings'
     | '/docs/$'
@@ -162,6 +173,7 @@ export interface FileRouteTypes {
     | '/(auth)/login'
     | '/admin/logs'
     | '/admin/notifications'
+    | '/admin/scanUsers'
     | '/admin/servers'
     | '/admin/settings'
     | '/docs/$'
@@ -177,6 +189,7 @@ export interface RootRouteChildren {
   authLoginRoute: typeof authLoginRoute
   AdminLogsRoute: typeof AdminLogsRoute
   AdminNotificationsRoute: typeof AdminNotificationsRoute
+  AdminScanUsersRoute: typeof AdminScanUsersRoute
   AdminServersRoute: typeof AdminServersRoute
   AdminSettingsRoute: typeof AdminSettingsRoute
   DocsSplatRoute: typeof DocsSplatRoute
@@ -230,6 +243,13 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof AdminServersRouteImport
       parentRoute: typeof rootRouteImport
     }
+    '/admin/scanUsers': {
+      id: '/admin/scanUsers'
+      path: '/admin/scanUsers'
+      fullPath: '/admin/scanUsers'
+      preLoaderRoute: typeof AdminScanUsersRouteImport
+      parentRoute: typeof rootRouteImport
+    }
     '/admin/notifications': {
       id: '/admin/notifications'
       path: '/admin/notifications'
@@ -281,6 +301,7 @@ const rootRouteChildren: RootRouteChildren = {
   authLoginRoute: authLoginRoute,
   AdminLogsRoute: AdminLogsRoute,
   AdminNotificationsRoute: AdminNotificationsRoute,
+  AdminScanUsersRoute: AdminScanUsersRoute,
   AdminServersRoute: AdminServersRoute,
   AdminSettingsRoute: AdminSettingsRoute,
   DocsSplatRoute: DocsSplatRoute,

frontend/src/routes/(auth)/-components/LoginForm.tsx

@@ -1,4 +1,5 @@
 import { Link, useNavigate } from "@tanstack/react-router";
+import { Cat } from "lucide-react";
 import { toast } from "sonner";
 import {
 	Card,
@@ -9,13 +10,23 @@ import {
 } from "@/components/ui/card";
 import { authClient } from "@/lib/auth-client";
 import { useAppForm } from "@/lib/formSutff";
+import { Button } from "../../../components/ui/button";
 import socket from "../../../lib/socket.io";
 
 export default function LoginForm({ redirectPath }: { redirectPath: string }) {
 	const loginEmail = localStorage.getItem("loginEmail") || "";
 	const rememberMe = localStorage.getItem("rememberMe") === "true";
+
 	const navigate = useNavigate();
 
+	const oauthLogin = async () => {
+		await authClient.signIn.oauth2({
+			providerId: "voidauth",
+			callbackURL: "/lst/app",
+			errorCallbackURL: "/lst/app/login",
+		});
+	};
+
 	const form = useAppForm({
 		defaultValues: {
 			email: loginEmail,
@@ -26,7 +37,7 @@ export default function LoginForm({ redirectPath }: { redirectPath: string }) {
 			// set remember me incase we want it later
 			if (value.rememberMe) {
 				localStorage.setItem("rememberMe", value.rememberMe.toString());
-				localStorage.setItem("loginEmail", value.email);
+				localStorage.setItem("loginEmail", value.email.toLocaleLowerCase());
 			} else {
 				localStorage.removeItem("rememberMe");
 				localStorage.removeItem("loginEmail");
@@ -62,7 +73,17 @@ export default function LoginForm({ redirectPath }: { redirectPath: string }) {
 		<div>
 			<Card className="p-3 w-96">
 				<CardHeader>
-					<CardTitle>Login to your account</CardTitle>
+					<CardTitle>
+						<div className="flex flex-row justify-center">
+							<Button onClick={oauthLogin} size="lg" variant="ghost">
+								<Cat />
+							</Button>
+							<span className="mt-2">Login to your account</span>{" "}
+							<Button size="lg" variant="ghost">
+								<Cat />
+							</Button>
+						</div>
+					</CardTitle>
 					<CardDescription>
 						Enter your username and password below
 					</CardDescription>
@@ -76,12 +97,19 @@ export default function LoginForm({ redirectPath }: { redirectPath: string }) {
 					>
 						<form.AppField name="email">
 							{(field) => (
-								<field.InputField label="Email" inputType="email" required />
+								<field.InputField
+									label="Email"
+									inputType="email"
+									required={rememberMe}
+								/>
 							)}
 						</form.AppField>
 						<form.AppField name="password">
 							{(field) => (
-								<field.InputPasswordField label="Password" required={true} />
+								<field.InputPasswordField
+									label="Password"
+									required={rememberMe}
+								/>
 							)}
 						</form.AppField>
 
@@ -98,7 +126,7 @@ export default function LoginForm({ redirectPath }: { redirectPath: string }) {
 							</Link>
 						</div>
 
-						<div className="flex justify-end mt-2">
+						<div className="flex justify-between mt-2 ">
 							<form.AppForm>
 								<form.SubmitButton>Login</form.SubmitButton>
 							</form.AppForm>

frontend/src/routes/__root.tsx

@@ -3,30 +3,36 @@ import { TanStackRouterDevtools } from "@tanstack/react-router-devtools";
 import { Toaster } from "sonner";
 import Header from "@/components/Header";
 import { AppSidebar } from "@/components/Sidebar/sidebar";
-import {  SidebarProvider } from "@/components/ui/sidebar";
+import { SidebarProvider } from "@/components/ui/sidebar";
 import { ThemeProvider } from "@/lib/theme-provider";
+import { useSession } from "../lib/auth-client";
 
-const RootLayout = () => (
-	<div className="[--header-height:calc(--spacing(14))]">
-		<ThemeProvider>
-			<SidebarProvider className="flex flex-col" defaultOpen={false}>
-				<Header />
+const RootLayout = () => {
+	const { data: session } = useSession();
+	return (
+		<div className="[--header-height:calc(--spacing(14))]">
+			<ThemeProvider>
+				<SidebarProvider className="flex flex-col" defaultOpen={false}>
+					<Header />
 
-				<div className="relative min-h-[calc(100svh-var(--header-height))]">
-					<AppSidebar />
+					<div className="relative min-h-[calc(100svh-var(--header-height))]">
+						<AppSidebar />
 
-					<main className="w-full p-4">
-						<div className="mx-auto w-full max-w-7xl">
-							<Outlet />
-						</div>
-					</main>
-				</div>
+						<main className="w-full p-4">
+							<div className="mx-auto w-full max-w-7xl">
+								<Outlet />
+							</div>
+						</main>
+					</div>
 
-				<Toaster expand richColors closeButton />
-			</SidebarProvider>
-		</ThemeProvider>
-		<TanStackRouterDevtools />
-	</div>
-);
+					<Toaster expand richColors closeButton />
+				</SidebarProvider>
+			</ThemeProvider>
+			{session && session.user.role === "systemAdmin" && (
+				<TanStackRouterDevtools />
+			)}
+		</div>
+	);
+};
 
 export const Route = createRootRoute({ component: RootLayout });

frontend/src/routes/admin/scanUsers.tsx

@@ -0,0 +1,16 @@
+import { useSuspenseQuery } from "@tanstack/react-query";
+import { createFileRoute } from "@tanstack/react-router";
+import { getScanUsers } from "../../lib/queries/getScanUsers";
+
+export const Route = createFileRoute("/admin/scanUsers")({
+	component: RouteComponent,
+});
+
+const ScanUserTable = () => {
+	const { data } = useSuspenseQuery(getScanUsers());
+	console.log(data);
+	return <div>Hello "/admin/scanUsers"!</div>;
+};
+function RouteComponent() {
+	return <ScanUserTable />;
+}