diff --git a/app/Http/Controllers/PictureController.php b/app/Http/Controllers/PictureController.php index 328582eb..ddfd7574 100644 --- a/app/Http/Controllers/PictureController.php +++ b/app/Http/Controllers/PictureController.php @@ -43,12 +43,18 @@ class PictureController extends Controller $pic = new Picture(); $pic->title = request('title'); - $pic->url = request('url'); + $pic->url = ""; $pic->desc = request('desc'); $pic->pictureable_id = 0; $pic->pictureable_type = ""; - $pic->save(); + + $filename = $pic->title.'-'.$pic->id.'.'.\request()->file('file')->getClientOriginalExtension(); + \Storage::putFileAs('Publique/Image',\request()->file('file'),$filename); + + $pic->url = '/api/files/Publique/Image/'.$filename; + $pic->save(); + clog('add','success','a ajouté une image',null,'App\Picture',$pic->id); return redirect('/admin/picture')->with('success','Image ajoutée avec succès'); @@ -87,9 +93,15 @@ class PictureController extends Controller public function update($id) { $pic = Picture::find($id); + if (\request()->hasFile('file')) + { + \Storage::delete(str_replace('/api/files/','',$pic->url)); + $filename = \request('title').'-'.$pic->id.'.'.\request()->file('file')->getClientOriginalExtension(); + \Storage::putFileAs('Publique/Image',\request()->file('file'),$filename); + $pic->url = '/api/files/Publique/Image/'.$filename; + } $pic->title = request('title'); - $pic->url = request('url'); $pic->desc = request('desc'); $pic->save(); @@ -113,7 +125,7 @@ class PictureController extends Controller public function destroy($id) { $pic = Picture::find($id); - + \Storage::delete(str_replace('/api/files/','',$pic->url)); $pic->delete(); clog('delete','success','a supprimé une image',null,'App\Picture',$id); } diff --git a/resources/views/admin/picture/add.blade.php b/resources/views/admin/picture/add.blade.php index 76eb56c8..042e2900 100644 --- a/resources/views/admin/picture/add.blade.php +++ b/resources/views/admin/picture/add.blade.php @@ -7,26 +7,31 @@

Ajouter une images

-
+ @csrf
- +
-
- - +
+ +
+
+ +
+ RemoveSelect fileChange +
- +
@@ -44,20 +49,5 @@ $('#desc').trumbowyg({ lang: 'fr' }); - function saveChange(pPerm) { - (function($) { - var myswitch = document.getElementById(pPerm); - $.post('/api/config/general/save?api_token='+api_token, { value: myswitch.checked,perm: pPerm } , function(data) { - swal({ - title: 'Modification enregistré !', - type: 'success', - }).then((result) => { - if (result.value) { - location.reload(); - } - }) - }); - })(jQuery); - } @endsection diff --git a/resources/views/admin/picture/edit.blade.php b/resources/views/admin/picture/edit.blade.php index 5c99680c..516f35d0 100644 --- a/resources/views/admin/picture/edit.blade.php +++ b/resources/views/admin/picture/edit.blade.php @@ -7,7 +7,7 @@

Ajouter une images

- + @csrf @@ -18,9 +18,14 @@
-
- - +
+ +
+
+ +
+ RemoveSelect fileChange +
diff --git a/resources/views/admin/picture/index.blade.php b/resources/views/admin/picture/index.blade.php index c309d2fe..72205a5c 100644 --- a/resources/views/admin/picture/index.blade.php +++ b/resources/views/admin/picture/index.blade.php @@ -31,13 +31,13 @@
- @if($picture->pictureable) + {{-- @if($picture->pictureable) - @endif + @endif--}}
diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php index a94a6af4..12668c54 100644 --- a/resources/views/layouts/admin/sidebar.blade.php +++ b/resources/views/layouts/admin/sidebar.blade.php @@ -60,12 +60,6 @@ // 'perm' => 'article_see', // 'child' => null //], - //'Images' => [ - // 'route' => 'admin.picture', - // 'icon' => 'fas fa-images', - // 'perm' => 'picture_see', - // 'child' => null - //], 'Utilisateurs' => [ 'route' => 'admin.users', 'icon' => 'fas fa-users', @@ -78,6 +72,12 @@ 'perm' => 'cadet_list_see', 'child' => null ], + 'Images' => [ + 'route' => 'admin.picture', + 'icon' => 'fas fa-images', + 'perm' => 'picture_see', + 'child' => null + ], 'Logs' => [ 'route' => 'admin.stats.log', 'icon' => 'fas fa-stream',