Compare commits
22 Commits
v0.0.1
...
4ca74de279
| Author | SHA1 | Date | |
|---|---|---|---|
| 4ca74de279 | |||
| 12412536d1 | |||
| a38e2e0339 | |||
| 8c253a90b6 | |||
| ba30281e59 | |||
| 2ad78e22f1 | |||
| 518c0a8c19 | |||
| cd13360cfb | |||
| 4e0cf8c54c | |||
| 36995e9fb4 | |||
| 30ffd843c7 | |||
| bb6155c969 | |||
| 7d2f048932 | |||
| 649ae1ee9f | |||
| 8446dbc955 | |||
| 0b7318f856 | |||
| bddc9aca0d | |||
| 77b4533dea | |||
| 83a542d1b7 | |||
| 4855412733 | |||
| 251970ec8f | |||
| f7ea5f709e |
44
CHANGELOG.md
@@ -1,5 +1,49 @@
|
|||||||
# All Changes to LST can be found below.
|
# All Changes to LST can be found below.
|
||||||
|
|
||||||
|
## [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)
|
## [0.0.1](https://git.tuffraid.net/cowch/lst_v3/compare/v0.0.1-alpha.5...v0.0.1) (2026-04-23)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import { drizzle } from "drizzle-orm/postgres-js";
|
import { drizzle } from "drizzle-orm/postgres-js";
|
||||||
import postgres from "postgres";
|
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 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, {
|
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,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|||||||
48
backend/db/schema/scanUsers.ts
Normal file
@@ -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>;
|
||||||
22
backend/db/schema/scanlog.schema.ts
Normal file
@@ -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>;
|
||||||
@@ -13,7 +13,9 @@ let attempt = 0;
|
|||||||
const maxAttempts = 10;
|
const maxAttempts = 10;
|
||||||
|
|
||||||
export const connectGPSql = async () => {
|
export const connectGPSql = async () => {
|
||||||
const serverUp = await checkHostnamePort(`USMCD1VMS011:1433`);
|
const serverUp = await checkHostnamePort(
|
||||||
|
`${process.env.GP_SERVER ?? "usmcd1vms011"}:1433`,
|
||||||
|
);
|
||||||
if (!serverUp) {
|
if (!serverUp) {
|
||||||
// we will try to reconnect
|
// we will try to reconnect
|
||||||
connected = false;
|
connected = false;
|
||||||
@@ -119,7 +121,9 @@ export const reconnectToSql = async () => {
|
|||||||
|
|
||||||
await new Promise((res) => setTimeout(res, delayStart));
|
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) {
|
if (!serverUp) {
|
||||||
delayStart = Math.min(delayStart * 2, 30000); // exponential backoff until up to 30000
|
delayStart = Math.min(delayStart * 2, 30000); // exponential backoff until up to 30000
|
||||||
|
|||||||
@@ -11,26 +11,10 @@ const __dirname = path.dirname(__filename);
|
|||||||
const downloadDir = path.resolve(__dirname, "../../downloads/mobile");
|
const downloadDir = path.resolve(__dirname, "../../downloads/mobile");
|
||||||
|
|
||||||
const currentApk = {
|
const currentApk = {
|
||||||
packageName: "net.alpla.lst.mobile",
|
|
||||||
versionName: "0.0.1-alpha",
|
|
||||||
versionCode: 1,
|
|
||||||
minSupportedVersionCode: 1,
|
|
||||||
fileName: "lst-mobile.apk",
|
fileName: "lst-mobile.apk",
|
||||||
};
|
};
|
||||||
|
|
||||||
router.get("/version", async (req, res) => {
|
router.get("/latest", (_, 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) => {
|
|
||||||
const apkPath = path.join(downloadDir, currentApk.fileName);
|
const apkPath = path.join(downloadDir, currentApk.fileName);
|
||||||
|
|
||||||
if (!fs.existsSync(apkPath)) {
|
if (!fs.existsSync(apkPath)) {
|
||||||
@@ -46,4 +30,17 @@ router.get("/apk/latest", (_, res) => {
|
|||||||
return res.sendFile(apkPath);
|
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;
|
export default router;
|
||||||
17
backend/mobile/mobile.routes.ts
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
import type { Express } from "express";
|
||||||
|
import downloads from "./donwloadApps.route.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(`${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);
|
||||||
|
|
||||||
|
// all other system should be under /api/system/*
|
||||||
|
};
|
||||||
335
backend/mobile/mobileAuth.route.ts
Normal file
@@ -0,0 +1,335 @@
|
|||||||
|
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));
|
||||||
|
|
||||||
|
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;
|
||||||
21
backend/mobile/mobilePin.route.ts
Normal file
@@ -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;
|
||||||
37
backend/mobile/scanLogs.route.ts
Normal file
@@ -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;
|
||||||
28
backend/mobile/version.route.ts
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
import fs from "node:fs";
|
||||||
|
import { Router } from "express";
|
||||||
|
|
||||||
|
import path from "path";
|
||||||
|
|
||||||
|
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 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`,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
export default router;
|
||||||
113
backend/notification/notification.minLevel.ts
Normal file
@@ -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;
|
||||||
@@ -5,6 +5,7 @@ import { setupAuthRoutes } from "./auth/auth.routes.js";
|
|||||||
import { setupApiDocsRoutes } from "./configs/scaler.config.js";
|
import { setupApiDocsRoutes } from "./configs/scaler.config.js";
|
||||||
import { setupDatamartRoutes } from "./datamart/datamart.routes.js";
|
import { setupDatamartRoutes } from "./datamart/datamart.routes.js";
|
||||||
import { setupGPSqlRoutes } from "./gpSql/gpSql.routes.js";
|
import { setupGPSqlRoutes } from "./gpSql/gpSql.routes.js";
|
||||||
|
import { setupMobileRoutes } from "./mobile/mobile.routes.js";
|
||||||
import { setupNotificationRoutes } from "./notification/notification.routes.js";
|
import { setupNotificationRoutes } from "./notification/notification.routes.js";
|
||||||
import { setupOCPRoutes } from "./ocp/ocp.routes.js";
|
import { setupOCPRoutes } from "./ocp/ocp.routes.js";
|
||||||
import { setupOpendockRoutes } from "./opendock/opendock.routes.js";
|
import { setupOpendockRoutes } from "./opendock/opendock.routes.js";
|
||||||
@@ -27,4 +28,5 @@ export const setupRoutes = (baseUrl: string, app: Express) => {
|
|||||||
setupNotificationRoutes(baseUrl, app);
|
setupNotificationRoutes(baseUrl, app);
|
||||||
setupOCPRoutes(baseUrl, app);
|
setupOCPRoutes(baseUrl, app);
|
||||||
setupTCPRoutes(baseUrl, app);
|
setupTCPRoutes(baseUrl, app);
|
||||||
|
setupMobileRoutes(baseUrl, app);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ const servers: NewServerData[] = [
|
|||||||
name: "Lima",
|
name: "Lima",
|
||||||
server: "USLIM1VMS006",
|
server: "USLIM1VMS006",
|
||||||
plantToken: "uslim1",
|
plantToken: "uslim1",
|
||||||
idAddress: "10.53.0.26",
|
idAddress: "10.53.0.26", // port opened 3000 2222
|
||||||
greatPlainsPlantCode: "50",
|
greatPlainsPlantCode: "50",
|
||||||
contactEmail: "",
|
contactEmail: "",
|
||||||
contactPhone: "",
|
contactPhone: "",
|
||||||
@@ -56,7 +56,7 @@ const servers: NewServerData[] = [
|
|||||||
name: "Dayton",
|
name: "Dayton",
|
||||||
server: "usday1VMS006",
|
server: "usday1VMS006",
|
||||||
plantToken: "usday1",
|
plantToken: "usday1",
|
||||||
idAddress: "10.44.0.56",
|
idAddress: "10.44.0.56", // ports opened 3000 and 2222
|
||||||
greatPlainsPlantCode: "80",
|
greatPlainsPlantCode: "80",
|
||||||
contactEmail: "",
|
contactEmail: "",
|
||||||
contactPhone: "",
|
contactPhone: "",
|
||||||
@@ -122,13 +122,46 @@ const servers: NewServerData[] = [
|
|||||||
name: "Marked Tree",
|
name: "Marked Tree",
|
||||||
server: "USMAR1VMS006",
|
server: "USMAR1VMS006",
|
||||||
plantToken: "usmar1",
|
plantToken: "usmar1",
|
||||||
idAddress: "10.206.9.26",
|
idAddress: "10.206.9.26", // 3000,2222 requested REQ0236838
|
||||||
greatPlainsPlantCode: "90",
|
greatPlainsPlantCode: "90",
|
||||||
contactEmail: "",
|
contactEmail: "",
|
||||||
contactPhone: "",
|
contactPhone: "",
|
||||||
serverLoc: "D$\\LST_V3",
|
serverLoc: "D$\\LST_V3",
|
||||||
buildNumber: 1,
|
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
|
// 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
|
||||||
|
|||||||
@@ -4,12 +4,10 @@ import getServers from "./serverData.route.js";
|
|||||||
import getSettings from "./settings.route.js";
|
import getSettings from "./settings.route.js";
|
||||||
import updSetting from "./settingsUpdate.route.js";
|
import updSetting from "./settingsUpdate.route.js";
|
||||||
import stats from "./stats.route.js";
|
import stats from "./stats.route.js";
|
||||||
import mobile from "./system.mobileApp.js";
|
|
||||||
|
|
||||||
export const setupSystemRoutes = (baseUrl: string, app: Express) => {
|
export const setupSystemRoutes = (baseUrl: string, app: Express) => {
|
||||||
//stats will be like this as we dont need to change this
|
//stats will be like this as we dont need to change this
|
||||||
app.use(`${baseUrl}/api/stats`, stats);
|
app.use(`${baseUrl}/api/stats`, stats);
|
||||||
app.use(`${baseUrl}/api/mobile`, mobile);
|
|
||||||
app.use(`${baseUrl}/api/settings`, getSettings);
|
app.use(`${baseUrl}/api/settings`, getSettings);
|
||||||
app.use(`${baseUrl}/api/servers`, getServers);
|
app.use(`${baseUrl}/api/servers`, getServers);
|
||||||
app.use(`${baseUrl}/api/settings`, requireAuth, updSetting);
|
app.use(`${baseUrl}/api/settings`, requireAuth, updSetting);
|
||||||
|
|||||||
39
backend/utils/generateScannerPin.utils.ts
Normal file
@@ -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: "",
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -15,7 +15,8 @@ export interface ReturnHelper<T = unknown[]> {
|
|||||||
| "purchase"
|
| "purchase"
|
||||||
| "tcp"
|
| "tcp"
|
||||||
| "logistics"
|
| "logistics"
|
||||||
| "admin";
|
| "admin"
|
||||||
|
| "mobile";
|
||||||
subModule: string;
|
subModule: string;
|
||||||
|
|
||||||
level: "info" | "error" | "debug" | "fatal" | "warn";
|
level: "info" | "error" | "debug" | "fatal" | "warn";
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- NODE_ENV=production
|
- NODE_ENV=production
|
||||||
- LOG_LEVEL=info
|
- LOG_LEVEL=info
|
||||||
- EXTERNAL_URL=http://192.168.8.222:3600
|
- URL=http://localhost:3600
|
||||||
- DATABASE_HOST=postgres # if running on the same docker then do this
|
- DATABASE_HOST=postgres # if running on the same docker then do this
|
||||||
- DATABASE_PORT=5432
|
- DATABASE_PORT=5432
|
||||||
- DATABASE_USER=${DATABASE_USER}
|
- DATABASE_USER=${DATABASE_USER}
|
||||||
@@ -41,7 +41,10 @@ services:
|
|||||||
#for all host including prod servers, plc's, printers, or other de
|
#for all host including prod servers, plc's, printers, or other de
|
||||||
networks:
|
networks:
|
||||||
- docker-network
|
- docker-network
|
||||||
|
- pgNetwork
|
||||||
|
|
||||||
networks:
|
networks:
|
||||||
docker-network:
|
docker-network:
|
||||||
|
external: true
|
||||||
|
pgNetwork:
|
||||||
external: true
|
external: true
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Link } from "@tanstack/react-router";
|
import { Link } from "@tanstack/react-router";
|
||||||
import { Bell, Logs, Server, Settings } from "lucide-react";
|
import { Bell, Logs, Server, Settings, UsersRound } from "lucide-react";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
SidebarGroup,
|
SidebarGroup,
|
||||||
@@ -56,22 +56,22 @@ export default function AdminSidebar({ session }: any) {
|
|||||||
module: "admin",
|
module: "admin",
|
||||||
active: true,
|
active: true,
|
||||||
},
|
},
|
||||||
// {
|
{
|
||||||
// title: "Modules",
|
title: "Users",
|
||||||
// url: "/admin/modules",
|
url: "/admin/users",
|
||||||
// icon: Settings,
|
icon: UsersRound,
|
||||||
// role: ["systemAdmin", "admin"],
|
role: ["systemAdmin", "admin"],
|
||||||
// module: "admin",
|
module: "admin",
|
||||||
// active: true,
|
active: true,
|
||||||
// },
|
},
|
||||||
// {
|
{
|
||||||
// title: "Servers",
|
title: "Scan users",
|
||||||
// url: "/admin/servers",
|
url: "/admin/scanUsers",
|
||||||
// icon: Server,
|
icon: UsersRound,
|
||||||
// role: ["systemAdmin", "admin"],
|
role: ["systemAdmin", "admin"],
|
||||||
// module: "admin",
|
module: "admin",
|
||||||
// active: true,
|
active: true,
|
||||||
// },
|
},
|
||||||
];
|
];
|
||||||
return (
|
return (
|
||||||
<SidebarGroup>
|
<SidebarGroup>
|
||||||
|
|||||||
@@ -36,6 +36,17 @@ const docs = [
|
|||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: "Mobile",
|
||||||
|
url: "/updateInstructions",
|
||||||
|
isActive: false,
|
||||||
|
items: [
|
||||||
|
{
|
||||||
|
title: "Settings",
|
||||||
|
url: "/mobile-settings",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
];
|
];
|
||||||
export default function DocBar() {
|
export default function DocBar() {
|
||||||
const { setOpen } = useSidebar();
|
const { setOpen } = useSidebar();
|
||||||
|
|||||||
49
frontend/src/components/Sidebar/MobileBar.tsx
Normal file
@@ -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>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -8,6 +8,7 @@ import {
|
|||||||
import { useSession } from "@/lib/auth-client";
|
import { useSession } from "@/lib/auth-client";
|
||||||
import AdminSidebar from "./AdminBar";
|
import AdminSidebar from "./AdminBar";
|
||||||
import DocBar from "./DocBar";
|
import DocBar from "./DocBar";
|
||||||
|
import MobileBar from "./MobileBar";
|
||||||
|
|
||||||
export function AppSidebar() {
|
export function AppSidebar() {
|
||||||
const { data: session } = useSession();
|
const { data: session } = useSession();
|
||||||
@@ -22,7 +23,8 @@ export function AppSidebar() {
|
|||||||
<SidebarMenu>
|
<SidebarMenu>
|
||||||
<SidebarMenuItem>
|
<SidebarMenuItem>
|
||||||
<SidebarContent>
|
<SidebarContent>
|
||||||
<DocBar/>
|
<DocBar />
|
||||||
|
<MobileBar session={session} />
|
||||||
{session &&
|
{session &&
|
||||||
(session.user.role === "admin" ||
|
(session.user.role === "admin" ||
|
||||||
session.user.role === "systemAdmin") && (
|
session.user.role === "systemAdmin") && (
|
||||||
|
|||||||
3
frontend/src/docs/notifications/updateInstructions.tsx
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
export default function updateInstructions() {
|
||||||
|
return <div>updateInstructions</div>;
|
||||||
|
}
|
||||||
@@ -11,6 +11,15 @@ import {
|
|||||||
import React, { useState } from "react";
|
import React, { useState } from "react";
|
||||||
import { Button } from "../../components/ui/button";
|
import { Button } from "../../components/ui/button";
|
||||||
import { ScrollArea, ScrollBar } from "../../components/ui/scroll-area";
|
import { ScrollArea, ScrollBar } from "../../components/ui/scroll-area";
|
||||||
|
import {
|
||||||
|
Select,
|
||||||
|
SelectContent,
|
||||||
|
SelectGroup,
|
||||||
|
SelectItem,
|
||||||
|
SelectLabel,
|
||||||
|
SelectTrigger,
|
||||||
|
SelectValue,
|
||||||
|
} from "../../components/ui/select";
|
||||||
import {
|
import {
|
||||||
Table,
|
Table,
|
||||||
TableBody,
|
TableBody,
|
||||||
@@ -26,15 +35,23 @@ type LstTableType = {
|
|||||||
tableClassName?: string;
|
tableClassName?: string;
|
||||||
data: any;
|
data: any;
|
||||||
columns: any;
|
columns: any;
|
||||||
|
height?: string;
|
||||||
|
pageSize?: number;
|
||||||
};
|
};
|
||||||
export default function LstTable({
|
export default function LstTable({
|
||||||
className = "",
|
className = "",
|
||||||
tableClassName = "",
|
tableClassName = "",
|
||||||
data,
|
data,
|
||||||
columns,
|
columns,
|
||||||
|
height = "h-full",
|
||||||
|
pageSize = 5,
|
||||||
}: LstTableType) {
|
}: LstTableType) {
|
||||||
const [sorting, setSorting] = useState<SortingState>([]);
|
const [sorting, setSorting] = useState<SortingState>([]);
|
||||||
const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
|
const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
|
||||||
|
const [pagination, setPagination] = useState({
|
||||||
|
pageIndex: 0, //initial page index
|
||||||
|
pageSize: pageSize, //default page size
|
||||||
|
});
|
||||||
//console.log(data);
|
//console.log(data);
|
||||||
|
|
||||||
const table = useReactTable({
|
const table = useReactTable({
|
||||||
@@ -46,24 +63,33 @@ export default function LstTable({
|
|||||||
getSortedRowModel: getSortedRowModel(),
|
getSortedRowModel: getSortedRowModel(),
|
||||||
onColumnFiltersChange: setColumnFilters,
|
onColumnFiltersChange: setColumnFilters,
|
||||||
getFilteredRowModel: getFilteredRowModel(),
|
getFilteredRowModel: getFilteredRowModel(),
|
||||||
|
onPaginationChange: setPagination,
|
||||||
//renderSubComponent: ({ row }: { row: any }) => <ExpandedRow row={row} />,
|
//renderSubComponent: ({ row }: { row: any }) => <ExpandedRow row={row} />,
|
||||||
//getRowCanExpand: () => true,
|
//getRowCanExpand: () => true,
|
||||||
|
// columnResizeMode: "onChange",
|
||||||
filterFns: {},
|
filterFns: {},
|
||||||
state: {
|
state: {
|
||||||
sorting,
|
sorting,
|
||||||
|
pagination,
|
||||||
columnFilters,
|
columnFilters,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
return (
|
return (
|
||||||
<div className={className}>
|
<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)}>
|
<Table className={cn("w-full", tableClassName)}>
|
||||||
<TableHeader>
|
<TableHeader>
|
||||||
{table.getHeaderGroups().map((headerGroup) => (
|
{table.getHeaderGroups().map((headerGroup) => (
|
||||||
<TableRow key={headerGroup.id}>
|
<TableRow key={headerGroup.id}>
|
||||||
{headerGroup.headers.map((header) => {
|
{headerGroup.headers.map((header) => {
|
||||||
return (
|
return (
|
||||||
<TableHead key={header.id}>
|
<TableHead
|
||||||
|
key={header.id}
|
||||||
|
className="sticky top-0 z-20 bg-background"
|
||||||
|
>
|
||||||
{header.isPlaceholder
|
{header.isPlaceholder
|
||||||
? null
|
? null
|
||||||
: flexRender(
|
: flexRender(
|
||||||
@@ -76,6 +102,7 @@ export default function LstTable({
|
|||||||
</TableRow>
|
</TableRow>
|
||||||
))}
|
))}
|
||||||
</TableHeader>
|
</TableHeader>
|
||||||
|
|
||||||
<TableBody>
|
<TableBody>
|
||||||
{table.getRowModel().rows.length ? (
|
{table.getRowModel().rows.length ? (
|
||||||
table.getRowModel().rows.map((row) => (
|
table.getRowModel().rows.map((row) => (
|
||||||
@@ -107,14 +134,23 @@ export default function LstTable({
|
|||||||
<ScrollBar orientation="horizontal" />
|
<ScrollBar orientation="horizontal" />
|
||||||
<ScrollBar orientation="vertical" />
|
<ScrollBar orientation="vertical" />
|
||||||
</ScrollArea>
|
</ScrollArea>
|
||||||
|
|
||||||
<div className="flex items-center justify-end space-x-2 py-4">
|
<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
|
<Button
|
||||||
variant="outline"
|
variant="outline"
|
||||||
size="sm"
|
size="sm"
|
||||||
onClick={() => table.previousPage()}
|
onClick={() => table.previousPage()}
|
||||||
disabled={!table.getCanPreviousPage()}
|
disabled={!table.getCanPreviousPage()}
|
||||||
>
|
>
|
||||||
Previous
|
{"<"}
|
||||||
</Button>
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
variant="outline"
|
variant="outline"
|
||||||
@@ -122,8 +158,42 @@ export default function LstTable({
|
|||||||
onClick={() => table.nextPage()}
|
onClick={() => table.nextPage()}
|
||||||
disabled={!table.getCanNextPage()}
|
disabled={!table.getCanNextPage()}
|
||||||
>
|
>
|
||||||
Next
|
{">"}
|
||||||
</Button>
|
</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>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import { Route as DocsIndexRouteImport } from './routes/docs/index'
|
|||||||
import { Route as DocsSplatRouteImport } from './routes/docs/$'
|
import { Route as DocsSplatRouteImport } from './routes/docs/$'
|
||||||
import { Route as AdminSettingsRouteImport } from './routes/admin/settings'
|
import { Route as AdminSettingsRouteImport } from './routes/admin/settings'
|
||||||
import { Route as AdminServersRouteImport } from './routes/admin/servers'
|
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 AdminNotificationsRouteImport } from './routes/admin/notifications'
|
||||||
import { Route as AdminLogsRouteImport } from './routes/admin/logs'
|
import { Route as AdminLogsRouteImport } from './routes/admin/logs'
|
||||||
import { Route as authLoginRouteImport } from './routes/(auth)/login'
|
import { Route as authLoginRouteImport } from './routes/(auth)/login'
|
||||||
@@ -52,6 +53,11 @@ const AdminServersRoute = AdminServersRouteImport.update({
|
|||||||
path: '/admin/servers',
|
path: '/admin/servers',
|
||||||
getParentRoute: () => rootRouteImport,
|
getParentRoute: () => rootRouteImport,
|
||||||
} as any)
|
} as any)
|
||||||
|
const AdminScanUsersRoute = AdminScanUsersRouteImport.update({
|
||||||
|
id: '/admin/scanUsers',
|
||||||
|
path: '/admin/scanUsers',
|
||||||
|
getParentRoute: () => rootRouteImport,
|
||||||
|
} as any)
|
||||||
const AdminNotificationsRoute = AdminNotificationsRouteImport.update({
|
const AdminNotificationsRoute = AdminNotificationsRouteImport.update({
|
||||||
id: '/admin/notifications',
|
id: '/admin/notifications',
|
||||||
path: '/admin/notifications',
|
path: '/admin/notifications',
|
||||||
@@ -89,6 +95,7 @@ export interface FileRoutesByFullPath {
|
|||||||
'/login': typeof authLoginRoute
|
'/login': typeof authLoginRoute
|
||||||
'/admin/logs': typeof AdminLogsRoute
|
'/admin/logs': typeof AdminLogsRoute
|
||||||
'/admin/notifications': typeof AdminNotificationsRoute
|
'/admin/notifications': typeof AdminNotificationsRoute
|
||||||
|
'/admin/scanUsers': typeof AdminScanUsersRoute
|
||||||
'/admin/servers': typeof AdminServersRoute
|
'/admin/servers': typeof AdminServersRoute
|
||||||
'/admin/settings': typeof AdminSettingsRoute
|
'/admin/settings': typeof AdminSettingsRoute
|
||||||
'/docs/$': typeof DocsSplatRoute
|
'/docs/$': typeof DocsSplatRoute
|
||||||
@@ -103,6 +110,7 @@ export interface FileRoutesByTo {
|
|||||||
'/login': typeof authLoginRoute
|
'/login': typeof authLoginRoute
|
||||||
'/admin/logs': typeof AdminLogsRoute
|
'/admin/logs': typeof AdminLogsRoute
|
||||||
'/admin/notifications': typeof AdminNotificationsRoute
|
'/admin/notifications': typeof AdminNotificationsRoute
|
||||||
|
'/admin/scanUsers': typeof AdminScanUsersRoute
|
||||||
'/admin/servers': typeof AdminServersRoute
|
'/admin/servers': typeof AdminServersRoute
|
||||||
'/admin/settings': typeof AdminSettingsRoute
|
'/admin/settings': typeof AdminSettingsRoute
|
||||||
'/docs/$': typeof DocsSplatRoute
|
'/docs/$': typeof DocsSplatRoute
|
||||||
@@ -118,6 +126,7 @@ export interface FileRoutesById {
|
|||||||
'/(auth)/login': typeof authLoginRoute
|
'/(auth)/login': typeof authLoginRoute
|
||||||
'/admin/logs': typeof AdminLogsRoute
|
'/admin/logs': typeof AdminLogsRoute
|
||||||
'/admin/notifications': typeof AdminNotificationsRoute
|
'/admin/notifications': typeof AdminNotificationsRoute
|
||||||
|
'/admin/scanUsers': typeof AdminScanUsersRoute
|
||||||
'/admin/servers': typeof AdminServersRoute
|
'/admin/servers': typeof AdminServersRoute
|
||||||
'/admin/settings': typeof AdminSettingsRoute
|
'/admin/settings': typeof AdminSettingsRoute
|
||||||
'/docs/$': typeof DocsSplatRoute
|
'/docs/$': typeof DocsSplatRoute
|
||||||
@@ -134,6 +143,7 @@ export interface FileRouteTypes {
|
|||||||
| '/login'
|
| '/login'
|
||||||
| '/admin/logs'
|
| '/admin/logs'
|
||||||
| '/admin/notifications'
|
| '/admin/notifications'
|
||||||
|
| '/admin/scanUsers'
|
||||||
| '/admin/servers'
|
| '/admin/servers'
|
||||||
| '/admin/settings'
|
| '/admin/settings'
|
||||||
| '/docs/$'
|
| '/docs/$'
|
||||||
@@ -148,6 +158,7 @@ export interface FileRouteTypes {
|
|||||||
| '/login'
|
| '/login'
|
||||||
| '/admin/logs'
|
| '/admin/logs'
|
||||||
| '/admin/notifications'
|
| '/admin/notifications'
|
||||||
|
| '/admin/scanUsers'
|
||||||
| '/admin/servers'
|
| '/admin/servers'
|
||||||
| '/admin/settings'
|
| '/admin/settings'
|
||||||
| '/docs/$'
|
| '/docs/$'
|
||||||
@@ -162,6 +173,7 @@ export interface FileRouteTypes {
|
|||||||
| '/(auth)/login'
|
| '/(auth)/login'
|
||||||
| '/admin/logs'
|
| '/admin/logs'
|
||||||
| '/admin/notifications'
|
| '/admin/notifications'
|
||||||
|
| '/admin/scanUsers'
|
||||||
| '/admin/servers'
|
| '/admin/servers'
|
||||||
| '/admin/settings'
|
| '/admin/settings'
|
||||||
| '/docs/$'
|
| '/docs/$'
|
||||||
@@ -177,6 +189,7 @@ export interface RootRouteChildren {
|
|||||||
authLoginRoute: typeof authLoginRoute
|
authLoginRoute: typeof authLoginRoute
|
||||||
AdminLogsRoute: typeof AdminLogsRoute
|
AdminLogsRoute: typeof AdminLogsRoute
|
||||||
AdminNotificationsRoute: typeof AdminNotificationsRoute
|
AdminNotificationsRoute: typeof AdminNotificationsRoute
|
||||||
|
AdminScanUsersRoute: typeof AdminScanUsersRoute
|
||||||
AdminServersRoute: typeof AdminServersRoute
|
AdminServersRoute: typeof AdminServersRoute
|
||||||
AdminSettingsRoute: typeof AdminSettingsRoute
|
AdminSettingsRoute: typeof AdminSettingsRoute
|
||||||
DocsSplatRoute: typeof DocsSplatRoute
|
DocsSplatRoute: typeof DocsSplatRoute
|
||||||
@@ -230,6 +243,13 @@ declare module '@tanstack/react-router' {
|
|||||||
preLoaderRoute: typeof AdminServersRouteImport
|
preLoaderRoute: typeof AdminServersRouteImport
|
||||||
parentRoute: typeof rootRouteImport
|
parentRoute: typeof rootRouteImport
|
||||||
}
|
}
|
||||||
|
'/admin/scanUsers': {
|
||||||
|
id: '/admin/scanUsers'
|
||||||
|
path: '/admin/scanUsers'
|
||||||
|
fullPath: '/admin/scanUsers'
|
||||||
|
preLoaderRoute: typeof AdminScanUsersRouteImport
|
||||||
|
parentRoute: typeof rootRouteImport
|
||||||
|
}
|
||||||
'/admin/notifications': {
|
'/admin/notifications': {
|
||||||
id: '/admin/notifications'
|
id: '/admin/notifications'
|
||||||
path: '/admin/notifications'
|
path: '/admin/notifications'
|
||||||
@@ -281,6 +301,7 @@ const rootRouteChildren: RootRouteChildren = {
|
|||||||
authLoginRoute: authLoginRoute,
|
authLoginRoute: authLoginRoute,
|
||||||
AdminLogsRoute: AdminLogsRoute,
|
AdminLogsRoute: AdminLogsRoute,
|
||||||
AdminNotificationsRoute: AdminNotificationsRoute,
|
AdminNotificationsRoute: AdminNotificationsRoute,
|
||||||
|
AdminScanUsersRoute: AdminScanUsersRoute,
|
||||||
AdminServersRoute: AdminServersRoute,
|
AdminServersRoute: AdminServersRoute,
|
||||||
AdminSettingsRoute: AdminSettingsRoute,
|
AdminSettingsRoute: AdminSettingsRoute,
|
||||||
DocsSplatRoute: DocsSplatRoute,
|
DocsSplatRoute: DocsSplatRoute,
|
||||||
|
|||||||
@@ -3,30 +3,36 @@ import { TanStackRouterDevtools } from "@tanstack/react-router-devtools";
|
|||||||
import { Toaster } from "sonner";
|
import { Toaster } from "sonner";
|
||||||
import Header from "@/components/Header";
|
import Header from "@/components/Header";
|
||||||
import { AppSidebar } from "@/components/Sidebar/sidebar";
|
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 { ThemeProvider } from "@/lib/theme-provider";
|
||||||
|
import { useSession } from "../lib/auth-client";
|
||||||
|
|
||||||
const RootLayout = () => (
|
const RootLayout = () => {
|
||||||
<div className="[--header-height:calc(--spacing(14))]">
|
const { data: session } = useSession();
|
||||||
<ThemeProvider>
|
return (
|
||||||
<SidebarProvider className="flex flex-col" defaultOpen={false}>
|
<div className="[--header-height:calc(--spacing(14))]">
|
||||||
<Header />
|
<ThemeProvider>
|
||||||
|
<SidebarProvider className="flex flex-col" defaultOpen={false}>
|
||||||
|
<Header />
|
||||||
|
|
||||||
<div className="relative min-h-[calc(100svh-var(--header-height))]">
|
<div className="relative min-h-[calc(100svh-var(--header-height))]">
|
||||||
<AppSidebar />
|
<AppSidebar />
|
||||||
|
|
||||||
<main className="w-full p-4">
|
<main className="w-full p-4">
|
||||||
<div className="mx-auto w-full max-w-7xl">
|
<div className="mx-auto w-full max-w-7xl">
|
||||||
<Outlet />
|
<Outlet />
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Toaster expand richColors closeButton />
|
<Toaster expand richColors closeButton />
|
||||||
</SidebarProvider>
|
</SidebarProvider>
|
||||||
</ThemeProvider>
|
</ThemeProvider>
|
||||||
<TanStackRouterDevtools />
|
{session && session.user.role === "systemAdmin" && (
|
||||||
</div>
|
<TanStackRouterDevtools />
|
||||||
);
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export const Route = createRootRoute({ component: RootLayout });
|
export const Route = createRootRoute({ component: RootLayout });
|
||||||
|
|||||||
9
frontend/src/routes/admin/scanUsers.tsx
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
import { createFileRoute } from '@tanstack/react-router'
|
||||||
|
|
||||||
|
export const Route = createFileRoute('/admin/scanUsers')({
|
||||||
|
component: RouteComponent,
|
||||||
|
})
|
||||||
|
|
||||||
|
function RouteComponent() {
|
||||||
|
return <div>Hello "/admin/scanUsers"!</div>
|
||||||
|
}
|
||||||
@@ -155,7 +155,7 @@ const ServerTable = () => {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return <LstTable data={data} columns={columns} />;
|
return <LstTable data={data} columns={columns} pageSize={50} />;
|
||||||
};
|
};
|
||||||
|
|
||||||
function RouteComponent() {
|
function RouteComponent() {
|
||||||
|
|||||||
@@ -59,6 +59,33 @@ function RouteComponent() {
|
|||||||
Only shows machines that are attached to the silo.
|
Only shows machines that are attached to the silo.
|
||||||
</ul>
|
</ul>
|
||||||
</ul>
|
</ul>
|
||||||
|
{/* Mobile stuff */}
|
||||||
|
<li>Mobile App</li>
|
||||||
|
<ul className="list-disc list-inside indent-8">
|
||||||
|
<li>Rewrite of Alpla scan</li>
|
||||||
|
<ul className="list-disc list-inside indent-16">
|
||||||
|
<li>All old settings same as before id, ip, port</li>
|
||||||
|
<li>Currently scanned pallets will show now as well</li>
|
||||||
|
</ul>
|
||||||
|
<li>
|
||||||
|
Custom addition - login and more features NOTE: This is activated
|
||||||
|
based on how you enter the settings
|
||||||
|
</li>
|
||||||
|
<ul className="list-disc list-inside indent-16">
|
||||||
|
<li>Pin numbers login</li>
|
||||||
|
<li>
|
||||||
|
Scan a lane barcode and it returns whats in the lane and its
|
||||||
|
current status
|
||||||
|
</li>
|
||||||
|
<li>Command restrictions per pin login</li>
|
||||||
|
<li>Dock Door scanning</li>
|
||||||
|
<li>
|
||||||
|
More details on the pallet that is scanned by touching the running
|
||||||
|
number on the scanner.
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</ul>
|
||||||
|
{/* TMS integration */}
|
||||||
<li>TMS integration</li>
|
<li>TMS integration</li>
|
||||||
<ul className="list-disc list-inside indent-8">
|
<ul className="list-disc list-inside indent-8">
|
||||||
<li>integration with TI to auto add in orders</li>
|
<li>integration with TI to auto add in orders</li>
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
"expo": {
|
"expo": {
|
||||||
"name": "LST mobile",
|
"name": "LST mobile",
|
||||||
"slug": "lst-mobile",
|
"slug": "lst-mobile",
|
||||||
"version": "0.0.1-alpha",
|
"version": "0.11.1-alpha",
|
||||||
"orientation": "portrait",
|
"orientation": "portrait",
|
||||||
"icon": "./assets/images/icon.png",
|
"icon": "./assets/icon_white.png",
|
||||||
"scheme": "lstmobile",
|
"scheme": "lstmobile",
|
||||||
"userInterfaceStyle": "automatic",
|
"userInterfaceStyle": "automatic",
|
||||||
"ios": {
|
"ios": {
|
||||||
@@ -12,29 +12,44 @@
|
|||||||
},
|
},
|
||||||
"android": {
|
"android": {
|
||||||
"adaptiveIcon": {
|
"adaptiveIcon": {
|
||||||
"backgroundColor": "#E6F4FE",
|
"foregroundImage": "./assets/adaptive-icon-white.png",
|
||||||
"foregroundImage": "./assets/images/android-icon-foreground.png",
|
"backgroundColor": "#ffffff"
|
||||||
"backgroundImage": "./assets/images/android-icon-background.png",
|
|
||||||
"monochromeImage": "./assets/images/android-icon-monochrome.png",
|
|
||||||
"package": "net.alpla.lst.mobile",
|
|
||||||
"versionCode": 1
|
|
||||||
},
|
},
|
||||||
|
"versionCode": 30,
|
||||||
|
"minSupportedVersionCode": 26,
|
||||||
"predictiveBackGestureEnabled": false,
|
"predictiveBackGestureEnabled": false,
|
||||||
"package": "com.anonymous.lstMobile"
|
"package": "net.alpla.lst.mobile"
|
||||||
},
|
},
|
||||||
"web": {
|
"web": {
|
||||||
"output": "static",
|
"output": "static",
|
||||||
"favicon": "./assets/images/favicon.png"
|
"favicon": "./assets/images/favicon.png",
|
||||||
|
"bundler": "metro"
|
||||||
},
|
},
|
||||||
"plugins": [
|
"plugins": [
|
||||||
|
"./plugins/withZebraDataWedge",
|
||||||
"expo-router",
|
"expo-router",
|
||||||
[
|
[
|
||||||
"expo-splash-screen",
|
"expo-splash-screen",
|
||||||
{
|
{
|
||||||
"backgroundColor": "#208AEF",
|
"backgroundColor": "#208AEF",
|
||||||
"android": {
|
"android": {
|
||||||
"image": "./assets/images/splash-icon.png",
|
"resizeMode": "cover",
|
||||||
"imageWidth": 76
|
"image": "./assets/splash_white.png",
|
||||||
|
"backgroundColor": "#ffffff",
|
||||||
|
"dark": {
|
||||||
|
"image": "./assets/splash.png",
|
||||||
|
"backgroundColor": "#000000"
|
||||||
|
},
|
||||||
|
"imageWidth": 200
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"expo-audio",
|
||||||
|
[
|
||||||
|
"expo-build-properties",
|
||||||
|
{
|
||||||
|
"android": {
|
||||||
|
"usesCleartextTraffic": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -44,4 +59,4 @@
|
|||||||
"reactCompiler": true
|
"reactCompiler": true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
BIN
lstMobile/assets/adaptive-icon-background.png
Normal file
|
After Width: | Height: | Size: 6.3 KiB |
BIN
lstMobile/assets/adaptive-icon-badge.png
Normal file
|
After Width: | Height: | Size: 58 KiB |
BIN
lstMobile/assets/adaptive-icon-white.png
Normal file
|
After Width: | Height: | Size: 58 KiB |
BIN
lstMobile/assets/adaptive-icon.png
Normal file
|
After Width: | Height: | Size: 79 KiB |
BIN
lstMobile/assets/favicon.png
Normal file
|
After Width: | Height: | Size: 17 KiB |
BIN
lstMobile/assets/icon.png
Normal file
|
After Width: | Height: | Size: 79 KiB |
BIN
lstMobile/assets/icon_badge.png
Normal file
|
After Width: | Height: | Size: 58 KiB |
BIN
lstMobile/assets/icon_white.png
Normal file
|
After Width: | Height: | Size: 58 KiB |
BIN
lstMobile/assets/sounds/bad.wav
Normal file
BIN
lstMobile/assets/sounds/good.wav
Normal file
BIN
lstMobile/assets/sounds/scan.wav
Normal file
BIN
lstMobile/assets/splash.png
Normal file
|
After Width: | Height: | Size: 67 KiB |
BIN
lstMobile/assets/splash_white.png
Normal file
|
After Width: | Height: | Size: 66 KiB |
9
lstMobile/babel.config.js
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
module.exports = (api) => {
|
||||||
|
api.cache(true);
|
||||||
|
return {
|
||||||
|
presets: [
|
||||||
|
["babel-preset-expo", { jsxImportSource: "nativewind" }],
|
||||||
|
"nativewind/babel",
|
||||||
|
],
|
||||||
|
};
|
||||||
|
};
|
||||||
19
lstMobile/components.json
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
{
|
||||||
|
"$schema": "https://ui.shadcn.com/schema.json",
|
||||||
|
"style": "new-york",
|
||||||
|
"rsc": false,
|
||||||
|
"tsx": true,
|
||||||
|
"tailwind": {
|
||||||
|
"config": "tailwind.config.js",
|
||||||
|
"css": "global.css",
|
||||||
|
"baseColor": "neutral",
|
||||||
|
"cssVariables": true
|
||||||
|
},
|
||||||
|
"aliases": {
|
||||||
|
"components": "@/components",
|
||||||
|
"utils": "@/lib/utils",
|
||||||
|
"ui": "@/components/ui",
|
||||||
|
"lib": "@/lib",
|
||||||
|
"hooks": "@/hooks"
|
||||||
|
}
|
||||||
|
}
|
||||||
58
lstMobile/global.css
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
@tailwind base;
|
||||||
|
@tailwind components;
|
||||||
|
@tailwind utilities;
|
||||||
|
|
||||||
|
@layer base {
|
||||||
|
:root {
|
||||||
|
--background: 0 0% 100%;
|
||||||
|
--foreground: 0 0% 3.9%;
|
||||||
|
--card: 0 0% 100%;
|
||||||
|
--card-foreground: 0 0% 3.9%;
|
||||||
|
--popover: 0 0% 100%;
|
||||||
|
--popover-foreground: 0 0% 3.9%;
|
||||||
|
--primary: 0 0% 9%;
|
||||||
|
--primary-foreground: 0 0% 98%;
|
||||||
|
--secondary: 0 0% 96.1%;
|
||||||
|
--secondary-foreground: 0 0% 9%;
|
||||||
|
--muted: 0 0% 96.1%;
|
||||||
|
--muted-foreground: 0 0% 45.1%;
|
||||||
|
--accent: 0 0% 96.1%;
|
||||||
|
--accent-foreground: 0 0% 9%;
|
||||||
|
--destructive: 0 84.2% 60.2%;
|
||||||
|
--border: 0 0% 89.8%;
|
||||||
|
--input: 0 0% 89.8%;
|
||||||
|
--ring: 0 0% 63%;
|
||||||
|
--radius: 0.625rem;
|
||||||
|
--chart-1: 12 76% 61%;
|
||||||
|
--chart-2: 173 58% 39%;
|
||||||
|
--chart-3: 197 37% 24%;
|
||||||
|
--chart-4: 43 74% 66%;
|
||||||
|
--chart-5: 27 87% 67%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dark:root {
|
||||||
|
--background: 0 0% 3.9%;
|
||||||
|
--foreground: 0 0% 98%;
|
||||||
|
--card: 0 0% 3.9%;
|
||||||
|
--card-foreground: 0 0% 98%;
|
||||||
|
--popover: 0 0% 3.9%;
|
||||||
|
--popover-foreground: 0 0% 98%;
|
||||||
|
--primary: 0 0% 98%;
|
||||||
|
--primary-foreground: 0 0% 9%;
|
||||||
|
--secondary: 0 0% 14.9%;
|
||||||
|
--secondary-foreground: 0 0% 98%;
|
||||||
|
--muted: 0 0% 14.9%;
|
||||||
|
--muted-foreground: 0 0% 63.9%;
|
||||||
|
--accent: 0 0% 14.9%;
|
||||||
|
--accent-foreground: 0 0% 98%;
|
||||||
|
--destructive: 0 70.9% 59.4%;
|
||||||
|
--border: 0 0% 14.9%;
|
||||||
|
--input: 0 0% 14.9%;
|
||||||
|
--ring: 300 0% 45%;
|
||||||
|
--chart-1: 220 70% 50%;
|
||||||
|
--chart-2: 160 60% 45%;
|
||||||
|
--chart-3: 30 80% 55%;
|
||||||
|
--chart-4: 280 65% 60%;
|
||||||
|
--chart-5: 340 75% 55%;
|
||||||
|
}
|
||||||
|
}
|
||||||
9
lstMobile/metro.config.js
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
const { getDefaultConfig } = require("expo/metro-config");
|
||||||
|
const { withNativeWind } = require("nativewind/metro");
|
||||||
|
|
||||||
|
const config = getDefaultConfig(__dirname);
|
||||||
|
|
||||||
|
module.exports = withNativeWind(config, {
|
||||||
|
input: "./global.css",
|
||||||
|
inlineRem: 16,
|
||||||
|
});
|
||||||
3
lstMobile/nativewind-env.d.ts
vendored
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
/// <reference types="nativewind/types" />
|
||||||
|
|
||||||
|
// NOTE: This file should not be edited and should be committed with your source code. It is generated by NativeWind.
|
||||||
1513
lstMobile/package-lock.json
generated
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "lstmobile",
|
"name": "lstmobile",
|
||||||
"main": "expo-router/entry",
|
"main": "expo-router/entry",
|
||||||
"version": "0.0.1-alpha",
|
"version": "0.0.2-alpha",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "expo start",
|
"start": "expo start",
|
||||||
"reset-project": "node ./scripts/reset-project.js",
|
"reset-project": "node ./scripts/reset-project.js",
|
||||||
@@ -9,22 +9,38 @@
|
|||||||
"ios": "expo run:ios",
|
"ios": "expo run:ios",
|
||||||
"web": "expo start --web",
|
"web": "expo start --web",
|
||||||
"lint": "expo lint",
|
"lint": "expo lint",
|
||||||
"build:apk": "expo prebuild --clean && cd android && gradlew.bat assembleRelease ",
|
"build:apk:clean": "expo prebuild --clean && cd android && gradlew.bat clean && gradlew.bat assembleRelease && npm run copy:apk",
|
||||||
"update": "adb install android/app/build/outputs/apk/release/app-release.apk"
|
"build:apk": "expo prebuild && cd android && gradlew.bat assembleRelease && npm run copy:apk",
|
||||||
|
"build:mobile": "cd scripts && node runBuild.ts",
|
||||||
|
"build:mobile:bump": "cd scripts && node runBuild.ts --bump",
|
||||||
|
"copy:apk": "cd android && copy /Y app\\build\\outputs\\apk\\release\\app-release.apk ..\\..\\downloads\\mobile\\lst-mobile.apk",
|
||||||
|
"update": "adb install android/app/build/outputs/apk/release/app-release.apk",
|
||||||
|
"checklogs": "adb logcat -v time -s ReactNativeJS"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@react-native-async-storage/async-storage": "2.2.0",
|
"@react-native-async-storage/async-storage": "2.2.0",
|
||||||
"@react-navigation/bottom-tabs": "^7.15.5",
|
"@react-navigation/bottom-tabs": "^7.15.5",
|
||||||
"@react-navigation/elements": "^2.9.10",
|
"@react-navigation/elements": "^2.9.10",
|
||||||
"@react-navigation/native": "^7.1.33",
|
"@react-navigation/native": "^7.1.33",
|
||||||
|
"@rn-primitives/portal": "^1.4.0",
|
||||||
|
"@rn-primitives/separator": "^1.4.0",
|
||||||
|
"@rn-primitives/slot": "^1.4.0",
|
||||||
"@tanstack/react-query": "^5.99.0",
|
"@tanstack/react-query": "^5.99.0",
|
||||||
"axios": "^1.15.0",
|
"axios": "^1.15.0",
|
||||||
|
"babel-preset-expo": "^55.0.18",
|
||||||
|
"class-variance-authority": "^0.7.1",
|
||||||
|
"clsx": "^2.1.1",
|
||||||
|
"date-fns-tz": "^3.2.0",
|
||||||
"expo": "~55.0.15",
|
"expo": "~55.0.15",
|
||||||
"expo-application": "~55.0.14",
|
"expo-application": "~55.0.14",
|
||||||
|
"expo-audio": "~55.0.14",
|
||||||
|
"expo-av": "^16.0.8",
|
||||||
|
"expo-build-properties": "~55.0.13",
|
||||||
"expo-constants": "~55.0.14",
|
"expo-constants": "~55.0.14",
|
||||||
"expo-device": "~55.0.15",
|
"expo-device": "~55.0.15",
|
||||||
"expo-font": "~55.0.6",
|
"expo-font": "~55.0.6",
|
||||||
"expo-glass-effect": "~55.0.10",
|
"expo-glass-effect": "~55.0.10",
|
||||||
|
"expo-haptics": "~55.0.14",
|
||||||
"expo-image": "~55.0.8",
|
"expo-image": "~55.0.8",
|
||||||
"expo-linking": "~55.0.13",
|
"expo-linking": "~55.0.13",
|
||||||
"expo-router": "~55.0.12",
|
"expo-router": "~55.0.12",
|
||||||
@@ -34,16 +50,22 @@
|
|||||||
"expo-system-ui": "~55.0.15",
|
"expo-system-ui": "~55.0.15",
|
||||||
"expo-web-browser": "~55.0.14",
|
"expo-web-browser": "~55.0.14",
|
||||||
"lucide-react-native": "^1.8.0",
|
"lucide-react-native": "^1.8.0",
|
||||||
|
"nativewind": "^4.2.3",
|
||||||
|
"prettier-plugin-tailwindcss": "^0.5.14",
|
||||||
"react": "19.2.0",
|
"react": "19.2.0",
|
||||||
"react-dom": "19.2.0",
|
"react-dom": "19.2.0",
|
||||||
"react-native": "0.83.4",
|
"react-native": "0.83.4",
|
||||||
"react-native-gesture-handler": "~2.30.0",
|
"react-native-gesture-handler": "~2.30.0",
|
||||||
"react-native-reanimated": "4.2.1",
|
"react-native-reanimated": "^4.2.1",
|
||||||
"react-native-safe-area-context": "~5.6.2",
|
"react-native-safe-area-context": "~5.6.2",
|
||||||
"react-native-screens": "~4.23.0",
|
"react-native-screens": "~4.23.0",
|
||||||
|
"react-native-tcp-socket": "^6.4.1",
|
||||||
"react-native-web": "~0.21.0",
|
"react-native-web": "~0.21.0",
|
||||||
"react-native-worklets": "0.7.2",
|
"react-native-worklets": "0.7.2",
|
||||||
"socket.io-client": "^4.8.3",
|
"socket.io-client": "^4.8.3",
|
||||||
|
"tailwind-merge": "^3.5.0",
|
||||||
|
"tailwindcss": "^3.4.19",
|
||||||
|
"tailwindcss-animate": "^1.0.7",
|
||||||
"zod": "^4.3.6",
|
"zod": "^4.3.6",
|
||||||
"zustand": "^5.0.12"
|
"zustand": "^5.0.12"
|
||||||
},
|
},
|
||||||
|
|||||||
317
lstMobile/plugins/withZebraDataWedge.js
Normal file
@@ -0,0 +1,317 @@
|
|||||||
|
const { withDangerousMod } = require("@expo/config-plugins");
|
||||||
|
const fs = require("fs");
|
||||||
|
const path = require("path");
|
||||||
|
|
||||||
|
// const packageName = "net.alpla.lst.mobile";
|
||||||
|
// const packagePath = "com/alpla/lst/mobile";
|
||||||
|
const packageName = "net.alpla.lst.mobile";
|
||||||
|
const packagePath = "net/alpla/lst/mobile";
|
||||||
|
// const packageName = config.android?.package;
|
||||||
|
// const packagePath = packageName.replace(/\./g, "/");
|
||||||
|
|
||||||
|
const moduleCode = `package ${packageName}.scanner
|
||||||
|
|
||||||
|
import android.content.BroadcastReceiver
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.IntentFilter
|
||||||
|
import android.os.Bundle
|
||||||
|
import com.facebook.react.bridge.*
|
||||||
|
import com.facebook.react.modules.core.DeviceEventManagerModule
|
||||||
|
|
||||||
|
class ZebraScannerModule(
|
||||||
|
private val reactContext: ReactApplicationContext
|
||||||
|
) : ReactContextBaseJavaModule(reactContext) {
|
||||||
|
|
||||||
|
override fun getName(): String = "ZebraScanner"
|
||||||
|
|
||||||
|
private val scanAction = "com.lst.mobile.SCAN"
|
||||||
|
private var receiverRegistered = false
|
||||||
|
|
||||||
|
private val scanReceiver = object : BroadcastReceiver() {
|
||||||
|
override fun onReceive(context: Context?, intent: Intent?) {
|
||||||
|
println("LST SCANNER: received intent -> \${intent?.action}")
|
||||||
|
|
||||||
|
if (intent?.action != scanAction) {
|
||||||
|
println("LST SCANNER: wrong action")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val barcodeData: String? =
|
||||||
|
intent.getStringExtra("com.symbol.datawedge.data_string")
|
||||||
|
|
||||||
|
val labelType: String? =
|
||||||
|
intent.getStringExtra("com.symbol.datawedge.label_type")
|
||||||
|
|
||||||
|
val source: String? =
|
||||||
|
intent.getStringExtra("com.symbol.datawedge.source")
|
||||||
|
|
||||||
|
println("LST SCANNER: data=$barcodeData label=$labelType source=$source")
|
||||||
|
|
||||||
|
if (barcodeData.isNullOrBlank()) {
|
||||||
|
println("LST SCANNER: empty barcode")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val payload = Arguments.createMap().apply {
|
||||||
|
putString("data", barcodeData)
|
||||||
|
putString("labelType", labelType)
|
||||||
|
putString("source", source)
|
||||||
|
putDouble("timestamp", System.currentTimeMillis().toDouble())
|
||||||
|
}
|
||||||
|
|
||||||
|
sendEvent("barcodeScanned", payload)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@ReactMethod
|
||||||
|
fun startListening() {
|
||||||
|
if (receiverRegistered) return
|
||||||
|
|
||||||
|
reactContext.registerReceiver(
|
||||||
|
scanReceiver,
|
||||||
|
IntentFilter(scanAction),
|
||||||
|
Context.RECEIVER_EXPORTED
|
||||||
|
)
|
||||||
|
|
||||||
|
receiverRegistered = true
|
||||||
|
}
|
||||||
|
|
||||||
|
@ReactMethod
|
||||||
|
fun stopListening() {
|
||||||
|
if (!receiverRegistered) return
|
||||||
|
|
||||||
|
try {
|
||||||
|
reactContext.unregisterReceiver(scanReceiver)
|
||||||
|
} catch (_: Exception) {}
|
||||||
|
|
||||||
|
receiverRegistered = false
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Required for React Native NativeEventEmitter
|
||||||
|
*/
|
||||||
|
@ReactMethod
|
||||||
|
fun addListener(eventName: String) {
|
||||||
|
// No-op
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Required for React Native NativeEventEmitter
|
||||||
|
*/
|
||||||
|
@ReactMethod
|
||||||
|
fun removeListeners(count: Int) {
|
||||||
|
// No-op
|
||||||
|
}
|
||||||
|
|
||||||
|
@ReactMethod
|
||||||
|
fun triggerScan() {
|
||||||
|
val intent = Intent().apply {
|
||||||
|
action = "com.symbol.datawedge.api.ACTION"
|
||||||
|
putExtra("com.symbol.datawedge.api.SOFT_SCAN_TRIGGER", "TOGGLE_SCANNING")
|
||||||
|
}
|
||||||
|
|
||||||
|
reactContext.sendBroadcast(intent)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun sendCommand(command: String, value: Any) {
|
||||||
|
val intent = Intent().apply {
|
||||||
|
action = "com.symbol.datawedge.api.ACTION"
|
||||||
|
|
||||||
|
when (value) {
|
||||||
|
is String -> putExtra(command, value)
|
||||||
|
is Bundle -> putExtra(command, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
reactContext.sendBroadcast(intent)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun sendEvent(eventName: String, payload: WritableMap) {
|
||||||
|
reactContext
|
||||||
|
.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
|
||||||
|
.emit(eventName, payload)
|
||||||
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
@ReactMethod
|
||||||
|
fun ensureProfile() {
|
||||||
|
val profileName = "LST_MOBILE"
|
||||||
|
|
||||||
|
sendCommand(
|
||||||
|
"com.symbol.datawedge.api.CREATE_PROFILE",
|
||||||
|
profileName
|
||||||
|
)
|
||||||
|
|
||||||
|
Thread.sleep(500)
|
||||||
|
|
||||||
|
val barcodeConfig = Bundle().apply {
|
||||||
|
putString("PLUGIN_NAME", "BARCODE")
|
||||||
|
putString("RESET_CONFIG", "true")
|
||||||
|
|
||||||
|
val props = Bundle().apply {
|
||||||
|
putString("scanner_input_enabled", "true")
|
||||||
|
|
||||||
|
// Auto-select internal scanner
|
||||||
|
putString("scanner_selection", "auto")
|
||||||
|
putString("scanner_selection_by_identifier", "AUTO")
|
||||||
|
|
||||||
|
// Hardware trigger behavior
|
||||||
|
putString("hardware_trigger_enabled", "true")
|
||||||
|
putString("trigger_mode", "2") // 2 = HARD trigger
|
||||||
|
|
||||||
|
// Disable Zebra's loud initial decode feedback
|
||||||
|
putString("decode_audio_feedback_uri", "")
|
||||||
|
putString("decode_haptic_feedback", "false")
|
||||||
|
putString("decode_led_feedback", "false")
|
||||||
|
|
||||||
|
// add in wake on trigger
|
||||||
|
putString("trigger_wakeup_scan", "true");
|
||||||
|
}
|
||||||
|
|
||||||
|
putBundle("PARAM_LIST", props)
|
||||||
|
}
|
||||||
|
|
||||||
|
val intentConfig = Bundle().apply {
|
||||||
|
putString("PLUGIN_NAME", "INTENT")
|
||||||
|
putString("RESET_CONFIG", "true")
|
||||||
|
|
||||||
|
val props = Bundle().apply {
|
||||||
|
putString("intent_output_enabled", "true")
|
||||||
|
putString("intent_action", scanAction)
|
||||||
|
putString("intent_delivery", "2") // broadcast
|
||||||
|
putString("intent_use_content_provider", "false")
|
||||||
|
}
|
||||||
|
|
||||||
|
putBundle("PARAM_LIST", props)
|
||||||
|
}
|
||||||
|
|
||||||
|
val keystrokeConfig = Bundle().apply {
|
||||||
|
putString("PLUGIN_NAME", "KEYSTROKE")
|
||||||
|
putString("RESET_CONFIG", "true")
|
||||||
|
|
||||||
|
val props = Bundle().apply {
|
||||||
|
putString("keystroke_output_enabled", "false")
|
||||||
|
}
|
||||||
|
|
||||||
|
putBundle("PARAM_LIST", props)
|
||||||
|
}
|
||||||
|
|
||||||
|
val profileConfig = Bundle().apply {
|
||||||
|
putString("PROFILE_NAME", profileName)
|
||||||
|
putString("PROFILE_ENABLED", "true")
|
||||||
|
putString("CONFIG_MODE", "CREATE_IF_NOT_EXIST")
|
||||||
|
|
||||||
|
putParcelableArrayList(
|
||||||
|
"PLUGIN_CONFIG",
|
||||||
|
arrayListOf(barcodeConfig, intentConfig, keystrokeConfig)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
sendCommand("com.symbol.datawedge.api.SET_CONFIG", profileConfig)
|
||||||
|
|
||||||
|
val appConfig = Bundle().apply {
|
||||||
|
putString("PACKAGE_NAME", reactContext.packageName)
|
||||||
|
putStringArray("ACTIVITY_LIST", arrayOf("*"))
|
||||||
|
}
|
||||||
|
|
||||||
|
val associateConfig = Bundle().apply {
|
||||||
|
putString("PROFILE_NAME", profileName)
|
||||||
|
putString("CONFIG_MODE", "UPDATE")
|
||||||
|
putParcelableArray("APP_LIST", arrayOf(appConfig))
|
||||||
|
}
|
||||||
|
|
||||||
|
sendCommand("com.symbol.datawedge.api.SET_CONFIG", associateConfig)
|
||||||
|
|
||||||
|
// Runtime nudge: make sure scanner input is enabled for the active profile
|
||||||
|
sendCommand(
|
||||||
|
"com.symbol.datawedge.api.SCANNER_INPUT_PLUGIN",
|
||||||
|
"ENABLE_PLUGIN"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
const packageCode = `package ${packageName}.scanner
|
||||||
|
|
||||||
|
import com.facebook.react.ReactPackage
|
||||||
|
import com.facebook.react.bridge.NativeModule
|
||||||
|
import com.facebook.react.bridge.ReactApplicationContext
|
||||||
|
import com.facebook.react.uimanager.ViewManager
|
||||||
|
|
||||||
|
class ZebraScannerPackage : ReactPackage {
|
||||||
|
|
||||||
|
override fun createNativeModules(
|
||||||
|
reactContext: ReactApplicationContext
|
||||||
|
): List<NativeModule> {
|
||||||
|
return listOf(ZebraScannerModule(reactContext))
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun createViewManagers(
|
||||||
|
reactContext: ReactApplicationContext
|
||||||
|
): List<ViewManager<*, *>> {
|
||||||
|
return emptyList()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
|
|
||||||
|
function patchMainApplication(mainApplicationPath) {
|
||||||
|
let contents = fs.readFileSync(mainApplicationPath, "utf8");
|
||||||
|
|
||||||
|
const importLine = `import ${packageName}.scanner.ZebraScannerPackage`;
|
||||||
|
|
||||||
|
if (!contents.includes(importLine)) {
|
||||||
|
contents = contents.replace(
|
||||||
|
/import com\.facebook\.react\.PackageList/,
|
||||||
|
`import com.facebook.react.PackageList\n${importLine}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!contents.includes("add(ZebraScannerPackage())")) {
|
||||||
|
contents = contents.replace(
|
||||||
|
/PackageList\(this\)\.packages\.apply\s*\{/,
|
||||||
|
`PackageList(this).packages.apply {\n add(ZebraScannerPackage())`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
fs.writeFileSync(mainApplicationPath, contents);
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = function withZebraScanner(config) {
|
||||||
|
return withDangerousMod(config, [
|
||||||
|
"android",
|
||||||
|
async (config) => {
|
||||||
|
const androidRoot = config.modRequest.platformProjectRoot;
|
||||||
|
|
||||||
|
const scannerDir = path.join(
|
||||||
|
androidRoot,
|
||||||
|
"app/src/main/java",
|
||||||
|
packagePath,
|
||||||
|
"scanner",
|
||||||
|
);
|
||||||
|
|
||||||
|
fs.mkdirSync(scannerDir, { recursive: true });
|
||||||
|
|
||||||
|
fs.writeFileSync(
|
||||||
|
path.join(scannerDir, "ZebraScannerModule.kt"),
|
||||||
|
moduleCode,
|
||||||
|
);
|
||||||
|
|
||||||
|
fs.writeFileSync(
|
||||||
|
path.join(scannerDir, "ZebraScannerPackage.kt"),
|
||||||
|
packageCode,
|
||||||
|
);
|
||||||
|
|
||||||
|
const mainApplicationPath = path.join(
|
||||||
|
androidRoot,
|
||||||
|
"app/src/main/java",
|
||||||
|
packagePath,
|
||||||
|
"MainApplication.kt",
|
||||||
|
);
|
||||||
|
|
||||||
|
patchMainApplication(mainApplicationPath);
|
||||||
|
|
||||||
|
return config;
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
};
|
||||||
57
lstMobile/scripts/runBuild.ts
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
import { execSync } from "child_process";
|
||||||
|
import fs from "fs";
|
||||||
|
import path from "path";
|
||||||
|
|
||||||
|
const appJsonPath = path.resolve("../app.json");
|
||||||
|
|
||||||
|
// detect flags
|
||||||
|
const args = process.argv.slice(2);
|
||||||
|
const shouldBumpMin = args.includes("--bump");
|
||||||
|
|
||||||
|
try {
|
||||||
|
// 📖 read file
|
||||||
|
const raw = fs.readFileSync(appJsonPath, "utf-8");
|
||||||
|
const json = JSON.parse(raw);
|
||||||
|
|
||||||
|
const expo = json.expo ?? json; // supports both formats
|
||||||
|
|
||||||
|
if (!expo.android) {
|
||||||
|
throw new Error("No android config found in app.json");
|
||||||
|
}
|
||||||
|
|
||||||
|
// 🔢 current values
|
||||||
|
const currentVersionCode = expo.android.versionCode ?? 1;
|
||||||
|
const currentMin = expo.android.minSupportedVersionCode ?? 1;
|
||||||
|
|
||||||
|
// 🚀 increment version
|
||||||
|
const newVersionCode = currentVersionCode + 1;
|
||||||
|
|
||||||
|
expo.android.versionCode = newVersionCode;
|
||||||
|
|
||||||
|
if (shouldBumpMin) {
|
||||||
|
expo.android.minSupportedVersionCode = newVersionCode;
|
||||||
|
} else {
|
||||||
|
// keep existing min if not bumping
|
||||||
|
expo.android.minSupportedVersionCode = currentMin;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 💾 write back
|
||||||
|
fs.writeFileSync(appJsonPath, JSON.stringify(json, null, 2));
|
||||||
|
|
||||||
|
console.log("✅ app.json updated:");
|
||||||
|
console.log(" versionCode:", newVersionCode);
|
||||||
|
console.log(
|
||||||
|
" minSupportedVersionCode:",
|
||||||
|
expo.android.minSupportedVersionCode,
|
||||||
|
);
|
||||||
|
|
||||||
|
// 🏗 run build
|
||||||
|
console.log("\n🚧 Running build:apk...\n");
|
||||||
|
execSync("npm run build:apk", { stdio: "inherit" });
|
||||||
|
|
||||||
|
console.log("\n🎉 Build complete!");
|
||||||
|
} catch (err) {
|
||||||
|
console.error("❌ Build script failed:");
|
||||||
|
console.error(err);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
106
lstMobile/src/app/(tabs)/_layout.tsx
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
import { Redirect, Tabs } from "expo-router";
|
||||||
|
import { Container, Home, Logs, Rows4, Settings } from "lucide-react-native";
|
||||||
|
import { useAppStore } from "../../hooks/useAppStore";
|
||||||
|
import { useMobileAuthStore } from "../../hooks/useMobileAuth";
|
||||||
|
|
||||||
|
// const roles = {
|
||||||
|
// adminOnly: ["admin"],
|
||||||
|
// management: ["admin", "manager"],
|
||||||
|
// allStaff: ["admin", "manager", "driver", "lead", "user"],
|
||||||
|
// };
|
||||||
|
|
||||||
|
export default function TabsLayout() {
|
||||||
|
const serverPort = useAppStore((s) => s.serverPort);
|
||||||
|
const user = useMobileAuthStore((s) => s.user);
|
||||||
|
const isUnlocked = useMobileAuthStore((s) => s.isUnlocked);
|
||||||
|
|
||||||
|
const port = parseInt(serverPort || "0", 10) >= 50000;
|
||||||
|
console.log(port);
|
||||||
|
if (!port) {
|
||||||
|
if (!user || !isUnlocked) {
|
||||||
|
return <Redirect href="/login" />;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const isNormalScanner = parseInt(serverPort || "0", 10) >= 50000;
|
||||||
|
|
||||||
|
const hasRole = (allowed: string[] = []) => {
|
||||||
|
const role = user?.role?.toLowerCase();
|
||||||
|
return role ? allowed.includes(role) : false;
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Tabs
|
||||||
|
screenOptions={{
|
||||||
|
headerShown: false, // Hides the header for all screens in this navigator
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Tabs.Screen
|
||||||
|
name="scanner"
|
||||||
|
options={{
|
||||||
|
title: "Scan",
|
||||||
|
tabBarIcon: ({ color, size }) => <Home size={size} color={color} />,
|
||||||
|
// header: ({ route }) => {
|
||||||
|
// const version = serverVersion?.versionCode;
|
||||||
|
|
||||||
|
// const hasUpdate = version && version > build;
|
||||||
|
|
||||||
|
// if (!hasUpdate) return null; // 👈 hides header completely
|
||||||
|
|
||||||
|
// return <GlobalHeader title={route.name} />;
|
||||||
|
// },
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Tabs.Screen
|
||||||
|
name="laneCheck"
|
||||||
|
options={{
|
||||||
|
title: "Lane Check",
|
||||||
|
|
||||||
|
href: isNormalScanner ? null : "/(tabs)/laneCheck",
|
||||||
|
tabBarIcon: ({ color, size }) => <Rows4 size={size} color={color} />,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Tabs.Screen
|
||||||
|
name="dockScan"
|
||||||
|
options={{
|
||||||
|
title: "Dock scan",
|
||||||
|
href:
|
||||||
|
isNormalScanner || !hasRole(["admin", "manager"])
|
||||||
|
? null
|
||||||
|
: "/(tabs)/dockScan",
|
||||||
|
tabBarIcon: ({ color, size }) => (
|
||||||
|
<Container size={size} color={color} />
|
||||||
|
),
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<Tabs.Screen
|
||||||
|
name="logs"
|
||||||
|
options={{
|
||||||
|
title: "Logs",
|
||||||
|
href:
|
||||||
|
isNormalScanner || !hasRole(["admin", "manager"])
|
||||||
|
? null
|
||||||
|
: "/(tabs)/logs",
|
||||||
|
tabBarIcon: ({ color, size }) => <Logs size={size} color={color} />,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
{/* <Tabs.Screen
|
||||||
|
name="lanes"
|
||||||
|
options={{
|
||||||
|
title: "Lanes",
|
||||||
|
href:
|
||||||
|
parseInt(serverPort || "0", 10) >= 50000 ? null : "/(tabs)/logs",
|
||||||
|
}}
|
||||||
|
/> */}
|
||||||
|
<Tabs.Screen
|
||||||
|
name="config"
|
||||||
|
options={{
|
||||||
|
title: "settings",
|
||||||
|
tabBarIcon: ({ color, size }) => (
|
||||||
|
<Settings size={size} color={color} />
|
||||||
|
),
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Tabs>
|
||||||
|
);
|
||||||
|
}
|
||||||
5
lstMobile/src/app/(tabs)/config.tsx
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
import Setup from "../setup";
|
||||||
|
|
||||||
|
export default function SettingsTab() {
|
||||||
|
return <Setup />;
|
||||||
|
}
|
||||||
26
lstMobile/src/app/(tabs)/dockScan.tsx
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { Text, View } from "react-native";
|
||||||
|
import { Button } from "../../components/ui/button";
|
||||||
|
|
||||||
|
export default function LaneCheck() {
|
||||||
|
const getInfo = async () => {
|
||||||
|
const info = "ho";
|
||||||
|
|
||||||
|
console.log(info);
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
flex: 1,
|
||||||
|
//justifyContent: "center",
|
||||||
|
alignItems: "center",
|
||||||
|
marginTop: 50,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Text>Dock Scanning</Text>
|
||||||
|
<Button onPress={getInfo}>
|
||||||
|
<Text>Check info</Text>
|
||||||
|
</Button>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
37
lstMobile/src/app/(tabs)/laneCheck.tsx
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
import React, { useCallback, useEffect } from "react";
|
||||||
|
import { Text, View } from "react-native";
|
||||||
|
import { Button } from "../../components/ui/button";
|
||||||
|
import { type ZebraScanResult, zebraScanner } from "../../lib/ZebraScanner";
|
||||||
|
|
||||||
|
export default function LaneCheck() {
|
||||||
|
const handleScan = useCallback(async (scan: ZebraScanResult) => {
|
||||||
|
console.log(scan);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
zebraScanner.ensureProfile();
|
||||||
|
zebraScanner.startListening();
|
||||||
|
|
||||||
|
const sub = zebraScanner.addScanListener((scan) => {
|
||||||
|
//console.log("SCAN:", scan);
|
||||||
|
handleScan(scan);
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
sub.remove();
|
||||||
|
zebraScanner.stopListening();
|
||||||
|
};
|
||||||
|
}, [handleScan]);
|
||||||
|
return (
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
flex: 1,
|
||||||
|
//justifyContent: "center",
|
||||||
|
alignItems: "center",
|
||||||
|
marginTop: 50,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Text>LaneChecks</Text>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
26
lstMobile/src/app/(tabs)/logs.tsx
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { Text, View } from "react-native";
|
||||||
|
import { Button } from "../../components/ui/button";
|
||||||
|
|
||||||
|
export default function Logs() {
|
||||||
|
const getInfo = async () => {
|
||||||
|
const info = "ho";
|
||||||
|
|
||||||
|
console.log(info);
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
flex: 1,
|
||||||
|
//justifyContent: "center",
|
||||||
|
alignItems: "center",
|
||||||
|
marginTop: 50,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Text>Logs</Text>
|
||||||
|
<Button onPress={getInfo}>
|
||||||
|
<Text>Check info</Text>
|
||||||
|
</Button>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
24
lstMobile/src/app/(tabs)/scanner.tsx
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import { View } from "react-native";
|
||||||
|
import LSTScanner from "../../components/LSTScanner";
|
||||||
|
import ProdScanner from "../../components/ProdScanner";
|
||||||
|
import { useAppStore } from "../../hooks/useAppStore";
|
||||||
|
|
||||||
|
export default function Scanner() {
|
||||||
|
const serverPort = useAppStore((s) => s.serverPort);
|
||||||
|
return (
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
flex: 1,
|
||||||
|
//justifyContent: "center",
|
||||||
|
alignItems: "center",
|
||||||
|
marginTop: 50,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{parseInt(serverPort || "0", 10) >= 50000 ? (
|
||||||
|
<ProdScanner />
|
||||||
|
) : (
|
||||||
|
<LSTScanner />
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,14 +1,23 @@
|
|||||||
|
import { PortalHost } from "@rn-primitives/portal";
|
||||||
import { Stack } from "expo-router";
|
import { Stack } from "expo-router";
|
||||||
import { StatusBar } from "expo-status-bar";
|
import { StatusBar } from "expo-status-bar";
|
||||||
|
import "../../global.css";
|
||||||
|
import useDeviceLock from "../hooks/useDeviceCheck";
|
||||||
|
|
||||||
export default function RootLayout() {
|
export default function RootLayout() {
|
||||||
|
useDeviceLock();
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<StatusBar style="dark" />
|
<StatusBar style="dark" />
|
||||||
<Stack screenOptions={{ headerShown: false }}>
|
<Stack screenOptions={{ headerShown: false }}>
|
||||||
<Stack.Screen name="index" />
|
<Stack.Screen name="index" />
|
||||||
{/* <Stack.Screen name="(tabs)" /> */}
|
<Stack.Screen name="login" />
|
||||||
|
<Stack.Screen name="setup" />
|
||||||
|
<Stack.Screen name="updateScreen" />
|
||||||
|
<Stack.Screen name="(tabs)" />
|
||||||
</Stack>
|
</Stack>
|
||||||
|
<PortalHost />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
import { Text, View } from "react-native";
|
|
||||||
|
|
||||||
export default function blocked() {
|
|
||||||
return (
|
|
||||||
<View>
|
|
||||||
<Text>Blocked</Text>
|
|
||||||
</View>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -1,71 +1,31 @@
|
|||||||
import { useRouter } from "expo-router";
|
import { Redirect } from "expo-router";
|
||||||
import { useEffect, useState } from "react";
|
|
||||||
import { ActivityIndicator, Text, View } from "react-native";
|
import { ActivityIndicator, Text, View } from "react-native";
|
||||||
import { useAppStore } from "../hooks/useAppStore";
|
import { useAppStartup } from "../hooks/useAppStartup";
|
||||||
import { devDelay } from "../lib/devMode";
|
|
||||||
|
const startupMessages = {
|
||||||
|
loading: "Loading app...",
|
||||||
|
validating: "Validating data...",
|
||||||
|
scannerMode: "Checking scanner mode...",
|
||||||
|
normalScanner: "Starting normal ALPLAprod scanner that has no LST rules",
|
||||||
|
checkingUpdates: "Checking for updates...",
|
||||||
|
opening: "Opening LST scan app...",
|
||||||
|
error: "Something went wrong during startup.",
|
||||||
|
};
|
||||||
|
|
||||||
export default function Index() {
|
export default function Index() {
|
||||||
const router = useRouter();
|
const { ready, startupRoute, status } = useAppStartup();
|
||||||
const [message, setMessage] = useState(<Text>Starting app...</Text>);
|
|
||||||
|
|
||||||
const hasHydrated = useAppStore((s) => s.hasHydrated);
|
if (ready && startupRoute) {
|
||||||
const serverPort = useAppStore((s) => s.serverPort);
|
return <Redirect href={startupRoute as any} />;
|
||||||
const hasValidSetup = useAppStore((s) => s.hasValidSetup);
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
if (ready) {
|
||||||
if (!hasHydrated) {
|
return <Redirect href="/login" />;
|
||||||
setMessage(<Text>Loading app...</Text>);
|
}
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const startup = async () => {
|
|
||||||
try {
|
|
||||||
await devDelay(1500);
|
|
||||||
|
|
||||||
setMessage(<Text>Validating data...</Text>);
|
|
||||||
await devDelay(1500);
|
|
||||||
|
|
||||||
if (!hasValidSetup()) {
|
|
||||||
router.replace("/setup");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setMessage(<Text>Checking scanner mode...</Text>);
|
|
||||||
await devDelay(1500);
|
|
||||||
|
|
||||||
if (parseInt(serverPort || "0", 10) >= 50000) {
|
|
||||||
setMessage(
|
|
||||||
<Text>
|
|
||||||
Starting normal alplaprod scanner that has no LST rules
|
|
||||||
</Text>,
|
|
||||||
);
|
|
||||||
await devDelay(1500);
|
|
||||||
router.replace("/scanner");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
setMessage(<Text>Opening LST scan app</Text>);
|
|
||||||
await devDelay(3250);
|
|
||||||
router.replace("/scanner");
|
|
||||||
} catch (error) {
|
|
||||||
console.log("Startup error", error);
|
|
||||||
setMessage(<Text>Something went wrong during startup.</Text>);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
startup();
|
|
||||||
}, [hasHydrated, hasValidSetup, serverPort, router]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<View
|
<View style={{ flex: 1, justifyContent: "center", alignItems: "center" }}>
|
||||||
style={{
|
<Text>{startupMessages[status]}</Text>
|
||||||
flex: 1,
|
|
||||||
justifyContent: "center",
|
|
||||||
alignItems: "center",
|
|
||||||
marginTop: 12,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{message}
|
|
||||||
<ActivityIndicator size="large" />
|
<ActivityIndicator size="large" />
|
||||||
</View>
|
</View>
|
||||||
);
|
);
|
||||||
|
|||||||
86
lstMobile/src/app/login.tsx
Normal file
@@ -0,0 +1,86 @@
|
|||||||
|
import axios from "axios";
|
||||||
|
|
||||||
|
import { useRouter } from "expo-router";
|
||||||
|
import { useState } from "react";
|
||||||
|
import { Alert, Button, Text, View } from "react-native";
|
||||||
|
import { Input } from "../components/ui/input";
|
||||||
|
import { useAppStore } from "../hooks/useAppStore";
|
||||||
|
import { useMobileAuthStore } from "../hooks/useMobileAuth";
|
||||||
|
|
||||||
|
export default function Login() {
|
||||||
|
// doing this causes rerender and sub
|
||||||
|
//const { setUser } = useMobileAuthStore();
|
||||||
|
const [pin, setPin] = useState("");
|
||||||
|
const serverPort = useAppStore((s) => s.serverPort);
|
||||||
|
const serverIp = useAppStore((s) => s.serverIp);
|
||||||
|
|
||||||
|
const router = useRouter();
|
||||||
|
|
||||||
|
const onLogin = async () => {
|
||||||
|
if (pin.length < 6) {
|
||||||
|
console.log("pin must be min 6 ");
|
||||||
|
}
|
||||||
|
console.log(pin);
|
||||||
|
try {
|
||||||
|
const res = await axios.post(
|
||||||
|
`http://${serverIp}:${parseInt(serverPort || "0", 10) >= 50000 ? "3000" : serverPort}/lst/api/mobile/auth/pin`,
|
||||||
|
{ pin },
|
||||||
|
|
||||||
|
{
|
||||||
|
timeout: 5000,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
if (res.status === 200) {
|
||||||
|
// this way to set the user is direct and basically a 1 shot
|
||||||
|
useMobileAuthStore.getState().setUser(res.data.data);
|
||||||
|
return router.replace("/(tabs)/scanner");
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.log(error);
|
||||||
|
Alert.alert("Login Error", `Invalid pin please try again`);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const config = () => {
|
||||||
|
console.log("config");
|
||||||
|
return router.replace("/setup");
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
flex: 1,
|
||||||
|
//justifyContent: "center",
|
||||||
|
alignItems: "center",
|
||||||
|
marginTop: 50,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<View className="flex items-center m-5">
|
||||||
|
<Text style={{ fontSize: 20, fontWeight: "600" }}>
|
||||||
|
LST Scanner Login
|
||||||
|
</Text>
|
||||||
|
<View className="w-64 p-4">
|
||||||
|
<Input
|
||||||
|
className="w-fit"
|
||||||
|
keyboardType="number-pad"
|
||||||
|
textContentType="oneTimeCode"
|
||||||
|
placeholder="Pin number"
|
||||||
|
onChangeText={setPin}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
<View>
|
||||||
|
<Text className="p-3">
|
||||||
|
Warning: If you are logged into another scanner you will encounter
|
||||||
|
scan errors, please do not try to log into more than 1 scanner at a
|
||||||
|
time.
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
<View className="flex gap-2 flex-row">
|
||||||
|
<Button title="Login" onPress={onLogin} />
|
||||||
|
<Button title="Config" onPress={config} />
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
import React from "react";
|
|
||||||
import { Text, View } from "react-native";
|
|
||||||
|
|
||||||
export default function scanner() {
|
|
||||||
return (
|
|
||||||
<View
|
|
||||||
style={{
|
|
||||||
flex: 1,
|
|
||||||
//justifyContent: "center",
|
|
||||||
alignItems: "center",
|
|
||||||
marginTop: 50,
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<View style={{ alignItems: "center", margin: 10 }}>
|
|
||||||
<Text style={{ fontSize: 20, fontWeight: "600" }}>LST Scanner</Text>
|
|
||||||
</View>
|
|
||||||
<View
|
|
||||||
style={{
|
|
||||||
marginTop: 50,
|
|
||||||
alignItems: "center",
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Text>Relocate</Text>
|
|
||||||
<Text>0 / 4</Text>
|
|
||||||
</View>
|
|
||||||
|
|
||||||
{/* <View>
|
|
||||||
<Text>List of recent scanned pallets TBA</Text>
|
|
||||||
</View> */}
|
|
||||||
</View>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -3,8 +3,9 @@ import { useRouter } from "expo-router";
|
|||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { Alert, Button, Text, TextInput, View } from "react-native";
|
import { Alert, Button, Text, TextInput, View } from "react-native";
|
||||||
import { useAppStore } from "../hooks/useAppStore";
|
import { useAppStore } from "../hooks/useAppStore";
|
||||||
|
import { useServerStore } from "../hooks/useServerCheck";
|
||||||
|
|
||||||
export default function setup() {
|
export default function Setup() {
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const [auth, setAuth] = useState(false);
|
const [auth, setAuth] = useState(false);
|
||||||
const [pin, setPin] = useState("");
|
const [pin, setPin] = useState("");
|
||||||
@@ -22,6 +23,10 @@ export default function setup() {
|
|||||||
const [serverPort, setLocalServerPort] = useState(serverPortFromStore);
|
const [serverPort, setLocalServerPort] = useState(serverPortFromStore);
|
||||||
const [scannerId, setScannerId] = useState(scannerIdFromStore);
|
const [scannerId, setScannerId] = useState(scannerIdFromStore);
|
||||||
|
|
||||||
|
const server = useServerStore((s) => s.serverVersion);
|
||||||
|
|
||||||
|
// TODO: if on lst version and the user is manager or admin just login
|
||||||
|
|
||||||
const authCheck = () => {
|
const authCheck = () => {
|
||||||
if (pin === "6971") {
|
if (pin === "6971") {
|
||||||
setAuth(true);
|
setAuth(true);
|
||||||
@@ -40,6 +45,7 @@ export default function setup() {
|
|||||||
updateAppState({
|
updateAppState({
|
||||||
serverIp: serverIp.trim(),
|
serverIp: serverIp.trim(),
|
||||||
serverPort: serverPort.trim(),
|
serverPort: serverPort.trim(),
|
||||||
|
scannerId: scannerId?.trim(),
|
||||||
setupCompleted: true,
|
setupCompleted: true,
|
||||||
isRegistered: true,
|
isRegistered: true,
|
||||||
});
|
});
|
||||||
@@ -80,7 +86,7 @@ export default function setup() {
|
|||||||
borderRadius: 8,
|
borderRadius: 8,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Button title="Save Config" onPress={authCheck} />
|
<Button title="Submit" onPress={authCheck} />
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
) : (
|
) : (
|
||||||
@@ -136,7 +142,7 @@ export default function setup() {
|
|||||||
<Button
|
<Button
|
||||||
title="Home"
|
title="Home"
|
||||||
onPress={() => {
|
onPress={() => {
|
||||||
router.push("/");
|
router.push("/(tabs)/scanner");
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</View>
|
</View>
|
||||||
@@ -147,11 +153,14 @@ export default function setup() {
|
|||||||
marginTop: "auto",
|
marginTop: "auto",
|
||||||
alignItems: "center",
|
alignItems: "center",
|
||||||
padding: 10,
|
padding: 10,
|
||||||
marginBottom: 12,
|
marginBottom: 50,
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Text style={{ fontSize: 12, color: "#666" }}>
|
<Text className="text-sm color-[#312f2f]">
|
||||||
LST Scanner v{version}-{build}
|
App v{version}-{build}
|
||||||
|
</Text>
|
||||||
|
<Text className="text-sm color-[#312f2f]">
|
||||||
|
Server version - v{server?.versionName}-{server?.versionCode}
|
||||||
</Text>
|
</Text>
|
||||||
</View>
|
</View>
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
47
lstMobile/src/app/updateScreen.tsx
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
import Constants from "expo-constants";
|
||||||
|
import { Link } from "expo-router";
|
||||||
|
import { Text, View } from "react-native";
|
||||||
|
import {
|
||||||
|
Card,
|
||||||
|
CardContent,
|
||||||
|
CardFooter,
|
||||||
|
CardHeader,
|
||||||
|
} from "../components/ui/card";
|
||||||
|
import { Separator } from "../components/ui/separator";
|
||||||
|
import { useServerStore } from "../hooks/useServerCheck";
|
||||||
|
|
||||||
|
export default function Update() {
|
||||||
|
const version = Constants.expoConfig?.version;
|
||||||
|
const build = Constants.expoConfig?.android?.versionCode ?? 1;
|
||||||
|
const server = useServerStore((s) => s.serverVersion);
|
||||||
|
return (
|
||||||
|
<View className="flex-1 mt-5 p-5">
|
||||||
|
<Card>
|
||||||
|
<CardHeader>
|
||||||
|
<Text className="text-center underline">Update Required</Text>
|
||||||
|
</CardHeader>
|
||||||
|
<CardContent>
|
||||||
|
<Text>Your app is out of date and needs to be updated</Text>
|
||||||
|
<Separator className="mt-5 mb-5" />
|
||||||
|
<Text>
|
||||||
|
App version - v{version}-{build}
|
||||||
|
</Text>
|
||||||
|
<Text>
|
||||||
|
Server version - v{server?.versionName}-{server?.versionCode}
|
||||||
|
</Text>
|
||||||
|
<Separator className="mt-5 mb-5" />
|
||||||
|
<Text>
|
||||||
|
To update the app please head go to a computer and open LST.
|
||||||
|
</Text>
|
||||||
|
<Text>Then head to Scan.</Text>
|
||||||
|
<Text>Click update Then follow the instructions on screen</Text>
|
||||||
|
</CardContent>
|
||||||
|
</Card>
|
||||||
|
{server && server?.versionCode >= build && (
|
||||||
|
<Link href={"/"}>
|
||||||
|
<Text className="text-center underline">Home</Text>
|
||||||
|
</Link>
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
236
lstMobile/src/components/LSTScanner.tsx
Normal file
@@ -0,0 +1,236 @@
|
|||||||
|
import axios from "axios";
|
||||||
|
import { format } from "date-fns-tz";
|
||||||
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
import { Alert, Button, Text, View } from "react-native";
|
||||||
|
import { useAppStore } from "../hooks/useAppStore";
|
||||||
|
import { useMobileAuthStore } from "../hooks/useMobileAuth";
|
||||||
|
import { useScannerStore } from "../hooks/useScannerStore";
|
||||||
|
import { scannerFeedback } from "../lib/feedbackScan";
|
||||||
|
import { sendTcpMessage } from "../lib/tcpScan";
|
||||||
|
import { versionCheck } from "../lib/versionValidation";
|
||||||
|
import { type ZebraScanResult, zebraScanner } from "../lib/ZebraScanner";
|
||||||
|
import { ScannedLabelBox } from "./ScannedLabels";
|
||||||
|
import { GlobalFooter } from "./UpdateFooter";
|
||||||
|
import { Separator } from "./ui/separator";
|
||||||
|
|
||||||
|
const STX = "\x02";
|
||||||
|
const ETX = "\x03";
|
||||||
|
|
||||||
|
const formatName = (name?: string) =>
|
||||||
|
name ? name.charAt(0).toUpperCase() + name.slice(1).toLowerCase() : "";
|
||||||
|
|
||||||
|
export default function LSTScanner() {
|
||||||
|
const user = useMobileAuthStore((s) => s.user);
|
||||||
|
const logout = useMobileAuthStore((s) => s.logout);
|
||||||
|
|
||||||
|
// TODO : move to off tcp stuff after od
|
||||||
|
const lastScan = useScannerStore((s) => s.lastScan);
|
||||||
|
const setLastScan = useScannerStore((s) => s.setLastScan);
|
||||||
|
const [tagScans, setTagScans] = useState<any>([]);
|
||||||
|
const scannerIdFromStore = useAppStore((s) => s.scannerId);
|
||||||
|
const serverIp = useAppStore((s) => s.serverIp);
|
||||||
|
const serverPort = useAppStore((s) => s.serverPort);
|
||||||
|
const [bgColor, setBGColor] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const handleScan = useCallback(
|
||||||
|
async (scan: ZebraScanResult) => {
|
||||||
|
await scannerFeedback({
|
||||||
|
type: "scan",
|
||||||
|
sound: true,
|
||||||
|
vibrate: true,
|
||||||
|
led: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
const isAlphaStart = /^[a-zA-Z]/.test(scan.data);
|
||||||
|
const isExcluded = (user?.excludedCommand ?? []).some((cmd) =>
|
||||||
|
scan.data.toLowerCase().includes(cmd.toLowerCase()),
|
||||||
|
);
|
||||||
|
|
||||||
|
console.log(user?.excludedCommand);
|
||||||
|
|
||||||
|
if (isAlphaStart && isExcluded) {
|
||||||
|
Alert.alert(
|
||||||
|
"Command not allowed",
|
||||||
|
`Command: ${scan.data}\n\nPlease contact logistics if this is an error`,
|
||||||
|
);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
let commandToSend = `${STX}${user?.scannerId}@${scan.data}${ETX}`;
|
||||||
|
|
||||||
|
// if we are sscc we need to scan like this .... <STX>98@]C100090087710038712256<ETX>
|
||||||
|
if (scan.data.startsWith("000")) {
|
||||||
|
commandToSend = `${STX}${user?.scannerId}@]C1${scan.data}${ETX}`;
|
||||||
|
setTagScans((prev: any) => [
|
||||||
|
{
|
||||||
|
label: parseInt(scan.data.slice(10, -1) || "000", 10).toString(),
|
||||||
|
date: format(new Date(Date.now()), "HH:mm"),
|
||||||
|
},
|
||||||
|
...prev,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
const scanned = (await sendTcpMessage(
|
||||||
|
commandToSend,
|
||||||
|
serverIp,
|
||||||
|
50004,
|
||||||
|
)) as any;
|
||||||
|
|
||||||
|
// send the logs to lst but allow it to time out if it dose not exist just bc.
|
||||||
|
|
||||||
|
try {
|
||||||
|
await axios.post(`http://${serverIp.trim()}:3000/lst/api/mobile/logs`, {
|
||||||
|
scannerId: user?.scannerId ?? "0",
|
||||||
|
message: scanned.data.message,
|
||||||
|
prompt: scanned.data.prompt,
|
||||||
|
commandDescription: scanned.data.commandDescription,
|
||||||
|
status: scanned.data.status,
|
||||||
|
lines: scanned.data.lines,
|
||||||
|
user: user?.name ?? "prodScan",
|
||||||
|
runningNumber: scan.data.startsWith("000")
|
||||||
|
? parseInt(scan.data.slice(10, -1) || "000", 10).toString()
|
||||||
|
: "0",
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
console.log(error);
|
||||||
|
}
|
||||||
|
// const response = await sendTcpMessage(tcpMessage);
|
||||||
|
console.log(scanned.data);
|
||||||
|
if (scanned.data.status !== "error") {
|
||||||
|
await scannerFeedback({
|
||||||
|
type: "good",
|
||||||
|
sound: true,
|
||||||
|
vibrate: true,
|
||||||
|
led: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
setBGColor("bg-green-500");
|
||||||
|
|
||||||
|
// version check
|
||||||
|
versionCheck();
|
||||||
|
|
||||||
|
// auth update
|
||||||
|
useMobileAuthStore.getState().updateLastScan();
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
setBGColor(null);
|
||||||
|
}, 1 * 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (scanned.data.status === "error") {
|
||||||
|
await scannerFeedback({
|
||||||
|
type: scanned.data.status === "error" ? "bad" : "good",
|
||||||
|
sound: true,
|
||||||
|
vibrate: true,
|
||||||
|
led: true,
|
||||||
|
});
|
||||||
|
setBGColor("bg-red-500");
|
||||||
|
setTimeout(() => {
|
||||||
|
setBGColor(null);
|
||||||
|
}, 1 * 1000);
|
||||||
|
}
|
||||||
|
setLastScan(scanned.data);
|
||||||
|
|
||||||
|
// if we change commands we want to zero out the last scanned labels
|
||||||
|
if (isAlphaStart) {
|
||||||
|
setTagScans([]);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[
|
||||||
|
serverIp,
|
||||||
|
setLastScan,
|
||||||
|
user?.scannerId,
|
||||||
|
user?.name,
|
||||||
|
user?.excludedCommand?.some,
|
||||||
|
user?.excludedCommand,
|
||||||
|
],
|
||||||
|
);
|
||||||
|
|
||||||
|
const clearScans = () => {
|
||||||
|
setTagScans([]);
|
||||||
|
};
|
||||||
|
|
||||||
|
//console.log(lastScan);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
zebraScanner.ensureProfile();
|
||||||
|
zebraScanner.startListening();
|
||||||
|
|
||||||
|
const sub = zebraScanner.addScanListener((scan) => {
|
||||||
|
//console.log("SCAN:", scan);
|
||||||
|
handleScan(scan);
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
sub.remove();
|
||||||
|
zebraScanner.stopListening();
|
||||||
|
};
|
||||||
|
}, [handleScan]);
|
||||||
|
return (
|
||||||
|
<View className={`${bgColor ?? ""} flex-1 w-screen`}>
|
||||||
|
<View style={{ alignItems: "center", margin: 5 }}>
|
||||||
|
<Text style={{ fontSize: 14, fontWeight: "600" }}>
|
||||||
|
User: {formatName(user?.name ?? "")}
|
||||||
|
</Text>
|
||||||
|
<Text style={{ fontSize: 18, fontWeight: "600" }}>
|
||||||
|
LST Scanner id: {user?.scannerId}
|
||||||
|
</Text>
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
marginTop: 5,
|
||||||
|
alignItems: "center",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{!lastScan ? (
|
||||||
|
<View style={{ marginTop: 10, alignItems: "center" }}>
|
||||||
|
<Text className="text-xl font-bold">Ready to scan</Text>
|
||||||
|
<Text>Waiting for first scan...</Text>
|
||||||
|
</View>
|
||||||
|
) : (
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
marginTop: 10,
|
||||||
|
alignItems: "center",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{lastScan.lines
|
||||||
|
?.filter((line) => !/^\d+@$/.test(line))
|
||||||
|
.map((i) => {
|
||||||
|
return (
|
||||||
|
<View
|
||||||
|
style={{ marginTop: 10, alignItems: "center" }}
|
||||||
|
key={i}
|
||||||
|
>
|
||||||
|
<Text style={{ fontSize: 18, fontWeight: "600" }}>
|
||||||
|
{i}
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
<Separator className="m-2" />
|
||||||
|
<View className="flex-1 w-full px-4">
|
||||||
|
<ScannedLabelBox
|
||||||
|
labels={tagScans}
|
||||||
|
color={bgColor}
|
||||||
|
clearScan={clearScans}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<View className="m-2">
|
||||||
|
{user && (
|
||||||
|
<View className="items-center">
|
||||||
|
<Button title="Logout" onPress={logout} />
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
|
<View>
|
||||||
|
<GlobalFooter />
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
181
lstMobile/src/components/ProdScanner.tsx
Normal file
@@ -0,0 +1,181 @@
|
|||||||
|
import axios from "axios";
|
||||||
|
import { format } from "date-fns-tz";
|
||||||
|
import { useCallback, useEffect, useState } from "react";
|
||||||
|
import { Text, View } from "react-native";
|
||||||
|
import { useAppStore } from "../hooks/useAppStore";
|
||||||
|
import { useMobileAuthStore } from "../hooks/useMobileAuth";
|
||||||
|
import { useScannerStore } from "../hooks/useScannerStore";
|
||||||
|
import { scannerFeedback } from "../lib/feedbackScan";
|
||||||
|
import { sendTcpMessage } from "../lib/tcpScan";
|
||||||
|
import { versionCheck } from "../lib/versionValidation";
|
||||||
|
import { type ZebraScanResult, zebraScanner } from "../lib/ZebraScanner";
|
||||||
|
import { ScannedLabelBox } from "./ScannedLabels";
|
||||||
|
import { GlobalFooter } from "./UpdateFooter";
|
||||||
|
import { Separator } from "./ui/separator";
|
||||||
|
|
||||||
|
const STX = "\x02";
|
||||||
|
const ETX = "\x03";
|
||||||
|
|
||||||
|
export default function ProdScanner() {
|
||||||
|
const lastScan = useScannerStore((s) => s.lastScan);
|
||||||
|
const setLastScan = useScannerStore((s) => s.setLastScan);
|
||||||
|
const [tagScans, setTagScans] = useState<any>([]);
|
||||||
|
const scannerIdFromStore = useAppStore((s) => s.scannerId);
|
||||||
|
const serverIp = useAppStore((s) => s.serverIp);
|
||||||
|
const serverPort = useAppStore((s) => s.serverPort);
|
||||||
|
const [bgColor, setBGColor] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const handleScan = useCallback(
|
||||||
|
async (scan: ZebraScanResult) => {
|
||||||
|
await scannerFeedback({
|
||||||
|
type: "scan",
|
||||||
|
sound: true,
|
||||||
|
vibrate: true,
|
||||||
|
led: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
let commandToSend = `${STX}${scannerIdFromStore}@${scan.data}${ETX}`;
|
||||||
|
|
||||||
|
// if we are sscc we need to scan like this .... <STX>98@]C100090087710038712256<ETX>
|
||||||
|
if (scan.data.startsWith("000")) {
|
||||||
|
commandToSend = `${STX}${scannerIdFromStore}@]C1${scan.data}${ETX}`;
|
||||||
|
setTagScans((prev: any) => [
|
||||||
|
{
|
||||||
|
label: parseInt(scan.data.slice(10, -1) || "000", 10).toString(),
|
||||||
|
date: format(new Date(Date.now()), "HH:mm"),
|
||||||
|
},
|
||||||
|
...prev,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
const scanned = (await sendTcpMessage(
|
||||||
|
commandToSend,
|
||||||
|
serverIp,
|
||||||
|
parseInt(serverPort || "0", 10),
|
||||||
|
)) as any;
|
||||||
|
// send the logs to lst but allow it to time out if it dose not exist just bc.
|
||||||
|
const data = {
|
||||||
|
...scanned.data,
|
||||||
|
runningNumber: scan.data.startsWith("000")
|
||||||
|
? parseInt(scan.data.slice(10, -1) || "000", 10).toString()
|
||||||
|
: "0",
|
||||||
|
};
|
||||||
|
try {
|
||||||
|
await axios.post(
|
||||||
|
`http://${serverIp.trim()}:3000/lst/api/mobile/logs`,
|
||||||
|
data,
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
console.log(error);
|
||||||
|
}
|
||||||
|
// const response = await sendTcpMessage(tcpMessage);
|
||||||
|
console.log(scanned.data);
|
||||||
|
if (scanned.data.status !== "error") {
|
||||||
|
await scannerFeedback({
|
||||||
|
type: "good",
|
||||||
|
sound: true,
|
||||||
|
vibrate: true,
|
||||||
|
led: true,
|
||||||
|
});
|
||||||
|
setBGColor("bg-green-500");
|
||||||
|
|
||||||
|
// version check
|
||||||
|
versionCheck();
|
||||||
|
|
||||||
|
// auth update
|
||||||
|
useMobileAuthStore.getState().updateLastScan();
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
setBGColor(null);
|
||||||
|
}, 1 * 1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (scanned.data.status === "error") {
|
||||||
|
await scannerFeedback({
|
||||||
|
type: scanned.data.status === "error" ? "bad" : "good",
|
||||||
|
sound: true,
|
||||||
|
vibrate: true,
|
||||||
|
led: true,
|
||||||
|
});
|
||||||
|
setBGColor("bg-red-500");
|
||||||
|
setTimeout(() => {
|
||||||
|
setBGColor(null);
|
||||||
|
}, 1 * 1000);
|
||||||
|
}
|
||||||
|
setLastScan(scanned.data);
|
||||||
|
|
||||||
|
// if we change commands we want to zero out the last scanned labels
|
||||||
|
if (/^[a-zA-Z]/.test(scan.data)) {
|
||||||
|
setTagScans([]);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[scannerIdFromStore, serverIp, serverPort, setLastScan],
|
||||||
|
);
|
||||||
|
|
||||||
|
const clearScans = () => {
|
||||||
|
setTagScans([]);
|
||||||
|
};
|
||||||
|
|
||||||
|
//console.log(lastScan);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
zebraScanner.ensureProfile();
|
||||||
|
zebraScanner.startListening();
|
||||||
|
|
||||||
|
const sub = zebraScanner.addScanListener((scan) => {
|
||||||
|
//console.log("SCAN:", scan);
|
||||||
|
handleScan(scan);
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
sub.remove();
|
||||||
|
zebraScanner.stopListening();
|
||||||
|
};
|
||||||
|
}, [handleScan]);
|
||||||
|
return (
|
||||||
|
<View className={`${bgColor ?? ""} flex-1 w-screen`}>
|
||||||
|
<View>
|
||||||
|
<View style={{ alignItems: "center", margin: 10 }}>
|
||||||
|
<Text style={{ fontSize: 15, fontWeight: "600" }}>
|
||||||
|
Scanner ID: {parseInt(scannerIdFromStore || "0", 10)}
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
<Separator />
|
||||||
|
{!lastScan ? (
|
||||||
|
<View style={{ marginTop: 10, alignItems: "center" }}>
|
||||||
|
<Text className="text-xl font-bold">Ready to scan</Text>
|
||||||
|
<Text>Waiting for first scan...</Text>
|
||||||
|
</View>
|
||||||
|
) : (
|
||||||
|
<View
|
||||||
|
style={{
|
||||||
|
marginTop: 10,
|
||||||
|
alignItems: "center",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{lastScan.lines
|
||||||
|
?.filter((line) => !/^\d+@$/.test(line))
|
||||||
|
.map((i) => {
|
||||||
|
return (
|
||||||
|
<View style={{ marginTop: 10, alignItems: "center" }} key={i}>
|
||||||
|
<Text style={{ fontSize: 18, fontWeight: "600" }}>{i}</Text>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
|
<Separator className="m-2" />
|
||||||
|
<View className="flex-1 w-full px-4">
|
||||||
|
<ScannedLabelBox
|
||||||
|
labels={tagScans}
|
||||||
|
color={bgColor}
|
||||||
|
clearScan={clearScans}
|
||||||
|
/>
|
||||||
|
</View>
|
||||||
|
<View>
|
||||||
|
<GlobalFooter />
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
58
lstMobile/src/components/ScannExample.tsx
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
import { useEffect, useState } from "react";
|
||||||
|
import { Button, Text, View } from "react-native";
|
||||||
|
import { sendTcpMessage } from "../lib/tcpScan";
|
||||||
|
import { type ZebraScanResult, zebraScanner } from "../lib/ZebraScanner";
|
||||||
|
|
||||||
|
const STX = "\x02";
|
||||||
|
const ETX = "\x03";
|
||||||
|
|
||||||
|
export function ScannerTestScreen() {
|
||||||
|
const [lastResponse, setLastResponse] = useState("");
|
||||||
|
|
||||||
|
const handleScan = async (scan: ZebraScanResult) => {
|
||||||
|
console.log("Raw Zebra scan:", scan);
|
||||||
|
|
||||||
|
const scanned = scan.data;
|
||||||
|
|
||||||
|
let commandToSend = `${STX}98@${scanned}${ETX}`;
|
||||||
|
|
||||||
|
// if we are sscc we need to scan like this .... <STX>98@]C100090087710038712256<ETX>
|
||||||
|
if (scan.data.startsWith("000")) {
|
||||||
|
commandToSend = `${STX}98@]C1${scanned}${ETX}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
const something = await sendTcpMessage(commandToSend, "10.44.0.26", 50001);
|
||||||
|
// Later this is where your TCP send goes.
|
||||||
|
// const response = await sendTcpMessage(tcpMessage);
|
||||||
|
|
||||||
|
console.log("TCP response:", something);
|
||||||
|
setLastResponse(JSON.stringify(something));
|
||||||
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
zebraScanner.ensureProfile();
|
||||||
|
zebraScanner.startListening();
|
||||||
|
|
||||||
|
const sub = zebraScanner.addScanListener((scan) => {
|
||||||
|
console.log("SCAN:", scan);
|
||||||
|
handleScan(scan);
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
sub.remove();
|
||||||
|
zebraScanner.stopListening();
|
||||||
|
};
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<View style={{ padding: 20, gap: 12 }}>
|
||||||
|
<Button
|
||||||
|
title="Soft Trigger Scan"
|
||||||
|
onPress={() => zebraScanner.triggerScan()}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<Text>Waiting for scan...</Text>
|
||||||
|
<Text>{lastResponse}</Text>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
58
lstMobile/src/components/ScannedLabels.tsx
Normal file
@@ -0,0 +1,58 @@
|
|||||||
|
import { ScrollView, View } from "react-native";
|
||||||
|
import { SafeAreaView } from "react-native-safe-area-context";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { Text } from "@/components/ui/text";
|
||||||
|
import { Card } from "./ui/card";
|
||||||
|
|
||||||
|
type ScannedLabel = {
|
||||||
|
label: string;
|
||||||
|
date: Date;
|
||||||
|
};
|
||||||
|
|
||||||
|
type ScannedLabelBoxProps = {
|
||||||
|
labels: ScannedLabel[];
|
||||||
|
color: string | null;
|
||||||
|
clearScan: () => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export function ScannedLabelBox({
|
||||||
|
labels,
|
||||||
|
color,
|
||||||
|
clearScan,
|
||||||
|
}: ScannedLabelBoxProps) {
|
||||||
|
return (
|
||||||
|
<SafeAreaView className={`flex-1 w-full items-center ${color ?? ""}`}>
|
||||||
|
<View className="flex flex-col gap-2">
|
||||||
|
<Text style={{ fontSize: 18, fontWeight: "700", marginBottom: 8 }}>
|
||||||
|
Current scanned labels
|
||||||
|
</Text>
|
||||||
|
</View>
|
||||||
|
|
||||||
|
<ScrollView className="w-full flex-1">
|
||||||
|
{labels.length === 0 ? (
|
||||||
|
<Text className="text-center">
|
||||||
|
pending new labels to be scanned...
|
||||||
|
</Text>
|
||||||
|
) : (
|
||||||
|
<View className="flex items-center gap-2 w-full">
|
||||||
|
{labels.map((i, index) => (
|
||||||
|
<Card
|
||||||
|
key={`${i.label}-${index}`}
|
||||||
|
className={`p-2 border rounded items-center ${color ?? ""} w-full`}
|
||||||
|
>
|
||||||
|
<Text style={{ fontSize: 18, fontWeight: "700" }}>
|
||||||
|
{i.label} - {i.date.toString()}
|
||||||
|
</Text>
|
||||||
|
</Card>
|
||||||
|
))}
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
</ScrollView>
|
||||||
|
{/* {labels.length !== 0 && (
|
||||||
|
<Button onPress={clearScan} variant="secondary">
|
||||||
|
<Text>Clear Scans</Text>
|
||||||
|
</Button>
|
||||||
|
)} */}
|
||||||
|
</SafeAreaView>
|
||||||
|
);
|
||||||
|
}
|
||||||
40
lstMobile/src/components/UpdateFooter.tsx
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import Constants from "expo-constants";
|
||||||
|
import { Link } from "expo-router";
|
||||||
|
import { Text, View } from "react-native";
|
||||||
|
import { useServerStore } from "../hooks/useServerCheck";
|
||||||
|
|
||||||
|
export function GlobalFooter() {
|
||||||
|
const build = Constants.expoConfig?.android?.versionCode ?? 1;
|
||||||
|
const serverVersion = useServerStore((s) => s.serverVersion);
|
||||||
|
const hasUpdate =
|
||||||
|
serverVersion && serverVersion?.minSupportedVersionCode > build;
|
||||||
|
const shouldUpdate = serverVersion && serverVersion?.versionCode > build;
|
||||||
|
|
||||||
|
if (serverVersion && serverVersion?.versionCode <= build) return;
|
||||||
|
return (
|
||||||
|
<View>
|
||||||
|
<View>
|
||||||
|
{hasUpdate && (
|
||||||
|
<View className="items-center h-[75px] bg-[#EB091A]">
|
||||||
|
<Link href={"/updateScreen"}>
|
||||||
|
<Text className="h-[75px] font-medium text-base text-wrap text-center">
|
||||||
|
Critical updates pending, once you are completed with your task
|
||||||
|
please click me for instructions to update
|
||||||
|
</Text>
|
||||||
|
</Link>
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{!hasUpdate && shouldUpdate && (
|
||||||
|
<View className="bg-[#FDBA74]">
|
||||||
|
<Link href={"/updateScreen"}>
|
||||||
|
<Text className="h-[32] font-medium text-lg text-wrap text-center">
|
||||||
|
There is an update click me for instructions
|
||||||
|
</Text>
|
||||||
|
</Link>
|
||||||
|
</View>
|
||||||
|
)}
|
||||||
|
</View>
|
||||||
|
</View>
|
||||||
|
);
|
||||||
|
}
|
||||||
106
lstMobile/src/components/ui/button.tsx
Normal file
@@ -0,0 +1,106 @@
|
|||||||
|
import { TextClassContext } from '@/components/ui/text';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import { cva, type VariantProps } from 'class-variance-authority';
|
||||||
|
import { Platform, Pressable } from 'react-native';
|
||||||
|
|
||||||
|
const buttonVariants = cva(
|
||||||
|
cn(
|
||||||
|
'group shrink-0 flex-row items-center justify-center gap-2 rounded-md shadow-none',
|
||||||
|
Platform.select({
|
||||||
|
web: "focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive whitespace-nowrap outline-none transition-all focus-visible:ring-[3px] disabled:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:pointer-events-none [&_svg]:shrink-0",
|
||||||
|
})
|
||||||
|
),
|
||||||
|
{
|
||||||
|
variants: {
|
||||||
|
variant: {
|
||||||
|
default: cn(
|
||||||
|
'bg-primary active:bg-primary/90 shadow-sm shadow-black/5',
|
||||||
|
Platform.select({ web: 'hover:bg-primary/90' })
|
||||||
|
),
|
||||||
|
destructive: cn(
|
||||||
|
'bg-destructive active:bg-destructive/90 dark:bg-destructive/60 shadow-sm shadow-black/5',
|
||||||
|
Platform.select({
|
||||||
|
web: 'hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40',
|
||||||
|
})
|
||||||
|
),
|
||||||
|
outline: cn(
|
||||||
|
'border-border bg-background active:bg-accent dark:bg-input/30 dark:border-input dark:active:bg-input/50 border shadow-sm shadow-black/5',
|
||||||
|
Platform.select({
|
||||||
|
web: 'hover:bg-accent dark:hover:bg-input/50',
|
||||||
|
})
|
||||||
|
),
|
||||||
|
secondary: cn(
|
||||||
|
'bg-secondary active:bg-secondary/80 shadow-sm shadow-black/5',
|
||||||
|
Platform.select({ web: 'hover:bg-secondary/80' })
|
||||||
|
),
|
||||||
|
ghost: cn(
|
||||||
|
'active:bg-accent dark:active:bg-accent/50',
|
||||||
|
Platform.select({ web: 'hover:bg-accent dark:hover:bg-accent/50' })
|
||||||
|
),
|
||||||
|
link: '',
|
||||||
|
},
|
||||||
|
size: {
|
||||||
|
default: cn('h-10 px-4 py-2 sm:h-9', Platform.select({ web: 'has-[>svg]:px-3' })),
|
||||||
|
sm: cn('h-9 gap-1.5 rounded-md px-3 sm:h-8', Platform.select({ web: 'has-[>svg]:px-2.5' })),
|
||||||
|
lg: cn('h-11 rounded-md px-6 sm:h-10', Platform.select({ web: 'has-[>svg]:px-4' })),
|
||||||
|
icon: 'h-10 w-10 sm:h-9 sm:w-9',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
defaultVariants: {
|
||||||
|
variant: 'default',
|
||||||
|
size: 'default',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
const buttonTextVariants = cva(
|
||||||
|
cn(
|
||||||
|
'text-foreground text-sm font-medium',
|
||||||
|
Platform.select({ web: 'pointer-events-none transition-colors' })
|
||||||
|
),
|
||||||
|
{
|
||||||
|
variants: {
|
||||||
|
variant: {
|
||||||
|
default: 'text-primary-foreground',
|
||||||
|
destructive: 'text-white',
|
||||||
|
outline: cn(
|
||||||
|
'group-active:text-accent-foreground',
|
||||||
|
Platform.select({ web: 'group-hover:text-accent-foreground' })
|
||||||
|
),
|
||||||
|
secondary: 'text-secondary-foreground',
|
||||||
|
ghost: 'group-active:text-accent-foreground',
|
||||||
|
link: cn(
|
||||||
|
'text-primary group-active:underline',
|
||||||
|
Platform.select({ web: 'underline-offset-4 hover:underline group-hover:underline' })
|
||||||
|
),
|
||||||
|
},
|
||||||
|
size: {
|
||||||
|
default: '',
|
||||||
|
sm: '',
|
||||||
|
lg: '',
|
||||||
|
icon: '',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
defaultVariants: {
|
||||||
|
variant: 'default',
|
||||||
|
size: 'default',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
type ButtonProps = React.ComponentProps<typeof Pressable> & VariantProps<typeof buttonVariants>;
|
||||||
|
|
||||||
|
function Button({ className, variant, size, ...props }: ButtonProps) {
|
||||||
|
return (
|
||||||
|
<TextClassContext.Provider value={buttonTextVariants({ variant, size })}>
|
||||||
|
<Pressable
|
||||||
|
className={cn(props.disabled && 'opacity-50', buttonVariants({ variant, size }), className)}
|
||||||
|
role="button"
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
</TextClassContext.Provider>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export { Button, buttonTextVariants, buttonVariants };
|
||||||
|
export type { ButtonProps };
|
||||||
52
lstMobile/src/components/ui/card.tsx
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
import { Text, TextClassContext } from '@/components/ui/text';
|
||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import { View } from 'react-native';
|
||||||
|
|
||||||
|
function Card({ className, ...props }: React.ComponentProps<typeof View>) {
|
||||||
|
return (
|
||||||
|
<TextClassContext.Provider value="text-card-foreground">
|
||||||
|
<View
|
||||||
|
className={cn(
|
||||||
|
'bg-card border-border flex flex-col gap-6 rounded-xl border py-6 shadow-sm shadow-black/5',
|
||||||
|
className
|
||||||
|
)}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
</TextClassContext.Provider>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function CardHeader({ className, ...props }: React.ComponentProps<typeof View>) {
|
||||||
|
return <View className={cn('flex flex-col gap-1.5 px-6', className)} {...props} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
function CardTitle({
|
||||||
|
className,
|
||||||
|
...props
|
||||||
|
}: React.ComponentProps<typeof Text>) {
|
||||||
|
return (
|
||||||
|
<Text
|
||||||
|
role="heading"
|
||||||
|
aria-level={3}
|
||||||
|
className={cn('font-semibold leading-none', className)}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function CardDescription({
|
||||||
|
className,
|
||||||
|
...props
|
||||||
|
}: React.ComponentProps<typeof Text>) {
|
||||||
|
return <Text className={cn('text-muted-foreground text-sm', className)} {...props} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
function CardContent({ className, ...props }: React.ComponentProps<typeof View>) {
|
||||||
|
return <View className={cn('px-6', className)} {...props} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
function CardFooter({ className, ...props }: React.ComponentProps<typeof View>) {
|
||||||
|
return <View className={cn('flex flex-row items-center px-6', className)} {...props} />;
|
||||||
|
}
|
||||||
|
|
||||||
|
export { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle };
|
||||||
29
lstMobile/src/components/ui/input.tsx
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import { Platform, TextInput } from 'react-native';
|
||||||
|
|
||||||
|
function Input({ className, ...props }: React.ComponentProps<typeof TextInput> & React.RefAttributes<TextInput>) {
|
||||||
|
return (
|
||||||
|
<TextInput
|
||||||
|
className={cn(
|
||||||
|
'dark:bg-input/30 border-input bg-background text-foreground flex h-10 w-full min-w-0 flex-row items-center rounded-md border px-3 py-1 text-base leading-5 shadow-sm shadow-black/5 sm:h-9',
|
||||||
|
props.editable === false &&
|
||||||
|
cn(
|
||||||
|
'opacity-50',
|
||||||
|
Platform.select({ web: 'disabled:pointer-events-none disabled:cursor-not-allowed' })
|
||||||
|
),
|
||||||
|
Platform.select({
|
||||||
|
web: cn(
|
||||||
|
'placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground outline-none transition-[color,box-shadow] md:text-sm',
|
||||||
|
'focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]',
|
||||||
|
'aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive'
|
||||||
|
),
|
||||||
|
native: 'placeholder:text-muted-foreground/50',
|
||||||
|
}),
|
||||||
|
className
|
||||||
|
)}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export { Input };
|
||||||
24
lstMobile/src/components/ui/separator.tsx
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import * as SeparatorPrimitive from '@rn-primitives/separator';
|
||||||
|
|
||||||
|
function Separator({
|
||||||
|
className,
|
||||||
|
orientation = 'horizontal',
|
||||||
|
decorative = true,
|
||||||
|
...props
|
||||||
|
}: React.ComponentProps<typeof SeparatorPrimitive.Root>) {
|
||||||
|
return (
|
||||||
|
<SeparatorPrimitive.Root
|
||||||
|
decorative={decorative}
|
||||||
|
orientation={orientation}
|
||||||
|
className={cn(
|
||||||
|
'bg-border shrink-0',
|
||||||
|
orientation === 'horizontal' ? 'h-[1px] w-full' : 'h-full w-[1px]',
|
||||||
|
className
|
||||||
|
)}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export { Separator };
|
||||||
88
lstMobile/src/components/ui/text.tsx
Normal file
@@ -0,0 +1,88 @@
|
|||||||
|
import { cn } from '@/lib/utils';
|
||||||
|
import * as Slot from '@rn-primitives/slot';
|
||||||
|
import { cva, type VariantProps } from 'class-variance-authority';
|
||||||
|
import * as React from 'react';
|
||||||
|
import { Platform, Text as RNText, type Role } from 'react-native';
|
||||||
|
|
||||||
|
const textVariants = cva(
|
||||||
|
cn(
|
||||||
|
'text-foreground text-base',
|
||||||
|
Platform.select({
|
||||||
|
web: 'select-text',
|
||||||
|
})
|
||||||
|
),
|
||||||
|
{
|
||||||
|
variants: {
|
||||||
|
variant: {
|
||||||
|
default: '',
|
||||||
|
h1: cn(
|
||||||
|
'text-center text-4xl font-extrabold tracking-tight',
|
||||||
|
Platform.select({ web: 'scroll-m-20 text-balance' })
|
||||||
|
),
|
||||||
|
h2: cn(
|
||||||
|
'border-border border-b pb-2 text-3xl font-semibold tracking-tight',
|
||||||
|
Platform.select({ web: 'scroll-m-20 first:mt-0' })
|
||||||
|
),
|
||||||
|
h3: cn('text-2xl font-semibold tracking-tight', Platform.select({ web: 'scroll-m-20' })),
|
||||||
|
h4: cn('text-xl font-semibold tracking-tight', Platform.select({ web: 'scroll-m-20' })),
|
||||||
|
p: 'mt-3 leading-7 sm:mt-6',
|
||||||
|
blockquote: 'mt-4 border-l-2 pl-3 italic sm:mt-6 sm:pl-6',
|
||||||
|
code: cn(
|
||||||
|
'bg-muted relative rounded px-[0.3rem] py-[0.2rem] font-mono text-sm font-semibold'
|
||||||
|
),
|
||||||
|
lead: 'text-muted-foreground text-xl',
|
||||||
|
large: 'text-lg font-semibold',
|
||||||
|
small: 'text-sm font-medium leading-none',
|
||||||
|
muted: 'text-muted-foreground text-sm',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
defaultVariants: {
|
||||||
|
variant: 'default',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
type TextVariantProps = VariantProps<typeof textVariants>;
|
||||||
|
|
||||||
|
type TextVariant = NonNullable<TextVariantProps['variant']>;
|
||||||
|
|
||||||
|
const ROLE: Partial<Record<TextVariant, Role>> = {
|
||||||
|
h1: 'heading',
|
||||||
|
h2: 'heading',
|
||||||
|
h3: 'heading',
|
||||||
|
h4: 'heading',
|
||||||
|
blockquote: Platform.select({ web: 'blockquote' as Role }),
|
||||||
|
code: Platform.select({ web: 'code' as Role }),
|
||||||
|
};
|
||||||
|
|
||||||
|
const ARIA_LEVEL: Partial<Record<TextVariant, string>> = {
|
||||||
|
h1: '1',
|
||||||
|
h2: '2',
|
||||||
|
h3: '3',
|
||||||
|
h4: '4',
|
||||||
|
};
|
||||||
|
|
||||||
|
const TextClassContext = React.createContext<string | undefined>(undefined);
|
||||||
|
|
||||||
|
function Text({
|
||||||
|
className,
|
||||||
|
asChild = false,
|
||||||
|
variant = 'default',
|
||||||
|
...props
|
||||||
|
}: React.ComponentProps<typeof RNText> &
|
||||||
|
TextVariantProps & {
|
||||||
|
asChild?: boolean;
|
||||||
|
}) {
|
||||||
|
const textClass = React.useContext(TextClassContext);
|
||||||
|
const Component = asChild ? Slot.Text : RNText;
|
||||||
|
return (
|
||||||
|
<Component
|
||||||
|
className={cn(textVariants({ variant }), textClass, className)}
|
||||||
|
role={variant ? ROLE[variant] : undefined}
|
||||||
|
aria-level={variant ? ARIA_LEVEL[variant] : undefined}
|
||||||
|
{...props}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export { Text, TextClassContext };
|
||||||
111
lstMobile/src/hooks/useAppStartup.tsx
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
import axios from "axios";
|
||||||
|
import Constants from "expo-constants";
|
||||||
|
import { useEffect, useRef, useState } from "react";
|
||||||
|
import { devDelay } from "../lib/devMode";
|
||||||
|
import { versionCheck } from "../lib/versionValidation";
|
||||||
|
import { useAppStore } from "./useAppStore";
|
||||||
|
import { useServerStore } from "./useServerCheck";
|
||||||
|
|
||||||
|
type StartupStatus =
|
||||||
|
| "loading"
|
||||||
|
| "validating"
|
||||||
|
| "scannerMode"
|
||||||
|
| "normalScanner"
|
||||||
|
| "checkingUpdates"
|
||||||
|
| "opening"
|
||||||
|
| "error";
|
||||||
|
|
||||||
|
export function useAppStartup() {
|
||||||
|
const [ready, setReady] = useState(false);
|
||||||
|
const [status, setStatus] = useState<StartupStatus>("loading");
|
||||||
|
const [startupRoute, setStartupRoute] = useState<string | null>(null);
|
||||||
|
|
||||||
|
const hasRunKey = useRef<string | null>(null);
|
||||||
|
|
||||||
|
const hasHydrated = useAppStore((s) => s.hasHydrated);
|
||||||
|
const serverPort = useAppStore((s) => s.serverPort);
|
||||||
|
const serverIp = useAppStore((s) => s.serverIp);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!hasHydrated) {
|
||||||
|
setStatus("loading");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const runKey = `${serverIp}:${serverPort}`;
|
||||||
|
|
||||||
|
if (hasRunKey.current === runKey) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
hasRunKey.current = runKey;
|
||||||
|
|
||||||
|
let cancelled = false;
|
||||||
|
|
||||||
|
const startup = async () => {
|
||||||
|
try {
|
||||||
|
setReady(false);
|
||||||
|
setStartupRoute(null);
|
||||||
|
|
||||||
|
await devDelay(1500);
|
||||||
|
if (cancelled) return;
|
||||||
|
|
||||||
|
setStatus("validating");
|
||||||
|
await devDelay(1500);
|
||||||
|
if (cancelled) return;
|
||||||
|
|
||||||
|
const hasValidSetup = useAppStore.getState().hasValidSetup;
|
||||||
|
|
||||||
|
if (!hasValidSetup()) {
|
||||||
|
setStartupRoute("/setup");
|
||||||
|
setReady(true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await versionCheck();
|
||||||
|
|
||||||
|
setStatus("scannerMode");
|
||||||
|
await devDelay(1500);
|
||||||
|
if (cancelled) return;
|
||||||
|
|
||||||
|
if (parseInt(serverPort || "0", 10) >= 50000) {
|
||||||
|
setStatus("normalScanner");
|
||||||
|
await devDelay(1500);
|
||||||
|
|
||||||
|
setStartupRoute("/scanner");
|
||||||
|
setReady(true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
setStatus("checkingUpdates");
|
||||||
|
console.log("checking updates");
|
||||||
|
await devDelay(1500);
|
||||||
|
if (cancelled) return;
|
||||||
|
|
||||||
|
setStatus("opening");
|
||||||
|
console.log("opening");
|
||||||
|
await devDelay(1500);
|
||||||
|
if (cancelled) return;
|
||||||
|
|
||||||
|
setStartupRoute("/(tabs)/scanner");
|
||||||
|
console.log("scanner");
|
||||||
|
setReady(true);
|
||||||
|
} catch (error) {
|
||||||
|
console.log("Startup error:", error);
|
||||||
|
setStatus("error");
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
startup();
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
cancelled = true;
|
||||||
|
};
|
||||||
|
}, [hasHydrated, serverIp, serverPort]);
|
||||||
|
|
||||||
|
return {
|
||||||
|
ready,
|
||||||
|
startupRoute,
|
||||||
|
status,
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -33,10 +33,8 @@ type AppActions = {
|
|||||||
setValidationStatus: (status: ValidationStatus, validatedAt?: string) => void;
|
setValidationStatus: (status: ValidationStatus, validatedAt?: string) => void;
|
||||||
setAppVersion: (value?: string) => void;
|
setAppVersion: (value?: string) => void;
|
||||||
setHasHydrated: (value: boolean) => void;
|
setHasHydrated: (value: boolean) => void;
|
||||||
|
|
||||||
updateAppState: (updates: Partial<AppState>) => void;
|
updateAppState: (updates: Partial<AppState>) => void;
|
||||||
resetApp: () => void;
|
resetApp: () => void;
|
||||||
|
|
||||||
hasValidSetup: () => boolean;
|
hasValidSetup: () => boolean;
|
||||||
canEnterApp: () => boolean;
|
canEnterApp: () => boolean;
|
||||||
getServerUrl: () => string;
|
getServerUrl: () => string;
|
||||||
@@ -50,15 +48,11 @@ const defaultAppState: AppState = {
|
|||||||
scannerId: "0001",
|
scannerId: "0001",
|
||||||
stageId: undefined,
|
stageId: undefined,
|
||||||
deviceName: undefined,
|
deviceName: undefined,
|
||||||
|
|
||||||
setupCompleted: false,
|
setupCompleted: false,
|
||||||
isRegistered: false,
|
isRegistered: false,
|
||||||
|
|
||||||
lastValidationStatus: "idle",
|
lastValidationStatus: "idle",
|
||||||
lastValidationAt: undefined,
|
lastValidationAt: undefined,
|
||||||
|
|
||||||
appVersion: undefined,
|
appVersion: undefined,
|
||||||
|
|
||||||
hasHydrated: false,
|
hasHydrated: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -74,28 +68,23 @@ export const useAppStore = create<AppStore>()(
|
|||||||
setDeviceName: (value) => set({ deviceName: value }),
|
setDeviceName: (value) => set({ deviceName: value }),
|
||||||
setSetupCompleted: (value) => set({ setupCompleted: value }),
|
setSetupCompleted: (value) => set({ setupCompleted: value }),
|
||||||
setIsRegistered: (value) => set({ isRegistered: value }),
|
setIsRegistered: (value) => set({ isRegistered: value }),
|
||||||
|
|
||||||
setValidationStatus: (status, validatedAt) =>
|
setValidationStatus: (status, validatedAt) =>
|
||||||
set({
|
set({
|
||||||
lastValidationStatus: status,
|
lastValidationStatus: status,
|
||||||
lastValidationAt: validatedAt,
|
lastValidationAt: validatedAt,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
setAppVersion: (value) => set({ appVersion: value }),
|
setAppVersion: (value) => set({ appVersion: value }),
|
||||||
setHasHydrated: (value) => set({ hasHydrated: value }),
|
setHasHydrated: (value) => set({ hasHydrated: value }),
|
||||||
|
|
||||||
updateAppState: (updates) =>
|
updateAppState: (updates) =>
|
||||||
set((state) => ({
|
set((state) => ({
|
||||||
...state,
|
...state,
|
||||||
...updates,
|
...updates,
|
||||||
})),
|
})),
|
||||||
|
|
||||||
resetApp: () =>
|
resetApp: () =>
|
||||||
set({
|
set({
|
||||||
...defaultAppState,
|
...defaultAppState,
|
||||||
hasHydrated: true,
|
hasHydrated: true,
|
||||||
}),
|
}),
|
||||||
|
|
||||||
hasValidSetup: () => {
|
hasValidSetup: () => {
|
||||||
const state = get();
|
const state = get();
|
||||||
return Boolean(
|
return Boolean(
|
||||||
@@ -104,7 +93,6 @@ export const useAppStore = create<AppStore>()(
|
|||||||
state.setupCompleted,
|
state.setupCompleted,
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|
||||||
canEnterApp: () => {
|
canEnterApp: () => {
|
||||||
const state = get();
|
const state = get();
|
||||||
return Boolean(
|
return Boolean(
|
||||||
|
|||||||
37
lstMobile/src/hooks/useDeviceCheck.tsx
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
import { useEffect, useRef, useState } from "react";
|
||||||
|
import { AppState, type AppStateStatus } from "react-native";
|
||||||
|
import { useMobileAuthStore } from "./useMobileAuth";
|
||||||
|
|
||||||
|
export default function useDeviceLock() {
|
||||||
|
const [appState, setAppState] = useState<AppStateStatus>(
|
||||||
|
AppState.currentState,
|
||||||
|
);
|
||||||
|
const appStateRef = useRef<AppStateStatus>(AppState.currentState);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const subscription = AppState.addEventListener("change", (nextAppState) => {
|
||||||
|
const previousAppState = appStateRef.current;
|
||||||
|
|
||||||
|
const wasActive = previousAppState === "active";
|
||||||
|
|
||||||
|
// if the we see aggressive locking then we should remove inactive.
|
||||||
|
const isNowInactive =
|
||||||
|
nextAppState === "background" || nextAppState === "inactive";
|
||||||
|
|
||||||
|
if (wasActive && isNowInactive) {
|
||||||
|
const auth = useMobileAuthStore.getState();
|
||||||
|
|
||||||
|
if (auth.shouldLockForIdle()) {
|
||||||
|
auth.lock();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
appStateRef.current = nextAppState;
|
||||||
|
setAppState(nextAppState);
|
||||||
|
});
|
||||||
|
|
||||||
|
return () => subscription.remove();
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return appState;
|
||||||
|
}
|
||||||
52
lstMobile/src/hooks/useMobileAuth.ts
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
import { create } from "zustand";
|
||||||
|
|
||||||
|
const ONE_HOUR = 1000 * 60 * 60;
|
||||||
|
|
||||||
|
type MobileUser = {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
role: "user" | "lead" | "manager" | "admin";
|
||||||
|
excludedCommand: string[];
|
||||||
|
scannerId: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
type AuthState = {
|
||||||
|
user: MobileUser | null;
|
||||||
|
isUnlocked: boolean;
|
||||||
|
lastScanAt: number | null;
|
||||||
|
|
||||||
|
setUser: (user: MobileUser) => void;
|
||||||
|
updateLastScan: () => void;
|
||||||
|
lock: () => void;
|
||||||
|
logout: () => void;
|
||||||
|
shouldLockForIdle: () => boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useMobileAuthStore = create<AuthState>((set, get) => ({
|
||||||
|
user: null,
|
||||||
|
isUnlocked: false,
|
||||||
|
lastScanAt: null,
|
||||||
|
|
||||||
|
setUser: (user) =>
|
||||||
|
set({
|
||||||
|
user,
|
||||||
|
isUnlocked: true,
|
||||||
|
lastScanAt: Date.now(),
|
||||||
|
}),
|
||||||
|
updateLastScan: () => set({ lastScanAt: Date.now() }),
|
||||||
|
lock: () => set({ isUnlocked: false }),
|
||||||
|
|
||||||
|
logout: () =>
|
||||||
|
set({
|
||||||
|
user: null,
|
||||||
|
isUnlocked: false,
|
||||||
|
lastScanAt: null,
|
||||||
|
}),
|
||||||
|
shouldLockForIdle: () => {
|
||||||
|
const lastScanAt = get().lastScanAt;
|
||||||
|
|
||||||
|
if (!lastScanAt) return true;
|
||||||
|
|
||||||
|
return Date.now() - lastScanAt > ONE_HOUR;
|
||||||
|
},
|
||||||
|
}));
|
||||||
33
lstMobile/src/hooks/useScannerStore.ts
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
import { create } from "zustand";
|
||||||
|
|
||||||
|
type LastScan = {
|
||||||
|
terminalId?: string;
|
||||||
|
screen?: string;
|
||||||
|
prompt?: string;
|
||||||
|
message?: string;
|
||||||
|
status: "success" | "error" | "location" | "unknown";
|
||||||
|
lines?: string[];
|
||||||
|
timestamp?: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
type ScannerStore = {
|
||||||
|
lastScan: LastScan | null;
|
||||||
|
setLastScan: (scan: LastScan | null) => void;
|
||||||
|
clearLastScan: () => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useScannerStore = create<ScannerStore>((set) => ({
|
||||||
|
lastScan: null,
|
||||||
|
|
||||||
|
setLastScan: (scan) =>
|
||||||
|
set({
|
||||||
|
lastScan: scan
|
||||||
|
? {
|
||||||
|
...scan,
|
||||||
|
timestamp: Date.now(),
|
||||||
|
}
|
||||||
|
: null,
|
||||||
|
}),
|
||||||
|
|
||||||
|
clearLastScan: () => set({ lastScan: null }),
|
||||||
|
}));
|
||||||
29
lstMobile/src/hooks/useServerCheck.ts
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
import { create } from "zustand";
|
||||||
|
|
||||||
|
type ServerVersion = {
|
||||||
|
packageName: string;
|
||||||
|
versionName: string;
|
||||||
|
versionCode: number;
|
||||||
|
minSupportedVersionCode: number;
|
||||||
|
downloadUrl: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
type AppState = {
|
||||||
|
serverVersion: ServerVersion | null;
|
||||||
|
|
||||||
|
setServerVersion: (data: ServerVersion) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const useServerStore = create<AppState>((set, get) => ({
|
||||||
|
serverVersion: null,
|
||||||
|
hasUpdate: () => {
|
||||||
|
const v = get().serverVersion;
|
||||||
|
if (!v) return false;
|
||||||
|
|
||||||
|
return v.versionCode < v.minSupportedVersionCode;
|
||||||
|
},
|
||||||
|
setServerVersion: (data) =>
|
||||||
|
set(() => ({
|
||||||
|
serverVersion: data,
|
||||||
|
})),
|
||||||
|
}));
|
||||||
40
lstMobile/src/lib/ZebraScanner.ts
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import {
|
||||||
|
type EmitterSubscription,
|
||||||
|
NativeEventEmitter,
|
||||||
|
NativeModules,
|
||||||
|
} from "react-native";
|
||||||
|
|
||||||
|
const { ZebraScanner } = NativeModules;
|
||||||
|
|
||||||
|
const scannerEmitter = new NativeEventEmitter(ZebraScanner);
|
||||||
|
|
||||||
|
export type ZebraScanResult = {
|
||||||
|
data: string;
|
||||||
|
labelType?: string;
|
||||||
|
source?: string;
|
||||||
|
timestamp: number;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const zebraScanner = {
|
||||||
|
startListening() {
|
||||||
|
ZebraScanner.startListening();
|
||||||
|
},
|
||||||
|
|
||||||
|
stopListening() {
|
||||||
|
ZebraScanner.stopListening();
|
||||||
|
},
|
||||||
|
|
||||||
|
triggerScan() {
|
||||||
|
ZebraScanner.triggerScan();
|
||||||
|
},
|
||||||
|
|
||||||
|
ensureProfile() {
|
||||||
|
ZebraScanner.ensureProfile();
|
||||||
|
},
|
||||||
|
|
||||||
|
addScanListener(
|
||||||
|
callback: (scan: ZebraScanResult) => void,
|
||||||
|
): EmitterSubscription {
|
||||||
|
return scannerEmitter.addListener("barcodeScanned", callback);
|
||||||
|
},
|
||||||
|
};
|
||||||
13
lstMobile/src/lib/auth.roleCheck.ts
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
const roleRank = {
|
||||||
|
user: 1,
|
||||||
|
lead: 2,
|
||||||
|
manager: 3,
|
||||||
|
admin: 4,
|
||||||
|
} as const;
|
||||||
|
|
||||||
|
export function hasMobileRole(
|
||||||
|
userRole: keyof typeof roleRank,
|
||||||
|
requiredRole: keyof typeof roleRank,
|
||||||
|
) {
|
||||||
|
return roleRank[userRole] >= roleRank[requiredRole];
|
||||||
|
}
|
||||||
40
lstMobile/src/lib/feedbackScan.ts
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import { createAudioPlayer } from "expo-audio";
|
||||||
|
import * as Haptics from "expo-haptics";
|
||||||
|
|
||||||
|
export type ScanFeedback = {
|
||||||
|
type: "good" | "bad" | "scan";
|
||||||
|
sound?: boolean;
|
||||||
|
vibrate?: boolean;
|
||||||
|
led?: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
const scan = createAudioPlayer(require("../../assets/sounds/scan.wav"));
|
||||||
|
const goodSound = createAudioPlayer(require("../../assets/sounds/good.wav"));
|
||||||
|
const badSound = createAudioPlayer(require("../../assets/sounds/bad.wav"));
|
||||||
|
|
||||||
|
export async function scannerFeedback({
|
||||||
|
type,
|
||||||
|
sound = true,
|
||||||
|
vibrate = true,
|
||||||
|
led = true,
|
||||||
|
}: ScanFeedback) {
|
||||||
|
if (sound) {
|
||||||
|
const player =
|
||||||
|
type === "scan" ? scan : type === "good" ? goodSound : badSound;
|
||||||
|
player.seekTo(0);
|
||||||
|
player.play();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (vibrate) {
|
||||||
|
await Haptics.notificationAsync(
|
||||||
|
type === "good" || type === "scan"
|
||||||
|
? Haptics.NotificationFeedbackType.Success
|
||||||
|
: Haptics.NotificationFeedbackType.Error,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (led) {
|
||||||
|
// Zebra LED hook goes here
|
||||||
|
// More below 👇
|
||||||
|
}
|
||||||
|
}
|
||||||
292
lstMobile/src/lib/tcpScan.ts
Normal file
@@ -0,0 +1,292 @@
|
|||||||
|
import TcpSocket from "react-native-tcp-socket";
|
||||||
|
|
||||||
|
// const STX = "\x02";
|
||||||
|
// const ETX = "\x03";
|
||||||
|
|
||||||
|
type TcpResponse = {
|
||||||
|
success: boolean;
|
||||||
|
message: string;
|
||||||
|
data: string[];
|
||||||
|
};
|
||||||
|
|
||||||
|
type ScannerEvent = {
|
||||||
|
scannerId?: string;
|
||||||
|
commandDescription?: string;
|
||||||
|
prompt?: string;
|
||||||
|
message?: string;
|
||||||
|
status: "success" | "error" | "location" | "unknown" | "scan";
|
||||||
|
lines?: string[];
|
||||||
|
};
|
||||||
|
|
||||||
|
// const ERROR_MESSAGES = [
|
||||||
|
// "Invalid barcode",
|
||||||
|
// "Already scanned",
|
||||||
|
// "Not on stock",
|
||||||
|
// "Article tolerance for consolidation not satisfied.",
|
||||||
|
// ];
|
||||||
|
|
||||||
|
const ERROR_KEYWORDS = [
|
||||||
|
"invalid barcode",
|
||||||
|
"already",
|
||||||
|
"not on stock",
|
||||||
|
"article tolerance",
|
||||||
|
"unloaded",
|
||||||
|
"delivered",
|
||||||
|
"blocked",
|
||||||
|
];
|
||||||
|
|
||||||
|
// function parseErpResponse(buffer: Buffer) {
|
||||||
|
// const text = buffer
|
||||||
|
// .toString("utf8")
|
||||||
|
// .replace(/\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~]|#[0-9A-Za-z])/g, "")
|
||||||
|
// .replace(/\x02/g, "")
|
||||||
|
// .replace(/\x03/g, "")
|
||||||
|
// .trim();
|
||||||
|
|
||||||
|
// const noHeader = text.replace(/^\d+@/, "");
|
||||||
|
// console.log(text);
|
||||||
|
// if (!noHeader.includes("Scan:")) {
|
||||||
|
// return {
|
||||||
|
// raw: text,
|
||||||
|
// type: "error",
|
||||||
|
// message: noHeader.trim(),
|
||||||
|
// lines: [noHeader.trim()],
|
||||||
|
// };
|
||||||
|
// }
|
||||||
|
|
||||||
|
// const [actionPart, scanPart = ""] = noHeader.split("Scan:");
|
||||||
|
// const action = actionPart.trim();
|
||||||
|
// const scanClean = scanPart.trim();
|
||||||
|
|
||||||
|
// const successMatch = scanClean.match(/^(.*?)\s+V$/);
|
||||||
|
|
||||||
|
// if (successMatch) {
|
||||||
|
// const prompt = successMatch[1].trim();
|
||||||
|
|
||||||
|
// return {
|
||||||
|
// raw: text,
|
||||||
|
// type: "success",
|
||||||
|
// action,
|
||||||
|
// prompt,
|
||||||
|
// status: "V",
|
||||||
|
// lines: [action, prompt, "V"],
|
||||||
|
// };
|
||||||
|
// }
|
||||||
|
|
||||||
|
// // // Handles: "Production lotInvalid barcode"
|
||||||
|
// // const knownErrors = [
|
||||||
|
// // "Invalid barcode",
|
||||||
|
// // "Invalid machine",
|
||||||
|
// // "Not on stock",
|
||||||
|
// // "Article tolerance for consolidation not satisfied",
|
||||||
|
// // ].sort((a, b) => b.length - a.length);
|
||||||
|
|
||||||
|
// // const foundError = knownErrors.find((err) => scanClean.includes(err));
|
||||||
|
|
||||||
|
// // if (foundError) {
|
||||||
|
// // const prompt = scanClean.replace(foundError, "").trim();
|
||||||
|
|
||||||
|
// // return {
|
||||||
|
// // raw: text,
|
||||||
|
// // type: "error",
|
||||||
|
// // action,
|
||||||
|
// // prompt,
|
||||||
|
// // message: foundError,
|
||||||
|
// // lines: [action, prompt, foundError].filter(Boolean),
|
||||||
|
// // };
|
||||||
|
// // }
|
||||||
|
|
||||||
|
// // return {
|
||||||
|
// // raw: text,
|
||||||
|
// // type: "pending",
|
||||||
|
// // action,
|
||||||
|
// // prompt: scanClean,
|
||||||
|
// // lines: [action, scanClean].filter(Boolean),
|
||||||
|
// // };
|
||||||
|
|
||||||
|
// const unitMatch = scanClean.match(/^(Unit\s+\d+\/\d+)(.*)$/);
|
||||||
|
|
||||||
|
// if (unitMatch) {
|
||||||
|
// const prompt = unitMatch[1].trim(); // "Unit 1/4"
|
||||||
|
// const remainder = unitMatch[2].trim(); // everything after
|
||||||
|
|
||||||
|
// // SUCCESS
|
||||||
|
// if (remainder === "V") {
|
||||||
|
// return {
|
||||||
|
// raw: text,
|
||||||
|
// type: "success",
|
||||||
|
// action,
|
||||||
|
// prompt,
|
||||||
|
// status: "V",
|
||||||
|
// lines: [action, prompt, "V"],
|
||||||
|
// };
|
||||||
|
// }
|
||||||
|
|
||||||
|
// // Known ERP errors
|
||||||
|
// const knownErrors = [
|
||||||
|
// "Invalid barcode",
|
||||||
|
// "Invalid machine",
|
||||||
|
// "Not on stock",
|
||||||
|
// "Article tolerance for consolidation not satisfied",
|
||||||
|
// ];
|
||||||
|
|
||||||
|
// const foundError = knownErrors.find((err) =>
|
||||||
|
// remainder.toLowerCase().includes(err.toLowerCase()),
|
||||||
|
// );
|
||||||
|
|
||||||
|
// if (foundError) {
|
||||||
|
// return {
|
||||||
|
// raw: text,
|
||||||
|
// type: "error",
|
||||||
|
// action,
|
||||||
|
// prompt,
|
||||||
|
// message: foundError,
|
||||||
|
// lines: [action, prompt, foundError],
|
||||||
|
// };
|
||||||
|
// }
|
||||||
|
|
||||||
|
// if (remainder) {
|
||||||
|
// return {
|
||||||
|
// raw: text,
|
||||||
|
// type: "prompt",
|
||||||
|
// action,
|
||||||
|
// prompt,
|
||||||
|
// message: remainder,
|
||||||
|
// lines: [action, prompt, remainder],
|
||||||
|
// };
|
||||||
|
// }
|
||||||
|
|
||||||
|
// return {
|
||||||
|
// raw: text,
|
||||||
|
// type: "pending",
|
||||||
|
// action,
|
||||||
|
// prompt,
|
||||||
|
// lines: [action, prompt],
|
||||||
|
// };
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
|
const parseScannerText = (buffer: Buffer) => {
|
||||||
|
const text = buffer.toString("utf8");
|
||||||
|
|
||||||
|
return (
|
||||||
|
text
|
||||||
|
// remove cursor movement like ESC[122C, ESC[2;1H, ESC[8q
|
||||||
|
.replace(/\x1B\[[0-9;]*[A-Za-z]/g, "\n")
|
||||||
|
|
||||||
|
// remove other ANSI sequences like ESC#5
|
||||||
|
.replace(/\x1B#[0-9]/g, "\n")
|
||||||
|
|
||||||
|
// normalize carriage returns
|
||||||
|
.replace(/\r/g, "\n")
|
||||||
|
|
||||||
|
// split into clean lines
|
||||||
|
.split(/\n+/)
|
||||||
|
|
||||||
|
// clean each line
|
||||||
|
.map((line) => line.trim())
|
||||||
|
|
||||||
|
// remove blanks
|
||||||
|
.filter(Boolean)
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const parseScannerEvent = (lines: string[]): ScannerEvent => {
|
||||||
|
const scannerId = lines[0];
|
||||||
|
const messageLines = lines.slice(1);
|
||||||
|
const message = messageLines.at(-1);
|
||||||
|
|
||||||
|
const commandDescription = messageLines.find((x) => /^\d+\s+/.test(x));
|
||||||
|
const prompt = messageLines.find((x) => /^Scan:/i.test(x));
|
||||||
|
|
||||||
|
let status: ScannerEvent["status"] = "unknown";
|
||||||
|
|
||||||
|
const msg = message?.toLowerCase() ?? "";
|
||||||
|
|
||||||
|
if (msg === "v") status = "success";
|
||||||
|
else if (msg && ERROR_KEYWORDS.some((keyword) => msg.includes(keyword)))
|
||||||
|
status = "error";
|
||||||
|
else if (msg?.includes("scan")) status = "success";
|
||||||
|
// everything else will just be a location
|
||||||
|
else if (commandDescription?.includes("Relocate")) status = "location";
|
||||||
|
|
||||||
|
// TODO: split command description and use the command id next to description for sorting.
|
||||||
|
return {
|
||||||
|
scannerId,
|
||||||
|
commandDescription,
|
||||||
|
prompt,
|
||||||
|
message,
|
||||||
|
status,
|
||||||
|
lines,
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sends a Zebra-style TCP message:
|
||||||
|
* <STX>98@{scanned}<ETX>
|
||||||
|
*/
|
||||||
|
export async function sendTcpMessage(
|
||||||
|
command: string,
|
||||||
|
host: string,
|
||||||
|
port: number,
|
||||||
|
timeoutMs = 5000,
|
||||||
|
): Promise<TcpResponse> {
|
||||||
|
return new Promise((resolve) => {
|
||||||
|
const responses: any = [];
|
||||||
|
|
||||||
|
const client = TcpSocket.createConnection({ host, port }, () => {
|
||||||
|
//console.log("Sending TCP (visible):", `${command}`);
|
||||||
|
|
||||||
|
client.write(command);
|
||||||
|
});
|
||||||
|
|
||||||
|
const timeout = setTimeout(() => {
|
||||||
|
client.destroy();
|
||||||
|
|
||||||
|
resolve({
|
||||||
|
success: false,
|
||||||
|
message: "TCP timeout",
|
||||||
|
data: responses,
|
||||||
|
});
|
||||||
|
}, timeoutMs);
|
||||||
|
|
||||||
|
client.on("data", (data) => {
|
||||||
|
//console.log("TCP received:", text);
|
||||||
|
const parsed = parseScannerText(data);
|
||||||
|
//console.log("scanned:", parsed);
|
||||||
|
|
||||||
|
//responses.push(parsed);
|
||||||
|
|
||||||
|
const cleaned = parseScannerEvent(parsed);
|
||||||
|
|
||||||
|
//console.log(responses);
|
||||||
|
clearTimeout(timeout);
|
||||||
|
resolve({
|
||||||
|
success: true,
|
||||||
|
message: "TCP Response",
|
||||||
|
data: cleaned as any,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
client.on("error", (err) => {
|
||||||
|
clearTimeout(timeout);
|
||||||
|
client.destroy();
|
||||||
|
|
||||||
|
resolve({
|
||||||
|
success: false,
|
||||||
|
message: err.message,
|
||||||
|
data: ["Error", "Please try again"],
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
client.on("close", () => {
|
||||||
|
clearTimeout(timeout);
|
||||||
|
|
||||||
|
resolve({
|
||||||
|
success: true,
|
||||||
|
message: "TCP complete",
|
||||||
|
data: ["Error", "Please try again"],
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
81
lstMobile/src/lib/theme.ts
Normal file
@@ -0,0 +1,81 @@
|
|||||||
|
import { DarkTheme, DefaultTheme, type Theme } from "@react-navigation/native";
|
||||||
|
|
||||||
|
export const THEME = {
|
||||||
|
light: {
|
||||||
|
background: "hsl(0 0% 100%)",
|
||||||
|
foreground: "hsl(0 0% 3.9%)",
|
||||||
|
card: "hsl(0 0% 100%)",
|
||||||
|
cardForeground: "hsl(0 0% 3.9%)",
|
||||||
|
popover: "hsl(0 0% 100%)",
|
||||||
|
popoverForeground: "hsl(0 0% 3.9%)",
|
||||||
|
primary: "hsl(0 0% 9%)",
|
||||||
|
primaryForeground: "hsl(0 0% 98%)",
|
||||||
|
secondary: "hsl(0 0% 96.1%)",
|
||||||
|
secondaryForeground: "hsl(0 0% 9%)",
|
||||||
|
muted: "hsl(0 0% 96.1%)",
|
||||||
|
mutedForeground: "hsl(0 0% 45.1%)",
|
||||||
|
accent: "hsl(0 0% 96.1%)",
|
||||||
|
accentForeground: "hsl(0 0% 9%)",
|
||||||
|
destructive: "hsl(0 84.2% 60.2%)",
|
||||||
|
border: "hsl(0 0% 89.8%)",
|
||||||
|
input: "hsl(0 0% 89.8%)",
|
||||||
|
ring: "hsl(0 0% 63%)",
|
||||||
|
radius: "0.625rem",
|
||||||
|
chart1: "hsl(12 76% 61%)",
|
||||||
|
chart2: "hsl(173 58% 39%)",
|
||||||
|
chart3: "hsl(197 37% 24%)",
|
||||||
|
chart4: "hsl(43 74% 66%)",
|
||||||
|
chart5: "hsl(27 87% 67%)",
|
||||||
|
},
|
||||||
|
dark: {
|
||||||
|
background: "hsl(0 0% 3.9%)",
|
||||||
|
foreground: "hsl(0 0% 98%)",
|
||||||
|
card: "hsl(0 0% 3.9%)",
|
||||||
|
cardForeground: "hsl(0 0% 98%)",
|
||||||
|
popover: "hsl(0 0% 3.9%)",
|
||||||
|
popoverForeground: "hsl(0 0% 98%)",
|
||||||
|
primary: "hsl(0 0% 98%)",
|
||||||
|
primaryForeground: "hsl(0 0% 9%)",
|
||||||
|
secondary: "hsl(0 0% 14.9%)",
|
||||||
|
secondaryForeground: "hsl(0 0% 98%)",
|
||||||
|
muted: "hsl(0 0% 14.9%)",
|
||||||
|
mutedForeground: "hsl(0 0% 63.9%)",
|
||||||
|
accent: "hsl(0 0% 14.9%)",
|
||||||
|
accentForeground: "hsl(0 0% 98%)",
|
||||||
|
destructive: "hsl(0 70.9% 59.4%)",
|
||||||
|
border: "hsl(0 0% 14.9%)",
|
||||||
|
input: "hsl(0 0% 14.9%)",
|
||||||
|
ring: "hsl(300 0% 45%)",
|
||||||
|
radius: "0.625rem",
|
||||||
|
chart1: "hsl(220 70% 50%)",
|
||||||
|
chart2: "hsl(160 60% 45%)",
|
||||||
|
chart3: "hsl(30 80% 55%)",
|
||||||
|
chart4: "hsl(280 65% 60%)",
|
||||||
|
chart5: "hsl(340 75% 55%)",
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
export const NAV_THEME: Record<"light" | "dark", Theme> = {
|
||||||
|
light: {
|
||||||
|
...DefaultTheme,
|
||||||
|
colors: {
|
||||||
|
background: THEME.light.background,
|
||||||
|
border: THEME.light.border,
|
||||||
|
card: THEME.light.card,
|
||||||
|
notification: THEME.light.destructive,
|
||||||
|
primary: THEME.light.primary,
|
||||||
|
text: THEME.light.foreground,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
dark: {
|
||||||
|
...DarkTheme,
|
||||||
|
colors: {
|
||||||
|
background: THEME.dark.background,
|
||||||
|
border: THEME.dark.border,
|
||||||
|
card: THEME.dark.card,
|
||||||
|
notification: THEME.dark.destructive,
|
||||||
|
primary: THEME.dark.primary,
|
||||||
|
text: THEME.dark.foreground,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
};
|
||||||
6
lstMobile/src/lib/utils.ts
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
import { type ClassValue, clsx } from "clsx";
|
||||||
|
import { twMerge } from "tailwind-merge";
|
||||||
|
|
||||||
|
export function cn(...inputs: ClassValue[]) {
|
||||||
|
return twMerge(clsx(inputs));
|
||||||
|
}
|
||||||
@@ -1,43 +1,73 @@
|
|||||||
|
import axios from "axios";
|
||||||
|
import { useAppStore } from "../hooks/useAppStore";
|
||||||
|
import { useServerStore } from "../hooks/useServerCheck";
|
||||||
|
|
||||||
export type ServerVersionInfo = {
|
export type ServerVersionInfo = {
|
||||||
packageName: string;
|
packageName: string;
|
||||||
versionName: string;
|
versionName: string;
|
||||||
versionCode: number;
|
versionCode: number;
|
||||||
minSupportedVersionCode: number;
|
minSupportedVersionCode: number;
|
||||||
fileName: string;
|
fileName: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type StartupStatus =
|
export type StartupStatus =
|
||||||
| { state: "checking" }
|
| { state: "checking" }
|
||||||
| { state: "needs-config" }
|
| { state: "needs-config" }
|
||||||
| { state: "offline" }
|
| { state: "offline" }
|
||||||
| { state: "blocked"; reason: string; server: ServerVersionInfo }
|
| { state: "blocked"; reason: string; server: ServerVersionInfo }
|
||||||
| { state: "warning"; message: string; server: ServerVersionInfo }
|
| { state: "warning"; message: string; server: ServerVersionInfo }
|
||||||
| { state: "ready"; server: ServerVersionInfo | null };
|
| { state: "ready"; server: ServerVersionInfo | null };
|
||||||
|
|
||||||
export function evaluateVersion(
|
export function evaluateVersion(
|
||||||
appBuildCode: number,
|
appBuildCode: number,
|
||||||
server: ServerVersionInfo
|
server: ServerVersionInfo,
|
||||||
): StartupStatus {
|
): StartupStatus {
|
||||||
if (appBuildCode < server.minSupportedVersionCode) {
|
if (appBuildCode < server.minSupportedVersionCode) {
|
||||||
return {
|
return {
|
||||||
state: "blocked",
|
state: "blocked",
|
||||||
reason: "This scanner app is too old and must be updated before use.",
|
reason: "This scanner app is too old and must be updated before use.",
|
||||||
server,
|
server,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
if (appBuildCode !== server.versionCode) {
|
if (appBuildCode !== server.versionCode) {
|
||||||
return {
|
return {
|
||||||
state: "warning",
|
state: "warning",
|
||||||
message: `A newer version is available. Installed build: ${appBuildCode}, latest build: ${server.versionCode}.`,
|
message: `A newer version is available. Installed build: ${appBuildCode}, latest build: ${server.versionCode}.`,
|
||||||
server,
|
server,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
state: "ready",
|
state: "ready",
|
||||||
server,
|
server,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export const versionCheck = async () => {
|
||||||
|
const { setServerVersion } = useServerStore.getState();
|
||||||
|
const { serverPort, serverIp } = useAppStore.getState();
|
||||||
|
|
||||||
|
const port = parseInt(serverPort || "0", 10) >= 50000 ? "3000" : serverPort;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const res = await axios.get(
|
||||||
|
`http://${serverIp}:${port}/lst/api/mobile/version`,
|
||||||
|
{ timeout: 5000 },
|
||||||
|
);
|
||||||
|
|
||||||
|
if (res.status === 200) {
|
||||||
|
setServerVersion(res.data);
|
||||||
|
}
|
||||||
|
|
||||||
|
// const build = Constants.expoConfig?.android?.versionCode ?? 1;
|
||||||
|
|
||||||
|
// if (build < res.data.minSupportedVersionCode) {
|
||||||
|
// setStartupRoute("/updateScreen");
|
||||||
|
// setReady(true);
|
||||||
|
// return;
|
||||||
|
// }
|
||||||
|
} catch (error) {
|
||||||
|
console.log("Version check error:", error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|||||||
76
lstMobile/tailwind.config.js
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
const { hairlineWidth } = require("nativewind/theme");
|
||||||
|
|
||||||
|
/** @type {import('tailwindcss').Config} */
|
||||||
|
module.exports = {
|
||||||
|
content: [
|
||||||
|
"./app/**/*.{js,jsx,ts,tsx}",
|
||||||
|
"./src/**/*.{js,jsx,ts,tsx}",
|
||||||
|
"./components/**/*.{js,jsx,ts,tsx}",
|
||||||
|
],
|
||||||
|
presets: [require("nativewind/preset")],
|
||||||
|
theme: {
|
||||||
|
extend: {
|
||||||
|
colors: {
|
||||||
|
border: "hsl(var(--border))",
|
||||||
|
input: "hsl(var(--input))",
|
||||||
|
ring: "hsl(var(--ring))",
|
||||||
|
background: "hsl(var(--background))",
|
||||||
|
foreground: "hsl(var(--foreground))",
|
||||||
|
primary: {
|
||||||
|
DEFAULT: "hsl(var(--primary))",
|
||||||
|
foreground: "hsl(var(--primary-foreground))",
|
||||||
|
},
|
||||||
|
secondary: {
|
||||||
|
DEFAULT: "hsl(var(--secondary))",
|
||||||
|
foreground: "hsl(var(--secondary-foreground))",
|
||||||
|
},
|
||||||
|
destructive: {
|
||||||
|
DEFAULT: "hsl(var(--destructive))",
|
||||||
|
foreground: "hsl(var(--destructive-foreground))",
|
||||||
|
},
|
||||||
|
muted: {
|
||||||
|
DEFAULT: "hsl(var(--muted))",
|
||||||
|
foreground: "hsl(var(--muted-foreground))",
|
||||||
|
},
|
||||||
|
accent: {
|
||||||
|
DEFAULT: "hsl(var(--accent))",
|
||||||
|
foreground: "hsl(var(--accent-foreground))",
|
||||||
|
},
|
||||||
|
popover: {
|
||||||
|
DEFAULT: "hsl(var(--popover))",
|
||||||
|
foreground: "hsl(var(--popover-foreground))",
|
||||||
|
},
|
||||||
|
card: {
|
||||||
|
DEFAULT: "hsl(var(--card))",
|
||||||
|
foreground: "hsl(var(--card-foreground))",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
borderRadius: {
|
||||||
|
lg: "var(--radius)",
|
||||||
|
md: "calc(var(--radius) - 2px)",
|
||||||
|
sm: "calc(var(--radius) - 4px)",
|
||||||
|
},
|
||||||
|
borderWidth: {
|
||||||
|
hairline: hairlineWidth(),
|
||||||
|
},
|
||||||
|
keyframes: {
|
||||||
|
"accordion-down": {
|
||||||
|
from: { height: "0" },
|
||||||
|
to: { height: "var(--radix-accordion-content-height)" },
|
||||||
|
},
|
||||||
|
"accordion-up": {
|
||||||
|
from: { height: "var(--radix-accordion-content-height)" },
|
||||||
|
to: { height: "0" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
animation: {
|
||||||
|
"accordion-down": "accordion-down 0.2s ease-out",
|
||||||
|
"accordion-up": "accordion-up 0.2s ease-out",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
future: {
|
||||||
|
hoverOnlyWhenSupported: true,
|
||||||
|
},
|
||||||
|
plugins: [require("tailwindcss-animate")],
|
||||||
|
};
|
||||||
@@ -4,7 +4,8 @@
|
|||||||
"strict": true,
|
"strict": true,
|
||||||
"paths": {
|
"paths": {
|
||||||
"@/*": [
|
"@/*": [
|
||||||
"./src/*"
|
"./src/*",
|
||||||
|
"./*"
|
||||||
],
|
],
|
||||||
"@/assets/*": [
|
"@/assets/*": [
|
||||||
"./assets/*"
|
"./assets/*"
|
||||||
@@ -15,6 +16,7 @@
|
|||||||
"**/*.ts",
|
"**/*.ts",
|
||||||
"**/*.tsx",
|
"**/*.tsx",
|
||||||
".expo/types/**/*.ts",
|
".expo/types/**/*.ts",
|
||||||
"expo-env.d.ts"
|
"expo-env.d.ts",
|
||||||
|
"nativewind-env.d.ts"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
10
migrations/0041_bright_tempest.sql
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
CREATE TABLE "scan_log" (
|
||||||
|
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
||||||
|
"scanner_id" text,
|
||||||
|
"message" text NOT NULL,
|
||||||
|
"prompt" text,
|
||||||
|
"command_description" text,
|
||||||
|
"status" text,
|
||||||
|
"lines" jsonb DEFAULT '[]'::jsonb,
|
||||||
|
"add_Date" timestamp DEFAULT now()
|
||||||
|
);
|
||||||
14
migrations/0042_melted_talon.sql
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
CREATE TYPE "public"."mobile_role" AS ENUM('user', 'lead', 'manager', 'admin');--> statement-breakpoint
|
||||||
|
CREATE TABLE "scan_users" (
|
||||||
|
"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
|
||||||
|
"name" text NOT NULL,
|
||||||
|
"scanner_id" integer NOT NULL,
|
||||||
|
"pin_number" integer NOT NULL,
|
||||||
|
"pin_hash" text NOT NULL,
|
||||||
|
"excluded_commands" text DEFAULT '',
|
||||||
|
"role" "mobile_role" DEFAULT 'user' NOT NULL,
|
||||||
|
"active" boolean DEFAULT true,
|
||||||
|
"last_scan" timestamp DEFAULT now(),
|
||||||
|
"add_Date" timestamp DEFAULT now(),
|
||||||
|
"upd_date" timestamp DEFAULT now()
|
||||||
|
);
|
||||||
3
migrations/0043_melted_lyja.sql
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
ALTER TABLE "scan_users" ADD CONSTRAINT "scan_users_scanner_id_unique" UNIQUE("scanner_id");--> statement-breakpoint
|
||||||
|
ALTER TABLE "scan_users" ADD CONSTRAINT "scan_users_pin_number_unique" UNIQUE("pin_number");--> statement-breakpoint
|
||||||
|
ALTER TABLE "scan_users" ADD CONSTRAINT "scan_user_unique" UNIQUE("scanner_id","pin_number");
|
||||||
2
migrations/0044_steady_magneto.sql
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
ALTER TABLE "scan_users" ALTER COLUMN "scanner_id" SET DATA TYPE text;--> statement-breakpoint
|
||||||
|
ALTER TABLE "scan_users" ALTER COLUMN "pin_number" SET DATA TYPE text;
|
||||||
3
migrations/0045_quick_khan.sql
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
ALTER TABLE "scan_users" ALTER COLUMN "excluded_commands" SET DATA TYPE jsonb;--> statement-breakpoint
|
||||||
|
ALTER TABLE "scan_users" ALTER COLUMN "excluded_commands" SET DEFAULT '';--> statement-breakpoint
|
||||||
|
ALTER TABLE "scan_log" ADD COLUMN "user" text;
|
||||||
1
migrations/0046_chemical_the_leader.sql
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "scan_users" ALTER COLUMN "excluded_commands" SET DEFAULT '[]'::jsonb;
|
||||||
1
migrations/0047_spotty_queen_noir.sql
Normal file
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "scan_log" ADD COLUMN "running_number" text DEFAULT '0';
|
||||||