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 @@
- - @include('layouts.public.head') + + @include('layouts.public.head') - - @include('layouts.public.header') + +@include('layouts.public.header') -