Commit graph

145 commits

Author SHA1 Message Date
csawatzky
050225bdb1 adding little description about the data sync and adding a sync button 2025-08-14 14:00:33 -06:00
csawatzky
42e027393e Merge branch 'libracart' of gitlab.com:brandx/bxt-app into libracart 2025-08-12 16:24:30 -06:00
csawatzky
3e6185be8f making sure the bin uses the correct data when using libracart as an inventory control 2025-08-12 16:20:04 -06:00
Saiyida Noor
ee979d4c50 Merge branch 'dev_environment' into 'libracart'
# Conflicts:
#   src/integrations/LibraCart/LibraCartAccess.tsx
#   src/pages/LibraCart.tsx
#   src/providers/pond/pond.tsx
2025-08-06 17:08:33 +00:00
csawatzky
e5300b19f4 Merge branch 'staging_environment' into libracart 2025-08-06 11:00:20 -06:00
Saiyida Noor
add87dca1c moved all of the libracart suff from the old frontend into the new new, also... 2025-08-06 15:30:39 +00:00
Noor
5d9f4787a5 minor update 2025-08-06 09:29:38 -06:00
Noor
1596f14ecd Merge branch 'dev_environment' of gitlab.com:brandx/bxt-app into libracart 2025-08-06 09:24:46 -06:00
csawatzky
ad479e2b45 added in the device preset stuff for bin modes since it was missed in the initial update to the new platform 2025-08-05 10:34:20 -06:00
csawatzky
03ab16614d update the bin storage condition to use the filtered nodes function to take into account excluded nodes 2025-07-31 14:40:55 -06:00
csawatzky
23223aa1a8 updated the api to use a new variable for whether to load all nodes, this will still use the show errors boolean for the component page
fixed issue in the filter function in the grain cable model that caused it to return empty when a top node was not set
updated the bin svg to have the disabled nodes greyed out
2025-07-31 13:20:31 -06:00
Noor
58ca2dff31 Merge branch 'libracart' of gitlab.com:brandx/bxt-app into libracart 2025-07-29 11:19:48 -06:00
Carter
f228f7f869 Merge branch 'auth_stuff' into staging_environment 2025-07-23 12:10:17 -06:00
Carter
e806633a8d using url.origin in the redirect uri to be more consistent 2025-07-23 12:10:01 -06:00
Carter
e874792707 Merge branch 'auth_stuff' into staging_environment 2025-07-18 15:30:29 -06:00
Carter
84ed63a765 added https:// to the hostname to make a valid uri 2025-07-18 15:28:41 -06:00
Carter
e5c97e4648 Merge branch 'auth_stuff' into staging_environment 2025-07-18 15:06:01 -06:00
Carter
b9d2635f99 using hostname instead of url 2025-07-18 15:05:49 -06:00
Carter
c0ec437eaa Merge branch 'auth_stuff' into staging_environment 2025-07-18 14:31:56 -06:00
Carter
bc1cf27ad4 debug output :) 2025-07-18 14:31:48 -06:00
csawatzky
093ad7b2ad sending the auth from libracart to the add endpoints 2025-07-18 13:46:07 -06:00
Carter
6ad6de20d9 Merge branch 'auth_stuff' into staging_environment 2025-07-18 13:16:27 -06:00
Carter
6f02f9e562 setting auth redirect to the url dynamically instead of just local host 2025-07-18 13:15:55 -06:00
Carter
41cb2dc7e4 merged auth stuff 2025-07-18 12:01:20 -06:00
csawatzky
a0a54bee2a moved all of the libracart suff from the old frontend into the new new, also added libracart as an option alongside jd and cnh to skip the auth0 callback when redirected back to us from there 2025-07-17 13:42:11 -06:00
Carter
4f8b0254bb added a welcome tour to the signupCallback page 2025-07-08 14:07:01 -06:00
Carter
24d27121d1 added signup callback page that runs an api call to finish signup 2025-07-03 13:41:09 -06:00
csawatzky
5607672a4b adding way of disabling the scan button
the button will be disabled once it has been clicked as well as on the device page if a scan is in progress (there are pending requests)
2025-06-30 16:46:39 -06:00
csawatzky
5127a78cb0 Merge branch 'master' into i2c_detect 2025-06-26 13:30:23 -06:00
csawatzky
751b39d345 made the react components to display the card for scanned components 2025-06-26 13:20:10 -06:00
Carter
a43ff1a8ad added preferred units back to the user settings menu 2025-06-25 13:44:40 -06:00
Carter
338b256d13 took out the login page route again, auth redirect forces login page if doing a sign up 2025-06-25 10:59:20 -06:00
Carter
c7848a25ef put the login page back 2025-06-25 09:45:02 -06:00
Carter
15d2a6a690 moved login page logic into the auth file to redirect correctly before auth redirects because you're unauthenticated 2025-06-24 16:46:59 -06:00
csawatzky
f5bc230fb6 changed test button to load scans 2025-06-24 11:01:37 -06:00
csawatzky
2c3ba2c1f5 updating the proto and adding a button on the device page to test the scan i2c command 2025-06-19 11:32:21 -06:00
csawatzky
cb7bf64c68 Merge branch 'hybrid_inventory_control' into staging_environment 2025-06-09 14:55:26 -06:00
csawatzky
691b3be1f9 approval of transactions works, is also now requires a matching transaction if the bin selected also uses hybrid control, rejection still needs to be implemented 2025-06-04 15:20:46 -06:00
csawatzky
a083f7d8ed added to transaction api and built the submit function 2025-05-30 14:50:21 -06:00
Carter
6a6334da6a fixed tag apis to use new context logic 2025-05-28 10:32:19 -06:00
csawatzky
d17be025cb Merge branch 'staging_environment' into hybrid_inventory_control 2025-05-27 10:38:26 -06:00
csawatzky
554fd0c228 added bintransactions component and function for the transaction api to get transaction involving a given object 2025-05-22 13:16:47 -06:00
Carter
ebf6bdb71a fixed navigation bug in devices page; added option to seperate dust from sen5x to different column 2025-05-16 10:53:26 -06:00
csawatzky
8c66a9d2c8 bolding the text for selected yard, changing font colour in drawer title to black 2025-05-08 16:18:24 -06:00
csawatzky
446147d4d5 fixed the temp and humidity on the bin cards in the drawer on the map, also fixed the drawer loading bins not in the yard 2025-05-08 15:56:38 -06:00
csawatzky
5f9d39e26d Merge branch 'master' into staging_environment 2025-05-08 15:22:08 -06:00
csawatzky
1c41157281 Merge branch 'dev_environment' into staging_environment 2025-05-08 15:19:54 -06:00
Carter
8ed5a44789 hotfix: changed loging with popup to login with redirect 2025-05-08 13:20:30 -06:00
Carter
9041482131 device statistics load properly with context 2025-05-07 13:27:37 -06:00
Carter
59c14e3f8b adjusted some spacing stuff on the bin page 2025-05-06 11:17:35 -06:00