Commit Graph

102 Commits

Author SHA1 Message Date
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
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
Luis S. Ruisinger
6b9f64b6d1 [WIP]:
- visual representation of storage cards
- line jump doesnt work right now for the cards
2022-06-17 23:55:59 +02:00
Bruno
22b84c3565 made endpoints better 2022-06-17 20:08:24 +02:00
Bruno
93943149ac made endpoints better 2022-06-17 20:07:00 +02:00
Bruno
8b472a6d61 changed string to JSON objects/arrrays 2022-06-17 17:50:21 +02:00
Bruno
105aaf6bad debugged, added OneFridge Recipie 2022-06-17 17:15:24 +02:00
Bruno
724e765cd6 basic api functuinality added, still needs debugging 2022-06-17 16:23:04 +02:00
1f8922788c updated api query address 2022-06-17 15:22:50 +02:00
Bruno
5e86c05ca8 basic api functuinality added, still needs debugging 2022-06-17 13:05:00 +02:00
cato
ebfd1b78e5 update api endpoint config and updated related tests (#26) 2022-06-14 19:33:28 +02:00
Luis S. Ruisinger
452bd149a3 Finished responsive behavior 2022-06-08 18:43:21 +02:00
Luis S. Ruisinger
c238309ad6 [WIP]: First working fix for responsive behavior of ItemModel site 2022-06-08 17:08:49 +02:00
Luis S. Ruisinger
26c933015e [WIP]: Add style to ItemPage
- quick 1080p fix as workspace ( no other resolution fix )
2022-06-08 13:04:16 +02:00
Luis S. Ruisinger
896696a499 [WIP]: Add style to ItemPage
- added navbar devider als asthetic feature
2022-06-07 15:28:34 +02:00
Luis S. Ruisinger
3e73fd01f9 [WIP]: Add styling to itemPage
- centralizing navbar scss
- building custom 404 page
- building navbar struct MainPage
2022-06-07 13:52:52 +02:00
Luis S. Ruisinger
243cc4cf06 [WIP]: Add styling to itemPage
- added smooth transformation
- added nav
2022-06-06 20:33:37 +02:00
ge42deg
e3942b5d16 [WIP]: Add styling to itemPage 2022-06-06 14:08:20 +02:00
cato
7bfdf7a3e0 i like pain (#24) 2022-06-06 02:10:23 +02:00
c9e21ed063 i like even more pain 2022-06-06 02:07:50 +02:00
cato
96705f2fed added smiley to readme (#23) 2022-06-06 02:04:20 +02:00
cato
f67bdf1a5e Update bitbucket-sync-test.yml 2022-06-06 02:00:13 +02:00
cato
873ff15abe Update bitbucket-sync.yml 2022-06-06 01:58:46 +02:00
cato
e13961d150 Update bitbucket-sync.yml 2022-06-06 01:57:24 +02:00
cato
7cf1e2dcd4 Update bitbucket-sync.yml 2022-06-06 01:43:02 +02:00
cato
f46f38e045 Update bitbucket-sync.yml 2022-06-06 01:42:04 +02:00
cato
2167298da1 Update bitbucket-sync.yml 2022-06-06 01:38:13 +02:00
cato
97bd773640 Update bitbucket-sync.yml 2022-06-06 01:32:21 +02:00
cato
96b9b83579 Update bitbucket-sync.yml 2022-06-06 00:50:41 +02:00
cato
6e11f4ab6b updated rebase behavior 2022-06-05 21:08:19 +02:00
cato
4b1455cf6b added context (#21)
* added context

* added author to readme
2022-06-05 20:53:09 +02:00
cato
a2c322bb34 added context (#20) 2022-06-05 20:37:17 +02:00
cato
f521a3d079 Update README.md 2022-06-05 20:29:04 +02:00