From f075c266efe13449f1f80c9ad359ff5001a5f34d Mon Sep 17 00:00:00 2001 From: NGPixel Date: Thu, 25 May 2017 20:54:03 -0400 Subject: [PATCH] refactor: vuex re-org + modal-create-page --- client/js/app.js | 10 ++ client/js/components/modal-create-page.vue | 27 ++-- client/js/components/modal-create-user.vue | 6 +- client/js/components/page-loader.js | 6 +- client/js/components/search.vue | 3 +- client/js/components/tree.vue | 14 +- client/js/helpers/index.js | 8 + client/js/store/modules/modal-create-page.js | 12 +- client/js/store/modules/modal-create-user.js | 5 +- fuse.js | 56 +++---- package.json | 4 +- server/views/auth/login.pug | 2 +- server/views/error-forbidden.pug | 2 +- server/views/error-notexist.pug | 2 +- server/views/error.pug | 2 +- server/views/layout.pug | 2 +- server/views/pages/admin/users.pug | 4 +- server/views/pages/view.pug | 6 +- yarn.lock | 146 +++++++++++++------ 19 files changed, 201 insertions(+), 116 deletions(-) create mode 100644 client/js/helpers/index.js diff --git a/client/js/app.js b/client/js/app.js index 74c307c8..516a8d96 100644 --- a/client/js/app.js +++ b/client/js/app.js @@ -4,9 +4,11 @@ /* eslint-disable no-new */ import $ from 'jquery' +import _ from 'lodash' import Vue from 'vue' import VueResource from 'vue-resource' import VueClipboards from 'vue-clipboards' +import VueLodash from 'vue-lodash' import store from './store' import io from 'socket-io-client' import i18next from 'i18next' @@ -15,6 +17,12 @@ import VueI18Next from '@panter/vue-i18next' import 'jquery-smooth-scroll' import 'jquery-sticky' +// ==================================== +// Load Helpers +// ==================================== + +import helpers from './helpers' + // ==================================== // Load Vue Components // ==================================== @@ -40,6 +48,7 @@ import sourceViewComponent from './pages/source-view.component.js' Vue.use(VueResource) Vue.use(VueClipboards) Vue.use(VueI18Next) +Vue.use(VueLodash, _) i18next .use(i18nextXHR) @@ -78,6 +87,7 @@ $(() => { const i18n = new VueI18Next(i18next) new Vue({ + mixins: [helpers], components: { alert: alertComponent, adminProfile: adminProfileComponent, diff --git a/client/js/components/modal-create-page.vue b/client/js/components/modal-create-page.vue index 0a52e5bc..b7701933 100644 --- a/client/js/components/modal-create-page.vue +++ b/client/js/components/modal-create-page.vue @@ -1,12 +1,12 @@ diff --git a/client/js/components/modal-create-user.vue b/client/js/components/modal-create-user.vue index 73b30142..23c98d08 100644 --- a/client/js/components/modal-create-user.vue +++ b/client/js/components/modal-create-user.vue @@ -36,7 +36,7 @@