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 @@
-
+ @csrf
@@ -75,4 +75,4 @@
-@endsection \ No newline at end of file +@endsection diff --git a/resources/views/equipamentos/edit.blade.php b/resources/views/equipamentos/edit.blade.php index 028d7e3..8d67750 100644 --- a/resources/views/equipamentos/edit.blade.php +++ b/resources/views/equipamentos/edit.blade.php @@ -10,7 +10,7 @@
-
+ @csrf @method('PUT') @@ -72,4 +72,4 @@
-@endsection \ No newline at end of file +@endsection diff --git a/resources/views/equipamentos/show.blade.php b/resources/views/equipamentos/show.blade.php index 0e828a5..67f422a 100644 --- a/resources/views/equipamentos/show.blade.php +++ b/resources/views/equipamentos/show.blade.php @@ -12,7 +12,7 @@
- + Voltar
diff --git a/resources/views/macs/index.blade.php b/resources/views/macs/index.blade.php index 777e291..169a593 100644 --- a/resources/views/macs/index.blade.php +++ b/resources/views/macs/index.blade.php @@ -11,7 +11,7 @@
  • {{ $mac->mac }} - {{ $mac->snapshot->coletado_em }} - - + {{ $mac->snapshot->porta->equipamento->hostname }} - {{ $mac->snapshot->porta->porta }} - @@ -21,4 +21,4 @@ {{ $macs->appends(request()->query())->links() }} -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/partials/search.blade.php b/resources/views/partials/search.blade.php index bfaf655..4beb6c1 100644 --- a/resources/views/partials/search.blade.php +++ b/resources/views/partials/search.blade.php @@ -1,4 +1,4 @@ -
    +
    @@ -27,4 +27,4 @@ function formatMAC(e) { }; macAddress.addEventListener("keyup", formatMAC, false); -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/patch-panels/create.blade.php b/resources/views/patch-panels/create.blade.php index f2c6540..192b93a 100644 --- a/resources/views/patch-panels/create.blade.php +++ b/resources/views/patch-panels/create.blade.php @@ -6,7 +6,7 @@

    Cadastrar Novo Patch Panel

    - + @csrf
    @@ -39,4 +39,4 @@
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/patch-panels/edit.blade.php b/resources/views/patch-panels/edit.blade.php index 7f1037e..b8f3b4e 100644 --- a/resources/views/patch-panels/edit.blade.php +++ b/resources/views/patch-panels/edit.blade.php @@ -6,7 +6,7 @@

    Editar Patch Panel: {{ $patchPanel->nome }}

    -
    + @csrf @method('PUT') @@ -38,4 +38,4 @@
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/patch-panels/editar-tipo-porta.blade.php b/resources/views/patch-panels/editar-tipo-porta.blade.php index 0b0a213..7452fd9 100644 --- a/resources/views/patch-panels/editar-tipo-porta.blade.php +++ b/resources/views/patch-panels/editar-tipo-porta.blade.php @@ -9,7 +9,7 @@
    -
    + @csrf @method('PUT') @@ -43,9 +43,9 @@
    - Cancelar + Cancelar
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/patch-panels/selecionar-sala.blade.php b/resources/views/patch-panels/selecionar-sala.blade.php index a293d27..ff49282 100644 --- a/resources/views/patch-panels/selecionar-sala.blade.php +++ b/resources/views/patch-panels/selecionar-sala.blade.php @@ -11,7 +11,7 @@
    @foreach($salasPredio as $sala) - Local: {{ $sala->nome }} @@ -19,8 +19,8 @@ class="list-group-item list-group-item-action">
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/patch-panels/selecionar-tipo-porta.blade.php b/resources/views/patch-panels/selecionar-tipo-porta.blade.php index 3209cfa..364a5d1 100644 --- a/resources/views/patch-panels/selecionar-tipo-porta.blade.php +++ b/resources/views/patch-panels/selecionar-tipo-porta.blade.php @@ -9,7 +9,7 @@
    -
    + @csrf @@ -41,9 +41,9 @@
    - Voltar + Voltar
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/patch-panels/show.blade.php b/resources/views/patch-panels/show.blade.php index 48f920d..fdbe037 100644 --- a/resources/views/patch-panels/show.blade.php +++ b/resources/views/patch-panels/show.blade.php @@ -13,7 +13,7 @@ Rack: {{ $patchPanel->rack->nome }} | Prédio: {{ $patchPanel->rack->predio->nome }} - + Voltar @@ -88,7 +88,7 @@ @if($vinculo && $vinculo->pivot->planta_id) - + Ver Planta @else @@ -98,11 +98,11 @@ @can('user') @if($vinculo)
    - Editar -
    + @csrf @method('DELETE')
    @else - + Vincular @endif @@ -126,4 +126,4 @@ class="btn btn-warning btn-sm"> -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/plantas/edit.blade.php b/resources/views/plantas/edit.blade.php index 9360deb..632c3bd 100644 --- a/resources/views/plantas/edit.blade.php +++ b/resources/views/plantas/edit.blade.php @@ -6,7 +6,7 @@
    Editar Planta Baixa: {{ $planta->name }}
    -
    + @csrf @method('PUT') @@ -107,7 +107,7 @@ class="form-control">
    - + Cancelar
    - + @csrf @@ -38,4 +38,4 @@ class="form-control"
    - \ No newline at end of file + diff --git a/resources/views/plantas/index.blade.php b/resources/views/plantas/index.blade.php index 53fb8ec..ec9c1b4 100644 --- a/resources/views/plantas/index.blade.php +++ b/resources/views/plantas/index.blade.php @@ -8,7 +8,7 @@

    {{ $predio->nome }}

    - + Voltar @@ -25,19 +25,19 @@
    {{ $planta->name }}
    - + Ver Planta - + Editar Planta - + Marcar Salas - + Marcar planta -
    + @csrf @method('delete')
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/plantas/mark.blade.php b/resources/views/plantas/mark.blade.php index 4be506b..7ea9be8 100644 --- a/resources/views/plantas/mark.blade.php +++ b/resources/views/plantas/mark.blade.php @@ -2,7 +2,7 @@
    - + ← Voltar @@ -22,7 +22,7 @@
    - Planta Baixa + Planta Baixa @include('plantas.partials.markers') @@ -38,7 +38,7 @@ Selecione o Ponto: - + @csrf @@ -138,6 +138,8 @@
    \ No newline at end of file + diff --git a/resources/views/plantas/public_show.blade.php b/resources/views/plantas/public_show.blade.php index bc4047d..1f25c1c 100644 --- a/resources/views/plantas/public_show.blade.php +++ b/resources/views/plantas/public_show.blade.php @@ -8,7 +8,7 @@
    - + ← Voltar @@ -16,7 +16,7 @@
    - + 📄 Exportar PDF @@ -38,7 +38,7 @@
    - {{ $planta->name }} + {{ $planta->name }} @include('plantas.partials.markers', ['markers' => $markers]) @@ -175,4 +175,4 @@ function initPanzoom() { } }, { passive: false }); -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/predios/create.blade.php b/resources/views/predios/create.blade.php index 581c7ed..026c7fc 100644 --- a/resources/views/predios/create.blade.php +++ b/resources/views/predios/create.blade.php @@ -6,7 +6,7 @@

    Cadastrar Novo Prédio

    - + @csrf
    @@ -21,9 +21,9 @@
    - Cancelar + Cancelar
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/predios/edit.blade.php b/resources/views/predios/edit.blade.php index c7cfbf0..153fce4 100644 --- a/resources/views/predios/edit.blade.php +++ b/resources/views/predios/edit.blade.php @@ -6,7 +6,7 @@

    Editar Prédio: {{ $predio->nome }}

    -
    + @csrf @method('PUT') @@ -22,9 +22,9 @@
    - Cancelar + Cancelar
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/predios/index.blade.php b/resources/views/predios/index.blade.php index 195588d..2dd8333 100644 --- a/resources/views/predios/index.blade.php +++ b/resources/views/predios/index.blade.php @@ -17,7 +17,7 @@
    @can('user') - + Adicionar Novo Prédio @endcan @@ -43,9 +43,9 @@ {{ $predio->nome }} {{ $predio->descricao ?? '-' }} - Ver - Editar -
    + Ver + Editar + @csrf @method('DELETE')
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/predios/show.blade.php b/resources/views/predios/show.blade.php index eda4fe9..e6fa1da 100644 --- a/resources/views/predios/show.blade.php +++ b/resources/views/predios/show.blade.php @@ -8,7 +8,7 @@

    {{ $predio->nome }}

    - + Voltar
    @@ -26,7 +26,7 @@

    Locais e Salas

    @can('user')
    - + Novo Local/Sala
    @@ -51,9 +51,9 @@ {{ $sala->nome }} {{ $sala->descricao }} - Ver - Editar - + Ver + Editar + @csrf @method('DELETE')
    - Ver Plantas + Ver Plantas @endsection diff --git a/resources/views/racks/create.blade.php b/resources/views/racks/create.blade.php index e1b840d..062e42e 100644 --- a/resources/views/racks/create.blade.php +++ b/resources/views/racks/create.blade.php @@ -6,7 +6,7 @@

    Cadastrar Novo Rack

    - + @csrf
    @@ -34,4 +34,4 @@
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/racks/edit.blade.php b/resources/views/racks/edit.blade.php index 8a2e5b3..e8361f2 100644 --- a/resources/views/racks/edit.blade.php +++ b/resources/views/racks/edit.blade.php @@ -6,7 +6,7 @@

    Editar Rack: {{ $rack->nome }}

    -
    + @csrf @method('PUT') @@ -33,4 +33,4 @@
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/racks/show.blade.php b/resources/views/racks/show.blade.php index 3eb57d8..abbfed7 100644 --- a/resources/views/racks/show.blade.php +++ b/resources/views/racks/show.blade.php @@ -11,7 +11,7 @@ Rack: {{ $rack->nome }} {{ $rack->predio->nome }} - + Voltar @@ -24,7 +24,7 @@

    Equipamentos

    @can('user') - + Novo @endcan @@ -50,13 +50,13 @@
    - + Ver - + Editar -
    + @csrf @method('DELETE')
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/salas/create.blade.php b/resources/views/salas/create.blade.php index e060c07..1b3bc8d 100644 --- a/resources/views/salas/create.blade.php +++ b/resources/views/salas/create.blade.php @@ -6,7 +6,7 @@

    Cadastrar Novo Local ou Sala

    - + @csrf
    diff --git a/resources/views/salas/edit.blade.php b/resources/views/salas/edit.blade.php index 5e3ca80..e22b4f9 100644 --- a/resources/views/salas/edit.blade.php +++ b/resources/views/salas/edit.blade.php @@ -6,7 +6,7 @@

    Editar Local: {{ $sala->nome }}

    - + @csrf @method('PUT')
    diff --git a/resources/views/salas/editar-tipo-porta.blade.php b/resources/views/salas/editar-tipo-porta.blade.php index 063833f..0adaba1 100644 --- a/resources/views/salas/editar-tipo-porta.blade.php +++ b/resources/views/salas/editar-tipo-porta.blade.php @@ -9,7 +9,7 @@
    - + @csrf @method('PUT') @@ -28,9 +28,9 @@
    - Cancelar + Cancelar
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/salas/markers.blade.php b/resources/views/salas/markers.blade.php index 19a0102..dc92932 100644 --- a/resources/views/salas/markers.blade.php +++ b/resources/views/salas/markers.blade.php @@ -5,7 +5,7 @@
    - + ← Voltar @@ -112,7 +112,9 @@ function updateFormAction() { const salaId = salaSelect.value; if (salaId) { - mainForm.action = `/salas/${salaId}/${plantaId}/mark`; + mainForm.action = @json(route('salas.mark', ['sala' => '__SALA__', 'planta' => '__PLANTA__'])) + .replace('__SALA__', salaId) + .replace('__PLANTA__', plantaId); inputDescricao.value = selectedOption.dataset.descricao || ""; } else { mainForm.action = ""; @@ -263,14 +265,17 @@ function setupMarkerDrag() { salaSelect.required = false; // Preenche os campos do formulário principal para atualização - mainForm.action = `/salas/${salaId}/${plantaId}/mark`; + mainForm.action = @json(route('salas.mark', ['sala' => '__SALA__', 'planta' => '__PLANTA__'])) + .replace('__SALA__', salaId) + .replace('__PLANTA__', plantaId); inputX.value = currentX; inputY.value = currentY; inputFontsize.value = salaFontsize; inputDescricao.value = salaDescricao; // Configura o formulário de deleção - deleteForm.action = `/salas/${salaId}/unmark`; + deleteForm.action = @json(route('salas.unmark', ['sala' => '__SALA__'])) + .replace('__SALA__', salaId); mainForm.style.display = 'block'; deleteForm.style.display = 'block'; @@ -366,4 +371,4 @@ function closeForm() { e.preventDefault(); } }, { passive: false }); - \ No newline at end of file + diff --git a/resources/views/salas/selecionar-patchpanel.blade.php b/resources/views/salas/selecionar-patchpanel.blade.php index 55e8fac..97d759a 100644 --- a/resources/views/salas/selecionar-patchpanel.blade.php +++ b/resources/views/salas/selecionar-patchpanel.blade.php @@ -21,7 +21,7 @@
    @foreach($patchPanels as $pp) - {{ $pp->nome }} @@ -38,7 +38,7 @@ class="list-group-item list-group-item-action {{ request('patch_panel_id') == $p $tipoPortas = \App\Models\TipoPorta::all(); @endphp
    -
    + @csrf @@ -91,7 +91,7 @@ class="list-group-item list-group-item-action {{ request('patch_panel_id') == $p
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/salas/selecionar-rack.blade.php b/resources/views/salas/selecionar-rack.blade.php index f07a31e..e3e258d 100644 --- a/resources/views/salas/selecionar-rack.blade.php +++ b/resources/views/salas/selecionar-rack.blade.php @@ -11,7 +11,7 @@
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/salas/show.blade.php b/resources/views/salas/show.blade.php index c3556ad..306fc82 100644 --- a/resources/views/salas/show.blade.php +++ b/resources/views/salas/show.blade.php @@ -14,7 +14,7 @@ Local: {{ $sala->nome }} {{ $sala->predio->nome }} - + Voltar
    @@ -23,7 +23,7 @@

    Portas Vinculadas

    @can('user') - + Vincular a uma Porta @endcan @@ -64,11 +64,11 @@ @can('user')
    - Editar tipo de porta - + @csrf @method('DELETE')
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/tipo-portas/create.blade.php b/resources/views/tipo-portas/create.blade.php index 4b3aa0a..3e9f026 100644 --- a/resources/views/tipo-portas/create.blade.php +++ b/resources/views/tipo-portas/create.blade.php @@ -6,7 +6,7 @@

    Cadastrar Novo Tipo de Porta

    - + @csrf {{-- Campo Nome --}} @@ -46,9 +46,9 @@ class="form-control" {{-- Ações --}}
    - Cancelar + Cancelar
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/tipo-portas/edit.blade.php b/resources/views/tipo-portas/edit.blade.php index 02337fc..e7c5950 100644 --- a/resources/views/tipo-portas/edit.blade.php +++ b/resources/views/tipo-portas/edit.blade.php @@ -6,7 +6,7 @@

    Editar Tipo de Porta: {{ $tipoPorta->nome }}

    -
    + @csrf @method('PUT') @@ -47,9 +47,9 @@ class="form-control" {{-- Ações --}}
    - Cancelar + Cancelar
    -@endsection \ No newline at end of file +@endsection diff --git a/resources/views/tipo-portas/index.blade.php b/resources/views/tipo-portas/index.blade.php index d95e6f9..24cfa64 100644 --- a/resources/views/tipo-portas/index.blade.php +++ b/resources/views/tipo-portas/index.blade.php @@ -7,7 +7,7 @@

    Tipos de Porta

    - + Novo Tipo @@ -30,8 +30,8 @@ {{ $tipoPorta->nome }}
    - Editar -
    + Editar + @csrf @method('DELETE')
    -@endsection \ No newline at end of file +@endsection diff --git a/routes/web.php b/routes/web.php index fd22731..5b9daf8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -10,94 +10,94 @@ use App\Http\Controllers\TipoPortaController; use App\Http\Controllers\PlantaController; -Route::get('/',[IndexController::class,'index']); +Route::get('/',[IndexController::class,'index'])->name('home'); // Prédios -Route::get('/predios', [PredioController::class, 'index']); -Route::get('/predios/create', [PredioController::class, 'create']); -Route::post('/predios', [PredioController::class, 'store']); -Route::get('/predios/{predio}', [PredioController::class, 'show']); -Route::get('/predios/{predio}/edit', [PredioController::class, 'edit']); -Route::put('/predios/{predio}', [PredioController::class, 'update']); -Route::delete('/predios/{predio}', [PredioController::class, 'destroy']); +Route::get('/predios', [PredioController::class, 'index'])->name('predios.index'); +Route::get('/predios/create', [PredioController::class, 'create'])->name('predios.create'); +Route::post('/predios', [PredioController::class, 'store'])->name('predios.store'); +Route::get('/predios/{predio}', [PredioController::class, 'show'])->name('predios.show'); +Route::get('/predios/{predio}/edit', [PredioController::class, 'edit'])->name('predios.edit'); +Route::put('/predios/{predio}', [PredioController::class, 'update'])->name('predios.update'); +Route::delete('/predios/{predio}', [PredioController::class, 'destroy'])->name('predios.destroy'); // Salas -Route::get('/salas/create', [SalaController::class, 'create']); -Route::post('/salas', [SalaController::class, 'store']); +Route::get('/salas/create', [SalaController::class, 'create'])->name('salas.create'); +Route::post('/salas', [SalaController::class, 'store'])->name('salas.store'); -Route::get('/salas/{planta}/markers', [SalaController::class, 'markers']); -Route::delete('/salas/{sala}/unmark', [SalaController::class, 'unmark']); -Route::put('/salas/{sala}/{planta}/mark', [SalaController::class, 'mark']); +Route::get('/salas/{planta}/markers', [SalaController::class, 'markers'])->name('salas.markers'); +Route::delete('/salas/{sala}/unmark', [SalaController::class, 'unmark'])->name('salas.unmark'); +Route::put('/salas/{sala}/{planta}/mark', [SalaController::class, 'mark'])->name('salas.mark'); -Route::get('/salas/{sala}', [SalaController::class, 'show']); -Route::get('/salas/{sala}/edit', [SalaController::class, 'edit']); -Route::put('/salas/{sala}', [SalaController::class, 'update']); -Route::delete('/salas/{sala}', [SalaController::class, 'destroy']); -Route::get('/salas/{planta}/mark', [PlantaController::class, 'mark']); +Route::get('/salas/{sala}', [SalaController::class, 'show'])->name('salas.show'); +Route::get('/salas/{sala}/edit', [SalaController::class, 'edit'])->name('salas.edit'); +Route::put('/salas/{sala}', [SalaController::class, 'update'])->name('salas.update'); +Route::delete('/salas/{sala}', [SalaController::class, 'destroy'])->name('salas.destroy'); +Route::get('/salas/{planta}/mark', [PlantaController::class, 'mark'])->name('salas.planta.mark'); // Racks -Route::get('/racks/create', [RackController::class, 'create']); -Route::post('/racks', [RackController::class, 'store']); -Route::get('/racks/{rack}', [RackController::class, 'show']); -Route::get('/racks/{rack}/edit', [RackController::class, 'edit']); -Route::put('/racks/{rack}', [RackController::class, 'update']); -Route::delete('/racks/{rack}', [RackController::class, 'destroy']); +Route::get('/racks/create', [RackController::class, 'create'])->name('racks.create'); +Route::post('/racks', [RackController::class, 'store'])->name('racks.store'); +Route::get('/racks/{rack}', [RackController::class, 'show'])->name('racks.show'); +Route::get('/racks/{rack}/edit', [RackController::class, 'edit'])->name('racks.edit'); +Route::put('/racks/{rack}', [RackController::class, 'update'])->name('racks.update'); +Route::delete('/racks/{rack}', [RackController::class, 'destroy'])->name('racks.destroy'); // Patch Panels -Route::get('/patch-panels/create', [PatchPanelController::class, 'create']); -Route::post('/patch-panels', [PatchPanelController::class, 'store']); -Route::get('/patch-panels/{patchPanel}', [PatchPanelController::class, 'show']); -Route::get('/patch-panels/{patchPanel}/edit', [PatchPanelController::class, 'edit']); -Route::put('/patch-panels/{patchPanel}', [PatchPanelController::class, 'update']); -Route::delete('/patch-panels/{patchPanel}', [PatchPanelController::class, 'destroy']); +Route::get('/patch-panels/create', [PatchPanelController::class, 'create'])->name('patch-panels.create'); +Route::post('/patch-panels', [PatchPanelController::class, 'store'])->name('patch-panels.store'); +Route::get('/patch-panels/{patchPanel}', [PatchPanelController::class, 'show'])->name('patch-panels.show'); +Route::get('/patch-panels/{patchPanel}/edit', [PatchPanelController::class, 'edit'])->name('patch-panels.edit'); +Route::put('/patch-panels/{patchPanel}', [PatchPanelController::class, 'update'])->name('patch-panels.update'); +Route::delete('/patch-panels/{patchPanel}', [PatchPanelController::class, 'destroy'])->name('patch-panels.destroy'); // Equipamentos -Route::get('/equipamentos/create', [EquipamentoController::class, 'create']); -Route::post('/equipamentos', [EquipamentoController::class, 'store']); -Route::get('/equipamentos/{equipamento}', [EquipamentoController::class, 'show']); -Route::get('/equipamentos/{equipamento}/edit', [EquipamentoController::class, 'edit']); -Route::put('/equipamentos/{equipamento}', [EquipamentoController::class, 'update']); -Route::delete('/equipamentos/{equipamento}', [EquipamentoController::class, 'destroy']); +Route::get('/equipamentos/create', [EquipamentoController::class, 'create'])->name('equipamentos.create'); +Route::post('/equipamentos', [EquipamentoController::class, 'store'])->name('equipamentos.store'); +Route::get('/equipamentos/{equipamento}', [EquipamentoController::class, 'show'])->name('equipamentos.show'); +Route::get('/equipamentos/{equipamento}/edit', [EquipamentoController::class, 'edit'])->name('equipamentos.edit'); +Route::put('/equipamentos/{equipamento}', [EquipamentoController::class, 'update'])->name('equipamentos.update'); +Route::delete('/equipamentos/{equipamento}', [EquipamentoController::class, 'destroy'])->name('equipamentos.destroy'); // Tipo Portas -Route::get('/tipo-portas', [TipoPortaController::class, 'index']); -Route::get('/tipo-portas/create', [TipoPortaController::class, 'create']); -Route::post('/tipo-portas', [TipoPortaController::class, 'store']); -Route::get('/tipo-portas/{tipoPorta}', [TipoPortaController::class, 'show']); -Route::get('/tipo-portas/{tipoPorta}/edit', [TipoPortaController::class, 'edit']); -Route::put('/tipo-portas/{tipoPorta}', [TipoPortaController::class, 'update']); -Route::delete('/tipo-portas/{tipoPorta}', [TipoPortaController::class, 'destroy']); +Route::get('/tipo-portas', [TipoPortaController::class, 'index'])->name('tipo-portas.index'); +Route::get('/tipo-portas/create', [TipoPortaController::class, 'create'])->name('tipo-portas.create'); +Route::post('/tipo-portas', [TipoPortaController::class, 'store'])->name('tipo-portas.store'); +Route::get('/tipo-portas/{tipoPorta}', [TipoPortaController::class, 'show'])->name('tipo-portas.show'); +Route::get('/tipo-portas/{tipoPorta}/edit', [TipoPortaController::class, 'edit'])->name('tipo-portas.edit'); +Route::put('/tipo-portas/{tipoPorta}', [TipoPortaController::class, 'update'])->name('tipo-portas.update'); +Route::delete('/tipo-portas/{tipoPorta}', [TipoPortaController::class, 'destroy'])->name('tipo-portas.destroy'); // Plantas -Route::get('/plantas/public/{planta}', [PlantaController::class, 'showPublic']); -Route::get('/plantas/pdf/{planta}', [PlantaController::class, 'pdfPublic']); -Route::post('/plantas/{predio}', [PlantaController::class, 'store']); -Route::get('/plantas/{planta}/edit', [PlantaController::class, 'edit']); -Route::get('/plantas/{planta}/mark', [PlantaController::class, 'editMark']); -Route::delete('/plantas/{patch_panel_sala_id}/unmark', [PlantaController::class, 'unmark']); -Route::put('/plantas/{planta}/mark', [PlantaController::class, 'mark']); -Route::put('/plantas/{planta}', [PlantaController::class, 'update']); -Route::get('/plantas/{predio}/{planta}', [PlantaController::class, 'show']); -Route::get('/plantas/{predio}', [PlantaController::class, 'index']); -Route::delete('/plantas/{predio}/{planta}', [PlantaController::class, 'destroy']); +Route::get('/plantas/public/{planta}', [PlantaController::class, 'showPublic'])->name('plantas.public'); +Route::get('/plantas/pdf/{planta}', [PlantaController::class, 'pdfPublic'])->name('plantas.pdf'); +Route::post('/plantas/{predio}', [PlantaController::class, 'store'])->name('plantas.store'); +Route::get('/plantas/{planta}/edit', [PlantaController::class, 'edit'])->name('plantas.edit'); +Route::get('/plantas/{planta}/mark', [PlantaController::class, 'editMark'])->name('plantas.mark'); +Route::delete('/plantas/{patch_panel_sala_id}/unmark', [PlantaController::class, 'unmark'])->name('plantas.unmark'); +Route::put('/plantas/{planta}/mark', [PlantaController::class, 'mark'])->name('plantas.mark.update'); +Route::put('/plantas/{planta}', [PlantaController::class, 'update'])->name('plantas.update'); +Route::get('/plantas/{predio}/{planta}', [PlantaController::class, 'show'])->name('plantas.show'); +Route::get('/plantas/{predio}', [PlantaController::class, 'index'])->name('plantas.index'); +Route::delete('/plantas/{predio}/{planta}', [PlantaController::class, 'destroy'])->name('plantas.destroy'); // Vincular portas de patch panels a salas -Route::get('/patch-panels/{patchPanel}/selecionar-sala', [PatchPanelController::class, 'selecionarSala']); -Route::get('/patch-panels/{patchPanel}/selecionar-tipo-porta/{sala}', [PatchPanelController::class, 'selecionarTipoPorta']); -Route::post('/patch-panels/{patchPanel}/vincular-sala', [PatchPanelController::class, 'vincularSala']); -Route::delete('/patch-panels/{patchPanel}/desvincular-sala/{sala}', [PatchPanelController::class, 'desvincularSala']); +Route::get('/patch-panels/{patchPanel}/selecionar-sala', [PatchPanelController::class, 'selecionarSala'])->name('patch-panels.selecionar-sala'); +Route::get('/patch-panels/{patchPanel}/selecionar-tipo-porta/{sala}', [PatchPanelController::class, 'selecionarTipoPorta'])->name('patch-panels.selecionar-tipo-porta'); +Route::post('/patch-panels/{patchPanel}/vincular-sala', [PatchPanelController::class, 'vincularSala'])->name('patch-panels.vincular-sala'); +Route::delete('/patch-panels/{patchPanel}/desvincular-sala/{sala}', [PatchPanelController::class, 'desvincularSala'])->name('patch-panels.desvincular-sala'); // Editar tipo de porta patch panels -Route::get('/patch-panels/{patchPanel}/editar-tipo-porta/{sala}', [PatchPanelController::class, 'editarTipoPorta']); -Route::put('/patch-panels/{patchPanel}/atualizar-tipo-porta/{sala}', [PatchPanelController::class, 'atualizarTipoPorta']); +Route::get('/patch-panels/{patchPanel}/editar-tipo-porta/{sala}', [PatchPanelController::class, 'editarTipoPorta'])->name('patch-panels.editar-tipo-porta'); +Route::put('/patch-panels/{patchPanel}/atualizar-tipo-porta/{sala}', [PatchPanelController::class, 'atualizarTipoPorta'])->name('patch-panels.atualizar-tipo-porta'); // Vincular salas a patch panels -Route::get('/salas/{sala}/selecionar-rack', [SalaController::class, 'selecionarRack']); -Route::get('/salas/{sala}/selecionar-patchpanel/{rack}', [SalaController::class, 'selecionarPatchPanel']); -Route::post('/salas/{sala}/vincular-patchpanel', [SalaController::class, 'vincularPatchPanel']); -Route::delete('/salas/{sala}/desvincular-patchpanel/{patchPanel}', [SalaController::class, 'desvincularPatchPanel']); +Route::get('/salas/{sala}/selecionar-rack', [SalaController::class, 'selecionarRack'])->name('salas.selecionar-rack'); +Route::get('/salas/{sala}/selecionar-patchpanel/{rack}', [SalaController::class, 'selecionarPatchPanel'])->name('salas.selecionar-patchpanel'); +Route::post('/salas/{sala}/vincular-patchpanel', [SalaController::class, 'vincularPatchPanel'])->name('salas.vincular-patchpanel'); +Route::delete('/salas/{sala}/desvincular-patchpanel/{patchPanel}', [SalaController::class, 'desvincularPatchPanel'])->name('salas.desvincular-patchpanel'); // Editar tipo de porta sakas -Route::get('/salas/{sala}/editar-tipo-porta/{patchPanel}', [SalaController::class, 'editarTipoPorta']); -Route::put('/salas/{sala}/atualizar-tipo-porta/{patchPanel}', [SalaController::class, 'atualizarTipoPorta']); \ No newline at end of file +Route::get('/salas/{sala}/editar-tipo-porta/{patchPanel}', [SalaController::class, 'editarTipoPorta'])->name('salas.editar-tipo-porta'); +Route::put('/salas/{sala}/atualizar-tipo-porta/{patchPanel}', [SalaController::class, 'atualizarTipoPorta'])->name('salas.atualizar-tipo-porta');