From 6e8222dcd9a2b3762dc0806aa72625a0ece5d426 Mon Sep 17 00:00:00 2001
From: Jeroen De Meerleer <me@jeroened.be>
Date: Mon, 2 Aug 2021 13:57:20 +0200
Subject: [PATCH] ENHANCEMENT: All assets are now in /assets

---
 {public => assets}/images/ajax-loader.gif | Bin
 templates/job/index.html.twig             |   1 -
 webpack.config.js                         |  15 +++++----------
 3 files changed, 5 insertions(+), 11 deletions(-)
 rename {public => assets}/images/ajax-loader.gif (100%)

diff --git a/public/images/ajax-loader.gif b/assets/images/ajax-loader.gif
similarity index 100%
rename from public/images/ajax-loader.gif
rename to assets/images/ajax-loader.gif
diff --git a/templates/job/index.html.twig b/templates/job/index.html.twig
index d34e8c4..ee4ae7a 100644
--- a/templates/job/index.html.twig
+++ b/templates/job/index.html.twig
@@ -53,7 +53,6 @@
 {% block extrahtml %}
 <div class="runnow-overlay d-none">
     <div class="runnow-content">
-        <img src="/images/ajax-loader.gif" alt="loading">
     </div>
     <div class="runnow-blur"></div>
 </div>
diff --git a/webpack.config.js b/webpack.config.js
index 94edbc0..bd22f80 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -23,10 +23,10 @@ Encore
      * Each entry will result in one JavaScript file (e.g. app.js)
      * and one CSS file (e.g. app.css) if your JavaScript imports CSS.
      */
-    .addEntry('security.login', ['./assets/security/login.js', './assets/security/login.scss'])
-    .addEntry('job.index', ['./assets/job/index.js', './assets/job/index.scss'])
-    .addEntry('job.view', ['./assets/job/view.js', './assets/job/view.scss'])
-    .addEntry('job.add', ['./assets/job/add.js', './assets/job/add.scss'])
+    .addEntry('security.login', ['./assets/js/security/login.js', './assets/scss/security/login.scss'])
+    .addEntry('job.index', ['./assets/js/job/index.js', './assets/scss/job/index.scss'])
+    .addEntry('job.view', ['./assets/js/job/view.js', './assets/scss/job/view.scss'])
+    .addEntry('job.add', ['./assets/js/job/add.js', './assets/scss/job/add.scss'])
     //.addEntry('page1', './assets/page1.js')
     //.addEntry('page2', './assets/page2.js')
 
@@ -67,12 +67,7 @@ Encore
     //.enableReactPreset()
     //.addEntry('admin', './assets/admin.js')
 
-    .autoProvideVariables({
-        $: 'jquery',
-        jQuery: 'jquery',
-        'window.jQuery': 'jquery',
-        moment: 'moment'
-    })
+    //.autoProvideVariables({ })
 ;
 
 module.exports = Encore.getWebpackConfig();