Commit Graph

308 Commits

Author SHA1 Message Date
bc9a54b29a fix staff account loading 2026-03-15 12:22:23 -06:00
51bf07d5e1 Merge remote-tracking branch 'origin/main' 2026-03-15 12:16:28 -06:00
c1d78a69fd Merge remote-tracking branch 'origin/main' 2026-03-15 12:16:28 -06:00
43886ea01f Merge remote-tracking branch 'origin/fixes' into tmp-merge-main 2026-03-15 12:11:13 -06:00
826798d976 harden endpoint errors 2026-03-15 11:32:26 -06:00
75642fc751 merge fixes into main 2026-03-14 22:15:24 -06:00
12e5a3272b merge fixes into main 2026-03-14 22:15:24 -06:00
972c090b41 harden user filters 2026-03-14 22:06:49 -06:00
Alex
7b8b75cd82 Converted recylerview for Pet, Service, supplier to use DTOs
- swapped Pet,Service,Suppliers to use DTOs instead of the model when loading the list from the backend to advoid conversion of DTO -> models when displaying the list
- Added a drawer menu to chatFragment to display a list of conversations the staff can choose to open chat
2026-03-14 22:06:45 -06:00
9d48692857 fix user api validation 2026-03-14 21:56:02 -06:00
8c673fd66f add user filter requests 2026-03-14 21:45:20 -06:00
5b3a91ada0 filter users by role 2026-03-14 21:38:42 -06:00
730d39c63e edit staff accounts 2026-03-14 21:35:38 -06:00
4b4f4b087e cut over employee phones 2026-03-14 20:22:14 -06:00
4b024984cd use employee api 2026-03-14 20:22:14 -06:00
4fd2041fbb sync customer phone 2026-03-14 20:13:48 -06:00
42f8f568ae use user phone 2026-03-14 20:12:48 -06:00
efc9836c11 add user phone 2026-03-14 20:12:48 -06:00
Alex
7acefd4848 Updated project to use Gradle Daemon toolchain 2026-03-14 18:43:58 -06:00
Alex
e49ea61e5b Added CRUD to Pet, Service, Supplier
- Made Pet, Service, supplier CRUD by calling the backend apiendpoints
2026-03-14 03:56:16 -06:00
Alex
025e749ce3 Edited the views so application looks consistant
-edited appointment, adoption, product, inventory xmls to look consistant
- added search feature to Pets, services, and suppliers
- made it so the application will resume where you left off when the application is switched to the background and back
2026-03-14 03:02:18 -06:00
Alex
cf0329e0a5 Fixed login issue where token was not being cleared before loggin in again 2026-03-13 22:14:19 -06:00
Nikitha
4a1f3f2284 Merge branch 'master' into store 2026-03-13 19:08:25 -06:00
Nikitha
e8a5bd9eae Update build.gradle.kts in store branch 2026-03-13 19:06:20 -06:00
bc9bd09d24 Keep original startup error message 2026-03-13 18:09:03 -06:00
82d35feb9a Add avatar controls 2026-03-13 18:01:56 -06:00
819bd92492 Fix refund flow 2026-03-13 18:01:56 -06:00
99fe718d2c Polish chat ui 2026-03-13 18:01:56 -06:00
e27758c204 Ignore tmp folder 2026-03-13 14:42:33 -06:00
1e381d59c6 Keep startup errors 2026-03-13 14:18:34 -06:00
462e37a443 Improve docker errors 2026-03-13 14:16:21 -06:00
885d968978 Find docker on windows 2026-03-13 14:13:31 -06:00
3cabc7b8ff Add startup checks 2026-03-13 10:25:50 -06:00
8368ff2359 Harden run configs 2026-03-13 10:05:32 -06:00
Alex
41402b74dc Connected to the backend
-Connected to backend using retrofit
-Added TokenManager and AuthInterceptor for the application to login and make calls with authentication to access some backend calls that need authentication
2026-03-13 03:17:02 -06:00
Nikitha
15cdd6590b Activity logger, Input validator
To search and validate activities
2026-03-12 20:55:23 -06:00
Nikitha
9783e78110 list fragments to view 2026-03-12 20:54:21 -06:00
Nikitha
0c48605519 Product activities , to create, view 2026-03-12 20:53:53 -06:00
Nikitha
61f3e52383 Create Inventory.java 2026-03-12 20:53:10 -06:00
Nikitha
08cc87da53 inventory activities 2026-03-12 20:52:55 -06:00
Nikitha
a4080a1e5f Appointment activities 2026-03-12 20:51:22 -06:00
Nikitha
60812f9ee8 Adoption list and details 2026-03-12 20:50:12 -06:00
79e8eb08b8 Align websocket auth 2026-03-12 18:27:02 -06:00
9dcb4865fa Invalidate auth tokens 2026-03-12 18:16:20 -06:00
8fdd28cbbd Use claims auth 2026-03-12 17:44:39 -06:00
52889b90b3 Add token version 2026-03-12 17:36:16 -06:00
389b5685e3 Run flyway explicitly 2026-03-11 15:54:40 -06:00
29fd106e0c Fix backend run config 2026-03-11 15:38:42 -06:00
d52542cae0 Add avatar controls 2026-03-11 14:21:57 -06:00
3bfdbf7584 Fix refund flow 2026-03-11 14:21:40 -06:00