Merge branch 'main' of https://github.com/SYNCS2023/LeafyLink

src/logic/plantData.json

@@ -5,7 +5,7 @@
             "kgz_1": ["A", "B", "C", "D"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/aloe-vera.jpg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "S",
             "pots": true,
@@ -18,7 +18,7 @@
             "kgz_1": ["A", "C", "D"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/avocado.jpg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "L",
             "pots": false,
@@ -31,7 +31,7 @@
             "kgz_1": ["C"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/basil.jpg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "S",
             "pots": true,
@@ -44,7 +44,7 @@
             "kgz_1": ["A", "B", "C", "D"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/bean-sprout.jpg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "S",
             "pots": true,
@@ -57,7 +57,7 @@
             "kgz_1": ["C", "D"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/cabbage.jpg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "M",
             "pots": false,
@@ -70,7 +70,7 @@
             "kgz_1": ["A", "C", "D"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/carrot.webp",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "M",
             "pots": false,
@@ -83,7 +83,7 @@
             "kgz_1": ["B", "C", "D"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/celery.jpg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "M",
             "pots": false,
@@ -96,7 +96,7 @@
             "kgz_1": ["A", "C"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/cherry-tomato.webp",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "S",
             "pots": true,
@@ -109,7 +109,7 @@
             "kgz_1": ["A", "B", "C", "D"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/chives.jpg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "S",
             "pots": true,
@@ -122,7 +122,7 @@
             "kgz_1": ["A", "C", "D"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/clinatro.jpg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "S",
             "pots": true,
@@ -135,7 +135,7 @@
             "kgz_1": ["A"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/mango.webp",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "L",
             "pots": false,
@@ -148,7 +148,7 @@
             "kgz_1": ["A", "C"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/mint.jpg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "S",
             "pots": true,
@@ -161,7 +161,7 @@
             "kgz_1": ["A", "C"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/orange.webp",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "L",
             "pots": false,
@@ -174,7 +174,7 @@
             "kgz_1": ["A", "B", "C", "D"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/oregano.jpg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "S",
             "pots": true,
@@ -187,7 +187,7 @@
             "kgz_1": ["A", "B", "C", "D"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/parsley.jpg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "S",
             "pots": true,
@@ -200,7 +200,7 @@
             "kgz_1": ["B", "C"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/rosemary.jpg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "S",
             "pots": true,
@@ -213,7 +213,7 @@
             "kgz_1": ["B", "C", "D"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/sage.jpeg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "S",
             "pots": true,
@@ -226,7 +226,7 @@
             "kgz_1": ["C", "D"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/strawberry.jpeg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "S",
             "pots": false,
@@ -239,7 +239,7 @@
             "kgz_1": ["A", "B", "C"],
             "kgz_2": "",
             "kgz_3": "",
-            "image_url": "https://i.pinimg.com/originals/fe/d2/6d/fed26da97c5d28883d8dc8b9b3ca14c2.png",
+            "image_url": "public/images/suggestions/thyme.jpg",
             "description": "placeholder placeholder placeholder placeholder placeholder ",
             "space_req": "S",
             "pots": true,

src/logic/suggest.js

@@ -153,11 +153,13 @@ async function suggestPlants(budget, location, property, time, potted) {
         return s.score === max;
     });
 
-    if (suggestions.length >= 3 && suggestionsMax.length >= 3) {
+    if (suggestionsMax.length >= 3) {
         const shuffledMax = suggestionsMax.sort(() => 0.5 - Math.random());
         return shuffledMax.slice(0, 3);
-    } else {
+    } else if (suggestions.length >= 3) {
         return suggestions.slice(0, 3);
+    } else {
+        return suggestions;
     }
 }