From 4b659c5db1fa5bed531d1e658db7ae1f982bd25f Mon Sep 17 00:00:00 2001
From: "George Frederick \"Buzz\" Beurling"
 <georgefrederickbuzzbeurling@pop-os.localdomain>
Date: Thu, 9 Apr 2020 18:25:21 -0400
Subject: [PATCH] April 9 update v2

---
 app/GoogleDriveFile.php                       |   4 +
 app/Http/Controllers/FilesController.php      |  37 ++++-
 resources/views/layouts/public/main.blade.php | 134 ++++++++----------
 3 files changed, 100 insertions(+), 75 deletions(-)

diff --git a/app/GoogleDriveFile.php b/app/GoogleDriveFile.php
index 230fb95a..ea2851d3 100644
--- a/app/GoogleDriveFile.php
+++ b/app/GoogleDriveFile.php
@@ -330,6 +330,10 @@ class GoogleDriveFile extends Model
 
     public static function getSidebarFile()
     {
+        if (!\App\GoogleDriveFile::checkConfig())
+        {
+            return [];
+        }
         $user = \Auth::user();
         $sidebarArray = [];
         $dirList = \App\GoogleDriveFile::all();
diff --git a/app/Http/Controllers/FilesController.php b/app/Http/Controllers/FilesController.php
index e87fae2d..af391b5f 100644
--- a/app/Http/Controllers/FilesController.php
+++ b/app/Http/Controllers/FilesController.php
@@ -85,38 +85,67 @@ class FilesController extends Controller
 
     public function guide()
     {
-        $dirID = \App\GoogleDriveFile::findByPath('.Privé/.Staff/.Guide');
-        $dir = collect(\Storage::cloud()->listContents($dirID->id,false))->sortBy('name');
-        return view('admin.files.guide',['dir' => $dir]);
+        if (\App\GoogleDriveFile::checkConfig())
+        {
+            $dirID = \App\GoogleDriveFile::findByPath('.Privé/.Staff/.Guide');
+            $dir = collect(\Storage::cloud()->listContents($dirID->id,false))->sortBy('name');
+            return view('admin.files.guide',['dir' => $dir]);
+        }
+        return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
     }
 
     public function instruction()
     {
-        return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.Staff/.Instruction')->first()->id, 'mode' => 'folder']);
+        if (\App\GoogleDriveFile::checkConfig())
+        {
+            return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.Staff/.Instruction')->first()->id, 'mode' => 'folder']);
+        }
+        return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+
     }
 
     public function cadet()
     {
+        if (!\App\GoogleDriveFile::checkConfig())
+        {
+            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+        }
         return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.Cadet')->first()->id, 'mode' => 'folder']);
     }
 
     public function staff()
     {
+        if (!\App\GoogleDriveFile::checkConfig())
+        {
+            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+        }
         return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.Staff')->first()->id, 'mode' => 'folder']);
     }
 
     public function etamas()
     {
+        if (!\App\GoogleDriveFile::checkConfig())
+        {
+            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+        }
         return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.ETAMAS')->first()->id, 'mode' => 'folder']);
     }
 
     public function officier()
     {
+        if (!\App\GoogleDriveFile::checkConfig())
+        {
+            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+        }
         return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Privé/.Officier')->first()->id, 'mode' => 'folder']);
     }
 
     public function publique()
     {
+        if (!\App\GoogleDriveFile::checkConfig())
+        {
+            return redirect('/admin')->with('error','Google Drive n\'est pas configuré');
+        }
         return view('admin.files.Google Drive.index',['folder' => \App\GoogleDriveFile::where('path','=','.Publique')->first()->id, 'mode' => 'folder']);
     }
 }
diff --git a/resources/views/layouts/public/main.blade.php b/resources/views/layouts/public/main.blade.php
index e47687ff..23b6813c 100644
--- a/resources/views/layouts/public/main.blade.php
+++ b/resources/views/layouts/public/main.blade.php
@@ -8,88 +8,80 @@
 
 <head>
 
-	<!-- Include Head -->
-	@include('layouts.public.head')
+    <!-- Include Head -->
+    @include('layouts.public.head')
 
 </head>
 
 <body>
 
-	<!-- Include Header -->
-	@include('layouts.public.header')
+<!-- Include Header -->
+@include('layouts.public.header')
 
-	<div class="wrapper wrapper-full-page">
+<div class="wrapper wrapper-full-page">
 
-		@yield('content')
+    @yield('content')
 
-		
-		<footer class="footer">
-			<div class="container">
-			
-				<!-- Include Footer -->
-				@include('layouts.public.footer')
 
-			</div>
-		</footer>
-	</div>
+    <footer class="footer">
+        <div class="container">
 
-	<!-- Scripts -->
-	<script src="https://polyfill.io/v3/polyfill.min.js?features=Intl.~locale.en"></script>
-	<script src="/js/core/jquery.min.js"></script>
-	<script src="/js/core/popper.min.js"></script>
-	<script src="/js/core/bootstrap-material-design.min.js"></script>
-	<script src="/js/material-dashboard.js"></script>
-	<script src="/js/material-kit.min.js"></script>
-	<script src='/assets/fullcalendar/core/main.js'></script>
-    <script src='/assets/fullcalendar/daygrid/main.js'></script>
-	<script>
-		function toggleEdit() {
-			if($('#edit-switch').prop( "checked" )) {
-				$('.edit-btn').css({"display":"inline-block"});
-			} else {
-				$('.edit-btn').css({"display":"none"});
-			}
-		}
-	</script>
-	<script>
-		$('#test').html('Loading Start ...');
-		document.addEventListener('DOMContentLoaded', function() {
-			$('#test').html('DOM ContentLoaded');
-			var calendarEl = document.getElementById('public_calendar');
+            <!-- Include Footer -->
+            @include('layouts.public.footer')
 
-			try {
-				var calendar = new FullCalendar.Calendar(calendarEl, {
-					plugins: [ 'dayGrid' ],
-					locale: 'fr',
-					header: {
-						left:   'title',
-						center: '',
-						right:  'prev,next'
-					},
-					events: '/api/schedule/events',
-					eventClick: function(info) {
-						console.log(info.event.id)
-						$.get( "/api/schedule/events/modal/" + info.event.id + "/"+ info.event.extendedProps.extraParams.db_type, function( data ) {
-							$( "#modal-content" ).html( data );
-						});
-						$('#schedulemodal').modal('toggle')
-					}
-				});
-				$('#test').html('Begin render');
-				calendar.render();
-				$('#test').html('Done render');
-			}
-			catch(err) {
-				document.getElementById("test").innerHTML = err.message;
-			}
-		});
-	
-	</script>
-	<div class="modal fade" id="schedulemodal" tabindex="-1" role="dialog" aria-labelledby="schedulemodal" aria-hidden="true">
-		<div class="modal-dialog w-100 modal-lg mx-2 mx-lg-auto" role="document">
-			<div class="modal-content" id="modal-content"></div>
-		</div>
-	</div>
+        </div>
+    </footer>
+</div>
+
+<!-- Scripts -->
+<script src="https://polyfill.io/v3/polyfill.min.js?features=Intl.~locale.en"></script>
+<script src="/js/core/jquery.min.js"></script>
+<script src="/js/core/popper.min.js"></script>
+<script src="/js/core/bootstrap-material-design.min.js"></script>
+<script src="/js/material-dashboard.js"></script>
+<script src="/js/material-kit.min.js"></script>
+<script src='/assets/fullcalendar/core/main.js'></script>
+<script src='/assets/fullcalendar/daygrid/main.js'></script>
+<script>
+    function toggleEdit() {
+        if ($('#edit-switch').prop("checked")) {
+            $('.edit-btn').css({"display": "inline-block"});
+        } else {
+            $('.edit-btn').css({"display": "none"});
+        }
+    }
+</script>
+<script>
+    document.addEventListener('DOMContentLoaded', function () {
+        var calendarEl = document.getElementById('public_calendar');
+
+        var calendar = new FullCalendar.Calendar(calendarEl, {
+            plugins: ['dayGrid'],
+            locale: 'fr',
+            header: {
+                left: 'title',
+                center: '',
+                right: 'prev,next'
+            },
+            events: '/api/schedule/events',
+            eventClick: function (info) {
+                console.log(info.event.id)
+                $.get("/api/schedule/events/modal/" + info.event.id + "/" + info.event.extendedProps.extraParams.db_type, function (data) {
+                    $("#modal-content").html(data);
+                });
+                $('#schedulemodal').modal('toggle')
+            }
+        });
+        calendar.render();
+    });
+
+</script>
+<div class="modal fade" id="schedulemodal" tabindex="-1" role="dialog" aria-labelledby="schedulemodal"
+     aria-hidden="true">
+    <div class="modal-dialog w-100 modal-lg mx-2 mx-lg-auto" role="document">
+        <div class="modal-content" id="modal-content"></div>
+    </div>
+</div>
 </body>
 
 </html>
\ No newline at end of file