From e8b60a9b12e6de4bbfa25bb70aef2b47cd3995a0 Mon Sep 17 00:00:00 2001
From: MRVDH <info@maartenvandenhoven.com>
Date: Fri, 19 Feb 2021 20:14:44 +0100
Subject: [PATCH 1/2] Added history to front page url

---
 .../components/others/CategoryAndProducts.vue | 19 ++++-----
 .../others/CategoryAndProductsSkeleton.vue    | 38 ++++++++++++++++++
 client/src/components/routes/StoreFront.vue   | 40 ++++++-------------
 client/src/router/index.js                    |  6 ++-
 4 files changed, 63 insertions(+), 40 deletions(-)
 create mode 100644 client/src/components/others/CategoryAndProductsSkeleton.vue

diff --git a/client/src/components/others/CategoryAndProducts.vue b/client/src/components/others/CategoryAndProducts.vue
index ebb7b91..0440024 100644
--- a/client/src/components/others/CategoryAndProducts.vue
+++ b/client/src/components/others/CategoryAndProducts.vue
@@ -36,16 +36,11 @@
                 </b-col>
             </b-col>
         </b-row>
-        <b-row v-if="!category.items.length">
-            <b-col
-                v-for="n in 8"
-                :key="n"
-                cols="6"
-                md="3"
-                >
-                <b-skeleton-img no-aspect />
-            </b-col>
-        </b-row>
+
+        <CustomCategoryAndProductsSkeleton
+            v-if="!category.items.length"
+            :include-header="false"
+            />
     </div>
 </template>
 
@@ -53,11 +48,13 @@
 import ApiService from '@/services/ApiService';
 
 import CustomProductCard from '@/components/others/ProductCard';
+import CustomCategoryAndProductsSkeleton from '@/components/others/CategoryAndProductsSkeleton';
 
 export default {
     name: 'CategoryAndProducts',
     components: {
-        CustomProductCard
+        CustomProductCard,
+        CustomCategoryAndProductsSkeleton
     },
     props: {
         category: Object,
diff --git a/client/src/components/others/CategoryAndProductsSkeleton.vue b/client/src/components/others/CategoryAndProductsSkeleton.vue
new file mode 100644
index 0000000..62ed8e5
--- /dev/null
+++ b/client/src/components/others/CategoryAndProductsSkeleton.vue
@@ -0,0 +1,38 @@
+<template>
+    <div>
+        <b-row v-if="includeHeader">
+            <b-col cols="12">
+                <b-skeleton
+                    width="120px"
+                    style="margin-bottom: 20px"
+                    />
+            </b-col>
+        </b-row>
+        <b-row>
+            <b-col
+                v-for="n in 8"
+                :key="n"
+                cols="6"
+                md="3"
+                >
+                <b-skeleton-img no-aspect />
+            </b-col>
+        </b-row>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'CategoryAndProductsSkeleton',
+    props: {
+        includeHeader: Boolean
+    }
+}
+</script>
+
+<style scoped>
+.b-skeleton-img {
+    height: 370px;
+    margin-bottom: 5px;
+}
+</style>
diff --git a/client/src/components/routes/StoreFront.vue b/client/src/components/routes/StoreFront.vue
index 8d4f0c3..ad57878 100644
--- a/client/src/components/routes/StoreFront.vue
+++ b/client/src/components/routes/StoreFront.vue
@@ -26,25 +26,10 @@
             </b-col>
         </b-row>
 
-        <div v-if="!selectedTopMenuItem">
-            <b-row>
-                <b-col cols="12">
-                    <b-skeleton
-                        width="50px"
-                        style="margin-bottom: 20px"
-                        />
-                </b-col>
-            </b-row>
-            <b-row>
-                <b-col
-                    v-for="n in 8"
-                    :key="n"
-                    cols="3"
-                    >
-                    <b-skeleton-img no-aspect />
-                </b-col>
-            </b-row>
-        </div>
+        <CustomCategoryAndProductsSkeleton
+            v-if="!selectedTopMenuItem"
+            :include-header="true"
+            />
 
         <div v-if="selectedTopMenuItem">
             <CustomCategoryAndProducts
@@ -61,18 +46,18 @@
 import ApiService from '@/services/ApiService';
 
 import CustomCategoryAndProducts from '@/components/others/CategoryAndProducts';
+import CustomCategoryAndProductsSkeleton from '@/components/others/CategoryAndProductsSkeleton';
 
 export default {
     name: 'StoreFront',
     components: {
-        CustomCategoryAndProducts
+        CustomCategoryAndProducts,
+        CustomCategoryAndProductsSkeleton
     },
     data () {
         return {
-            lists: [],
             topMenuItems: [],
-            selectedTopMenuItem: null,
-            productCategories: []
+            selectedTopMenuItem: null
         }
     },
     computed: {
@@ -93,11 +78,8 @@ export default {
     methods: {
         getLists () {
             ApiService.getLists().then((res) => {
-                this.lists = res.data.filter(x => !x.hidden && x.sellable_item_count > 0);
-
-                this.topMenuItems = this.lists.filter(x => !x.is_included_in_category_tree);
-                this.selectedTopMenuItem = this.topMenuItems[0];
-                this.productCategories = this.lists.filter(x => x.is_included_in_category_tree);
+                this.topMenuItems = res.data.filter(x => !x.is_included_in_category_tree && !x.hidden && x.sellable_item_count > 0);
+                this.selectedTopMenuItem = this.topMenuItems.find(x => x.id === this.$route.params.listId) || this.topMenuItems[0];
 
                 if (!this.loggedIn) {
                     this.topMenuItems.unshift({
@@ -112,6 +94,8 @@ export default {
             });
         },
         selectTopMenuItem (item) {
+            this.$router.push({ name: 'StoreFront', params: { listId: item.id } });
+
             if (!this.loggedIn && item.id === "purchases") {
                 return;
             }
diff --git a/client/src/router/index.js b/client/src/router/index.js
index b624bd8..a801789 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -5,7 +5,11 @@ Vue.use(VueRouter);
 
 const routes = [
     {
-        path: '/',
+        path: '/', 
+        redirect: '/store-front'
+    },
+    {
+        path: '/store-front/:listId?',
         name: 'StoreFront',
         component: () => import(/* webpackChunkName: "store-front" */ '../components/routes/StoreFront.vue')
     },

From 86905ba46c45c49d01d27130fe532bf66260fe1b Mon Sep 17 00:00:00 2001
From: MRVDH <info@maartenvandenhoven.com>
Date: Fri, 19 Feb 2021 20:56:11 +0100
Subject: [PATCH 2/2] Search history implemented

---
 .../components/others/CategoryAndProducts.vue |  8 +++--
 client/src/components/routes/Search.vue       | 30 ++++++++++++++++++-
 client/src/components/routes/StoreFront.vue   |  4 ++-
 client/src/router/index.js                    | 10 +++++++
 4 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/client/src/components/others/CategoryAndProducts.vue b/client/src/components/others/CategoryAndProducts.vue
index 0440024..7eab38c 100644
--- a/client/src/components/others/CategoryAndProducts.vue
+++ b/client/src/components/others/CategoryAndProducts.vue
@@ -1,6 +1,6 @@
 <template>
     <div>
-        <b-row>
+        <b-row v-if="showHeader">
             <b-col cols="12">
                 <span class="category-name">{{ category.name }}</span>
             </b-col>
@@ -58,7 +58,11 @@ export default {
     },
     props: {
         category: Object,
-        parentId: String
+        parentId: String,
+        showHeader: {
+            type: Boolean,
+            default: true
+        }
     },
     data () {
         return {
diff --git a/client/src/components/routes/Search.vue b/client/src/components/routes/Search.vue
index e8b6eba..2f43315 100644
--- a/client/src/components/routes/Search.vue
+++ b/client/src/components/routes/Search.vue
@@ -106,6 +106,7 @@
                 v-for="category in searchResults"
                 :key="category.id"
                 :category="category"
+                :show-header="false"
                 />
         </div>
 
@@ -155,6 +156,9 @@ export default {
             this.searchResults = [];
 
             if (text.length < 2) {
+                if (this.$route.name !== 'Search') {
+                    this.$router.push({ name: 'Search' });
+                }
                 return;
             }
 
@@ -164,20 +168,38 @@ export default {
         }
     },
     mounted () {
+        if (this.$route.params.query) {
+            this.selectSuggestion(this.$route.params.query);
+        }
+
         this.getCategories();
     },
     methods: {
         getCategories () {
             ApiService.getCategories().then(res => {
                 this.allCategories = res.data.filter(x => x.is_included_in_category_tree);
+
+                if (this.$route.params.listId) {
+                    this.selectTopCategory(this.allCategories.find(x => x.id === this.$route.params.listId));
+                }
             });
         },
         selectTopCategory (category) {
             this.selectedTopCategory = category;
+
+            if (this.$route.params.subListId) {
+                this.selectSubCategory(this.selectedTopCategory.items.find(x => x.id === this.$route.params.subListId));
+            } else if (this.$route.params.listId !== category.id) {
+                this.$router.push({ name: 'SearchList', params: { listId: category.id } });
+            }
         },
         selectSubCategory (category) {
             this.selectedSubCategory = category;
 
+            if (this.$route.params.subListId !== category.id) {
+                this.$router.push({ name: 'SearchList', params: { listId: this.selectedTopCategory.id, subListId: category.id } });
+            }
+
             this.finalCategories = [];
 
             ApiService.getList(category.id, null, 1).then((res) => {
@@ -188,16 +210,22 @@ export default {
         },
         selectSuggestion (suggestion) {
             this.searchText = suggestion;
+            
+            if (this.$route.params.query !== this.searchText) {
+                this.$router.push({ name: 'SearchQuery', params: { query: this.searchText } });
+            }
 
-            ApiService.search(suggestion).then(res => {
+            ApiService.search(this.searchText).then(res => {
                 this.searchResults = res.data;
             });
         },
         goBack () {
             if (this.selectedSubCategory) {
                 this.selectedSubCategory = null;
+                this.$router.push({ name: 'SearchList', params: { listId: this.selectedTopCategory.id } });
             } else {
                 this.selectedTopCategory = null;
+                this.$router.push({ name: 'Search' });
             }
         }
     }
diff --git a/client/src/components/routes/StoreFront.vue b/client/src/components/routes/StoreFront.vue
index ad57878..3025b09 100644
--- a/client/src/components/routes/StoreFront.vue
+++ b/client/src/components/routes/StoreFront.vue
@@ -94,7 +94,9 @@ export default {
             });
         },
         selectTopMenuItem (item) {
-            this.$router.push({ name: 'StoreFront', params: { listId: item.id } });
+            if (this.$route.params.listId !== item.id) {
+                this.$router.push({ name: 'StoreFront', params: { listId: item.id } });
+            }
 
             if (!this.loggedIn && item.id === "purchases") {
                 return;
diff --git a/client/src/router/index.js b/client/src/router/index.js
index a801789..8018ce3 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -18,6 +18,16 @@ const routes = [
         name: 'Search',
         component: () => import(/* webpackChunkName: "search" */ '../components/routes/Search.vue')
     },
+    {
+        path: '/search/query/:query?',
+        name: 'SearchQuery',
+        component: () => import(/* webpackChunkName: "search" */ '../components/routes/Search.vue')
+    },
+    {
+        path: '/search/list/:listId?/:subListId?',
+        name: 'SearchList',
+        component: () => import(/* webpackChunkName: "search" */ '../components/routes/Search.vue')
+    },
     {
         path: '/cart',
         name: 'Cart',