Commit Graph

292 Commits

Author SHA1 Message Date
augmentedpotato
00c5198c47 Appointments, account stuff, adopt a pet changes 2026-03-30 05:38:15 -06:00
augmentedpotato
4dd57e3484 Merge branch 'web-index' 2026-03-29 17:47:33 -06:00
augmentedpotato
c048c4bdc3 Account login 2026-03-29 17:43:31 -06:00
fdf438f3dd Merge pull request #52 from RecentRunner/desktop-pet-product-pictures
Add desktop pet and product images
2026-03-29 16:58:06 -06:00
93e71434df fix desktop pet and product dialogs 2026-03-29 16:54:01 -06:00
8c6a53250a add desktop pet and product images 2026-03-27 10:07:37 -06:00
Alex
8272c49b44 Changed android app icon 2026-03-26 22:45:28 -06:00
Alex
38e1a29f34 Added petprofile images and uploads in petprofilefragment 2026-03-26 22:07:51 -06:00
Alex
5d8d37dee4 Merge branch 'MorePushNotification' 2026-03-26 21:39:38 -06:00
Alex
2c61e6e664 Make chat notification display messengers name and disable notifying if already in chat view 2026-03-26 21:31:36 -06:00
2fb409f0d9 add pet and product images 2026-03-26 20:36:04 -06:00
Alex
dbb24085b2 Added push notifications when reciving any message and added filter status on pets in Andriod 2026-03-26 20:13:27 -06:00
Alex
75c39312fe Added profile photo loading and uploading
- profile photos now load from backend
- profile photos can be uploaded to the backend
- RetrofitClient now automatically determines if the device is an emulator or hardware so we dont have to comment and uncomment everytime we test with a different device
2026-03-26 16:50:02 -06:00
Alex
aec9f7b9e0 Added role based access to android login
- Admin has access to everything
- Staff has limited access to what they can edit in listfragment
- Customers cannot login to app
- added validations to pets, supplier and services in their detailed view
2026-03-26 16:50:02 -06:00
5477c4beee use swing picker on wayland 2026-03-25 23:55:40 -06:00
4659aa44df readd secure avatar endpoints 2026-03-25 22:58:04 -06:00
b1fe03410c Merge pull request #30 from RecentRunner/WorkingOnProfileAndPushNotification
Working on profile and push notification
2026-03-25 09:18:48 -06:00
augmentedpotato
1c0f55fbe5 Adopt page, minor adjustment to backend 2026-03-25 08:19:44 -06:00
Alex
d3a69b7aea added push notification when a new conversation is made 2026-03-24 22:41:54 -06:00
d3fdf4f823 Merge pull request #29 from RecentRunner/desktop---validator-fixes
added null checks to validator, created a bunch of junit tests
2026-03-24 20:43:54 -06:00
augmentedpotato
dbdf5e54ab added null checks to validator, created a bunch of junit tests 2026-03-24 20:42:45 -06:00
Alex
b46705396d Profile now loads from backend
- can update profile from app
- loads profile details from backend to display
- changed inputValidator to use andriod phone pattern
- added ErrorResponse so we can fetch error messages from the backend
- Added UserDTO to get profile info

TODO:
Still need to get profile images from the backend and beable to load and update them using the backend
2026-03-24 18:31:12 -06:00
b012c91b3b Merge pull request #28 from RecentRunner/web-index
uploading index to repo
2026-03-24 16:59:39 -06:00
augmentedpotato
a7dfe3962d uploading index to repo 2026-03-24 16:56:03 -06:00
79f8514f3e Tighten reset cleanup 2026-03-18 20:28:55 -06:00
bbc7fa3aa8 Clean backend reset flow 2026-03-18 20:21:55 -06:00
2b616b8306 Remove Android VCS mapping 2026-03-18 19:46:15 -06:00
7e39925bcb Share IDE project settings 2026-03-18 19:40:43 -06:00
85839cbc4f Add empty web folder 2026-03-18 19:23:31 -06:00
66395139e0 Add 'android/' from commit '4e3261e9879f36679271f2dbdf6023ad01334265'
git-subtree-dir: android
git-subtree-mainline: 58b37b52384ca0a702c23297a2cd9bdad595c660
git-subtree-split: 4e3261e987
2026-03-18 19:23:20 -06:00
29c4afcfec Add 'desktop/' from commit 'bc9a54b29a8a8c8272609082438f36b92de7f4d1'
git-subtree-dir: desktop
git-subtree-mainline: 737028e06d5207fc69425cf4431b7d047cf3110f
git-subtree-split: bc9a54b29a
2026-03-18 19:23:20 -06:00
d0c06226f7 Add 'backend/' from commit '51bf07d5e16469036a8363e6b9d53616cbed643f'
git-subtree-dir: backend
git-subtree-mainline: 6dc2b48035ed90480e499efdb4513dff7b566616
git-subtree-split: 51bf07d5e1
2026-03-18 19:23:20 -06:00
1d7aa5ee42 Initial commit 2026-03-18 18:14:39 -06:00
Alex
4e3261e987 Added chat implementation with websockets 2026-03-15 17:41:42 -06:00
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