swapnil/my-idlers
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
cp6 2023-08-18 19:26:14 +10:00
commit 65f0474ebe
18 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@ -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 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 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/)
<img src="https://raw.githubusercontent.com/cp6/my-idlers/main/public/My%20Idlers%20logo.jpg" width="128" height="128" /> <img src="https://raw.githubusercontent.com/cp6/my-idlers/main/public/My%20Idlers%20logo.jpg" width="128" height="128" />
@ -20,13 +20,12 @@ GeekBench 5 scores to do easier comparing and sorting.
Currently seeking a project sponsor 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 * Updated resource files
* Removed unused CSS and JS asset files * Updated composer.json
* Updated `array()` usage to `[]` * Updated packages.json
* Removed setting for saving YABS to text file * Fixed dashboard price summary including non active services
* Updated Settings model, getSettings() now uses Eloquent rather than DB
#### Please run the following if updating from existing install: #### Please run the following if updating from existing install:

4
app/Models/Pricing.php
View File

@ -143,8 +143,8 @@ class Pricing extends Model
public static function allPricing() public static function allPricing()
{ {
return Cache::remember('all_pricing', now()->addWeek(1), function () { return Cache::remember('all_active_pricing', now()->addWeek(1), function () {
return Pricing::get(); return Pricing::where('active', 1)->get();
}); });
} }

12
composer.json
View File

@ -11,19 +11,19 @@
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": "^8.1", "php": "^8.1",
"guzzlehttp/guzzle": "^7.5", "guzzlehttp/guzzle": "^7.7",
"laravel/framework": "^10", "laravel/framework": "^10",
"laravel/tinker": "^2.8", "laravel/tinker": "^2.8",
"laravel/ui": "^4.2", "laravel/ui": "^4.2",
"yajra/laravel-datatables-oracle": "~10.3", "yajra/laravel-datatables-oracle": "~10.7",
"ext-json": "*", "ext-json": "*",
"doctrine/dbal": "v3.6" "doctrine/dbal": "v3.6"
}, },
"require-dev": { "require-dev": {
"fakerphp/faker": "^1.21", "fakerphp/faker": "^1.23",
"laravel/breeze": "^1.19", "laravel/breeze": "^1.22",
"laravel/sail": "^1.20", "laravel/sail": "^1.23",
"mockery/mockery": "^1.5", "mockery/mockery": "^1.6",
"nunomaduro/collision": "^7", "nunomaduro/collision": "^7",
"phpunit/phpunit": "^10", "phpunit/phpunit": "^10",
"spatie/laravel-ignition": "^2" "spatie/laravel-ignition": "^2"

14
package.json
View File

@ -11,22 +11,22 @@
"build": "webpack --config webpack.config.js" "build": "webpack --config webpack.config.js"
}, },
"devDependencies": { "devDependencies": {
"axios": "^0.21.4", "axios": "^0.27.2",
"bootstrap": "^5.2.3", "bootstrap": "^5.3.1",
"bootstrap-dark-5": "^1.1.3", "bootstrap-dark-5": "^1.1.3",
"bootstrap-data-table": "^1.0.0", "bootstrap-data-table": "^1.0.0",
"datatables": "^1.10.18", "datatables": "^1.10.18",
"datatables.net-bs": "^1.13.2", "datatables.net-bs": "^1.13.6",
"font-awesome": "^4.7.0", "font-awesome": "^4.7.0",
"jquery": "^3.6.3", "jquery": "^3.7.0",
"laravel-mix": "^6.0.49", "laravel-mix": "^6.0.49",
"vue": "^2.7.14", "vue": "^2.7.14",
"vue-loader": "^17.0.1", "vue-loader": "^17.2.2",
"vue-resource": "^1.5.3", "vue-resource": "^1.5.3",
"vue-template-compiler": "^2.7.14" "vue-template-compiler": "^2.7.14"
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-free": "^6.3.0", "@fortawesome/fontawesome-free": "^6.4.2",
"datatables.net-bs5": "^1.13.2" "datatables.net-bs5": "^1.13.6"
} }
} }

BIN
public/css/app.css vendored
View File

Binary file not shown.

BIN
public/css/dark.css vendored
View File

Binary file not shown.

BIN
public/css/light.css vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2 vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.ttf vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.woff2 vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.ttf vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff2 vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.ttf vendored
View File

Binary file not shown.

BIN
public/fonts/vendor/@fortawesome/fontawesome-free/webfa-v4compatibility.woff2 vendored
View File

Binary file not shown.

BIN
public/js/app.js vendored
View File

Binary file not shown.

15
resources/views/layouts/guest.blade.php
View File

@ -6,14 +6,25 @@
<meta name="csrf-token" content="{{ csrf_token() }}"> <meta name="csrf-token" content="{{ csrf_token() }}">
<title>@yield('title') - @if (config()->has('app.name')) {{ config('app.name') }} @else My idlers @endif</title> <title>@yield('title') - @if (config()->has('app.name')) {{ config('app.name') }} @else My idlers @endif</title>
<link rel="icon" type="image" href="{{asset(Session::get('favicon') ?? 'favicon.ico')}}"/>
<link rel="stylesheet" href="{{ asset('css/bootstrap.min.css') }}"> @if(Session::get('dark_mode'))
<link rel="stylesheet" href="{{ asset('css/dark.css') }}">
@else
<link rel="stylesheet" href="{{ asset('css/light.css') }}">
@endif
<link rel="stylesheet" href="{{ asset('css/app.css') }}">
@yield('css_links')
@yield('style')
<x-form-style></x-form-style> <x-form-style></x-form-style>
<script src="{{ asset('js/bootstrap.min.js') }}" defer></script>
</head> </head>
<body> <body>
{{ $slot }} {{ $slot }}
<script src="{{ asset('js/app.js') }}" defer></script>
@yield('scripts')
</body> </body>
</html> </html>

13
resources/views/layouts/index.blade.php
View File

@ -9,17 +9,18 @@
@endif @endif
<title>@yield('title') - @if (config()->has('app.name')){{ config('app.name') }} @else My idlers @endif</title> <title>@yield('title') - @if (config()->has('app.name')){{ config('app.name') }} @else My idlers @endif</title>
<link rel="icon" type="image" href="{{asset(Session::get('favicon') ?? 'favicon.ico')}}"/>
@if(Session::get('dark_mode')) @if(Session::get('dark_mode'))
<link rel="stylesheet" href="{{ asset('css/bootstrap-dark.min.css') }}"> <link rel="stylesheet" href="{{ asset('css/dark.css') }}">
@else @else
<link rel="stylesheet" href="{{ asset('css/bootstrap.min.css') }}"> <link rel="stylesheet" href="{{ asset('css/light.css') }}">
@endif @endif
<link rel="stylesheet" href="{{ asset('css/fa.min.css') }}"> <link rel="stylesheet" href="{{ asset('css/app.css') }}">
@yield('css_style') @yield('css_links')
<script src="{{ asset('js/vue.min.js') }}"></script> @yield('style')
</head> </head>
<body class="font-sans antialiased"> <body class="font-sans antialiased">
<div class="container-fluid"> <div class="container-fluid">
@ -33,7 +34,7 @@
<div class="container"> <div class="container">
@yield('content') @yield('content')
</div> </div>
<script src="{{ asset('js/bootstrap.min.js') }}" defer></script> <script src="{{ asset('js/app.js') }}" defer></script>
@yield('scripts') @yield('scripts')
</body> </body>
</html> </html>