diff --git a/package.json b/package.json index d489648..d9a0ae2 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ }, "dependencies": { "@quasar/extras": "^1.16.11", + "@quasar/quasar-ui-qcalendar": "^4.0.0-beta.19", "appwrite": "^13.0.0", "pinia": "^2.1.7", "vue": "3", @@ -21,7 +22,7 @@ }, "devDependencies": { "@quasar/app-vite": "^1.7.4", - "@quasar/quasar-app-extension-qcalendar": "^4.0.0-beta.15", + "@quasar/quasar-app-extension-qcalendar": "^4.0.0-beta.19", "@types/node": "^12.20.21", "@typescript-eslint/eslint-plugin": "^5.10.0", "@typescript-eslint/parser": "^5.10.0", diff --git a/src/pages/schedule/BoatScheduleView.vue b/src/pages/schedule/BoatScheduleView.vue index 9696d99..6a91dec 100644 --- a/src/pages/schedule/BoatScheduleView.vue +++ b/src/pages/schedule/BoatScheduleView.vue @@ -53,8 +53,8 @@ import { useScheduleStore } from 'src/stores/schedule'; import { ref } from 'vue'; const scheduleStore = useScheduleStore(); -import { QCalendarDay, today, makeDateTime } from '@quasar/quasar-ui-qcalendar'; - +import { makeDateTime, today } from '@quasar/quasar-ui-qcalendar'; +import { QCalendarDay } from '@quasar/quasar-ui-qcalendar'; const selectedDate = ref(today()); // Use ref to get a reference to the QCalendarDay component diff --git a/src/stores/schedule.ts b/src/stores/schedule.ts index a207a0c..fc54798 100644 --- a/src/stores/schedule.ts +++ b/src/stores/schedule.ts @@ -4,7 +4,6 @@ import { Boat, useBoatStore } from './boat'; import { date } from 'quasar'; import { DateOptions } from 'quasar'; import { Timestamp } from '@quasar/quasar-ui-qcalendar'; -import { timeStamp } from 'console'; export type StatusTypes = 'tentative' | 'confirmed' | 'pending' | undefined; export type Reservation = { @@ -16,7 +15,8 @@ export type Reservation = { reservationDate: Date; status?: StatusTypes; }; - +// 24 hrs in advance only 2 weekday, and 1 weekend slot +// Within 24 hrs, any available slot /* TODO: Figure out how best to separate out where qcalendar bits should be. e.g.: Should there be any qcalendar stuff in this store? Or should we have just JS Date objects in here? */ diff --git a/yarn.lock b/yarn.lock index 2df2c5c..23cabc6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1120,18 +1120,23 @@ resolved "https://registry.yarnpkg.com/@quasar/extras/-/extras-1.16.11.tgz#84b1efb9097a6e58c3ebfdd5da83ac658056a35c" integrity sha512-sbTBHOA+Hi7ah0P6qSm+xfRXqwJ94ct3NKA3Lkq3iNPYuHD7VXbSWtP2eA7Cu9Fd0WjVoPbngf6yFGg46U3IfQ== -"@quasar/quasar-app-extension-qcalendar@^4.0.0-beta.15": +"@quasar/quasar-app-extension-qcalendar@^4.0.0-beta.19": version "4.0.0-beta.16" - resolved "https://registry.npmjs.org/@quasar/quasar-app-extension-qcalendar/-/quasar-app-extension-qcalendar-4.0.0-beta.16.tgz" + resolved "https://registry.yarnpkg.com/@quasar/quasar-app-extension-qcalendar/-/quasar-app-extension-qcalendar-4.0.0-beta.16.tgz#5b0bdfb04db59cf6017892ff91563dd9759c7bb5" integrity sha512-Rj3KKjPFrE13cswlZAPcqdqi1YH9CeHMpWIw8xsNqdLhCoaRhMGbRas9fvHFLJOXpnsDaVwWINNgN/bBUyn99w== dependencies: "@quasar/quasar-ui-qcalendar" "^4.0.0-beta.16" "@quasar/quasar-ui-qcalendar@^4.0.0-beta.16": version "4.0.0-beta.16" - resolved "https://registry.npmjs.org/@quasar/quasar-ui-qcalendar/-/quasar-ui-qcalendar-4.0.0-beta.16.tgz" + resolved "https://registry.yarnpkg.com/@quasar/quasar-ui-qcalendar/-/quasar-ui-qcalendar-4.0.0-beta.16.tgz#90dca0962f1fe1068361f387893df6c5da7522e2" integrity sha512-KVbFJD1HQp91tiklv+6XsG7bq8FKK6mhhnoVzmjgoyhUAEb9csfbDPbpegy1/FzXy3o0wITe6mmRZ8nbaiMEZg== +"@quasar/quasar-ui-qcalendar@^4.0.0-beta.19": + version "4.0.0-beta.19" + resolved "https://registry.yarnpkg.com/@quasar/quasar-ui-qcalendar/-/quasar-ui-qcalendar-4.0.0-beta.19.tgz#11229ad28f65991c2de584faf2e0196563a0e633" + integrity sha512-BT0G2JjgKl1bqNrY5utcYeoy8gK+U9k3Pz1YDi1OB265W/jHU6nFoWMEUdY3JdvMccwkXTL2DLVyl3eqAUyLyg== + "@quasar/render-ssr-error@^1.0.3": version "1.0.3" resolved "https://registry.yarnpkg.com/@quasar/render-ssr-error/-/render-ssr-error-1.0.3.tgz#33f27231007d1b222de41d3d70c29a6d14f9498a"