Breadcrumbs resit pres funkce

src/pages/public/AboutPage.vue

@@ -3,10 +3,11 @@ import {useAppStore} from "stores/App";
 import {useMeta} from "quasar";
 import {metaData} from "src/composables/meta";
 import ContentCard from "components/ContentCard.vue";
+import {homepageBreadcrumbs} from "src/composables/breadcrumbs";
 
 useAppStore().setPageTitle("O projektu");
 useAppStore().setBreadcrumbs([
-  {to: {name: 'homepage'}, label: "Polétání.cz"},
+  ...homepageBreadcrumbs(),
   {label: "O projektu"}
 ]);
 useMeta(() => metaData({

src/pages/public/ContactPage.vue

@@ -6,10 +6,11 @@ import {commonProps} from "src/composables/inputs";
 import {useQuasar} from "quasar";
 import {errorObject, successObject} from "src/composables/dialog";
 import {api, axios} from "boot/axios";
+import {homepageBreadcrumbs} from "src/composables/breadcrumbs";
 
 useAppStore().setPageTitle("Kontakt");
 useAppStore().setBreadcrumbs([
-  {to: {name: 'homepage'}, label: "Polétání.cz"},
+  ...homepageBreadcrumbs(),
   {label: "Kontakt"}
 ]);
 

src/pages/public/FeaturesPage.vue

@@ -1,10 +1,11 @@
 <script setup>
 import {useAppStore} from "stores/App";
 import ContentCard from "components/ContentCard.vue";
+import {homepageBreadcrumbs} from "src/composables/breadcrumbs";
 
 useAppStore().setPageTitle("Co Polétání.cz umí?");
 useAppStore().setBreadcrumbs([
-  {to: {name: 'homepage'}, label: "Polétání.cz"},
+  ...homepageBreadcrumbs(),
   {label: "Funkce"}
 ]);
 

src/pages/public/HelpPage.vue

@@ -4,6 +4,7 @@ import {useAppStore} from "stores/App";
 import {onMounted, ref} from "vue";
 import {useMeta} from "quasar";
 import {metaData} from "src/composables/meta";
+import {homepageBreadcrumbs} from "src/composables/breadcrumbs";
 
 const $route = useRoute();
 const help = {
@@ -50,7 +51,6 @@ const help = {
 const opened = ref({});
 onMounted(() => {
   opened.value[$route.query.h] = true;
-
 })
 
 useAppStore().setPageTitle("Nápověda");
@@ -58,7 +58,7 @@ useMeta(() => metaData({
   title: "Nápověda",
 }));
 useAppStore().setBreadcrumbs([
-  {label: "Polétání.cz", to: {name: "homepage"}},
+  ...homepageBreadcrumbs(),
   {label: "Nápověda"},
 ]);
 </script>

src/pages/public/PersonalInformationPage.vue

@@ -1,10 +1,11 @@
 <script setup>
 import ContentCard from "components/ContentCard.vue";
 import {useAppStore} from "stores/App";
+import {homepageBreadcrumbs} from "src/composables/breadcrumbs";
 
 useAppStore().setPageTitle("Správa osobních údajů");
 useAppStore().setBreadcrumbs([
-  {to: {name: 'homepage'}, label: "Polétání.cz"},
+  ...homepageBreadcrumbs(),
   {label: "Správa osobních údajů"}
 ]);
 </script>

src/pages/public/TermsAndConditionsPage.vue

@@ -1,10 +1,11 @@
 <script setup>
 import ContentCard from "components/ContentCard.vue";
 import {useAppStore} from "stores/App";
+import {homepageBreadcrumbs} from "src/composables/breadcrumbs";
 
 useAppStore().setPageTitle("Podmínky používání");
 useAppStore().setBreadcrumbs([
-  {to: {name: 'homepage'}, label: "Polétání.cz"},
+  ...homepageBreadcrumbs(),
   {label: "Podmínky používání"}
 ]);
 </script>

src/pages/public/aircraft/AircraftDetailPage.vue

@@ -8,8 +8,7 @@ export default {
 }
 </script>
 <script setup>
-import {useRouter} from "vue-router";
-import {useMeta, useQuasar} from "quasar";
+import {useMeta} from "quasar";
 import AircraftDetailSkeleton from "components/aircrafts/skeletons/AircraftDetailSkeleton.vue";
 import {useAppStore} from "stores/App";
 import FlightsList from "components/flights/FlightsList.vue";
@@ -25,9 +24,7 @@ import FlightsListSkeleton from "components/flights/skeletons/FlightsListSkeleto
 import BasicInfoBanner from "components/banners/BasicInfoBanner.vue";
 import PhotoGallerySkeleton from "components/photos/skeletons/PhotoGallerySkeleton.vue";
 import {usePagination} from "src/composables/pagination";
-
-const $q = useQuasar();
-const $router = useRouter();
+import {homepageBreadcrumbs} from "src/composables/breadcrumbs";
 
 const {aircraft, isQueryRunning} = storeToRefs(useAircraftsStore());
 const {photos, isQueryRunning: arePhotosLoading} = storeToRefs(usePhotosStore());
@@ -43,20 +40,15 @@ useMeta(() => metaData({
   description: aircraft.value.description || `Detail letadla ${aircraft.value.callSign}.`
 }));
 useAppStore().setBreadcrumbs([
-  {label: "Polétání.cz", to: {name: "homepage"}},
+    ...homepageBreadcrumbs(),
   {label: "Letadla"},
   {label: aircraft.value.callSign}
 ]);
 
-const {filters, loadPage, paginationLimit} = usePagination();
-
+const {filters, loadPage, paginationLimit} = usePagination({fetchFunction: useFlightsStore().fetchPublic});
 filters.value = {aircraftId: aircraft.value.id};
-const loadNextFlightsPage = (appendItems) => loadPage({
-  fetchFunc: useFlightsStore().fetchPublic, appendItems
-});
-
 onMounted(() => {
-  loadNextFlightsPage(false);
+  loadPage(false);
   usePhotosStore().fetchPublic({aircraftId: aircraft.value.id});
 });
 </script>
@@ -85,7 +77,7 @@ onMounted(() => {
             :total-items-count="totalItemsCount"
             :is-query-running="areFlightsLoading"
             :items-per-page="paginationLimit"
-            @load-more="loadNextFlightsPage(true)"
+            @load-more="loadPage(true)"
             :public="true"
           />
         </q-card-section>

src/pages/public/pilotProfile/CopilotDetailPage.vue

@@ -25,6 +25,7 @@ import {metaData} from "src/composables/meta";
 import PhotoGallerySkeleton from "components/photos/skeletons/PhotoGallerySkeleton.vue";
 import BasicInfoBanner from "components/banners/BasicInfoBanner.vue";
 import {usePagination} from "src/composables/pagination";
+import {publicCopilotBreadcrumbs} from "src/composables/breadcrumbs";
 
 const props = defineProps({
   pilot: {
@@ -38,11 +39,7 @@ const {flights, totalItemsCount, isQueryRunning: areFlightsLoading} = storeToRef
 const {photos, isQueryRunning: arePhotosLoading} = storeToRefs(usePhotosStore());
 
 useAppStore().setPageTitle(`${props.pilot.name} + ${copilot.value.name}`);
-useAppStore().setBreadcrumbs([
-  {to: {name: 'homepage'}, label: "Polétání.cz"},
-  {to: {name: "publicProfileDetail", params: {username: props.pilot.publicUsername}}, label: `@${props.pilot.publicUsername}`},
-  {label: copilot.value.name}
-]);
+useAppStore().setBreadcrumbs(publicCopilotBreadcrumbs(props.pilot));
 
 useMeta(() => metaData({
   title: copilot.value.name,
@@ -51,14 +48,10 @@ useMeta(() => metaData({
   image: copilot.value.titleImage?.url
 }));
 
-const {filters, loadPage, paginationLimit} = usePagination();
+const {filters, loadPage, paginationLimit} = usePagination({fetchFunction: useFlightsStore().fetchPublic});
 filters.value = {copilotId: copilot.value.id};
-const loadNextFlightsPage = (appendItems) => loadPage({
-  fetchFunc: useFlightsStore().fetchPublic, appendItems
-});
-
 onMounted(() => {
-  loadNextFlightsPage(false);
+  loadPage(false);
   usePhotosStore().fetchPublic({copilotId: copilot.value.id})
 })
 </script>
@@ -82,7 +75,7 @@ onMounted(() => {
           :is-query-running="areFlightsLoading"
           :items-per-page="paginationLimit"
           :public="true"
-          @load-more="loadNextFlightsPage(true)"
+          @load-more="loadPage(true)"
         />
       </q-card-section>
     </template>

src/pages/public/pilotProfile/CopilotUploadPhotoPage.vue

@@ -22,13 +22,13 @@ export default {
 import {storeToRefs} from "pinia";
 import ContentCard from "components/ContentCard.vue";
 import {useAppStore} from "stores/App";
-import {useMeta, useQuasar} from "quasar";
+import {useMeta} from "quasar";
 import {metaData} from "src/composables/meta";
 import {flightName} from "src/composables/flight";
 import {usePhotosStore} from "stores/Photos";
-import {onMounted, ref} from "vue";
+import {onMounted} from "vue";
 import PhotosEditorListSimple from "components/photos/PhotosEditorListSimple.vue";
-import {copilotBreadcrumbs} from "src/composables/breadcrumbs";
+import {publicCopilotBreadcrumbs} from "src/composables/breadcrumbs";
 import FlightFormPhotos from "components/flights/form/FlightFormPhotos.vue";
 import BasicInfoBanner from "components/banners/BasicInfoBanner.vue";
 import {useRoute} from "vue-router";
@@ -47,7 +47,7 @@ const {photos, isQueryRunning: arePhotosLoading} = storeToRefs(usePhotosStore())
 
 useAppStore().setPageTitle(`Nahraj fotky - ${props.pilot.name} - ${flightName(flight.value)}`);
 useAppStore().setBreadcrumbs([
-  ...copilotBreadcrumbs(props.pilot, flight.value, flight.value.event, copilot.value),
+  ...publicCopilotBreadcrumbs(props.pilot, flight.value, flight.value.event, copilot.value),
   {label: "Nahraj fotky"},
 ]);
 

src/pages/public/pilotProfile/EventDetailPage.vue

@@ -20,6 +20,8 @@ import {useMeta} from "quasar";
 import {metaData} from "src/composables/meta";
 import EventBasicInfo from "components/event/EventBasicInfo.vue";
 import EventFlightsMap from "components/event/EventFlightsMap.vue";
+import {publicEventBreadcrumbs} from "src/composables/breadcrumbs";
+import {onMounted} from "vue";
 
 const props = defineProps({
   pilot: {
@@ -31,23 +33,18 @@ const props = defineProps({
 const {isQueryRunning, event} = storeToRefs(useEventsStore());
 
 useAppStore().setPageTitle(event.value.name);
-useAppStore().setBreadcrumbs([
-  {to: {name: 'homepage'}, label: "Polétání.cz"},
-  {to: {name: "publicProfileDetail", params: {username: props.pilot.publicUsername}}, label: `@${props.pilot.publicUsername}`},
-  {to: {name: "publicEventsList", params: {username: props.pilot.publicUsername}}, label: "Události"},
-  {label: event.value.name}
-]);
+useAppStore().setBreadcrumbs(publicEventBreadcrumbs(props.pilot, event.value, false));
 useMeta(() => metaData({
   title: event.value.name,
   description: event.value.description
 }))
 
-const {filters, loadPage, paginationLimit} = usePagination();
+const {filters, loadPage, paginationLimit} = usePagination({fetchFunction: useFlightsStore().fetchPublic});
 filters.value = {username: props.pilot.publicUsername, eventId: event.value.id};
-const loadNextFlightsPage = (appendItems) => loadPage({
-  fetchFunc: useFlightsStore().fetchPublic, appendItems
-});
-loadNextFlightsPage(false);
+
+onMounted(() => {
+  loadPage(false);
+})
 
 const {flights, totalItemsCount, isQueryRunning: areFlightsLoading} = storeToRefs(useFlightsStore());
 </script>
@@ -80,7 +77,7 @@ const {flights, totalItemsCount, isQueryRunning: areFlightsLoading} = storeToRef
         :is-query-running="areFlightsLoading"
         :items-per-page="paginationLimit"
         :public="true"
-        @load-more="loadNextFlightsPage(true)"
+        @load-more="loadPage(true)"
       />
     </template>
   </div>

src/pages/public/pilotProfile/EventsListPage.vue

@@ -7,6 +7,7 @@ import {useEventsStore} from "stores/Events";
 import {storeToRefs} from "pinia";
 import {useMeta} from "quasar";
 import {commonKeywords, metaData} from "src/composables/meta";
+import {publicProfileBreadcrumbs} from "src/composables/breadcrumbs";
 
 const props = defineProps({
   pilot: {
@@ -23,8 +24,7 @@ useMeta(() => metaData({
 
 useAppStore().setPageTitle(`${props.pilot.publicUsername}`);
 useAppStore().setBreadcrumbs([
-  {to: {name: 'homepage'}, label: "Polétání.cz"},
-  {to: {name: "publicProfileDetail", params: {username: props.pilot.publicUsername}}, label: `@${props.pilot.publicUsername}`},
+  ...publicProfileBreadcrumbs(props.pilot),
   {label: "Události"}
 ]);
 

src/pages/public/pilotProfile/FlightDetailPage.vue

@@ -23,6 +23,7 @@ import {aircraftKeywords, flightEventKeywords, flightKeywords, metaData} from "s
 import ContentCard from "components/ContentCard.vue";
 import {usePhotosStore} from "stores/Photos";
 import {computed} from "vue";
+import {publicFlightBreadcrumbs} from "src/composables/breadcrumbs";
 
 const {isQueryRunning, flight} = storeToRefs(useFlightsStore());
 
@@ -37,24 +38,10 @@ usePhotosStore().fetchPublic({flightId: flight.value.id});
 const {isQueryRunning: arePhotosLoading, photos: flightPhotos} = storeToRefs(usePhotosStore());
 
 const flightNameFormatted = flightName(flight.value);
-useAppStore().setPageTitle(flightNameFormatted);
-
 const event = computed(() => flight.value.event);
-const breadcrumbs = [
-  {to: {name: 'homepage'}, label: "Polétání.cz"},
-  {to: {name: "publicProfileDetail", params: {username: props.pilot.publicUsername}}, label: `@${props.pilot.publicUsername}`},
-]
-if (event.value && event.value.isPublic) {
-  breadcrumbs.push({to: {name: 'publicEventsList', username: props.pilot.publicUsername}, label: "Události"});
-  breadcrumbs.push({
-    to: {
-      name: 'publicEventDetail',
-      params: {eventSlug: event.value.urlSlug, username: props.pilot.publicUsername}
-    }, label: event.value.name
-  });
-}
-breadcrumbs.push({label: flightNameFormatted})
-useAppStore().setBreadcrumbs(breadcrumbs);
+
+useAppStore().setPageTitle(flightNameFormatted);
+useAppStore().setBreadcrumbs(publicFlightBreadcrumbs(props.pilot, flight.value, event.value, false));
 
 useMeta(() => metaData({
     title: `${flightNameFormatted} - ${props.pilot.name}`,

src/pages/public/pilotProfile/FlightsListPage.vue

@@ -8,6 +8,8 @@ import {storeToRefs} from "pinia";
 import {commonKeywords, metaData} from "src/composables/meta";
 import {useMeta} from "quasar";
 import {usePagination} from "src/composables/pagination";
+import {publicProfileBreadcrumbs} from "src/composables/breadcrumbs";
+import {onMounted} from "vue";
 
 const props = defineProps({
   pilot: {
@@ -24,18 +26,13 @@ useMeta(() => metaData({
 }));
 
 useAppStore().setPageTitle(props.pilot.publicUsername);
-useAppStore().setBreadcrumbs([
-  {to: {name: 'homepage'}, label: "Polétání.cz"},
-  {label: `@${props.pilot.publicUsername}`},
-])
+useAppStore().setBreadcrumbs(publicProfileBreadcrumbs(props.pilot, false))
 
-const {filters, loadPage, paginationLimit} = usePagination();
+const {filters, loadPage, paginationLimit} = usePagination({fetchFunction: useFlightsStore().fetchPublic});
 filters.value = {username: props.pilot.publicUsername};
-const loadNextFlightsPage = (appendItems) => loadPage({
-  fetchFunc: useFlightsStore().fetchPublic,
-  appendItems
+onMounted(() => {
+  loadPage(false);
 });
-loadNextFlightsPage(false);
 
 const {flights, totalItemsCount, isQueryRunning: areFlightsLoading} = storeToRefs(useFlightsStore());
 </script>
@@ -56,6 +53,6 @@ const {flights, totalItemsCount, isQueryRunning: areFlightsLoading} = storeToRef
     :is-query-running="areFlightsLoading"
     :items-per-page="paginationLimit"
     :public="true"
-    @load-more="loadNextFlightsPage(true)"
+    @load-more="loadPage(true)"
   />
 </template>

src/pages/public/poi/PointOfInterestDetailPage.vue

@@ -24,6 +24,7 @@ import BasicInfoBanner from "components/banners/BasicInfoBanner.vue";
 import {onMounted} from "vue";
 import PhotoGallerySkeleton from "components/photos/skeletons/PhotoGallerySkeleton.vue";
 import {usePagination} from "src/composables/pagination";
+import {publicPOIBaseBreadcrumbs} from "src/composables/breadcrumbs";
 
 const {pointOfInterest, isQueryRunning} = storeToRefs(usePointsOfInterestStore());
 const {photos, isQueryRunning: arePhotosLoading} = storeToRefs(usePhotosStore());
@@ -36,23 +37,16 @@ useMeta(() => metaData({
   description: pointOfInterest.value.description,
 }));
 useAppStore().setBreadcrumbs([
-  {to: {name: 'homepage'}, label: "Polétání.cz"},
-  {to: {name: 'publicPOIs'}, label: "Místa"},
+  ...publicPOIBaseBreadcrumbs(),
   {label: pointOfInterest.value.name}
 ]);
 
-const {filters, loadPage, paginationLimit} = usePagination();
+const {filters, loadPage, paginationLimit} = usePagination({fetchFunction: useFlightsStore().fetchPublic});
 filters.value = {pointOfInterestId: pointOfInterest.value.id};
-const loadNextFlightsPage = (appendItems) => loadPage({
-  fetchFunc: useFlightsStore().fetchPublic,
-  appendItems
-});
-
 onMounted(() => {
   usePhotosStore().fetchPublic({pointOfInterestId: pointOfInterest.value.id});
-  loadNextFlightsPage(false);
+  loadPage(false);
 });
-
 </script>
 
 <template>
@@ -85,7 +79,7 @@ onMounted(() => {
           :is-query-running="areFlightsLoading"
           :items-per-page="paginationLimit"
           :public="true"
-          @load-more="loadNextFlightsPage(true)"
+          @load-more="loadPage(true)"
         />
       </q-card-section>
     </template>

src/pages/public/poi/PointsOfInterestPage.vue

@@ -8,26 +8,23 @@ import {useMeta} from "quasar";
 import {metaData} from "src/composables/meta";
 import {usePagination} from "src/composables/pagination";
 import ListFilters from "components/ListFilters.vue";
+import {homepageBreadcrumbs, publicPOIBaseBreadcrumbs} from "src/composables/breadcrumbs";
 
 useAppStore().setPageTitle("Místa");
-useAppStore().setBreadcrumbs([
-  {to: {name: 'homepage'}, label: "Polétání.cz"},
-  {label: "Místa"},
-]);
+useAppStore().setBreadcrumbs(publicPOIBaseBreadcrumbs());
 useMeta(() => metaData({
   title: "Místa"
 }))
 
-const {filters, loadPage, paginationOffset, paginationLimit} = usePagination();
-const loadNextPage = (appendItems) => loadPage({
-  fetchFunc: usePointsOfInterestStore().fetchPublic, appendItems
+const {filters, loadPage, paginationOffset, paginationLimit} = usePagination({
+  fetchFunction: usePointsOfInterestStore().fetchPublic
 });
-loadNextPage(false);
+loadPage(false);
 
 const handleFiltersChanged = (newFilters) => {
   paginationOffset.value = 0;
   filters.value = newFilters;
-  loadNextPage(false);
+  loadPage(false);
 }
 
 const {pointsOfInterest, totalItemsCount, isQueryRunning} = storeToRefs(usePointsOfInterestStore());
@@ -45,7 +42,7 @@ const {pointsOfInterest, totalItemsCount, isQueryRunning} = storeToRefs(usePoint
       :total-items-count="totalItemsCount"
       :is-query-running="isQueryRunning"
       :items-per-page="paginationLimit"
-      @load-more="loadNextPage(true)"
+      @load-more="loadPage(true)"
     />
   </div>
 </template>

src/pages/public/user/ForgottenPasswordPage.vue

@@ -15,6 +15,7 @@ const $q = useQuasar();
 useAppStore().setPageTitle("Zapomenuté heslo");
 useMeta(() => metaData({
   title: "Zapomenuté heslo",
+  index: false
 }));
 
 const requestPasswordChange = () => {

src/pages/public/user/LoginPage.vue

@@ -14,6 +14,7 @@ const $q = useQuasar();
 useAppStore().setPageTitle("Přihlášení");
 useMeta(() => metaData({
   title: "Přihlášení",
+  index: false
 }));
 
 const logUser = () => {

src/pages/public/user/PasswordResetPage.vue

@@ -17,6 +17,7 @@ const $q = useQuasar();
 useAppStore().setPageTitle("Změna hesla");
 useMeta(() => metaData({
   title: "Změna hesla",
+  index: false
 }));
 
 const tokenInfo = reactive({