LilleBRG
|
f9e006539c
|
help reimar
|
2025-05-14 12:47:20 +02:00 |
|
LilleBRG
|
4a935514cf
|
updates to editrecipe
|
2025-05-14 11:58:49 +02:00 |
|
LilleBRG
|
5c924026ed
|
Merge branch 'master' of git.reim.ar:ReiMerc/easyeat
|
2025-05-14 09:53:48 +02:00 |
|
LilleBRG
|
4b8dcb865c
|
changed addrecipe to shoppinglist
|
2025-05-14 09:53:46 +02:00 |
|
|
|
37757cbf46
|
Reload dish list after generating, fix ingredient list when no amount
|
2025-05-14 09:30:52 +02:00 |
|
LilleBRG
|
ba00a6e35e
|
Merge branch 'master' of git.reim.ar:ReiMerc/easyeat
|
2025-05-14 09:17:22 +02:00 |
|
LilleBRG
|
fd85841daf
|
changed multiplier to string, kotlin weird
|
2025-05-14 09:17:16 +02:00 |
|
Jeas0001
|
bd486fa9f7
|
Merge branch 'master' of git.reim.ar:ReiMerc/easyeat
|
2025-05-14 09:04:35 +02:00 |
|
Jeas0001
|
6dffa397f2
|
Changed the initial message for the ai integration
|
2025-05-14 09:04:28 +02:00 |
|
|
|
6e72f549cf
|
Add buttons for incrementing/decrementing portion size, fix decimal numbers
|
2025-05-14 08:40:36 +02:00 |
|
|
|
48b3622542
|
Redesign dish details page
|
2025-05-13 22:09:50 +02:00 |
|
|
|
7a25b0708b
|
Implement editing shopping items
|
2025-05-13 21:19:42 +02:00 |
|
LilleBRG
|
b04f385bdb
|
very close to add to shopping list wrks
|
2025-05-13 15:52:41 +02:00 |
|
LilleBRG
|
2c22f8d8e1
|
more fixes idk
|
2025-05-13 15:38:11 +02:00 |
|
LilleBRG
|
1e01d1ee90
|
fixed errors in merge
|
2025-05-13 15:24:25 +02:00 |
|
LilleBRG
|
12427a85f8
|
merge
|
2025-05-13 15:14:54 +02:00 |
|
LilleBRG
|
00cc8101f1
|
need to merge but trying to add recipe to shoppinglist
|
2025-05-13 15:11:57 +02:00 |
|
|
|
dbb25a394d
|
Use popup menu for creating dish
|
2025-05-13 14:56:34 +02:00 |
|
|
|
1c085a4262
|
Finish generating recipe, refactor directions property and request helpers
|
2025-05-13 12:59:18 +02:00 |
|
|
|
4772c0ef26
|
Create recipe fragment
|
2025-05-13 12:42:09 +02:00 |
|
Jeas0001
|
c423a9e19d
|
Merge branch 'master' of git.reim.ar:ReiMerc/easyeat
|
2025-05-13 12:13:18 +02:00 |
|
Jeas0001
|
14cf727e22
|
Made it possible to set a multiplier on recipeadd
|
2025-05-13 12:13:07 +02:00 |
|
LilleBRG
|
cb2df85e5b
|
merge
|
2025-05-13 10:56:42 +02:00 |
|
LilleBRG
|
56017f745d
|
dishlist works and dishgdetails soon done
|
2025-05-13 10:55:24 +02:00 |
|
Jeas0001
|
f38333dc8c
|
Merge branch 'master' of git.reim.ar:ReiMerc/easyeat
|
2025-05-13 10:45:53 +02:00 |
|
Jeas0001
|
73cec5745b
|
When getting a single recipe the directions is in a string array
|
2025-05-13 10:45:46 +02:00 |
|
|
|
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 |
|
