Merge branch 'feature/GD-1338' into develop

firespring · Feb 7, 2019 · 39a22ff · 39a22ff
2 parents c48fef6 + f9756c4
commit 39a22ff
Show file tree

Hide file tree

Showing 28 changed files with 2,116 additions and 1,906 deletions.
diff --git a/packages/frontend/package-lock.json b/packages/frontend/package-lock.json
diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -65,7 +65,6 @@
 		"vue-slider-component": "^2.3.9",
 		"vue-social-sharing": "^2.3.3",
 		"vue-template-compiler": "^2.5.17",
-		"vueckeditor": "^0.1.4",
 		"vuedraggable": "^2.14.1",
 		"vuex": "^2.4.1",
 		"vuex-persistedstate": "^2.0.0",

diff --git a/packages/frontend/src/admin-pages/app.js b/packages/frontend/src/admin-pages/app.js
@@ -18,9 +18,9 @@ import * as VueMoney from 'v-money';
 import AlertCloseDirective from './directives/alertClose';
 import AutoFocusDirective from './directives/autoFocus';
 import axios from 'axios';
+import bootstrapCkeditor from './bootstrap/ckeditor';
 import ComponentApiError from './components/errors/ApiError.vue';
 import ComponentApp from './components/App.vue';
-import ComponentCKEditor from 'vueckeditor';
 import ComponentGravatar from 'vue-gravatar';
 import ComponentNavigation from './components/header/Navigation.vue';
 import EventBusMixin from './mixins/eventBus';
@@ -57,7 +57,9 @@ Vue.directive('shave', ShaveDirective);
 Vue.component('api-error', ComponentApiError);
 Vue.component('navigation', ComponentNavigation);
 Vue.component('v-gravatar', ComponentGravatar);
-Vue.component('vue-ckeditor', ComponentCKEditor);
+
+// Bootstrap libs
+bootstrapCkeditor();
 
 // Register vue global
 Vue.prototype.user = {};