From b093dae3f39dc586b470f1b8502eff6252e0063a Mon Sep 17 00:00:00 2001 From: lesion Date: Tue, 25 Jun 2019 01:05:38 +0200 Subject: [PATCH] allow_anon_event, comment via mastodon --- components/Calendar.vue | 2 +- components/Nav.vue | 13 ++++++-- components/Search.vue | 13 ++++---- config/default.json | 9 ++--- locales/it.js | 38 +++++++++++++++++++-- nuxt.config.js | 19 ++--------- package.json | 2 +- pages/about.vue | 27 +-------------- pages/add/_edit.vue | 19 +++++------ pages/admin.vue | 37 ++++++++++++--------- pages/event/_id.vue | 26 +++++++++------ pages/export.vue | 18 +++++----- pages/login.vue | 13 ++++---- pages/recover/_code.vue | 2 ++ pages/register.vue | 2 ++ pages/settings.vue | 5 ++- plugins/axios.js | 10 +----- plugins/element-ui.js | 4 +-- plugins/filters.js | 4 +-- plugins/i18n.js | 7 ++-- server/api/controller/bot.js | 46 ++++++++++---------------- server/api/controller/event.js | 2 ++ server/api/controller/settings.js | 36 +++++++++++--------- server/api/controller/user.js | 25 ++++++++------ server/api/index.js | 2 +- server/api/models/comment.js | 2 +- server/api/models/event.js | 4 +-- server/api/models/eventnotification.js | 4 +-- server/cli.js | 9 +++-- server/firstrun.js | 13 ++++++-- server/notifier.js | 40 ++++++++++++++++------ store/index.js | 25 ++++++++------ 32 files changed, 259 insertions(+), 219 deletions(-) diff --git a/components/Calendar.vue b/components/Calendar.vue index 5f9debac..3b46f0e6 100644 --- a/components/Calendar.vue +++ b/components/Calendar.vue @@ -42,7 +42,7 @@ export default { ...mapGetters(['filteredEvents']), attributes () { let attributes = [] - attributes.push ({ key: 'today', dates: new Date(), highlight: { color: 'yellow' }}) + attributes.push ({ key: 'today', dates: new Date(), highlight: { color: 'green' }}) attributes = attributes.concat(this.filteredEvents .filter(e => !e.multidate) diff --git a/components/Nav.vue b/components/Nav.vue index 1352eaad..4c91fe25 100644 --- a/components/Nav.vue +++ b/components/Nav.vue @@ -9,7 +9,7 @@ el-menu-item(v-if='!$auth.loggedIn' :title="$t('common.login')") v-icon(color='lightgreen' name='user') - nuxt-link(to='/add') + nuxt-link(v-if='could_add' to='/add') el-menu-item(:title="$t('common.add_event')") v-icon(color='lightgreen' name='plus') @@ -17,8 +17,9 @@ placement="bottom" trigger="click") Search(past-filter) - el-menu-item(slot='reference') + el-menu-item(slot='reference' :title="$t('common.search')" icon='el-share-button') v-icon(color='lightblue' name='search') + el-badge(v-if='filters.tags.length+filters.places.length>0' is-dot type='warning') nuxt-link(to='/settings') el-menu-item(v-if='$auth.loggedIn' :title="$t('common.settings')") @@ -38,14 +39,22 @@