diff --git a/package.json b/package.json index ec7ceb7..def0cab 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,9 @@ "eslint-plugin-vue": "^9.0.0", "prettier": "^2.5.1", "quasar": "^2.15.2", - "typescript": "^4.5.4", + "typescript": "~5.3.0", + "vite-plugin-checker": "^0.6.4", + "vue-tsc": "^1.8.22", "workbox-build": "^7.0.0", "workbox-cacheable-response": "^7.0.0", "workbox-core": "^7.0.0", diff --git a/quasar.config.js b/quasar.config.js index 26371fe..f98860a 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -9,7 +9,6 @@ // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js const { configure } = require('quasar/wrappers'); -const path = require('path'); module.exports = configure(function (/* ctx */) { return { @@ -73,9 +72,20 @@ module.exports = configure(function (/* ctx */) { // extendViteConf (viteConf) {}, // viteVuePluginOptions: {}, - // vitePlugins: [ - // [ 'package-name', { ..options.. } ] - // ] + vitePlugins: [ + [ + 'vite-plugin-checker', + { + vueTsc: { + tsconfigPath: 'tsconfig.vue-tsc.json', + }, + eslint: { + lintCommand: 'eslint "./**/*.{js,ts,mjs,cjs,vue}"', + }, + }, + { server: false }, + ], + ], }, // Full list of options: https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#devServer @@ -104,7 +114,7 @@ module.exports = configure(function (/* ctx */) { // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework framework: { config: { - autoImportComponentCase: 'combined', // or 'kebab' (default) or 'combined' + autoImportComponentCase: 'kebab', // or 'kebab' (default) or 'combined' }, // iconSet: 'material-icons', // Quasar icon set diff --git a/src/App.vue b/src/App.vue index 4023881..3dd5266 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,9 +3,16 @@ diff --git a/src/boot/appwrite.ts b/src/boot/appwrite.ts index 5d0668c..f432d99 100644 --- a/src/boot/appwrite.ts +++ b/src/boot/appwrite.ts @@ -13,9 +13,10 @@ const client = new Client(); // const appDatabaseId = '654ac5044d1c446feb71'; // Private self-hosted appwrite -client - .setEndpoint(process.env.APPWRITE_API_ENDPOINT) - .setProject(process.env.APPWRITE_API_PROJECT); +if (process.env.APPWRITE_API_ENDPOINT && process.env.APPWRITE_API_PROJECT) + client + .setEndpoint(process.env.APPWRITE_API_ENDPOINT) + .setProject(process.env.APPWRITE_API_PROJECT); //TODO move this to config file const AppwriteIds = { diff --git a/src/components/ExampleComponent.vue b/src/components/ExampleComponent.vue deleted file mode 100644 index 3bfd35e..0000000 --- a/src/components/ExampleComponent.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - diff --git a/src/components/ResourceScheduleViewerComponent.vue b/src/components/ResourceScheduleViewerComponent.vue index 4a19b62..2965a02 100644 --- a/src/components/ResourceScheduleViewerComponent.vue +++ b/src/components/ResourceScheduleViewerComponent.vue @@ -116,7 +116,7 @@ import { Boat, useBoatStore } from 'src/stores/boat'; import { useScheduleStore } from 'src/stores/schedule'; import { date } from 'quasar'; import { computed } from 'vue'; -import type { StatusTypes } from 'src/stores/schedule'; +import type { StatusTypes } from 'src/stores/schedule.types'; interface EventData { event: object; @@ -172,7 +172,7 @@ function monthFormatter() { function getEvents(scope: ResourceIntervalScope) { const resourceEvents = scheduleStore.getBoatReservations( - date.extractDate(selectedDate.value, 'YYYY-MM-DD'), + parseDate(date.extractDate(selectedDate.value, 'YYYY-MM-DD')) as Timestamp, scope.resource.$id ); diff --git a/src/components/scheduling/boat/BoatScheduleTableComponent.vue b/src/components/scheduling/boat/BoatScheduleTableComponent.vue index 14bb370..839c6dc 100644 --- a/src/components/scheduling/boat/BoatScheduleTableComponent.vue +++ b/src/components/scheduling/boat/BoatScheduleTableComponent.vue @@ -15,7 +15,6 @@ :short-interval-label="true" v-model="selectedDate" :column-count="boatData.length" - @change="changeEvent" v-touch-swipe.left.right="handleSwipe" >