Fixed dependencies, calendar and submodule
This commit is contained in:
parent
9b273c2501
commit
dbcd1b2c5f
|
@ -44,9 +44,7 @@ module.exports = {
|
||||||
|
|
||||||
// https://github.com/prettier/eslint-config-prettier#installation
|
// https://github.com/prettier/eslint-config-prettier#installation
|
||||||
// usage with Prettier, provided by 'eslint-config-prettier'.
|
// usage with Prettier, provided by 'eslint-config-prettier'.
|
||||||
'prettier',
|
'prettier', //'plugin:prettier/recommended'
|
||||||
'prettier/@typescript-eslint',
|
|
||||||
'prettier/vue'
|
|
||||||
],
|
],
|
||||||
|
|
||||||
plugins: [
|
plugins: [
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
[submodule "deps/quasar-ui-qcalendar"]
|
[submodule "deps/quasar-ui-qcalendar"]
|
||||||
path = deps/quasar-ui-qcalendar
|
path = deps/quasar-ui-qcalendar
|
||||||
url = https://github.com/quasarframework/quasar-ui-qcalendar
|
url = https://github.com/susnux/quasar-ui-qcalendar
|
||||||
branch = next
|
branch = quasar2
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 9ed7fd1082d0e03b60fe67d6a536f9dd83dce345
|
Subproject commit 9a61d93c2f0758895eeb63259ac3cf9185c32d1a
|
20
package.json
20
package.json
|
@ -7,13 +7,13 @@
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"format": "prettier --config ./package.json --write '{,!(node_modules)/**/}*.ts'",
|
"format": "prettier --config ./package.json --write '{,!(node_modules)/**/}*.ts'",
|
||||||
"lint": "eslint --ext .js,.ts,.vue ./"
|
"lint": "eslint --ext .js,.ts,.vue ./src"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@quasar/extras": "^1.9.19",
|
"@quasar/extras": "^1.9.19",
|
||||||
"axios": "^0.21.1",
|
"axios": "^0.21.1",
|
||||||
"cordova": "^10.0.0",
|
"cordova": "^10.0.0",
|
||||||
"core-js": "^3.7.0",
|
"core-js": "^3.9.1",
|
||||||
"pinia": "^2.0.0-alpha.7",
|
"pinia": "^2.0.0-alpha.7",
|
||||||
"quasar": "^2.0.0-beta.9"
|
"quasar": "^2.0.0-beta.9"
|
||||||
},
|
},
|
||||||
|
@ -26,17 +26,17 @@
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@quasar/app": "^3.0.0-beta.9",
|
"@quasar/app": "^3.0.0-beta.9",
|
||||||
"@quasar/quasar-app-extension-qcalendar": "file:deps/quasar-ui-qcalendar/app-extension",
|
"@quasar/quasar-app-extension-qcalendar": "file:deps/quasar-ui-qcalendar/app-extension",
|
||||||
"@types/node": "^12.19.6",
|
"@types/node": "^12.20.6",
|
||||||
"@types/webpack": "^4.41.26",
|
"@types/webpack": "^4.41.26",
|
||||||
"@types/webpack-env": "^1.16.0",
|
"@types/webpack-env": "^1.16.0",
|
||||||
"@typescript-eslint/eslint-plugin": "^4.8.2",
|
"@typescript-eslint/eslint-plugin": "^4.18.0",
|
||||||
"@typescript-eslint/parser": "^4.8.2",
|
"@typescript-eslint/parser": "^4.18.0",
|
||||||
"eslint": "^7.18.0",
|
"eslint": "^7.22.0",
|
||||||
"eslint-config-prettier": "^6.15.0",
|
"eslint-config-prettier": "^8.1.0",
|
||||||
"eslint-plugin-vue": "^7.5.0",
|
"eslint-plugin-vue": "^7.7.0",
|
||||||
"eslint-webpack-plugin": "^2.4.3",
|
"eslint-webpack-plugin": "^2.5.2",
|
||||||
"prettier": "^2.2.1",
|
"prettier": "^2.2.1",
|
||||||
"typescript": "^4.1.3"
|
"typescript": "^4.2.3"
|
||||||
},
|
},
|
||||||
"browserslist": [
|
"browserslist": [
|
||||||
"last 10 Chrome versions",
|
"last 10 Chrome versions",
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
]"
|
]"
|
||||||
/>
|
/>
|
||||||
</q-toolbar>
|
</q-toolbar>
|
||||||
<q-calendar
|
<q-calendar-agenda
|
||||||
ref="calendar"
|
ref="calendar"
|
||||||
v-model="selectedDate"
|
v-model="selectedDate"
|
||||||
:view="calendarView"
|
:view="calendarView"
|
||||||
|
@ -58,7 +58,7 @@
|
||||||
<eventslot :event="agenda" />
|
<eventslot :event="agenda" />
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
</q-calendar>
|
</q-calendar-agenda>
|
||||||
</div>
|
</div>
|
||||||
</q-card>
|
</q-card>
|
||||||
</q-page>
|
</q-page>
|
||||||
|
@ -78,8 +78,8 @@ export default defineComponent({
|
||||||
const store = useScheduleStore();
|
const store = useScheduleStore();
|
||||||
const selectedDate = ref(date.formatDate(new Date(), 'YYYY-MM-DD'));
|
const selectedDate = ref(date.formatDate(new Date(), 'YYYY-MM-DD'));
|
||||||
const proxyDate = ref('');
|
const proxyDate = ref('');
|
||||||
const calendar = ref();
|
const calendar = ref<QCalendar.QCalendar>();
|
||||||
const calendarView = 'week-agenda';
|
const calendarView = 'week';
|
||||||
const events = ref<Agendas>({});
|
const events = ref<Agendas>({});
|
||||||
|
|
||||||
interface Agendas {
|
interface Agendas {
|
||||||
|
@ -109,12 +109,12 @@ export default defineComponent({
|
||||||
|
|
||||||
function calendarNext() {
|
function calendarNext() {
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-call
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-call
|
||||||
return calendar.value.next();
|
return calendar.value?.next();
|
||||||
}
|
}
|
||||||
|
|
||||||
function calendarPrev() {
|
function calendarPrev() {
|
||||||
// eslint-disable-next-line @typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-call
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-call
|
||||||
return calendar.value.prev();
|
return calendar.value?.prev();
|
||||||
}
|
}
|
||||||
function updateProxy() {
|
function updateProxy() {
|
||||||
proxyDate.value = selectedDate.value;
|
proxyDate.value = selectedDate.value;
|
||||||
|
|
Loading…
Reference in New Issue