Merge branch 'fix-recipe-page' into main

2022-07-22 23:46:02 +02:00
parent 508e19c064 15032bba2d
commit fa4eefcbe8
15 changed files with 810 additions and 76 deletions
--- a/server/src/main/whattocook/controller/RecipeSearchController.java
+++ b/server/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
--- a/server/src/main/whattocook/models/Unit.java
+++ b/server/src/main/whattocook/models/Unit.java
@@ -2,5 +2,6 @@ package whattocook.models;

 public enum Unit {
    g,
-    ml
+    ml,
+    units
 }