Commit Graph

97 Commits

Author SHA1 Message Date
59af36b3f2
Use string array for directions in recipes 2025-05-13 10:33:39 +02:00
f0e7e67d77
Allow generating recipes with AI 2025-05-13 10:33:39 +02:00
Jeas0001
1dd98e1a05 Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-05-13 10:32:02 +02:00
Jeas0001
df7d5f9695 Changed directions in recipedto to a string array instead of an object array Only the dto was changed 2025-05-13 10:31:37 +02:00
LilleBRG
b882bc09a7 create and diushlist works 2025-05-09 17:03:50 +02:00
LilleBRG
5c1a569906 made new getallrecipedto and return on getallrecipe 2025-05-09 10:22:02 +02:00
LilleBRG
3b01992eed code towards create manual and getallrecipies made but not working 2025-05-08 18:48:59 +02:00
LilleBRG
80e52cd22b Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-05-08 12:12:04 +02:00
LilleBRG
799ddb76e5 made modal for ai and manual creation of dish 2025-05-08 12:12:00 +02:00
Jeas0001
51f6808d8d Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-05-08 12:00:28 +02:00
Jeas0001
73bc290b6a add item to shopping list new item in g and old item in kg 2025-05-08 12:00:17 +02:00
1b4f9059f4
Fix adding items of the same name on frontend 2025-05-08 11:52:54 +02:00
Jeas0001
2a4b0c671d Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-05-08 11:05:50 +02:00
Jeas0001
fd11c89cea Extrated unit adjustment 2025-05-08 11:05:40 +02:00
df0c951100
Add progress bar and empty message to shopping list 2025-05-08 11:02:25 +02:00
fa877b2c5e
Show shopping item immediately as it is added to the list 2025-05-08 11:02:25 +02:00
39bcdd9a9b
Implement deleting shopping items 2025-05-08 11:02:25 +02:00
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