Cleanup asset and dependency includes

2018-09-12 07:32:17 +02:00
parent d85375427d
commit 781108f46a
20 changed files with 54 additions and 49 deletions
@@ -1,32 +1,5 @@
 'use strict';

-// Require images
-require('../images/logo.svg');
-require('../images/logo_wide.svg');
-require('../images/favicon_ep.ico');
-require('../images/at.png');
-require('../images/ch.png');
-require('../images/de.png');
-require('../images/fr.png');
-require('../images/badge_skipass.png');
-
-require('../images/icons/tx_eptheme_gridelements_half_and_two_quarters.png');
-require('../images/icons/tx_eptheme_gridelements_halves.png');
-require('../images/icons/tx_eptheme_gridelements_quarters.png');
-require('../images/icons/tx_eptheme_gridelements_thirds.png');
-require('../images/icons/tx_eptheme_gridelements_two_quarters_and_half.png');
-
-require('../images/logo_boarderweek.svg');
-require('../images/favicon_sbw.ico');
-require('../images/logo_snowzone.svg');
-require('../images/favicon_sz.ico');
-require('../images/logo_uni_champ.svg');
-require('../images/favicon_uch.ico');
-
-require('leaflet/dist/images/marker-icon.png');
-require('leaflet/dist/images/marker-icon-2x.png');
-require('leaflet/dist/images/marker-shadow.png');
-
 // Import dependencies
 import Vue from 'vue'
 import VueSession from 'vue-session'
@@ -45,7 +18,7 @@ require('picturefill');
 require('leaflet');

 // Import components
-import EventBus from './bus'
+import EventBus from './_bus'
 import SearchBar from './components/SearchBar.vue'
 import SearchBox from './components/SearchBox.vue'
 import SearchResult from './components/SearchResult.vue'
@@ -0,0 +1,28 @@
+'use strict';
+
+// Require images
+require('../images/logo.svg');
+require('../images/logo_wide.svg');
+require('../images/favicon_ep.ico');
+require('../images/at.png');
+require('../images/ch.png');
+require('../images/de.png');
+require('../images/fr.png');
+require('../images/badge_skipass.png');
+
+require('../images/icons/tx_eptheme_gridelements_half_and_two_quarters.png');
+require('../images/icons/tx_eptheme_gridelements_halves.png');
+require('../images/icons/tx_eptheme_gridelements_quarters.png');
+require('../images/icons/tx_eptheme_gridelements_thirds.png');
+require('../images/icons/tx_eptheme_gridelements_two_quarters_and_half.png');
+
+require('../images/logo_boarderweek.svg');
+require('../images/favicon_sbw.ico');
+require('../images/logo_snowzone.svg');
+require('../images/favicon_sz.ico');
+require('../images/logo_uni_champ.svg');
+require('../images/favicon_uch.ico');
+
+require('leaflet/dist/images/marker-icon.png');
+require('leaflet/dist/images/marker-icon-2x.png');
+require('leaflet/dist/images/marker-shadow.png');
@@ -1,10 +1,10 @@
 'use strict';

 // Main app
-require('./app');
+require('./_app');

 // Main and vendor styles
-require('./styles');
+require('./_styles');

 // Brand specific styles
 require('../scss/main_boarderweek.scss');
@@ -8,7 +8,7 @@
 </template>
 <script>
    import $ from 'jquery'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
    const $window = $(window);

    export default {
@@ -7,7 +7,7 @@
    </div>
 </template>
 <script>
-    import EventBus from '../bus'
+    import EventBus from '../_bus'

    export default {
        props: [ 'concepts' ],
@@ -1,6 +1,6 @@
 <script>
    import $ from 'jquery'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'

    export default {
        props: {
@@ -102,7 +102,7 @@

 <script>
    import $ from 'jquery'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
    import ServicesIncluded from './ServicesListIncluded.vue'

    export default {
@@ -25,7 +25,7 @@
    import Vue from 'vue'
    import $ from 'jquery'
    import AjaxContent from './AjaxContent.vue'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'

    export default {
        components: {
@@ -104,7 +104,7 @@
    import ServicesIncluded from './ServicesListIncluded.vue'
    import ServicesOptional from './ServicesListOptional.vue'
    import $ from 'jquery'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'

    export default {
        components: {
@@ -1,7 +1,7 @@
 <script>
    import Vue from 'vue'
    import $ from 'jquery'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
    import DatesTable from './DatesTable.vue'
    import PriceTable from './PriceTable.vue'
    import ServicesIncluded from './ServicesListIncluded.vue'
@@ -1,7 +1,7 @@
 <script>
    import Vue from 'vue';
    import $ from 'jquery'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
    import DaterangeSelect from './DaterangeSelect.vue'
    import DestinationCheckboxes from './DestinationCheckboxes.vue'
    import DestinationAutocomplete from './DestinationAutocomplete.vue'
@@ -17,7 +17,7 @@
    import dayjs from 'dayjs'
    import 'dayjs/locale/de'

-    import defaultFilterSettings from '../filtersettings'
+    import defaultFilterSettings from '../_filtersettings'

    export default {
        components: {
@@ -22,7 +22,7 @@

 <script>
    import Vue from 'vue'
-    import EventBus from '../bus'
+    import EventBus from '../_bus'
    import SearchResultItem from './SearchResultItem.vue'

    export default {
@@ -9,7 +9,7 @@
 </template>

 <script>
-    import EventBus from '../bus'
+    import EventBus from '../_bus'

    export default {
        props: {
@@ -1,10 +1,13 @@
 'use strict';

 // Main app
-require('./app');
+require('./_app');

 // Main and vendor styles
-require('./styles');
+require('./_styles');

-// Brand specific styles
+// Main and vendor images
+require('./_images');
+
+// Main styles
 require('../scss/main.scss');
@@ -1,10 +1,10 @@
 'use strict';

 // Main app
-require('./app');
+require('./_app');

 // Main and vendor styles
-require('./styles');
+require('./_styles');

 // Brand specific styles
 require('../scss/main_snowzone.scss');
@@ -1,10 +1,10 @@
 'use strict';

 // Main app
-require('./app');
+require('./_app');

 // Main and vendor styles
-require('./styles');
+require('./_styles');

 // Brand specific styles
 require('../scss/main_unichamp.scss');
@@ -11,7 +11,8 @@ Encore
    .addEntry('unichamp', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js')
    .addStyleEntry('rte', './web/typo3conf/ext/ep_theme/Resources/Private/Assets/css/rte.css')
    .createSharedEntry('vendor', [
-        'jquery', 'vue', 'bootstrap-sass/assets/javascripts/bootstrap', 'slick-carousel',
+        'jquery', 'vue', 'vue-session', '@fengyuanchen/datepicker', 'jquery-lazy',
+        'bootstrap-sass/assets/javascripts/bootstrap', 'slick-carousel',
        'dayjs', 'cookieconsent', 'picturefill', '@fancyapps/fancybox', 'leaflet'
    ])
    .enableSassLoader()