From 087de0739c0f25271b34fd6b0a0a202674da73a0 Mon Sep 17 00:00:00 2001
From: hay-kot <hay-kot@pm.me>
Date: Fri, 2 Apr 2021 11:32:15 -0800
Subject: [PATCH] bottom-bar experiment

---
 frontend/src/App.vue                          |  53 +-------
 frontend/src/api/category.js                  |  14 +--
 frontend/src/api/recipe.js                    |   2 -
 .../components/Recipe/MobileRecipeCard.vue    |   7 +-
 .../src/components/UI/Search/SearchDialog.vue |  49 +++++++-
 frontend/src/components/UI/TheAppBar.vue      | 113 ++++++++++++++++++
 frontend/src/mixins/utilMixins.js             |   7 ++
 frontend/src/store/modules/userSettings.js    |   2 +-
 8 files changed, 180 insertions(+), 67 deletions(-)
 create mode 100644 frontend/src/components/UI/TheAppBar.vue
 create mode 100644 frontend/src/mixins/utilMixins.js

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index d9de087ef..bb545577b 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,35 +1,6 @@
 <template>
   <v-app>
-    <v-app-bar clipped-left dense app color="primary" dark class="d-print-none">
-      <router-link v-if="!(isMobile && search)" to="/">
-        <v-btn icon>
-          <v-icon size="40"> mdi-silverware-variant </v-icon>
-        </v-btn>
-      </router-link>
-
-      <div v-if="!isMobile" btn class="pl-2">
-        <v-toolbar-title style="cursor: pointer" @click="$router.push('/')"
-          >Mealie
-        </v-toolbar-title>
-      </div>
-
-      <v-spacer></v-spacer>
-      <v-expand-x-transition>
-        <SearchBar
-          ref="mainSearchBar"
-          v-if="search"
-          :show-results="true"
-          @selected="navigateFromSearch"
-          :max-width="isMobile ? '100%' : '450px'"
-        />
-      </v-expand-x-transition>
-      <v-btn icon @click="search = !search">
-        <v-icon>mdi-magnify</v-icon>
-      </v-btn>
-
-      <SiteMenu />
-      <LanguageMenu />
-    </v-app-bar>
+    <TheAppBar />
     <v-main>
       <v-banner v-if="demo" sticky
         ><div class="text-center">
@@ -47,10 +18,8 @@
 </template>
 
 <script>
-import SiteMenu from "@/components/UI/SiteMenu";
-import SearchBar from "@/components/UI/Search/SearchBar";
+import TheAppBar from "@/components/UI/TheAppBar";
 import AddRecipeFab from "@/components/UI/AddRecipeFab";
-import LanguageMenu from "@/components/UI/LanguageMenu";
 import Vuetify from "./plugins/vuetify";
 import { user } from "@/mixins/user";
 
@@ -58,23 +27,13 @@ export default {
   name: "App",
 
   components: {
-    SiteMenu,
+    TheAppBar,
     AddRecipeFab,
-    SearchBar,
-    LanguageMenu,
   },
 
   mixins: [user],
 
-  watch: {
-    $route() {
-      this.search = false;
-    },
-  },
   computed: {
-    isMobile() {
-      return this.$vuetify.breakpoint.name === "xs";
-    },
     demo() {
       const appInfo = this.$store.getters.getAppInfo;
       return appInfo.demoStatus;
@@ -102,9 +61,6 @@ export default {
     this.$store.dispatch("requestAppInfo");
   },
 
-  data: () => ({
-    search: false,
-  }),
   methods: {
     // For Later!
 
@@ -126,9 +82,6 @@ export default {
         this.darkModeSystemCheck();
       });
     },
-    navigateFromSearch(slug) {
-      this.$router.push(`/recipe/${slug}`);
-    },
   },
 };
 </script>
diff --git a/frontend/src/api/category.js b/frontend/src/api/category.js
index ef582c580..0f8ecd3fd 100644
--- a/frontend/src/api/category.js
+++ b/frontend/src/api/category.js
@@ -5,27 +5,27 @@ import { store } from "@/store";
 const prefix = baseURL + "categories";
 
 const categoryURLs = {
-  get_all: `${prefix}`,
-  get_category: category => `${prefix}/${category}`,
-  delete_category: category => `${prefix}/${category}`,
+  getAll: `${prefix}`,
+  getCategory: category => `${prefix}/${category}`,
+  deleteCategory: category => `${prefix}/${category}`,
 };
 
 export const categoryAPI = {
   async getAll() {
-    let response = await apiReq.get(categoryURLs.get_all);
+    let response = await apiReq.get(categoryURLs.getAll);
     return response.data;
   },
   async create(name) {
-    let response = await apiReq.post(categoryURLs.get_all, { name: name });
+    let response = await apiReq.post(categoryURLs.getAll, { name: name });
     store.dispatch("requestCategories");
     return response.data;
   },
   async getRecipesInCategory(category) {
-    let response = await apiReq.get(categoryURLs.get_category(category));
+    let response = await apiReq.get(categoryURLs.getCategory(category));
     return response.data;
   },
   async delete(category) {
-    let response = await apiReq.delete(categoryURLs.delete_category(category));
+    let response = await apiReq.delete(categoryURLs.deleteCategory(category));
     store.dispatch("requestCategories");
     return response.data;
   },
diff --git a/frontend/src/api/recipe.js b/frontend/src/api/recipe.js
index 97a4b08c4..b72d18a37 100644
--- a/frontend/src/api/recipe.js
+++ b/frontend/src/api/recipe.js
@@ -56,9 +56,7 @@ export const recipeAPI = {
     const fd = new FormData();
     fd.append("image", fileObject);
     fd.append("extension", fileObject.name.split(".").pop());
-
     let response = apiReq.put(recipeURLs.updateImage(recipeSlug), fd);
-
     return response;
   },
 
diff --git a/frontend/src/components/Recipe/MobileRecipeCard.vue b/frontend/src/components/Recipe/MobileRecipeCard.vue
index 9b436c076..b926eee2b 100644
--- a/frontend/src/components/Recipe/MobileRecipeCard.vue
+++ b/frontend/src/components/Recipe/MobileRecipeCard.vue
@@ -1,5 +1,10 @@
 <template>
-  <v-card hover :to="`/recipe/${slug}`" max-height="125">
+  <v-card
+    hover
+    :to="`/recipe/${slug}`"
+    max-height="125"
+    @click="$emit('selected')"
+  >
     <v-list-item>
       <v-list-item-avatar rounded size="125" class="mt-0 ml-n4">
         <v-img :src="getImage(image)"> </v-img>
diff --git a/frontend/src/components/UI/Search/SearchDialog.vue b/frontend/src/components/UI/Search/SearchDialog.vue
index d4abcde8f..74c0e4b3a 100644
--- a/frontend/src/components/UI/Search/SearchDialog.vue
+++ b/frontend/src/components/UI/Search/SearchDialog.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="text-center ">
-    <v-dialog v-model="dialog" class="search-dialog" width="600px" height="0">
+    <v-dialog v-model="dialog" width="600px" height="0" :fullscreen="isMobile">
       <v-card>
         <v-app-bar dark color="primary">
           <v-toolbar-title class="headline">Search a Recipe</v-toolbar-title>
@@ -9,13 +9,27 @@
           <SearchBar
             @results="updateResults"
             @selected="emitSelect"
-            :show-results="true"
+            :show-results="!isMobile"
             max-width="550px"
             :dense="false"
             :nav-on-click="false"
             :reset-search="dialog"
             :solo="false"
           />
+          <div v-if="isMobile">
+            <div v-for="recipe in searchResults.slice(0, 7)" :key="recipe.name">
+              <MobileRecipeCard
+                class="ma-1 px-0"
+                :name="recipe.item.name"
+                :description="recipe.item.description"
+                :slug="recipe.item.slug"
+                :rating="recipe.item.rating"
+                :image="recipe.item.image"
+                :route="true"
+                @selected="dialog = false"
+              />
+            </div>
+          </div>
         </v-card-text>
       </v-card>
     </v-dialog>
@@ -24,16 +38,32 @@
 
 <script>
 import SearchBar from "./SearchBar";
+import MobileRecipeCard from "@/components/Recipe/MobileRecipeCard";
 export default {
   components: {
     SearchBar,
+    MobileRecipeCard,
   },
   data() {
     return {
-      searchResults: null,
+      searchResults: [],
       dialog: false,
     };
   },
+  computed: {
+    isMobile() {
+      return this.$vuetify.breakpoint.name === "xs";
+    },
+  },
+  watch: {
+    "$route.hash"(newHash, oldHash) {
+      if (newHash === "#mobile-search") {
+        this.dialog = true;
+      } else if (oldHash === "#mobile-search") {
+        this.dialog = false;
+      }
+    },
+  },
   methods: {
     updateResults(results) {
       this.searchResults = results;
@@ -44,15 +74,22 @@ export default {
     },
     open() {
       this.dialog = true;
+      this.$router.push("#mobile-search");
+    },
+    toggleDialog(open) {
+      if (open) {
+        this.$router.push("#mobile-search");
+      } else {
+        this.$router.back(); // 😎 back button click
+      }
     },
   },
 };
 </script>
 
 <style scope>
-.search-dialog {
-  margin-top: 10%;
+.mobile-dialog {
   align-items: flex-start;
-  justify-content: center;
+  justify-content: flex-start;
 }
 </style>
\ No newline at end of file
diff --git a/frontend/src/components/UI/TheAppBar.vue b/frontend/src/components/UI/TheAppBar.vue
new file mode 100644
index 000000000..bae7c89e9
--- /dev/null
+++ b/frontend/src/components/UI/TheAppBar.vue
@@ -0,0 +1,113 @@
+<template>
+  <div>
+    <v-app-bar
+      v-if="!isMobile"
+      clipped-left
+      dense
+      app
+      color="primary"
+      dark
+      class="d-print-none"
+    >
+      <router-link v-if="!(isMobile && search)" to="/">
+        <v-btn icon>
+          <v-icon size="40"> mdi-silverware-variant </v-icon>
+        </v-btn>
+      </router-link>
+
+      <div v-if="!isMobile" btn class="pl-2">
+        <v-toolbar-title style="cursor: pointer" @click="$router.push('/')"
+          >Mealie
+        </v-toolbar-title>
+      </div>
+
+      <v-spacer></v-spacer>
+      <v-expand-x-transition>
+        <SearchBar
+          ref="mainSearchBar"
+          v-if="search"
+          :show-results="true"
+          @selected="navigateFromSearch"
+          :max-width="isMobile ? '100%' : '450px'"
+        />
+      </v-expand-x-transition>
+      <v-btn icon @click="search = !search">
+        <v-icon>mdi-magnify</v-icon>
+      </v-btn>
+
+      <SiteMenu />
+    </v-app-bar>
+    <v-app-bar
+      v-else
+      bottom
+      clipped-left
+      dense
+      app
+      color="primary"
+      dark
+      class="d-print-none"
+    >
+      <router-link to="/">
+        <v-btn icon>
+          <v-icon size="40"> mdi-silverware-variant </v-icon>
+        </v-btn>
+      </router-link>
+
+      <div v-if="!isMobile" btn class="pl-2">
+        <v-toolbar-title style="cursor: pointer" @click="$router.push('/')"
+          >Mealie
+        </v-toolbar-title>
+      </div>
+
+      <v-spacer></v-spacer>
+      <v-expand-x-transition>
+        <SearchDialog ref="mainSearchDialog" />
+      </v-expand-x-transition>
+      <v-btn icon @click="$refs.mainSearchDialog.open()">
+        <v-icon>mdi-magnify</v-icon>
+      </v-btn>
+
+      <SiteMenu />
+    </v-app-bar>
+  </div>
+</template>
+
+<script>
+import SiteMenu from "@/components/UI/SiteMenu";
+import SearchBar from "@/components/UI/Search/SearchBar";
+import SearchDialog from "@/components/UI/Search/SearchDialog";
+import { user } from "@/mixins/user";
+export default {
+  name: "AppBar",
+
+  mixins: [user],
+  components: {
+    SiteMenu,
+    SearchBar,
+    SearchDialog,
+  },
+  data() {
+    return {
+      search: false,
+    };
+  },
+  watch: {
+    $route() {
+      this.search = false;
+    },
+  },
+  computed: {
+    isMobile() {
+      return this.$vuetify.breakpoint.name === "xs";
+    },
+  },
+  methods: {
+    navigateFromSearch(slug) {
+      this.$router.push(`/recipe/${slug}`);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+</style>
\ No newline at end of file
diff --git a/frontend/src/mixins/utilMixins.js b/frontend/src/mixins/utilMixins.js
new file mode 100644
index 000000000..2b9bf8504
--- /dev/null
+++ b/frontend/src/mixins/utilMixins.js
@@ -0,0 +1,7 @@
+export const utilMixins = {
+  commputed: {
+    isMobile() {
+      return this.$vuetify.breakpoint.name === "xs";
+    },
+  },
+};
diff --git a/frontend/src/store/modules/userSettings.js b/frontend/src/store/modules/userSettings.js
index 352c89c43..7c01b12e1 100644
--- a/frontend/src/store/modules/userSettings.js
+++ b/frontend/src/store/modules/userSettings.js
@@ -70,7 +70,7 @@ const actions = {
 
   async refreshToken({ commit, getters }) {
     if (!getters.getIsLoggedIn) {
-      commit("setIsLoggedIn", false); // This is to be here... for some reasons?  ¯\_(ツ)_/¯
+      commit("setIsLoggedIn", false); // This has to be here... for some reasons?  ¯\_(ツ)_/¯
       console.log("Not Logged In");
       return;
     }