From 2b8eab1f1607d3b9e51a1ddd2a8a36893fca453e Mon Sep 17 00:00:00 2001 From: Karthik Vempati Date: Sun, 17 Jul 2022 17:13:30 +0200 Subject: [PATCH] Preliminary recipe page Vuetify go brr --- .../controller/RecipeSearchController.java | 2 +- frontend/package.json | 8 +- frontend/public/index.html | 2 + frontend/src/Api.js | 8 +- frontend/src/App.vue | 4 +- frontend/src/components/ItemModel.vue | 3 + frontend/src/components/RecipeModel.vue | 546 ++++++++++++++++++ frontend/src/main.js | 7 +- frontend/src/plugins/vuetify.js | 11 + frontend/yarn.lock | 78 ++- 10 files changed, 656 insertions(+), 13 deletions(-) create mode 100644 frontend/src/components/RecipeModel.vue create mode 100644 frontend/src/plugins/vuetify.js diff --git a/backend/src/main/whattocook/controller/RecipeSearchController.java b/backend/src/main/whattocook/controller/RecipeSearchController.java index 59a3eec..426ddd8 100644 --- a/backend/src/main/whattocook/controller/RecipeSearchController.java +++ b/backend/src/main/whattocook/controller/RecipeSearchController.java @@ -17,7 +17,7 @@ import java.util.List; @RestController() @BasePathAwareController() public class RecipeSearchController { - private final int nextRecipes=10; + private final int nextRecipes=12; private final int nextRecipesForOneRandom = 20; @Autowired diff --git a/frontend/package.json b/frontend/package.json index b8f949e..11bef88 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -12,7 +12,8 @@ "core-js": "^3.8.3", "vue": "^2.6.14", "vue-router": "^4.0.15", - "vuejs-logger": "^1.5.5" + "vuejs-logger": "^1.5.5", + "vuetify": "^2.6.7" }, "devDependencies": { "@babel/core": "^7.12.16", @@ -20,10 +21,13 @@ "@vue/cli-plugin-babel": "~5.0.0", "@vue/cli-plugin-eslint": "~5.0.0", "@vue/cli-service": "~5.0.0", + "deepmerge": "^4.2.2", "eslint": "^7.32.0", "eslint-plugin-vue": "^8.0.3", "node-sass": "^7.0.1", - "sass-loader": "^13.0.0", + "sass": "~1.32", + "sass-loader": "^13.0.2", + "vue-cli-plugin-vuetify": "^2.5.1", "vue-template-compiler": "^2.6.14" }, "eslintConfig": { diff --git a/frontend/public/index.html b/frontend/public/index.html index 3632c28..4753fba 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -8,6 +8,8 @@ <%= htmlWebpackPlugin.options.title %> + +