From a95df871b9a6849ca687aa20b7fedaca73e39ca7 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Mon, 13 Dec 2021 07:41:02 +0100
Subject: [PATCH] Load the app and the layout JS files

---
 application/views/layouts/account_layout.php | 4 ++++
 application/views/layouts/backend_layout.php | 4 ++++
 application/views/layouts/booking_layout.php | 8 ++++++--
 application/views/layouts/message_layout.php | 3 +++
 application/views/pages/booking_page.php     | 7 +++++++
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/application/views/layouts/account_layout.php b/application/views/layouts/account_layout.php
index b0197c6e..2fe9b54a 100644
--- a/application/views/layouts/account_layout.php
+++ b/application/views/layouts/account_layout.php
@@ -50,6 +50,10 @@
 <script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/fontawesome.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/solid.min.js') ?>"></script>
 
+<script src="<?= asset_url('assets/js/app.js') ?>"></script>
+<script src="<?= asset_url('assets/js/layouts/account_layout.js') ?>"></script>
+<script src="<?= asset_url('assets/js/utils/general_functions.js') ?>"></script>
+
 <script>
     const GlobalVariables = {
         csrfToken: <?= json_encode($this->security->get_csrf_hash()) ?>,
diff --git a/application/views/layouts/backend_layout.php b/application/views/layouts/backend_layout.php
index 0873967d..29e26f4c 100644
--- a/application/views/layouts/backend_layout.php
+++ b/application/views/layouts/backend_layout.php
@@ -54,9 +54,13 @@
 <script src="<?= asset_url('assets/vendor/tippy.js/tippy-bundle.umd.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/trumbowyg/trumbowyg.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/select2/select2.min.js') ?>"></script>
+
+<script src="<?= asset_url('assets/js/app.js') ?>"></script>
 <script src="<?= asset_url('assets/js/layouts/backend.js') ?>"></script>
+<script src="<?= asset_url('assets/js/layouts/backend_layout.js') ?>"></script>
 <script src="<?= asset_url('assets/js/utils/general_functions.js') ?>"></script>
 
 <?php slot('scripts') ?>
+
 </body>
 </html>
diff --git a/application/views/layouts/booking_layout.php b/application/views/layouts/booking_layout.php
index 92176456..ef0c03d0 100644
--- a/application/views/layouts/booking_layout.php
+++ b/application/views/layouts/booking_layout.php
@@ -100,9 +100,11 @@
 <script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/fontawesome.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/solid.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/tippy.js/tippy-bundle.umd.min.js') ?>"></script>
+
+<script src="<?= asset_url('assets/js/app.js') ?>"></script>
+<script src="<?= asset_url('assets/js/layouts/booking_layout.js') ?>"></script>
 <script src="<?= asset_url('assets/js/utils/general_functions.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/frontend_book_api.js') ?>"></script>
-<script src="<?= asset_url('assets/js/pages/frontend_book.js') ?>"></script>
+
 
 <script>
     $(function () {
@@ -113,5 +115,7 @@
 
 <?php google_analytics_script() ?>
 
+<?php slot('scripts') ?>
+
 </body>
 </html>
diff --git a/application/views/layouts/message_layout.php b/application/views/layouts/message_layout.php
index 80394f8c..0cb14c44 100644
--- a/application/views/layouts/message_layout.php
+++ b/application/views/layouts/message_layout.php
@@ -58,6 +58,9 @@
 <script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/fontawesome.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/@fortawesome-fontawesome-free/solid.min.js') ?>"></script>
 <script src="<?= asset_url('assets/vendor/bootstrap/bootstrap.min.js') ?>"></script>
+
+<script src="<?= asset_url('assets/js/app.js') ?>"></script>
+<script src="<?= asset_url('assets/js/layouts/message_layout.js') ?>"></script>
 <script src="<?= asset_url('assets/js/utils/general_functions.js') ?>"></script>
 
 <?php google_analytics_script() ?>
diff --git a/application/views/pages/booking_page.php b/application/views/pages/booking_page.php
index 898f7fc5..49026ee5 100755
--- a/application/views/pages/booking_page.php
+++ b/application/views/pages/booking_page.php
@@ -46,3 +46,10 @@
 
 <?php section('content') ?>
 
+
+<?php section('scripts') ?>
+
+<script src="<?= asset_url('assets/js/pages/frontend_book_api.js') ?>"></script>
+<script src="<?= asset_url('assets/js/pages/frontend_book.js') ?>"></script>
+
+<?php section('scripts') ?>