From 3c51631bcd2fe415ae65fabe728db3bdea699a08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Thu, 9 May 2024 13:17:44 +0200 Subject: [PATCH] Aktualizace quasaru --- Dockerfile | 2 + docker-compose.prod.yml | 5 - docker-compose.yml | 9 +- package.json | 10 +- quasar.config.js | 17 +- src/boot/apollo.js | 10 +- .../flightPlans/FlightPlanRoute.vue | 11 +- src/pages/profile/flight/FlightDetailPage.vue | 2 +- .../flightPlanner/FlightPlanEditPage.vue | 16 +- src/router/index.js | 4 +- yarn.lock | 494 +++++++++++------- 11 files changed, 355 insertions(+), 225 deletions(-) diff --git a/Dockerfile b/Dockerfile index 251de26..49b3e4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,8 @@ COPY . . # build stage FROM develop-stage as build-stage ENV NODE_ENV production +ENV API_URL "https://api.poletani.cz" +ENV GOOGLE_MAPS_API_KEY "AIzaSyAfTU1VntF9rp2D9TR4CFXIMALF5GLgsio" RUN quasar build -m ssr diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index e3ee00f..a57f7a6 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -2,11 +2,6 @@ version: "3.4" services: poletani-app: image: "docker.kvacek.cz/poletani/app:latest" -# build: -# context: . -# dockerfile: Dockerfile -# target: "production-stage" restart: always ports: -# - 9000:80 - 9000:3000 diff --git a/docker-compose.yml b/docker-compose.yml index be49cf8..da4c435 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,7 +24,6 @@ services: ## command: ls -l /app app: - network_mode: host build: context: . target: "develop-stage" @@ -32,13 +31,11 @@ services: - "9000:9000" - "9001:9100" volumes: - - ./src:/app/src - - ./src-ssr:/app/src-ssr - - ./public:/app/public -# - ./node_modules:/app/node_modules:delegated - command: quasar dev # -m ssr + - ./:/app + command: quasar dev -m ssr environment: API_URL: "http://127.0.0.1:8000" + GOOGLE_MAPS_API_KEY: "AIzaSyAfTU1VntF9rp2D9TR4CFXIMALF5GLgsio" # nginx: # image: diff --git a/package.json b/package.json index bcd699f..e8b8684 100644 --- a/package.json +++ b/package.json @@ -22,15 +22,15 @@ "photoswipe": "^5.4.2", "photoswipe-dynamic-caption-plugin": "^1.2.7", "pinia": "^2.0.33", - "quasar": "^2.14.1", - "vue": "^3.3.11", - "vue-chartjs": "^5.2.0", + "quasar": "2.16.2", + "vue": "3.3.11", + "vue-chartjs": "^5.3.1", "vue-picture-cropper": "^0.7.0", "vue-router": "^4.2.5", - "vue3-google-map": "^0.15.0" + "vue3-google-map": "^0.20.0" }, "devDependencies": { - "@quasar/app-vite": "^1.7.1", + "@quasar/app-vite": "1.9.3", "autoprefixer": "^10.4.16", "eslint": "^8.55.0", "eslint-config-prettier": "^8.10.0", diff --git a/quasar.config.js b/quasar.config.js index f58ef65..c2ad713 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -61,8 +61,8 @@ module.exports = configure(function (ctx) { }, env: { - API_URL: ctx.dev ? 'http://localhost:8000' : 'https://api.poletani.cz', - GOOGLE_MAPS_API_KEY: "AIzaSyAfTU1VntF9rp2D9TR4CFXIMALF5GLgsio" + API_URL: process.env.API_URL, + GOOGLE_MAPS_API_KEY: process.env.GOOGLE_MAPS_API_KEY }, vueRouterMode: 'history', // available values: 'hash', 'history' @@ -81,7 +81,15 @@ module.exports = configure(function (ctx) { // polyfillModulePreload: true, // distDir - // extendViteConf (viteConf) {}, + // extendViteConf(viteConf, {isServer}) { + // viteConf.define = { + // __VUE_PROD_HYDRATION_MISMATCH_DETAILS__: false, + // 'globalThis.process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV), + // 'globalThis.process.env.API_URL': JSON.stringify(process.env.API_URL), + // 'globalThis.process.env.GOOGLE_MAPS_API_KEY': JSON.stringify(process.env.GOOGLE_MAPS_API_KEY), + // 'globalThis.process.env.SERVER': JSON.stringify(isServer), + // }; + // }, // viteVuePluginOptions: {}, // vitePlugins: [] @@ -140,7 +148,8 @@ module.exports = configure(function (ctx) { ssrPwaHtmlFilename: 'offline.html', // do NOT use index.html as name! // will mess up SSR - extendSSRWebserverConf (esbuildConf) {}, + extendSSRWebserverConf(esbuildConf) { + }, // extendPackageJson (json) {}, pwa: false, diff --git a/src/boot/apollo.js b/src/boot/apollo.js index 3285fac..3a7582d 100644 --- a/src/boot/apollo.js +++ b/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 = {}) => { diff --git a/src/components/flightPlans/FlightPlanRoute.vue b/src/components/flightPlans/FlightPlanRoute.vue index 4118b36..7119446 100644 --- a/src/components/flightPlans/FlightPlanRoute.vue +++ b/src/components/flightPlans/FlightPlanRoute.vue @@ -72,11 +72,11 @@ const allPlacesOptions = computed(() => {
{ :options="allPlacesOptions" @select="handlePlaceSelect" /> + diff --git a/src/pages/profile/flight/FlightDetailPage.vue b/src/pages/profile/flight/FlightDetailPage.vue index d4c8e43..ca589d1 100644 --- a/src/pages/profile/flight/FlightDetailPage.vue +++ b/src/pages/profile/flight/FlightDetailPage.vue @@ -10,7 +10,7 @@ export default {