diff --git a/README.md b/README.md index 4a74d08..e4d4ccb 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Despite what the name infers this self hosted web app isn't just for storing idl 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.3-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.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/) @@ -20,13 +20,12 @@ GeekBench 5 scores to do easier comparing and sorting. Currently seeking a project sponsor -## 2.3 changes (31st March 2023): +## 2.3.1 changes (17th August 2023): -* Added ability to upload and use own favicon -* Removed unused CSS and JS asset files -* Updated `array()` usage to `[]` -* Removed setting for saving YABS to text file -* Updated Settings model, getSettings() now uses Eloquent rather than DB +* Updated resource files +* Updated composer.json +* Updated packages.json +* Fixed dashboard price summary including non active services #### Please run the following if updating from existing install: diff --git a/app/Models/Pricing.php b/app/Models/Pricing.php index 254a89a..c845728 100644 --- a/app/Models/Pricing.php +++ b/app/Models/Pricing.php @@ -143,8 +143,8 @@ class Pricing extends Model public static function allPricing() { - return Cache::remember('all_pricing', now()->addWeek(1), function () { - return Pricing::get(); + return Cache::remember('all_active_pricing', now()->addWeek(1), function () { + return Pricing::where('active', 1)->get(); }); } diff --git a/composer.json b/composer.json index 915779a..635beca 100644 --- a/composer.json +++ b/composer.json @@ -11,19 +11,19 @@ "license": "MIT", "require": { "php": "^8.1", - "guzzlehttp/guzzle": "^7.5", + "guzzlehttp/guzzle": "^7.7", "laravel/framework": "^10", "laravel/tinker": "^2.8", "laravel/ui": "^4.2", - "yajra/laravel-datatables-oracle": "~10.3", + "yajra/laravel-datatables-oracle": "~10.7", "ext-json": "*", "doctrine/dbal": "v3.6" }, "require-dev": { - "fakerphp/faker": "^1.21", - "laravel/breeze": "^1.19", - "laravel/sail": "^1.20", - "mockery/mockery": "^1.5", + "fakerphp/faker": "^1.23", + "laravel/breeze": "^1.22", + "laravel/sail": "^1.23", + "mockery/mockery": "^1.6", "nunomaduro/collision": "^7", "phpunit/phpunit": "^10", "spatie/laravel-ignition": "^2" diff --git a/package.json b/package.json index 45ad0a8..60407ed 100644 --- a/package.json +++ b/package.json @@ -11,22 +11,22 @@ "build": "webpack --config webpack.config.js" }, "devDependencies": { - "axios": "^0.21.4", - "bootstrap": "^5.2.3", + "axios": "^0.27.2", + "bootstrap": "^5.3.1", "bootstrap-dark-5": "^1.1.3", "bootstrap-data-table": "^1.0.0", "datatables": "^1.10.18", - "datatables.net-bs": "^1.13.2", + "datatables.net-bs": "^1.13.6", "font-awesome": "^4.7.0", - "jquery": "^3.6.3", + "jquery": "^3.7.0", "laravel-mix": "^6.0.49", "vue": "^2.7.14", - "vue-loader": "^17.0.1", + "vue-loader": "^17.2.2", "vue-resource": "^1.5.3", "vue-template-compiler": "^2.7.14" }, "dependencies": { - "@fortawesome/fontawesome-free": "^6.3.0", - "datatables.net-bs5": "^1.13.2" + "@fortawesome/fontawesome-free": "^6.4.2", + "datatables.net-bs5": "^1.13.6" } } diff --git a/public/css/app.css b/public/css/app.css index 2c36d2f..b17c09e 100644 Binary files a/public/css/app.css and b/public/css/app.css differ diff --git a/public/css/dark.css b/public/css/dark.css index d3c7f8d..8d8b7f6 100644 Binary files a/public/css/dark.css and b/public/css/dark.css differ diff --git a/public/css/light.css b/public/css/light.css index 67cdce2..c8c3364 100644 Binary files a/public/css/light.css and b/public/css/light.css differ diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf index 502f362..30f55b7 100644 Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf and b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf differ diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2 b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2 index d801b51..8a480d9 100644 Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2 and b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2 differ diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.ttf b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.ttf index e0abe27..c79589d 100644 Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.ttf and b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.ttf differ diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.woff2 b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.woff2 index d736e4b..059a94e 100644 Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.woff2 and b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.woff2 differ diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.ttf b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.ttf index 13c9489..e479fb2 100644 Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.ttf and b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.ttf differ diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff2 b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff2 index 3516fdb..88b0367 100644 Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff2 and b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff2 differ diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.ttf b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.ttf index dc29819..ba6cb25 100644 Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.ttf and b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.ttf differ diff --git a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.woff2 b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.woff2 index 28d46b1..23b1c47 100644 Binary files a/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.woff2 and b/public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.woff2 differ diff --git a/public/js/app.js b/public/js/app.js index 7a5e8e6..e08f2a3 100644 Binary files a/public/js/app.js and b/public/js/app.js differ diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php index 2f88afa..1ea5563 100644 --- a/resources/views/layouts/guest.blade.php +++ b/resources/views/layouts/guest.blade.php @@ -6,14 +6,25 @@ @yield('title') - @if (config()->has('app.name')) {{ config('app.name') }} @else My idlers @endif + - + @if(Session::get('dark_mode')) + + @else + + @endif + + + + @yield('css_links') + @yield('style') - {{ $slot }} + + @yield('scripts') diff --git a/resources/views/layouts/index.blade.php b/resources/views/layouts/index.blade.php index 6f73821..81f5155 100644 --- a/resources/views/layouts/index.blade.php +++ b/resources/views/layouts/index.blade.php @@ -9,17 +9,18 @@ @endif @yield('title') - @if (config()->has('app.name')){{ config('app.name') }} @else My idlers @endif + @if(Session::get('dark_mode')) - + @else - + @endif - + - @yield('css_style') - + @yield('css_links') + @yield('style')
@@ -33,7 +34,7 @@
@yield('content')
- + @yield('scripts')