Fixed dependencies, calendar and submodule

This commit is contained in:
Ferdinand Thiessen 2021-03-19 02:36:31 +01:00
parent 9b273c2501
commit dbcd1b2c5f
6 changed files with 1268 additions and 1173 deletions

View File

@ -44,9 +44,7 @@ module.exports = {
// https://github.com/prettier/eslint-config-prettier#installation
// usage with Prettier, provided by 'eslint-config-prettier'.
'prettier',
'prettier/@typescript-eslint',
'prettier/vue'
'prettier', //'plugin:prettier/recommended'
],
plugins: [

4
.gitmodules vendored
View File

@ -1,4 +1,4 @@
[submodule "deps/quasar-ui-qcalendar"]
path = deps/quasar-ui-qcalendar
url = https://github.com/quasarframework/quasar-ui-qcalendar
branch = next
url = https://github.com/susnux/quasar-ui-qcalendar
branch = quasar2

@ -1 +1 @@
Subproject commit 9ed7fd1082d0e03b60fe67d6a536f9dd83dce345
Subproject commit 9a61d93c2f0758895eeb63259ac3cf9185c32d1a

View File

@ -7,13 +7,13 @@
"private": true,
"scripts": {
"format": "prettier --config ./package.json --write '{,!(node_modules)/**/}*.ts'",
"lint": "eslint --ext .js,.ts,.vue ./"
"lint": "eslint --ext .js,.ts,.vue ./src"
},
"dependencies": {
"@quasar/extras": "^1.9.19",
"axios": "^0.21.1",
"cordova": "^10.0.0",
"core-js": "^3.7.0",
"core-js": "^3.9.1",
"pinia": "^2.0.0-alpha.7",
"quasar": "^2.0.0-beta.9"
},
@ -26,17 +26,17 @@
"devDependencies": {
"@quasar/app": "^3.0.0-beta.9",
"@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-env": "^1.16.0",
"@typescript-eslint/eslint-plugin": "^4.8.2",
"@typescript-eslint/parser": "^4.8.2",
"eslint": "^7.18.0",
"eslint-config-prettier": "^6.15.0",
"eslint-plugin-vue": "^7.5.0",
"eslint-webpack-plugin": "^2.4.3",
"@typescript-eslint/eslint-plugin": "^4.18.0",
"@typescript-eslint/parser": "^4.18.0",
"eslint": "^7.22.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-vue": "^7.7.0",
"eslint-webpack-plugin": "^2.5.2",
"prettier": "^2.2.1",
"typescript": "^4.1.3"
"typescript": "^4.2.3"
},
"browserslist": [
"last 10 Chrome versions",

View File

@ -44,7 +44,7 @@
]"
/>
</q-toolbar>
<q-calendar
<q-calendar-agenda
ref="calendar"
v-model="selectedDate"
:view="calendarView"
@ -58,7 +58,7 @@
<eventslot :event="agenda" />
</template>
</template>
</q-calendar>
</q-calendar-agenda>
</div>
</q-card>
</q-page>
@ -78,8 +78,8 @@ export default defineComponent({
const store = useScheduleStore();
const selectedDate = ref(date.formatDate(new Date(), 'YYYY-MM-DD'));
const proxyDate = ref('');
const calendar = ref();
const calendarView = 'week-agenda';
const calendar = ref<QCalendar.QCalendar>();
const calendarView = 'week';
const events = ref<Agendas>({});
interface Agendas {
@ -109,12 +109,12 @@ export default defineComponent({
function calendarNext() {
// 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() {
// 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() {
proxyDate.value = selectedDate.value;

2399
yarn.lock

File diff suppressed because it is too large Load Diff