From 3abb39f62bde2f68d641e5f52b540dc45d025220 Mon Sep 17 00:00:00 2001 From: les Date: Mon, 11 Jan 2021 00:17:56 +0100 Subject: [PATCH] keep migrating to vuetify --- assets/style.less | 1 + components/Calendar.vue | 7 +- components/Event.vue | 125 +- components/Nav.vue | 22 +- components/Search.vue | 18 +- locales/esm.js | 2 +- locales/index.js | 2 +- locales/it.json | 9 +- package.json | 34 +- pages/Admin.vue | 2 +- pages/add/DateInput.vue | 53 +- pages/add/ImportDialog.vue | 14 +- pages/add/_edit.vue | 1 - pages/event/_id.vue | 5 +- pages/event/embedEvent.vue | 11 +- pages/event/eventAdmin.vue | 5 +- pages/export.vue | 10 +- pages/index.vue | 65 +- plugins/api.js | 5 +- plugins/filters.js | 6 +- server/api/controller/event.js | 41 +- server/helpers.js | 58 +- server/taskManager.js | 3 +- yarn.lock | 2272 +++++++++++++++----------------- 24 files changed, 1382 insertions(+), 1389 deletions(-) diff --git a/assets/style.less b/assets/style.less index 2cc3e325..00dd8007 100644 --- a/assets/style.less +++ b/assets/style.less @@ -1,6 +1,7 @@ html, body { scrollbar-width: thin; scrollbar-color: orange; + overflow: auto !important; } li { diff --git a/components/Calendar.vue b/components/Calendar.vue index 886d9319..2049405f 100644 --- a/components/Calendar.vue +++ b/components/Calendar.vue @@ -3,7 +3,7 @@ v-calendar( title-position='left' :is-dark="settings['theme.is_dark']" - :columns="$screens({ default: 1, md: 2 })" + :columns="2" @update:from-page='updatePage' :locale='$i18n.locale' :attributes='attributes' @@ -21,7 +21,7 @@ import { take, get } from 'lodash' export default { name: 'Calendar', props: { - events: { type: Array, default: [] } + events: { type: Array, default: () => [] } }, data () { const month = dayjs().month() + 1 @@ -35,13 +35,14 @@ export default { // TODO: could be better attributes () { + return [] const colors = ['blue', 'orange', 'yellow', 'teal', 'indigo', 'green', 'red', 'purple', 'pink', 'gray'] const tags = take(this.tags, 10).map(t => t.tag) let attributes = [] attributes.push({ key: 'today', dates: new Date(), highlight: { color: 'green', fillMode: 'outline' } }) function getColor (event) { - const color = { class: 'vc-rounded-full', color: 'blue', fillMode: 'outline' } + const color = { class: 'vc-rounded-full', color: 'blue', fillMode: 'normal' } const tag = get(event, 'tags[0]') if (!tag) { return color } const idx = tags.indexOf(tag) diff --git a/components/Event.vue b/components/Event.vue index 27292fea..562fac1a 100644 --- a/components/Event.vue +++ b/components/Event.vue @@ -1,78 +1,83 @@ -