diff --git a/README.md b/README.md index cb38e62..0a9fbe2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ domains, DNS and misc services. Despite what the name infers this self hosted web app isn't just for storing idling server information. By using -a [YABs](https://github.com/masonr/yet-another-bench-script) output you can get disk & network speed values along with +a [YABS](https://github.com/masonr/yet-another-bench-script) output you can get disk & network speed values along with GeekBench 5 scores to do easier comparing and sorting. [![Generic badge](https://img.shields.io/badge/version-2.1.8-blue.svg)](https://shields.io/) [![Generic badge](https://img.shields.io/badge/Laravel-9.0-red.svg)](https://shields.io/) [![Generic badge](https://img.shields.io/badge/PHP-8.1-purple.svg)](https://shields.io/) [![Generic badge](https://img.shields.io/badge/Bootstrap-5.1-pink.svg)](https://shields.io/) @@ -47,7 +47,7 @@ php artisan cache:clear * Updated `updatePricing()` to not need `$as_usd` parameter * Updated labels assigned insert * Updated order/sort by methods for pricing related columns -* Removed add YABs button on servers index page +* Removed add YABS button on servers index page ## Requires @@ -60,10 +60,10 @@ php artisan cache:clear * Add domains * [Auto get IP's from hostname](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-ips-from-hostname.gif) * [Check up/down status](https://cdn.write.corbpie.com/wp-content/uploads/2021/01/my-idlers-self-hosted-server-domain-information-ping-up-feature.gif) -* Get YABs data from output +* Get YABS data from output * Compare 2 servers -* Save & view YABs output -* Update YABs disk & network results +* Save & view YABS output +* Update YABS disk & network results * Next due date system * Multi currency compatibility * Multi payment-term compatibility @@ -295,7 +295,7 @@ or ```curl -sL yabs.sh | bash -s -- -r``` -**Make sure YABs output starts at the first line which is:** +**Make sure YABS output starts at the first line which is:** ```# ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## ## #``` diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index 98dc771..5850615 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -483,7 +483,7 @@ class ApiController extends Controller if ($insert) { Cache::forget('all_active_servers');//all servers cache Cache::forget('non_active_servers');//all servers cache - Cache::forget('all_yabs');//Forget the all YABs cache + Cache::forget('all_yabs');//Forget the all YABS cache return response()->json(array('message' => 'Successfully added YABS'), 200); } diff --git a/app/Http/Controllers/YabsController.php b/app/Http/Controllers/YabsController.php index 21c549f..2aae773 100644 --- a/app/Http/Controllers/YabsController.php +++ b/app/Http/Controllers/YabsController.php @@ -47,7 +47,7 @@ class YabsController extends Controller Cache::forget("yabs.{$yab->id}"); return redirect()->route('yabs.index') - ->with('success', 'YABs was deleted Successfully.'); + ->with('success', 'YABS was deleted Successfully.'); } public function chooseYabsCompare() diff --git a/app/Models/Server.php b/app/Models/Server.php index 7cec444..16ad201 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -193,7 +193,7 @@ class Server extends Model } public static function serverYabsAmount(string $server_id): int - {//Returns amount of YABs a server has + {//Returns amount of YABS a server has return DB::table('yabs') ->where('server_id', '=', $server_id) ->get()->count(); diff --git a/app/Models/Yabs.php b/app/Models/Yabs.php index 0aa9c40..df6d572 100644 --- a/app/Models/Yabs.php +++ b/app/Models/Yabs.php @@ -167,18 +167,18 @@ class Yabs extends Model $version = $data['version']; $has_ipv4 = $data['net']['ipv4']; $has_ipv6 = $data['net']['ipv6']; - //Os + //OS $arch = $data['os']['arch']; $distro = $data['os']['distro']; $kernel = $data['os']['kernel']; $uptime = $data['os']['uptime']; - //Cpu + //CPU $model = $data['cpu']['model']; $cores = $data['cpu']['cores']; $freq = $data['cpu']['freq']; $aes = $data['cpu']['aes']; $virt = $data['cpu']['virt']; - //Ram Disk + //RAM Disk $ram = $data['mem']['ram']; $swap = $data['mem']['swap']; $disk = $data['mem']['disk']; @@ -239,7 +239,7 @@ class Yabs extends Model 'gb5_id' => $gb5_id ]); - //Fio + //fio foreach ($data['fio'] as $ds) { if ($ds['bs'] === '4k') { $d4k = ($ds['speed_rw'] > 999999) ? ($ds['speed_rw'] / 1000 / 1000) : $ds['speed_rw'] / 1000; @@ -280,7 +280,7 @@ class Yabs extends Model 'd_1m_as_mbps' => $d1m_mbps ]); - //Iperf + //iperf foreach ($data['iperf'] as $st) { ($has_ipv4) ? $match = 'IPv4' : $match = 'IPv6'; if ($st['mode'] === $match) { diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 1d6e3c7..0792679 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -159,7 +159,7 @@

{{number_format($information['servers_summary']['ram_mb_sum'] / 1024, 2)}} GB

-

Ram

+

RAM

diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index 243e8d1..b7be5eb 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -37,7 +37,7 @@
  • OS
  • Providers
  • Seedboxes
    • -
  • YABs
    • +
  • YABS
  • Settings
  • Account
    • diff --git a/resources/views/servers/choose-compare.blade.php b/resources/views/servers/choose-compare.blade.php index a03c4bd..b76fbf2 100644 --- a/resources/views/servers/choose-compare.blade.php +++ b/resources/views/servers/choose-compare.blade.php @@ -39,7 +39,7 @@ View comparison table @else -

    You need to have added a YABs to at least 2 servers to use this feature

    +

    You need to have added a YABS to at least 2 servers to use this feature

    @endif diff --git a/resources/views/servers/compare.blade.php b/resources/views/servers/compare.blade.php index 2a7234e..4ae4f79 100644 --- a/resources/views/servers/compare.blade.php +++ b/resources/views/servers/compare.blade.php @@ -62,7 +62,7 @@ class="data-type">Mhz - Ram + RAM {{$server1_data[0]->yabs[0]->ram_mb}}MB {!! \App\Models\Server::tableRowCompare($server1_data[0]->yabs[0]->ram_mb, $server2_data[0]->yabs[0]->ram_mb, 'MB') !!} @@ -286,7 +286,7 @@ {{number_format($server2_data[0]->yabs[0]->disk_gb / $server2_data[0]->price->usd_per_month,2)}} - Ram MB per USD + RAM MB per USD {{number_format($server1_data[0]->yabs[0]->ram_mb / $server1_data[0]->price->usd_per_month,2)}} {!! \App\Models\Server::tableRowCompare($server1_data[0]->yabs[0]->ram_mb / $server1_data[0]->price->usd_per_month, $server2_data[0]->yabs[0]->ram_mb / $server2_data[0]->price->usd_per_month, '') !!} {{number_format($server2_data[0]->yabs[0]->ram_mb / $server2_data[0]->price->usd_per_month,2)}} diff --git a/resources/views/servers/create.blade.php b/resources/views/servers/create.blade.php index 8d58640..6a235b3 100644 --- a/resources/views/servers/create.blade.php +++ b/resources/views/servers/create.blade.php @@ -137,10 +137,10 @@
    -

    Note adding a YABs output will overwrite Ram, disk and CPU values.

    +

    Note adding a YABS output will overwrite RAM, disk and CPU values.

    - Ram + RAM ram 2024 100000 @@ -148,7 +148,7 @@
    - Ram type + RAM type ram_type
    diff --git a/resources/views/servers/edit.blade.php b/resources/views/servers/edit.blade.php index 7d12fb8..4bd4645 100644 --- a/resources/views/servers/edit.blade.php +++ b/resources/views/servers/edit.blade.php @@ -120,7 +120,7 @@
    -

    Note adding a YABs output will overwrite Ram, disk and CPU.

    +

    Note adding a YABS output will overwrite RAM, disk and CPU.

    CPU @@ -132,7 +132,7 @@
    - Ram + RAM ram {{$server_data->ram}} 100000 @@ -140,7 +140,7 @@
    - Ram type + RAM type ram_type {{$server_data->ram_type}} diff --git a/resources/views/servers/index-cards.blade.php b/resources/views/servers/index-cards.blade.php index ab009eb..1ed3b59 100644 --- a/resources/views/servers/index-cards.blade.php +++ b/resources/views/servers/index-cards.blade.php @@ -79,9 +79,9 @@
    @if(isset($server->yabs[0]->cpu_cores)) - YABs + YABS @else - YABs + YABS @endif
    diff --git a/resources/views/servers/show.blade.php b/resources/views/servers/show.blade.php index 85952a3..bb75ebd 100644 --- a/resources/views/servers/show.blade.php +++ b/resources/views/servers/show.blade.php @@ -204,7 +204,7 @@ @else -

    Please add a YABs to +

    Please add a YABS to see Geekbench, disk and network speeds:

    curl -sL yabs.sh | bash -s -- -s "{{route('api.store-yabs', [$server_data->id, \Illuminate\Support\Facades\Auth::user()->api_token])}}" @endif diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 8f55dcf..87648c2 100644 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -72,7 +72,7 @@
    - +

    Only if Show servers to public is YES do these apply:

    diff --git a/resources/views/yabs/choose-compare.blade.php b/resources/views/yabs/choose-compare.blade.php index 06d2999..7dec6dd 100644 --- a/resources/views/yabs/choose-compare.blade.php +++ b/resources/views/yabs/choose-compare.blade.php @@ -1,20 +1,20 @@ -@section("title", "Choose YABs to compare") +@section("title", "Choose YABS to compare") @section('scripts') @endsection - {{ __('Choose two YABs to compare') }} + {{ __('Choose two YABS to compare') }}
    - YABs home + YABS home @if(count($all_yabs) >= 2)
    -
    YABs 1
    +
    YABS 1
    @foreach ($all_yabs as $yabs)
    View comparison table @else -

    You need to have added at least 2 YABs to use this feature

    +

    You need to have added at least 2 YABS to use this feature

    @endif
    diff --git a/resources/views/yabs/compare.blade.php b/resources/views/yabs/compare.blade.php index 8c369db..882fc43 100644 --- a/resources/views/yabs/compare.blade.php +++ b/resources/views/yabs/compare.blade.php @@ -74,7 +74,7 @@ {{$yabs2_data[0]->cpu_freq}}Mhz - Ram + RAM {{$yabs1_data[0]->ram_mb}}MB {!! \App\Models\Server::tableRowCompare($yabs1_data[0]->ram_mb, $yabs2_data[0]->ram_mb, 'MB') !!} {{$yabs2_data[0]->ram_mb}}MB diff --git a/resources/views/yabs/index.blade.php b/resources/views/yabs/index.blade.php index 7e9beef..1828781 100644 --- a/resources/views/yabs/index.blade.php +++ b/resources/views/yabs/index.blade.php @@ -8,12 +8,12 @@ @endsection - {{ __('YABs') }} + {{ __('YABS') }}
    - Compare YABs + Compare YABS
    @@ -23,10 +23,10 @@ - + - + @@ -76,7 +76,7 @@ @endforeach @else - + @endif diff --git a/resources/views/yabs/show.blade.php b/resources/views/yabs/show.blade.php index 2352166..8f99910 100644 --- a/resources/views/yabs/show.blade.php +++ b/resources/views/yabs/show.blade.php @@ -1,7 +1,7 @@ @section("title", "{$yab[0]->hostname} {$yab[0]->id} YABS") - {{ __('YABs details') }} + {{ __('YABS details') }}
    @@ -34,7 +34,7 @@
    - +
    CPU CPU FREQ RAMDISKDisk GB5 S GB5 MIpv6IPv6 4k 64k 512k
    No YABs found.No YABS found.
    {{ $yab[0]->cpu_model }}
    RamRAM {{ $yab[0]->ram }} {{$yab[0]->ram_type}}