diff --git a/app/Models/Yabs.php b/app/Models/Yabs.php index 4a9453b..a6e01b4 100644 --- a/app/Models/Yabs.php +++ b/app/Models/Yabs.php @@ -20,7 +20,7 @@ class Yabs extends Model protected $table = 'yabs'; - protected $fillable = ['id', 'server_id', 'has_ipv6', 'aes', 'vm', 'output_date', 'cpu_cores', 'cpu_freq', 'cpu_model', 'ram', 'ram_type', 'ram_mb', 'disk', 'disk_type', 'disk_gb', 'gb5_single', 'gb5_multi', 'gb5_id', '4k', '4k_type', '4k_as_mbps', '64k', '64k_type', '64k_as_mbps', '512k', '512k_type', '512k_as_mbps', '1m', '1m_type', '1m_as_mbps', 'location', 'send', 'send_type', 'send_as_mbps', 'receive', 'receive_type', 'receive_as_mbps', 'uptime', 'distro', 'kernel', 'swap', 'swap_type', 'swap_mb']; + protected $fillable = ['id', 'server_id', 'has_ipv6', 'aes', 'vm', 'output_date', 'cpu_cores', 'cpu_freq', 'cpu_model', 'ram', 'ram_type', 'ram_mb', 'disk', 'disk_type', 'disk_gb', 'gb5_single', 'gb5_multi', 'gb5_id', 'gb6_single', 'gb6_multi', 'gb6_id', '4k', '4k_type', '4k_as_mbps', '64k', '64k_type', '64k_as_mbps', '512k', '512k_type', '512k_as_mbps', '1m', '1m_type', '1m_as_mbps', 'location', 'send', 'send_type', 'send_as_mbps', 'receive', 'receive_type', 'receive_as_mbps', 'uptime', 'distro', 'kernel', 'swap', 'swap_type', 'swap_mb']; public static function yabs(string $yabs_id) { @@ -153,6 +153,11 @@ class Yabs extends Model return str_replace("https://browser.geekbench.com/v5/cpu/", "", $url); } + public static function gb6IdFromURL(string $url): int + { + return str_replace("https://browser.geekbench.com/v6/cpu/", "", $url); + } + public static function KBstoMBs(int $kbs): float { return $kbs / 1000; @@ -181,16 +186,18 @@ class Yabs extends Model $ram = $data['mem']['ram']; $swap = $data['mem']['swap']; $disk = $data['mem']['disk']; - if (isset($data['geekbench'][0]) && $data['geekbench'][0]['version'] === 5) { - $gb5_single = $data['geekbench'][0]['single']; - $gb5_multi = $data['geekbench'][0]['multi']; - $gb5_id = self::gb5IdFromURL($data['geekbench'][0]['url']); - } elseif (isset($data['geekbench'][1]) && $data['geekbench'][1]['version'] === 5) { - $gb5_single = $data['geekbench'][1]['single']; - $gb5_multi = $data['geekbench'][1]['multi']; - $gb5_id = self::gb5IdFromURL($data['geekbench'][1]['url']); - } else { - $gb5_single = $gb5_multi = $gb5_id = null; + + $gb5_single = $gb5_multi = $gb5_id = $gb6_single = $gb6_multi = $gb6_id = null; + foreach ($data['geekbench'] as $gb) { + if ($gb['version'] === 5) { + $gb5_single = $gb['single']; + $gb5_multi = $gb['multi']; + $gb5_id = self::gb5IdFromURL($gb['url']); + } elseif ($gb['version'] === 6) { + $gb6_single = $gb['single']; + $gb6_multi = $gb['multi']; + $gb6_id = self::gb6IdFromURL($gb['url']); + } } $yabs_id = Str::random(8); @@ -235,7 +242,10 @@ class Yabs extends Model 'output_date' => $date_ran, 'gb5_single' => $gb5_single, 'gb5_multi' => $gb5_multi, - 'gb5_id' => $gb5_id + 'gb5_id' => $gb5_id, + 'gb6_single' => $gb6_single, + 'gb6_multi' => $gb6_multi, + 'gb6_id' => $gb6_id ]); //fio diff --git a/database/migrations/2023_09_20_121309_add_gb6_to_yabs_table.php b/database/migrations/2023_09_20_121309_add_gb6_to_yabs_table.php new file mode 100644 index 0000000..c245fe3 --- /dev/null +++ b/database/migrations/2023_09_20_121309_add_gb6_to_yabs_table.php @@ -0,0 +1,25 @@ +integer('gb6_single')->nullable()->default(null)->after('gb5_id'); + $table->integer('gb6_multi')->nullable()->default(null)->after('gb5_id'); + $table->integer('gb6_id')->nullable()->default(null)->after('gb5_id'); + }); + } + + public function down(): void + { + Schema::table('yabs', function (Blueprint $table) { + $table->dropColumn('gb6_single'); + $table->dropColumn('gb6_multi'); + $table->dropColumn('gb6_id'); + }); + } +}; diff --git a/resources/views/components/details-footer.blade.php b/resources/views/components/details-footer.blade.php index c314195..048e7ae 100644 --- a/resources/views/components/details-footer.blade.php +++ b/resources/views/components/details-footer.blade.php @@ -1,4 +1,4 @@ -@if(Session::has('timer_version_footer') && Session::get('timer_version_footer') === 1) +@if(Session::get('timer_version_footer', 0) === 1)

Built on Laravel v{{ Illuminate\Foundation\Application::VERSION }} (PHP v{{ PHP_VERSION }})

@endif diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index c9ed798..9054886 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -289,7 +289,7 @@ @endif @endif - @if(Session::has('timer_version_footer') && Session::get('timer_version_footer') === 1) + @if(Session::get('timer_version_footer', 0) === 1)

Page took {{$information['execution_time']}} seconds, Built on Laravel v{{ Illuminate\Foundation\Application::VERSION }} (PHP v{{ PHP_VERSION }}), Rates By Exchange Rate API diff --git a/resources/views/servers/public-index.blade.php b/resources/views/servers/public-index.blade.php index 3c41588..c6db96a 100644 --- a/resources/views/servers/public-index.blade.php +++ b/resources/views/servers/public-index.blade.php @@ -22,8 +22,8 @@ Provider Price Had since - GB5 S - GB5 M + GB6 S + GB6 M 4k 64k 512k @@ -76,12 +76,12 @@ {{ $s->owned_since }} @if(Session::get('show_server_value_yabs') === 1) - {{$s->yabs[0]->gb5_single ?? null}} + {{$s->yabs[0]->gb6_single ?? null}} @endif @if(Session::get('show_server_value_yabs') === 1) - {{$s->yabs[0]->gb5_multi ?? null}} + {{$s->yabs[0]->gb6_multi ?? null}} @endif diff --git a/resources/views/servers/show.blade.php b/resources/views/servers/show.blade.php index 8d713d5..5693616 100644 --- a/resources/views/servers/show.blade.php +++ b/resources/views/servers/show.blade.php @@ -150,6 +150,10 @@

+ + + +
GB6 S/M{{$server_data->yabs[0]->gb6_single ?? null}} / {{$server_data->yabs[0]->gb6_multi ?? null}}
CPU {{$server_data->yabs[0]->cpu_model}}