add racks management

app/Http/Controllers/OrganizationController.php

@@ -77,12 +77,6 @@ class OrganizationController extends Controller
         $this->authorize("show", $organization);
         return view("organization.show", array("organization" => $organization));
     }
-    
-    public function rack(Organization $organization)
-    {
-        $this->authorize("show", $organization);
-        return view("organization.rack", ["organization" => $organization]);
-    }
 
     public function dashboard(Organization $organization)
     {

app/Http/Controllers/RackController.php

+<?php
+
+namespace App\Http\Controllers;
+
+use App\Rack;
+use App\Organization;
+use Illuminate\Http\Request;
+
+class RackController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     */
+    public function index(Organization $organization)
+    {
+        $this->authorize("show", $organization);
+        return view("organization.rack", ["organization" => $organization]);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     */
+    public function create(Organization $organization)
+    {
+        return view("rack.edit", [
+            "rack" => new Rack(),
+            "organization" => $organization]);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     */
+    public function store(Organization $organization, Request $request)
+    {
+        return $this->save($organization, $request, new Rack());
+    }
+    
+    public function save(Organization $organization, Request $request, Rack $rack)
+    {
+        $request->validate([
+            "name" => "required|string",
+            "height" => "required|integer|min:1|max:50"
+        ]);
+        
+        $rack->name = $request->name;
+        $rack->height = $request->height;
+        $rack->organization_id = $organization->id;
+        $rack->save();
+        
+        return redirect(action("RackController@index", ["organization" => $organization]));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Rack  $rack
+     */
+    public function destroy(Rack $rack)
+    {
+        //
+    }
+}

app/Http/Controllers/ServerController.php

@@ -22,6 +22,7 @@ class ServerController extends Controller
             'name' => 'required|string|regex:/^[a-zA-Z0-9\s\-\.]+$/|max:255',
             "organization_id" => Rule::in(Auth::user()->organizations->modelKeys()),
             "description" => 'nullable|string',
+            "rack_id" => "required|integer",
             "size" => "nullable|int|min:0|max:48",
             "position" => "nullable|int|min:0|max:48"];
     }
@@ -94,6 +95,12 @@ class ServerController extends Controller
         $server->description = $request->description;
         $server->size = $request->size;
         $server->position = $request->position;
+        $server->rack_id = $request->rack_id;
+        
+        if ($server->rack_id == 0) {
+            $server->rack_id = null;
+        }
+        
         $server->save();
 
         return redirect(action("ServerController@show", ["server" => $server]));

app/Organization.php

@@ -43,12 +43,18 @@ class Organization extends Model
 
     public function users()
     {
-        return $this->belongsToMany("App\User");
+        return $this->belongsToMany(User::class);
     }
 
     public function servers()
     {
-        return $this->hasMany("App\Server");
+        return $this->hasMany(Server::class);
+    }
+    
+    
+    public function racks()
+    {
+        return $this->hasMany(Rack::class);
     }
 
     public function url() : string

app/Rack.php

+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Rack extends Model
+{
+    public function servers()
+    {
+        return $this->hasMany(Server::class);
+    }
+}

app/Server.php

@@ -199,4 +199,9 @@ class Server extends Model
         $converter = new CommonMarkConverter();
         return $converter->convertToHtml($this->description ?? '');
     }
+    
+    public function rack()
+    {
+        return $this->belongsTo(Rack::class);
+    }
 }

database/migrations/2024_04_04_110616_create_racks_table.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateRacksTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('racks', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->timestamps();
+            $table->integer("organization_id")->references("id")->on("organizations");
+            $table->string("name");
+            $table->integer("height");
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('racks');
+    }
+}

database/migrations/2024_04_04_134753_servers_add_rack_id.php

+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class ServersAddRackId extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->bigInteger("rack_id")
+                    ->nullable()
+                    ->references("id")->on("servers")
+                    ->onDelete('set null');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            //
+        });
+    }
+}

resources/views/organization/rack.blade.php

 @extends('layouts.app')
 
 @section('content')
-<div class="container-fluid pb-4">
+<div class="container-fluid pb-4 text-center">
     
-    <div class="rack size-42u">
-        @for ($i = 0; $i < 42; $i++)
-        <div class="slot" style="bottom: {{ 2*$i }}rem">
+    @foreach ($organization->racks as $rack)
+    <div class="rack size-{{ $rack->height + 1 }}u">
+        <div class="slot" style="top: 0">
+            {{ $rack->name }}
+        </div>
+        
+        @for ($i = 0; $i < $rack->height; $i++)
+        <div class="slot text-left" style="bottom: {{ 2*$i }}rem">
             {{ $i + 1 }}
         </div>
         @endfor
 
-        @foreach ($organization->servers as $server)
+        @foreach ($rack->servers as $server)
         @if ($server->size == 0)
             @continue
         @endif
-        <div class="server size-{{ $server->size }}u"
+        <div class="server text-left size-{{ $server->size }}u"
              style="bottom: {{ 2*($server->position - 1) }}rem;">
             <p>
                 <a href="{{ $server->getUrlAttribute() }}"
@@ -26,13 +31,6 @@
         </div>
         @endforeach
     </div>
-
-    <div class="rack size-12u">
-        @for ($i = 0; $i < 12; $i++)
-        <div class="slot" style="bottom: {{ 2*$i }}rem">
-            {{ $i + 1 }}
-        </div>
-        @endfor
-    </div>
+    @endforeach
 </div>
 @endsection

resources/views/organization/show.blade.php

@@ -30,7 +30,7 @@
         </a>
         
         <a class="btn btn-primary btn-sm"
-           href="{{ action("OrganizationController@rack", ["organization" => $organization]) }}">
+           href="{{ action("RackController@index", ["organization" => $organization]) }}">
             <i class="fas fa-server"></i> Rack view
         </a>
     </p>

resources/views/rack/edit.blade.php

+@extends('layouts.app')
+
+@section('content')
+<div class="container">
+    <div class="card">
+        <div class="card-header">Rack</div>
+
+        <div class="card-body">
+            @if (!$rack->exists)
+            <form method="POST" action="{{ action("RackController@store", ["organization" => $organization]) }}">
+            @else
+            <form method="POST"
+                  action="{{ action("RackController@update", ["rack" => $rack]) }}">
+            {{ method_field("PUT") }}
+            @endif
+                {{ csrf_field() }}
+
+                <div class="form-group">
+                    <label for="name">Name</label>
+
+                    <input id="name" type="text"
+                           class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}"
+                           name="name"
+                           value="{{ old('name', $rack->name) }}" autofocus>
+
+                    @if ($errors->has('name'))
+                        <span class="invalid-feedback">
+                            <strong>{{ $errors->first('name') }}</strong>
+                        </span>
+                    @endif
+                </div>
+
+                <div class="form-group">
+                    <label for="height">Height</label>
+
+                    <input id="height"
+                           type="number" min="1" max="50" step="1"
+                           class="form-control{{ $errors->has('height') ? ' is-invalid' : '' }}"
+                           name="height"
+                           value="{{ old('height', $rack->height) }}" autofocus>
+
+                    @if ($errors->has('name'))
+                        <span class="invalid-feedback">
+                            <strong>{{ $errors->first('name') }}</strong>
+                        </span>
+                    @endif
+                </div>
+
+                <div class="form-group">
+                    <button type="submit" class="btn btn-primary btn-sm">
+                        <i class="fas fa-check"></i> Save
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+@endsection

resources/views/server/edit.blade.php

@@ -28,10 +28,9 @@
                                 @foreach (Auth::user()->organizations as $organization)
                                 <option value="{{ $organization->id }}">{{ $organization->name }}</option>
                                 @endforeach
-
                             </select>
 
-                            @if ($errors->has('name'))
+                            @if ($errors->has('organization_id'))
                                 <span class="invalid-feedback">
                                     <strong>{{ $errors->first('organization_id') }}</strong>
                                 </span>
@@ -69,6 +68,26 @@
                             @endif
                         </div>
                         
+                        <div class="form-group">
+                            <label for="rack_id">Rack</label>
+
+                            <select id="rack_id"
+                                   class="form-control{{ $errors->has('rack_id') ? ' is-invalid' : '' }}"
+                                   name="rack_id">
+                                
+                                <option value="0">--</option>
+                                @foreach ($organization->racks as $rack)
+                                <option value="{{ $rack->id }}">{{ $rack->name }}</option>
+                                @endforeach
+                            </select>
+
+                            @if ($errors->has('organization_id'))
+                                <span class="invalid-feedback">
+                                    <strong>{{ $errors->first('organization_id') }}</strong>
+                                </span>
+                            @endif
+                        </div>
+                        
                         <div class="form-group">
                             <label for="size">Form factor</label>
 

resources/views/server/show.blade.php

@@ -44,6 +44,16 @@ window.monitorServerToken = "{{ $server->read_token }}";
             </p>
 
             <p>Uptime: {{ $server->info()->uptime() }}</p>
+            
+            @if (! is_null($server->rack_id))
+            <p>
+                Rack
+                <b>
+                    {{ $server->rack->name }}#{{ $server->position }} 
+                    [{{ $server->size }}u]
+                </b>
+            </p>
+            @endif
         </div>
     </div>
     

routes/web.php

@@ -51,8 +51,10 @@ Route::get(
     'app/organizations/{organization}/{token}/dashboard.json',
     'OrganizationDashboardController@json'
 );
-Route::get('app/organizations/{organization}/rack', 'OrganizationController@rack');
+
 Route::resource('app/organizations', 'OrganizationController');
 Route::resource("app/organizations.user", "OrganizationUserController")->only(["create", "store", "destroy"]);
+Route::resource("app/organizations.rack", 'RackController')->only(["index", "create", "store", "destroy"]);
 Route::resource('app/servers', 'ServerController')->except(["index"]);
+
 Route::get("app/records/{record}", "RecordController@show");