From e284822875e6c681afcb4e25595837ce17d2664f Mon Sep 17 00:00:00 2001 From: Nicolas Giard Date: Tue, 4 Sep 2018 00:46:24 -0400 Subject: [PATCH] misc: updated dependencies + UI fixes --- .babelrc | 21 +- client/components/admin/admin-auth.vue | 2 +- client/components/admin/admin-general.vue | 43 +- client/components/admin/admin-logging.vue | 2 +- client/components/admin/admin-storage.vue | 2 +- client/components/admin/admin-utilities.vue | 4 +- client/helpers/compatibility.js | 2 +- client/modules/localization.js | 2 +- client/themes/default/components/app.vue | 23 +- package.json | 102 +- server/views/page.pug | 72 +- yarn.lock | 2248 +++++++++---------- 12 files changed, 1293 insertions(+), 1230 deletions(-) diff --git a/.babelrc b/.babelrc index cb993f7a..75214e92 100644 --- a/.babelrc +++ b/.babelrc @@ -2,10 +2,25 @@ "comments": true, "plugins": [ "lodash", - "graphql-tag" + "graphql-tag", + "@babel/plugin-syntax-dynamic-import", + "@babel/plugin-syntax-import-meta", + "@babel/plugin-proposal-class-properties", + "@babel/plugin-proposal-json-strings", + [ + "@babel/plugin-proposal-decorators", + { + "legacy": true + } + ], + "@babel/plugin-proposal-function-sent", + "@babel/plugin-proposal-export-namespace-from", + "@babel/plugin-proposal-numeric-separator", + "@babel/plugin-proposal-throw-expressions" ], "presets": [ - ["env"], - "stage-2" + [ + "@babel/preset-env" + ] ] } diff --git a/client/components/admin/admin-auth.vue b/client/components/admin/admin-auth.vue index a5f8c5cf..3ae31da2 100644 --- a/client/components/admin/admin-auth.vue +++ b/client/components/admin/admin-auth.vue @@ -12,7 +12,7 @@ .body-2.grey--text.text--darken-1 Select which authentication strategies to enable: .caption.grey--text.pb-2 Some strategies require additional configuration in their dedicated tab (when selected). v-form - v-checkbox.my-1( + v-checkbox.my-0( v-for='strategy in strategies' v-model='strategy.isEnabled' :key='strategy.key' diff --git a/client/components/admin/admin-general.vue b/client/components/admin/admin-general.vue index 07bbd7d0..94987466 100644 --- a/client/components/admin/admin-general.vue +++ b/client/components/admin/admin-general.vue @@ -44,7 +44,7 @@ ) v-card-chin v-spacer - v-btn(color='primary') + v-btn(color='primary', @click='save') v-icon(left) chevron_right span Save v-flex(lg6 xs12) @@ -82,7 +82,33 @@ ) v-card-chin v-spacer - v-btn(color='primary') + v-btn(color='primary', @click='save') + v-icon(left) chevron_right + span Save + + v-card.mt-3 + v-toolbar(color='primary', dark, dense, flat) + v-toolbar-title + .subheading Features + v-card-text + v-switch( + v-model='featurePageRatings' + label='Page Ratings' + color='primary' + persistent-hint + hint='Allow users to rate pages.' + ) + v-divider.mt-3 + v-switch( + v-model='featurePersonalWiki' + label='Personal Wikis' + color='primary' + persistent-hint + hint='Allow users to have their own personal wiki.' + ) + v-card-chin + v-spacer + v-btn(color='primary', @click='save') v-icon(left) chevron_right span Save @@ -98,12 +124,23 @@ export default { metaRobotsSelection: ['Index', 'Follow'], metaRobots: ['Index', 'Follow', 'No Index', 'No Follow'], useSquareLogo: false, - displayMascot: true + displayMascot: true, + featurePageRatings: false, + featurePersonalWiki: true } }, computed: { siteTitle: sync('site/title'), company: sync('site/company') + }, + methods: { + async save () { + this.$store.commit('showNotification', { + message: 'Configuration saved successfully.', + style: 'success', + icon: 'check' + }) + } } } diff --git a/client/components/admin/admin-logging.vue b/client/components/admin/admin-logging.vue index 5bc0fc09..73f13ada 100644 --- a/client/components/admin/admin-logging.vue +++ b/client/components/admin/admin-logging.vue @@ -12,7 +12,7 @@ .body-2.grey--text.text--darken-1 Select which logging service to enable: .caption.grey--text.pb-2 Some loggers require additional configuration in their dedicated tab (when selected). v-form - v-checkbox.my-1( + v-checkbox.my-0( v-for='(logger, n) in loggers' v-model='logger.isEnabled' :key='logger.key' diff --git a/client/components/admin/admin-storage.vue b/client/components/admin/admin-storage.vue index d5f566a9..cb6e1232 100644 --- a/client/components/admin/admin-storage.vue +++ b/client/components/admin/admin-storage.vue @@ -12,7 +12,7 @@ .body-2.grey--text.text--darken-1 Select which storage targets to enable: .caption.grey--text.pb-2 Some storage targets require additional configuration in their dedicated tab (when selected). v-form - v-checkbox.my-1( + v-checkbox.my-0( v-for='tgt in targets' v-model='tgt.isEnabled' :key='tgt.key' diff --git a/client/components/admin/admin-utilities.vue b/client/components/admin/admin-utilities.vue index 6b3e811e..260bb5ff 100644 --- a/client/components/admin/admin-utilities.vue +++ b/client/components/admin/admin-utilities.vue @@ -139,8 +139,8 @@