Merge branch 'HS_Frontend_Recipes' into 'master'
Hs frontend recipes See merge request !42
Showing
- src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java 91 additions, 0 deletions...nu/idatt1002/demo/controller/AddIngredientController.java
- src/main/java/no/ntnu/idatt1002/demo/controller/AllRecipesController.java 115 additions, 0 deletions.../ntnu/idatt1002/demo/controller/AllRecipesController.java
- src/main/java/no/ntnu/idatt1002/demo/controller/IngredientTileController.java 34 additions, 0 deletions...u/idatt1002/demo/controller/IngredientTileController.java
- src/main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java 1 addition, 1 deletion...main/java/no/ntnu/idatt1002/demo/controller/MainMenu.java
- src/main/java/no/ntnu/idatt1002/demo/controller/RecipeController.java 111 additions, 0 deletions...a/no/ntnu/idatt1002/demo/controller/RecipeController.java
- src/main/java/no/ntnu/idatt1002/demo/controller/RecipeTileController.java 65 additions, 0 deletions.../ntnu/idatt1002/demo/controller/RecipeTileController.java
- src/main/java/no/ntnu/idatt1002/demo/controller/SuggestRecipesController.java 202 additions, 0 deletions...u/idatt1002/demo/controller/SuggestRecipesController.java
- src/main/java/no/ntnu/idatt1002/demo/data/recipes/FileHandler.java 218 additions, 0 deletions...java/no/ntnu/idatt1002/demo/data/recipes/FileHandler.java
- src/main/java/no/ntnu/idatt1002/demo/data/recipes/FoodItem.java 68 additions, 3 deletions...in/java/no/ntnu/idatt1002/demo/data/recipes/FoodItem.java
- src/main/java/no/ntnu/idatt1002/demo/data/recipes/Ingredient.java 6 additions, 6 deletions.../java/no/ntnu/idatt1002/demo/data/recipes/Ingredient.java
- src/main/java/no/ntnu/idatt1002/demo/data/recipes/IngredientsAtHand.java 21 additions, 47 deletions...o/ntnu/idatt1002/demo/data/recipes/IngredientsAtHand.java
- src/main/java/no/ntnu/idatt1002/demo/data/recipes/MeasuringUnit.java 18 additions, 1 deletion...va/no/ntnu/idatt1002/demo/data/recipes/MeasuringUnit.java
- src/main/java/no/ntnu/idatt1002/demo/data/recipes/Recipe.java 137 additions, 37 deletions...main/java/no/ntnu/idatt1002/demo/data/recipes/Recipe.java
- src/main/java/no/ntnu/idatt1002/demo/data/recipes/RecipeIngredient.java 15 additions, 1 deletion...no/ntnu/idatt1002/demo/data/recipes/RecipeIngredient.java
- src/main/java/no/ntnu/idatt1002/demo/data/recipes/RecipeRegister.java 59 additions, 8 deletions...a/no/ntnu/idatt1002/demo/data/recipes/RecipeRegister.java
- src/main/resources/Economics/Expense.register 6 additions, 0 deletionssrc/main/resources/Economics/Expense.register
- src/main/resources/recipes/Fridge.register 9 additions, 0 deletionssrc/main/resources/recipes/Fridge.register
- src/main/resources/recipes/Recipes.register 275 additions, 0 deletionssrc/main/resources/recipes/Recipes.register
- src/main/resources/recipes/testReadRegisterFromFile.register 14 additions, 0 deletionssrc/main/resources/recipes/testReadRegisterFromFile.register
- src/main/resources/style.css 81 additions, 0 deletionssrc/main/resources/style.css
Loading
Please register or sign in to comment