Commit Graph

53 Commits

Author SHA1 Message Date
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
Jeas0001
81384ceb55 ShoppingList endpoints 2025-04-29 12:31:40 +02:00
LilleBRG
6743e9c7aa multiple ingredient rows can now be added 2025-04-29 09:56:44 +02:00
Jeas0001
3cbf52f8b2 Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-04-29 09:05:08 +02:00
Jeas0001
b67f9f944c Forgotten ; 2025-04-29 09:04:35 +02:00
Jeas0001
bc69acd75d Recipe controller 2025-04-29 08:44:23 +02:00
LilleBRG
1aa98f2bcf fixed double dish list 2025-04-28 13:59:47 +02:00
LilleBRG
4f5c0de725 fixed errors 2025-04-28 13:58:31 +02:00
LilleBRG
9870689068 merged 2025-04-28 13:57:43 +02:00
LilleBRG
92e8e2289b try to add create dish 2025-04-28 13:54:31 +02:00
d54e5c179a
Rename dashboard to shopping list 2025-04-28 13:23:46 +02:00
00ecfc8485
Move dish list into fragment, rename home fragment, add icon 2025-04-28 10:44:55 +02:00
bbd937ff65
Remove test folders 2025-04-28 09:20:07 +02:00
LilleBRG
7abbfa4d09 changed directory of models 2025-04-28 09:19:34 +02:00
LilleBRG
a90f44fa8b changed directory of models 2025-04-28 09:19:19 +02:00
Jeas0001
108598ef98 RecipeModels 2025-04-28 09:00:30 +02:00
Jeas0001
184fbb3728 Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-04-28 08:35:15 +02:00
LilleBRG
9eb0c4b69a made custom listview with mockdata 2025-04-25 15:22:53 +02:00
Jeas0001
4d2948f3f3 Merge branch 'master' of git.reim.ar:ReiMerc/easyeat 2025-04-24 12:29:22 +02:00
Jeas0001
73bfd8d01c UserController done 2025-04-24 12:27:58 +02:00
Jeas0001
3423c9df34 Updated gitignore 2025-04-24 12:27:41 +02:00
9fae8ce5b5
Create register activity 2025-04-23 13:25:25 +02:00
9fd62f9565
Create login activity 2025-04-23 12:42:22 +02:00
d9cc16e3d7
Add logo to app 2025-04-23 11:37:09 +02:00
5b1680eed8
Create welcome activity 2025-04-23 11:19:16 +02:00
0c8f40f7e5
Make building work, add bottom navigation view 2025-04-23 10:26:10 +02:00
79013d86a4
Create android project 2025-04-22 11:51:47 +02:00
Jeas0001
73a4260ea3 API project created 2025-04-22 10:58:20 +02:00