From 0060f794ae51d561aa01ee07c788778917dff892 Mon Sep 17 00:00:00 2001
From: Nabeel S <nabeelio@users.noreply.github.com>
Date: Tue, 18 Feb 2020 17:10:31 -0500
Subject: [PATCH] Refresh theme cache on settings page load #554 (#557)

---
 app/Http/Controllers/Admin/SettingsController.php | 1 +
 resources/views/admin/settings/table.blade.php    | 3 ++-
 resources/views/layouts/.gitignore                | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 resources/views/layouts/.gitignore

diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php
index efd85b65..8308a528 100644
--- a/app/Http/Controllers/Admin/SettingsController.php
+++ b/app/Http/Controllers/Admin/SettingsController.php
@@ -17,6 +17,7 @@ class SettingsController extends Controller
      */
     private function getThemes(): array
     {
+        Theme::rebuildCache();
         $themes = Theme::all();
         $theme_list = [];
         foreach ($themes as $t) {
diff --git a/resources/views/admin/settings/table.blade.php b/resources/views/admin/settings/table.blade.php
index 61d1d372..f1aac3d1 100644
--- a/resources/views/admin/settings/table.blade.php
+++ b/resources/views/admin/settings/table.blade.php
@@ -1,7 +1,7 @@
 {{ Form::model($grouped_settings, ['route' => ['admin.settings.update'], 'method' => 'post']) }}
 @foreach($grouped_settings as $group => $settings)
   <div class="card border-blue-bottom">
-    <div class="content table-responsive table-full-width">
+    <div class="content table-responsive">
       <div class="row">
         <table class="table table-hover" id="flights-table">
           <thead>
@@ -77,6 +77,7 @@
 </div>
 
 {{ Form::close() }}
+
 <script>
   $(document).ready(function () {
     $('#datepicker').datetimepicker({
diff --git a/resources/views/layouts/.gitignore b/resources/views/layouts/.gitignore
new file mode 100644
index 00000000..cf0be202
--- /dev/null
+++ b/resources/views/layouts/.gitignore
@@ -0,0 +1,6 @@
+# Ignore everything so if we update via git, nothing is overwritten
+
+/*
+/*/
+!.gitignore
+!/default