From 31884bbba66779189f6dad9258f2ff37ebc750ac Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Tue, 6 Feb 2018 07:51:49 +0100
Subject: [PATCH] Add generated js / css to all views.

---
 resources/views/layout/default.twig | 8 ++++----
 resources/views/layout/empty.twig   | 6 ++----
 resources/views/layout/guest.twig   | 6 ++----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig
index 636a4d4cd7..2891755dd1 100644
--- a/resources/views/layout/default.twig
+++ b/resources/views/layout/default.twig
@@ -156,14 +156,14 @@
         </div>
     </div>
 </div>
-
-<script src="js/app.js?v={{ FF_VERSION }}" type="text/javascript"></script>
 <script src="js/lib/moment.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
+<script src="{{ route('javascript.variables') }}?ext=.js&amp;v={{ FF_VERSION }}{% if account %}&amp;account={{ account.id }}{% endif %}" type="text/javascript"></script>
+<script src="js/app.js?v={{ FF_VERSION }}" type="text/javascript"></script>
+
 <script src="js/lib/daterangepicker.js?v={{ FF_VERSION }}" type="text/javascript"></script>
 <script src="lib/adminlte/js/app.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
 <script type="text/javascript" src="js/lib/accounting.min.js?v={{ FF_VERSION }}"></script>
-<script src="{{ route('javascript.variables') }}?ext=.js&amp;v={{ FF_VERSION }}{% if account %}&amp;account={{ account.id }}{% endif %}"
-        type="text/javascript"></script>
+
 <script type="text/javascript" src="js/ff/firefly.js?v={{ FF_VERSION }}"></script>
 <script type="text/javascript">
     var helpPageTitle = "{{ trans('firefly.help_for_this_page')|escape('js') }}";
diff --git a/resources/views/layout/empty.twig b/resources/views/layout/empty.twig
index 5493a3013f..e51a89f786 100644
--- a/resources/views/layout/empty.twig
+++ b/resources/views/layout/empty.twig
@@ -7,8 +7,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
     <base href="{{ route('index') }}/">
-    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css?v={{ FF_VERSION }}" type="text/css" media="all"/>
-    <link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css?v={{ FF_VERSION }}" type="text/css" media="all"/>
+    <link href="css/app.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
     <link href="lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
 
     <!--[if lt IE 9]>
@@ -27,9 +26,8 @@
     </div>
     {% block content %}{% endblock %}
 </div>
-<script type="text/javascript" src="js/lib/jquery-3.2.1.min.js?v={{ FF_VERSION }}"></script>
-<script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js?v={{ FF_VERSION }}"></script>
 
+<script src="js/app.js?v={{ FF_VERSION }}" type="text/javascript"></script>
 {% if env('ANALYTICS_ID','') != '' %}
     <script>
         // send pageview
diff --git a/resources/views/layout/guest.twig b/resources/views/layout/guest.twig
index d963c5b95d..3a21312f10 100644
--- a/resources/views/layout/guest.twig
+++ b/resources/views/layout/guest.twig
@@ -16,8 +16,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
     <base href="{{ route('index') }}/">
-    <link rel="stylesheet" href="lib/bootstrap/css/bootstrap.min.css?v={{ FF_VERSION }}" type="text/css" media="all"/>
-    <link rel="stylesheet" href="lib/font-awesome/css/font-awesome.min.css?v={{ FF_VERSION }}" type="text/css" media="all"/>
+    <link href="css/app.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
     <link href="lib/adminlte/css/AdminLTE.min.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
     <link href="css/firefly.css?v={{ FF_VERSION }}" rel="stylesheet" type="text/css"/>
 
@@ -37,8 +36,7 @@
     </div>
     {% block content %}{% endblock %}
 </div>
-<script type="text/javascript" src="js/lib/jquery-3.2.1.min.js?v={{ FF_VERSION }}"></script>
-<script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js?v={{ FF_VERSION }}"></script>
+<script src="js/app.js?v={{ FF_VERSION }}" type="text/javascript"></script>
 <script type="text/javascript" src="js/ff/guest.js?v={{ FF_VERSION }}"></script>
 
 {% if env('ANALYTICS_ID','') != '' %}