fa4eefcbe8
Merge branch 'fix-recipe-page' into main
2022-07-22 23:46:02 +02:00
15032bba2d
fixed timeout issue
2022-07-22 23:25:15 +02:00
Karthik Vempati
c72678b578
commit idk
2022-07-22 23:09:59 +02:00
Karthik Vempati
aa1da2d0c7
Merge branch 'fix-item-input' into add-recipe-page
2022-07-22 21:39:45 +02:00
Karthik Vempati
5e7f6edc8b
Merge branch 'add-recipe-page' into fix-item-input
2022-07-22 21:37:02 +02:00
Karthik Vempati
92d03120b1
fix colors and alignment everywhere
...
don't ask
2022-07-22 21:29:50 +02:00
Karthik Vempati
8259f3b158
rework recipes and random generation pt. 2
2022-07-22 21:21:01 +02:00
Karthik Vempati
215f17b174
Merge branch 'vue-app-navigation-drawer' into add-recipe-page
2022-07-22 20:56:37 +02:00
Karthik Vempati
de33798a71
rework random generation
2022-07-22 20:56:07 +02:00
Karthik Vempati
c97d3e75b1
Move app views to v-app
2022-07-22 20:55:11 +02:00
Karthik Vempati
a12f43ca05
Alignment issues and what not
...
More commits incoming
2022-07-22 20:44:29 +02:00
cato
508e19c064
Update bitbucket-sync-test.yml
2022-07-22 19:12:28 +02:00
11c1e022b6
rename modules according to rules
2022-07-22 01:01:21 +02:00
cato
6d6d060d5b
Merge pull request #40 from cato447/remove-used-ingredients
...
Implement first draft to remove used ingredients
2022-07-22 00:31:55 +02:00
Karthik Vempati
dafe8e7430
some fixes
...
needs to be fixed more
2022-07-18 19:15:52 +02:00
Karthik Vempati
a96e3c5b0d
Merge remote-tracking branch 'origin/main' into fix-item-input
2022-07-18 19:14:58 +02:00
cato
afe7e68a66
Merge pull request #38 from cato447/fix-recipe-model
...
added sourceUrl as property to recipe
2022-07-18 19:12:41 +02:00
b331f8eff8
added sourceUrl as property to recipe
2022-07-18 19:00:08 +02:00
Karthik Vempati
2a2d945b59
Fix item input
...
yeah
2022-07-17 20:12:03 +02:00
Karthik Vempati
41ef563a20
Merge branch 'add-recipe-page' into fix-item-input
2022-07-17 18:28:53 +02:00
Karthik Vempati
2c8f5d76dc
Fix units for backend
2022-07-17 17:27:11 +02:00
Karthik Vempati
2b8eab1f16
Preliminary recipe page
...
Vuetify go brr
2022-07-17 17:16:11 +02:00
Karthik Vempati
4359d26982
Change to const
2022-07-17 17:14:49 +02:00
Karthik Vempati
3c35f2de81
Merge remote-tracking branch 'origin/main' into fix-item-input
2022-07-17 12:12:54 +02:00
cato
820601037e
Merge pull request #37 from cato447/page-navigation
...
Added routing to frontend
2022-07-16 22:39:23 +02:00
711a8e5c21
first draft implemented
...
Still struggling at some ingredients which deviating names
2022-07-16 22:20:32 +02:00
Luis S. Ruisinger
6a34c67f56
[Page Navigation]
...
- working page navigation between ItemModel and LoginPage
- ItemModel first loaded on website access
- resizing variables because of client sided loading change in sizes
- cleanup of links in navbar (only ItemModel / LoginPage)
2022-07-14 22:43:46 +02:00
d9053ebaa4
Merge branch 'main' into remove-used-ingredients
2022-07-14 01:30:39 +02:00
cato
4e0e9f4119
Merge pull request #35 from cato447/postgres-implementation
...
added support for postgres
2022-07-14 01:25:41 +02:00
d9dcda19df
added support for postgres
2022-07-14 01:15:39 +02:00
22b138696c
[WIP] BROKEN - trying to remove the used ingredients automagically
2022-07-14 00:19:20 +02:00
49d9f917fa
Merge branch 'main' into remove-used-ingredients
2022-07-13 17:16:46 +02:00
cato
f5e433ee19
Merge pull request #34 from cato447/recipe-endpoint-restructuring
...
Converted api classes to be only statically accessible
Renamed SpoonacularController to RecipeSearchController
2022-07-13 16:54:49 +02:00
ac223093fe
Converted api classes to be only statically accessible | Renamed SpoonacularController to RecipeSearchController
2022-07-13 16:22:36 +02:00
4c1f2db00a
added functionality to spoonacular lib to convert units
2022-07-13 15:50:07 +02:00
cato
5af845f195
Merge pull request #32 from cato447/recipe-rest-update
...
Restructuring of recipe api endpoint
2022-07-13 15:47:14 +02:00
33fe0e0d79
Program no longer terminates if .env file is not present (need for testing)
2022-07-13 15:42:20 +02:00
5c0de10446
updated paths of SpoonacularController to match the rest
2022-07-13 05:58:48 +02:00
c5014c4a11
Finished restructuring and changed way of querying the API
2022-07-13 04:25:40 +02:00
806b6945ec
Revert "added frontend to gradle build"
...
This reverts commit 28109f0d35
2022-07-13 01:43:29 +02:00
28109f0d35
added frontend to gradle build
2022-07-13 00:21:33 +02:00
Luis S. Ruisinger
20c266394f
Fixing background of input field
2022-07-12 18:20:38 +02:00
f7455019c3
[WIP] Reworked the way the spoonaccular api response gets consumed
...
- Added pojos for jackson
- Filtering unneeded information from spoonaccular response
2022-07-12 17:24:57 +02:00
cato
e969c32f83
Merge pull request #30 from cato447/itempageCSS
...
Added styling to item storage page
2022-07-09 04:03:24 +02:00
6bd7e34fc2
fixed mistake in package declaration
2022-07-09 03:59:57 +02:00
cato
1d4ff6508f
Merge pull request #29 from cato447/API-querry
...
Added Spoonacular Api querry
2022-06-27 10:45:34 +02:00
Luis S. Ruisinger
d3b1922a7f
[WIP]: Adding style to frontend
...
- better responsive behavior for 2560 x 1440 resolution
2022-06-19 14:04:06 +02:00
Luis S. Ruisinger
5b7d2c9a6a
[WIP]: Adding style to frontend
...
- better aesthetics
- overlapping hierarchy
2022-06-19 00:54:09 +02:00
Luis S. Ruisinger
a60f365d90
[WIP]: Adding style to frontend
...
- overflow working
- better aesthetics
- working responsive container layout
- sticky input field for scrolling purposes
2022-06-18 18:34:01 +02:00
Luis S. Ruisinger
5f913bdffa
[WIP]:
...
- line jump works
- overflow scrolling doesnt work
2022-06-18 00:57:43 +02:00
