reorganize assets in others bundles

src/Bundle/ChillActivityBundle/Resources/public/chill/index.js

@@ -0,0 +1 @@
+require('./chillactivity.scss');

src/Bundle/ChillActivityBundle/Resources/public/index.js

@@ -1 +0,0 @@
-require('./scss/chillactivity.scss');

src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig

@@ -15,7 +15,7 @@
 
 {% block js %}
     {{ parent() }}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', 
@@ -28,6 +28,6 @@
 
 {% block css %}
     {{ parent() }}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/editPerson.html.twig

@@ -30,7 +30,7 @@
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingModifiedForm('form[name="{{ edit_form.vars.form.vars.name }}"]', 
@@ -42,6 +42,6 @@
 {% endblock %}
 
 {% block css %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/newAccompanyingCourse.html.twig

@@ -15,7 +15,7 @@
 
 {% block js %}
     {{ parent() }}
-    {{ encore_entry_script_tags('async_upload') }}
+    {{ encore_entry_script_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]',
@@ -28,6 +28,6 @@
 
 {% block css %}
     {{ parent() }}
-    <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/newPerson.html.twig

@@ -14,7 +14,7 @@
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     <script type="text/javascript">
         window.addEventListener('DOMContentLoaded', function (e) {
             chill.displayAlertWhenLeavingUnsubmittedForm('form[name="{{ form.vars.form.vars.name }}"]', 
@@ -26,6 +26,6 @@
 {% endblock %}
 
 {% block css %}
-    {{ encore_entry_link_tags('async_upload') }}
+    {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/chill.webpack.config.js

@@ -1,10 +1,11 @@
 // this file loads all assets from the Chill person bundle
-module.exports = function(encore, entries) {
-    entries.push(__dirname + '/Resources/public/index.js');
-    
+module.exports = function(encore, entries)
+{
+    entries.push(__dirname + '/Resources/public/chill/index.js');
+
     encore.addAliases({
         ChillActivityAssets: __dirname + '/Resources/public'
     });
-    
+
     encore.addEntry('vue_activity', __dirname + '/Resources/public/vuejs/Activity/index.js');
 };

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/edit.html.twig

@@ -22,11 +22,11 @@
 {% block title %}{{ 'Editing document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 {% block personcontent %}
     <h1>{{ 'Edit Document' | trans }}</h1>
-    
+
     {{ form_errors(form) }}
 
     {{ form_start(form) }}
-    
+
     {{ form_row(form.title) }}
     {{ form_row(form.date) }}
     {{ form_row(form.category) }}
@@ -49,16 +49,16 @@
             </li>
         {% endif %} #}
     </ul>
-        
+
     {{ form_end(form) }}
 
 
 {% endblock %}
 
 {% block js %}
-    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+    {{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block css %}
-    <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
+    {{ encore_entry_link_tags('mod_async_upload') }}
 {% endblock %}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/index.html.twig

@@ -24,7 +24,7 @@
 {% block title %}{{ 'Documents for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 
 {% block js %}
-    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+    {{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block personcontent %}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/new.html.twig

@@ -22,11 +22,11 @@
 
 {% block personcontent %}
     <h1>{{ 'New document for %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}</h1>
-    
+
     {{ form_errors(form) }}
 
     {{ form_start(form) }}
-    
+
     {{ form_row(form.title) }}
     {{ form_row(form.date) }}
     {{ form_row(form.category) }}
@@ -48,9 +48,9 @@
 {% endblock %}
 
 {% block js %}
-    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+    {{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block css %}
-    <link rel="stylesheet" href="{{ asset('build/async_upload.css') }}"/>
+    {{ encore_entry_link_tags('mod_async_upload') }}
 {% endblock %}

src/Bundle/ChillDocStoreBundle/Resources/views/PersonDocument/show.html.twig

@@ -23,19 +23,19 @@
 {% block title %}{{ 'Detail of document of %name%'|trans({ '%name%': person|chill_entity_render_string } ) }}{% endblock %}
 
 {% block js %}
-    <script src="{{ asset('build/async_upload.js') }}" type="text/javascript"></script>
+    {{ encore_entry_script_tags('mod_async_upload') }}
 {% endblock %}
 
 {% block personcontent %}
     <h1>{{ 'Document %title%' | trans({ '%title%': document.title }) }}</h1>
-    
+
     <dl class="chill_view_data">
         <dt>{{ 'Title'|trans }}</dt>
         <dd>{{ document.title }}</dd>
-        
+
         <dt>{{ 'Scope' | trans }}</dt>
         <dd>{{ document.scope.name | localize_translatable_string }}</dd>
-        
+
         <dt>{{ 'Category'|trans }}</dt>
         <dd>{{ document.category.name|localize_translatable_string }}</dd>
 
@@ -58,7 +58,7 @@
                 {{ 'Back to the list' | trans }}
             </a>
         </li>
-        
+
         <li>
             {{ m.download_button(document.object, document.title) }}
         </li>

src/Bundle/ChillDocStoreBundle/chill.webpack.config.js

@@ -1,3 +1,4 @@
-module.exports = function(encore) {
-    encore.addEntry('async_upload', __dirname + '/Resources/public/module/async_upload/index.js');
+module.exports = function(encore)
+{
+    encore.addEntry('mod_async_upload', __dirname + '/Resources/public/module/async_upload/index.js');
 };

src/Bundle/ChillEventBundle/Resources/public/chill/index.js

@@ -0,0 +1 @@
+require('./chillevent.scss');

src/Bundle/ChillEventBundle/Resources/public/index.js

@@ -1 +0,0 @@
-require('./css/chillevent.css');

src/Bundle/ChillEventBundle/chill.webpack.config.js

@@ -1,4 +1,4 @@
-// this file loads all assets from the Chill Event Bundle
-module.exports = function(encore, entries) {
-    entries.push(__dirname + '/Resources/public/index.js');
-};
+module.exports = function(encore, entries)
+{
+    entries.push(__dirname + '/Resources/public/chill/index.js');
+};

src/Bundle/ChillTaskBundle/Resources/public/chill/chilltask.scss

@@ -1,8 +1,5 @@
 @import '~ChillMainAssets/module/bootstrap/bootstrap';
 
-@import "_task-statuses.scss";
-@import "_task-list.scss";
-
 div#single_task_warningInterval {
     display: flex;
     flex-direction: row;
@@ -49,22 +46,22 @@ div#single_task_warningInterval {
 .btn-task-exchange::before {
     @extend .btn-task;
     width: 10px;
-    content: url(../svg/exchange-alt.svg);
+    content: url('./svg/exchange-alt.svg');
 }
 
 .btn-task-start::before {
     @extend .btn-task;
-    content: url(../svg/play.svg);
+    content: url('./svg/play.svg');
 }
 
 .btn-task-cancel::before {
     @extend .btn-task;
-    content: url(../svg/archive.svg);
+    content: url('./svg/archive.svg');
 }
 
 .btn-task-close::before {
     @extend .btn-task;
-    content: url(../svg/check.svg);
+    content: url('./svg/check.svg');
 }
 
 .btn-dropdown {

src/Bundle/ChillTaskBundle/Resources/public/chill/index.js

@@ -0,0 +1,5 @@
+require('./scss/_task-statuses.scss');
+require('./scss/_task-list.scss');
+
+require('./chilltask.scss');
+

src/Bundle/ChillTaskBundle/Resources/public/index.js

@@ -1,3 +0,0 @@
-// this file loads all assets from the Chill task bundle
-require('./sass/_task.scss');
-

src/Bundle/ChillTaskBundle/chill.webpack.config.js

@@ -1,3 +1,4 @@
-module.exports = function(encore, entries) {
-    entries.push(__dirname + '/Resources/public/index.js');
-};
+module.exports = function(encore, entries)
+{
+    entries.push(__dirname + '/Resources/public/chill/index.js');
+};

src/Bundle/ChillThirdPartyBundle/Resources/public/chill/index.js

@@ -0,0 +1,2 @@
+require('./thirdparty.scss');
+

src/Bundle/ChillThirdPartyBundle/Resources/public/index.js

@@ -1,3 +0,0 @@
-// sass/css
-require('./sass/thirdparty.scss');
-

src/Bundle/ChillThirdPartyBundle/chill.webpack.config.js

@@ -1,3 +1,4 @@
-module.exports = function(encore, entries) {
-    entries.push(__dirname + '/Resources/public/index.js');
+module.exports = function(encore, entries)
+{
+    entries.push(__dirname + '/Resources/public/chill/index.js');
 };