cowch/lstV2
1
0
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Compare commits

base: cowch:402ce734b3608c391a4a11b6875d7c2acb8989a9
Branches Tags
cowch:main cowch:migration cowch:dev
...
compare: cowch:dev
Branches Tags
cowch:main cowch:migration cowch:dev

208 Commits
402ce734b3 ... dev

Author SHA1 Message Date
Blake Matthes
c35726bf5c fix(lst): missing , in versionRc 2025-03-23 11:11:06 -05:00
Blake Matthes
e82208fc5e build(build): removed from showing in the change log 2025-03-23 11:10:00 -05:00
Blake Matthes
9bdca3317c chore: bump build number to 50 2025-03-23 11:06:13 -05:00
Blake Matthes
61abd44328 chore(release): 2.9.0 2025-03-23 11:05:26 -05:00
Blake Matthes
acb9876d9b chore: bump build number to 49 2025-03-23 11:02:22 -05:00
Blake Matthes
10d88f53eb fix(frontend): removed unwanted import 2025-03-23 11:01:21 -05:00
Blake Matthes
bba0aa2ee4 refactor(frontend): added date-fns into the frontend 2025-03-23 11:00:38 -05:00
Blake Matthes
b7773ec02a fix(sqlserver): if we already have a connection just return we dont want to try a second time 2025-03-23 11:00:15 -05:00
Blake Matthes
b9dd6e3ae2 fix(auth): fixed the getaccess to be getuseraccess as it was orignally 2025-03-23 10:59:48 -05:00
Blake Matthes
f940bcdc9d fix(serverlist): corrected the time by removing teh Z at the end of the time 2025-03-23 10:59:23 -05:00
Blake Matthes
2ae3c8ba59 fix(loginform): removed the console log that was left by accident 2025-03-23 10:58:49 -05:00
Blake Matthes
97b9c4db4a chore: bump build number to 48 2025-03-23 10:16:28 -05:00
Blake Matthes
d8eddafcae feat(auth): add, update were added for adm account in backend only 2025-03-23 10:07:28 -05:00
Blake Matthes
58b58424ab test(returnres): tryed to make a standard return res but will come back to this later 2025-03-23 10:06:34 -05:00
Blake Matthes
72d52d9256 feat(trycatch): added in theo's try catch to reduce the code and love it 2025-03-23 10:05:51 -05:00
Blake Matthes
5dfece09b7 refactor(login): removed all the data from teh login dropdown as it could cause issues 2025-03-23 10:05:27 -05:00
Blake Matthes
97eb73c6d1 test(streaming logs): will come back to this later this is killing me inside 2025-03-23 10:04:58 -05:00
Cowch
bb6d523abb refactor(server): removed the websocket wrapper going wiht normal ws 2025-03-22 10:06:14 -05:00
Cowch
09d3a7041a docs(install): added more env params and an install install stuff 2025-03-22 10:05:47 -05:00
Cowch
132e8d0146 feat(lst): added prettier config so we have the same formatting across all computers 2025-03-22 10:05:10 -05:00
Cowch
d0a0d08902 feat(scripts): made moving scripts more proper 2025-03-22 10:04:48 -05:00
Cowch
208cd615af refactor(auth): added in correct bycrptjs 2025-03-22 10:04:14 -05:00
Blake Matthes
e82ef76316 test(streaming): more testing on streaming the lofs 2025-03-22 08:21:11 -05:00
Blake Matthes
4db4eea2d1 test(streaming): more streaming test 2025-03-21 22:08:13 -05:00
Blake Matthes
edcfff6cc6 fix(scaler): fix due to update 2025-03-21 22:07:49 -05:00
Blake Matthes
61860c759e build(updater): dynamic ports mainly for iowa2 2025-03-21 22:07:32 -05:00
Blake Matthes
08c9b3404f test(streaming logs): more test but failed again 2025-03-21 22:06:53 -05:00
Blake Matthes
93ed2e9ee8 fix(calendar): this component had a bug and needed a lib update 2025-03-21 22:06:25 -05:00
Blake Matthes
fb9ee15bda chore(pkg updates): updated all pkgs 2025-03-21 21:48:04 -05:00
Blake Matthes
76bc0db3dd test(server): start/stop/restart buttons added. comment #14 2025-03-21 20:09:39 -05:00
Blake Matthes
2e5de34cb5 fix(login): if we have a wrong password or username we didnt properly error instead we crashed 2025-03-21 19:44:02 -05:00
Blake Matthes
07e47e64ae fix(consume material): when we consumed material the button was never reenabled 
closes #15
 2025-03-21 19:42:51 -05:00
Blake Matthes
73eb70538e test(streaming logs): test for streaming logs 2025-03-21 13:36:12 -05:00
Blake Matthes
8b8c9acb69 refactor(serverdata): remapped the server list to all be on the E drive and deactivated 
deactivated so i can double check we have everything per server now
 2025-03-21 13:35:51 -05:00
Blake Matthes
cb3ab668d8 chore(updatescript): added in so we can do a full install with an env creation for old 2025-03-21 13:34:46 -05:00
Blake Matthes
f6654067f5 chore: bump build number to 47 2025-03-21 12:07:02 -05:00
Blake Matthes
532a722763 chore: bump build number to 46 2025-03-20 14:26:41 -05:00
Blake Matthes
38d1043606 chore: bump build number to 45 2025-03-20 14:09:36 -05:00
Blake Matthes
18daca904e docs(logs): changes how logs are put into the db they will be there name vs key 2025-03-20 14:07:37 -05:00
Blake Matthes
e833c48cc8 feat(logger): streaming logs works server side not frontend for now 2025-03-20 14:06:53 -05:00
Blake Matthes
0bd217c727 docs(migration): added more documents on the install md 2025-03-20 14:04:48 -05:00
Blake Matthes
74974323f0 feat(lst): added in delay global function 2025-03-20 14:03:09 -05:00
Blake Matthes
f3c4c26ef9 test(ocp dash): more work on the dashboard 2025-03-20 14:02:46 -05:00
Blake Matthes
74bcd6e805 feat(ocme): cycle count implemeneted 2025-03-20 14:02:19 -05:00
Blake Matthes
eb2c34c557 ci(frontend): added ocme as a proxy in the dev 2025-03-20 14:00:42 -05:00
Blake Matthes
808e3d84ef chore: bump build number to 44 2025-03-20 09:51:25 -05:00
Blake Matthes
7a22b52c91 test(ocme): cycle count intital improvements 2025-03-19 21:45:10 -05:00
Blake Matthes
e17b8e7bbe refactor(view access): if role [] then allow them to see it 2025-03-19 17:59:22 -05:00
Blake Matthes
e597968777 feat(settings): more seed settings 2025-03-19 17:18:13 -05:00
Blake Matthes
bbd7a17144 feat(servers): added dayton in 2025-03-19 17:17:54 -05:00
Blake Matthes
5945ace9f2 refactor(settings): removed the need to login to get the settings 2025-03-19 17:17:36 -05:00
Blake Matthes
316b27e3e0 refactor(settings): used the common response function created 2025-03-19 17:17:18 -05:00
Blake Matthes
7165c959b9 feat(ocp): added in service plus manual print log 2025-03-19 17:16:39 -05:00
Blake Matthes
ae7e3fd54e feat(ocme): added in ocme service so we can utlize 2 ports 2025-03-19 17:16:14 -05:00
Blake Matthes
7ec5c5beb0 feat(logger): logger service created with its endpoints 2025-03-19 17:15:33 -05:00
Blake Matthes
c9aa41ab00 refactor(login): removed roles from the login to shrink the jwt 2025-03-19 17:15:02 -05:00
Blake Matthes
4696835c65 feat(installer): added a check for lstv2 already installed 2025-03-19 17:14:33 -05:00
Blake Matthes
2d3f308877 feat(server): ocpService and loggerService added 2025-03-19 17:13:52 -05:00
Blake Matthes
3d083986ae feat(admincheck): this check is so we dont use stuff on the wrong servers 2025-03-19 17:13:21 -05:00
Blake Matthes
92b47f03d9 style(types): added in prod? so we dont get type errors 2025-03-19 17:12:51 -05:00
Blake Matthes
3b8f18093e refactor(stores): added in axios 2025-03-19 17:12:27 -05:00
Blake Matthes
1cd1d3a3e9 feat(settings): added in setting store 2025-03-19 17:12:09 -05:00
Blake Matthes
8324fffeb6 test(ocp): more work on the dashboard 2025-03-19 17:11:00 -05:00
Blake Matthes
354f3260a5 refactor(consume materail): get token from localstorage as the store isnt wokring properly 2025-03-19 17:09:57 -05:00
Blake Matthes
ab5af4deac refactor(production): changes ocp to viewwer 2025-03-19 17:09:16 -05:00
Blake Matthes
7a15b160ac refactor(auth): moved prod back to server as we run 2 instances during migration 2025-03-19 17:08:51 -05:00
Blake Matthes
ca0ba7fe59 refactor(settings): refactored the admincheck so we can reuse it 2025-03-19 17:08:22 -05:00
Blake Matthes
0914b53341 feat(db): logs, manualprints added 2025-03-19 17:07:37 -05:00
Blake Matthes
34b80cf236 chore: bump build number to 43 2025-03-19 16:18:04 -05:00
Blake Matthes
196ea00972 chore: bump build number to 42 2025-03-19 13:30:10 -05:00
Blake Matthes
807a4ca699 chore: bump build number to 41 2025-03-19 11:32:58 -05:00
Blake Matthes
d98a659262 chore: bump build number to 40 2025-03-19 11:23:35 -05:00
Blake Matthes
6dd5f4b61f chore: bump build number to 39 2025-03-19 11:22:04 -05:00
Blake Matthes
751b9d5701 chore: bump build number to 38 2025-03-19 08:47:27 -05:00
Blake Matthes
b0634d9427 chore: bump build number to 37 2025-03-19 08:41:27 -05:00
Blake Matthes
8a143fbb19 chore: bump build number to 36 2025-03-19 08:23:56 -05:00
Blake Matthes
8b72a1b47e chore: bump build number to 35 2025-03-19 08:09:14 -05:00
Blake Matthes
f4c44fb02b chore: bump build number to 34 2025-03-18 22:29:52 -05:00
Blake Matthes
03aa7e5aee chore: bump build number to 33 2025-03-18 22:07:51 -05:00
Blake Matthes
f035e6f14a chore: bump build number to 32 2025-03-18 22:01:10 -05:00
Blake Matthes
227e2aa00c chore: bump build number to 31 2025-03-18 21:53:44 -05:00
Blake Matthes
4a48dd2bb5 chore: bump build number to 30 2025-03-18 18:37:43 -05:00
Blake Matthes
9796947db5 chore: bump build number to 29 2025-03-18 18:03:39 -05:00
Blake Matthes
1e02d4fa4f chore: bump build number to 28 2025-03-18 17:58:04 -05:00
Blake Matthes
26ea8d5e89 chore: bump build number to 27 2025-03-18 16:46:08 -05:00
Blake Matthes
8fb06c71d3 feat(auth): remove all old localstorage if no session 2025-03-17 16:16:06 -05:00
Blake Matthes
e258aaead9 feat(ocmeserver): the server was just migrated so it can be upgraded to lstv2 2025-03-17 16:13:58 -05:00
Blake Matthes
491de26a0b chore: bump build number to 26 2025-03-17 13:15:57 -05:00
Blake Matthes
f1979f0fc9 chore: bump build number to 25 2025-03-17 11:55:00 -05:00
Blake Matthes
f4433f4192 chore: bump build number to 24 2025-03-17 10:26:04 -05:00
Blake Matthes
bff0e77766 chore: bump build number to 23 2025-03-17 10:22:31 -05:00
Blake Matthes
43ca16dc80 chore: bump build number to 22 2025-03-17 08:21:54 -05:00
Blake Matthes
121bed59fd feat(ports): added in production port if in production 2025-03-17 08:21:09 -05:00
Blake Matthes
4e885ce74c chore: bump build number to 21 2025-03-17 08:11:25 -05:00
Blake Matthes
4908d6644a feat(serverdata): added in huston, sherman. and corrected contact info in westbend 2025-03-17 08:09:35 -05:00
Blake Matthes
21c374903b test(rfid): more work on the rfid service 2025-03-17 08:09:00 -05:00
Blake Matthes
ed11b2b26f fix(auth): added in the correct function for days between logins 2025-03-17 08:08:21 -05:00
Blake Matthes
357c118396 docs(install): removed the super secret key 2025-03-17 08:07:51 -05:00
Blake Matthes
866b6d5120 refactor(server query): bumped the refresh from 500ms to 2500ms 2025-03-17 08:07:30 -05:00
Blake Matthes
739e6bbe9f chore(builds): bummped lstv1 build 2025-03-17 08:07:04 -05:00
Blake Matthes
0975f4e499 chore: bump build number to 20 2025-03-16 15:38:31 -05:00
Blake Matthes
2990a330dd chore(release): 2.8.0 2025-03-16 15:38:06 -05:00
Blake Matthes
cb59f58926 feat(tag reading): more tag reading updates, with more contorl now 
station 1 and 2 are still pending but didnt have enough tags at the office trial it
 2025-03-16 15:37:40 -05:00
Blake Matthes
1a79a97929 refactor(rfid): cleaned up contorller folder 2025-03-16 15:36:43 -05:00
Blake Matthes
4b92a28dfa feat(rfid): no read console log for now but will show in frontend as well 2025-03-16 15:36:09 -05:00
Blake Matthes
4aae659ee4 feat(rfid): add/update readers now possible 2025-03-16 15:35:43 -05:00
Blake Matthes
7bfb48b81f feat(api): added in a response function to reduce the over responses as they are always the same 2025-03-16 15:34:55 -05:00
Blake Matthes
7432decd3c test(api): testing api options to reduce the code as we keep repeating same functions 2025-03-16 15:34:14 -05:00
Blake Matthes
04a607d3bc test(printers): started printer migration 2025-03-16 15:33:44 -05:00
Blake Matthes
d178e04362 refactor(rfid tags): update tag table to include what is needed and changed columns to be correct 2025-03-16 15:33:20 -05:00
Blake Matthes
020fdc83af refactor(reader): added in missing columns needed in the table 2025-03-16 15:32:47 -05:00
Blake Matthes
33803a69a6 feat(rfid): reader and tag db completed 2025-03-16 15:32:21 -05:00
Blake Matthes
3ea6dc5bc4 chore: bump build number to 19 2025-03-15 15:35:56 -05:00
Blake Matthes
b484a0c5ea chore(release): 2.7.0 2025-03-15 15:35:30 -05:00
Blake Matthes
a73c63cefa fix(rfid): correction to the params and incorrect naming 2025-03-15 15:34:04 -05:00
Blake Matthes
5b97d078c5 feat(new setting): added in devDir ment for updating servers 2025-03-15 15:33:41 -05:00
Blake Matthes
7529cc5b0c feat(serverdata): added in bowling green 2 2025-03-15 15:33:04 -05:00
Blake Matthes
df252e72b3 feat(server): added in update server as well as get serverdata 2025-03-15 15:32:15 -05:00
Blake Matthes
359427824b refactor(frontend): removed tanstack devTools 2025-03-15 15:31:22 -05:00
Blake Matthes
cbdd218fe4 feat(frontend): added in proper links for settings and servers to the sidebar 2025-03-15 15:30:53 -05:00
Blake Matthes
35acd2b0b3 refactor(frontend): removed the caption from settings table 2025-03-15 15:30:19 -05:00
Blake Matthes
625d5969be feat(frontend): added in update server page only for sysAdmin 2025-03-15 15:29:53 -05:00
Blake Matthes
2370d45220 fix(frontend): if the modules returns and error we want to use an empty array 2025-03-15 15:29:25 -05:00
Blake Matthes
cb7a4068fc feat(sql query): added 2 catches if not connected dont run 2025-03-15 15:28:51 -05:00
Blake Matthes
e4d15ef051 feat(sql server): added in the ping check to not spam if we are not connected 2025-03-15 15:25:46 -05:00
Blake Matthes
f3fa617aa5 feat(serverdata): added catch if we are not on localhost we cant actaully see the devDir in set 2025-03-15 15:24:11 -05:00
Blake Matthes
ab16059387 feat(server upgrade): added in a catch incase we try to upgrade again 2025-03-15 15:22:38 -05:00
Blake Matthes
b6f1cfdc6c chore: bump build number to 18 2025-03-14 14:47:51 -05:00
Blake Matthes
1ce5f9acf7 chore: bump build number to 17 2025-03-14 14:42:36 -05:00
Blake Matthes
44da09d22c chore: bump build number to 16 2025-03-14 14:38:14 -05:00
Blake Matthes
0b72ffa935 chore: bump build number to 15 2025-03-14 14:35:19 -05:00
Blake Matthes
a2fb845e2e chore: bump build number to 14 2025-03-14 14:33:58 -05:00
Blake Matthes
bcd65b4b91 chore: bump build number to 13 2025-03-14 14:33:00 -05:00
Blake Matthes
b1d25c7ba2 chore: bump build number to 12 2025-03-14 14:31:11 -05:00
Blake Matthes
c9a5203131 chore: bump build number to 11 2025-03-14 14:08:07 -05:00
Blake Matthes
246b5a17bd fix(zippaths): corrected the paths to the src that were moved the the env 2025-03-14 13:46:11 -05:00
Blake Matthes
245ba19cdc chore: bump build number to 10 2025-03-14 13:45:25 -05:00
Blake Matthes
e5e6aa3fee chore(release): 2.6.0 2025-03-14 13:39:00 -05:00
Blake Matthes
81eb10e021 feat(app update): finished the app build / deploy functions and a scripts migration 2025-03-14 13:36:26 -05:00
Blake Matthes
51b81b97bc feat(pkgdata): moved the pkg info to a global function 2025-03-14 13:35:45 -05:00
Blake Matthes
242494a4ea refactor(pkg): removed dir stuff and moved to env 2025-03-14 13:34:27 -05:00
Blake Matthes
542c08f10b chore: bump build number to 9 2025-03-14 10:04:29 -05:00
Blake Matthes
0578d28669 chore(release): 2.5.1 2025-03-14 10:03:26 -05:00
Blake Matthes
5696871b8d test(lst): readded prodBuild 2025-03-14 10:03:20 -05:00
Blake Matthes
125f7f5046 chore(release): 2.5.0 2025-03-14 10:02:17 -05:00
Blake Matthes
1cb8b70430 test(pkg): removed the combined command to deploy 2025-03-14 10:00:47 -05:00
Blake Matthes
200ec975f7 ci(lst): changes to improve the build process 2025-03-14 09:59:53 -05:00
Blake Matthes
5f5757c784 chore: bump build number to 8 2025-03-14 09:58:21 -05:00
Blake Matthes
571b74f0e7 chore: bump build number to 7 2025-03-14 09:38:38 -05:00
Blake Matthes
8363cc2816 chore: bump build number to 6 2025-03-14 09:37:21 -05:00
Blake Matthes
d852e9e573 chore: bump build number to 5 2025-03-14 09:14:31 -05:00
Blake Matthes
bd4ca7ba63 chore: bump build number to 4 2025-03-14 09:13:42 -05:00
Blake Matthes
df85a30dff feat(build and zip): migrated build and zip process from v1 2025-03-14 09:06:19 -05:00
Blake Matthes
d5e9176d53 fix(sql server): correct return when we cant connect to the server 2025-03-14 09:05:48 -05:00
Blake Matthes
45b1f7c0a6 chore(pkg): added admin section as well as correct a couple areas for builds 2025-03-14 09:04:24 -05:00
Blake Matthes
eaac8143e9 chore(ignore): ignoring build folder as we dont want this to push to the server 2025-03-14 09:03:50 -05:00
Blake Matthes
dd88f258ed test(buildserver): build serer checks 2025-03-14 07:36:33 -05:00
Blake Matthes
c2c43b1e22 feat(sql server): added ping check to make sure the server is online before we try to connect 2025-03-14 07:36:15 -05:00
Blake Matthes
4b53700603 fix(serverdata): fixed a bug in the serverData check 2025-03-14 07:35:31 -05:00
Blake Matthes
a18cf652fa feat(ping): added in 3 new funcitons to ping devices to see if they are alive before doing something 2025-03-14 07:35:10 -05:00
Blake Matthes
84ce009310 fix(crash alerts): remmoved close sql as it spammed bad when we couldnt connect 2025-03-14 07:34:43 -05:00
Blake Matthes
dc04d97229 feat(rfid): added tables to the db for tags and readers 2025-03-14 07:34:12 -05:00
Blake Matthes
bb1635a5b4 fix(sql): oops forgot to remove the returns i put in to ignore an error 2025-03-13 21:38:54 -05:00
Blake Matthes
da04e9d35d test(rfid): intial trials built 2025-03-13 21:37:04 -05:00
Blake Matthes
0054c8f7d4 test(updates): rewrite of update system 2025-03-13 15:44:53 -05:00
Blake Matthes
80567d2dd9 refactor(sql): reduced the time before start up 2025-03-13 15:44:22 -05:00
Blake Matthes
d6942dd982 feat(settings): added in more settings 2025-03-13 15:44:04 -05:00
Blake Matthes
155b7d92aa fix(query): shipmentPallets change from last move to production date 2025-03-13 15:43:45 -05:00
Blake Matthes
6158f254b7 fix(sql server): reduced the risk of error when missing data 2025-03-13 15:43:15 -05:00
Blake Matthes
58975ca117 feat(serverdata): all server info will be in all servers now for reduncay 2025-03-13 15:42:51 -05:00
Blake Matthes
78dc597477 refactor(system): checks now in time out to ensure everything connected 2025-03-13 15:42:24 -05:00
Blake Matthes
90d0760352 fix(auth): proper logging for errors in role check 2025-03-13 15:41:43 -05:00
Blake Matthes
c386c5ea8b feat(ocme): added in shipment data with increased checked 2025-03-13 15:41:21 -05:00
Blake Matthes
d95b81d303 perf(auth): changed the way logs look in the setRoles 2025-03-13 15:40:45 -05:00
Blake Matthes
2130adedb3 refactor(auth): added in timeout for adding new roles to make sure everything else is connected 1st 2025-03-13 15:40:10 -05:00
Blake Matthes
f69a40af3a feat(install): added install instructions 2025-03-13 15:39:38 -05:00
Blake Matthes
9c66e6aac6 test(apihits): monitoring this still to make sure its working as intended but low priority 2025-03-13 15:39:18 -05:00
Blake Matthes
b9724aa89c feat(server): added a missing db prevention crash 2025-03-13 15:38:46 -05:00
Blake Matthes
3c2b10b28c feat(db): serverData added in 2025-03-13 15:38:22 -05:00
Blake Matthes
5c2d79c125 fix(consumption): correction to the status code to always be 200 on success: true 2025-03-11 05:48:00 -05:00
Blake Matthes
d70469bcbb chore(release): 2.4.0 2025-03-10 17:28:45 -05:00
Blake Matthes
995311c563 feat(querys): plant query for gln and label data for sscc and other info 2025-03-10 16:59:17 -05:00
Blake Matthes
123d8a09ba feat(ocme): new setting for determining the fifo check 2025-03-10 16:58:48 -05:00
Blake Matthes
4fe400af3b refactor(modules): changed how the defaults are on some modules 2025-03-10 16:58:30 -05:00
Blake Matthes
8c31ac723d test(ocme): shipment pallets 2025-03-10 16:58:06 -05:00
Blake Matthes
a5cd8433f7 refactor(ocme): postRunning number removed bloat 2025-03-10 16:35:29 -05:00
Blake Matthes
c5f12814ea feat(ocme): pickedup route added 2025-03-10 16:35:07 -05:00
Blake Matthes
e2562768a5 refactor(ocme): added in apihits to getinfo 2025-03-10 16:34:46 -05:00
Blake Matthes
971038b10e feat(ocme): finalized posting RN and sscc just to keep it the same as ocme 2025-03-10 16:34:25 -05:00
Blake Matthes
1bcb4db328 feat(ocme): added in picked up and included a all function to reduce endpoints 2025-03-10 16:33:24 -05:00
Blake Matthes
f15afe5c11 refactor(ocme): changes made so that we only get the not picked up pallets 2025-03-10 16:32:37 -05:00
Blake Matthes
0e579c84b5 refactor(server:consume): change so error returns 200 so we can see the true error 2025-03-10 16:32:02 -05:00
Blake Matthes
40b970ef92 refactor(logger): changed so that everything comes over as lowerCase to make it more easy to search 2025-03-10 16:31:27 -05:00
Blake Matthes
0eb60706e4 feat(roles): added tester role 2025-03-10 16:29:13 -05:00
Blake Matthes
27d242f4f3 refactor(register): split the code to be more standard to the rest of the app 2025-03-10 16:22:46 -05:00
Blake Matthes
cd4109533e fix(auth): changed the profile update so we can run correctly now 2025-03-10 16:20:07 -05:00
Blake Matthes
8b1c65db4e feat(sscc): added in a creation of the sscc for now only ocme but will extend to be label data 2025-03-10 16:19:33 -05:00
Blake Matthes
6d1157a9d0 refactor(server): added in ability to listen on all ip's 2025-03-10 16:19:04 -05:00
Blake Matthes
9df643ce6b feat(materials): added in comsumption card to consume based on running nr 2025-03-10 16:18:25 -05:00
Blake Matthes
6c4e14fad3 feat(permissions): more permissions for accessing via sidbar 2025-03-10 16:17:57 -05:00
Blake Matthes
22e050ebfa test(apihits): framework for apiHits to be implemented but no db insert yet 2025-03-10 16:16:46 -05:00
Blake Matthes
008717b988 refactor(db): added in a db config for dev 2025-03-10 16:16:07 -05:00
Blake Matthes
65b35bc9a3 fix(user): when user didnt hape permissions would error, changed to have undefined now 2025-03-10 09:35:52 -05:00
Blake Matthes
12e15babb4 fix(logging): updated entire server side to the new logging system 2025-03-07 13:40:29 -06:00
Blake Matthes
ce11b1f57e feat(logger): added transport to post to db instead of file 2025-03-07 13:39:53 -06:00
Blake Matthes
ef26b6aa79 feat(ocme): added in ocme with endpoints base 2025-03-07 13:39:32 -06:00
Blake Matthes
a1c9ad65b8 feat(sqlserver): added in the sqlconnnection 2025-03-07 13:38:14 -06:00
Blake Matthes
c74f8e2a5f fix(server): changed the url to always be lowercase when it comes over 2025-03-07 05:49:13 -06:00
231 changed files with 33400 additions and 12726 deletions
Expand all files Collapse all files

12
.gitignore vendored
View File

@@ -3,6 +3,14 @@ frontend/dist
server/dist
dist
apiDocsLSTV2
testFiles
builds
nssm.exe
backend-0.1.2-217.zip
backend-0.1.2-218.zip
backend-0.1.2.zip
postgresql-17.2-3-windows-x64.exe
# ---> Node
bun.lock
@@ -140,6 +148,4 @@ dist
.yarn/install-state.gz
.pnp.*
nssm.exe
backend-0.1.3.zip

29
.versionrc.json
View File

@@ -1,16 +1,17 @@
{
"types": [
{"type": "feat", "section": "🌟 Enhancements"},
{"type": "fix", "section": "🐛 Bug fixes"},
{"type": "chore", "hidden": false, "section": "📝 Chore"},
{"type": "docs", "section": "📚 Documentation"},
{"type": "style", "hidden": true},
{"type": "refactor", "section": "🛠️ Code Refactor"},
{"type": "perf", "hidden": false, "section": "🚀 Performance"},
{"type": "test", "section": "📝 Testing Code"},
{"type": "ci", "section": "📈 Project changes"}
],
"commitUrlFormat": "https://git.tuffraid.net/cowch/lstV2/commits/{{hash}}",
"compareUrlFormat": "https://git.tuffraid.net/cowch/lstV2/compare/{{previousTag}}...{{currentTag}}",
"header": "# All CHanges to LST can be found below.\n"
"types": [
{ "type": "feat", "section": "🌟 Enhancements" },
{ "type": "fix", "section": "🐛 Bug fixes" },
{ "type": "chore", "hidden": false, "section": "📝 Chore" },
{ "type": "docs", "section": "📚 Documentation" },
{ "type": "style", "hidden": true },
{ "type": "refactor", "section": "🛠️ Code Refactor" },
{ "type": "perf", "hidden": false, "section": "🚀 Performance" },
{ "type": "test", "section": "📝 Testing Code" },
{ "type": "ci", "hidden": false, "section": "📈 Project changes" },
{ "type": "build", "hidden": true, "section": "📈 Project Builds" }
],
"commitUrlFormat": "https://git.tuffraid.net/cowch/lstV2/commits/{{hash}}",
"compareUrlFormat": "https://git.tuffraid.net/cowch/lstV2/compare/{{previousTag}}...{{currentTag}}",
"header": "# All CHanges to LST can be found below.\n"
}

26
.vscode/settings.json vendored Normal file
View File

@@ -0,0 +1,26 @@
{
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"[javascript]": {
"editor.formatOnSave": true
},
"[javascriptreact]": {
"editor.formatOnSave": true
},
"[typescript]": {
"editor.formatOnSave": true
},
"[typescriptreact]": {
"editor.formatOnSave": true
},
"[json]": {
"editor.formatOnSave": true
},
"[graphql]": {
"editor.formatOnSave": true
},
"[handlebars]": {
"editor.formatOnSave": true
}
}

343
CHANGELOG.md
View File

@@ -1,5 +1,348 @@
# All CHanges to LST can be found below.
## [2.9.0](https://git.tuffraid.net/cowch/lstV2/compare/v2.8.0...v2.9.0) (2025-03-23)
### 📈 Project changes
* **frontend:** added ocme as a proxy in the dev ([eb2c34c](https://git.tuffraid.net/cowch/lstV2/commits/eb2c34c557b72c3387b70addac30a4d8291402d4))
### 📚 Documentation
* **install:** added more env params and an install install stuff ([09d3a70](https://git.tuffraid.net/cowch/lstV2/commits/09d3a7041a18283a5add86ea845a8d7249522769))
* **install:** removed the super secret key ([357c118](https://git.tuffraid.net/cowch/lstV2/commits/357c1183964be0f3c02207c24bc8f83347282211))
* **logs:** changes how logs are put into the db they will be there name vs key ([18daca9](https://git.tuffraid.net/cowch/lstV2/commits/18daca904e0305371c6128988b48d54e3aec9a2a))
* **migration:** added more documents on the install md ([0bd217c](https://git.tuffraid.net/cowch/lstV2/commits/0bd217c727d726d62ddf06a0e44e95c4606361cf))
### 📝 Testing Code
* **ocme:** cycle count intital improvements ([7a22b52](https://git.tuffraid.net/cowch/lstV2/commits/7a22b52c916335c748598b82e78819c325bb8c4c))
* **ocp dash:** more work on the dashboard ([f3c4c26](https://git.tuffraid.net/cowch/lstV2/commits/f3c4c26ef957e6fe359a77f139ad36cdacefb8ef))
* **ocp:** more work on the dashboard ([8324fff](https://git.tuffraid.net/cowch/lstV2/commits/8324fffeb664bff3751ffc26e988a4a506b658a9))
* **returnres:** tryed to make a standard return res but will come back to this later ([58b5842](https://git.tuffraid.net/cowch/lstV2/commits/58b58424abbf98feec0c5442a59f4d055bbd1811))
* **rfid:** more work on the rfid service ([21c3749](https://git.tuffraid.net/cowch/lstV2/commits/21c374903b5cba56ced44b7eb2066ee902fc7bc3))
* **server:** start/stop/restart buttons added. comment [#14](https://git.tuffraid.net/cowch/lstV2/issues/14) ([76bc0db](https://git.tuffraid.net/cowch/lstV2/commits/76bc0db3dd9c48b69e4f6f571181a1f07c48bdeb))
* **streaming logs:** more test but failed again ([08c9b34](https://git.tuffraid.net/cowch/lstV2/commits/08c9b3404f548a167464445ec2f19288a092b0dc))
* **streaming logs:** test for streaming logs ([73eb705](https://git.tuffraid.net/cowch/lstV2/commits/73eb70538e36601cf436aaba244f99d5bd873d34))
* **streaming logs:** will come back to this later this is killing me inside ([97eb73c](https://git.tuffraid.net/cowch/lstV2/commits/97eb73c6d1aef747ef98f5f666fe47622795746f))
* **streaming:** more streaming test ([4db4eea](https://git.tuffraid.net/cowch/lstV2/commits/4db4eea2d12e37809879e96ed4279d6e23e83acc))
* **streaming:** more testing on streaming the lofs ([e82ef76](https://git.tuffraid.net/cowch/lstV2/commits/e82ef76316f0562b57124eb977c86fd2c6a3f332))
### 🌟 Enhancements
* **admincheck:** this check is so we dont use stuff on the wrong servers ([3d08398](https://git.tuffraid.net/cowch/lstV2/commits/3d083986aed528c2f881d6f673c0be03b8986c0b))
* **auth:** add, update were added for adm account in backend only ([d8eddaf](https://git.tuffraid.net/cowch/lstV2/commits/d8eddafcaea9141e9413a122a320649c7dd325e5))
* **auth:** remove all old localstorage if no session ([8fb06c7](https://git.tuffraid.net/cowch/lstV2/commits/8fb06c71d370a27697628077474a261596b567e0))
* **db:** logs, manualprints added ([0914b53](https://git.tuffraid.net/cowch/lstV2/commits/0914b5334119fa705eedddc6c9e8303cb82da551))
* **installer:** added a check for lstv2 already installed ([4696835](https://git.tuffraid.net/cowch/lstV2/commits/4696835c6557c2eae3be6a292144493be9d98f67))
* **logger:** logger service created with its endpoints ([7ec5c5b](https://git.tuffraid.net/cowch/lstV2/commits/7ec5c5beb0a9b02e8b8761908ee75ac2cfd317ee))
* **logger:** streaming logs works server side not frontend for now ([e833c48](https://git.tuffraid.net/cowch/lstV2/commits/e833c48cc8f68af40888ea161100e02f6ad19604))
* **lst:** added in delay global function ([7497432](https://git.tuffraid.net/cowch/lstV2/commits/74974323f0a7bd7c2eaa22024b7a8e91db2868e2))
* **lst:** added prettier config so we have the same formatting across all computers ([132e8d0](https://git.tuffraid.net/cowch/lstV2/commits/132e8d0146318fa9deb673bbcabf0d80c2a6d39f))
* **ocme:** added in ocme service so we can utlize 2 ports ([ae7e3fd](https://git.tuffraid.net/cowch/lstV2/commits/ae7e3fd54e5c256fb82e68f2e935e3b914e43d13))
* **ocme:** cycle count implemeneted ([74bcd6e](https://git.tuffraid.net/cowch/lstV2/commits/74bcd6e805c34e181f0c48310a799daf3afaee66))
* **ocmeserver:** the server was just migrated so it can be upgraded to lstv2 ([e258aae](https://git.tuffraid.net/cowch/lstV2/commits/e258aaead9a56cc4de36c17ed60b0bdaa91019cb))
* **ocp:** added in service plus manual print log ([7165c95](https://git.tuffraid.net/cowch/lstV2/commits/7165c959b9d5b37c0d4b01cb3f5bc27b40cec71d))
* **ports:** added in production port if in production ([121bed5](https://git.tuffraid.net/cowch/lstV2/commits/121bed59fda04b2ad134feb0895428515a1c56d8))
* **scripts:** made moving scripts more proper ([d0a0d08](https://git.tuffraid.net/cowch/lstV2/commits/d0a0d0890255acf890ba402386847b19566c92df))
* **serverdata:** added in huston, sherman. and corrected contact info in westbend ([4908d66](https://git.tuffraid.net/cowch/lstV2/commits/4908d6644a392395e660d382536c0fd31e3d0647))
* **server:** ocpService and loggerService added ([2d3f308](https://git.tuffraid.net/cowch/lstV2/commits/2d3f30887744bddfe22dc764188cf727a5e476df))
* **servers:** added dayton in ([bbd7a17](https://git.tuffraid.net/cowch/lstV2/commits/bbd7a17144e1e1a0faa192139cb1539c2f1ecc5c))
* **settings:** added in setting store ([1cd1d3a](https://git.tuffraid.net/cowch/lstV2/commits/1cd1d3a3e9e1ec1bf16ac2552caf24aa299959bf))
* **settings:** more seed settings ([e597968](https://git.tuffraid.net/cowch/lstV2/commits/e597968777e88289d361fdc01ec683a1f4c80192))
* **trycatch:** added in theo's try catch to reduce the code and love it ([72d52d9](https://git.tuffraid.net/cowch/lstV2/commits/72d52d925677eeeac6d158028114201862b6e2a2))
### 🛠️ Code Refactor
* **auth:** added in correct bycrptjs ([208cd61](https://git.tuffraid.net/cowch/lstV2/commits/208cd615af8250686745aa5b6779706ae267e423))
* **auth:** moved prod back to server as we run 2 instances during migration ([7a15b16](https://git.tuffraid.net/cowch/lstV2/commits/7a15b160ac2393cd66a932e598ffaa5aeda5812f))
* **consume materail:** get token from localstorage as the store isnt wokring properly ([354f326](https://git.tuffraid.net/cowch/lstV2/commits/354f3260a55b53bfb461a37db9d64550bacbfe04))
* **frontend:** added date-fns into the frontend ([bba0aa2](https://git.tuffraid.net/cowch/lstV2/commits/bba0aa2ee4e9b9be1db184da894ce6e96fd2e38f))
* **login:** removed all the data from teh login dropdown as it could cause issues ([5dfece0](https://git.tuffraid.net/cowch/lstV2/commits/5dfece09b7285dda96875bbc740df803d816b92a))
* **login:** removed roles from the login to shrink the jwt ([c9aa41a](https://git.tuffraid.net/cowch/lstV2/commits/c9aa41ab0099b7a05d50d9a981cf7e8a42a04733))
* **production:** changes ocp to viewwer ([ab5af4d](https://git.tuffraid.net/cowch/lstV2/commits/ab5af4deacbeaf1ed93c6231fb98b187f7540ca4))
* **server query:** bumped the refresh from 500ms to 2500ms ([866b6d5](https://git.tuffraid.net/cowch/lstV2/commits/866b6d5120810252b089580d341f3fb1b62e951a))
* **serverdata:** remapped the server list to all be on the E drive and deactivated ([8b8c9ac](https://git.tuffraid.net/cowch/lstV2/commits/8b8c9acb6969b63f157ea95b7d61923bf4bb4eae))
* **server:** removed the websocket wrapper going wiht normal ws ([bb6d523](https://git.tuffraid.net/cowch/lstV2/commits/bb6d523abbd3c9423eddbaab96e297b4850e2aa8))
* **settings:** refactored the admincheck so we can reuse it ([ca0ba7f](https://git.tuffraid.net/cowch/lstV2/commits/ca0ba7fe59f7e19d0de4924a419cce461de4b7a1))
* **settings:** removed the need to login to get the settings ([5945ace](https://git.tuffraid.net/cowch/lstV2/commits/5945ace9f259f6ef418c1621c246982b5b572dc1))
* **settings:** used the common response function created ([316b27e](https://git.tuffraid.net/cowch/lstV2/commits/316b27e3e011a0c0b4ce88ea579290807b8927c5))
* **stores:** added in axios ([3b8f180](https://git.tuffraid.net/cowch/lstV2/commits/3b8f18093ead2a988b2b19d1e8f25db6eaeaaee8))
* **view access:** if role [] then allow them to see it ([e17b8e7](https://git.tuffraid.net/cowch/lstV2/commits/e17b8e7bbe94c25c1bd3414b1db31191c87553d6))
### 🐛 Bug fixes
* **auth:** added in the correct function for days between logins ([ed11b2b](https://git.tuffraid.net/cowch/lstV2/commits/ed11b2b26ff80fde9f94615f740eb5152b16744d))
* **auth:** fixed the getaccess to be getuseraccess as it was orignally ([b9dd6e3](https://git.tuffraid.net/cowch/lstV2/commits/b9dd6e3ae2f5c158dd4827ae0c9db2c6747c57e1))
* **calendar:** this component had a bug and needed a lib update ([93ed2e9](https://git.tuffraid.net/cowch/lstV2/commits/93ed2e9ee8c98edd6a8c47d6e7a0caf6a8e93278))
* **consume material:** when we consumed material the button was never reenabled ([07e47e6](https://git.tuffraid.net/cowch/lstV2/commits/07e47e64ae2f4ddd325a2fdb34c82143c9adf84b)), closes [#15](https://git.tuffraid.net/cowch/lstV2/issues/15)
* **frontend:** removed unwanted import ([10d88f5](https://git.tuffraid.net/cowch/lstV2/commits/10d88f53ebaf670c9f6b3ca59cbbaf4d88f26b9f))
* **loginform:** removed the console log that was left by accident ([2ae3c8b](https://git.tuffraid.net/cowch/lstV2/commits/2ae3c8ba5916b5249135b86b374ac1bf32837478))
* **login:** if we have a wrong password or username we didnt properly error instead we crashed ([2e5de34](https://git.tuffraid.net/cowch/lstV2/commits/2e5de34cb50c79cd60e038492b2397eee69def11))
* **scaler:** fix due to update ([edcfff6](https://git.tuffraid.net/cowch/lstV2/commits/edcfff6cc6cf81e56b5532f0876383659b951a5d))
* **serverlist:** corrected the time by removing teh Z at the end of the time ([f940bcd](https://git.tuffraid.net/cowch/lstV2/commits/f940bcdc9df2d3e9989d49feae88036a6f8c7013))
* **sqlserver:** if we already have a connection just return we dont want to try a second time ([b7773ec](https://git.tuffraid.net/cowch/lstV2/commits/b7773ec02aa26c01530723dc146e0c9f4dae41d3))
### 📝 Chore
* **builds:** bummped lstv1 build ([739e6bb](https://git.tuffraid.net/cowch/lstV2/commits/739e6bbe9fa48fae682f9931a2c8bcb763feb636))
* bump build number to 20 ([0975f4e](https://git.tuffraid.net/cowch/lstV2/commits/0975f4e499a8a2aec0662352cb4496299292d4ea))
* bump build number to 21 ([4e885ce](https://git.tuffraid.net/cowch/lstV2/commits/4e885ce74c02ee1fd95a93402d1d32ecf357b1cb))
* bump build number to 22 ([43ca16d](https://git.tuffraid.net/cowch/lstV2/commits/43ca16dc807b9fa3496498e90a871568f0e5f54c))
* bump build number to 23 ([bff0e77](https://git.tuffraid.net/cowch/lstV2/commits/bff0e77766b49c72d77fa55cfaab2d347a1a75dc))
* bump build number to 24 ([f4433f4](https://git.tuffraid.net/cowch/lstV2/commits/f4433f41926dab72a239fc585ddd1e14acb80c7e))
* bump build number to 25 ([f1979f0](https://git.tuffraid.net/cowch/lstV2/commits/f1979f0fc914f3b94bad1816cd405a6431d1ba4a))
* bump build number to 26 ([491de26](https://git.tuffraid.net/cowch/lstV2/commits/491de26a0bbe6dfca9e1cb068991789c29a09ac0))
* bump build number to 27 ([26ea8d5](https://git.tuffraid.net/cowch/lstV2/commits/26ea8d5e89bb1b44ceb6b205da3ad158c603fca0))
* bump build number to 28 ([1e02d4f](https://git.tuffraid.net/cowch/lstV2/commits/1e02d4fa4fc1a007634da49fe2697d63c89cba18))
* bump build number to 29 ([9796947](https://git.tuffraid.net/cowch/lstV2/commits/9796947db5443c8b5678d7502037458d680e4018))
* bump build number to 30 ([4a48dd2](https://git.tuffraid.net/cowch/lstV2/commits/4a48dd2bb57064953ef6e192c76b91bb844a24de))
* bump build number to 31 ([227e2aa](https://git.tuffraid.net/cowch/lstV2/commits/227e2aa00c2a3e5526e0347c76676de345dfea5d))
* bump build number to 32 ([f035e6f](https://git.tuffraid.net/cowch/lstV2/commits/f035e6f14a9e2123a10010d4f515f78f0c222599))
* bump build number to 33 ([03aa7e5](https://git.tuffraid.net/cowch/lstV2/commits/03aa7e5aeee39b1b390b4da2019f44459487e0a0))
* bump build number to 34 ([f4c44fb](https://git.tuffraid.net/cowch/lstV2/commits/f4c44fb02ba857890af66a2747381ef1c3def25b))
* bump build number to 35 ([8b72a1b](https://git.tuffraid.net/cowch/lstV2/commits/8b72a1b47e715f4146e586e9fdd6abcabd97743d))
* bump build number to 36 ([8a143fb](https://git.tuffraid.net/cowch/lstV2/commits/8a143fbb19d2270b0139a7a4edbce745c477b6b1))
* bump build number to 37 ([b0634d9](https://git.tuffraid.net/cowch/lstV2/commits/b0634d9427f6fff3a239680204b5e6daf6163e37))
* bump build number to 38 ([751b9d5](https://git.tuffraid.net/cowch/lstV2/commits/751b9d5701cf7e81641f154a02041869e1b80c49))
* bump build number to 39 ([6dd5f4b](https://git.tuffraid.net/cowch/lstV2/commits/6dd5f4b61f3a27779980cf14915c4394256eae20))
* bump build number to 40 ([d98a659](https://git.tuffraid.net/cowch/lstV2/commits/d98a6592628f36c654039ccea25db163ddf15e8c))
* bump build number to 41 ([807a4ca](https://git.tuffraid.net/cowch/lstV2/commits/807a4ca6993b5dfa82a45aaf44a2d661c3e03428))
* bump build number to 42 ([196ea00](https://git.tuffraid.net/cowch/lstV2/commits/196ea009720a65c520f5626658ac7885a41796cb))
* bump build number to 43 ([34b80cf](https://git.tuffraid.net/cowch/lstV2/commits/34b80cf2368228b70cd6a79d44ba0f95b5c5941a))
* bump build number to 44 ([808e3d8](https://git.tuffraid.net/cowch/lstV2/commits/808e3d84efa0889077a12cbf8e28df794a51f2bc))
* bump build number to 45 ([38d1043](https://git.tuffraid.net/cowch/lstV2/commits/38d10436069d3db1612a622d9b9e0c7aec04f6dd))
* bump build number to 46 ([532a722](https://git.tuffraid.net/cowch/lstV2/commits/532a7227631cf67664ca41133330d8cfa59f429b))
* bump build number to 47 ([f665406](https://git.tuffraid.net/cowch/lstV2/commits/f6654067f5f01c3ee4855f0cbe07593f13263ce7))
* bump build number to 48 ([97b9c4d](https://git.tuffraid.net/cowch/lstV2/commits/97b9c4db4a67faf68edae4dc1217b28f87d003e8))
* bump build number to 49 ([acb9876](https://git.tuffraid.net/cowch/lstV2/commits/acb9876d9b715894481d31d9bb104e54561710d0))
* **pkg updates:** updated all pkgs ([fb9ee15](https://git.tuffraid.net/cowch/lstV2/commits/fb9ee15bda89257815012023ed5543ef55b5f379))
* **updatescript:** added in so we can do a full install with an env creation for old ([cb3ab66](https://git.tuffraid.net/cowch/lstV2/commits/cb3ab668d866ea9e3428e548d9065a9681174e82))
## [2.8.0](https://git.tuffraid.net/cowch/lstV2/compare/v2.7.0...v2.8.0) (2025-03-16)
### 📝 Chore
* bump build number to 19 ([3ea6dc5](https://git.tuffraid.net/cowch/lstV2/commits/3ea6dc5bc46b6a060548566ea606095d0e30c96c))
### 📝 Testing Code
* **api:** testing api options to reduce the code as we keep repeating same functions ([7432dec](https://git.tuffraid.net/cowch/lstV2/commits/7432decd3ce9033ad310850fe5b0cbba076526a5))
* **printers:** started printer migration ([04a607d](https://git.tuffraid.net/cowch/lstV2/commits/04a607d3bcf2020624e45ba5ddf83f0b13acbbc7))
### 🛠️ Code Refactor
* **reader:** added in missing columns needed in the table ([020fdc8](https://git.tuffraid.net/cowch/lstV2/commits/020fdc83af2b5e90b76fa43b884965f82b5db466))
* **rfid tags:** update tag table to include what is needed and changed columns to be correct ([d178e04](https://git.tuffraid.net/cowch/lstV2/commits/d178e0436247d83b3e33dc7c92bb49aa023b6198))
* **rfid:** cleaned up contorller folder ([1a79a97](https://git.tuffraid.net/cowch/lstV2/commits/1a79a9792913bb984f230f29fede1bfa6da2991f))
### 🌟 Enhancements
* **api:** added in a response function to reduce the over responses as they are always the same ([7bfb48b](https://git.tuffraid.net/cowch/lstV2/commits/7bfb48b81fcfe759e8f448db30db93b1c320de1a))
* **rfid:** add/update readers now possible ([4aae659](https://git.tuffraid.net/cowch/lstV2/commits/4aae659ee41d952e823ba4582b4d3fab05bd2500))
* **rfid:** no read console log for now but will show in frontend as well ([4b92a28](https://git.tuffraid.net/cowch/lstV2/commits/4b92a28dfa3db011a451aff913175ff8d21feb1b))
* **rfid:** reader and tag db completed ([33803a6](https://git.tuffraid.net/cowch/lstV2/commits/33803a69a6b9b0d24297f7a9d463d16dbae4ca44))
* **tag reading:** more tag reading updates, with more contorl now ([cb59f58](https://git.tuffraid.net/cowch/lstV2/commits/cb59f589264583b2ee6d8f0255d3ceb33f101a01))
## [2.7.0](https://git.tuffraid.net/cowch/lstV2/compare/v2.6.0...v2.7.0) (2025-03-15)
### 📝 Chore
* bump build number to 10 ([245ba19](https://git.tuffraid.net/cowch/lstV2/commits/245ba19cdc7e67fec9343bb9eba90287d8951854))
* bump build number to 11 ([c9a5203](https://git.tuffraid.net/cowch/lstV2/commits/c9a520313160959ed929351f55bd18606b6500a9))
* bump build number to 12 ([b1d25c7](https://git.tuffraid.net/cowch/lstV2/commits/b1d25c7ba27a72c42803a3b482234c41670a07a2))
* bump build number to 13 ([bcd65b4](https://git.tuffraid.net/cowch/lstV2/commits/bcd65b4b91cf6cb24a32323ead5ff6a73d3c9d3d))
* bump build number to 14 ([a2fb845](https://git.tuffraid.net/cowch/lstV2/commits/a2fb845e2efbeb8becf91082343770b2d730330c))
* bump build number to 15 ([0b72ffa](https://git.tuffraid.net/cowch/lstV2/commits/0b72ffa935be81476a15166fd60ae8cabe29d297))
* bump build number to 16 ([44da09d](https://git.tuffraid.net/cowch/lstV2/commits/44da09d22c4d946c981d408d797ea121d26690b6))
* bump build number to 17 ([1ce5f9a](https://git.tuffraid.net/cowch/lstV2/commits/1ce5f9acf752f5f4bcb4b2ff1c71f54ffb9331f3))
* bump build number to 18 ([b6f1cfd](https://git.tuffraid.net/cowch/lstV2/commits/b6f1cfdc6c71e351fb90ec7729e0d0f89322174f))
### 🛠️ Code Refactor
* **frontend:** removed tanstack devTools ([3594278](https://git.tuffraid.net/cowch/lstV2/commits/359427824bae319b7f2f406eb52b8f9c43be198f))
* **frontend:** removed the caption from settings table ([35acd2b](https://git.tuffraid.net/cowch/lstV2/commits/35acd2b0b3af7b9d010cb8f78f088ab3a539c54b))
### 🌟 Enhancements
* **frontend:** added in proper links for settings and servers to the sidebar ([cbdd218](https://git.tuffraid.net/cowch/lstV2/commits/cbdd218fe454e38a7cf0c4d0ddf60d1f20e15ee2))
* **frontend:** added in update server page only for sysAdmin ([625d596](https://git.tuffraid.net/cowch/lstV2/commits/625d5969be2dbde9e97f6607c33c5e5b14e3d192))
* **new setting:** added in devDir ment for updating servers ([5b97d07](https://git.tuffraid.net/cowch/lstV2/commits/5b97d078c583f3e78d52dbc135da99a0175c8e54))
* **server upgrade:** added in a catch incase we try to upgrade again ([ab16059](https://git.tuffraid.net/cowch/lstV2/commits/ab16059387b7cb46e2a3d86f6da09a31899bd5d6))
* **server:** added in update server as well as get serverdata ([df252e7](https://git.tuffraid.net/cowch/lstV2/commits/df252e72b39d811ffbbb0af49aaf43ff22081f48))
* **serverdata:** added catch if we are not on localhost we cant actaully see the devDir in set ([f3fa617](https://git.tuffraid.net/cowch/lstV2/commits/f3fa617aa53ed35f461b71f5e479ea521412936e))
* **serverdata:** added in bowling green 2 ([7529cc5](https://git.tuffraid.net/cowch/lstV2/commits/7529cc5b0cc2c6542e8f4af07d465b6a9f4295b1))
* **sql query:** added 2 catches if not connected dont run ([cb7a406](https://git.tuffraid.net/cowch/lstV2/commits/cb7a4068fcffc7a1d85c2e04f2eeaebdc264705c))
* **sql server:** added in the ping check to not spam if we are not connected ([e4d15ef](https://git.tuffraid.net/cowch/lstV2/commits/e4d15ef051f6c72d2cca9bb9fb61ff78849db8c4))
### 🐛 Bug fixes
* **frontend:** if the modules returns and error we want to use an empty array ([2370d45](https://git.tuffraid.net/cowch/lstV2/commits/2370d45220c5e1c3215a3f2fce9582d8f2bbd3ed))
* **rfid:** correction to the params and incorrect naming ([a73c63c](https://git.tuffraid.net/cowch/lstV2/commits/a73c63cefa67f43300f4695f40f2248bcab8f40e))
* **zippaths:** corrected the paths to the src that were moved the the env ([246b5a1](https://git.tuffraid.net/cowch/lstV2/commits/246b5a17bd4ffe47654416fa4a1be446f8bffbd0))
## [2.6.0](https://git.tuffraid.net/cowch/lstV2/compare/v2.5.1...v2.6.0) (2025-03-14)
### 📝 Chore
* bump build number to 9 ([542c08f](https://git.tuffraid.net/cowch/lstV2/commits/542c08f10ba590e7174864c7970fd0ac03ffebf9))
### 🛠️ Code Refactor
* **pkg:** removed dir stuff and moved to env ([242494a](https://git.tuffraid.net/cowch/lstV2/commits/242494a4eaaca0aaf12e9a309e5611e17ac9ccb0))
### 🌟 Enhancements
* **app update:** finished the app build / deploy functions and a scripts migration ([81eb10e](https://git.tuffraid.net/cowch/lstV2/commits/81eb10e021fd29e33ee3f7393439c72427df9561))
* **pkgdata:** moved the pkg info to a global function ([51b81b9](https://git.tuffraid.net/cowch/lstV2/commits/51b81b97bc4c4b112b128818d203deba49fb5011))
### [2.5.1](https://git.tuffraid.net/cowch/lstV2/compare/v2.5.0...v2.5.1) (2025-03-14)
### 📝 Testing Code
* **lst:** readded prodBuild ([5696871](https://git.tuffraid.net/cowch/lstV2/commits/5696871b8d56374b508df77e3c6b18421865605f))
## [2.5.0](https://git.tuffraid.net/cowch/lstV2/compare/v2.4.0...v2.5.0) (2025-03-14)
### 🚀 Performance
* **auth:** changed the way logs look in the setRoles ([d95b81d](https://git.tuffraid.net/cowch/lstV2/commits/d95b81d303192f176a970ee1de5ffd7afd5d475c))
### 🛠️ Code Refactor
* **auth:** added in timeout for adding new roles to make sure everything else is connected 1st ([2130ade](https://git.tuffraid.net/cowch/lstV2/commits/2130adedb3a766268a73950cd21ac3a21e20bdeb))
* **sql:** reduced the time before start up ([80567d2](https://git.tuffraid.net/cowch/lstV2/commits/80567d2dd95fa141fea21fbaf8f9bc22386f92d0))
* **system:** checks now in time out to ensure everything connected ([78dc597](https://git.tuffraid.net/cowch/lstV2/commits/78dc597477a51a8b86f7b3dde1e02b9cdb732afa))
### 🐛 Bug fixes
* **auth:** proper logging for errors in role check ([90d0760](https://git.tuffraid.net/cowch/lstV2/commits/90d0760352bf9d77dd2c1c3c449f1e7f4a5a4056))
* **consumption:** correction to the status code to always be 200 on success: true ([5c2d79c](https://git.tuffraid.net/cowch/lstV2/commits/5c2d79c125d051e44cf4e5aa8316127d1619af3e))
* **crash alerts:** remmoved close sql as it spammed bad when we couldnt connect ([84ce009](https://git.tuffraid.net/cowch/lstV2/commits/84ce009310b2ddd5daf5af25a38ca78c7469ebff))
* **query:** shipmentPallets change from last move to production date ([155b7d9](https://git.tuffraid.net/cowch/lstV2/commits/155b7d92aa876cf9e313dc4cd2cd68193f4a9772))
* **serverdata:** fixed a bug in the serverData check ([4b53700](https://git.tuffraid.net/cowch/lstV2/commits/4b53700603ab2110f5abd2dbc9354a99e5950971))
* **sql server:** correct return when we cant connect to the server ([d5e9176](https://git.tuffraid.net/cowch/lstV2/commits/d5e9176d53b396a9dc16686ad2cfa8b59e4672eb))
* **sql server:** reduced the risk of error when missing data ([6158f25](https://git.tuffraid.net/cowch/lstV2/commits/6158f254b7de890a2262a59d0aeb32411d17d6fd))
* **sql:** oops forgot to remove the returns i put in to ignore an error ([bb1635a](https://git.tuffraid.net/cowch/lstV2/commits/bb1635a5b4dc0e6ca324bdf7ea8ecd89c33a9d3d))
### 🌟 Enhancements
* **build and zip:** migrated build and zip process from v1 ([df85a30](https://git.tuffraid.net/cowch/lstV2/commits/df85a30dffdc87e5c0475e45559ec81921605d60))
* **db:** serverData added in ([3c2b10b](https://git.tuffraid.net/cowch/lstV2/commits/3c2b10b28cdafd269c0f24dcb1dfa79471eb52d0))
* **install:** added install instructions ([f69a40a](https://git.tuffraid.net/cowch/lstV2/commits/f69a40af3af932c0e4e8552b17b099edd64b280a))
* **ocme:** added in shipment data with increased checked ([c386c5e](https://git.tuffraid.net/cowch/lstV2/commits/c386c5ea8b5500a99c49c2750d9b1f3e2816521a))
* **ping:** added in 3 new funcitons to ping devices to see if they are alive before doing something ([a18cf65](https://git.tuffraid.net/cowch/lstV2/commits/a18cf652fad80c3c5b22e3ec50999831930c211b))
* **rfid:** added tables to the db for tags and readers ([dc04d97](https://git.tuffraid.net/cowch/lstV2/commits/dc04d97229f61bfeab59d0cf27135d9e0efada8a))
* **server:** added a missing db prevention crash ([b9724aa](https://git.tuffraid.net/cowch/lstV2/commits/b9724aa89c47edaf1dbbf730e0605166626c9936))
* **serverdata:** all server info will be in all servers now for reduncay ([58975ca](https://git.tuffraid.net/cowch/lstV2/commits/58975ca117158e9f017343f938b8943694433ed3))
* **settings:** added in more settings ([d6942dd](https://git.tuffraid.net/cowch/lstV2/commits/d6942dd9826cfa4497a60a67eeb67d0957a904ed))
* **sql server:** added ping check to make sure the server is online before we try to connect ([c2c43b1](https://git.tuffraid.net/cowch/lstV2/commits/c2c43b1e2248bb2c48599f8f83f29568dc102a4d))
### 📝 Chore
* bump build number to 4 ([bd4ca7b](https://git.tuffraid.net/cowch/lstV2/commits/bd4ca7ba63a9dafd1b96dd1672ef221da558a7c2))
* bump build number to 5 ([d852e9e](https://git.tuffraid.net/cowch/lstV2/commits/d852e9e57370a9f77664eb74999c87b494b56c4e))
* bump build number to 6 ([8363cc2](https://git.tuffraid.net/cowch/lstV2/commits/8363cc2816b64f60d66926bb006c2079b2968cfb))
* bump build number to 7 ([571b74f](https://git.tuffraid.net/cowch/lstV2/commits/571b74f0e7a5f1e6ef1a13548c21c6f8c7d0c770))
* bump build number to 8 ([5f5757c](https://git.tuffraid.net/cowch/lstV2/commits/5f5757c7848903abfce50e2992ed31f3ecfb99ac))
* **ignore:** ignoring build folder as we dont want this to push to the server ([eaac814](https://git.tuffraid.net/cowch/lstV2/commits/eaac8143e9fe0e93f59e6229b39a8aa6bc49d79e))
* **pkg:** added admin section as well as correct a couple areas for builds ([45b1f7c](https://git.tuffraid.net/cowch/lstV2/commits/45b1f7c0a6a529fdde9624b257021ea30997ffdd))
### 📈 Project changes
* **lst:** changes to improve the build process ([200ec97](https://git.tuffraid.net/cowch/lstV2/commits/200ec975f742de8a4c7d28bdc1362dba9e15a582))
### 📝 Testing Code
* **apihits:** monitoring this still to make sure its working as intended but low priority ([9c66e6a](https://git.tuffraid.net/cowch/lstV2/commits/9c66e6aac6200c34afa74d8c4d178374dd5ef5ca))
* **buildserver:** build serer checks ([dd88f25](https://git.tuffraid.net/cowch/lstV2/commits/dd88f258edf4d7c0cefd8d6baa290c7cf2b9b805))
* **pkg:** removed the combined command to deploy ([1cb8b70](https://git.tuffraid.net/cowch/lstV2/commits/1cb8b7043008b1e396b0fe43175459284ce35561))
* **rfid:** intial trials built ([da04e9d](https://git.tuffraid.net/cowch/lstV2/commits/da04e9d35d2aecbc9c4a930fe9a217409c35aef2))
* **updates:** rewrite of update system ([0054c8f](https://git.tuffraid.net/cowch/lstV2/commits/0054c8f7d44745bdf710696764ff909bed6f3647))
## [2.4.0](https://git.tuffraid.net/cowch/lstV2/compare/v2.3.0...v2.4.0) (2025-03-10)
### 🐛 Bug fixes
* **auth:** changed the profile update so we can run correctly now ([cd41095](https://git.tuffraid.net/cowch/lstV2/commits/cd4109533ef68555cce5eeb57d537bae23c78b63))
* **logging:** updated entire server side to the new logging system ([12e15ba](https://git.tuffraid.net/cowch/lstV2/commits/12e15babb45bffbd7322197d850fa0507c86c05f))
* **lst:** corrected the version rc so the links actaully work ([f5fd1fc](https://git.tuffraid.net/cowch/lstV2/commits/f5fd1fc605259c7cfa2587ed2772bc04d10f8f58))
* **modules:** added in a type check to make sure a boolean is sent over ([8204ec4](https://git.tuffraid.net/cowch/lstV2/commits/8204ec4a1a6f4f0e8ab0bea17f7a5709b4db5e9d))
* **server:** changed the url to always be lowercase when it comes over ([c74f8e2](https://git.tuffraid.net/cowch/lstV2/commits/c74f8e2a5f888fadc2a9b1e21b9ed3c936d03414))
* **user:** when user didnt hape permissions would error, changed to have undefined now ([65b35bc](https://git.tuffraid.net/cowch/lstV2/commits/65b35bc9a3d415354b525dfb495b698530bf82e7))
### 📝 Testing Code
* **apihits:** framework for apiHits to be implemented but no db insert yet ([22e050e](https://git.tuffraid.net/cowch/lstV2/commits/22e050ebfa892053bace28c00d048d4d6c052a04))
* **ocme:** shipment pallets ([8c31ac7](https://git.tuffraid.net/cowch/lstV2/commits/8c31ac723daaff779761073e31714bc8823f2ddb))
### 🛠️ Code Refactor
* **db:** added in a db config for dev ([008717b](https://git.tuffraid.net/cowch/lstV2/commits/008717b988702b6509044ce56304997b2b661ff1))
* **logger:** changed so that everything comes over as lowerCase to make it more easy to search ([40b970e](https://git.tuffraid.net/cowch/lstV2/commits/40b970ef92ab8045a5a72c672866fc1bb37bb908))
* **modules:** changed how the defaults are on some modules ([4fe400a](https://git.tuffraid.net/cowch/lstV2/commits/4fe400af3b90cf507e9765c17d2d70fbe5f2d2cb))
* **ocme:** added in apihits to getinfo ([e256276](https://git.tuffraid.net/cowch/lstV2/commits/e2562768a5185563a6cd4bb7ed35a3d6e0116f16))
* **ocme:** changes made so that we only get the not picked up pallets ([f15afe5](https://git.tuffraid.net/cowch/lstV2/commits/f15afe5c116865b11f6c51981562f19bef47b6bc))
* **ocme:** postRunning number removed bloat ([a5cd843](https://git.tuffraid.net/cowch/lstV2/commits/a5cd8433f79a439490b3b351f91ae7c1ba12adcb))
* **register:** split the code to be more standard to the rest of the app ([27d242f](https://git.tuffraid.net/cowch/lstV2/commits/27d242f4f3604a8636659db671fd3948fa0cf694))
* **scripts:** added in a prodInstall to also take care of db migrations ([cf8cb9b](https://git.tuffraid.net/cowch/lstV2/commits/cf8cb9b9ed328b10e0196052f2d9b5bb4bc2c7f0))
* **server:consume:** change so error returns 200 so we can see the true error ([0e579c8](https://git.tuffraid.net/cowch/lstV2/commits/0e579c84b588d6f0aabfef413a410c028bbc9cf5))
* **server:** added in ability to listen on all ip's ([6d1157a](https://git.tuffraid.net/cowch/lstV2/commits/6d1157a9d0ba0f4c26e57e07e4888fd0b44f819c))
* **server:** added in an example powershell script to install ([6e20928](https://git.tuffraid.net/cowch/lstV2/commits/6e209289431e6e1426e65862f05df7e967bec7b8))
* **settings:** refactored the query placement for better reuse ([71a951a](https://git.tuffraid.net/cowch/lstV2/commits/71a951a9f246eb89bca362052def7e126b704de1))
### 🌟 Enhancements
* **auth:** added in a rolling token ([50cf873](https://git.tuffraid.net/cowch/lstV2/commits/50cf87380da023b1f9edef961ab7791fba9dbec7))
* **eom:** frame work added in for eom ([fda0719](https://git.tuffraid.net/cowch/lstV2/commits/fda0719d87b57510b09a944f77945d5d92d75d40))
* **frontend:** added in checks for links inside the module ([c30a48c](https://git.tuffraid.net/cowch/lstV2/commits/c30a48c4b85d633c3a60eaa4599de644cbed230e))
* **frontend:** added the start to the material help center ([aae9813](https://git.tuffraid.net/cowch/lstV2/commits/aae9813f9c93a3b768bca2a405d513d684065234))
* **logger:** added transport to post to db instead of file ([ce11b1f](https://git.tuffraid.net/cowch/lstV2/commits/ce11b1f57e6370d6d682a39f93d73d31907168ac))
* **lst:** added update settings into the entire app ([5fcadb9](https://git.tuffraid.net/cowch/lstV2/commits/5fcadb9fc837c1c773167f21d2ffd5a01e258ecf))
* **materials:** added in comsumption card to consume based on running nr ([9df643c](https://git.tuffraid.net/cowch/lstV2/commits/9df643ce6b367e6f16c41e87d48b570f207343b8))
* **ocme:** added in ocme with endpoints base ([ef26b6a](https://git.tuffraid.net/cowch/lstV2/commits/ef26b6aa7936b2a9aeafb6f3dd54c50f7b74d507))
* **ocme:** added in picked up and included a all function to reduce endpoints ([1bcb4db](https://git.tuffraid.net/cowch/lstV2/commits/1bcb4db32878d5f270197791782b43d277c58158))
* **ocme:** finalized posting RN and sscc just to keep it the same as ocme ([971038b](https://git.tuffraid.net/cowch/lstV2/commits/971038b10e90b74e187edfa133ab159bf0618d49))
* **ocme:** new setting for determining the fifo check ([123d8a0](https://git.tuffraid.net/cowch/lstV2/commits/123d8a09bae1f254787835103ac5ed5ca991048e))
* **ocme:** pickedup route added ([c5f1281](https://git.tuffraid.net/cowch/lstV2/commits/c5f12814eac59672d1e08a95286551fd03b6c0f6))
* **permissions:** more permissions for accessing via sidbar ([6c4e14f](https://git.tuffraid.net/cowch/lstV2/commits/6c4e14fad3ba590d496f2981c952e2f17d729d79))
* **querys:** plant query for gln and label data for sscc and other info ([995311c](https://git.tuffraid.net/cowch/lstV2/commits/995311c5631a5538ab791b118e1b5b975da3f205))
* **roles:** added tester role ([0eb6070](https://git.tuffraid.net/cowch/lstV2/commits/0eb60706e4fad00746a0804a4e94e65d8e663c6d))
* **server:** added in a default set of settings that will be checked on startup ([4195b9e](https://git.tuffraid.net/cowch/lstV2/commits/4195b9e8bc4f9607d14412c9e6e5e151217b1178))
* **server:** added in ocp to the module list ([d293ca6](https://git.tuffraid.net/cowch/lstV2/commits/d293ca6981139532e4dd0f8d44885ab32091d1ef))
* **sqlserver:** added in the sqlconnnection ([a1c9ad6](https://git.tuffraid.net/cowch/lstV2/commits/a1c9ad65b8ee9cfaaafef602bdd2fd56ff1c365f))
* **sscc:** added in a creation of the sscc for now only ocme but will extend to be label data ([8b1c65d](https://git.tuffraid.net/cowch/lstV2/commits/8b1c65db4e03b070fc7a9b80c4c0370121cf7607))
* **tcpserver:** added in the intial tcpServer startup ([402ce73](https://git.tuffraid.net/cowch/lstV2/commits/402ce734b3608c391a4a11b6875d7c2acb8989a9))
## [2.3.0](https://git.tuffraid.net/cowch/lstV2/compare/v1.2.0...v2.3.0) (2025-03-05)

13
database/migrations/0011_aberrant_nehzno.sql Normal file
View File

@@ -0,0 +1,13 @@
CREATE TABLE "ocmeData" (
"ocme_id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
"sscc" text,
"runningNr" numeric NOT NULL,
"completed" boolean DEFAULT false,
"lineNum" numeric NOT NULL,
"pickedUp" boolean DEFAULT false,
"areaFrom" text NOT NULL,
"add_User" text DEFAULT 'LST_System' NOT NULL,
"add_Date" timestamp DEFAULT now(),
"upd_User" text DEFAULT 'LST_System' NOT NULL,
"upd_date" timestamp DEFAULT now()
);

8
database/migrations/0012_mixed_captain_stacy.sql Normal file
View File

@@ -0,0 +1,8 @@
CREATE TABLE "logs" (
"log_id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
"level" text,
"username" text DEFAULT 'LST_Serivce',
"service" text DEFAULT 'system' NOT NULL,
"message" text NOT NULL,
"add_Date" timestamp DEFAULT now()
);

34
database/migrations/0013_conscious_rhodey.sql Normal file
View File

@@ -0,0 +1,34 @@
CREATE TABLE "apiHits" (
"ip" text,
"endpoint" text,
"action" text,
"lastBody" text,
"stats" text,
"add_date" timestamp DEFAULT now(),
"upd_date" timestamp DEFAULT now()
);
--> statement-breakpoint
CREATE TABLE "serverData" (
"server_id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
"sName" text NOT NULL,
"serverDNS" text NOT NULL,
"plantToken" text NOT NULL,
"idAddress" text NOT NULL,
"greatPlainsPlantCode" numeric NOT NULL,
"streetAddress" text NOT NULL,
"cityState" text NOT NULL,
"zipcode" numeric,
"contactEmail" text,
"contactPhone" text,
"customerTiAcc" text,
"lstServerPort" numeric DEFAULT '4000',
"active" boolean DEFAULT true,
"serverLoc" text NOT NULL,
"oldVersion" text NOT NULL,
"lastUpdated" timestamp DEFAULT now(),
"shippingHours" text DEFAULT '[{"early": "06:30", "late": "23:00"}]',
"tiPostTime" text DEFAULT '[{"from": "24", "to": "24"}]',
"otherSettings" jsonb DEFAULT '[{"specialInstructions":"something for ti","active":false}]'::jsonb NOT NULL
);
--> statement-breakpoint
CREATE UNIQUE INDEX "plantToken" ON "serverData" USING btree ("plantToken");

10
database/migrations/0014_illegal_thundra.sql Normal file
View File

@@ -0,0 +1,10 @@
ALTER TABLE "serverData" ALTER COLUMN "serverDNS" DROP NOT NULL;--> statement-breakpoint
ALTER TABLE "serverData" ALTER COLUMN "plantToken" DROP NOT NULL;--> statement-breakpoint
ALTER TABLE "serverData" ALTER COLUMN "idAddress" DROP NOT NULL;--> statement-breakpoint
ALTER TABLE "serverData" ALTER COLUMN "greatPlainsPlantCode" DROP NOT NULL;--> statement-breakpoint
ALTER TABLE "serverData" ALTER COLUMN "streetAddress" DROP NOT NULL;--> statement-breakpoint
ALTER TABLE "serverData" ALTER COLUMN "cityState" DROP NOT NULL;--> statement-breakpoint
ALTER TABLE "serverData" ALTER COLUMN "lstServerPort" DROP DEFAULT;--> statement-breakpoint
ALTER TABLE "serverData" ALTER COLUMN "serverLoc" DROP NOT NULL;--> statement-breakpoint
ALTER TABLE "serverData" ALTER COLUMN "oldVersion" DROP NOT NULL;--> statement-breakpoint
ALTER TABLE "serverData" ALTER COLUMN "otherSettings" DROP NOT NULL;

20
database/migrations/0015_wonderful_lady_vermin.sql Normal file
View File

@@ -0,0 +1,20 @@
CREATE TABLE "rfidReaders" (
"rfidReader_id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
"reader" text,
"readerIP" text,
"lastHeartBeat" timestamp DEFAULT now()
);
--> statement-breakpoint
CREATE TABLE "rfidTags" (
"rfidTag_id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
"tagHex" text,
"tag" text,
"timeStamp" timestamp DEFAULT now(),
"counts" jsonb NOT NULL,
"lastareaIn" text NOT NULL,
"runningNumber" numeric NOT NULL,
"created_at" timestamp DEFAULT now()
);
--> statement-breakpoint
CREATE UNIQUE INDEX "reader" ON "rfidReaders" USING btree ("reader");--> statement-breakpoint
CREATE UNIQUE INDEX "tagHex" ON "rfidTags" USING btree ("tagHex");

1
database/migrations/0016_wet_doctor_strange.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE "serverData" ADD COLUMN "isUpgrading" boolean DEFAULT false;

1
database/migrations/0017_bitter_brood.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE "rfidReaders" ADD COLUMN "lastTrigger" timestamp DEFAULT now();

1
database/migrations/0018_lovely_landau.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE "rfidReaders" ADD COLUMN "active" boolean DEFAULT true;

2
database/migrations/0019_greedy_justice.sql Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE "rfidTags" ADD COLUMN "antenna" numeric;--> statement-breakpoint
ALTER TABLE "rfidTags" ADD COLUMN "tagStrength" numeric;

2
database/migrations/0020_empty_thundra.sql Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE "rfidTags" ALTER COLUMN "counts" SET DEFAULT '[]'::jsonb;--> statement-breakpoint
ALTER TABLE "rfidTags" ALTER COLUMN "counts" DROP NOT NULL;

4
database/migrations/0021_premium_albert_cleary.sql Normal file
View File

@@ -0,0 +1,4 @@
ALTER TABLE "rfidTags" ALTER COLUMN "runningNumber" SET DATA TYPE integer;--> statement-breakpoint
ALTER TABLE "rfidTags" ALTER COLUMN "runningNumber" DROP NOT NULL;--> statement-breakpoint
ALTER TABLE "rfidTags" ALTER COLUMN "antenna" SET DATA TYPE integer;--> statement-breakpoint
ALTER TABLE "rfidTags" ALTER COLUMN "tagStrength" SET DATA TYPE integer;

1
database/migrations/0022_amused_true_believers.sql Normal file
View File

@@ -0,0 +1 @@
ALTER TABLE "rfidReaders" ADD COLUMN "lastTiggerGood" boolean DEFAULT true;

2
database/migrations/0023_wealthy_marvel_boy.sql Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE "logs" ADD COLUMN "checked" boolean DEFAULT false;--> statement-breakpoint
ALTER TABLE "logs" ADD COLUMN "checkedAt" timestamp;

9
database/migrations/0024_curved_venom.sql Normal file
View File

@@ -0,0 +1,9 @@
CREATE TABLE "manualPrinting" (
"print_id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
"line" integer,
"printReason" text NOT NULL,
"initials" text NOT NULL,
"additionalComments" text NOT NULL,
"add_date" timestamp DEFAULT now(),
"add_user" text
);

2
database/migrations/0025_amusing_sugar_man.sql Normal file
View File

@@ -0,0 +1,2 @@
DROP TABLE "apiHits" CASCADE;--> statement-breakpoint
DROP TABLE "eom" CASCADE;

633
database/migrations/meta/0011_snapshot.json Normal file
View File

@@ -0,0 +1,633 @@
{
"id": "e9f4e761-c157-4780-bc41-a91c7b63f5f9",
"prevId": "f6cf1c56-3bd4-492c-8324-1800b18f3d03",
"version": "7",
"dialect": "postgresql",
"tables": {
"public.eom": {
"name": "eom",
"schema": "",
"columns": {
"eomMonth": {
"name": "eomMonth",
"type": "date",
"primaryKey": false,
"notNull": true
},
"article": {
"name": "article",
"type": "text",
"primaryKey": false,
"notNull": true
},
"articleDescription": {
"name": "articleDescription",
"type": "text",
"primaryKey": false,
"notNull": true
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.modules": {
"name": "modules",
"schema": "",
"columns": {
"module_id": {
"name": "module_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"active": {
"name": "active",
"type": "boolean",
"primaryKey": false,
"notNull": false,
"default": false
},
"roles": {
"name": "roles",
"type": "jsonb",
"primaryKey": false,
"notNull": true,
"default": "'[\"view\",\"systemAdmin\"]'::jsonb"
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"module_name": {
"name": "module_name",
"columns": [
{
"expression": "name",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.ocmeData": {
"name": "ocmeData",
"schema": "",
"columns": {
"ocme_id": {
"name": "ocme_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"sscc": {
"name": "sscc",
"type": "text",
"primaryKey": false,
"notNull": false
},
"runningNr": {
"name": "runningNr",
"type": "numeric",
"primaryKey": false,
"notNull": true
},
"completed": {
"name": "completed",
"type": "boolean",
"primaryKey": false,
"notNull": false,
"default": false
},
"lineNum": {
"name": "lineNum",
"type": "numeric",
"primaryKey": false,
"notNull": true
},
"pickedUp": {
"name": "pickedUp",
"type": "boolean",
"primaryKey": false,
"notNull": false,
"default": false
},
"areaFrom": {
"name": "areaFrom",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.roles": {
"name": "roles",
"schema": "",
"columns": {
"role_id": {
"name": "role_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"role_name": {
"name": "role_name",
"columns": [
{
"expression": "name",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.settings": {
"name": "settings",
"schema": "",
"columns": {
"role_id": {
"name": "role_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"value": {
"name": "value",
"type": "text",
"primaryKey": false,
"notNull": true
},
"description": {
"name": "description",
"type": "text",
"primaryKey": false,
"notNull": false
},
"moduleName": {
"name": "moduleName",
"type": "text",
"primaryKey": false,
"notNull": false
},
"roles": {
"name": "roles",
"type": "jsonb",
"primaryKey": false,
"notNull": true,
"default": "'[\"systemAdmin\"]'::jsonb"
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"name": {
"name": "name",
"columns": [
{
"expression": "name",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.userRoles": {
"name": "userRoles",
"schema": "",
"columns": {
"user_id": {
"name": "user_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"role_id": {
"name": "role_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"module_id": {
"name": "module_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"role": {
"name": "role",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"user_module_unique": {
"name": "user_module_unique",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
},
{
"expression": "module_id",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {
"userRoles_user_id_users_user_id_fk": {
"name": "userRoles_user_id_users_user_id_fk",
"tableFrom": "userRoles",
"tableTo": "users",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"user_id"
],
"onDelete": "no action",
"onUpdate": "no action"
},
"userRoles_role_id_roles_role_id_fk": {
"name": "userRoles_role_id_roles_role_id_fk",
"tableFrom": "userRoles",
"tableTo": "roles",
"columnsFrom": [
"role_id"
],
"columnsTo": [
"role_id"
],
"onDelete": "no action",
"onUpdate": "no action"
},
"userRoles_module_id_modules_module_id_fk": {
"name": "userRoles_module_id_modules_module_id_fk",
"tableFrom": "userRoles",
"tableTo": "modules",
"columnsFrom": [
"module_id"
],
"columnsTo": [
"module_id"
],
"onDelete": "no action",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.users": {
"name": "users",
"schema": "",
"columns": {
"user_id": {
"name": "user_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"username": {
"name": "username",
"type": "text",
"primaryKey": false,
"notNull": true
},
"email": {
"name": "email",
"type": "text",
"primaryKey": false,
"notNull": true
},
"password": {
"name": "password",
"type": "text",
"primaryKey": false,
"notNull": true
},
"passwordToken": {
"name": "passwordToken",
"type": "text",
"primaryKey": false,
"notNull": false
},
"passwordTokenExpires": {
"name": "passwordTokenExpires",
"type": "timestamp",
"primaryKey": false,
"notNull": false
},
"active": {
"name": "active",
"type": "boolean",
"primaryKey": false,
"notNull": true,
"default": true
},
"pingcode": {
"name": "pingcode",
"type": "numeric",
"primaryKey": false,
"notNull": false
},
"role": {
"name": "role",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'user'"
},
"lastLogin": {
"name": "lastLogin",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"username": {
"name": "username",
"columns": [
{
"expression": "username",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
}
},
"enums": {},
"schemas": {},
"sequences": {},
"roles": {},
"policies": {},
"views": {},
"_meta": {
"columns": {},
"schemas": {},
"tables": {}
}
}

686
database/migrations/meta/0012_snapshot.json Normal file
View File

@@ -0,0 +1,686 @@
{
"id": "756faedf-1bcb-43eb-b122-93287c80122e",
"prevId": "e9f4e761-c157-4780-bc41-a91c7b63f5f9",
"version": "7",
"dialect": "postgresql",
"tables": {
"public.eom": {
"name": "eom",
"schema": "",
"columns": {
"eomMonth": {
"name": "eomMonth",
"type": "date",
"primaryKey": false,
"notNull": true
},
"article": {
"name": "article",
"type": "text",
"primaryKey": false,
"notNull": true
},
"articleDescription": {
"name": "articleDescription",
"type": "text",
"primaryKey": false,
"notNull": true
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.logs": {
"name": "logs",
"schema": "",
"columns": {
"log_id": {
"name": "log_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"level": {
"name": "level",
"type": "text",
"primaryKey": false,
"notNull": false
},
"username": {
"name": "username",
"type": "text",
"primaryKey": false,
"notNull": false,
"default": "'LST_Serivce'"
},
"service": {
"name": "service",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'system'"
},
"message": {
"name": "message",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.modules": {
"name": "modules",
"schema": "",
"columns": {
"module_id": {
"name": "module_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"active": {
"name": "active",
"type": "boolean",
"primaryKey": false,
"notNull": false,
"default": false
},
"roles": {
"name": "roles",
"type": "jsonb",
"primaryKey": false,
"notNull": true,
"default": "'[\"view\",\"systemAdmin\"]'::jsonb"
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"module_name": {
"name": "module_name",
"columns": [
{
"expression": "name",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.ocmeData": {
"name": "ocmeData",
"schema": "",
"columns": {
"ocme_id": {
"name": "ocme_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"sscc": {
"name": "sscc",
"type": "text",
"primaryKey": false,
"notNull": false
},
"runningNr": {
"name": "runningNr",
"type": "numeric",
"primaryKey": false,
"notNull": true
},
"completed": {
"name": "completed",
"type": "boolean",
"primaryKey": false,
"notNull": false,
"default": false
},
"lineNum": {
"name": "lineNum",
"type": "numeric",
"primaryKey": false,
"notNull": true
},
"pickedUp": {
"name": "pickedUp",
"type": "boolean",
"primaryKey": false,
"notNull": false,
"default": false
},
"areaFrom": {
"name": "areaFrom",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.roles": {
"name": "roles",
"schema": "",
"columns": {
"role_id": {
"name": "role_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"role_name": {
"name": "role_name",
"columns": [
{
"expression": "name",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.settings": {
"name": "settings",
"schema": "",
"columns": {
"role_id": {
"name": "role_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"value": {
"name": "value",
"type": "text",
"primaryKey": false,
"notNull": true
},
"description": {
"name": "description",
"type": "text",
"primaryKey": false,
"notNull": false
},
"moduleName": {
"name": "moduleName",
"type": "text",
"primaryKey": false,
"notNull": false
},
"roles": {
"name": "roles",
"type": "jsonb",
"primaryKey": false,
"notNull": true,
"default": "'[\"systemAdmin\"]'::jsonb"
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"name": {
"name": "name",
"columns": [
{
"expression": "name",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.userRoles": {
"name": "userRoles",
"schema": "",
"columns": {
"user_id": {
"name": "user_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"role_id": {
"name": "role_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"module_id": {
"name": "module_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"role": {
"name": "role",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"user_module_unique": {
"name": "user_module_unique",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
},
{
"expression": "module_id",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {
"userRoles_user_id_users_user_id_fk": {
"name": "userRoles_user_id_users_user_id_fk",
"tableFrom": "userRoles",
"tableTo": "users",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"user_id"
],
"onDelete": "no action",
"onUpdate": "no action"
},
"userRoles_role_id_roles_role_id_fk": {
"name": "userRoles_role_id_roles_role_id_fk",
"tableFrom": "userRoles",
"tableTo": "roles",
"columnsFrom": [
"role_id"
],
"columnsTo": [
"role_id"
],
"onDelete": "no action",
"onUpdate": "no action"
},
"userRoles_module_id_modules_module_id_fk": {
"name": "userRoles_module_id_modules_module_id_fk",
"tableFrom": "userRoles",
"tableTo": "modules",
"columnsFrom": [
"module_id"
],
"columnsTo": [
"module_id"
],
"onDelete": "no action",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.users": {
"name": "users",
"schema": "",
"columns": {
"user_id": {
"name": "user_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"username": {
"name": "username",
"type": "text",
"primaryKey": false,
"notNull": true
},
"email": {
"name": "email",
"type": "text",
"primaryKey": false,
"notNull": true
},
"password": {
"name": "password",
"type": "text",
"primaryKey": false,
"notNull": true
},
"passwordToken": {
"name": "passwordToken",
"type": "text",
"primaryKey": false,
"notNull": false
},
"passwordTokenExpires": {
"name": "passwordTokenExpires",
"type": "timestamp",
"primaryKey": false,
"notNull": false
},
"active": {
"name": "active",
"type": "boolean",
"primaryKey": false,
"notNull": true,
"default": true
},
"pingcode": {
"name": "pingcode",
"type": "numeric",
"primaryKey": false,
"notNull": false
},
"role": {
"name": "role",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'user'"
},
"lastLogin": {
"name": "lastLogin",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"username": {
"name": "username",
"columns": [
{
"expression": "username",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
}
},
"enums": {},
"schemas": {},
"sequences": {},
"roles": {},
"policies": {},
"views": {},
"_meta": {
"columns": {},
"schemas": {},
"tables": {}
}
}

899
database/migrations/meta/0013_snapshot.json Normal file
View File

@@ -0,0 +1,899 @@
{
"id": "ffa912bc-dc39-4a3a-a23b-75bd2293fe74",
"prevId": "756faedf-1bcb-43eb-b122-93287c80122e",
"version": "7",
"dialect": "postgresql",
"tables": {
"public.apiHits": {
"name": "apiHits",
"schema": "",
"columns": {
"ip": {
"name": "ip",
"type": "text",
"primaryKey": false,
"notNull": false
},
"endpoint": {
"name": "endpoint",
"type": "text",
"primaryKey": false,
"notNull": false
},
"action": {
"name": "action",
"type": "text",
"primaryKey": false,
"notNull": false
},
"lastBody": {
"name": "lastBody",
"type": "text",
"primaryKey": false,
"notNull": false
},
"stats": {
"name": "stats",
"type": "text",
"primaryKey": false,
"notNull": false
},
"add_date": {
"name": "add_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.eom": {
"name": "eom",
"schema": "",
"columns": {
"eomMonth": {
"name": "eomMonth",
"type": "date",
"primaryKey": false,
"notNull": true
},
"article": {
"name": "article",
"type": "text",
"primaryKey": false,
"notNull": true
},
"articleDescription": {
"name": "articleDescription",
"type": "text",
"primaryKey": false,
"notNull": true
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.logs": {
"name": "logs",
"schema": "",
"columns": {
"log_id": {
"name": "log_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"level": {
"name": "level",
"type": "text",
"primaryKey": false,
"notNull": false
},
"username": {
"name": "username",
"type": "text",
"primaryKey": false,
"notNull": false,
"default": "'LST_Serivce'"
},
"service": {
"name": "service",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'system'"
},
"message": {
"name": "message",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.modules": {
"name": "modules",
"schema": "",
"columns": {
"module_id": {
"name": "module_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"active": {
"name": "active",
"type": "boolean",
"primaryKey": false,
"notNull": false,
"default": false
},
"roles": {
"name": "roles",
"type": "jsonb",
"primaryKey": false,
"notNull": true,
"default": "'[\"view\",\"systemAdmin\"]'::jsonb"
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"module_name": {
"name": "module_name",
"columns": [
{
"expression": "name",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.ocmeData": {
"name": "ocmeData",
"schema": "",
"columns": {
"ocme_id": {
"name": "ocme_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"sscc": {
"name": "sscc",
"type": "text",
"primaryKey": false,
"notNull": false
},
"runningNr": {
"name": "runningNr",
"type": "numeric",
"primaryKey": false,
"notNull": true
},
"completed": {
"name": "completed",
"type": "boolean",
"primaryKey": false,
"notNull": false,
"default": false
},
"lineNum": {
"name": "lineNum",
"type": "numeric",
"primaryKey": false,
"notNull": true
},
"pickedUp": {
"name": "pickedUp",
"type": "boolean",
"primaryKey": false,
"notNull": false,
"default": false
},
"areaFrom": {
"name": "areaFrom",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.roles": {
"name": "roles",
"schema": "",
"columns": {
"role_id": {
"name": "role_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"role_name": {
"name": "role_name",
"columns": [
{
"expression": "name",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.serverData": {
"name": "serverData",
"schema": "",
"columns": {
"server_id": {
"name": "server_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"sName": {
"name": "sName",
"type": "text",
"primaryKey": false,
"notNull": true
},
"serverDNS": {
"name": "serverDNS",
"type": "text",
"primaryKey": false,
"notNull": true
},
"plantToken": {
"name": "plantToken",
"type": "text",
"primaryKey": false,
"notNull": true
},
"idAddress": {
"name": "idAddress",
"type": "text",
"primaryKey": false,
"notNull": true
},
"greatPlainsPlantCode": {
"name": "greatPlainsPlantCode",
"type": "numeric",
"primaryKey": false,
"notNull": true
},
"streetAddress": {
"name": "streetAddress",
"type": "text",
"primaryKey": false,
"notNull": true
},
"cityState": {
"name": "cityState",
"type": "text",
"primaryKey": false,
"notNull": true
},
"zipcode": {
"name": "zipcode",
"type": "numeric",
"primaryKey": false,
"notNull": false
},
"contactEmail": {
"name": "contactEmail",
"type": "text",
"primaryKey": false,
"notNull": false
},
"contactPhone": {
"name": "contactPhone",
"type": "text",
"primaryKey": false,
"notNull": false
},
"customerTiAcc": {
"name": "customerTiAcc",
"type": "text",
"primaryKey": false,
"notNull": false
},
"lstServerPort": {
"name": "lstServerPort",
"type": "numeric",
"primaryKey": false,
"notNull": false,
"default": "'4000'"
},
"active": {
"name": "active",
"type": "boolean",
"primaryKey": false,
"notNull": false,
"default": true
},
"serverLoc": {
"name": "serverLoc",
"type": "text",
"primaryKey": false,
"notNull": true
},
"oldVersion": {
"name": "oldVersion",
"type": "text",
"primaryKey": false,
"notNull": true
},
"lastUpdated": {
"name": "lastUpdated",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"shippingHours": {
"name": "shippingHours",
"type": "text",
"primaryKey": false,
"notNull": false,
"default": "'[{\"early\": \"06:30\", \"late\": \"23:00\"}]'"
},
"tiPostTime": {
"name": "tiPostTime",
"type": "text",
"primaryKey": false,
"notNull": false,
"default": "'[{\"from\": \"24\", \"to\": \"24\"}]'"
},
"otherSettings": {
"name": "otherSettings",
"type": "jsonb",
"primaryKey": false,
"notNull": true,
"default": "'[{\"specialInstructions\":\"something for ti\",\"active\":false}]'::jsonb"
}
},
"indexes": {
"plantToken": {
"name": "plantToken",
"columns": [
{
"expression": "plantToken",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.settings": {
"name": "settings",
"schema": "",
"columns": {
"role_id": {
"name": "role_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"value": {
"name": "value",
"type": "text",
"primaryKey": false,
"notNull": true
},
"description": {
"name": "description",
"type": "text",
"primaryKey": false,
"notNull": false
},
"moduleName": {
"name": "moduleName",
"type": "text",
"primaryKey": false,
"notNull": false
},
"roles": {
"name": "roles",
"type": "jsonb",
"primaryKey": false,
"notNull": true,
"default": "'[\"systemAdmin\"]'::jsonb"
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"name": {
"name": "name",
"columns": [
{
"expression": "name",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.userRoles": {
"name": "userRoles",
"schema": "",
"columns": {
"user_id": {
"name": "user_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"role_id": {
"name": "role_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"module_id": {
"name": "module_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"role": {
"name": "role",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"user_module_unique": {
"name": "user_module_unique",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
},
{
"expression": "module_id",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {
"userRoles_user_id_users_user_id_fk": {
"name": "userRoles_user_id_users_user_id_fk",
"tableFrom": "userRoles",
"tableTo": "users",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"user_id"
],
"onDelete": "no action",
"onUpdate": "no action"
},
"userRoles_role_id_roles_role_id_fk": {
"name": "userRoles_role_id_roles_role_id_fk",
"tableFrom": "userRoles",
"tableTo": "roles",
"columnsFrom": [
"role_id"
],
"columnsTo": [
"role_id"
],
"onDelete": "no action",
"onUpdate": "no action"
},
"userRoles_module_id_modules_module_id_fk": {
"name": "userRoles_module_id_modules_module_id_fk",
"tableFrom": "userRoles",
"tableTo": "modules",
"columnsFrom": [
"module_id"
],
"columnsTo": [
"module_id"
],
"onDelete": "no action",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.users": {
"name": "users",
"schema": "",
"columns": {
"user_id": {
"name": "user_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"username": {
"name": "username",
"type": "text",
"primaryKey": false,
"notNull": true
},
"email": {
"name": "email",
"type": "text",
"primaryKey": false,
"notNull": true
},
"password": {
"name": "password",
"type": "text",
"primaryKey": false,
"notNull": true
},
"passwordToken": {
"name": "passwordToken",
"type": "text",
"primaryKey": false,
"notNull": false
},
"passwordTokenExpires": {
"name": "passwordTokenExpires",
"type": "timestamp",
"primaryKey": false,
"notNull": false
},
"active": {
"name": "active",
"type": "boolean",
"primaryKey": false,
"notNull": true,
"default": true
},
"pingcode": {
"name": "pingcode",
"type": "numeric",
"primaryKey": false,
"notNull": false
},
"role": {
"name": "role",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'user'"
},
"lastLogin": {
"name": "lastLogin",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"username": {
"name": "username",
"columns": [
{
"expression": "username",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
}
},
"enums": {},
"schemas": {},
"sequences": {},
"roles": {},
"policies": {},
"views": {},
"_meta": {
"columns": {},
"schemas": {},
"tables": {}
}
}

898
database/migrations/meta/0014_snapshot.json Normal file
View File

@@ -0,0 +1,898 @@
{
"id": "fdf28fe7-3743-4581-bd1f-ab0dd92f5857",
"prevId": "ffa912bc-dc39-4a3a-a23b-75bd2293fe74",
"version": "7",
"dialect": "postgresql",
"tables": {
"public.apiHits": {
"name": "apiHits",
"schema": "",
"columns": {
"ip": {
"name": "ip",
"type": "text",
"primaryKey": false,
"notNull": false
},
"endpoint": {
"name": "endpoint",
"type": "text",
"primaryKey": false,
"notNull": false
},
"action": {
"name": "action",
"type": "text",
"primaryKey": false,
"notNull": false
},
"lastBody": {
"name": "lastBody",
"type": "text",
"primaryKey": false,
"notNull": false
},
"stats": {
"name": "stats",
"type": "text",
"primaryKey": false,
"notNull": false
},
"add_date": {
"name": "add_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.eom": {
"name": "eom",
"schema": "",
"columns": {
"eomMonth": {
"name": "eomMonth",
"type": "date",
"primaryKey": false,
"notNull": true
},
"article": {
"name": "article",
"type": "text",
"primaryKey": false,
"notNull": true
},
"articleDescription": {
"name": "articleDescription",
"type": "text",
"primaryKey": false,
"notNull": true
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.logs": {
"name": "logs",
"schema": "",
"columns": {
"log_id": {
"name": "log_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"level": {
"name": "level",
"type": "text",
"primaryKey": false,
"notNull": false
},
"username": {
"name": "username",
"type": "text",
"primaryKey": false,
"notNull": false,
"default": "'LST_Serivce'"
},
"service": {
"name": "service",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'system'"
},
"message": {
"name": "message",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.modules": {
"name": "modules",
"schema": "",
"columns": {
"module_id": {
"name": "module_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"active": {
"name": "active",
"type": "boolean",
"primaryKey": false,
"notNull": false,
"default": false
},
"roles": {
"name": "roles",
"type": "jsonb",
"primaryKey": false,
"notNull": true,
"default": "'[\"view\",\"systemAdmin\"]'::jsonb"
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"module_name": {
"name": "module_name",
"columns": [
{
"expression": "name",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.ocmeData": {
"name": "ocmeData",
"schema": "",
"columns": {
"ocme_id": {
"name": "ocme_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"sscc": {
"name": "sscc",
"type": "text",
"primaryKey": false,
"notNull": false
},
"runningNr": {
"name": "runningNr",
"type": "numeric",
"primaryKey": false,
"notNull": true
},
"completed": {
"name": "completed",
"type": "boolean",
"primaryKey": false,
"notNull": false,
"default": false
},
"lineNum": {
"name": "lineNum",
"type": "numeric",
"primaryKey": false,
"notNull": true
},
"pickedUp": {
"name": "pickedUp",
"type": "boolean",
"primaryKey": false,
"notNull": false,
"default": false
},
"areaFrom": {
"name": "areaFrom",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.roles": {
"name": "roles",
"schema": "",
"columns": {
"role_id": {
"name": "role_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"role_name": {
"name": "role_name",
"columns": [
{
"expression": "name",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.serverData": {
"name": "serverData",
"schema": "",
"columns": {
"server_id": {
"name": "server_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"sName": {
"name": "sName",
"type": "text",
"primaryKey": false,
"notNull": true
},
"serverDNS": {
"name": "serverDNS",
"type": "text",
"primaryKey": false,
"notNull": false
},
"plantToken": {
"name": "plantToken",
"type": "text",
"primaryKey": false,
"notNull": false
},
"idAddress": {
"name": "idAddress",
"type": "text",
"primaryKey": false,
"notNull": false
},
"greatPlainsPlantCode": {
"name": "greatPlainsPlantCode",
"type": "numeric",
"primaryKey": false,
"notNull": false
},
"streetAddress": {
"name": "streetAddress",
"type": "text",
"primaryKey": false,
"notNull": false
},
"cityState": {
"name": "cityState",
"type": "text",
"primaryKey": false,
"notNull": false
},
"zipcode": {
"name": "zipcode",
"type": "numeric",
"primaryKey": false,
"notNull": false
},
"contactEmail": {
"name": "contactEmail",
"type": "text",
"primaryKey": false,
"notNull": false
},
"contactPhone": {
"name": "contactPhone",
"type": "text",
"primaryKey": false,
"notNull": false
},
"customerTiAcc": {
"name": "customerTiAcc",
"type": "text",
"primaryKey": false,
"notNull": false
},
"lstServerPort": {
"name": "lstServerPort",
"type": "numeric",
"primaryKey": false,
"notNull": false
},
"active": {
"name": "active",
"type": "boolean",
"primaryKey": false,
"notNull": false,
"default": true
},
"serverLoc": {
"name": "serverLoc",
"type": "text",
"primaryKey": false,
"notNull": false
},
"oldVersion": {
"name": "oldVersion",
"type": "text",
"primaryKey": false,
"notNull": false
},
"lastUpdated": {
"name": "lastUpdated",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"shippingHours": {
"name": "shippingHours",
"type": "text",
"primaryKey": false,
"notNull": false,
"default": "'[{\"early\": \"06:30\", \"late\": \"23:00\"}]'"
},
"tiPostTime": {
"name": "tiPostTime",
"type": "text",
"primaryKey": false,
"notNull": false,
"default": "'[{\"from\": \"24\", \"to\": \"24\"}]'"
},
"otherSettings": {
"name": "otherSettings",
"type": "jsonb",
"primaryKey": false,
"notNull": false,
"default": "'[{\"specialInstructions\":\"something for ti\",\"active\":false}]'::jsonb"
}
},
"indexes": {
"plantToken": {
"name": "plantToken",
"columns": [
{
"expression": "plantToken",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.settings": {
"name": "settings",
"schema": "",
"columns": {
"role_id": {
"name": "role_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": true
},
"value": {
"name": "value",
"type": "text",
"primaryKey": false,
"notNull": true
},
"description": {
"name": "description",
"type": "text",
"primaryKey": false,
"notNull": false
},
"moduleName": {
"name": "moduleName",
"type": "text",
"primaryKey": false,
"notNull": false
},
"roles": {
"name": "roles",
"type": "jsonb",
"primaryKey": false,
"notNull": true,
"default": "'[\"systemAdmin\"]'::jsonb"
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"name": {
"name": "name",
"columns": [
{
"expression": "name",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.userRoles": {
"name": "userRoles",
"schema": "",
"columns": {
"user_id": {
"name": "user_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"role_id": {
"name": "role_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"module_id": {
"name": "module_id",
"type": "uuid",
"primaryKey": false,
"notNull": true
},
"role": {
"name": "role",
"type": "text",
"primaryKey": false,
"notNull": true
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"user_module_unique": {
"name": "user_module_unique",
"columns": [
{
"expression": "user_id",
"isExpression": false,
"asc": true,
"nulls": "last"
},
{
"expression": "module_id",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {
"userRoles_user_id_users_user_id_fk": {
"name": "userRoles_user_id_users_user_id_fk",
"tableFrom": "userRoles",
"tableTo": "users",
"columnsFrom": [
"user_id"
],
"columnsTo": [
"user_id"
],
"onDelete": "no action",
"onUpdate": "no action"
},
"userRoles_role_id_roles_role_id_fk": {
"name": "userRoles_role_id_roles_role_id_fk",
"tableFrom": "userRoles",
"tableTo": "roles",
"columnsFrom": [
"role_id"
],
"columnsTo": [
"role_id"
],
"onDelete": "no action",
"onUpdate": "no action"
},
"userRoles_module_id_modules_module_id_fk": {
"name": "userRoles_module_id_modules_module_id_fk",
"tableFrom": "userRoles",
"tableTo": "modules",
"columnsFrom": [
"module_id"
],
"columnsTo": [
"module_id"
],
"onDelete": "no action",
"onUpdate": "no action"
}
},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
},
"public.users": {
"name": "users",
"schema": "",
"columns": {
"user_id": {
"name": "user_id",
"type": "uuid",
"primaryKey": true,
"notNull": true,
"default": "gen_random_uuid()"
},
"username": {
"name": "username",
"type": "text",
"primaryKey": false,
"notNull": true
},
"email": {
"name": "email",
"type": "text",
"primaryKey": false,
"notNull": true
},
"password": {
"name": "password",
"type": "text",
"primaryKey": false,
"notNull": true
},
"passwordToken": {
"name": "passwordToken",
"type": "text",
"primaryKey": false,
"notNull": false
},
"passwordTokenExpires": {
"name": "passwordTokenExpires",
"type": "timestamp",
"primaryKey": false,
"notNull": false
},
"active": {
"name": "active",
"type": "boolean",
"primaryKey": false,
"notNull": true,
"default": true
},
"pingcode": {
"name": "pingcode",
"type": "numeric",
"primaryKey": false,
"notNull": false
},
"role": {
"name": "role",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'user'"
},
"lastLogin": {
"name": "lastLogin",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"add_User": {
"name": "add_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"add_Date": {
"name": "add_Date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
},
"upd_User": {
"name": "upd_User",
"type": "text",
"primaryKey": false,
"notNull": true,
"default": "'LST_System'"
},
"upd_date": {
"name": "upd_date",
"type": "timestamp",
"primaryKey": false,
"notNull": false,
"default": "now()"
}
},
"indexes": {
"username": {
"name": "username",
"columns": [
{
"expression": "username",
"isExpression": false,
"asc": true,
"nulls": "last"
}
],
"isUnique": true,
"concurrently": false,
"method": "btree",
"with": {}
}
},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {},
"policies": {},
"checkConstraints": {},
"isRLSEnabled": false
}
},
"enums": {},
"schemas": {},
"sequences": {},
"roles": {},
"policies": {},
"views": {},
"_meta": {
"columns": {},
"schemas": {},
"tables": {}
}
}

1033
database/migrations/meta/0015_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff

1040
database/migrations/meta/0016_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff

1047
database/migrations/meta/0017_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff

1054
database/migrations/meta/0018_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff

1066
database/migrations/meta/0019_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff

1067
database/migrations/meta/0020_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff

1067
database/migrations/meta/0021_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff

1074
database/migrations/meta/0022_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff

1087
database/migrations/meta/0023_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff

1144
database/migrations/meta/0024_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff

1056
database/migrations/meta/0025_snapshot.json Normal file
View File

File diff suppressed because it is too large Load Diff

105
database/migrations/meta/_journal.json
View File

@@ -78,6 +78,111 @@
"when": 1741289750635,
"tag": "0010_modern_loa",
"breakpoints": true
},
{
"idx": 11,
"version": "7",
"when": 1741311920806,
"tag": "0011_aberrant_nehzno",
"breakpoints": true
},
{
"idx": 12,
"version": "7",
"when": 1741366351980,
"tag": "0012_mixed_captain_stacy",
"breakpoints": true
},
{
"idx": 13,
"version": "7",
"when": 1741890357924,
"tag": "0013_conscious_rhodey",
"breakpoints": true
},
{
"idx": 14,
"version": "7",
"when": 1741892067501,
"tag": "0014_illegal_thundra",
"breakpoints": true
},
{
"idx": 15,
"version": "7",
"when": 1741952150913,
"tag": "0015_wonderful_lady_vermin",
"breakpoints": true
},
{
"idx": 16,
"version": "7",
"when": 1742051878587,
"tag": "0016_wet_doctor_strange",
"breakpoints": true
},
{
"idx": 17,
"version": "7",
"when": 1742133439717,
"tag": "0017_bitter_brood",
"breakpoints": true
},
{
"idx": 18,
"version": "7",
"when": 1742133828291,
"tag": "0018_lovely_landau",
"breakpoints": true
},
{
"idx": 19,
"version": "7",
"when": 1742139737945,
"tag": "0019_greedy_justice",
"breakpoints": true
},
{
"idx": 20,
"version": "7",
"when": 1742143798267,
"tag": "0020_empty_thundra",
"breakpoints": true
},
{
"idx": 21,
"version": "7",
"when": 1742144973347,
"tag": "0021_premium_albert_cleary",
"breakpoints": true
},
{
"idx": 22,
"version": "7",
"when": 1742156466912,
"tag": "0022_amused_true_believers",
"breakpoints": true
},
{
"idx": 23,
"version": "7",
"when": 1742346003832,
"tag": "0023_wealthy_marvel_boy",
"breakpoints": true
},
{
"idx": 24,
"version": "7",
"when": 1742408812383,
"tag": "0024_curved_venom",
"breakpoints": true
},
{
"idx": 25,
"version": "7",
"when": 1742655504936,
"tag": "0025_amusing_sugar_man",
"breakpoints": true
}
]
}

26
database/schema/apiHits.ts Normal file
View File

@@ -0,0 +1,26 @@
import {pgTable, text, timestamp} from "drizzle-orm/pg-core";
import {createSelectSchema} from "drizzle-zod";
export const apiHits = pgTable(
"apiHits",
{
ip: text("ip"),
endpoint: text("endpoint"),
action: text("action"),
lastBody: text("lastBody"),
stats: text("stats"),
add_date: timestamp().defaultNow(),
upd_date: timestamp().defaultNow(),
}
// (table) => [
// // uniqueIndex('emailUniqueIndex').on(sql`lower(${table.email})`),
// uniqueIndex("role_name").on(table.name),
// ]
);
// Schema for inserting a user - can be used to validate API requests
// export const insertRolesSchema = createInsertSchema(roles, {
// name: z.string().min(3, {message: "Role name must be more than 3 letters"}),
// });
// Schema for selecting a Expenses - can be used to validate API responses
export const selectRolesSchema = createSelectSchema(apiHits);

28
database/schema/logs.ts Normal file
View File

@@ -0,0 +1,28 @@
import {text, pgTable, numeric, index, timestamp, boolean, uuid, uniqueIndex} from "drizzle-orm/pg-core";
import {createInsertSchema, createSelectSchema} from "drizzle-zod";
import {z} from "zod";
export const logs = pgTable(
"logs",
{
log_id: uuid("log_id").defaultRandom().primaryKey(),
level: text("level"),
username: text("username").default("LST_Serivce"),
service: text("service").notNull().default("system"),
message: text("message").notNull(),
checked: boolean("checked").default(false),
checkedAt: timestamp("checkedAt"),
created_at: timestamp("add_Date").defaultNow(),
},
(table) => [
// uniqueIndex('emailUniqueIndex').on(sql`lower(${table.email})`),
// uniqueIndex("role_name").on(table.name),
]
);
// Schema for inserting a user - can be used to validate API requests
// export const insertRolesSchema = createInsertSchema(roles, {
// name: z.string().min(3, {message: "Role name must be more than 3 letters"}),
// });
// Schema for selecting a Expenses - can be used to validate API responses
export const selectRolesSchema = createSelectSchema(logs);

31
database/schema/ocme.ts Normal file
View File

@@ -0,0 +1,31 @@
import {text, pgTable, numeric, index, timestamp, boolean, uuid, uniqueIndex} from "drizzle-orm/pg-core";
import {createInsertSchema, createSelectSchema} from "drizzle-zod";
import {z} from "zod";
export const ocmeData = pgTable(
"ocmeData",
{
ocme_id: uuid("ocme_id").defaultRandom().primaryKey(),
sscc: text("sscc"),
runningNr: numeric("runningNr").notNull(),
completed: boolean("completed").default(false),
lineNum: numeric("lineNum").notNull(),
pickedUp: boolean("pickedUp").default(false),
areaFrom: text("areaFrom").notNull(),
add_User: text("add_User").default("LST_System").notNull(),
add_Date: timestamp("add_Date").defaultNow(),
upd_user: text("upd_User").default("LST_System").notNull(),
upd_date: timestamp("upd_date").defaultNow(),
},
(table) => [
// uniqueIndex('emailUniqueIndex').on(sql`lower(${table.email})`),
// uniqueIndex("role_name").on(table.name),
]
);
// Schema for inserting a user - can be used to validate API requests
// export const insertRolesSchema = createInsertSchema(roles, {
// name: z.string().min(3, {message: "Role name must be more than 3 letters"}),
// });
// Schema for selecting a Expenses - can be used to validate API responses
export const selectRolesSchema = createSelectSchema(ocmeData);

20
database/schema/ocpManualPrint.ts Normal file
View File

@@ -0,0 +1,20 @@
import {text, pgTable, timestamp, uuid, integer} from "drizzle-orm/pg-core";
import {createInsertSchema, createSelectSchema} from "drizzle-zod";
import {z} from "zod";
export const manualPrinting = pgTable("manualPrinting", {
print_id: uuid("print_id").defaultRandom().primaryKey(),
line: integer("line"),
printReason: text("printReason").notNull(),
initials: text("initials").notNull(),
additionalComments: text("additionalComments").notNull(),
add_date: timestamp("add_date").defaultNow(),
add_user: text("add_user"),
});
// Schema for inserting a user - can be used to validate API requests
// export const insertRolesSchema = createInsertSchema(roles, {
// name: z.string().min(3, {message: "Role name must be more than 3 letters"}),
// });
// Schema for selecting a Expenses - can be used to validate API responses
export const selectRolesSchema = createSelectSchema(manualPrinting);

27
database/schema/rfidReaders.ts Normal file
View File

@@ -0,0 +1,27 @@
import {text, pgTable, numeric, index, timestamp, boolean, uuid, uniqueIndex, jsonb} from "drizzle-orm/pg-core";
import {createInsertSchema, createSelectSchema} from "drizzle-zod";
import {z} from "zod";
export const rfidReaders = pgTable(
"rfidReaders",
{
rfidReader_id: uuid("rfidReader_id").defaultRandom().primaryKey(),
reader: text("reader"),
readerIP: text("readerIP"),
lastHeartBeat: timestamp("lastHeartBeat").defaultNow(),
lastTrigger: timestamp("lastTrigger").defaultNow(),
lastTriggerGood: boolean("lastTiggerGood").default(true),
active: boolean("active").default(true),
},
(table) => [
// uniqueIndex('emailUniqueIndex').on(sql`lower(${table.email})`),
uniqueIndex("reader").on(table.reader),
]
);
// Schema for inserting a user - can be used to validate API requests
// export const insertRolesSchema = createInsertSchema(roles, {
// name: z.string().min(3, {message: "Role name must be more than 3 letters"}),
// });
// Schema for selecting a Expenses - can be used to validate API responses
export const selectRolesSchema = createSelectSchema(rfidReaders);

30
database/schema/rfidTags.ts Normal file
View File

@@ -0,0 +1,30 @@
import {text, pgTable, timestamp, uuid, uniqueIndex, jsonb, integer} from "drizzle-orm/pg-core";
import {createInsertSchema, createSelectSchema} from "drizzle-zod";
import {z} from "zod";
export const rfidTags = pgTable(
"rfidTags",
{
rfidTag_id: uuid("rfidTag_id").defaultRandom().primaryKey(),
tagHex: text("tagHex"),
tag: text("tag"),
lastRead: timestamp("timeStamp").defaultNow(),
counts: jsonb("counts").default([]), // example [{area: Line3.2, count: 1}, {area: line3.1, count: 6}]
lastareaIn: text("lastareaIn").notNull(),
runningNumber: integer("runningNumber"),
antenna: integer("antenna"),
tagStrength: integer("tagStrength"),
created_at: timestamp("created_at").defaultNow(),
},
(table) => [
// uniqueIndex('emailUniqueIndex').on(sql`lower(${table.email})`),
uniqueIndex("tagHex").on(table.tagHex),
]
);
// Schema for inserting a user - can be used to validate API requests
export const insertRolesSchema = createInsertSchema(rfidTags, {
tagHex: z.string().min(3, {message: "Tag Should have more than 3 characters"}),
});
// Schema for selecting a Expenses - can be used to validate API responses
export const selectRolesSchema = createSelectSchema(rfidTags);

36
database/schema/serverData.ts Normal file
View File

@@ -0,0 +1,36 @@
import {boolean, date, jsonb, numeric, pgTable, text, timestamp, uniqueIndex, uuid} from "drizzle-orm/pg-core";
import {createSelectSchema} from "drizzle-zod";
export const serverData = pgTable(
"serverData",
{
server_id: uuid("server_id").defaultRandom().primaryKey(),
sName: text("sName").notNull(),
serverDNS: text("serverDNS"),
plantToken: text("plantToken"),
idAddress: text("idAddress"),
greatPlainsPlantCode: numeric("greatPlainsPlantCode"),
streetAddress: text("streetAddress"),
cityState: text("cityState"),
zipcode: numeric("zipcode"),
contactEmail: text("contactEmail"),
contactPhone: text("contactPhone"),
customerTiAcc: text("customerTiAcc"),
lstServerPort: numeric("lstServerPort"),
active: boolean("active").default(true),
serverLoc: text("serverLoc"),
oldVersion: text("oldVersion"),
lastUpdated: timestamp("lastUpdated").defaultNow(),
shippingHours: text("shippingHours").default('[{"early": "06:30", "late": "23:00"}]'),
tiPostTime: text("tiPostTime").default('[{"from": "24", "to": "24"}]'),
otherSettings: jsonb("otherSettings").default([{specialInstructions: "something for ti", active: false}]),
isUpgrading: boolean("isUpgrading").default(false),
},
(table) => [
// uniqueIndex('emailUniqueIndex').on(sql`lower(${table.email})`),
uniqueIndex("plantToken").on(table.plantToken),
]
);
export const selectRolesSchema = createSelectSchema(serverData);

14
drizzle-dev.config.ts Normal file
View File

@@ -0,0 +1,14 @@
import {defineConfig} from "drizzle-kit";
import dotenv from "dotenv";
dotenv.config();
const database = process.env.DATABASE_URL! || "";
export default defineConfig({
dialect: "postgresql", // 'mysql' | 'sqlite' | 'turso'
schema: "database/schema",
out: "database/migrations",
dbCredentials: {
url: database,
},
});

842
frontend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

46
frontend/package.json
View File

@@ -8,10 +8,11 @@
"build": "rimraf dist && tsc -b && vite build",
"lint": "eslint .",
"preview": "vite preview",
"shad": "npx shadcn@canary add "
"shad": "npx shadcn@canary add ",
"checkupdates": "npm-check-updates"
},
"dependencies": {
"@hookform/resolvers": "^4.1.2",
"@hookform/resolvers": "^4.1.3",
"@radix-ui/react-avatar": "^1.1.3",
"@radix-ui/react-checkbox": "^1.1.4",
"@radix-ui/react-collapsible": "^1.1.3",
@@ -19,49 +20,52 @@
"@radix-ui/react-dropdown-menu": "^2.1.6",
"@radix-ui/react-label": "^2.1.2",
"@radix-ui/react-popover": "^1.1.6",
"@radix-ui/react-select": "^2.1.6",
"@radix-ui/react-separator": "^1.1.2",
"@radix-ui/react-slot": "^1.1.2",
"@radix-ui/react-tabs": "^1.1.3",
"@radix-ui/react-tooltip": "^1.1.8",
"@tailwindcss/vite": "^4.0.9",
"@tanstack/react-query": "^5.66.9",
"@tanstack/react-router": "^1.111.11",
"@tailwindcss/vite": "^4.0.15",
"@tanstack/react-query": "^5.69.0",
"@tanstack/react-router": "^1.114.27",
"@tanstack/react-table": "^8.21.2",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"date-fns": "^4.1.0",
"date-fns-tz": "^3.2.0",
"dotenv": "^16.4.7",
"hono": "^4.7.2",
"hono": "^4.7.5",
"js-cookie": "^3.0.5",
"jsonwebtoken": "^9.0.2",
"lucide-react": "^0.476.0",
"next-themes": "^0.4.4",
"lucide-react": "^0.483.0",
"next-themes": "^0.4.6",
"npm-check-updates": "^17.1.16",
"react": "^19.0.0",
"react-day-picker": "^8.10.1",
"react-dom": "^19.0.0",
"react-grid-layout": "^1.5.0",
"react-grid-layout": "^1.5.1",
"react-hook-form": "^7.54.2",
"sonner": "^2.0.1",
"tailwind-merge": "^3.0.2",
"tailwindcss": "^4.0.9",
"tailwindcss": "^4.0.15",
"tailwindcss-animate": "^1.0.7",
"zod": "^3.24.2",
"zustand": "^5.0.3"
},
"devDependencies": {
"@eslint/js": "^9.21.0",
"@tanstack/router-devtools": "^1.106.0",
"@tanstack/router-plugin": "^1.106.0",
"@types/react": "^19.0.10",
"@eslint/js": "^9.23.0",
"@tanstack/router-devtools": "^1.114.27",
"@tanstack/router-plugin": "^1.114.27",
"@types/react": "^19.0.12",
"@types/react-dom": "^19.0.4",
"@types/react-grid-layout": "^1.3.5",
"@vitejs/plugin-react-swc": "^3.8.0",
"eslint": "^9.21.0",
"eslint-plugin-react-hooks": "^5.0.0",
"@vitejs/plugin-react-swc": "^3.8.1",
"eslint": "^9.23.0",
"eslint-plugin-react-hooks": "^5.2.0",
"eslint-plugin-react-refresh": "^0.4.19",
"globals": "^15.15.0",
"typescript": "~5.7.2",
"typescript-eslint": "^8.24.1",
"vite": "^6.2.0"
"globals": "^16.0.0",
"typescript": "~5.8.2",
"typescript-eslint": "^8.27.0",
"vite": "^6.2.2"
}
}

22
frontend/src/components/admin/servers/RestartServer.tsx Normal file
View File

@@ -0,0 +1,22 @@
import {Button} from "@/components/ui/button";
import {Tooltip, TooltipContent, TooltipProvider, TooltipTrigger} from "@/components/ui/tooltip";
import {RotateCcw} from "lucide-react";
export default function RestartServer() {
return (
<div>
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<Button variant={"outline"} size={"icon"}>
<RotateCcw />
</Button>
</TooltipTrigger>
<TooltipContent>
<p>Restart Server ... Needs added still</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
</div>
);
}

125
frontend/src/components/admin/servers/ServerPage.tsx Normal file
View File

@@ -0,0 +1,125 @@
import { LstCard } from "@/components/extendedUI/LstCard";
import { Skeleton } from "@/components/ui/skeleton";
import {
Table,
TableBody,
TableCell,
TableHead,
TableHeader,
TableRow,
} from "@/components/ui/table";
import { useSessionStore } from "@/lib/store/sessionStore";
import { useModuleStore } from "@/lib/store/useModuleStore";
import { getServers } from "@/utils/querys/servers";
import { useQuery } from "@tanstack/react-query";
import { useRouter } from "@tanstack/react-router";
import { format } from "date-fns";
import UpdateServer from "./UpdateServer";
import { adminUrlCheck } from "@/utils/adminUrlCheck";
import RestartServer from "./RestartServer";
import StopServer from "./StopServer";
import StartServer from "./StartServer";
export type Servers = {
server_id?: string;
sName?: string;
serverDNS?: string;
plantToken?: string;
idAddress: string;
lastUpdated: string;
isUpgrading: boolean;
};
export default function ServerPage() {
const { user, token } = useSessionStore();
const { modules } = useModuleStore();
const router = useRouter();
const { data, isError, error, isLoading } = useQuery(getServers(token ?? ""));
const adminModule = modules.filter((n) => n.name === "admin");
const userLevel =
user?.roles?.filter((r) => r.module_id === adminModule[0].module_id) || [];
if (!adminModule[0]?.roles?.includes(userLevel[0]?.role)) {
router.navigate({ to: "/" });
}
if (isError) {
return <div>{JSON.stringify(error)}</div>;
}
console.log(data);
return (
<LstCard className="m-2 flex place-content-center w-dvh">
<Table>
<TableHeader>
<TableRow>
<TableHead>Name</TableHead>
<TableHead>Server</TableHead>
<TableHead>PlantToken</TableHead>
<TableHead>IP Address</TableHead>
<TableHead>Date Last updated</TableHead>
<TableHead>Update Server</TableHead>
</TableRow>
</TableHeader>
{isLoading ? (
<>
<TableBody>
{Array(10)
.fill(0)
.map((_, i) => (
<TableRow key={i}>
<TableCell className="font-medium">
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
</TableRow>
))}
</TableBody>
</>
) : (
<TableBody>
{data?.map((server: Servers) => {
const strippedDate = server.lastUpdated.replace("Z", ""); // Remove Z
const formattedDate = format(strippedDate, "MM/dd/yyyy hh:mm a");
return (
<TableRow key={server.server_id}>
<TableCell className="font-medium">{server.sName}</TableCell>
<TableCell className="font-medium">
{server.serverDNS}
</TableCell>
<TableCell className="font-medium">
{server.plantToken}
</TableCell>
<TableCell className="font-medium">
{server.idAddress}
</TableCell>
<TableCell className="font-medium">{formattedDate}</TableCell>
<TableCell className="font-medium">
{adminUrlCheck() && (
<div className="flex flex-row">
<UpdateServer server={server} token={token as string} />
<StartServer />
<StopServer />
<RestartServer />
</div>
)}
</TableCell>
</TableRow>
);
})}
</TableBody>
)}
</Table>
</LstCard>
);
}

22
frontend/src/components/admin/servers/StartServer.tsx Normal file
View File

@@ -0,0 +1,22 @@
import {Button} from "@/components/ui/button";
import {Tooltip, TooltipContent, TooltipProvider, TooltipTrigger} from "@/components/ui/tooltip";
import {Play} from "lucide-react";
export default function StartServer() {
return (
<div>
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<Button variant={"outline"} size={"icon"}>
<Play />
</Button>
</TooltipTrigger>
<TooltipContent>
<p>Start Server ... Needs added still</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
</div>
);
}

22
frontend/src/components/admin/servers/StopServer.tsx Normal file
View File

@@ -0,0 +1,22 @@
import {Button} from "@/components/ui/button";
import {Tooltip, TooltipContent, TooltipProvider, TooltipTrigger} from "@/components/ui/tooltip";
import {Octagon} from "lucide-react";
export default function StopServer() {
return (
<div>
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<Button variant={"outline"} size={"icon"}>
<Octagon />
</Button>
</TooltipTrigger>
<TooltipContent>
<p>Stop Server ... Needs added still</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
</div>
);
}

51
frontend/src/components/admin/servers/UpdateServer.tsx Normal file
View File

@@ -0,0 +1,51 @@
import {Button} from "@/components/ui/button";
import {CircleFadingArrowUp} from "lucide-react";
import {toast} from "sonner";
import {Servers} from "./ServerPage";
import {useQuery} from "@tanstack/react-query";
import {getSettings} from "@/utils/querys/settings";
import axios from "axios";
import {Tooltip, TooltipContent, TooltipProvider, TooltipTrigger} from "@/components/ui/tooltip";
export default function UpdateServer({server, token}: {server: Servers; token: string}) {
const {data} = useQuery(getSettings(token ?? ""));
const upgrade = async () => {
let devDir = data.filter((n: any) => n.name === "devDir");
toast.success("Server being upgraded in the background please wait.");
try {
const result = await axios.post(
`/api/server/update/${server.plantToken}`,
{devDir: devDir[0].value},
{
headers: {Authorization: `Bearer ${token}`},
}
);
if (result.data.success) {
toast.success(result.data.message);
}
if (!result.data.success) {
toast.success(result.data.message);
}
} catch (error: any) {
toast.error(`There was an error updating the server: ${error.data.message}`);
}
};
return (
<div>
<TooltipProvider>
<Tooltip>
<TooltipTrigger asChild>
<Button variant={"outline"} size={"icon"} onClick={upgrade} disabled={server.isUpgrading}>
<CircleFadingArrowUp />
</Button>
</TooltipTrigger>
<TooltipContent>
<p>Update {server.sName}</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
</div>
);
}

5
frontend/src/components/admin/settings/SettingsPage.tsx
View File

@@ -1,5 +1,5 @@
import {LstCard} from "@/components/extendedUI/LstCard";
import {Table, TableBody, TableCaption, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
import {useSessionStore} from "@/lib/store/sessionStore";
import {useModuleStore} from "@/lib/store/useModuleStore";
import {useQuery} from "@tanstack/react-query";
@@ -37,9 +37,8 @@ export default function SettingsPage() {
}
return (
<LstCard className="m-2 flex place-content-center w-dvh">
<LstCard className="m-2 flex place-content-center w-fit">
<Table>
<TableCaption>All Settings</TableCaption>
<TableHeader>
<TableRow>
<TableHead>Name</TableHead>

275
frontend/src/components/auth/LoginForm.tsx
View File

@@ -1,143 +1,164 @@
import {useSessionStore} from "../../lib/store/sessionStore";
import {LstCard} from "../extendedUI/LstCard";
import {CardHeader} from "../ui/card";
import {toast} from "sonner";
import {z} from "zod";
import {useRouter} from "@tanstack/react-router";
import {Controller, useForm} from "react-hook-form";
import {zodResolver} from "@hookform/resolvers/zod";
import {Label} from "../ui/label";
import {Input} from "../ui/input";
import {Checkbox} from "../ui/checkbox";
import {Button} from "../ui/button";
import { useSessionStore } from "../../lib/store/sessionStore";
import { LstCard } from "../extendedUI/LstCard";
import { CardHeader } from "../ui/card";
import { toast } from "sonner";
import { z } from "zod";
import { useRouter } from "@tanstack/react-router";
import { Controller, useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod";
import { Label } from "../ui/label";
import { Input } from "../ui/input";
import { Checkbox } from "../ui/checkbox";
import { Button } from "../ui/button";
const FormSchema = z.object({
username: z.string().min(1, "You must enter a valid username"),
password: z.string().min(4, "You must enter a valid password"),
rememberMe: z.boolean(),
username: z.string().min(1, "You must enter a valid username"),
password: z.string().min(4, "You must enter a valid password"),
rememberMe: z.boolean(),
});
const LoginForm = () => {
const {setSession} = useSessionStore();
const rememeberMe = localStorage.getItem("rememberMe") === "true";
const username = localStorage.getItem("username") || "";
const router = useRouter();
const {
register,
handleSubmit,
control,
formState: {errors},
} = useForm<z.infer<typeof FormSchema>>({
resolver: zodResolver(FormSchema),
defaultValues: {
username: username || "",
password: "",
rememberMe: rememeberMe,
const { setSession } = useSessionStore();
const rememeberMe = localStorage.getItem("rememberMe") === "true";
const username = localStorage.getItem("username") || "";
const router = useRouter();
const {
register,
handleSubmit,
control,
formState: { errors },
} = useForm<z.infer<typeof FormSchema>>({
resolver: zodResolver(FormSchema),
defaultValues: {
username: username || "",
password: "",
rememberMe: rememeberMe,
},
});
const onSubmitLogin = async (value: z.infer<typeof FormSchema>) => {
// Do something with form data
// first update the rememberMe incase it was selected
if (value.rememberMe) {
localStorage.setItem("rememberMe", value.rememberMe.toString());
localStorage.setItem("username", value.username);
} else {
localStorage.removeItem("rememberMe");
localStorage.removeItem("username");
}
try {
const response = await fetch("/api/auth/login", {
method: "POST",
headers: {
"Content-Type": "application/json",
},
});
body: JSON.stringify({
username: value.username,
password: value.password,
}),
});
const onSubmitLogin = async (value: z.infer<typeof FormSchema>) => {
// Do something with form data
const data = await response.json();
// first update the rememberMe incase it was selected
if (value.rememberMe) {
localStorage.setItem("rememberMe", value.rememberMe.toString());
localStorage.setItem("username", value.username);
} else {
localStorage.removeItem("rememberMe");
localStorage.removeItem("username");
}
// Store token in localStorage
// localStorage.setItem("auth_token", data.data.token);
if (data.success) {
const prod = btoa(`${value.username.toLowerCase()}:${value.password}`);
const prodUser = { ...data.user, prod: prod };
try {
const response = await fetch("/api/auth/login", {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({username: value.username, password: value.password}),
});
setSession(prodUser, data.token);
toast.success(`You are logged in as ${data.user.username}`);
router.navigate({ to: "/" });
}
const data = await response.json();
if (!data.success) {
toast.error(`${data.message}`);
}
// Store token in localStorage
// localStorage.setItem("auth_token", data.data.token);
//console.log(data);
} catch (err) {
toast.error("Invalid credentials");
}
};
setSession(data.user, data.token);
toast.success(`You are logged in as ${data.user.username}`);
router.navigate({to: "/"});
} catch (err) {
toast.error("Invalid credentials");
}
};
return (
<div className="ml-[25%]">
<LstCard className="p-3 w-96">
<CardHeader>
<div>
<p className="text-2xl">Login to LST</p>
</div>
</CardHeader>
<hr className="rounded"></hr>
<form onSubmit={handleSubmit(onSubmitLogin)}>
<div>
<Label htmlFor="username" className="m-1">
Username
</Label>
<Input
placeholder="smith001"
{...register("username")}
className={errors.username ? "border-red-500" : ""}
aria-invalid={!!errors.username}
/>
{errors.username && (
<p className="text-red-500 text-sm mt-1">
{errors.username.message}
</p>
)}
</div>
<div>
<>
<Label htmlFor={"password"} className="m-1">
Password
</Label>
<Input
type="password"
{...register("password")}
className={errors.password ? "border-red-500" : ""}
aria-invalid={!!errors.password}
/>
{errors.password && (
<p className="text-red-500 text-sm mt-1">
{errors.password.message}
</p>
)}
</>
</div>
<div className="flex justify-between pt-2">
<div className="flex">
<Controller
render={({ field }) => (
<>
<Checkbox
id="remember"
checked={field.value}
onCheckedChange={field.onChange}
/>
<label
htmlFor="remember"
className="pl-2 text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
>
remember me
</label>
</>
)}
control={control}
name="rememberMe"
defaultValue={rememeberMe}
/>
</div>
return (
<div className="ml-[25%]">
<LstCard className="p-3 w-96">
<CardHeader>
<div>
<p className="text-2xl">Login to LST</p>
</div>
</CardHeader>
<hr className="rounded"></hr>
<form onSubmit={handleSubmit(onSubmitLogin)}>
<div>
<Label htmlFor="username" className="m-1">
Username
</Label>
<Input
placeholder="smith001"
{...register("username")}
className={errors.username ? "border-red-500" : ""}
aria-invalid={!!errors.username}
/>
{errors.username && <p className="text-red-500 text-sm mt-1">{errors.username.message}</p>}
</div>
<div>
<>
<Label htmlFor={"password"} className="m-1">
Password
</Label>
<Input
type="password"
{...register("password")}
className={errors.password ? "border-red-500" : ""}
aria-invalid={!!errors.password}
/>
{errors.password && <p className="text-red-500 text-sm mt-1">{errors.password.message}</p>}
</>
</div>
<div className="flex justify-between pt-2">
<div className="flex">
<Controller
render={({field}) => (
<>
<Checkbox
id="remember"
checked={field.value}
onCheckedChange={field.onChange}
/>
<label
htmlFor="remember"
className="pl-2 text-sm font-medium leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70"
>
remember me
</label>
</>
)}
control={control}
name="rememberMe"
defaultValue={rememeberMe}
/>
</div>
<div className="flex justify-end">
<Button type="submit">Submit</Button>
</div>
</div>
</form>
</LstCard>
</div>
);
<div className="flex justify-end">
<Button type="submit">Submit</Button>
</div>
</div>
</form>
</LstCard>
</div>
);
};
export default LoginForm;

7
frontend/src/components/layout/lst-sidebar.tsx
View File

@@ -19,7 +19,12 @@ export function AppSidebar() {
<Sidebar collapsible="icon">
<SidebarContent>
<Header />
{moduleActive("production") && <ProductionSideBar />}
{moduleActive("production") && (
<ProductionSideBar
user={user}
moduleID={modules.filter((n) => n.name === "production")[0].module_id as string}
/>
)}
{moduleActive("logistics") && (
<LogisticsSideBar
user={user}

27
frontend/src/components/layout/side-components/admin.tsx
View File

@@ -15,7 +15,7 @@ import {Collapsible, CollapsibleContent, CollapsibleTrigger} from "../../ui/coll
const items = [
{
title: "Servers",
url: "#",
url: "/servers",
icon: Server,
isActive: false,
},
@@ -31,13 +31,19 @@ const data = {
title: "Settings",
url: "/settings",
icon: Settings,
isActive: true,
},
{
title: "Modules",
url: "/modules",
icon: Settings,
isActive: false,
},
{
title: "Swagger",
url: "#",
icon: Webhook,
isActive: false,
isActive: true,
},
{
title: "Logs",
@@ -91,12 +97,17 @@ export function AdminSideBar() {
<SidebarMenuSub>
{item.items.map((item) => (
<SidebarMenuSubItem key={item.title}>
<SidebarMenuSubButton asChild isActive={item.isActive}>
<a href={item.url} target={item.newWindow ? "_blank" : "_self"}>
<item.icon />
<span>{item.title}</span>
</a>
</SidebarMenuSubButton>
{item.isActive && (
<SidebarMenuSubButton asChild>
<a
href={item.url}
target={item.newWindow ? "_blank" : "_self"}
>
<item.icon />
<span>{item.title}</span>
</a>
</SidebarMenuSubButton>
)}
</SidebarMenuSubItem>
))}
</SidebarMenuSub>

22
frontend/src/components/layout/side-components/logistics.tsx
View File

@@ -15,7 +15,7 @@ const items = [
title: "Silo Adjustments",
url: "#",
icon: Cylinder,
role: ["technician", "supervisor", "manager", "admin", "systemAdmin"],
role: ["admin", "systemAdmin"],
module: "logistics",
active: true,
},
@@ -23,7 +23,7 @@ const items = [
title: "Bulk orders",
url: "#",
icon: Truck,
role: ["technician", "supervisor", "manager", "admin", "systemAdmin"],
role: ["systemAdmin"],
module: "logistics",
active: true,
},
@@ -31,7 +31,7 @@ const items = [
title: "Forecast",
url: "#",
icon: Truck,
role: ["technician", "supervisor", "manager", "admin", "systemAdmin"],
role: ["systemAdmin"],
module: "logistics",
active: true,
},
@@ -43,6 +43,22 @@ const items = [
module: "logistics",
active: false,
},
{
title: "Material Helper",
url: "/materialHelper/consumption",
icon: Package,
role: ["technician", "supervisor", "manager", "admin", "systemAdmin"],
module: "logistics",
active: true,
},
{
title: "Ocme Cyclecount",
url: "/cyclecount",
icon: Package,
role: ["technician", "supervisor", "manager", "admin", "systemAdmin"],
module: "logistics",
active: true,
},
];
export function LogisticsSideBar({user, moduleID}: {user: User | null; moduleID: string}) {

23
frontend/src/components/layout/side-components/production.tsx
View File

@@ -7,16 +7,21 @@ import {
SidebarMenuButton,
SidebarMenuItem,
} from "../../ui/sidebar";
import {hasPageAccess} from "@/utils/userAccess";
import {User} from "@/types/users";
const items = [
{
title: "One Click Print",
url: "/ocp",
icon: Printer,
role: ["viewer"],
module: "ocp",
active: true,
},
];
export function ProductionSideBar() {
export function ProductionSideBar({user, moduleID}: {user: User | null; moduleID: string}) {
return (
<SidebarGroup>
<SidebarGroupLabel>Production</SidebarGroupLabel>
@@ -24,12 +29,16 @@ export function ProductionSideBar() {
<SidebarMenu>
{items.map((item) => (
<SidebarMenuItem key={item.title}>
<SidebarMenuButton asChild>
<a href={item.url}>
<item.icon />
<span>{item.title}</span>
</a>
</SidebarMenuButton>
<>
{hasPageAccess(user, item.role, moduleID) && item.active && (
<SidebarMenuButton asChild>
<a href={item.url}>
<item.icon />
<span>{item.title}</span>
</a>
</SidebarMenuButton>
)}
</>
</SidebarMenuItem>
))}
</SidebarMenu>

99
frontend/src/components/logistics/materialHelper/consumption/ConsumeMaterial.tsx Normal file
View File

@@ -0,0 +1,99 @@
import {LstCard} from "@/components/extendedUI/LstCard";
import {Button} from "@/components/ui/button";
import {CardHeader} from "@/components/ui/card";
import {Input} from "@/components/ui/input";
import {Label} from "@/components/ui/label";
import {useSessionStore} from "@/lib/store/sessionStore";
import axios from "axios";
import {useState} from "react";
import {useForm} from "react-hook-form";
import {toast} from "sonner";
export default function ConsumeMaterial() {
const {register: register1, handleSubmit: handleSubmit1, reset} = useForm();
const [submitting, setSubmitting] = useState(false);
const {token} = useSessionStore();
const handleConsume = async (data: any) => {
setSubmitting(true);
try {
const result = await axios.post(`/api/logistics/consume`, data, {
headers: {Authorization: `Bearer ${token}`},
});
if (result.data.success) {
toast.success(result.data.message);
setSubmitting(false);
reset();
}
if (!result.data.success) {
//console.log(result.data);
setSubmitting(false);
toast.error(result.data.message);
}
} catch (error: any) {
//console.log(error);
setSubmitting(false);
if (error.status === 401) {
toast.error("Unauthorized to do this task.");
} else {
toast.error("Unexpected error if this continues please constact an admin.");
}
}
};
return (
<div className="m-2">
<LstCard>
<CardHeader>
<p className="text-center text-lg">Consuming Material.</p>
</CardHeader>
<div className="flex m-1">
<div className="w-96 m-1">
<LstCard>
<form onSubmit={handleSubmit1(handleConsume)}>
<div className="m-2">
<Label htmlFor="runningNr">Enter unit running number</Label>
<Input
className="mt-2"
//defaultValue="634"
type="number"
{...register1("runningNr")}
/>
</div>
<div className="m-2">
<Label htmlFor="lotNum">Enter lot number</Label>
<Input
className="mt-2"
//defaultValue="634"
type="number"
{...register1("lotNum")}
/>
</div>
<Button className="m-2" color="primary" type="submit" disabled={submitting}>
Consume materal
</Button>
</form>
</LstCard>
</div>
<div className="m-1 p-1">
<LstCard>
<div className="w-96 p-1">
<ol>
<li>1. Enter the running number of the material you would like to consume</li>
<li>2. Enter the lot number you will be consuming to</li>
<li>3. Press consume material</li>
</ol>
<p className="text-pretty w-96">
*This process is only for barcoded material, if it is set to auto consume you will
encounter and error.
</p>
</div>
</LstCard>
</div>
</div>
</LstCard>
</div>
);
}

71
frontend/src/components/ocme/CycleCountLog.tsx Normal file
View File

@@ -0,0 +1,71 @@
/**
* we will do a very sloppy way for this just keep fetching the logs we spent to much time on this :()
*/
// //import {useEffect, useState} from "react";
// import {LstCard} from "../extendedUI/LstCard";
// import {CardContent, CardHeader} from "../ui/card";
// import {Skeleton} from "../ui/skeleton";
// import {Button} from "../ui/button";
// import {toast} from "sonner";
// import {useEffect} from "react";
// export default function CycleCountLog() {
// //const [logs, setLogs] = useState([]);
// //const [streaming, setStreaming] = useState(false); // Track if streaming is active
// useEffect(() => {
// // Start streaming when the button is clicked
// let es;
// const url = `http://localhost:4000/api/logger/logs/stream?service=ocme-count&level=info`;
// es = new EventSource(url);
// es.onopen = () => console.log(">>> Connection opened!");
// es.onerror = (e) => console.log("ERROR!", e);
// es.onmessage = (e) => {
// const data = JSON.parse(e.data);
// console.log(e);
// console.log(data);
// switch (data.type) {
// case "time-update":
// console.log(data);
// break;
// case "error":
// console.log(data);
// break;
// case "done":
// console.log(data);
// es.close(); // Close the connection when done
// break;
// default:
// break;
// }
// };
// return () => es.close();
// }, []);
// // const handleStartStreaming = () => {
// // setStreaming(true); // Start streaming when button is clicked
// // };
// return (
// <LstCard className="w-48">
// <CardHeader className="flex justify-center">
// <span>Cycle Count logs</span>
// </CardHeader>
// <CardContent>
// {Array(10)
// .fill(0)
// .map((_, i) => (
// <div key={i}>
// <Skeleton className="m-2 h-4" />
// </div>
// ))}
// </CardContent>
// <Button onClick={() => toast.success("SOmething")}>Start Stream</Button>
// </LstCard>
// );
// }

185
frontend/src/components/ocme/ocmeCycleCount.tsx Normal file
View File

@@ -0,0 +1,185 @@
import {toast} from "sonner";
import {LstCard} from "../extendedUI/LstCard";
import {Button} from "../ui/button";
import {Input} from "../ui/input";
import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "../ui/table";
import {Skeleton} from "../ui/skeleton";
//import CycleCountLog from "./CycleCountLog";
import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue} from "../ui/select";
import {Controller, useForm} from "react-hook-form";
import axios from "axios";
import {useState} from "react";
export default function OcmeCycleCount() {
const token = localStorage.getItem("auth_token");
const [data, setData] = useState([]);
const [counting, setCounting] = useState(false);
const {
register,
handleSubmit,
//watch,
formState: {errors},
reset,
control,
} = useForm();
const onSubmit = async (data: any) => {
setData([]);
setCounting(true);
toast.success(`Cycle count started`);
try {
const res = await axios.post("/ocme/api/v1/cyclecount", data, {
headers: {Authorization: `Bearer ${token}`},
});
toast.success(res.data.message);
setData(res.data.data);
setCounting(false);
reset();
} catch (error) {
toast.error("There was an error cycle counting");
setCounting(false);
reset();
}
};
return (
<div className="flex flex-row w-screen">
<div className="m-2 w-5/6">
<LstCard>
<p className="ml-2">Please enter the name or laneID you want to cycle count.</p>
<div>
<form onSubmit={handleSubmit(onSubmit)}>
<div className="flex justify-between">
<div className="m-2 flex flex-row">
<Input
placeholder="enter lane: L064"
className={errors.lane ? "border-red-500" : ""}
aria-invalid={!!errors.lane}
{...register("lane", {
required: true,
minLength: {
value: 3,
message: "The lane is too short!",
},
})}
/>
<div className="ml-2">
<Controller
control={control}
name="laneType"
defaultValue={""}
render={({
field: {onChange},
fieldState: {},
//formState,
}) => (
<Select onValueChange={onChange}>
<SelectTrigger className="w-[180px]">
<SelectValue placeholder="Select name or id" />
</SelectTrigger>
<SelectContent>
<SelectItem value="name">Name</SelectItem>
<SelectItem value="laneId">Lane ID</SelectItem>
</SelectContent>
</Select>
)}
/>
</div>
</div>
<Button className="m-2" type="submit" disabled={counting}>
{counting ? <span>Counting...</span> : <span>CycleCount</span>}
</Button>
</div>
</form>
</div>
<div>
<Table>
<TableHeader>
<TableRow>
<TableHead>LaneID</TableHead>
<TableHead>Lane</TableHead>
<TableHead>AV</TableHead>
<TableHead>Description</TableHead>
<TableHead>Running Number</TableHead>
<TableHead>In Ocme</TableHead>
<TableHead>In Stock</TableHead>
<TableHead>Result</TableHead>
</TableRow>
</TableHeader>
{data.length === 0 ? (
<TableBody>
{Array(10)
.fill(0)
.map((_, i) => (
<TableRow key={i}>
<TableCell className="font-medium">
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
</TableRow>
))}
</TableBody>
) : (
<>
{data.map((i: any) => {
let classname = ``;
if (i.info === "Quality Check Required") {
classname = `bg-red-500`;
}
if (i.info === "Sent to Inv") {
classname = `bg-amber-700`;
}
return (
<TableRow key={i.runningNumber}>
<TableCell className={`font-medium ${classname}`}>
{i.alpla_laneID}
</TableCell>
<TableCell className={`font-medium ${classname}`}>
{i.alpla_laneDescription}
</TableCell>
<TableCell className={`font-medium ${classname}`}>
{i.Article}
</TableCell>
<TableCell className={`font-medium ${classname}`}>
{i.alpla_laneDescription}
</TableCell>
<TableCell className={`font-medium ${classname}`}>
{i.runningNumber}
</TableCell>
<TableCell className={`font-medium ${classname}`}>{i.ocme}</TableCell>
<TableCell className={`font-medium ${classname}`}>{i.stock}</TableCell>
<TableCell className={`font-medium ${classname}`}>{i.info}</TableCell>
</TableRow>
);
})}
</>
)}
</Table>
</div>
</LstCard>
</div>
{/* <div className="m-2">
<CycleCountLog />
</div> */}
</div>
);
}

122
frontend/src/components/production/ocp/LabelLog.tsx
View File

@@ -1,5 +1,125 @@
import {LstCard} from "@/components/extendedUI/LstCard";
import {Skeleton} from "@/components/ui/skeleton";
import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
// import {useSessionStore} from "@/lib/store/sessionStore";
// import {useSettingStore} from "@/lib/store/useSettings";
import {useQuery} from "@tanstack/react-query";
import {getlabels} from "@/utils/querys/production/labels";
import {format} from "date-fns";
const labelLogs = [
{key: "line", label: "Line"},
{key: "printerName", label: "Printer"},
{key: "runningNr", label: "Running #"},
{key: "upd_date", label: "Label date"},
{key: "status", label: "Label Status"},
//{key: "reprint", label: "Reprint"}, // removing the reprint button for now until repritning is working as intended
];
export default function LabelLog() {
return <LstCard className="m-2 p-2"> label logs here</LstCard>;
const {data, isError, isLoading} = useQuery(getlabels("4"));
//const {user} = useSessionStore();
//const {settings} = useSettingStore();
//const server = settings.filter((n) => n.name === "server")[0]?.value || "";
//const roles = ["admin", "manager", "operator"];
if (isError) {
return (
<div className="m-2 p-2 min-h-2/5">
<LstCard>
<p className="text-center">Labels for the last 2 hours</p>
<Table>
<TableHeader>
<TableRow>
{labelLogs.map((l) => (
<TableHead key={l.key}>{l.label}</TableHead>
))}
</TableRow>
</TableHeader>
<TableBody>
{Array(7)
.fill(0)
.map((_, i) => (
<TableRow key={i}>
<TableCell className="font-medium">
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</LstCard>
</div>
);
}
return (
<LstCard className="m-2 p-2 min-h-2/5">
<p className="text-center">Labels for the last 2 hours</p>
<Table>
<TableHeader>
<TableRow>
{labelLogs.map((l) => (
<TableHead key={l.key}>{l.label}</TableHead>
))}
</TableRow>
</TableHeader>
{isLoading ? (
<>
<TableBody>
{Array(7)
.fill(0)
.map((_, i) => (
<TableRow key={i}>
<TableCell className="font-medium">
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
</TableRow>
))}
</TableBody>
</>
) : (
<TableBody>
{data?.map((label: any) => (
<TableRow key={label.runningNr}>
<TableCell className="font-medium">{label.line}</TableCell>
<TableCell className="font-medium">{label.printerName}</TableCell>
<TableCell className="font-medium">{label.runningNr}</TableCell>
<TableCell className="font-medium">
{format(label.upd_date, "M/d/yyyy hh:mm")}
</TableCell>
<TableCell className="font-medium">{label.status}</TableCell>
</TableRow>
))}
</TableBody>
)}
</Table>
</LstCard>
);
}

215
frontend/src/components/production/ocp/Lots.tsx
View File

@@ -1,9 +1,222 @@
import {LstCard} from "@/components/extendedUI/LstCard";
import {Skeleton} from "@/components/ui/skeleton";
import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
import {useSessionStore} from "@/lib/store/sessionStore";
import {useSettingStore} from "@/lib/store/useSettings";
import {LotType} from "@/types/lots";
import {getlots} from "@/utils/querys/production/lots";
import {useQuery} from "@tanstack/react-query";
import ManualPrint from "./ManualPrinting/ManualPrint";
import ManualPrintForm from "./ManualPrinting/ManualPrintForm";
let lotColumns = [
{
key: "MachineDescription",
label: "Machine",
},
{
key: "AV",
label: "AV",
},
{
key: "Alias",
label: "AvDescription",
},
{
key: "LOT",
label: "LotNumber",
},
{
key: "ProlinkLot",
label: "ProlinkLot",
},
{
key: "PlannedQTY",
label: "PlannedQTY",
},
{
key: "Produced",
label: "Produced",
},
{
key: "Remaining",
label: "Remaining",
},
{
key: "overPrinting",
label: "Overprinting",
},
// {
// key: "lastProlinkUpdate",
// label: "Last ProlinkCheck",
// },
// {
// key: "printLabel",
// label: "Print Label",
// },
];
export default function Lots() {
const {data, isError, isLoading} = useQuery(getlots());
const {user} = useSessionStore();
const {settings} = useSettingStore();
const server = settings.filter((n) => n.name === "server")[0]?.value || "";
console.log(server);
const roles = ["admin", "manager", "operator"];
if (user && roles.includes(user.role)) {
//width = 1280;
const checkCol = lotColumns.some((l) => l.key === "printLabel");
if (!checkCol) {
lotColumns = [
...lotColumns,
{
key: "printLabel",
label: "Print Label",
},
];
}
}
if (isError) {
return (
<div className="m-2 p-2 min-h-2/5">
<LstCard>
<p className="text-center">Current Assigned lots</p>
<Table>
<TableHeader>
<TableRow>
{lotColumns.map((l) => (
<TableHead key={l.key}>{l.label}</TableHead>
))}
</TableRow>
</TableHeader>
<TableBody>
{Array(10)
.fill(0)
.map((_, i) => (
<TableRow key={i}>
<TableCell className="font-medium">
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</LstCard>
</div>
);
}
return (
<LstCard className="m-2 p-2 min-h-2/5">
<h1>Lots</h1>
<p className="text-center">Current Assigned lots</p>
<Table>
<TableHeader>
<TableRow>
{lotColumns.map((l) => (
<TableHead key={l.key}>{l.label}</TableHead>
))}
</TableRow>
</TableHeader>
{isLoading ? (
<>
<TableBody>
{Array(10)
.fill(0)
.map((_, i) => (
<TableRow key={i}>
<TableCell className="font-medium">
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
</TableRow>
))}
</TableBody>
</>
) : (
<TableBody>
{data?.map((lot: LotType) => (
<TableRow key={lot.LabelOnlineID}>
<TableCell className="font-medium">{lot.MachineLocation}</TableCell>
<TableCell className="font-medium">{lot.AV}</TableCell>
<TableCell className="font-medium">{lot.Alias}</TableCell>
<TableCell className="font-medium">{lot.LOT}</TableCell>
<TableCell className="font-medium">{lot.ProlinkLot}</TableCell>
<TableCell className="font-medium">{lot.PlannedQTY}</TableCell>
<TableCell className="font-medium">{lot.Produced}</TableCell>
<TableCell className="font-medium">{lot.Remaining}</TableCell>
<TableCell className="font-medium">{lot.overPrinting}</TableCell>
{user && roles.includes(user.role) && (
<>
{server === "usday1vms006" || server === "localhost" ? (
<>
<TableCell className="flex justify-center">
<ManualPrintForm lot={lot} />
</TableCell>
</>
) : (
<TableCell className="flex justify-center">
<ManualPrint lot={lot} />
</TableCell>
)}
</>
)}
</TableRow>
))}
</TableBody>
)}
</Table>
</LstCard>
);
}

32
frontend/src/components/production/ocp/ManualPrinting/ManualPrint.tsx Normal file
View File

@@ -0,0 +1,32 @@
import {Button} from "@/components/ui/button";
import {useSessionStore} from "@/lib/store/sessionStore";
//import {useSettingStore} from "@/lib/store/useSettings";
import {LotType} from "@/types/lots";
import {Tag} from "lucide-react";
import {toast} from "sonner";
import {manualPrintLabels} from "./ManualPrintLabel";
export default function ManualPrint({lot}: {lot: LotType}) {
const {user} = useSessionStore();
//const {settings} = useSettingStore();
//const server = settings.filter((n) => n.name === "server")[0]?.value;
//const serverPort = settings.filter((n) => n.name === "serverPort")[0]?.value;
//const serverUrl = `http://${server}:${serverPort}`;
const handlePrintLabel = async (lot: LotType) => {
//console.log(lot);
const labels: any = await manualPrintLabels(lot, user);
if (labels.success) {
toast.success(labels.message);
} else {
toast.error(labels.message);
}
};
return (
<Button variant="outline" size="icon" onClick={() => handlePrintLabel(lot)}>
<Tag className="h-[16px] w-[16px]" />
</Button>
);
}

217
frontend/src/components/production/ocp/ManualPrinting/ManualPrintForm.tsx Normal file
View File

@@ -0,0 +1,217 @@
import {Button} from "@/components/ui/button";
import {
Dialog,
DialogContent,
DialogDescription,
DialogFooter,
DialogHeader,
DialogTitle,
DialogTrigger,
} from "@/components/ui/dialog";
import {Input} from "@/components/ui/input";
import {Label} from "@/components/ui/label";
import {
Select,
SelectContent,
SelectGroup,
SelectItem,
SelectLabel,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import {Textarea} from "@/components/ui/textarea";
import {useSessionStore} from "@/lib/store/sessionStore";
import {useSettingStore} from "@/lib/store/useSettings";
import {LotType} from "@/types/lots";
import axios from "axios";
import {Tag} from "lucide-react";
import {useState} from "react";
import {Controller, useForm} from "react-hook-form";
import {toast} from "sonner";
import {manualPrintLabels} from "./ManualPrintLabel";
const printReason = [
{key: "printerIssue", label: "Printer Related"},
{key: "strapper", label: "Strapper Error"},
{key: "manualCheck", label: "20th pallet check"},
{key: "outOfSync", label: "Labeler Out of Sync"},
];
export default function ManualPrintForm({lot}: {lot: LotType}) {
const {user} = useSessionStore();
const token = localStorage.getItem("auth_token");
const {settings} = useSettingStore();
const [open, setOpen] = useState(false);
const server = settings.filter((n) => n.name === "server")[0]?.value;
// const serverPort = settings.filter((n) => n.name === "serverPort")[0]?.value;
// const serverUrl = `http://${server}:${serverPort}`;
const {
register,
handleSubmit,
//watch,
formState: {errors},
reset,
control,
} = useForm();
const handlePrintLabel = async (lot: LotType) => {
//console.log(lot);
const labels: any = await manualPrintLabels(lot, user);
if (labels.success) {
toast.success(labels.message);
} else {
toast.error(labels.message);
}
};
const handleManualPrintLog = async (logData: any, lot: LotType) => {
// toast.success(`A new label was sent to printer: ${lot.PrinterName} for line ${lot.MachineDescription} `);
const logdataUrl = `/api/ocp/manualLabelLog`;
axios
.post(logdataUrl, logData, {headers: {Authorization: `Bearer ${token}`}})
.then((d) => {
//console.log(d);
toast.success(d.data.message);
handlePrintLabel(lot);
reset();
})
.catch((e) => {
if (e.response.status === 500) {
toast.error(`Internal Server error please try again.`);
return {sucess: false};
}
if (e.response.status === 401) {
//console.log(e.response);
toast.error(`You are not authorized to do this.`);
return {sucess: false};
}
});
};
const onSubmit = (data: any) => {
console.log(data);
handleManualPrintLog(data, lot);
};
return (
<Dialog
open={open}
onOpenChange={(isOpen) => {
if (!open) {
reset();
}
setOpen(isOpen);
// toast.message("Model was something", {
// description: isOpen ? "Modal is open" : "Modal is closed",
// });
}}
>
<DialogTrigger asChild>
<Button variant="outline" size="icon">
<Tag className="h-[16px] w-[16px]" />
</Button>
</DialogTrigger>
<DialogContent className="sm:max-w-[425px]">
<DialogHeader>
<DialogTitle>Edit profile</DialogTitle>
<DialogDescription>
Make changes to your profile here. Click save when you're done.
</DialogDescription>
</DialogHeader>
<form onSubmit={handleSubmit(onSubmit)}>
<p>
To manually print a label you must complete all the required fields below.
<br />
If you clicked this in error just click close
</p>
<hr className="mt-2 mb-2" />
{server == "usday1vms006" ? (
<Controller
control={control}
name="printReason"
defaultValue={""}
render={({
field: {onChange},
fieldState: {},
//formState,
}) => (
<Select onValueChange={onChange}>
<SelectTrigger className="w-[180px]">
<SelectValue placeholder="Select Reason" />
</SelectTrigger>
<SelectContent>
<SelectGroup>
<SelectLabel>Print Reasons</SelectLabel>
{printReason.map((printReason: any) => (
<SelectItem value={printReason.key}>{printReason.label}</SelectItem>
))}
</SelectGroup>
</SelectContent>
</Select>
)}
/>
) : (
<div>
<Label htmlFor="printRason" className="m-1">
Why are you manually printing?
</Label>
<Input
type="text"
className={errors.printReason ? "border-red-500" : ""}
aria-invalid={!!errors.printReason}
{...register("printReason", {
required: true,
minLength: {
value: 5,
message: "To short of a reason please try again!",
},
})}
/>
</div>
)}
<div>
<Label htmlFor="line" className="m-1">
"What is the line number you are printing?"
</Label>
<Input
//variant="underlined"
type="number"
className={errors.line ? "border-red-500" : ""}
aria-invalid={!!errors.line}
{...register("line", {required: true})}
/>
</div>
<div>
<Label htmlFor="initials" className="m-1">
Enter intials
</Label>
<Input
//variant="underlined"
//label="Enter intials"
{...register("initials", {required: true})}
/>
</div>
<Textarea
//label="Comments"
placeholder="add more info as needed."
{...register("additionalComments")}
/>
<DialogFooter>
<Button color="danger" variant="default" onClick={() => setOpen(!open)}>
Close
</Button>
<Button color="primary" type="submit">
Print
</Button>
</DialogFooter>
</form>
</DialogContent>
</Dialog>
);
}

44
frontend/src/components/production/ocp/ManualPrinting/ManualPrintLabel.ts Normal file
View File

@@ -0,0 +1,44 @@
import {LotType} from "@/types/lots";
import axios from "axios";
export const manualPrintLabels = async (lot: LotType, user: any) => {
//console.log(lot);
const labelUrl = `/ocp/manualPrintAndFollow`;
try {
const res = await axios.post(
labelUrl,
{line: lot.MachineLocation, printerName: lot.PrinterName},
{headers: {Authorization: `Basic ${user?.prod}`}}
);
if (res.data.success) {
return {
success: true,
message: `A new label was printed for ${lot.MachineDescription} to printer: ${lot.PrinterName}`,
};
} else {
return {
success: true,
message: `Line ${lot.MachineDescription} encountered an error printing labels: ${res.data.message}`,
};
}
} catch (error: any) {
if (error.response.status === 500) {
//toast.error(`Internal Server error please try again.`);
return {
success: false,
message: `Internal Server error please try again.`,
};
}
if (error.response.status === 401) {
//console.log(e.response);
//toast.error(`You are not authorized to do this.`);
return {
success: false,
message: `You are not authorized to do this.`,
};
}
}
};

49
frontend/src/components/production/ocp/PrinterStatus.tsx
View File

@@ -1,5 +1,52 @@
import {LstCard} from "@/components/extendedUI/LstCard";
import {Skeleton} from "@/components/ui/skeleton";
import {Table, TableBody, TableCell, TableHead, TableHeader, TableRow} from "@/components/ui/table";
let printerCols = [
{
key: "status",
label: "Status",
},
{
key: "printer",
label: "Printer",
},
{
key: "statusMessage",
label: "Status Message",
},
];
export default function PrinterStatus() {
return <LstCard className="m-2 p-2">Printer Status</LstCard>;
return (
<LstCard className="m-2 p-2">
<p className="text-center">Printer Status</p>
<Table>
<TableHeader>
<TableRow>
{printerCols.map((l) => (
<TableHead key={l.key}>{l.label}</TableHead>
))}
</TableRow>
</TableHeader>
<TableBody>
{Array(10)
.fill(0)
.map((_, i) => (
<TableRow key={i}>
<TableCell className="font-medium">
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
<TableCell>
<Skeleton className="h-4" />
</TableCell>
</TableRow>
))}
</TableBody>
</Table>
</LstCard>
);
}

3
frontend/src/components/providers/Providers.tsx
View File

@@ -1,16 +1,19 @@
import {QueryClient, QueryClientProvider} from "@tanstack/react-query";
import {useModuleStore} from "../../lib/store/useModuleStore";
import {useEffect} from "react";
import {useSettingStore} from "@/lib/store/useSettings";
//import {useGetUserRoles} from "@/lib/store/useGetRoles";
const queryClient = new QueryClient();
export const SessionProvider = ({children}: {children: React.ReactNode}) => {
const {fetchModules} = useModuleStore();
const {fetchSettings} = useSettingStore();
//const {fetchUserRoles} = useGetUserRoles();
useEffect(() => {
fetchModules();
fetchSettings();
//fetchUserRoles();
}, []);
return <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>;

9
frontend/src/components/ui/button.tsx
View File

@@ -5,19 +5,20 @@ import { cva, type VariantProps } from "class-variance-authority"
import { cn } from "@/lib/utils"
const buttonVariants = cva(
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-[color,box-shadow] disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0 outline-none 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",
"inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-md text-sm font-medium transition-all disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 outline-none 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",
{
variants: {
variant: {
default:
"bg-primary text-primary-foreground shadow-xs hover:bg-primary/90",
destructive:
"bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40",
"bg-destructive text-white shadow-xs hover:bg-destructive/90 focus-visible:ring-destructive/20 dark:focus-visible:ring-destructive/40 dark:bg-destructive/60",
outline:
"border border-input bg-background shadow-xs hover:bg-accent hover:text-accent-foreground",
"border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50",
secondary:
"bg-secondary text-secondary-foreground shadow-xs hover:bg-secondary/80",
ghost: "hover:bg-accent hover:text-accent-foreground",
ghost:
"hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50",
link: "text-primary underline-offset-4 hover:underline",
},
size: {

183
frontend/src/components/ui/select.tsx Normal file
View File

@@ -0,0 +1,183 @@
import * as React from "react"
import * as SelectPrimitive from "@radix-ui/react-select"
import { CheckIcon, ChevronDownIcon, ChevronUpIcon } from "lucide-react"
import { cn } from "@/lib/utils"
function Select({
...props
}: React.ComponentProps<typeof SelectPrimitive.Root>) {
return <SelectPrimitive.Root data-slot="select" {...props} />
}
function SelectGroup({
...props
}: React.ComponentProps<typeof SelectPrimitive.Group>) {
return <SelectPrimitive.Group data-slot="select-group" {...props} />
}
function SelectValue({
...props
}: React.ComponentProps<typeof SelectPrimitive.Value>) {
return <SelectPrimitive.Value data-slot="select-value" {...props} />
}
function SelectTrigger({
className,
size = "default",
children,
...props
}: React.ComponentProps<typeof SelectPrimitive.Trigger> & {
size?: "sm" | "default"
}) {
return (
<SelectPrimitive.Trigger
data-slot="select-trigger"
data-size={size}
className={cn(
"border-input data-[placeholder]:text-muted-foreground [&_svg:not([class*='text-'])]:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 dark:hover:bg-input/50 flex w-fit items-center justify-between gap-2 rounded-md border bg-transparent px-3 py-2 text-sm whitespace-nowrap shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 data-[size=default]:h-9 data-[size=sm]:h-8 *:data-[slot=select-value]:line-clamp-1 *:data-[slot=select-value]:flex *:data-[slot=select-value]:items-center *:data-[slot=select-value]:gap-2 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4",
className
)}
{...props}
>
{children}
<SelectPrimitive.Icon asChild>
<ChevronDownIcon className="size-4 opacity-50" />
</SelectPrimitive.Icon>
</SelectPrimitive.Trigger>
)
}
function SelectContent({
className,
children,
position = "popper",
...props
}: React.ComponentProps<typeof SelectPrimitive.Content>) {
return (
<SelectPrimitive.Portal>
<SelectPrimitive.Content
data-slot="select-content"
className={cn(
"bg-popover text-popover-foreground data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-(--radix-select-content-available-height) min-w-[8rem] origin-(--radix-select-content-transform-origin) overflow-x-hidden overflow-y-auto rounded-md border shadow-md",
position === "popper" &&
"data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
className
)}
position={position}
{...props}
>
<SelectScrollUpButton />
<SelectPrimitive.Viewport
className={cn(
"p-1",
position === "popper" &&
"h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)] scroll-my-1"
)}
>
{children}
</SelectPrimitive.Viewport>
<SelectScrollDownButton />
</SelectPrimitive.Content>
</SelectPrimitive.Portal>
)
}
function SelectLabel({
className,
...props
}: React.ComponentProps<typeof SelectPrimitive.Label>) {
return (
<SelectPrimitive.Label
data-slot="select-label"
className={cn("text-muted-foreground px-2 py-1.5 text-xs", className)}
{...props}
/>
)
}
function SelectItem({
className,
children,
...props
}: React.ComponentProps<typeof SelectPrimitive.Item>) {
return (
<SelectPrimitive.Item
data-slot="select-item"
className={cn(
"focus:bg-accent focus:text-accent-foreground [&_svg:not([class*='text-'])]:text-muted-foreground relative flex w-full cursor-default items-center gap-2 rounded-sm py-1.5 pr-8 pl-2 text-sm outline-hidden select-none data-[disabled]:pointer-events-none data-[disabled]:opacity-50 [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4 *:[span]:last:flex *:[span]:last:items-center *:[span]:last:gap-2",
className
)}
{...props}
>
<span className="absolute right-2 flex size-3.5 items-center justify-center">
<SelectPrimitive.ItemIndicator>
<CheckIcon className="size-4" />
</SelectPrimitive.ItemIndicator>
</span>
<SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
</SelectPrimitive.Item>
)
}
function SelectSeparator({
className,
...props
}: React.ComponentProps<typeof SelectPrimitive.Separator>) {
return (
<SelectPrimitive.Separator
data-slot="select-separator"
className={cn("bg-border pointer-events-none -mx-1 my-1 h-px", className)}
{...props}
/>
)
}
function SelectScrollUpButton({
className,
...props
}: React.ComponentProps<typeof SelectPrimitive.ScrollUpButton>) {
return (
<SelectPrimitive.ScrollUpButton
data-slot="select-scroll-up-button"
className={cn(
"flex cursor-default items-center justify-center py-1",
className
)}
{...props}
>
<ChevronUpIcon className="size-4" />
</SelectPrimitive.ScrollUpButton>
)
}
function SelectScrollDownButton({
className,
...props
}: React.ComponentProps<typeof SelectPrimitive.ScrollDownButton>) {
return (
<SelectPrimitive.ScrollDownButton
data-slot="select-scroll-down-button"
className={cn(
"flex cursor-default items-center justify-center py-1",
className
)}
{...props}
>
<ChevronDownIcon className="size-4" />
</SelectPrimitive.ScrollDownButton>
)
}
export {
Select,
SelectContent,
SelectGroup,
SelectItem,
SelectLabel,
SelectScrollDownButton,
SelectScrollUpButton,
SelectSeparator,
SelectTrigger,
SelectValue,
}

18
frontend/src/components/ui/textarea.tsx Normal file
View File

@@ -0,0 +1,18 @@
import * as React from "react"
import { cn } from "@/lib/utils"
function Textarea({ className, ...props }: React.ComponentProps<"textarea">) {
return (
<textarea
data-slot="textarea"
className={cn(
"border-input placeholder:text-muted-foreground focus-visible:border-ring focus-visible:ring-ring/50 aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive dark:bg-input/30 flex field-sizing-content min-h-16 w-full rounded-md border bg-transparent px-3 py-2 text-base shadow-xs transition-[color,box-shadow] outline-none focus-visible:ring-[3px] disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
className
)}
{...props}
/>
)
}
export { Textarea }

2
frontend/src/components/ui/tooltip.tsx
View File

@@ -44,7 +44,7 @@ function TooltipContent({
data-slot="tooltip-content"
sideOffset={sideOffset}
className={cn(
"bg-primary text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit rounded-md px-3 py-1.5 text-xs text-balance",
"bg-primary text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 z-50 w-fit origin-(--radix-tooltip-content-transform-origin) rounded-md px-3 py-1.5 text-xs text-balance",
className
)}
{...props}

10
frontend/src/hooks/useSession.ts
View File

@@ -17,6 +17,16 @@ const fetchSession = async () => {
});
// console.log(res);
if (!res.ok) {
localStorage.removeItem("auth_token");
// remove these for a while if no session just until fully to 2.0 and clearly no one has ran lstv1 in a long time
localStorage.removeItem("ally-supports-cache");
localStorage.removeItem("auth-storage");
localStorage.removeItem("nextauth.message");
localStorage.removeItem("prod");
localStorage.removeItem("cards");
localStorage.removeItem("rememberMe");
localStorage.removeItem("username");
throw new Error("Session not found");
}

8
frontend/src/lib/store/sessionStore.ts
View File

@@ -1,4 +1,5 @@
import {User} from "@/types/users";
import axios from "axios";
import {create} from "zustand";
export type SessionState = {
@@ -16,9 +17,14 @@ export const useSessionStore = create<SessionState>((set) => {
user: null, // User is NOT stored in localStorage
token: storedToken || null,
setSession: (user, token) => {
setSession: async (user: any, token) => {
if (token) {
localStorage.setItem("auth_token", token);
const response = await axios.get("/api/auth/getuseraccess", {
headers: {Authorization: `Bearer ${token}`},
});
const data = response.data; //await response.json();
user = {...user, roles: data.data};
} else {
localStorage.removeItem("auth_token");
}

12
frontend/src/lib/store/useGetRoles.ts
View File

@@ -1,6 +1,7 @@
import {create} from "zustand";
import {useSessionStore} from "./sessionStore";
import {Modules} from "@/types/modules";
import axios from "axios";
interface SettingState {
userRoles: Modules[];
@@ -19,15 +20,8 @@ export const useGetUserRoles = create<SettingState>()((set) => ({
try {
//const response = await axios.get<{data: Setting[]}>(`${process.env.NEXT_PUBLIC_URL}/api/settings/client`);
const {token} = useSessionStore();
const response = await fetch(`/api/auth/getuseraccess`, {
method: "GET",
headers: {
"Content-Type": "application/json",
Authentication: `Beaer ${token}`,
// You can add other headers here if necessary
},
});
const data: FetchModulesResponse = await response.json();
const response = await axios.get("/api/auth/getuseraccess", {headers: {Authorization: `Bearer ${token}`}});
const data: FetchModulesResponse = response.data; //await response.json();
//console.log(data);
set({userRoles: data.data});
} catch (error) {

12
frontend/src/lib/store/useModuleStore.ts
View File

@@ -1,4 +1,5 @@
import {Modules} from "@/types/modules";
import axios from "axios";
import {create} from "zustand";
interface SettingState {
@@ -17,18 +18,13 @@ export const useModuleStore = create<SettingState>()((set) => ({
fetchModules: async () => {
try {
//const response = await axios.get<{data: Setting[]}>(`${process.env.NEXT_PUBLIC_URL}/api/settings/client`);
const response = await fetch(`/api/server/modules`, {
method: "GET",
headers: {
"Content-Type": "application/json",
// You can add other headers here if necessary
},
});
const data: FetchModulesResponse = await response.json();
const response = await axios.get(`/api/server/modules`, {});
const data: FetchModulesResponse = response.data; //await response.json();
//console.log(data);
set({modules: data.data});
} catch (error) {
console.error("Failed to fetch settings:", error);
set({modules: []});
}
},
}));

29
frontend/src/lib/store/useSettings.ts Normal file
View File

@@ -0,0 +1,29 @@
import axios from "axios";
import {create} from "zustand";
interface SettingState {
settings: any[];
fetchSettings: () => Promise<void>;
setSettings: (settings: any[]) => void;
}
interface FetchModulesResponse {
data: any[];
}
export const useSettingStore = create<SettingState>()((set) => ({
settings: [],
setSettings: (settings) => set({settings}),
fetchSettings: async () => {
try {
//const response = await axios.get<{data: Setting[]}>(`${process.env.NEXT_PUBLIC_URL}/api/settings/client`);
const response = await axios.get(`/api/server/settings`, {});
const data: FetchModulesResponse = response.data; //await response.json();
//console.log(data);
set({settings: data.data});
} catch (error) {
console.error("Failed to fetch settings:", error);
set({settings: []});
}
},
}));

79
frontend/src/routeTree.gen.ts
View File

@@ -18,11 +18,12 @@ import { Route as AuthImport } from './routes/_auth'
import { Route as AdminImport } from './routes/_admin'
import { Route as IndexImport } from './routes/index'
import { Route as OcpIndexImport } from './routes/ocp/index'
import { Route as OcpLotsImport } from './routes/ocp/lots'
import { Route as EomEomImport } from './routes/_eom/eom'
import { Route as AuthProfileImport } from './routes/_auth/profile'
import { Route as AdminSettingsImport } from './routes/_admin/settings'
import { Route as AdminServersImport } from './routes/_admin/servers'
import { Route as AdminModulesImport } from './routes/_admin/modules'
import { Route as ocmeCyclecountIndexImport } from './routes/(ocme)/cyclecount/index'
import { Route as logisticsMaterialHelperIndexImport } from './routes/(logistics)/materialHelper/index'
import { Route as EomArticleAvImport } from './routes/_eom/article/$av'
import { Route as logisticsMaterialHelperSiloLinkIndexImport } from './routes/(logistics)/materialHelper/siloLink/index'
@@ -69,12 +70,6 @@ const OcpIndexRoute = OcpIndexImport.update({
getParentRoute: () => rootRoute,
} as any)
const OcpLotsRoute = OcpLotsImport.update({
id: '/ocp/lots',
path: '/ocp/lots',
getParentRoute: () => rootRoute,
} as any)
const EomEomRoute = EomEomImport.update({
id: '/eom',
path: '/eom',
@@ -93,12 +88,24 @@ const AdminSettingsRoute = AdminSettingsImport.update({
getParentRoute: () => AdminRoute,
} as any)
const AdminServersRoute = AdminServersImport.update({
id: '/servers',
path: '/servers',
getParentRoute: () => AdminRoute,
} as any)
const AdminModulesRoute = AdminModulesImport.update({
id: '/modules',
path: '/modules',
getParentRoute: () => AdminRoute,
} as any)
const ocmeCyclecountIndexRoute = ocmeCyclecountIndexImport.update({
id: '/(ocme)/cyclecount/',
path: '/cyclecount/',
getParentRoute: () => rootRoute,
} as any)
const logisticsMaterialHelperIndexRoute =
logisticsMaterialHelperIndexImport.update({
id: '/(logistics)/materialHelper/',
@@ -179,6 +186,13 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof AdminModulesImport
parentRoute: typeof AdminImport
}
'/_admin/servers': {
id: '/_admin/servers'
path: '/servers'
fullPath: '/servers'
preLoaderRoute: typeof AdminServersImport
parentRoute: typeof AdminImport
}
'/_admin/settings': {
id: '/_admin/settings'
path: '/settings'
@@ -200,13 +214,6 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof EomEomImport
parentRoute: typeof EomImport
}
'/ocp/lots': {
id: '/ocp/lots'
path: '/ocp/lots'
fullPath: '/ocp/lots'
preLoaderRoute: typeof OcpLotsImport
parentRoute: typeof rootRoute
}
'/ocp/': {
id: '/ocp/'
path: '/ocp'
@@ -228,6 +235,13 @@ declare module '@tanstack/react-router' {
preLoaderRoute: typeof logisticsMaterialHelperIndexImport
parentRoute: typeof rootRoute
}
'/(ocme)/cyclecount/': {
id: '/(ocme)/cyclecount/'
path: '/cyclecount'
fullPath: '/cyclecount'
preLoaderRoute: typeof ocmeCyclecountIndexImport
parentRoute: typeof rootRoute
}
'/(logistics)/materialHelper/consumption/': {
id: '/(logistics)/materialHelper/consumption/'
path: '/materialHelper/consumption'
@@ -249,11 +263,13 @@ declare module '@tanstack/react-router' {
interface AdminRouteChildren {
AdminModulesRoute: typeof AdminModulesRoute
AdminServersRoute: typeof AdminServersRoute
AdminSettingsRoute: typeof AdminSettingsRoute
}
const AdminRouteChildren: AdminRouteChildren = {
AdminModulesRoute: AdminModulesRoute,
AdminServersRoute: AdminServersRoute,
AdminSettingsRoute: AdminSettingsRoute,
}
@@ -287,13 +303,14 @@ export interface FileRoutesByFullPath {
'/about': typeof AboutRoute
'/login': typeof LoginRoute
'/modules': typeof AdminModulesRoute
'/servers': typeof AdminServersRoute
'/settings': typeof AdminSettingsRoute
'/profile': typeof AuthProfileRoute
'/eom': typeof EomEomRoute
'/ocp/lots': typeof OcpLotsRoute
'/ocp': typeof OcpIndexRoute
'/article/$av': typeof EomArticleAvRoute
'/materialHelper': typeof logisticsMaterialHelperIndexRoute
'/cyclecount': typeof ocmeCyclecountIndexRoute
'/materialHelper/consumption': typeof logisticsMaterialHelperConsumptionIndexRoute
'/materialHelper/siloLink': typeof logisticsMaterialHelperSiloLinkIndexRoute
}
@@ -304,13 +321,14 @@ export interface FileRoutesByTo {
'/about': typeof AboutRoute
'/login': typeof LoginRoute
'/modules': typeof AdminModulesRoute
'/servers': typeof AdminServersRoute
'/settings': typeof AdminSettingsRoute
'/profile': typeof AuthProfileRoute
'/eom': typeof EomEomRoute
'/ocp/lots': typeof OcpLotsRoute
'/ocp': typeof OcpIndexRoute
'/article/$av': typeof EomArticleAvRoute
'/materialHelper': typeof logisticsMaterialHelperIndexRoute
'/cyclecount': typeof ocmeCyclecountIndexRoute
'/materialHelper/consumption': typeof logisticsMaterialHelperConsumptionIndexRoute
'/materialHelper/siloLink': typeof logisticsMaterialHelperSiloLinkIndexRoute
}
@@ -324,13 +342,14 @@ export interface FileRoutesById {
'/about': typeof AboutRoute
'/login': typeof LoginRoute
'/_admin/modules': typeof AdminModulesRoute
'/_admin/servers': typeof AdminServersRoute
'/_admin/settings': typeof AdminSettingsRoute
'/_auth/profile': typeof AuthProfileRoute
'/_eom/eom': typeof EomEomRoute
'/ocp/lots': typeof OcpLotsRoute
'/ocp/': typeof OcpIndexRoute
'/_eom/article/$av': typeof EomArticleAvRoute
'/(logistics)/materialHelper/': typeof logisticsMaterialHelperIndexRoute
'/(ocme)/cyclecount/': typeof ocmeCyclecountIndexRoute
'/(logistics)/materialHelper/consumption/': typeof logisticsMaterialHelperConsumptionIndexRoute
'/(logistics)/materialHelper/siloLink/': typeof logisticsMaterialHelperSiloLinkIndexRoute
}
@@ -343,13 +362,14 @@ export interface FileRouteTypes {
| '/about'
| '/login'
| '/modules'
| '/servers'
| '/settings'
| '/profile'
| '/eom'
| '/ocp/lots'
| '/ocp'
| '/article/$av'
| '/materialHelper'
| '/cyclecount'
| '/materialHelper/consumption'
| '/materialHelper/siloLink'
fileRoutesByTo: FileRoutesByTo
@@ -359,13 +379,14 @@ export interface FileRouteTypes {
| '/about'
| '/login'
| '/modules'
| '/servers'
| '/settings'
| '/profile'
| '/eom'
| '/ocp/lots'
| '/ocp'
| '/article/$av'
| '/materialHelper'
| '/cyclecount'
| '/materialHelper/consumption'
| '/materialHelper/siloLink'
id:
@@ -377,13 +398,14 @@ export interface FileRouteTypes {
| '/about'
| '/login'
| '/_admin/modules'
| '/_admin/servers'
| '/_admin/settings'
| '/_auth/profile'
| '/_eom/eom'
| '/ocp/lots'
| '/ocp/'
| '/_eom/article/$av'
| '/(logistics)/materialHelper/'
| '/(ocme)/cyclecount/'
| '/(logistics)/materialHelper/consumption/'
| '/(logistics)/materialHelper/siloLink/'
fileRoutesById: FileRoutesById
@@ -396,9 +418,9 @@ export interface RootRouteChildren {
EomRoute: typeof EomRouteWithChildren
AboutRoute: typeof AboutRoute
LoginRoute: typeof LoginRoute
OcpLotsRoute: typeof OcpLotsRoute
OcpIndexRoute: typeof OcpIndexRoute
logisticsMaterialHelperIndexRoute: typeof logisticsMaterialHelperIndexRoute
ocmeCyclecountIndexRoute: typeof ocmeCyclecountIndexRoute
logisticsMaterialHelperConsumptionIndexRoute: typeof logisticsMaterialHelperConsumptionIndexRoute
logisticsMaterialHelperSiloLinkIndexRoute: typeof logisticsMaterialHelperSiloLinkIndexRoute
}
@@ -410,9 +432,9 @@ const rootRouteChildren: RootRouteChildren = {
EomRoute: EomRouteWithChildren,
AboutRoute: AboutRoute,
LoginRoute: LoginRoute,
OcpLotsRoute: OcpLotsRoute,
OcpIndexRoute: OcpIndexRoute,
logisticsMaterialHelperIndexRoute: logisticsMaterialHelperIndexRoute,
ocmeCyclecountIndexRoute: ocmeCyclecountIndexRoute,
logisticsMaterialHelperConsumptionIndexRoute:
logisticsMaterialHelperConsumptionIndexRoute,
logisticsMaterialHelperSiloLinkIndexRoute:
@@ -435,9 +457,9 @@ export const routeTree = rootRoute
"/_eom",
"/about",
"/login",
"/ocp/lots",
"/ocp/",
"/(logistics)/materialHelper/",
"/(ocme)/cyclecount/",
"/(logistics)/materialHelper/consumption/",
"/(logistics)/materialHelper/siloLink/"
]
@@ -449,6 +471,7 @@ export const routeTree = rootRoute
"filePath": "_admin.tsx",
"children": [
"/_admin/modules",
"/_admin/servers",
"/_admin/settings"
]
},
@@ -475,6 +498,10 @@ export const routeTree = rootRoute
"filePath": "_admin/modules.tsx",
"parent": "/_admin"
},
"/_admin/servers": {
"filePath": "_admin/servers.tsx",
"parent": "/_admin"
},
"/_admin/settings": {
"filePath": "_admin/settings.tsx",
"parent": "/_admin"
@@ -487,9 +514,6 @@ export const routeTree = rootRoute
"filePath": "_eom/eom.tsx",
"parent": "/_eom"
},
"/ocp/lots": {
"filePath": "ocp/lots.tsx"
},
"/ocp/": {
"filePath": "ocp/index.tsx"
},
@@ -500,6 +524,9 @@ export const routeTree = rootRoute
"/(logistics)/materialHelper/": {
"filePath": "(logistics)/materialHelper/index.tsx"
},
"/(ocme)/cyclecount/": {
"filePath": "(ocme)/cyclecount/index.tsx"
},
"/(logistics)/materialHelper/consumption/": {
"filePath": "(logistics)/materialHelper/consumption/index.tsx"
},

28
frontend/src/routes/(logistics)/materialHelper/consumption/index.tsx
View File

@@ -1,11 +1,25 @@
import { createFileRoute } from '@tanstack/react-router'
import ConsumeMaterial from "@/components/logistics/materialHelper/consumption/ConsumeMaterial";
import {createFileRoute} from "@tanstack/react-router";
export const Route = createFileRoute(
'/(logistics)/materialHelper/consumption/',
)({
component: RouteComponent,
})
export const Route = createFileRoute("/(logistics)/materialHelper/consumption/")({
component: RouteComponent,
head: () => ({
meta: [
{
name: "description",
content: "My App is a web application",
},
{
title: "LST - Logistics",
},
],
}),
});
function RouteComponent() {
return <div>Hello "/(logistics)/materialHelper/consumption/"!</div>
return (
<div>
<ConsumeMaterial />
</div>
);
}

11
frontend/src/routes/(logistics)/materialHelper/index.tsx
View File

@@ -3,6 +3,17 @@ import {createFileRoute} from "@tanstack/react-router";
export const Route = createFileRoute("/(logistics)/materialHelper/")({
component: RouteComponent,
head: () => ({
meta: [
{
name: "description",
content: "My App is a web application",
},
{
title: "LST - Logistics",
},
],
}),
});
function RouteComponent() {

14
frontend/src/routes/(ocme)/cyclecount/index.tsx Normal file
View File

@@ -0,0 +1,14 @@
import OcmeCycleCount from "@/components/ocme/ocmeCycleCount";
import {createFileRoute} from "@tanstack/react-router";
export const Route = createFileRoute("/(ocme)/cyclecount/")({
component: RouteComponent,
});
function RouteComponent() {
return (
<div className="m-2">
<OcmeCycleCount />
</div>
);
}

161
frontend/src/routes/__root.tsx
View File

@@ -1,91 +1,94 @@
import {createRootRoute, Link, Outlet} from "@tanstack/react-router";
import {TanStackRouterDevtools} from "@tanstack/router-devtools";
import { createRootRoute, Link, Outlet } from "@tanstack/react-router";
//import {TanStackRouterDevtools} from "@tanstack/router-devtools";
import Cookies from "js-cookie";
import {SidebarProvider} from "../components/ui/sidebar";
import {ThemeProvider} from "../components/layout/theme-provider";
import {ModeToggle} from "../components/layout/mode-toggle";
import {AppSidebar} from "../components/layout/lst-sidebar";
import {Avatar, AvatarFallback, AvatarImage} from "../components/ui/avatar";
import { SidebarProvider } from "../components/ui/sidebar";
import { ThemeProvider } from "../components/layout/theme-provider";
import { ModeToggle } from "../components/layout/mode-toggle";
import { AppSidebar } from "../components/layout/lst-sidebar";
import { Avatar, AvatarFallback, AvatarImage } from "../components/ui/avatar";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuTrigger,
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "../components/ui/dropdown-menu";
import {SessionProvider} from "../components/providers/Providers";
import {Toaster} from "sonner";
import {Button} from "../components/ui/button";
import { SessionProvider } from "../components/providers/Providers";
import { Toaster } from "sonner";
//import { Button } from "../components/ui/button";
import {useSessionStore} from "../lib/store/sessionStore";
import {useSession} from "@/hooks/useSession";
import {useLogout} from "@/hooks/useLogout";
import { useSessionStore } from "../lib/store/sessionStore";
import { useSession } from "@/hooks/useSession";
import { useLogout } from "@/hooks/useLogout";
// same as the layout
export const Route = createRootRoute({
component: () => {
const sidebarState = Cookies.get("sidebar_state") === "true";
const {session} = useSession();
const {user} = useSessionStore();
const logout = useLogout();
component: () => {
const sidebarState = Cookies.get("sidebar_state") === "true";
const { session } = useSession();
const { user } = useSessionStore();
const logout = useLogout();
return (
<>
<SessionProvider>
<ThemeProvider>
<nav className="flex justify-end">
<div className="m-2 flex flex-row">
<div className="m-auto pr-2">
<p>Add Card</p>
</div>
<div className="m-1">
<ModeToggle />
</div>
{session ? (
<div className="m-1">
<DropdownMenu>
<DropdownMenuTrigger>
<Avatar>
<AvatarImage src="https://github.com/shadcn.png" alt="@shadcn" />
<AvatarFallback>CN</AvatarFallback>
</Avatar>
</DropdownMenuTrigger>
<DropdownMenuContent>
<DropdownMenuLabel>Hello {user?.username}</DropdownMenuLabel>
<DropdownMenuSeparator />
<DropdownMenuItem>Profile</DropdownMenuItem>
return (
<>
<SessionProvider>
<ThemeProvider>
<nav className="flex justify-end">
<div className="m-2 flex flex-row">
<div className="m-auto pr-2">
<p>Add Card</p>
</div>
<div className="m-1">
<ModeToggle />
</div>
{session ? (
<div className="m-1">
<DropdownMenu>
<DropdownMenuTrigger>
<Avatar>
<AvatarImage
src="https://github.com/shadcn.png"
alt="@shadcn"
/>
<AvatarFallback>CN</AvatarFallback>
</Avatar>
</DropdownMenuTrigger>
<DropdownMenuContent>
<DropdownMenuLabel>
Hello {user?.username}
</DropdownMenuLabel>
<DropdownMenuSeparator />
{/* <DropdownMenuItem>Profile</DropdownMenuItem>
<DropdownMenuItem>Billing</DropdownMenuItem>
<DropdownMenuItem>Team</DropdownMenuItem>
<DropdownMenuItem>Subscription</DropdownMenuItem>
<hr className="solid"></hr>
<DropdownMenuItem>
<div className="m-auto mt-3">
<Button onClick={() => logout()} variant="ghost">
Logout
</Button>
</div>
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
) : (
<>
<Link to="/login">Login</Link>
</>
)}
</div>
</nav>
<SidebarProvider defaultOpen={sidebarState}>
<AppSidebar />
<Toaster expand={true} richColors closeButton />
<Outlet />
</SidebarProvider>
</ThemeProvider>
</SessionProvider>
<DropdownMenuItem>Subscription</DropdownMenuItem> */}
<hr className="solid"></hr>
<DropdownMenuItem>
<div className="m-auto">
<button onClick={() => logout()}>Logout</button>
</div>
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</div>
) : (
<div>
<Link to="/login">Login</Link>
</div>
)}
</div>
</nav>
<SidebarProvider defaultOpen={sidebarState}>
<AppSidebar />
<Toaster expand={true} richColors closeButton />
<Outlet />
</SidebarProvider>
</ThemeProvider>
</SessionProvider>
<TanStackRouterDevtools position="bottom-right" />
</>
);
},
{/* <TanStackRouterDevtools position="bottom-right" /> */}
</>
);
},
});

14
frontend/src/routes/_admin/servers.tsx Normal file
View File

@@ -0,0 +1,14 @@
import ServerPage from "@/components/admin/servers/ServerPage";
import {createFileRoute} from "@tanstack/react-router";
export const Route = createFileRoute("/_admin/servers")({
component: RouteComponent,
});
function RouteComponent() {
return (
<div>
<ServerPage />
</div>
);
}

9
frontend/src/routes/ocp/lots.tsx
View File

@@ -1,9 +0,0 @@
import { createFileRoute } from '@tanstack/react-router'
export const Route = createFileRoute('/ocp/lots')({
component: RouteComponent,
})
function RouteComponent() {
return <div>Hello "/ocp/lots"!</div>
}

19
frontend/src/types/lots.ts Normal file
View File

@@ -0,0 +1,19 @@
export type LotType = {
AV: number;
Alias: string;
LOT: number;
LabelOnlineID: number;
MachineDescription: string;
MachineID: number;
MachineLocation: number;
PlannedQTY: number;
PrinterName: string;
Produced: number;
ProlinkLot: number;
Remaining: number;
machineID: number;
overPrinting: string;
pallerCopies: number;
palletLabel: string;
printerID: number;
};

1
frontend/src/types/users.ts
View File

@@ -6,4 +6,5 @@ export type User = {
username: string;
roles: Roles[];
role: string;
prod?: string;
};

8
frontend/src/utils/adminUrlCheck.ts Normal file
View File

@@ -0,0 +1,8 @@
export const adminUrlCheck = () => {
const host = window.location.host.split(":")[0];
const okHost = ["localhost", "usmcd1vms036"];
if (okHost.includes(host)) {
return true;
}
return false;
};

20
frontend/src/utils/querys/production/labels.tsx Normal file
View File

@@ -0,0 +1,20 @@
import {queryOptions} from "@tanstack/react-query";
import axios from "axios";
export function getlabels(hours: string) {
return queryOptions({
queryKey: ["labels"],
queryFn: () => fetchSettings(hours),
staleTime: 1000,
//refetchInterval: 2500,
refetchOnWindowFocus: true,
});
}
const fetchSettings = async (hours: string) => {
const {data} = await axios.get(`/api/v1/ocp/labels?hours=${hours}`);
// if we are not localhost ignore the devDir setting.
//const url: string = window.location.host.split(":")[0];
return data.data ?? [];
};

21
frontend/src/utils/querys/production/lots.tsx Normal file
View File

@@ -0,0 +1,21 @@
import {queryOptions} from "@tanstack/react-query";
import axios from "axios";
export function getlots() {
return queryOptions({
queryKey: ["lots"],
queryFn: () => fetchSettings(),
staleTime: 10 * 1000,
//refetchInterval: 10 * 1000,
refetchOnWindowFocus: true,
});
}
const fetchSettings = async () => {
const {data} = await axios.get("/api/v1/ocp/lots");
// if we are not localhost ignore the devDir setting.
//const url: string = window.location.host.split(":")[0];
let lotData = data.data;
return lotData ?? [];
};

19
frontend/src/utils/querys/servers.tsx Normal file
View File

@@ -0,0 +1,19 @@
import {queryOptions} from "@tanstack/react-query";
import axios from "axios";
export function getServers(token: string) {
return queryOptions({
queryKey: ["servers"],
queryFn: () => fetchSettings(token),
enabled: !!token,
staleTime: 1000,
refetchInterval: 2500,
refetchOnWindowFocus: true,
});
}
const fetchSettings = async (token: string) => {
const {data} = await axios.get("/api/server/servers", {headers: {Authorization: `Bearer ${token}`}});
return data.data;
};

9
frontend/src/utils/querys/settings.tsx
View File

@@ -13,6 +13,11 @@ export function getSettings(token: string) {
const fetchSettings = async (token: string) => {
const {data} = await axios.get("/api/server/settings", {headers: {Authorization: `Bearer ${token}`}});
return data.data;
// if we are not localhost ignore the devDir setting.
const url: string = window.location.host.split(":")[0];
let settingsData = data.data;
if (url != "localhost") {
settingsData.filter((n: any) => n.name === "devDir");
}
return settingsData;
};

5
frontend/src/utils/userAccess.ts
View File

@@ -13,14 +13,13 @@ export function hasAccess(user: User | null, moduleName: string | null, modules:
}
export function hasPageAccess(user: User | null, role: any, module_id: string): boolean {
if (role.includes("viewer")) return true;
if (!user) return false;
// get only the module in the user profile
const userRole = user?.roles.filter((role) => role.module_id === module_id);
if (role.includes(userRole[0].role)) {
return true;
}
if (role.includes(userRole[0]?.role)) return true;
return false;
}

11
frontend/vite.config.ts
View File

@@ -18,7 +18,16 @@ export default defineConfig({
},
server: {
proxy: {
"/api": {target: `http://localhost:${Number(process.env.VITE_SERVER_PORT || 4400)}`, changeOrigin: true},
"/api": {
target: `http://localhost:${Number(process.env.VITE_SERVER_PORT || 4400)}`,
changeOrigin: true,
secure: false,
},
"/ocme": {
target: `http://localhost:${Number(process.env.VITE_SERVER_PORT || 4400)}`,
changeOrigin: true,
secure: false,
},
},
},
});

19554
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

139
package.json
View File

@@ -1,62 +1,81 @@
{
"name": "fullstack-app",
"version": "2.3.0",
"type": "module",
"scripts": {
"dev": "concurrently -n \"server,frontend\" -c \"#007755,#2f6da3\" \"npm run dev:server\" \"cd frontend && npm run dev\"",
"dev:server": "dotenvx run -f .env -- tsx watch server/index.ts",
"dev:frontend": "cd frontend && npm run dev",
"build": "npm run build:server && npm run build:frontend",
"build:server": "rimraf dist && tsc --build && xcopy server\\scripts dist\\server\\scripts /E /I /Y",
"build:frontend": "cd frontend && npm run build",
"start": "npm run start:server",
"start:server": "dotenvx run -f .env -- node dist/server/index.js",
"db:generate": "npx drizzle-kit generate",
"db:migrate": "npx drizzle-kit push",
"deploy": "standard-version --conventional-commits",
"commit": "cz",
"prodinstall": "npm i --omit=dev && npm run db:migrate"
},
"dependencies": {
"@dotenvx/dotenvx": "^1.38.3",
"@hono/node-server": "^1.13.8",
"@hono/zod-openapi": "^0.18.4",
"@scalar/hono-api-reference": "^0.5.175",
"@types/jsonwebtoken": "^9.0.8",
"axios": "^1.7.9",
"bcrypt": "^5.1.1",
"compression": "^1.8.0",
"cookie": "^1.0.2",
"date-fns": "^4.1.0",
"dotenv": "^16.4.7",
"drizzle-kit": "^0.30.4",
"drizzle-orm": "^0.39.3",
"drizzle-zod": "^0.7.0",
"jsonwebtoken": "^9.0.2",
"nodemailer": "^6.10.0",
"nodemailer-express-handlebars": "^7.0.0",
"pg": "^8.13.3",
"pino": "^9.6.0",
"pino-pretty": "^13.0.0",
"postgres": "^3.4.5",
"zod": "^3.24.2"
},
"devDependencies": {
"@types/bcrypt": "^5.0.2",
"@types/js-cookie": "^3.0.6",
"@types/node": "^22.13.5",
"@types/pg": "^8.11.11",
"concurrently": "^8.2.0",
"cz-conventional-changelog": "^3.3.0",
"dotenv": "^16.3.1",
"rimraf": "^6.0.1",
"standard-version": "^9.5.0",
"tsx": "^4.7.1",
"typescript": "~5.7.3"
},
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
"name": "lstv2",
"version": "2.9.0",
"type": "module",
"scripts": {
"dev": "concurrently -n \"server,frontend\" -c \"#007755,#2f6da3\" \"npm run dev:server\" \"cd frontend && npm run dev\"",
"dev:server": "dotenvx run -f .env -- tsx watch server/index.ts",
"dev:frontend": "cd frontend && npm run dev",
"dev:dbgen": " drizzle-kit generate --config=drizzle-dev.config.ts",
"dev:dbmigrate": " drizzle-kit migrate --config=drizzle-dev.config.ts",
"build": "npm run build:server && npm run build:frontend",
"build:server": "rimraf dist && tsc --build && npm run copy:scripts",
"build:frontend": "cd frontend && npm run build",
"copy:scripts": "tsx server/scripts/copyScripts.ts",
"copy:servers": "xcopy server\\services\\server\\utils\\serverData.json dist\\server\\services\\server\\utils /E /I /Y",
"start": "set NODE_ENV=production && npm run start:server",
"start:server": "dotenvx run -f .env -- node dist/server/index.js",
"db:generate": "npx drizzle-kit generate",
"db:migrate": "npx drizzle-kit push",
"db:dev": "npm run build && npm run db:generate && npm run db:migrate",
"deploy": "standard-version --conventional-commits && npm run prodBuild",
"zipServer": "dotenvx run -f .env -- tsx server/scripts/zipUpBuild.ts \"C:\\Users\\matthes01\\Documents\\lstv2\"",
"v1Build": "cd C:\\Users\\matthes01\\Documents\\logisticsSupportTool && npm run oldBuilder",
"prodBuild": "npm run v1Build && powershell -ExecutionPolicy Bypass -File server/scripts/build.ps1 -dir \"C:\\Users\\matthes01\\Documents\\lstv2\" && npm run zipServer",
"commit": "cz",
"prodinstall": "npm i --omit=dev && npm run db:migrate",
"checkupdates": "npx npm-check-updates"
},
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
}
}
},
"admConfig": {
"build": 50,
"oldBuild": "backend-0.1.3.zip"
},
"devDependencies": {
"@types/adm-zip": "^0.5.7",
"@types/bcrypt": "^5.0.2",
"@types/fs-extra": "^11.0.4",
"@types/js-cookie": "^3.0.6",
"@types/mssql": "^9.1.7",
"@types/node": "^22.13.11",
"@types/pg": "^8.11.11",
"@types/ws": "^8.18.0",
"concurrently": "^9.1.2",
"cz-conventional-changelog": "^3.3.0",
"drizzle-kit": "^0.30.5",
"fs-extra": "^11.3.0",
"standard-version": "^9.5.0",
"tsx": "^4.19.3",
"typescript": "^5.8.2"
},
"dependencies": {
"@dotenvx/dotenvx": "^1.39.0",
"@hono/node-server": "^1.14.0",
"@hono/zod-openapi": "^0.19.2",
"@scalar/hono-api-reference": "^0.7.2",
"@types/jsonwebtoken": "^9.0.9",
"adm-zip": "^0.5.16",
"axios": "^1.8.4",
"bcryptjs": "^3.0.2",
"date-fns": "^4.1.0",
"drizzle-orm": "^0.41.0",
"drizzle-zod": "^0.7.0",
"fast-xml-parser": "^5.0.9",
"jsonwebtoken": "^9.0.2",
"mssql": "^11.0.1",
"nodemailer": "^6.10.0",
"nodemailer-express-handlebars": "^7.0.0",
"pg": "^8.14.1",
"pino": "^9.6.0",
"pino-abstract-transport": "^2.0.0",
"pino-pretty": "^13.0.0",
"postgres": "^3.4.5",
"rimraf": "^6.0.1",
"ws": "^8.18.1",
"zod": "^3.24.2"
}
}

13
server/globalUtils/apiHits.ts
View File

@@ -6,6 +6,7 @@ const requestSchema = z.object({
ip: z.string().optional(),
endpoint: z.string(),
action: z.string().optional(),
lastBody: z.string().optional(),
stats: z.string().optional(),
});
@@ -13,7 +14,7 @@ type ApiHitData = z.infer<typeof requestSchema>;
export const apiHit = async (
c: Context,
data: unknown
data: ApiHitData
): Promise<{success: boolean; data?: ApiHitData; errors?: any[]}> => {
// console.log(data);
try {
@@ -22,10 +23,16 @@ export const apiHit = async (
//console.log(forwarded);
// Validate the data
const validatedData = requestSchema.parse(data);
const checkData = {
ip: forwarded!,
endpoint: data?.endpoint,
lastBody: data?.lastBody,
action: data?.action,
stats: data?.stats,
};
const validatedData = requestSchema.parse(checkData);
// Proceed with the validated data
// console.log("Validated Data:", validatedData);
return {success: true, data: validatedData};
} catch (error) {
// Explicitly check if the error is an instance of ZodError

15
server/globalUtils/appInfo.ts Normal file
View File

@@ -0,0 +1,15 @@
import path from "path";
import {createLog} from "../services/logger/logger.js";
import fs from "fs";
export const getAppInfo = async (appLock: string) => {
try {
const packagePath = path.join(appLock, "package.json");
const packageJson = JSON.parse(fs.readFileSync(packagePath, "utf-8"));
//const version = packageJson.version;
return packageJson;
} catch (error) {
createLog("error", "lst", "zipUpBuild", `Error in getting the version: ${error}`);
return error;
}
};

50
server/globalUtils/createSSCC.ts Normal file
View File

@@ -0,0 +1,50 @@
import {eq} from "drizzle-orm";
import {db} from "../../database/dbclient.js";
import {settings} from "../../database/schema/settings.js";
import {query} from "../services/sqlServer/prodSqlServer.js";
import {plantInfo} from "../services/sqlServer/querys/dataMart/plantInfo.js";
import {createLog} from "../services/logger/logger.js";
export const createSSCC = async (runningNumber: number) => {
// get the token
const plantToken = await db.select().from(settings).where(eq(settings.name, "plantToken"));
let global; // get from plant address in basis enter the entire string here.
try {
global = await query(plantInfo.replaceAll("[token]", plantToken[0].value), "plantInfo");
} catch (error) {
createLog("error", "lst", "globalUtils", `There was an error getting the GLN: Error: ${error}`);
}
// create the sscc without the check diget and make sure we have it all correct
let step1SSCC = global[0].gln.toString().slice(0, 7).padStart(10, "0") + runningNumber.toString().padStart(9, "0");
let sum = 0;
for (let i = 0; i < step1SSCC.length; i++) {
let digit = parseInt(step1SSCC[i], 10);
if (i % 2 === 0) {
// Even index in 0-based index system means odd position in 1-based index system
sum += digit * 3;
} else {
sum += digit;
}
}
let checkDigit = (10 - (sum % 10)) % 10;
// make sure the check digit is never 10
// let checkDigit = 10 - ((oddSum * 3 + evenSum) % 10) === 10 ? 0 : (oddSum * 3 + evenSum) % 10;
// return the true sscc
let sscc = step1SSCC + checkDigit;
// console.log(step1SSCC);
// console.log(checkDigit);
return sscc.padStart(20, "0");
};
// let rn = 518475;
// console.log(`Creating sscc`);
// let sscc = await createSSCC(rn);
// console.log(sscc);

32
server/globalUtils/createUrl.ts Normal file
View File

@@ -0,0 +1,32 @@
import {eq} from "drizzle-orm";
import {db} from "../../database/dbclient.js";
import {settings} from "../../database/schema/settings.js";
// create the test server stuff
const testServers = [
{token: "test1", port: 8940},
{token: "test2", port: 8941},
{token: "test3", port: 8942},
];
export const prodEndpointCreation = async (endpoint: string) => {
let url = "";
//get the plant token
const plantToken = await db.select().from(settings).where(eq(settings.name, "plantToken"));
// check if we are a test server
const testServer = testServers.some((server) => server.token === plantToken[0].value);
const server = await db.select().from(settings).where(eq(settings.name, "dbServer"));
if (testServer) {
//filter out what testserver we are
const test = testServers.filter((t) => t.token === plantToken[0].value);
// "https://usmcd1vms036.alpla.net:8942/application/public/v1.0/DemandManagement/ORDERS"
// "https://usmcd1vms036.alpla.net:8492/application/public/v1.0/DemandManagement/ORDERS"
url = `https://${server[0].value}.alpla.net:${test[0].port}/application${endpoint}`;
return url;
} else {
url = `https://${plantToken[0].value}prod.alpla.net/application${endpoint}`;
return url;
}
};

3
server/globalUtils/delay.ts Normal file
View File

@@ -0,0 +1,3 @@
export const delay = (ms: number) => {
return new Promise((resolve) => setTimeout(resolve, ms));
};

65
server/globalUtils/pingServer.ts Normal file
View File

@@ -0,0 +1,65 @@
import dns from "dns";
import net from "net";
// Usage example
//const hostnamePort = "example.com:80"; // Replace with your hostname:port
//checkHostnamePort(hostnamePort);
// Function to resolve a hostname to an IP address
export function resolveHostname(hostname: string) {
return new Promise((resolve, reject) => {
dns.lookup(hostname, (err, address) => {
if (err) {
reject(err);
} else {
resolve(address);
}
});
});
}
// Function to check if a port is open
export function checkPort(ip: string, port: number): Promise<boolean> {
return new Promise((resolve, reject) => {
const socket = new net.Socket();
socket.setTimeout(2000); // Set a timeout for the connection attempt
socket.on("connect", () => {
socket.destroy(); // Close the connection
resolve(true); // Port is open
});
socket.on("timeout", () => {
socket.destroy(); // Close the connection
reject(new Error("Connection timed out")); // Port is not reachable
});
socket.on("error", (err: any) => {
reject(new Error(`Unknown error: ${err}`)); // Handle non-Error types
});
socket.connect(port, ip);
});
}
// Main function to check hostname:port
export async function checkHostnamePort(hostnamePort: string): Promise<boolean> {
try {
// Split the input into hostname and port
const [hostname, port] = hostnamePort.split(":");
if (!hostname || !port) {
return false; // Invalid format
}
// Resolve the hostname to an IP address
const ip = (await resolveHostname(hostname)) as string;
// Check if the port is open
const portCheck = await checkPort(ip, parseInt(port, 10));
return true; // Hostname:port is reachable
} catch (err) {
return false; // Any error means the hostname:port is not reachable
}
}

8
server/globalUtils/routeDefs/options.ts Normal file
View File

@@ -0,0 +1,8 @@
export const apiOptions = () => {
return {
tags: ["rfid"],
summary: "Add new reader",
method: "post",
path: "/addreader",
};
};

Some files were not shown because too many files have changed in this diff Show More