Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

I

idatt1002_2023_9
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

54ffa627

Commit 54ffa627 authored 1 year ago by HSoreide

Downloads
- Patches
- Plain Diff

Add sample recipes, food types and measuring units

parent 8200834f

No related branches found

No related tags found

2 merge requests!42Hs frontend recipes,!41Hs frontend recipes

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/no/ntnu/idatt1002/demo/controller/AddIngredientController.java 5 additions, 2 deletions

...nu/idatt1002/demo/controller/AddIngredientController.java
src/main/java/no/ntnu/idatt1002/demo/controller/AllRecipesController.java 0 additions, 5 deletions

.../ntnu/idatt1002/demo/controller/AllRecipesController.java
src/main/java/no/ntnu/idatt1002/demo/controller/SuggestRecipesController.java 1 addition, 1 deletion

...u/idatt1002/demo/controller/SuggestRecipesController.java
src/main/java/no/ntnu/idatt1002/demo/data/recipes/FoodItem.java 42 additions, 1 deletion

...in/java/no/ntnu/idatt1002/demo/data/recipes/FoodItem.java
src/main/java/no/ntnu/idatt1002/demo/data/recipes/MeasuringUnit.java 4 additions, 1 deletion

...va/no/ntnu/idatt1002/demo/data/recipes/MeasuringUnit.java
src/main/resources/recipes/Fridge.register 9 additions, 1 deletion

src/main/resources/recipes/Fridge.register
src/main/resources/recipes/Recipes.register 268 additions, 23 deletions

src/main/resources/recipes/Recipes.register
src/main/resources/style.css 1 addition, 1 deletion

src/main/resources/style.css
src/main/resources/view/Recipe.fxml 1 addition, 1 deletion

src/main/resources/view/Recipe.fxml

with 331 additions and 36 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment