Commit Graph

130 Commits

Author SHA1 Message Date
Jeas0001
7e1583f485 Changed delete item in shopping list to work and add item to only return an item and not an array with one item 2025-05-08 10:44:34 +02:00
Jeas0001
bf588c62ed Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-05-08 10:22:56 +02:00
Jeas0001
dfb2838565 Returns the added item in the shoppinglist 2025-05-08 10:22:43 +02:00
b3b4562f21
Allow checking/unchecking shopping items 2025-05-08 10:06:48 +02:00
f924d2083b
Show shopping list 2025-05-08 10:06:48 +02:00
LilleBRG
dc7e94b37b merge 2025-05-07 13:52:43 +02:00
LilleBRG
536b693085 create dish done but not checked with api 2025-05-07 13:51:54 +02:00
f9296f05c1
Implement adding items to shopping list 2025-05-07 13:34:58 +02:00
Jeas0001
050ff896e1 UserDbAccess comments 2025-05-07 13:33:36 +02:00
Jeas0001
dee0ea54a2 shoppinglistdbaccess comments 2025-05-07 13:14:41 +02:00
Jeas0001
fe90c243e2 RecipeDbAccess comments 2025-05-07 13:05:59 +02:00
Jeas0001
e30110bcff Usercontrollers comments 2025-05-07 12:30:12 +02:00
Jeas0001
38cf388ea8 Shoppinglistcontroller comments 2025-05-07 11:54:02 +02:00
Jeas0001
edf8c73ec4 authorize atribute added to shppinglistcontroller 2025-05-07 11:29:35 +02:00
Jeas0001
1ce1f355c0 Recipecontroller comments 2025-05-07 11:28:21 +02:00
Jeas0001
b8026250cf Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-05-07 09:35:12 +02:00
Jeas0001
3c3f0f202b retunere true når man tilføjer til shoppinglisten 2025-05-07 09:34:50 +02:00
87b5fbb014
Update profile page immediately as user info has changed 2025-05-06 14:37:48 +02:00
b8fa54539f
Don't return user object when updating profile 2025-05-06 14:31:04 +02:00
Jeas0001
b8ebac5970 Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-05-06 13:57:11 +02:00
Jeas0001
15a09e0d30 Comments for the logic 2025-05-06 13:56:46 +02:00
bdd7a0dfdb
Group activities and fragments by domain 2025-05-06 08:50:09 +02:00
0c1f167e20
Implement updating username/email and changing password and logout 2025-05-05 13:24:46 +02:00
a446ad934c
Add button to add shopping item 2025-05-05 13:23:56 +02:00
Jeas0001
f84cd6167b Only checks if the username or email is changed 2025-05-05 13:04:50 +02:00
Jeas0001
b0bb534eff Some comment and a fix for checking if a username or email is in use 2025-05-05 13:00:57 +02:00
LilleBRG
16d1d3459d creadish layout done and ready to test http connection on monday 2025-05-02 18:17:26 +02:00
Jeas0001
67e6442255 Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-05-01 12:44:07 +02:00
Jeas0001
da0dd828df Added allergi as a option for dishes 2025-05-01 12:43:37 +02:00
7c45526563
Add profile page, implement authentication 2025-05-01 12:04:19 +02:00
LilleBRG
9d9a2975f5 create dish button moved to dishesfragment 2025-05-01 10:13:52 +02:00
a63b98e180
Save tokens when logging in and implement refresh token 2025-05-01 09:43:21 +02:00
Jeas0001
3aba01d56a Generate recieve a json object and is a post request now 2025-05-01 09:36:36 +02:00
Jeas0001
fac4e04c2c Refreshtoken is recieved as a json object 2025-05-01 09:22:12 +02:00
Jeas0001
76a0e6afee Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-05-01 09:06:49 +02:00
Jeas0001
76c126c2fd Chat GPT integration 2025-05-01 09:06:19 +02:00
d00bace5b7
Add progress dialogs when signing up/logging in 2025-04-30 13:23:52 +02:00
Jeas0001
f5d580afe7 Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-04-30 13:06:13 +02:00
Jeas0001
adcb469a6f Made Unit and Amount nullable and directions to a list 2025-04-30 13:05:51 +02:00
Jeas0001
4772daa666 Removed preferedrecipes from the entire project 2025-04-30 12:49:58 +02:00
75559daacb
Merge branch 'api-connection' 2025-04-30 12:34:45 +02:00
dfa9abc4b9
Fix errors in api calls, move base url to gradle properties 2025-04-30 12:31:54 +02:00
Jeas0001
de8c9359cc RemovedPreferedRecipes 2025-04-30 11:36:05 +02:00
Jeas0001
2596a9e408 Change element to name for ingredient 2025-04-30 11:04:56 +02:00
0f791cc642
Merge branch 'master' into api-connection 2025-04-29 13:57:21 +02:00
Jeas0001
15de778225 Migrations 2025-04-29 13:56:41 +02:00
Jeas0001
792bf196f0 SQLite added to gitignore 2025-04-29 13:56:31 +02:00
5e32ad7133
Implement registering user 2025-04-29 13:55:50 +02:00
93057d43d5
Implement send http requests to the api 2025-04-29 13:18:43 +02:00
Jeas0001
182ca1655c Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-04-29 12:38:06 +02:00