From d85375427dfe63072666aea82e4866b1ead8a71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <mail@bjo3rn.com>
Date: Wed, 12 Sep 2018 07:07:42 +0200
Subject: [PATCH] Include missed assets, simplify inclusion of dependencies

---
 .../ext/ep_theme/Resources/Private/Assets/js/app.js    |  4 ++++
 .../Resources/Private/Assets/js/boarderweek.js         |  9 +++++----
 .../ext/ep_theme/Resources/Private/Assets/js/main.js   | 10 +++++-----
 .../ep_theme/Resources/Private/Assets/js/snowzone.js   |  9 +++++----
 .../ext/ep_theme/Resources/Private/Assets/js/styles.js |  7 +++++++
 .../ep_theme/Resources/Private/Assets/js/unichamp.js   |  9 +++++----
 6 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/styles.js

diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/app.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/app.js
index 8d6178c6..90a39ca2 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/app.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/app.js
@@ -23,6 +23,10 @@ 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'
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/boarderweek.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/boarderweek.js
index 2530bf7e..80df43af 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/boarderweek.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/boarderweek.js
@@ -1,9 +1,10 @@
 'use strict';
 
+// Main app
 require('./app');
 
-require('font-awesome/css/font-awesome.min.css');
-require('cookieconsent/build/cookieconsent.min.css');
-require('@fancyapps/fancybox/dist/jquery.fancybox.min.css');
-require('slick-carousel/slick/slick.css');
+// Main and vendor styles
+require('./styles');
+
+// Brand specific styles
 require('../scss/main_boarderweek.scss');
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/main.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/main.js
index d9d0b674..5748f858 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/main.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/main.js
@@ -1,10 +1,10 @@
 'use strict';
 
+// Main app
 require('./app');
 
-require('font-awesome/css/font-awesome.min.css');
-require('cookieconsent/build/cookieconsent.min.css');
-require('@fancyapps/fancybox/dist/jquery.fancybox.min.css');
-require('slick-carousel/slick/slick.css');
-require('leaflet/dist/leaflet.css');
+// Main and vendor styles
+require('./styles');
+
+// Brand specific styles
 require('../scss/main.scss');
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js
index c63281d2..47ad8f7b 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/snowzone.js
@@ -1,9 +1,10 @@
 'use strict';
 
+// Main app
 require('./app');
 
-require('font-awesome/css/font-awesome.min.css');
-require('cookieconsent/build/cookieconsent.min.css');
-require('@fancyapps/fancybox/dist/jquery.fancybox.min.css');
-require('slick-carousel/slick/slick.css');
+// Main and vendor styles
+require('./styles');
+
+// Brand specific styles
 require('../scss/main_snowzone.scss');
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/styles.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/styles.js
new file mode 100644
index 00000000..1ccc7ee0
--- /dev/null
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/styles.js
@@ -0,0 +1,7 @@
+'use strict';
+
+require('font-awesome/css/font-awesome.min.css');
+require('cookieconsent/build/cookieconsent.min.css');
+require('@fancyapps/fancybox/dist/jquery.fancybox.min.css');
+require('slick-carousel/slick/slick.css');
+require('leaflet/dist/leaflet.css');
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js
index ddefe06b..d764b6cb 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/unichamp.js
@@ -1,9 +1,10 @@
 'use strict';
 
+// Main app
 require('./app');
 
-require('font-awesome/css/font-awesome.min.css');
-require('cookieconsent/build/cookieconsent.min.css');
-require('@fancyapps/fancybox/dist/jquery.fancybox.min.css');
-require('slick-carousel/slick/slick.css');
+// Main and vendor styles
+require('./styles');
+
+// Brand specific styles
 require('../scss/main_unichamp.scss');