Aktualizace quasaru

src/boot/apollo.js

@@ -3,9 +3,8 @@ import {onError} from "@apollo/client/link/error";
 import {useAppStore} from "stores/App";
 import {Notify} from "quasar";
 import {errorObject, warningObject} from "src/composables/dialog";
-import {createUploadLink} from "apollo-upload-client";
 import {useAuthStore} from "stores/Auth";
-import {useRouter} from "vue-router";
+import {createUploadLink} from "apollo-upload-client";
 // import createUploadLink from "apollo-upload-client/createUploadLink.mjs";
 
 const handleRefreshToken = (store, router, forward, operation) => {
@@ -14,7 +13,7 @@ const handleRefreshToken = (store, router, forward, operation) => {
   console.log("refreshing token, ", operation.query);
   return fromPromise(useAuthStore(store).refreshAccessToken()
     .catch((error) => {
-      Notify.create(warningObject("Tvoje přihlášení vypřešlo. Přihlaš se prosím znovu."));
+      Notify.create(warningObject("Tvoje přihlášení vypršelo. Přihlaš se prosím znovu."));
       router.push({name: "login"})
     }))
     .filter((value) => Boolean(value))
@@ -68,7 +67,10 @@ export default (({store, router}) => {
   });
 
   const apolloClient = new ApolloClient({
-    link: ApolloLink.from([authLink, errorLink, uploadLink]), cache: new InMemoryCache(), connectToDevTools: true,
+    link: ApolloLink.from([authLink, errorLink, uploadLink]),
+    cache: new InMemoryCache(),
+    connectToDevTools: true,
+    ssrMode: true,
   });
 
   apolloWrapper.query = (query, variables = {}) => {

src/components/flightPlans/FlightPlanRoute.vue

@@ -72,11 +72,11 @@ const allPlacesOptions = computed(() => {
         <q-item-section side>
           <div>
             <q-btn
-               v-if="i > 0"
-               text-color="primary"
-               size="16px"
-               flat dense round icon="arrow_upward"
-               @click="swapMarkers(i, i-1)"
+              v-if="i > 0"
+              text-color="primary"
+              size="16px"
+              flat dense round icon="arrow_upward"
+              @click="swapMarkers(i, i-1)"
             />
             <q-btn
               v-if="i < model.length - 1"
@@ -116,4 +116,5 @@ const allPlacesOptions = computed(() => {
     :options="allPlacesOptions"
     @select="handlePlaceSelect"
   />
+
 </template>

src/pages/profile/flight/FlightDetailPage.vue

@@ -10,7 +10,7 @@ export default {
 
 <script setup>
 import {useRoute, useRouter} from "vue-router";
-import {onMounted, watch} from "vue";
+import {computed, onMounted, watch} from "vue";
 import FlightDetailSkeleton from "components/flights/skeletons/FlightDetailSkeleton.vue";
 import {flightName} from "src/composables/flight";
 import {useAppStore} from "stores/App";

src/pages/profile/flightPlanner/FlightPlanEditPage.vue

@@ -143,16 +143,14 @@ const fullscreen = ref(false);
 
             <q-checkbox v-model="formData.isDefaultName" label="Použít automatické jméno"/>
 
-<!--            <q-checkbox v-model="formData.isPublic" label="Zveřejnit"/>-->
-<!--            <q-checkbox v-model="formData.isEditableByCopilot" label="Kopilot může upravovat"/>-->
+            <!--            <q-checkbox v-model="formData.isPublic" label="Zveřejnit"/>-->
+            <!--            <q-checkbox v-model="formData.isEditableByCopilot" label="Kopilot může upravovat"/>-->
             <DatetimePicker v-model="formData.plannedTakeoffDatetime" label="Plánovaný datum a čas vzletu" v-bind="commonProps"/>
             <ComboboxInput v-model="formData.aircraft" :options="aircrafts" label="Letadlo" v-bind="commonProps"/>
 
             <q-input v-model.number="formData.plannedSpeed" type="number" step="5" label="Plánovaná rychlost" v-bind="commonProps">
               <template #append>km/h</template>
             </q-input>
-
-            <!--            <q-btn @click="handleFlightPlanInfoSave" icon="save">Ulozit</q-btn>-->
           </FormWrapper>
         </div>
       </div>
@@ -162,8 +160,10 @@ const fullscreen = ref(false);
 
   <q-dialog full-width v-model="flightPlannerDialogOpen">
     <q-card>
-      <q-card-section>
+      <q-card-section class="row items-center q-pb-none">
         <div class="text-h6">Přidat otočný bod</div>
+        <q-space/>
+        <q-btn icon="close" flat round dense v-close-popup/>
       </q-card-section>
 
       <q-card-section class="q-pt-none">
@@ -176,21 +176,21 @@ const fullscreen = ref(false);
       </q-card-section>
 
       <q-card-actions align="right" class="text-primary">
-        <q-btn flat label="Zavřít" v-close-popup/>
+        <q-btn flat label="Hotovo" v-close-popup/>
       </q-card-actions>
     </q-card>
   </q-dialog>
 </template>
 
 
-<style lang="scss">
+<style lang="scss" scoped>
 .fullscreen {
   position: fixed;
   top: 0;
   bottom: 0;
   right: 0;
   left: 0;
-  z-index: 99999;
+  z-index: 2001;
 
   .markers-control {
     background: white;

src/router/index.js

@@ -3,8 +3,8 @@ import {createRouter, createMemoryHistory, createWebHistory} from 'vue-router'
 import routes from './routes'
 import {useAppStore} from "stores/App";
 
-export default route(function ({ store }) {
-  const createHistory = process.env.SERVER ? createMemoryHistory : createWebHistory;
+export default route(function ({ store, ssrContext }) {
+  const createHistory = ssrContext ? createMemoryHistory : createWebHistory;
 
   const Router = createRouter({
     scrollBehavior: () => ({left: 0, top: 0}),