From 897cb081d767122482d69f6e42ba178ce09d6cd5 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Tue, 26 Sep 2023 10:45:59 +0200 Subject: [PATCH] bugs fix --- app/Http/Controllers/Bo/NetworkController.php | 20 +++++++++---------- .../ApiCheckCredentialMiddleware.php | 2 +- .../views/bo/pages/networks/create.blade.php | 6 +++--- .../views/bo/pages/networks/delete.blade.php | 4 ++-- .../views/bo/pages/networks/edit.blade.php | 8 ++++---- .../views/bo/pages/networks/index.blade.php | 14 +++++++++++-- 6 files changed, 32 insertions(+), 22 deletions(-) diff --git a/app/Http/Controllers/Bo/NetworkController.php b/app/Http/Controllers/Bo/NetworkController.php index a9b75ed..e25f807 100644 --- a/app/Http/Controllers/Bo/NetworkController.php +++ b/app/Http/Controllers/Bo/NetworkController.php @@ -17,8 +17,8 @@ class NetworkController extends Controller */ public function index() { - $networks = Network::all(); - return view('networks.index', compact('networks')); + $networks = Network::paginate(20); + return view('bo.pages.networks.index', compact('networks')); } /** @@ -28,7 +28,7 @@ class NetworkController extends Controller */ public function create() { - return view('networks.create'); + return view('bo.pages.networks.create'); } /** @@ -42,7 +42,7 @@ class NetworkController extends Controller $network = new Network(); $network->fill($request->validated()); if ($network->saveOrFail()) { - return redirect()->route('networks.edit', compact('network')) + return redirect()->route('bo.networks.edit', compact('network')) ->with('success', trans('Network créé.')); } @@ -57,21 +57,21 @@ class NetworkController extends Controller */ public function edit(Network $network) { - return view('networks.edit', ['network' => $network]); + return view('bo.pages.networks.edit', ['network' => $network]); } /** * Update the specified resource in storage. * * @param \App\Http\Requests\Networks\UpdateNetwork $request - * @param \App\Models\Network $network + * @param \App\Models\Network $network * @return \Illuminate\Http\Response */ public function update(UpdateNetwork $request, Network $network) { $network->fill($request->validated()); if ($network->saveOrFail()) { - return redirect()->route('networks.edit', compact('network')) + return redirect()->route('bo.networks.edit', compact('network')) ->with('success', trans('Network mis à jour.')); } return \back(); @@ -85,14 +85,14 @@ class NetworkController extends Controller */ public function destroy(Network $network) { - return view('networks.delete', ['network' => $network]); + return view('bo.pages.networks.delete', ['network' => $network]); } /** * Remove the specified resource from storage. * * @param \App\Http\Requests\ValidateOtpRequest $request - * @param \App\Models\Network $network + * @param \App\Models\Network $network * @return \Illuminate\Http\Response * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed */ @@ -100,7 +100,7 @@ class NetworkController extends Controller { // phpcs:enable if ($network->deleteOrFail()) { - return redirect()->route('networks.index') + return redirect()->route('bo.networks.index') ->with('warning', 'Network supprimé !'); } diff --git a/app/Http/Middleware/ApiCheckCredentialMiddleware.php b/app/Http/Middleware/ApiCheckCredentialMiddleware.php index 48f5d2b..1e67162 100644 --- a/app/Http/Middleware/ApiCheckCredentialMiddleware.php +++ b/app/Http/Middleware/ApiCheckCredentialMiddleware.php @@ -11,7 +11,7 @@ class ApiCheckCredentialMiddleware * @param \Closure $next * @return mixed */ - public function handle($request, \Closure $next) + public function handle(mixed $request, \Closure $next) { if ($request->header('Authorization') !== \config('api.key')) { return response('Unauthorized', 401); diff --git a/resources/views/bo/pages/networks/create.blade.php b/resources/views/bo/pages/networks/create.blade.php index c6ccf58..cdc31d1 100644 --- a/resources/views/bo/pages/networks/create.blade.php +++ b/resources/views/bo/pages/networks/create.blade.php @@ -7,13 +7,13 @@
Ajout d'une IP - {{ __('Retour') }} + {{ __('Retour') }}
-
+ @csrf - @include('networks.form', ['no_ips' => true]) + @include('bo.pages.networks.form', ['no_ips' => true])
diff --git a/resources/views/bo/pages/networks/delete.blade.php b/resources/views/bo/pages/networks/delete.blade.php index a3097c9..92bdf94 100644 --- a/resources/views/bo/pages/networks/delete.blade.php +++ b/resources/views/bo/pages/networks/delete.blade.php @@ -6,11 +6,11 @@
{{ __('Confirmation de suppression de l\'IP') }} {{ __('Retour') }}
+ href="{{ route('bo.networks.edit', $network) }}">{{ __('Retour') }}
- @include('otp-delete', ['route' => route('networks.destroySubmit', $network)]) + @include('otp-delete', ['route' => route('bo.networks.destroySubmit', $network)])
diff --git a/resources/views/bo/pages/networks/edit.blade.php b/resources/views/bo/pages/networks/edit.blade.php index 6318615..335e5b8 100644 --- a/resources/views/bo/pages/networks/edit.blade.php +++ b/resources/views/bo/pages/networks/edit.blade.php @@ -7,15 +7,15 @@
Détails de l'IP - {{ __('Supprimer') }} - {{ __('Retour') }} + {{ __('Supprimer') }} + {{ __('Retour') }}
- + @csrf @method('PUT') - @include('networks.form') + @include('bo.pages.networks.form')
diff --git a/resources/views/bo/pages/networks/index.blade.php b/resources/views/bo/pages/networks/index.blade.php index 6cf106e..86c212b 100644 --- a/resources/views/bo/pages/networks/index.blade.php +++ b/resources/views/bo/pages/networks/index.blade.php @@ -6,7 +6,7 @@
{{ __('Gestion des IP du réseau') }}{{ __('Ajouter') }}
+ href="{{ route('bo.networks.create') }}">{{ __('Ajouter') }}
@if (session('status')) @@ -14,6 +14,11 @@ {{ session('status') }}
@endif +
+
+ {{ $networks->withQueryString()->onEachSide(1)->links() }} +
+
@@ -26,11 +31,16 @@ + href="{{ route('bo.networks.edit', $network) }}">{{ __('Détails') }} @endforeach
{{ $network->cidr }} {{ __('Détails') }}
+
+
+ {{ $networks->withQueryString()->onEachSide(1)->links() }} +
+