From ab5f8dc01dc18fa7a35f2102ffd80e5afef24254 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Mon, 15 May 2023 00:34:21 -0500
Subject: [PATCH] Internal: Include Twig helpers for Encore resources

---
 assets/js/exercise.js                         | 11 --------
 assets/js/{ => legacy}/annotation.js          |  0
 assets/js/{ => legacy}/app.js                 |  0
 assets/js/{ => legacy}/document.js            |  2 +-
 assets/js/legacy/exercise.js                  | 11 ++++++++
 assets/js/{ => legacy}/free-jqgrid.js         |  0
 assets/js/{ => legacy}/lp.js                  |  0
 assets/js/{ => legacy}/main.js                |  0
 assets/js/{ => legacy}/vendor.js              |  4 +--
 public/documentation/changelog.html           |  5 ++--
 public/main/install/index.php                 | 25 ++++++++++---------
 .../Resources/views/Editor/custom.html.twig   |  1 +
 .../Resources/views/Editor/elfinder.html.twig |  2 ++
 .../Resources/views/Index/vue.html.twig       |  1 -
 .../views/Layout/base-layout.html.twig        |  2 ++
 .../Resources/views/Layout/blank.html.twig    |  1 +
 .../Resources/views/Layout/document.html.twig |  2 +-
 .../Resources/views/Layout/foot.html.twig     |  1 +
 .../Resources/views/Layout/head.html.twig     |  9 +++----
 .../views/Layout/layout_one_col.html.twig     |  9 -------
 webpack.config.js                             | 13 +++++-----
 21 files changed, 49 insertions(+), 50 deletions(-)
 delete mode 100644 assets/js/exercise.js
 rename assets/js/{ => legacy}/annotation.js (100%)
 rename assets/js/{ => legacy}/app.js (100%)
 rename assets/js/{ => legacy}/document.js (75%)
 create mode 100644 assets/js/legacy/exercise.js
 rename assets/js/{ => legacy}/free-jqgrid.js (100%)
 rename assets/js/{ => legacy}/lp.js (100%)
 rename assets/js/{ => legacy}/main.js (100%)
 rename assets/js/{ => legacy}/vendor.js (91%)
 create mode 100644 src/CoreBundle/Resources/views/Layout/foot.html.twig

diff --git a/assets/js/exercise.js b/assets/js/exercise.js
deleted file mode 100644
index c0f9ac58b2..0000000000
--- a/assets/js/exercise.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Script to be added in the exercises tool.
-import 'jsplumb';
-import 'jquery-ui-touch-punch';
-// import 'xcolor/jquery.xcolor.js';
-import 'signature_pad';
-import '../../public/main/inc/lib/javascript/epiclock/javascript/jquery.dateformat.min.js';
-import '../../public/main/inc/lib/javascript/epiclock/javascript/jquery.epiclock.js';
-import '../../public/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.js';
-import './annotation'
-import '../../public/main/inc/lib/javascript/hotspot/js/hotspot.js';
-import '../../public/main/inc/lib/javascript/d3/jquery.xcolor.js';
diff --git a/assets/js/annotation.js b/assets/js/legacy/annotation.js
similarity index 100%
rename from assets/js/annotation.js
rename to assets/js/legacy/annotation.js
diff --git a/assets/js/app.js b/assets/js/legacy/app.js
similarity index 100%
rename from assets/js/app.js
rename to assets/js/legacy/app.js
diff --git a/assets/js/document.js b/assets/js/legacy/document.js
similarity index 75%
rename from assets/js/document.js
rename to assets/js/legacy/document.js
index b933e12677..3894132d94 100644
--- a/assets/js/document.js
+++ b/assets/js/legacy/document.js
@@ -1,6 +1,6 @@
 /** This JS  will be included when loading an HTML in the Document tool */
 
-import translateHtml from './translatehtml.js';
+import translateHtml from './../translatehtml.js';
 document.addEventListener('DOMContentLoaded', function () {
   translateHtml();
 });
diff --git a/assets/js/legacy/exercise.js b/assets/js/legacy/exercise.js
new file mode 100644
index 0000000000..357a7c792a
--- /dev/null
+++ b/assets/js/legacy/exercise.js
@@ -0,0 +1,11 @@
+// Script to be added in the exercises tool.
+import 'jsplumb';
+import 'jquery-ui-touch-punch';
+// import 'xcolor/jquery.xcolor.js';
+import 'signature_pad';
+import '../../../public/main/inc/lib/javascript/epiclock/javascript/jquery.dateformat.min.js';
+import '../../../public/main/inc/lib/javascript/epiclock/javascript/jquery.epiclock.js';
+import '../../../public/main/inc/lib/javascript/epiclock/renderers/minute/epiclock.minute.js';
+import './annotation'
+import '../../../public/main/inc/lib/javascript/hotspot/js/hotspot.js';
+import '../../../public/main/inc/lib/javascript/d3/jquery.xcolor.js';
diff --git a/assets/js/free-jqgrid.js b/assets/js/legacy/free-jqgrid.js
similarity index 100%
rename from assets/js/free-jqgrid.js
rename to assets/js/legacy/free-jqgrid.js
diff --git a/assets/js/lp.js b/assets/js/legacy/lp.js
similarity index 100%
rename from assets/js/lp.js
rename to assets/js/legacy/lp.js
diff --git a/assets/js/main.js b/assets/js/legacy/main.js
similarity index 100%
rename from assets/js/main.js
rename to assets/js/legacy/main.js
diff --git a/assets/js/vendor.js b/assets/js/legacy/vendor.js
similarity index 91%
rename from assets/js/vendor.js
rename to assets/js/legacy/vendor.js
index f27f06e044..6cfeeea1d1 100644
--- a/assets/js/vendor.js
+++ b/assets/js/legacy/vendor.js
@@ -21,8 +21,8 @@ global.textcomplete = textcomplete;
 
 require('chart.js');
 require('./annotation.js');
-require('./editor.js');
-import translateHtml from './translatehtml.js';
+require('../editor.js');
+import translateHtml from '../translatehtml.js';
 document.addEventListener('DOMContentLoaded', function () {
   translateHtml();
 });
diff --git a/public/documentation/changelog.html b/public/documentation/changelog.html
index e6612713ed..bb4af911c4 100644
--- a/public/documentation/changelog.html
+++ b/public/documentation/changelog.html
@@ -3,11 +3,12 @@
 <head>
     <meta charset="utf-8" />
     <title>Chamilo Changelog</title>
-    <link rel="stylesheet" href="../build/css/app.css" type="text/css" media="screen,projection" />
+    <link rel="stylesheet" href="../build/legacy_app.css" type="text/css" media="screen,projection" />
+    <link rel="stylesheet" href="../build/app.css" type="text/css" media="screen,projection" />
     <link rel="stylesheet" href="../build/css/themes/chamilo/default.css" type="text/css" media="screen,projection" />
     <link rel="stylesheet" href="default.css" type="text/css" media="screen,projection" />
     <link rel="stylesheet" href="../build/css/print.css" type="text/css" media="print" />
-    <script src="../build/app.js"></script>
+    <script src="../build/legacy_app.js"></script>
 </head>
 <body>
 <nav class="navbar navbar-default navbar-fixed-top">
diff --git a/public/main/install/index.php b/public/main/install/index.php
index de81c08b2f..6b4737ac3f 100644
--- a/public/main/install/index.php
+++ b/public/main/install/index.php
@@ -643,10 +643,10 @@ $installerData = [
     'langIso' => api_get_language_isocode(),
 
     'formAction' => api_get_self().'?'.http_build_query([
-        'running' => 1,
-        'installType' => $installType,
-        'updateFromConfigFile' => $updateFromConfigFile,
-    ]),
+            'running' => 1,
+            'installType' => $installType,
+            'updateFromConfigFile' => $updateFromConfigFile,
+        ]),
 
     'updatePath' => !$badUpdatePath ? api_htmlentities($proposedUpdatePath, ENT_QUOTES) : '',
     'urlAppendPath' => api_htmlentities($urlAppendPath, ENT_QUOTES),
@@ -691,16 +691,17 @@ $installerData = [
     </title>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <link rel="stylesheet" href="../../build/legacy_app.css">
+    <link rel="stylesheet" href="../../build/app.css">
     <link rel="stylesheet" href="../../build/vue.css">
-    <link rel="stylesheet" href="../../build/css/app.css">
-    <script type="text/javascript" src="../../../build/runtime.js"></script>
-    <script type="text/javascript" src="../../../build/app.js"></script>
+    <script type="text/javascript" src="../../build/legacy_app.js"></script>
 </head>
 <body class="flex min-h-screen p-2 md:px-16 md:py-8 xl:px-32 xl:py-16 bg-gradient-to-br from-primary to-primary-gradient">
-    <div id="app" class="m-auto"></div>
-    <script>
-    var installerData = <?php echo json_encode($installerData) ?>;
-    </script>
-    <script type="text/javascript" src="../../../build/vue_installer.js"></script>
+<div id="app" class="m-auto"></div>
+<script>
+  var installerData = <?php echo json_encode($installerData) ?>;
+</script>
+<script type="text/javascript" src="../../build/runtime.js"></script>
+<script type="text/javascript" src="../../build/vue_installer.js"></script>
 </body>
 </html>
diff --git a/src/CoreBundle/Resources/views/Editor/custom.html.twig b/src/CoreBundle/Resources/views/Editor/custom.html.twig
index 99118a4068..e3db194bb7 100644
--- a/src/CoreBundle/Resources/views/Editor/custom.html.twig
+++ b/src/CoreBundle/Resources/views/Editor/custom.html.twig
@@ -56,5 +56,6 @@
 {% endif %}
 {% endautoescape %}
 
+{% include "@ChamiloCore/Layout/foot.html.twig" %}
 </body>
 </html>
diff --git a/src/CoreBundle/Resources/views/Editor/elfinder.html.twig b/src/CoreBundle/Resources/views/Editor/elfinder.html.twig
index e2235cdc37..05820e6237 100644
--- a/src/CoreBundle/Resources/views/Editor/elfinder.html.twig
+++ b/src/CoreBundle/Resources/views/Editor/elfinder.html.twig
@@ -3,3 +3,5 @@
 {% block chamilo_wrap %}
     {% include '@ChamiloCore/Editor/elfinder_standalone.html.twig' %}
 {% endblock %}
+
+{% include "@ChamiloCore/Layout/foot.html.twig" %}
\ No newline at end of file
diff --git a/src/CoreBundle/Resources/views/Index/vue.html.twig b/src/CoreBundle/Resources/views/Index/vue.html.twig
index 4a30b4bd16..9c42212e64 100644
--- a/src/CoreBundle/Resources/views/Index/vue.html.twig
+++ b/src/CoreBundle/Resources/views/Index/vue.html.twig
@@ -3,5 +3,4 @@
 {%- block content %}
     {% include '@ChamiloCore/Layout/vue_setup.html.twig' %}
     {#    {{ encore_entry_script_tags('vue') }}#}
-    <script src="{{ url('index') ~ 'build/vue.js' }}"></script>
 {% endblock %}
\ No newline at end of file
diff --git a/src/CoreBundle/Resources/views/Layout/base-layout.html.twig b/src/CoreBundle/Resources/views/Layout/base-layout.html.twig
index 4652c80256..f1bcd98b3e 100644
--- a/src/CoreBundle/Resources/views/Layout/base-layout.html.twig
+++ b/src/CoreBundle/Resources/views/Layout/base-layout.html.twig
@@ -22,6 +22,8 @@
     {%- block chamilo_footer -%}
     {% endblock -%}
     {{ modals_block }}
+
+    {% include "@ChamiloCore/Layout/foot.html.twig" %}
     </body>
     </html>
 {% else %}
diff --git a/src/CoreBundle/Resources/views/Layout/blank.html.twig b/src/CoreBundle/Resources/views/Layout/blank.html.twig
index ed3accbe9d..72f8192418 100644
--- a/src/CoreBundle/Resources/views/Layout/blank.html.twig
+++ b/src/CoreBundle/Resources/views/Layout/blank.html.twig
@@ -13,6 +13,7 @@
             {{ content }}
         {% endblock %}
     </div>
+    {% include "@ChamiloCore/Layout/foot.html.twig" %}
 </body>
 </html>
 {% endautoescape %}
\ No newline at end of file
diff --git a/src/CoreBundle/Resources/views/Layout/document.html.twig b/src/CoreBundle/Resources/views/Layout/document.html.twig
index cafc304cf8..38db137567 100644
--- a/src/CoreBundle/Resources/views/Layout/document.html.twig
+++ b/src/CoreBundle/Resources/views/Layout/document.html.twig
@@ -2,4 +2,4 @@
 
 <link href="/build/css/document.css" rel="stylesheet">
 <script src="/build/runtime.js"></script>
-<script src="/build/document.js"></script>
\ No newline at end of file
+<script src="/build/legacy_document.js"></script>
\ No newline at end of file
diff --git a/src/CoreBundle/Resources/views/Layout/foot.html.twig b/src/CoreBundle/Resources/views/Layout/foot.html.twig
new file mode 100644
index 0000000000..63bfc3bc57
--- /dev/null
+++ b/src/CoreBundle/Resources/views/Layout/foot.html.twig
@@ -0,0 +1 @@
+    {{ encore_entry_script_tags('vue') }}
diff --git a/src/CoreBundle/Resources/views/Layout/head.html.twig b/src/CoreBundle/Resources/views/Layout/head.html.twig
index 52baef5ad8..1622911156 100644
--- a/src/CoreBundle/Resources/views/Layout/head.html.twig
+++ b/src/CoreBundle/Resources/views/Layout/head.html.twig
@@ -23,21 +23,20 @@
     {% set profile_link = '' %}
     {% set message_link = '' %}
     {%- block stylesheets %}
+        {{ encore_entry_link_tags('legacy_app') }}
+        {{ encore_entry_link_tags('vue') }}
+        {{ encore_entry_link_tags('app') }}
         {# Files app.css is generated from "assets/css/app.scss" file using the file webpack.config.js #}
         {#    {{ encore_entry_link_tags('app') }} #}
         {% if theme is defined %}
             {#    <link rel="stylesheet" href="{{ url('index') ~ 'build/css/themes/'~ theme ~'/default.css' }}"/> #}
         {% endif %}
         {#    {{ encore_entry_link_tags('vue') }} #}
-        <link rel="stylesheet" href="{{ url('index') ~ 'build/vue.css' }}" />
-        <link rel="stylesheet" href="{{ url('index') ~ 'build/css/app.css' }}" />
         {# <link rel="stylesheet" href="{{ url('index') ~ 'build/css/print.css' }}" media="print" /> #}
     {% endblock %}
     {# app.js is generated using the file webpack.config.js and using yarn read /assets/README.md for more info #}
     {# <script src="{{ url('index') ~ 'build/libs/ckeditor/ckeditor.js' }}"></script> #}
-    <script src="{{ url('index') ~ 'build/runtime.js' }}"></script>
-    <script src="{{ url('index') ~ 'build/app.js' }}"></script>
-    {# {{ encore_entry_script_tags('app') }} #}
+    {{ encore_entry_script_tags('legacy_app') }}
     {# Add third party js libraries that can't be loaded using webpack #}
     {# <script src="{{ asset('libs/readmore-js/readmore.js') }}"></script> #}
     <script src="{{ url('index') ~ 'build/libs/js-cookie/src/js.cookie.js' }}"></script>
diff --git a/src/CoreBundle/Resources/views/Layout/layout_one_col.html.twig b/src/CoreBundle/Resources/views/Layout/layout_one_col.html.twig
index bf44c9ce38..78aaac299f 100644
--- a/src/CoreBundle/Resources/views/Layout/layout_one_col.html.twig
+++ b/src/CoreBundle/Resources/views/Layout/layout_one_col.html.twig
@@ -1,11 +1,6 @@
 {% extends '@ChamiloCore/Layout/base-layout.html.twig' %}
 {%- block page_content %}
     {% if from_vue %}
-        <script src="{{ url('index') ~ 'build/runtime.js' }}"></script>
-        <script src="{{ url('index') ~ 'build/app.js' }}"></script>
-        <link rel="stylesheet" href="{{ url('index') ~ 'build/css/app.css' }}"/>
-        <link rel="stylesheet" href="{{ url('index') ~ 'build/vue.css' }}"/>
-
         {# Loading legacy js using the $htmlHeadXtra array #}
         {% autoescape false %}
             {% for js in legacy_javascript %}
@@ -77,8 +72,4 @@
             </div>
         {% endif %}
     {% endautoescape -%}
-
-    {% if not from_vue %}
-    <script src="{{ url('index') ~ 'build/vue.js' }}"></script>
-    {% endif %}
 {% endblock -%}
diff --git a/webpack.config.js b/webpack.config.js
index e22768ea08..a430b2f107 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -19,17 +19,18 @@ Encore
     .cleanupOutputBeforeBuild()
     .enableBuildNotifications()
 
-    .addEntry('app', './assets/js/app.js')
+    .addEntry('legacy_app', './assets/js/legacy/app.js')
     //.addEntry('bootstrap', './assets/js/bootstrap.js')
-    .addEntry('exercise', './assets/js/exercise.js')
-    .addEntry('free-jqgrid', './assets/js/free-jqgrid.js')
-    .addEntry('lp', './assets/js/lp.js')
+    .addEntry('legacy_exercise', './assets/js/legacy/exercise.js')
+    .addEntry('legacy_free-jqgrid', './assets/js/legacy/free-jqgrid.js')
+    .addEntry('legacy_lp', './assets/js/legacy/lp.js')
+    .addEntry('legacy_document', './assets/js/legacy/document.js')
+
     .addEntry('vue', './assets/vue/main.js')
     .addEntry('vue_installer', './assets/vue/main_installer.js')
     .addEntry('translatehtml', './assets/js/translatehtml.js')
-    .addEntry('document', './assets/js/document.js')
 
-    .addStyleEntry('css/app', './assets/css/app.scss')
+    .addStyleEntry('app', './assets/css/app.scss')
     //.addStyleEntry('css/bootstrap', './assets/css/bootstrap.scss')
     .addStyleEntry('css/chat', './assets/css/chat.css')
     .addStyleEntry('css/document', './assets/css/document.css')