From 7a6b490e51dcdc04407fc1902410668305b1d09e Mon Sep 17 00:00:00 2001
From: hay-kot <hay-kot@pm.me>
Date: Sat, 3 Apr 2021 16:42:13 -0800
Subject: [PATCH] advanced search apge

---
 .../components/Recipe/MobileRecipeCard.vue    |  2 +-
 .../src/components/UI/Search/SearchBar.vue    |  4 +-
 .../src/pages/SearchPage/FilterSelector.vue   | 64 +++++++++-----
 frontend/src/pages/SearchPage/index.vue       | 87 ++++++++-----------
 4 files changed, 85 insertions(+), 72 deletions(-)

diff --git a/frontend/src/components/Recipe/MobileRecipeCard.vue b/frontend/src/components/Recipe/MobileRecipeCard.vue
index a11accdbb..c0df606bf 100644
--- a/frontend/src/components/Recipe/MobileRecipeCard.vue
+++ b/frontend/src/components/Recipe/MobileRecipeCard.vue
@@ -7,7 +7,7 @@
   >
     <v-list-item>
       <v-list-item-avatar rounded size="125" class="mt-0 ml-n4">
-        <v-img :src="getImage(image)"> </v-img>
+        <v-img :src="getImage(slug)"> </v-img>
       </v-list-item-avatar>
       <v-list-item-content class="align-self-start">
         <v-list-item-title>
diff --git a/frontend/src/components/UI/Search/SearchBar.vue b/frontend/src/components/UI/Search/SearchBar.vue
index a1ef1a209..564e36995 100644
--- a/frontend/src/components/UI/Search/SearchBar.vue
+++ b/frontend/src/components/UI/Search/SearchBar.vue
@@ -27,7 +27,7 @@
           @click="navOnClick ? null : selected(item.item.slug, item.item.name)"
         >
           <v-list-item-avatar>
-            <v-img :src="getImage(item.item.image)"></v-img>
+            <v-img :src="getImage(item.item.slug)"></v-img>
           </v-list-item-avatar>
           <v-list-item-content
             @click="
@@ -136,7 +136,7 @@ export default {
         this.fuseResults = this.result;
       }
     },
-    
+
     searchSlug() {
       this.selected(this.searchSlug);
     },
diff --git a/frontend/src/pages/SearchPage/FilterSelector.vue b/frontend/src/pages/SearchPage/FilterSelector.vue
index acd870fa0..c46649e51 100644
--- a/frontend/src/pages/SearchPage/FilterSelector.vue
+++ b/frontend/src/pages/SearchPage/FilterSelector.vue
@@ -1,24 +1,40 @@
 <template>
-  <v-btn-toggle
-    dense
-    v-model="selected"
-    tile
-    color="primary accent-3"
-    @change="emitChange"
-    group
-  >
-    <v-btn value="include">
-      Include
-    </v-btn>
+  <v-toolbar dense flat>
+    <v-btn-toggle
+      dense
+      v-model="selected"
+      tile
+      color="primary accent-3"
+      @change="emitMulti"
+      group
+      mandatory
+    >
+      <v-btn :value="false">
+        Include
+      </v-btn>
 
-    <v-btn value="exclude">
-      Exclude
-    </v-btn>
-
-    <v-btn value="any">
-      Any
-    </v-btn>
-  </v-btn-toggle>
+      <v-btn :value="true">
+        Exclude
+      </v-btn>
+    </v-btn-toggle>
+    <v-spacer></v-spacer>
+    <v-btn-toggle
+      dense
+      v-model="match"
+      tile
+      color="primary accent-3"
+      @change="emitMulti"
+      group
+      mandatory
+    >
+      <v-btn :value="false">
+        And
+      </v-btn>
+      <v-btn :value="true">
+        Or
+      </v-btn>
+    </v-btn-toggle>
+  </v-toolbar>
 </template>
 
 <script>
@@ -30,13 +46,21 @@ export default {
   },
   data() {
     return {
-      selected: "include",
+      selected: false,
+      match: false,
     };
   },
   methods: {
     emitChange() {
       this.$emit("input", this.selected);
     },
+    emitMulti() {
+      const updateData = {
+        exclude: this.selected,
+        matchAny: this.match,
+      };
+      this.$emit("update", updateData);
+    },
   },
 };
 </script>
diff --git a/frontend/src/pages/SearchPage/index.vue b/frontend/src/pages/SearchPage/index.vue
index fcf5726cd..50533313a 100644
--- a/frontend/src/pages/SearchPage/index.vue
+++ b/frontend/src/pages/SearchPage/index.vue
@@ -26,8 +26,8 @@
 
       <v-row dense class="mt-0 flex-row align-center justify-space-around">
         <v-col>
-          <h3 class="pl-2 headline mt-0">Category Filter</h3>
-          <FilterSelector v-model="catFilterType" class="mb-1" />
+          <h3 class="pl-2 text-center headline">Category Filter</h3>
+          <FilterSelector class="mb-1" @update="updateCatParams" />
           <CategorySelector
             :solo="true"
             :dense="false"
@@ -36,8 +36,8 @@
           />
         </v-col>
         <v-col>
-          <h3 class="pl-2 headline">Tag Filter</h3>
-          <FilterSelector v-model="tagFilterType" class="mb-1" />
+          <h3 class="pl-2 text-center headline">Tag Filter</h3>
+          <FilterSelector class="mb-1" @update="updateTagParams" />
           <TagSelector
             :solo="true"
             :dense="false"
@@ -78,9 +78,6 @@ import CategorySelector from "@/components/FormHelpers/CategorySelector";
 import TagSelector from "@/components/FormHelpers/TagSelector";
 import FilterSelector from "./FilterSelector.vue";
 
-const INCLUDE = "include";
-const EXCLUDE = "exclude";
-const ANY = "any";
 export default {
   components: {
     RecipeCard,
@@ -94,9 +91,15 @@ export default {
       searchString: "",
       maxResults: 21,
       searchResults: [],
-      catFilterType: "include",
+      catFilter: {
+        exclude: false,
+        matchAny: false,
+      },
+      tagFilter: {
+        exclude: false,
+        matchAny: false,
+      },
       includeCategories: [],
-      tagFilterType: "include",
       includeTags: [],
       options: {
         shouldSort: true,
@@ -116,8 +119,18 @@ export default {
     },
     filteredRecipes() {
       return this.allRecipes.filter(recipe => {
-        const includesTags = this.checkTags(recipe.tags);
-        const includesCats = this.checkCategories(recipe.recipeCategory);
+        const includesTags = this.check(
+          this.includeTags,
+          recipe.tags,
+          this.tagFilter.matchAny,
+          this.tagFilter.exclude
+        );
+        const includesCats = this.check(
+          this.includeCategories,
+          recipe.recipeCategory,
+          this.catFilter.matchAny,
+          this.catFilter.exclude
+        );
         return [includesTags, includesCats].every(x => x === true);
       });
     },
@@ -136,50 +149,26 @@ export default {
     },
   },
   methods: {
-    checkIncludes(filterBy, recipeList) {
+    check(filterBy, recipeList, matchAny, exclude) {
+      let isMatch = true;
+      if (filterBy.length === 0) return isMatch;
+
       if (recipeList) {
-        return filterBy.every(t => recipeList.includes(t));
+        if (matchAny) {
+          isMatch = filterBy.some(t => recipeList.includes(t)); // Checks if some items are a match
+        } else {
+          isMatch = filterBy.every(t => recipeList.includes(t)); // Checks if every items is a match
+        }
+        return exclude ? !isMatch : isMatch;
       } else;
       return false;
     },
 
-    checkExcludes(filterBy, recipeList) {
-      if (recipeList) {
-        return filterBy.every(t => !recipeList.includes(t));
-      } else;
-      return false;
+    updateTagParams(params) {
+      this.tagFilter = params;
     },
-
-    checkAny(filterBy, recipeList) {
-      if (filterBy.length === 0) return true;
-      if (recipeList) {
-        return filterBy.some(t => recipeList.includes(t));
-      } else;
-      return false;
-    },
-
-    checkTags(recipeTags) {
-      if (this.tagFilterType === INCLUDE) {
-        return this.checkIncludes(this.includeTags, recipeTags);
-      }
-      if (this.tagFilterType === EXCLUDE) {
-        return this.checkExcludes(this.includeTags, recipeTags);
-      }
-      if (this.tagFilterType === ANY) {
-        return this.checkAny(this.includeTags, recipeTags);
-      }
-    },
-
-    checkCategories(recipeCategories) {
-      if (this.catFilterType === INCLUDE) {
-        return this.checkIncludes(this.includeCategories, recipeCategories);
-      }
-      if (this.catFilterType === EXCLUDE) {
-        return this.checkExcludes(this.includeCategories, recipeCategories);
-      }
-      if (this.catFilterType === ANY) {
-        return this.checkAny(this.includeCategories, recipeCategories);
-      }
+    updateCatParams(params) {
+      this.catFilter = params;
     },
   },
 };