Merge remote-tracking branch 'upstream/development' into HEAD

EotvosCollegium · Mar 7, 2024 · 7db0b97 · 7db0b97
2 parents a5616ec + ff86a6c
commit 7db0b97
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 43 deletions.
diff --git a/app/Http/Controllers/Network/RouterController.php b/app/Http/Controllers/Network/RouterController.php
@@ -18,11 +18,11 @@ public function index()
         return view('network.routers.list', ['routers' => $routers]);
     }
 
-    public function view(Router $ip)
+    public function view(Router $router)
     {
-        $this->authorize('view', $ip);
+        $this->authorize('view', $router);
 
-        return view('network.routers.view', ['router' => $ip]);
+        return view('network.routers.view', ['router' => $router]);
     }
 
     public function create()
@@ -38,7 +38,7 @@ public function store(Request $request)
 
         Validator::make($request->all(), [
             'ip' => 'required|max:15|ip|unique:routers,ip',
-            'room' => 'required|integer',
+            'room' => 'required|max:5',
             'mac_WAN' => ['nullable', 'regex:/^(([a-f0-9]{2}[-:]){5}([a-f0-9]{2}))$/i'],
             'mac_2G_LAN' => ['nullable', 'regex:/^(([a-f0-9]{2}[-:]){5}([a-f0-9]{2}))$/i'],
             'mac_5G' => ['nullable', 'regex:/^(([a-f0-9]{2}[-:]){5}([a-f0-9]{2}))$/i'],
@@ -50,36 +50,36 @@ public function store(Request $request)
         return redirect(route('routers'));
     }
 
-    public function edit(Router $ip)
+    public function edit(Router $router)
     {
         $this->authorize('update', Router::class);
 
-        return view('network.routers.edit', ['router' => $ip]);
+        return view('network.routers.edit', ['router' => $router]);
     }
 
-    public function update(Request $request, Router $ip)
+    public function update(Request $request, Router $router)
     {
         $this->authorize('update', Router::class);
 
         Validator::make($request->all(), [
-            'ip' => 'required|max:15|ip|unique:routers,ip',
-            'room' => 'required|integer',
+            'ip' => ['required', 'max:15', 'ip', \Illuminate\Validation\Rule::unique('routers')->ignore($router)],
+            'room' => 'required|max:5',
             'mac_WAN' => ['nullable', 'regex:/^(([a-f0-9]{2}[-:]){5}([a-f0-9]{2}))$/i'],
             'mac_2G_LAN' => ['nullable', 'regex:/^(([a-f0-9]{2}[-:]){5}([a-f0-9]{2}))$/i'],
             'mac_5G' => ['nullable', 'regex:/^(([a-f0-9]{2}[-:]){5}([a-f0-9]{2}))$/i'],
             'comment' => 'max:255',
         ])->validate();
 
-        $ip->update($request->all());
+        $router->update($request->all());
 
-        return view('network.routers.view', ['router' => $ip]);
+        return redirect(route('routers.view', $router));
     }
 
-    public function delete(Router $ip)
+    public function delete(Router $router)
     {
         $this->authorize('delete', Router::class);
 
-        $ip->delete();
+        $router->delete();
 
         return redirect(route('routers'));
     }

diff --git a/composer.lock b/composer.lock
diff --git a/database/migrations/2024_03_03_194700_change_room_datatype_routers.php b/database/migrations/2024_03_03_194700_change_room_datatype_routers.php
@@ -0,0 +1,31 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class () extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('routers', function (Blueprint $table) {
+            $table->text('room')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('routers', function (Blueprint $table) {
+            $table->smallInteger('room')->change();
+        });
+    }
+};
diff --git a/resources/views/network/routers/create.blade.php b/resources/views/network/routers/create.blade.php
@@ -3,7 +3,7 @@
 @section('title')
 <a href="#!" class="breadcrumb">@lang('general.admin')</a>
 <a href="{{ route('routers') }}" class="breadcrumb" style="cursor: pointer">@lang('router.router_monitor')</a>
-<a href="#!" class="breadcrumb">@lang('general.add_new')</a>
+<a href="#!" class="breadcrumb">@lang('router.new')</a>
 @endsection
 @section('admin_module') active @endsection
 
@@ -15,21 +15,21 @@
             <form action="{{ route('routers.store') }}" method="POST">
                 @csrf
                 <div class="card-content">
-                    <span class="card-title">Új router</span>
+                    <span class="card-title">@lang('router.new')</span>
                     <div class="row">
                         <x-input.textarea s="6" type="text" text="router.ip" id="ip" maxlength="15" required/>
-                        <x-input.text s="6" type="number" text="router.room" id="room" min="1" max="500" required/>
+                        <x-input.textarea s="6" type="text" text="router.room" id="room" min="1" max="500" required/>
                     </div>
                     <div class="row">
                         <x-input.textarea s="4" type="text" text="router.port" id="port"/>
                         <x-input.textarea s="4" type="text" text="router.type" id="type"/>
                         <x-input.textarea s="4" type="text" text="router.serial_number" id="serial_number"/>
                     </div>
-                    <div><p>MAC cím</p></div>
+                    <div><p>@lang('internet.mac_address')</p></div>
                     <div class="row">
-                        <x-input.textarea s="4" type="text" text="WAN" id="mac_wan"/>
-                        <x-input.textarea s="4" type="text" text="2G/LAN" id="mac_2g_lan"/>
-                        <x-input.textarea s="4" type="text" text="5G" id="mac_5g"/>
+                        <x-input.textarea s="4" type="text" text="WAN" id="mac_WAN"/>
+                        <x-input.textarea s="4" type="text" text="2G/LAN" id="mac_2G_LAN"/>
+                        <x-input.textarea s="4" type="text" text="5G" id="mac_5G"/>
                     </div>
                     <div class="row">
                         <x-input.textarea type="text" id="comment" text="general.comment" maxlength="255"/>
@@ -39,8 +39,10 @@
                         <x-input.text s="6" type="date" id="date_of_deployment" text="router.date_of_deployment"/>
                     </div>
                 </div>
-                <div class="card-action right-align">
-                    <button type="submit" class="waves-effect btn">Mentés</button>
+                <div class="card-action">
+                    <div class="row" style="margin:0">
+                        <x-input.button text="general.save" class="right"/>
+                    </div>
                 </div>
             </form>
         </div>

diff --git a/resources/views/network/routers/edit.blade.php b/resources/views/network/routers/edit.blade.php
@@ -12,21 +12,20 @@
 <div class="row">
     <div class="col s12">
         <div class="card">
-            <form action="{{ route('routers.update', $router->ip) }}" method="POST">
+            <form action="{{ route('routers.update', $router) }}" method="POST">
                 @csrf
                 <div class="card-content">
-                    <span class="card-title">Módosítás</span>
+                    <span class="card-title">@lang('router.edit')</span>
                     <div class="row">
                         <x-input.textarea s="6" type="text" text="router.ip" id="ip" maxlength="15" required>{{ $router->ip }}</x-input.textarea>
-                        <x-input.text s="6" type="number" text="router.room" id="room" min="1" max="500" :value="$router->room" required>
-                        </x-input.text>
+                        <x-input.textarea s="6" type="text" text="router.room" id="room" min="1" max="500" required>{{ $router->room }}</x-input.textarea>
                     </div>
                     <div class="row">
                         <x-input.textarea s="4" type="text" text="router.port" id="port">{{ $router->port }}</x-input.textarea>
                         <x-input.textarea s="4" type="text" text="router.type" id="type">{{ $router->type }}</x-input.textarea>
                         <x-input.textarea s="4" type="text" text="router.serial_number" id="serial_number">{{ $router->serial_number }}</x-input.textarea>
                     </div>
-                    <div><p>MAC cím</p></div>
+                    <div><p>@lang('internet.mac_address')</p></div>
                     <div class="row">
                         <x-input.textarea s="4" type="text" text="WAN" id="mac_WAN">{{ $router->mac_WAN }}</x-input.textarea>
                         <x-input.textarea s="4" type="text" text="2G/LAN" id="mac_2G_LAN">{{ $router->mac_2G_LAN }}</x-input.textarea>
@@ -36,8 +35,8 @@
                         <x-input.textarea type="text" id="comment" text="general.comment" maxlength="255">{{ $router->comment }}</x-input.textarea>
                     </div>
                     <div class="row">
-                        <x-input.datepicker s="6" id="date_of_acquisition" text="router.date_of_acquisition" value="{{ $router->date_of_acquisition }}"/>
-                        <x-input.datepicker s="6" id="date_of_deployment" text="router.date_of_deployment" value="{{ $router->date_of_deployment }}"/>
+                        <x-input.text s="6" type="date" id="date_of_acquisition" text="router.date_of_acquisition" value="{{ $router->date_of_acquisition }}"/>
+                        <x-input.text s="6" type="date" id="date_of_deployment" text="router.date_of_deployment" value="{{ $router->date_of_deployment }}"/>
                     </div>
                 </div>
                 <div class="card-action">

diff --git a/resources/views/network/routers/list.blade.php b/resources/views/network/routers/list.blade.php
@@ -58,7 +58,7 @@
                             </td>
                             @can('view', $router)
                                 <td>
-                                    <a href="{{ route('routers.view', $router->ip) }}" class="btn-floating waves-effect waves-light right">
+                                    <a href="{{ route('routers.view', $router) }}" class="btn-floating waves-effect waves-light right">
                                         <i class="material-icons">remove_red_eye</i>
                                     </a>
                                 </td>

diff --git a/resources/views/network/routers/view.blade.php b/resources/views/network/routers/view.blade.php
@@ -15,10 +15,10 @@
             <div class="card-content">
                 <span class="card-title">@lang('router.router')
                     @can('update', $router)
-                        <x-input.button :href="route('routers.edit', $router->ip)" floating class="right" icon="edit" />
+                        <x-input.button :href="route('routers.edit', $router)" floating class="right" icon="edit" />
                     @endcan
                     @can('delete', $router)
-                        <form action="{{ route('routers.delete', $router->ip) }}" method="POST" class="right" style="margin-right:10px">
+                        <form action="{{ route('routers.delete', $router) }}" method="POST" class="right" style="margin-right:10px">
                             @csrf
                             <x-input.button floating icon="delete" class="red" />
                         </form>

diff --git a/routes/web.php b/routes/web.php
@@ -155,10 +155,10 @@
     Route::get('/routers', [RouterController::class, 'index'])->name('routers');
     Route::get('/routers/create', [RouterController::class, 'create'])->name('routers.create');
     Route::post('/routers/create', [RouterController::class, 'store'])->name('routers.store');
-    Route::get('/routers/{ip}', [RouterController::class, 'view'])->name('routers.view');
-    Route::get('/routers/{ip}/edit', [RouterController::class, 'edit'])->name('routers.edit');
-    Route::post('/routers/{ip}/edit', [RouterController::class, 'update'])->name('routers.update');
-    Route::post('/routers/{ip}/delete', [RouterController::class, 'delete'])->name('routers.delete');
+    Route::get('/routers/{router}', [RouterController::class, 'view'])->name('routers.view');
+    Route::get('/routers/{router}/edit', [RouterController::class, 'edit'])->name('routers.edit');
+    Route::post('/routers/{router}/edit', [RouterController::class, 'update'])->name('routers.update');
+    Route::post('/routers/{router}/delete', [RouterController::class, 'delete'])->name('routers.delete');
 
     /** Registration handling */
     Route::middleware(['can:registration.handle'])->group(function () {