Skip to content

Commit

Permalink
Move directories out of assets subdirectory
Browse files Browse the repository at this point in the history
  • Loading branch information
mikemand committed Oct 28, 2019
1 parent acb9a8e commit cb03106
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
4 changes: 0 additions & 4 deletions resources/assets/js/mixins.js

This file was deleted.

8 changes: 4 additions & 4 deletions resources/assets/js/app.js → resources/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import ElementUI from 'element-ui';
import VueEvents from 'vue-events';
import locale from 'element-ui/lib/locale/lang/en';
import VueSimplemde from 'vue-simplemde';
import PageRoutes from '../../../Modules/Page/Assets/js/PageRoutes';
import MediaRoutes from '../../../Modules/Media/Assets/js/MediaRoutes';
import UserRoutes from '../../../Modules/User/Assets/js/UserRoutes';
import PageRoutes from '../../Modules/Page/Assets/js/PageRoutes';
import MediaRoutes from '../../Modules/Media/Assets/js/MediaRoutes';
import UserRoutes from '../../Modules/User/Assets/js/UserRoutes';

Vue.use(ElementUI, { locale });
Vue.use(VueI18n);
Expand All @@ -21,7 +21,7 @@ Vue.use(VueEvents);
Vue.use(VueSimplemde);
require('./mixins');

Vue.component('ckeditor', require('../../../Modules/Core/Assets/js/components/CkEditor.vue').default);
Vue.component('ckeditor', require('../../Modules/Core/Assets/js/components/CkEditor.vue').default);

const { currentLocale, adminPrefix } = window.AsgardCMS;

Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 4 additions & 0 deletions resources/js/mixins.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import Vue from 'vue';
import TranslationHelper from '../../Modules/Core/Assets/js/mixins/TranslationHelper';

Vue.mixin(TranslationHelper);
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions webpack.mix.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ if (mix.inProduction()) {
|
*/

mix.js('resources/assets/js/app.js', 'public/js')
mix.js('resources/js/app.js', 'public/js')
.extract()
.sass('resources/assets/sass/app.scss', 'public/css');
.sass('resources/sass/app.scss', 'public/css');

0 comments on commit cb03106

Please sign in to comment.