Mirrors/my-idlers
1
0
Fork 0
mirror of https://github.com/cp6/my-idlers.git synced 2024-11-16 15:33:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100 from cp6/main

Browse Source 
Dev to main
This commit is contained in:
corbpie 2023-09-26 22:50:33 +10:00 committed by GitHub
commit a3d172e3b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
README.md
View File

@ -6,9 +6,9 @@ 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
GeekBench 5 scores to do easier comparing and sorting.
GeekBench 5 & 6 scores to do easier comparing and sorting. Ofcourse storing other services e.g. web hosting is possible and supported too.
[![Generic badge](https://img.shields.io/badge/version-2.3.1-blue.svg)](https://shields.io/) [![Generic badge](https://img.shields.io/badge/Laravel-10.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.2-pink.svg)](https://shields.io/)
[![Generic badge](https://img.shields.io/badge/version-2.3.2-blue.svg)](https://shields.io/) [![Generic badge](https://img.shields.io/badge/Laravel-10.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.2-pink.svg)](https://shields.io/)
<img src="https://raw.githubusercontent.com/cp6/my-idlers/main/public/My%20Idlers%20logo.jpg" width="128" height="128" />
@ -20,14 +20,22 @@ GeekBench 5 scores to do easier comparing and sorting.
Currently seeking a project sponsor
## 2.3.1 changes (17th August 2023):
## 2.3.2 changes (26th September 2023):
* Updated resource files
* Updated composer.json
* Updated packages.json
* Fixed dashboard price summary including non active services
* Added tabs to the homepage for stats and avg summary cards
* Added Geekbench 6 columns to YABS table
* Added Geekbench 6 insert from YABS result
* Updated YABS insert to include Geekbench 5 results also
* Updated server show page and public show to display Geekbench 6 values
* Updated tests to pass
* Updated footer to only have one conditional check for the setting
* Updated homepage table to be rounded
* Fixed setting causing a fail with validation
* Fixed pricing cache not being refreshed
* Fixed object being accessed instead of array for certain models
* Removed unused Vue component
#### Please run the following if updating from existing install:
#### Please run the following if updating from an existing install:
```shell
composer update
@ -116,7 +124,7 @@ Example yabs.sh call to POST the result:
## TODO
Add Geekbench 6 single and multi-core scores
Add Geekbench 6 single and multi-core scores (On dev branch)
## API endpoints

13
app/Models/Labels.php
View File

@ -5,6 +5,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Cache;
use Mockery\Exception;
class Labels extends Model
{
@ -32,10 +33,14 @@ class Labels extends Model
{
for ($i = 1; $i <= 4; $i++) {
if (!is_null($labels_array[($i - 1)])) {
LabelsAssigned::create([
'label_id' => $labels_array[($i - 1)],
'service_id' => $service_id
]);
try {
LabelsAssigned::create([
'label_id' => $labels_array[($i - 1)],
'service_id' => $service_id
]);
} catch (Exception $exception) {
}
}
}
}

7
resources/views/servers/index.blade.php
View File

@ -47,10 +47,8 @@
@foreach($servers as $server)
<tr>
<td>{{ $server->hostname }}</td>
<td class="text-center">
{{ App\Models\Server::serviceServerType($server->server_type) }}
</td>
<td class="text-center">{!!App\Models\Server::osIntToIcon($server->os->id, $server->os->name)!!}</td>
<td class="text-center">{{ App\Models\Server::serviceServerType($server->server_type) }}</td>
<td class="text-center">@if(isset($server->os)){!!App\Models\Server::osIntToIcon($server->os->id, $server->os->name)!!}@endif</td>
<td class="text-center">{{$server->cpu}}</td>
<td class="text-center">
@if(isset($server->ram))
@ -83,7 +81,6 @@
class="text-body mx-1">
<i class="fas fa-pen" title="edit"></i>
</a>
<i class="fas fa-plug mx-1" id="{{$server->hostname}}"
title="check if up"
@click="checkIfUp">

2
tests/Feature/Auth/AuthenticationTest.php
View File

@ -13,6 +13,8 @@ class AuthenticationTest extends TestCase
public function test_login_screen_can_be_rendered()
{
$user = User::factory()->create();
$response = $this->get('/login');
$response->assertStatus(200);

7
tests/Feature/AuthenticationTest.php
View File

@ -11,13 +11,6 @@ class AuthenticationTest extends TestCase
{
use RefreshDatabase;
public function test_login_screen_can_be_rendered()
{
$response = $this->get('/login');
$response->assertStatus(200);
}
public function test_users_can_authenticate_using_the_login_screen()
{
$user = User::factory()->create();

21
tests/Feature/ExampleTest.php
View File

@ -1,21 +0,0 @@
<?php
namespace Tests\Feature;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
class ExampleTest extends TestCase
{
/**
* A basic test example.
*
* @return void
*/
public function testBasicTest()
{
$response = $this->get('/');
$response->assertStatus(200);
}
}