From 968e6914b27c0af55c3654e11eb0b2c0fc4033d1 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Thu, 27 May 2021 13:29:01 +0200
Subject: [PATCH] add new webpack vue entrypoint for activity

+ rename existing activity.scss
+ rename webpack vue accompanyingCourse entrypoint
---
 src/Bundle/ChillActivityBundle/Resources/public/index.js    | 2 +-
 .../{activity/activity.scss => scss/chillactivity.scss}     | 0
 .../Resources/public/vuejs/Activity/index.js                | 0
 src/Bundle/ChillActivityBundle/chill.webpack.config.js      | 6 ++++++
 .../Resources/views/AccompanyingCourse/edit.html.twig       | 2 +-
 .../Resources/views/AccompanyingCourse/layout.html.twig     | 4 ++--
 src/Bundle/ChillPersonBundle/chill.webpack.config.js        | 2 +-
 7 files changed, 11 insertions(+), 5 deletions(-)
 rename src/Bundle/ChillActivityBundle/Resources/public/{activity/activity.scss => scss/chillactivity.scss} (100%)
 create mode 100644 src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/index.js b/src/Bundle/ChillActivityBundle/Resources/public/index.js
index 74b2a8646..e219e368b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/index.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/index.js
@@ -1 +1 @@
-require('./activity/activity.scss');
+require('./scss/chillactivity.scss');
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/activity/activity.scss b/src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss
similarity index 100%
rename from src/Bundle/ChillActivityBundle/Resources/public/activity/activity.scss
rename to src/Bundle/ChillActivityBundle/Resources/public/scss/chillactivity.scss
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/Bundle/ChillActivityBundle/chill.webpack.config.js b/src/Bundle/ChillActivityBundle/chill.webpack.config.js
index 724184f63..d40ae2d4a 100644
--- a/src/Bundle/ChillActivityBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillActivityBundle/chill.webpack.config.js
@@ -1,4 +1,10 @@
 // this file loads all assets from the Chill person bundle
 module.exports = function(encore, entries) {
     entries.push(__dirname + '/Resources/public/index.js');
+    
+    encore.addAliases({
+        ChillActivityAssets: __dirname + '/Resources/public'
+    });
+    
+    encore.addEntry('vue_activity', __dirname + '/Resources/public/vuejs/Activity/index.js');
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig
index 6aa978149..65edd5155 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/edit.html.twig
@@ -15,5 +15,5 @@
       window.accompanyingCourseId = {{ accompanyingCourse.id|e('js') }};
       window.vueRootComponent = 'app';
    </script>
-   {{ encore_entry_script_tags('accompanying_course') }}
+   {{ encore_entry_script_tags('vue_accourse') }}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig
index 0bab5d893..58591a618 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/layout.html.twig
@@ -16,7 +16,7 @@
 {% endblock %}
 
 {% block css %}
-    {{ encore_entry_link_tags('accompanying_course') }}
+    {{ encore_entry_link_tags('vue_accourse') }}
 {% endblock %}
 
 {% block js %}
@@ -24,5 +24,5 @@
        window.accompanyingCourseId = {{ accompanyingCourse.id|e('js') }};
        window.vueRootComponent = 'banner';
     </script>
-    {{ encore_entry_script_tags('accompanying_course') }}
+    {{ encore_entry_script_tags('vue_accourse') }}
 {% endblock %}
diff --git a/src/Bundle/ChillPersonBundle/chill.webpack.config.js b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
index 53aed5d91..f1fd189c7 100644
--- a/src/Bundle/ChillPersonBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillPersonBundle/chill.webpack.config.js
@@ -8,5 +8,5 @@ module.exports = function(encore, entries)
         ChillPersonAssets: __dirname + '/Resources/public'
     });
     
-    encore.addEntry('accompanying_course', __dirname + '/Resources/public/vuejs/AccompanyingCourse/index.js');
+    encore.addEntry('vue_accourse', __dirname + '/Resources/public/vuejs/AccompanyingCourse/index.js');
 };