diff --git a/app/Http/Controllers/EquipamentoController.php b/app/Http/Controllers/EquipamentoController.php index c6f6b2e..6cf09b3 100644 --- a/app/Http/Controllers/EquipamentoController.php +++ b/app/Http/Controllers/EquipamentoController.php @@ -29,7 +29,7 @@ public function store(EquipamentoRequest $request) $equipamento = Equipamento::create($request->validated() + ['user_id' => auth()->id()]); session()->flash('alert-success', 'Equipamento criado com sucesso!'); - return redirect("/racks/{$equipamento->rack_id}"); + return redirect()->route('racks.show', ['rack' => $equipamento->rack_id]); } public function show(Equipamento $equipamento) @@ -59,7 +59,7 @@ public function update(EquipamentoRequest $request, Equipamento $equipamento) $equipamento->update($request->validated() + ['user_id' => auth()->id()]); session()->flash('alert-success', 'Equipamento atualizado com sucesso!'); - return redirect("/equipamentos/{$equipamento->id}"); + return redirect()->route('equipamentos.show', ['equipamento' => $equipamento]); } public function destroy(Equipamento $equipamento) @@ -70,6 +70,6 @@ public function destroy(Equipamento $equipamento) $equipamento->delete(); session()->flash('alert-success', 'Equipamento removido com sucesso!'); - return redirect("/racks/{$rack_id}"); + return redirect()->route('racks.show', ['rack' => $rack_id]); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/PatchPanelController.php b/app/Http/Controllers/PatchPanelController.php index 55e4e7d..077a4e6 100644 --- a/app/Http/Controllers/PatchPanelController.php +++ b/app/Http/Controllers/PatchPanelController.php @@ -29,7 +29,7 @@ public function store(PatchPanelRequest $request) Gate::authorize('admin'); $patchPanel = PatchPanel::create($request->validated() + ['user_id' => auth()->id()]); session()->flash('alert-success', 'Patch panel criado com sucesso!'); - return redirect("/racks/{$patchPanel->rack_id}"); + return redirect()->route('racks.show', ['rack' => $patchPanel->rack_id]); } public function show(PatchPanel $patchPanel) @@ -67,7 +67,7 @@ public function update(PatchPanelRequest $request, PatchPanel $patchPanel) Gate::authorize('admin'); $patchPanel->update($request->validated() + ['user_id' => auth()->id()]); session()->flash('alert-success', 'Patch panel atualizado com sucesso!'); - return redirect("/patch-panels/{$patchPanel->id}"); + return redirect()->route('patch-panels.show', ['patchPanel' => $patchPanel]); } public function selecionarSala(PatchPanel $patchPanel, Request $request) @@ -106,7 +106,7 @@ public function vincularSala(VincularPortaPatchPanelRequest $request, PatchPanel // Verificar se a porta já está vinculada if ($patchPanel->salas()->wherePivot('porta', $porta)->exists()) { session()->flash('alert-danger', 'Esta porta já está vinculada!'); - return redirect("/patch-panels/{$patchPanel->id}"); + return redirect()->route('patch-panels.show', ['patchPanel' => $patchPanel]); } $dadosVinculo = [ @@ -120,7 +120,7 @@ public function vincularSala(VincularPortaPatchPanelRequest $request, PatchPanel $patchPanel->salas()->attach($request->sala_id, $dadosVinculo); session()->flash('alert-success', 'Porta vinculada com sucesso!'); - return redirect("/patch-panels/{$patchPanel->id}"); + return redirect()->route('patch-panels.show', ['patchPanel' => $patchPanel]); } public function desvincularSala(PatchPanel $patchPanel, Sala $sala, Request $request) @@ -130,7 +130,7 @@ public function desvincularSala(PatchPanel $patchPanel, Sala $sala, Request $req $patchPanel->salas()->wherePivot('porta', $porta)->detach($sala->id); session()->flash('alert-success', 'Porta desvinculada com sucesso!'); - return redirect("/patch-panels/{$patchPanel->id}"); + return redirect()->route('patch-panels.show', ['patchPanel' => $patchPanel]); } public function editarTipoPorta(PatchPanel $patchPanel, Sala $sala, Request $request) @@ -146,7 +146,7 @@ public function editarTipoPorta(PatchPanel $patchPanel, Sala $sala, Request $req if (!$vinculo) { session()->flash('alert-danger', 'Vínculo não encontrado!'); - return redirect("/patch-panels/{$patchPanel->id}"); + return redirect()->route('patch-panels.show', ['patchPanel' => $patchPanel]); } return view('patch-panels.editar-tipo-porta', [ @@ -181,7 +181,7 @@ public function atualizarTipoPorta(Request $request, PatchPanel $patchPanel, Sal ]); session()->flash('alert-success', 'Tipo de porta atualizado com sucesso!'); - return redirect("/patch-panels/{$patchPanel->id}"); + return redirect()->route('patch-panels.show', ['patchPanel' => $patchPanel]); } public function destroy(PatchPanel $patchPanel) diff --git a/app/Http/Controllers/PlantaController.php b/app/Http/Controllers/PlantaController.php index a898dd4..193b857 100644 --- a/app/Http/Controllers/PlantaController.php +++ b/app/Http/Controllers/PlantaController.php @@ -100,7 +100,7 @@ public function update(PlantaRequest $request, Planta $planta) ->update(['visible' => true]); } - return redirect("/plantas/{$planta->predio_id}") + return redirect()->route('plantas.index', ['predio' => $planta->predio_id]) ->with('success', 'Planta e permissões dos pontos atualizadas com sucesso!'); } diff --git a/app/Http/Controllers/PredioController.php b/app/Http/Controllers/PredioController.php index 8960f7e..255f985 100644 --- a/app/Http/Controllers/PredioController.php +++ b/app/Http/Controllers/PredioController.php @@ -27,7 +27,7 @@ public function store(PredioRequest $request) Gate::authorize('admin'); Predio::create($request->validated() + ['user_id' => auth()->id()]); session()->flash('alert-success', 'Prédio criado com sucesso!'); - return redirect('/predios'); + return redirect()->route('predios.index'); } public function show(Predio $predio) @@ -51,7 +51,7 @@ public function update(PredioRequest $request, Predio $predio) Gate::authorize('admin'); $predio->update($request->validated() + ['user_id' => auth()->id()]); session()->flash('alert-success', 'Prédio atualizado com sucesso!'); - return redirect('/predios'); + return redirect()->route('predios.index'); } public function destroy(Predio $predio) @@ -69,6 +69,6 @@ public function destroy(Predio $predio) } else { session()->flash('alert-danger', 'Prédio não deletado, pois possui salas ou racks cadastrados!'); } - return redirect('/predios'); + return redirect()->route('predios.index'); } } diff --git a/app/Http/Controllers/RackController.php b/app/Http/Controllers/RackController.php index 7626a0c..89a848a 100644 --- a/app/Http/Controllers/RackController.php +++ b/app/Http/Controllers/RackController.php @@ -28,7 +28,7 @@ public function store(RackRequest $request) Rack::create($request->validated() + ['user_id' => auth()->id()]); session()->flash('alert-success', 'Rack criado com sucesso!'); - return redirect("/predios/{$request->predio_id}"); + return redirect()->route('predios.show', ['predio' => $request->predio_id]); } public function show(Rack $rack) @@ -57,7 +57,7 @@ public function update(RackRequest $request, Rack $rack) $rack->update($request->validated() + ['user_id' => auth()->id()]); session()->flash('alert-success', 'Rack atualizado com sucesso!'); - return redirect("/racks/{$rack->id}"); + return redirect()->route('racks.show', ['rack' => $rack]); } public function destroy(Rack $rack) diff --git a/app/Http/Controllers/SalaController.php b/app/Http/Controllers/SalaController.php index 4a75aae..52c32c5 100644 --- a/app/Http/Controllers/SalaController.php +++ b/app/Http/Controllers/SalaController.php @@ -32,7 +32,7 @@ public function store(SalaRequest $request) Sala::create($request->validated() + ['user_id' => auth()->id()]); session()->flash('alert-success', 'Sala criada com sucesso!'); - return redirect("/predios/{$request->predio_id}"); + return redirect()->route('predios.show', ['predio' => $request->predio_id]); } public function show(Sala $sala) @@ -70,7 +70,7 @@ public function update(SalaRequest $request, Sala $sala) $sala->update($request->validated() + ['user_id' => auth()->id()]); session()->flash('alert-success', 'Sala atualizada com sucesso!'); - return redirect("/salas/{$sala->id}"); + return redirect()->route('salas.show', ['sala' => $sala]); } public function selecionarRack(Sala $sala) @@ -133,7 +133,7 @@ public function vincularPatchPanel(VincularPortaSalaRequest $request, Sala $sala } session()->flash('alert-success', 'Portas vinculadas com sucesso!'); - return redirect("/salas/{$sala->id}"); + return redirect()->route('salas.show', ['sala' => $sala]); } public function desvincularPatchPanel(Sala $sala, PatchPanel $patchPanel, Request $request) @@ -148,7 +148,7 @@ public function desvincularPatchPanel(Sala $sala, PatchPanel $patchPanel, Reques session()->flash('alert-success', 'Porta desvinculada com sucesso!'); - return redirect("/salas/{$sala->id}"); + return redirect()->route('salas.show', ['sala' => $sala]); } public function editarTipoPorta(Sala $sala, PatchPanel $patchPanel, Request $request) @@ -164,7 +164,7 @@ public function editarTipoPorta(Sala $sala, PatchPanel $patchPanel, Request $req if (!$vinculo) { session()->flash('alert-danger', 'Vínculo não encontrado!'); - return redirect("/salas/{$sala->id}"); + return redirect()->route('salas.show', ['sala' => $sala]); } return view('salas.editar-tipo-porta', [ @@ -196,7 +196,7 @@ public function atualizarTipoPorta(Request $request, Sala $sala, PatchPanel $pat ]); session()->flash('alert-success', 'Tipo de porta atualizado com sucesso!'); - return redirect("/salas/{$sala->id}"); + return redirect()->route('salas.show', ['sala' => $sala]); } public function destroy(Sala $sala) diff --git a/app/Http/Controllers/TipoPortaController.php b/app/Http/Controllers/TipoPortaController.php index 2602b63..b63dfad 100644 --- a/app/Http/Controllers/TipoPortaController.php +++ b/app/Http/Controllers/TipoPortaController.php @@ -27,7 +27,7 @@ public function store(TipoPortaRequest $request) Gate::authorize('admin'); TipoPorta::create($request->validated() + ['user_id' => auth()->id()]); session()->flash('alert-success', 'Tipo de porta criado com sucesso!'); - return redirect('/tipo-portas'); + return redirect()->route('tipo-portas.index'); } public function show(TipoPorta $tipoPorta) @@ -51,7 +51,7 @@ public function update(TipoPortaRequest $request, TipoPorta $tipoPorta) Gate::authorize('admin'); $tipoPorta->update($request->validated() + ['user_id' => auth()->id()]); session()->flash('alert-success', 'Tipo de porta atualizado com sucesso!'); - return redirect('/tipo-portas'); + return redirect()->route('tipo-portas.index'); } public function destroy(TipoPorta $tipoPorta) @@ -64,6 +64,6 @@ public function destroy(TipoPorta $tipoPorta) } else { session()->flash('alert-danger', 'Tipo de porta não pode ser removido, pois está em uso!'); } - return redirect('/tipo-portas'); + return redirect()->route('tipo-portas.index'); } -} \ No newline at end of file +} diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index 362b48b..448bce3 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -2,7 +2,6 @@ namespace App\Http\Middleware; -use App\Providers\RouteServiceProvider; use Closure; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -23,7 +22,7 @@ public function handle(Request $request, Closure $next, ...$guards) foreach ($guards as $guard) { if (Auth::guard($guard)->check()) { - return redirect(RouteServiceProvider::HOME); + return redirect()->route('home'); } } diff --git a/resources/views/equipamentos/create.blade.php b/resources/views/equipamentos/create.blade.php index 84f8adc..6409077 100644 --- a/resources/views/equipamentos/create.blade.php +++ b/resources/views/equipamentos/create.blade.php @@ -10,7 +10,7 @@