From 5bb74230802547c7d76071955827ea4ed51e6f32 Mon Sep 17 00:00:00 2001
From: AnonDev <85408287+anondev-sudo@users.noreply.github.com>
Date: Sun, 7 Nov 2021 18:43:32 +0100
Subject: [PATCH 1/5] Update create.blade.php

---
 resources/views/servers/create.blade.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/resources/views/servers/create.blade.php b/resources/views/servers/create.blade.php
index 15c09060..3bb1d287 100644
--- a/resources/views/servers/create.blade.php
+++ b/resources/views/servers/create.blade.php
@@ -103,7 +103,7 @@
                                                 x-model="selectedNest"
                                                 @change="setNests();">
                                             <option selected disabled hidden
-                                                    value="null">{{count($nests) > 0 ? __('Please select software..') : __('---')}}</option>
+                                                    value="null">{{count($nests) > 0 ? __('Please select software ...') : __('---')}}</option>
                                             @foreach ($nests as $nest)
                                                 <option value="{{ $nest->id }}">{{ $nest->name }}</option>
                                             @endforeach
@@ -232,7 +232,7 @@
                                     <template x-if="selectedProductObject?.name">
                                        <ul class="pl-0">
                                            <li class="d-flex justify-content-between">
-                                               <small class="text-muted d-inline-block">{{__('Cpu')}}</small>
+                                               <small class="text-muted d-inline-block">{{__('CPU')}}</small>
                                                <small class="text-muted d-inline-block" x-text="selectedProductObject.cpu + ' %'"></small>
                                            </li>
                                            <div class="d-flex justify-content-between">
@@ -245,12 +245,16 @@
                                            </div>
                                            <div class="d-flex justify-content-between">
                                                <small class="text-muted d-inline-block">{{__('Databases')}}</small>
-                                               <small class="text-muted d-inline-block" x-text="selectedProductObject.databases + ' {{__('Mysql')}}'"></small>
+                                               <small class="text-muted d-inline-block" x-text="selectedProductObject.databases + ' {{__('MySQL')}}'"></small>
                                            </div>
                                            <div class="d-flex justify-content-between">
                                                <small class="text-muted d-inline-block">{{__('Backups')}}</small>
                                                <small class="text-muted d-inline-block" x-text="selectedProductObject.backups"></small>
                                            </div>
+                                           <div class="d-flex justify-content-between">
+                                               <small class="text-muted d-inline-block">{{__('Allocations (ports)')}}</small>
+                                               <small class="text-muted d-inline-block" x-text="selectedProductObject.allocations"></small>
+                                           </div>
                                        </ul>
                                     </template>
 
@@ -401,7 +405,7 @@
                 getNodeInputText() {
                     if (this.fetchedLocations) {
                         if (this.locations.length > 0) {
-                            return '{{__('Please select a node...')}}';
+                            return '{{__('Please select a node ...')}}';
                         }
                         return '{{__('No nodes found matching current configuration')}}'
                     }
@@ -411,7 +415,7 @@
                 getProductInputText() {
                     if (this.fetchedProducts) {
                         if (this.products.length > 0) {
-                            return '{{__('Please select a resource...')}}';
+                            return '{{__('Please select a resource ...')}}';
                         }
                         return '{{__('No resources found matching current configuration')}}'
                     }
@@ -420,7 +424,7 @@
 
                 getEggInputText() {
                     if (this.selectedNest) {
-                        return '{{__('Please select a configuration...')}}';
+                        return '{{__('Please select a configuration ...')}}';
                     }
                     return '{{__('---')}}';
                 },

From 848373da42df9510c4f0c8abb63788ab322e99c1 Mon Sep 17 00:00:00 2001
From: AnonDev <85408287+anondev-sudo@users.noreply.github.com>
Date: Sun, 7 Nov 2021 18:47:43 +0100
Subject: [PATCH 2/5] Change disk to storage as it's displayed on server
 creation page

---
 resources/views/servers/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/servers/index.blade.php b/resources/views/servers/index.blade.php
index acef35ef..a65e3f25 100644
--- a/resources/views/servers/index.blade.php
+++ b/resources/views/servers/index.blade.php
@@ -72,7 +72,7 @@
                                         <td>{{$server->product->memory}} MB</td>
                                     </tr>
                                     <tr>
-                                        <td>Disk</td>
+                                        <td>Storage</td>
                                         <td>{{$server->product->disk}} MB</td>
                                     </tr>
                                     <tr>

From 6717df5bea15f137f5258280ae274b4385e2dda3 Mon Sep 17 00:00:00 2001
From: AnonDev <85408287+anondev-sudo@users.noreply.github.com>
Date: Sun, 7 Nov 2021 18:57:29 +0100
Subject: [PATCH 3/5] Update index.blade.php

---
 resources/views/servers/index.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/servers/index.blade.php b/resources/views/servers/index.blade.php
index a65e3f25..acef35ef 100644
--- a/resources/views/servers/index.blade.php
+++ b/resources/views/servers/index.blade.php
@@ -72,7 +72,7 @@
                                         <td>{{$server->product->memory}} MB</td>
                                     </tr>
                                     <tr>
-                                        <td>Storage</td>
+                                        <td>Disk</td>
                                         <td>{{$server->product->disk}} MB</td>
                                     </tr>
                                     <tr>

From e0a1a499e5cbcad73c8cc3f384e0c8d8cee33091 Mon Sep 17 00:00:00 2001
From: AnonDev <85408287+anondev-sudo@users.noreply.github.com>
Date: Sun, 7 Nov 2021 18:58:08 +0100
Subject: [PATCH 4/5] Update create.blade.php

---
 resources/views/servers/create.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/servers/create.blade.php b/resources/views/servers/create.blade.php
index 3bb1d287..e22b2148 100644
--- a/resources/views/servers/create.blade.php
+++ b/resources/views/servers/create.blade.php
@@ -240,7 +240,7 @@
                                                <small class="text-muted d-inline-block" x-text="selectedProductObject.memory + ' {{__('MB')}}'"></small>
                                            </div>
                                            <div class="d-flex justify-content-between">
-                                               <small class="text-muted d-inline-block">{{__('Storage')}}</small>
+                                               <small class="text-muted d-inline-block">{{__('Disk')}}</small>
                                                <small class="text-muted d-inline-block" x-text="selectedProductObject.disk + ' {{__('MB')}}'"></small>
                                            </div>
                                            <div class="d-flex justify-content-between">

From c6ea21dd6d75404ed1dc71a6ebbab83a18ae23d2 Mon Sep 17 00:00:00 2001
From: AVMG20 <rijstenpap1234@hotmail.com>
Date: Fri, 12 Nov 2021 18:19:06 +0100
Subject: [PATCH 5/5] Fixed a bug where disabled products were stilled used in
 server create

---
 app/Http/Controllers/ProductController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Http/Controllers/ProductController.php b/app/Http/Controllers/ProductController.php
index 33738d52..7e83ef28 100644
--- a/app/Http/Controllers/ProductController.php
+++ b/app/Http/Controllers/ProductController.php
@@ -84,6 +84,7 @@ class ProductController extends Controller
         if (is_null($egg->id) || is_null($node->id)) return response()->json('node and egg id is required', '400');
 
         return Product::query()
+            ->where('disabled', '=', false)
             ->whereHas('nodes', function (Builder $builder) use ($node) {
                 $builder->where('id', '=', $node->id);
             })