From b22773b2ae8c5296777462d34aa74397fad55bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal.kvacek@performax.cz>
Date: Thu, 1 Feb 2024 17:32:12 +0100
Subject: [PATCH] Snad fix 404ky

---
 src/boot/apollo.js                            |  7 ++---
 src/components/ListFilters.vue                | 27 ++++++++++++++++---
 src/composables/meta.js                       |  5 ++--
 src/composables/pagination.js                 |  6 +++--
 src/pages/errors/ErrorNotFound.vue            | 21 ++++++++++-----
 .../profile/poi/PointsOfInterestPage.vue      | 12 ++++-----
 src/pages/public/poi/PointsOfInterestPage.vue | 15 ++++++-----
 src/stores/App.js                             |  5 ++--
 8 files changed, 66 insertions(+), 32 deletions(-)

diff --git a/src/boot/apollo.js b/src/boot/apollo.js
index a858868..3285fac 100644
--- a/src/boot/apollo.js
+++ b/src/boot/apollo.js
@@ -60,7 +60,6 @@ export default (({store, router}) => {
           return handleRefreshToken(store, router, forward, operation);
         } else if (error.message.includes("404") || error.message.includes("Not found")) {
           useAppStore(store).appStatus = 404;
-          console.log("not found");
         } else {
           Notify.create(errorObject("API error: " + error.message));
         }
@@ -81,11 +80,13 @@ export default (({store, router}) => {
       .then((response) => response)
       .catch(err => {
         const errStr = err.toString();
-        if (errStr.includes('Not found')) {
+        if (errStr.includes('Not found') || errStr.includes("No row was found")) {
           useAppStore(store).appStatus = 404;
+          return Promise.resolve();
         }
-        else if (!errStr.includes("401") && !errStr.includes("Not authorized"))
+        else if (!errStr.includes("401") && !errStr.includes("Not authorized")) {
           console.error("Error during query: ", err)
+        }
         return Promise.reject(err);
       })
   };
diff --git a/src/components/ListFilters.vue b/src/components/ListFilters.vue
index 7bec26a..0679089 100644
--- a/src/components/ListFilters.vue
+++ b/src/components/ListFilters.vue
@@ -1,7 +1,8 @@
 <script setup>
 import {commonProps} from "src/composables/inputs";
-import {ref, watch} from "vue";
+import {onMounted, ref, watch} from "vue";
 import {debounce} from "quasar";
+import {useRoute, useRouter} from "vue-router";
 
 const props = defineProps({
   emitDebounce: {
@@ -16,13 +17,33 @@ const filters = ref({
   search: ""
 });
 
+const $route = useRoute();
+const $router = useRouter();
 watch((() => filters.value), debounce(() => {
-  emits("filtersChanged", filters.value)
+  emits("filtersChanged", filters.value);
+
+  const query = {...$route.query};
+  for (const key in filters.value) {
+    if (filters.value[key] === "" || filters.value['key'] === null) {
+      delete query[key];
+    } else {
+      query[key] = filters.value[key];
+    }
+  }
+  $router.replace({query});
 }, props.emitDebounce), {deep: true});
+
+onMounted(() => {
+  const search = $route.query.search;
+
+  if (search) {
+    filters.value.search = search;
+  }
+})
 </script>
 
 <template>
-  <q-input v-model="filters.search" v-bind="commonProps" clearable>
+  <q-input v-model="filters.search" placeholder="Vyhledávání..." v-bind="commonProps" clearable>
     <template #prepend>
       <q-icon name="search"/>
     </template>
diff --git a/src/composables/meta.js b/src/composables/meta.js
index a19e4b1..286b744 100644
--- a/src/composables/meta.js
+++ b/src/composables/meta.js
@@ -16,7 +16,7 @@ export const aircraftKeywords = (aircraft) => {
   return [aircraft.callSign, aircraft.manufacturer, aircraft.model]
 };
 
-export const metaData = ({title, description, keywords, image}) => {
+export const metaData = ({title, description, keywords, image, index = true}) => {
     const filteredKeywords = (keywords || []).filter(kw => !!kw);
     const filteredDescription = stripHtml(description);
 
@@ -38,7 +38,8 @@ export const metaData = ({title, description, keywords, image}) => {
             },
             ogDescription: {
                 property: "og:description", content: filteredDescription,
-            }
+            },
+          robots: {name: "robots", content: index ? "index" : "noindex"},
         }
     }
 }
diff --git a/src/composables/pagination.js b/src/composables/pagination.js
index 41730cf..b44b5c9 100644
--- a/src/composables/pagination.js
+++ b/src/composables/pagination.js
@@ -4,9 +4,11 @@ import {ref} from "vue";
 export const paginationLimit = ref(10);
 export const paginationOffset = ref(0);
 
-export const loadPage = ({fetchFunc, filters, appendItems}) => {
+export const filters = ref({});
+
+export const loadPage = ({fetchFunc, appendItems}) => {
   return fetchFunc({
-    ...filters,
+    ...filters.value,
     limit: paginationLimit.value,
     offset: paginationOffset.value,
     appendItems
diff --git a/src/pages/errors/ErrorNotFound.vue b/src/pages/errors/ErrorNotFound.vue
index 9a7691f..eca99b9 100644
--- a/src/pages/errors/ErrorNotFound.vue
+++ b/src/pages/errors/ErrorNotFound.vue
@@ -15,7 +15,7 @@
         color="white"
         text-color="blue"
         unelevated
-        :to="{name: 'homepage'}"
+        @click="backToHomepage"
         label="Zpět na titulní stranu"
         no-caps
       />
@@ -23,10 +23,19 @@
   </div>
 </template>
 
-<script>
-import { defineComponent } from 'vue'
+<script setup>
+import {useAppStore} from "stores/App";
+import {useRouter} from "vue-router";
+import {metaData} from "src/composables/meta";
+import {useMeta} from "quasar";
 
-export default defineComponent({
-  name: 'ErrorNotFound'
-})
+useAppStore().setPageTitle("Nenalezeno");
+useMeta(() => metaData({
+  title: "Nenalezeno"
+}))
+
+const $router = useRouter();
+const backToHomepage = () => {
+  $router.push({name: "homepage"}).then(() => useAppStore().appStatus = 200);
+}
 </script>
diff --git a/src/pages/profile/poi/PointsOfInterestPage.vue b/src/pages/profile/poi/PointsOfInterestPage.vue
index da2049d..0dea3aa 100644
--- a/src/pages/profile/poi/PointsOfInterestPage.vue
+++ b/src/pages/profile/poi/PointsOfInterestPage.vue
@@ -6,20 +6,20 @@ import BasicListSkeleton from "components/basicSkeletons/BasicListSkeleton.vue";
 import BasicInfoBanner from "components/banners/BasicInfoBanner.vue";
 import {usePointsOfInterestStore} from "stores/PointsOfInterest";
 import {storeToRefs} from "pinia";
-import {loadPage, paginationLimit, paginationOffset} from "src/composables/pagination";
+import {filters, loadPage, paginationLimit, paginationOffset} from "src/composables/pagination";
 import ListFilters from "components/ListFilters.vue";
 
 useAppStore().setPageTitle("Zajímavá místa");
 
 paginationLimit.value = 15;
-const loadNextPage = (appendItems, filters = {}) => loadPage({
-  fetchFunc: usePointsOfInterestStore().fetch,
-  filters, appendItems
+const loadNextPage = (appendItems) => loadPage({
+  fetchFunc: usePointsOfInterestStore().fetch, appendItems
 });
 loadNextPage(false);
-const handleFiltersChanged = (filters) => {
+const handleFiltersChanged = (newFilters) => {
   paginationOffset.value = 0;
-  loadNextPage(false, filters);
+  filters.value = newFilters;
+  loadNextPage(false);
 }
 
 const {isQueryRunning, totalItemsCount, pointsOfInterest} = storeToRefs(usePointsOfInterestStore());
diff --git a/src/pages/public/poi/PointsOfInterestPage.vue b/src/pages/public/poi/PointsOfInterestPage.vue
index 6f3630a..bfc2c1e 100644
--- a/src/pages/public/poi/PointsOfInterestPage.vue
+++ b/src/pages/public/poi/PointsOfInterestPage.vue
@@ -6,7 +6,7 @@ import POIList from "components/poi/POIList.vue";
 import {useAppStore} from "stores/App";
 import {useMeta} from "quasar";
 import {metaData} from "src/composables/meta";
-import {loadPage, paginationLimit, paginationOffset} from "src/composables/pagination";
+import {filters, loadPage, paginationLimit, paginationOffset} from "src/composables/pagination";
 import ListFilters from "components/ListFilters.vue";
 
 useAppStore().setPageTitle("Místa");
@@ -18,21 +18,22 @@ useMeta(() => metaData({
   title: "Místa"
 }))
 
-const loadNextPage = (appendItems, filters) => loadPage({
-  fetchFunc: usePointsOfInterestStore().fetchPublic,
-  filters, appendItems
+const loadNextPage = (appendItems) => loadPage({
+  fetchFunc: usePointsOfInterestStore().fetchPublic, appendItems
 });
 loadNextPage(false);
-const handleFiltersChanged = (filters) => {
+
+const handleFiltersChanged = (newFilters) => {
   paginationOffset.value = 0;
-  loadNextPage(false, filters);
+  filters.value = newFilters;
+  loadNextPage(false);
 }
 
 const {pointsOfInterest, totalItemsCount, isQueryRunning} = storeToRefs(usePointsOfInterestStore());
 </script>
 
 <template>
-  <div class="q-pa-md">
+  <div>
     <ListFilters @filters-changed="handleFiltersChanged"/>
 
     <BasicListSkeleton :items="paginationLimit" v-if="isQueryRunning && !pointsOfInterest.length"/>
diff --git a/src/stores/App.js b/src/stores/App.js
index 3c62568..bcf55b9 100644
--- a/src/stores/App.js
+++ b/src/stores/App.js
@@ -5,12 +5,11 @@ import {paginationLimit, paginationOffset} from "src/composables/pagination";
 export const useAppStore = defineStore('App', () => {
   const pageTitle = ref(null);
   const breadcrumbs = ref(null);
-  const appStatus = ref(200);  // TODO: toto nejspis nebude potreba!
+  const appStatus = ref(200);
 
   const resetAfterRouteChange = () => {
-    console.log("reset  after route change");
     pageTitle.value = null;
-    appStatus.value = 200;
+    // appStatus.value = 200;  // tohle dela problem pri renderu 404 na serveru
     breadcrumbs.value = null;
 
     // reset strankovani po prechodu na strankach