From cf81a73f2ff63f48c15de03beb2417bedea3cbd9 Mon Sep 17 00:00:00 2001 From: lesion Date: Fri, 21 Jun 2019 23:52:18 +0200 Subject: [PATCH] better config / install from cli / allow_registration --- .sequelizerc | 2 +- components/Calendar.vue | 34 ++-- components/Home.vue | 7 +- config/default.json | 19 ++ config/production.js | 12 ++ locales/en.js | 2 +- locales/it.js | 21 +-- nuxt.config.js | 39 ++--- package.json | 12 +- pages/add/_edit.vue | 59 +++---- pages/admin.vue | 69 +++----- pages/export.vue | 6 +- pages/login.vue | 6 +- pages/register.vue | 6 +- pages/settings.vue | 29 +++- plugins/axios.js | 13 ++ plugins/element-ui.js | 4 +- plugins/filters.js | 25 +-- server/api/auth.js | 3 +- server/api/controller/bot.js | 4 +- server/api/controller/event.js | 12 +- server/api/controller/settings.js | 79 ++++++--- server/api/controller/user.js | 4 +- server/api/index.js | 18 +- server/api/mail.js | 2 +- server/api/models/event.js | 7 +- server/api/models/eventnotification.js | 4 +- server/api/models/index.js | 3 +- server/api/models/setting.js | 3 +- server/api/storage.js | 2 +- server/cli.js | 162 ++++++++++++++++++ server/config.js | 27 ++- server/emails/register/html.pug | 2 +- server/firstrun.js | 70 ++++---- server/index.js | 7 +- .../migrations/20190605141850-create-event.js | 6 +- .../20190605142619-create-setting.js | 1 + store/index.js | 21 ++- 38 files changed, 530 insertions(+), 272 deletions(-) create mode 100644 config/default.json create mode 100644 config/production.js create mode 100644 plugins/axios.js create mode 100755 server/cli.js diff --git a/.sequelizerc b/.sequelizerc index 31b6598f..5334eec1 100644 --- a/.sequelizerc +++ b/.sequelizerc @@ -1,7 +1,7 @@ const path = require('path') module.exports = { - 'config': path.resolve('config.js'), + 'config': path.resolve('server', 'dbconfig.js'), 'migrations-path': path.resolve('server', 'migrations'), 'models-path': path.resolve('server', 'api', 'models') } diff --git a/components/Calendar.vue b/components/Calendar.vue index e1c50e8a..5f9debac 100644 --- a/components/Calendar.vue +++ b/components/Calendar.vue @@ -2,7 +2,7 @@ #calendar v-calendar( title-position='left' - locale='it' + :locale='$i18n.locale' is-dark :attributes='attributes' :from-page.sync='page' @@ -41,25 +41,19 @@ export default { computed: { ...mapGetters(['filteredEvents']), attributes () { - return [ - { key: 'today', dates: new Date(), - highlight: { color: 'red' }, - }, - { - key: 'event', - dates: this.filteredEvents - .filter(e => !e.multidate) - .map(e => e.start_datetime ), - dot: { } - }, - { - key: 'multidays', - dates: this.filteredEvents - .filter(e => e.multidate) - .map( e => ({ start: e.start_datetime, end: e.end_datetime })), - highlight: { color: 'green' } - } - ] + let attributes = [] + attributes.push ({ key: 'today', dates: new Date(), highlight: { color: 'yellow' }}) + + attributes = attributes.concat(this.filteredEvents + .filter(e => !e.multidate) + .map(e => ({ key: e.id, dot: {}, dates: new Date(e.start_datetime*1000)}))) + + attributes = attributes.concat(this.filteredEvents + .filter(e => e.multidate) + .map( e => ({ key: e.id, highlight: {}, dates: { + start: new Date(e.start_datetime*1000), end: new Date(e.end_datetime*1000) }}))) + + return attributes } } } diff --git a/components/Home.vue b/components/Home.vue index f9c386cf..02cab368 100644 --- a/components/Home.vue +++ b/components/Home.vue @@ -21,7 +21,7 @@