Merge remote-tracking branch 'origin/main' into main
This commit is contained in:
cp6
commit
65f0474ebe
13
README.md
13
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.
|
||||
|
||||
[](https://shields.io/) [](https://shields.io/) [](https://shields.io/) [](https://shields.io/)
|
||||
[](https://shields.io/) [](https://shields.io/) [](https://shields.io/) [](https://shields.io/)
|
||||
|
||||
<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
|
||||
|
||||
## 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:
|
||||
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
14
package.json
14
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"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
BIN
public/css/app.css
vendored
BIN
public/css/app.css
vendored
Binary file not shown.
BIN
public/css/dark.css
vendored
BIN
public/css/dark.css
vendored
Binary file not shown.
BIN
public/css/light.css
vendored
BIN
public/css/light.css
vendored
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
public/js/app.js
vendored
BIN
public/js/app.js
vendored
Binary file not shown.
|
|
@ -6,14 +6,25 @@
|
|||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||
|
||||
<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>
|
||||
|
||||
<script src="{{ asset('js/bootstrap.min.js') }}" defer></script>
|
||||
</head>
|
||||
<body>
|
||||
{{ $slot }}
|
||||
<script src="{{ asset('js/app.js') }}" defer></script>
|
||||
@yield('scripts')
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -9,17 +9,18 @@
|
|||
@endif
|
||||
|
||||
<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'))
|
||||
<link rel="stylesheet" href="{{ asset('css/bootstrap-dark.min.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('css/dark.css') }}">
|
||||
@else
|
||||
<link rel="stylesheet" href="{{ asset('css/bootstrap.min.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('css/light.css') }}">
|
||||
@endif
|
||||
|
||||
<link rel="stylesheet" href="{{ asset('css/fa.min.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('css/app.css') }}">
|
||||
|
||||
@yield('css_style')
|
||||
<script src="{{ asset('js/vue.min.js') }}"></script>
|
||||
@yield('css_links')
|
||||
@yield('style')
|
||||
</head>
|
||||
<body class="font-sans antialiased">
|
||||
<div class="container-fluid">
|
||||
|
|
@ -33,7 +34,7 @@
|
|||
<div class="container">
|
||||
@yield('content')
|
||||
</div>
|
||||
<script src="{{ asset('js/bootstrap.min.js') }}" defer></script>
|
||||
<script src="{{ asset('js/app.js') }}" defer></script>
|
||||
@yield('scripts')
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user