From db9c82f9dbcf6b81212a776a062bd12bfaaaf4c0 Mon Sep 17 00:00:00 2001
From: cp6 <cp6@users.noreply.github.com>
Date: Mon, 18 Jul 2022 14:44:16 +1000
Subject: [PATCH] Fixed server compare initial selection

Fixed server compare initial selection
Will now work without having to select (re-select) options
---
 .../views/servers/choose-compare.blade.php     | 18 ++++++++----------
 routes/web.php                                 |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/resources/views/servers/choose-compare.blade.php b/resources/views/servers/choose-compare.blade.php
index 58665fd..82154eb 100644
--- a/resources/views/servers/choose-compare.blade.php
+++ b/resources/views/servers/choose-compare.blade.php
@@ -10,6 +10,7 @@
         <div class="card shadow mt-3">
             <div class="card-body">
                 <a href="{{ route('servers.index') }}" class="btn btn-primary mb-3">Servers home</a>
+                @if(count($all_servers) >= 2)
                 <div class="row">
                     <div class="col-12 col-lg-6">
                         <div class="input-group">
@@ -28,7 +29,7 @@
                             <div class="input-group-prepend"><span class="input-group-text">Server2</span></div>
                             <select class="form-control" name="server2" @change="changeServer2($event)">
                                 @foreach ($all_servers as $server)
-                                    <option value="{{ $server['id'] }}">
+                                    <option value="{{ $server['id'] }}" {{($loop->index === 1)?'selected':''}}>
                                         {{ $server['hostname'] }}
                                     </option>
                                 @endforeach
@@ -36,13 +37,10 @@
                         </div>
                     </div>
                 </div>
-                <!--
-                <div class="input-group mt-4">
-                    <div class="input-group-prepend"><span class="input-group-text">URL</span></div>
-                    <input type="text" class="form-control" id="url" v-model="url_input" disabled>
-                </div>
--->
                 <a v-bind:href="full_url" class="btn btn-success mt-4">View comparison table</a>
+                @else
+                    <p class="text-danger">You need to have added a YABs to at least 2 servers to use this feature</p>
+                @endif
             </div>
         </div>
         @if(Session::has('timer_version_footer') && Session::get('timer_version_footer') === 1)
@@ -55,10 +53,10 @@
             el: "#app",
             data: {
                 "base_url": "servers-compare/",
-                "full_url": "",
+                "full_url": "{{route('servers.compare', ['server1' => $all_servers[0]->id, 'server2' => $all_servers[1]->id])}}",
                 "url_input": "",
-                "server1": "",
-                "server2": "",
+                "server1": "{{$all_servers[0]->id ?? ''}}",
+                "server2": "{{$all_servers[1]->id ?? ''}}",
             },
             methods: {
                 changeServer1: function changeServer1(event) {
diff --git a/routes/web.php b/routes/web.php
index f3ef6b8..60697fe 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -76,4 +76,4 @@ Route::get('yabs-compare/{yabs1}/{yabs2}', 'App\Http\Controllers\YabsController@
 
 Route::get('servers-compare-choose', 'App\Http\Controllers\ServerController@chooseCompare')->middleware(['auth'])->name('servers-compare-choose');
 
-Route::get('servers-compare/{server1}/{server2}', 'App\Http\Controllers\ServerController@compareServers')->middleware(['auth']);
+Route::get('servers-compare/{server1}/{server2}', 'App\Http\Controllers\ServerController@compareServers')->middleware(['auth'])->name('servers.compare');