Commits · 1c9d7d129081e68416400c3d8e441150ef4c1057 · Andreas Kluge Svendsrud / idatt1002_2023_9 · GitLab

Snippets Groups Projects

Apr 20, 2023
- Merge branch 'master' into 'HS_Frontend_Recipes' · 1c9d7d12
  Hanne-Sofie Søreide authored 1 year ago
  
  # Conflicts: # src/main/resources/Economics/Income.register
  1c9d7d12
- Remove file-io assertion from unit tests of FileHandler · 8d8acb4a
  HSoreide authored 1 year ago
  
  8d8acb4a
- Add unit tests for writing recipes and ingredients to/from file · 59744086
  HSoreide authored 1 year ago
  
  59744086
- Add JavaDoc to File Hanlder class · 61bf570e
  HSoreide authored 1 year ago
  
  61bf570e
- Add JavaDoc and restructure and fill in on unit tests · edbc5fe5
  HSoreide authored 1 year ago
  
  edbc5fe5
Apr 19, 2023
- Add JavaDock and restructure unit tests · f0ec12f9
  HSoreide authored 1 year ago
  
  f0ec12f9
- Delete unused classes · d918f6dd
  HSoreide authored 1 year ago
  
  d918f6dd
- Add and restructure tests for Ingredients and add missing JavaDoc · ae8fd7bb
  HSoreide authored 1 year ago
  
  ae8fd7bb
- Factor out and improve hover effect of suggested recipe tiles · 02920fc6
  HSoreide authored 1 year ago
  
  02920fc6
- Make searchbar active and searchbutton defaut when opening the view to add ingredients to fridge · aaa3f025
  HSoreide authored 1 year ago
  
  aaa3f025
- Refactor our read and write actions of SuggestRecipesController · cb5bf851
  HSoreide authored 1 year ago
  
  cb5bf851
- Refactor Scene Switch for SuggestRecipes view · 5cb47da5
  HSoreide authored 1 year ago
  
  5cb47da5
Apr 18, 2023
- Make ingredients sorted alphabetically · 80abb2af
  HSoreide authored 1 year ago
  
  80abb2af
- Add check for Apply button being present · 12904e22
  HSoreide authored 1 year ago
  
  12904e22
- Add sample recipes, food types and measuring units · 54ffa627
  HSoreide authored 1 year ago
  
  54ffa627
- Adjust spacing and scrolling of recipe instructions · 8200834f
  HSoreide authored 1 year ago
  
  8200834f
- List of all recipes with navigation to selected recipe · b7cd7e46
  HSoreide authored 1 year ago
  
  b7cd7e46
Apr 17, 2023
- Skeleton of view of all recipes in a scrollable list · f04f5058
  HSoreide authored 1 year ago
  
  f04f5058
- View for showing selected recipe in detail working with dynamic list of ingredients · 6041aed0
  HSoreide authored 1 year ago
  
  6041aed0
- Add some styling for buttons and lists · 55b50fe8
  HSoreide authored 1 year ago
  
  55b50fe8
- Bugfix of overlaying recipes in grid and display missing ingredients upon hover over recipes · f67ce0fc
  HSoreide authored 1 year ago
  
  f67ce0fc
- Merge branch 'frontend-testing' into 'master' · e2523052
  Harry Linrui Xu authored 1 year ago
  
  "Made progressbar dynamic in accordance to spending. Added balance field.... See merge request !38
  e2523052
- "Made progressbar dynamic in accordance to spending. Added balance field.... · d017da93
  Harry Linrui Xu authored 1 year ago
  
  d017da93
Apr 16, 2023
- Create controller and fxml file for display of one Recipe with details · 7c9e44a7
  HSoreide authored 1 year ago
  
  7c9e44a7
- Suggested recipes are shown and update with changes ti ingredients at hand · ce9d67f4
  HSoreide authored 1 year ago
  
  ce9d67f4
- Create best-fit-recipes picker in RecipeRegister · 2f3ec095
  HSoreide authored 1 year ago
  
  2f3ec095
- Ingredients can be added to the fridge · 94c03500
  HSoreide authored 1 year ago
  
  94c03500
- Ingredients can be removed from the fridge · db97121b
  HSoreide authored 1 year ago
  
  db97121b
Apr 15, 2023
- Initialize ingredients at hand and recipe register from file in SuggestRecipesController · a24adfdf
  HSoreide authored 1 year ago
  
  a24adfdf
- Merge branch 'HS_Rewrite_fileHandling_for_recipes_and_ingredients' into 'HS_Frontend_Recipes' · d21b72ab
  Hanne-Sofie Søreide authored 1 year ago
  
  Hs rewrite file handling for recipes and ingredients See merge request !36
  d21b72ab
- Tidy up unit tests of detailed and simplified IngredientsAtHand classes · 1432ee61
  HSoreide authored 1 year ago
  
  1432ee61
- FileHandler writes and reads ingredients at hand from file · 9b5cefb4
  HSoreide authored 1 year ago
  
  9b5cefb4
- Refactor simplified class for ingredients at hand · eb177b1b
  HSoreide authored 1 year ago
  
  eb177b1b
- File handler reads recipes from file and creates a RecipeRegister · 3ae78945
  HSoreide authored 1 year ago
  
  3ae78945
- File handler that writes recipe register to file with basic unit test · 062d2a39
  HSoreide authored 1 year ago
  
  062d2a39
- Import and search for Ingredients to add to fridge in pop-up window · c488a0ce
  HSoreide authored 1 year ago
  
  c488a0ce
Apr 14, 2023
- Make button in running MainMenu open Suggested Recipes view · 7db22c03
  HSoreide authored 1 year ago
  
  7db22c03
- Styling and layout of suggested recipe tiles · ba95587c
  HSoreide authored 1 year ago
  
  ba95587c
- Make Recipe controllers to provide test data and fill in grid with suggested recipes · b8d9b0b5
  HSoreide authored 1 year ago
  
  b8d9b0b5
- Make updateIngredientStatus of Recipe class provide number of missing ingredients · 3e3112ec
  HSoreide authored 1 year ago
  
  3e3112ec