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

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/)
 
 <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
+* 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:
 

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 Cache::remember('all_active_pricing', now()->addWeek(1), function () {
-            return Pricing::get();
+            return Pricing::where('active', 1)->get();
         });
     }
 

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",
+        "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",
         "phpunit/phpunit": "^10",
         "spatie/laravel-ignition": "^2"

package.json

@@ -11,22 +11,22 @@
         "build": "webpack --config webpack.config.js"
     },
     "devDependencies": {
-        "axios": "^0.21.4",
+        "axios": "^0.27.2",
-        "bootstrap": "^5.2.3",
+        "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",
+        "@fortawesome/fontawesome-free": "^6.4.2",
-        "datatables.net-bs5": "^1.13.2"
+        "datatables.net-bs5": "^1.13.6"
     }
 }

public/css/dark.css

@@ -458,10 +458,6 @@ legend + * {
   padding: 0;
 }
 
-::-webkit-file-upload-button {
-  font: inherit;
-}
-
 ::file-selector-button {
   font: inherit;
 }
@@ -2232,10 +2228,6 @@ progress {
   color: #6c757d;
   opacity: 1;
 }
-.form-control:-ms-input-placeholder {
-  color: #6c757d;
-  opacity: 1;
-}
 .form-control::placeholder {
   color: #6c757d;
   opacity: 1;
@@ -2244,26 +2236,9 @@ progress {
   background-color: #e9ecef;
   opacity: 1;
 }
-.form-control::-webkit-file-upload-button {
-  padding: 0.375rem 0.75rem;
-  margin: -0.375rem -0.75rem;
-  -webkit-margin-end: 0.75rem;
-  margin-inline-end: 0.75rem;
-  color: #212529;
-  background-color: #e9ecef;
-  pointer-events: none;
-  border-color: inherit;
-  border-style: solid;
-  border-width: 0;
-  border-inline-end-width: 1px;
-  border-radius: 0;
-  -webkit-transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-  transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-}
 .form-control::file-selector-button {
   padding: 0.375rem 0.75rem;
   margin: -0.375rem -0.75rem;
-  -webkit-margin-end: 0.75rem;
   margin-inline-end: 0.75rem;
   color: #212529;
   background-color: #e9ecef;
@@ -2276,24 +2251,16 @@ progress {
   transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
 @media (prefers-reduced-motion: reduce) {
-  .form-control::-webkit-file-upload-button {
-    -webkit-transition: none;
-    transition: none;
-  }
   .form-control::file-selector-button {
     transition: none;
   }
 }
-.form-control:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
-  background-color: #dde0e3;
-}
 .form-control:hover:not(:disabled):not([readonly])::file-selector-button {
   background-color: #dde0e3;
 }
 .form-control::-webkit-file-upload-button {
   padding: 0.375rem 0.75rem;
   margin: -0.375rem -0.75rem;
-  -webkit-margin-end: 0.75rem;
   margin-inline-end: 0.75rem;
   color: #212529;
   background-color: #e9ecef;
@@ -2338,22 +2305,14 @@ progress {
   font-size: 0.875rem;
   border-radius: 0.2rem;
 }
-.form-control-sm::-webkit-file-upload-button {
-  padding: 0.25rem 0.5rem;
-  margin: -0.25rem -0.5rem;
-  -webkit-margin-end: 0.5rem;
-  margin-inline-end: 0.5rem;
-}
 .form-control-sm::file-selector-button {
   padding: 0.25rem 0.5rem;
   margin: -0.25rem -0.5rem;
-  -webkit-margin-end: 0.5rem;
   margin-inline-end: 0.5rem;
 }
 .form-control-sm::-webkit-file-upload-button {
   padding: 0.25rem 0.5rem;
   margin: -0.25rem -0.5rem;
-  -webkit-margin-end: 0.5rem;
   margin-inline-end: 0.5rem;
 }
 
@@ -2363,22 +2322,14 @@ progress {
   font-size: 1.25rem;
   border-radius: 0.3rem;
 }
-.form-control-lg::-webkit-file-upload-button {
-  padding: 0.5rem 1rem;
-  margin: -0.5rem -1rem;
-  -webkit-margin-end: 1rem;
-  margin-inline-end: 1rem;
-}
 .form-control-lg::file-selector-button {
   padding: 0.5rem 1rem;
   margin: -0.5rem -1rem;
-  -webkit-margin-end: 1rem;
   margin-inline-end: 1rem;
 }
 .form-control-lg::-webkit-file-upload-button {
   padding: 0.5rem 1rem;
   margin: -0.5rem -1rem;
-  -webkit-margin-end: 1rem;
   margin-inline-end: 1rem;
 }
 
@@ -2693,9 +2644,6 @@ textarea.form-control-lg {
 .form-floating > .form-control::-moz-placeholder {
   color: transparent;
 }
-.form-floating > .form-control:-ms-input-placeholder {
-  color: transparent;
-}
 .form-floating > .form-control::placeholder {
   color: transparent;
 }
@@ -2703,10 +2651,6 @@ textarea.form-control-lg {
   padding-top: 1.625rem;
   padding-bottom: 0.625rem;
 }
-.form-floating > .form-control:not(:-ms-input-placeholder) {
-  padding-top: 1.625rem;
-  padding-bottom: 0.625rem;
-}
 .form-floating > .form-control:focus, .form-floating > .form-control:not(:placeholder-shown) {
   padding-top: 1.625rem;
   padding-bottom: 0.625rem;
@@ -2723,10 +2667,6 @@ textarea.form-control-lg {
   opacity: 0.65;
   transform: scale(0.85) translateY(-0.5rem) translateX(0.15rem);
 }
-.form-floating > .form-control:not(:-ms-input-placeholder) ~ label {
-  opacity: 0.65;
-  transform: scale(0.85) translateY(-0.5rem) translateX(0.15rem);
-}
 .form-floating > .form-control:focus ~ label,
 .form-floating > .form-control:not(:placeholder-shown) ~ label,
 .form-floating > .form-select ~ label {
@@ -3007,7 +2947,6 @@ textarea.form-control-lg {
   cursor: pointer;
   -webkit-user-select: none;
   -moz-user-select: none;
-  -ms-user-select: none;
   user-select: none;
   background-color: transparent;
   border: 1px solid transparent;
@@ -5008,12 +4947,6 @@ textarea.form-control-lg {
   color: #101214;
 }
 
-@-webkit-keyframes progress-bar-stripes {
-  0% {
-    background-position-x: 1rem;
-  }
-}
-
 @keyframes progress-bar-stripes {
   0% {
     background-position-x: 1rem;
@@ -5051,12 +4984,10 @@ textarea.form-control-lg {
 }
 
 .progress-bar-animated {
-  -webkit-animation: 1s linear infinite progress-bar-stripes;
   animation: 1s linear infinite progress-bar-stripes;
 }
 @media (prefers-reduced-motion: reduce) {
   .progress-bar-animated {
-    -webkit-animation: none;
     animation: none;
   }
 }
@@ -5420,7 +5351,6 @@ textarea.form-control-lg {
   pointer-events: none;
   -webkit-user-select: none;
   -moz-user-select: none;
-  -ms-user-select: none;
   user-select: none;
   opacity: 0.25;
 }
@@ -5448,7 +5378,6 @@ textarea.form-control-lg {
 }
 
 .toast-container {
-  width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
   max-width: 100%;
@@ -6016,7 +5945,6 @@ textarea.form-control-lg {
   float: left;
   width: 100%;
   margin-right: -100%;
-  -webkit-backface-visibility: hidden;
   backface-visibility: hidden;
   transition: transform 0.6s ease-in-out;
 }
@@ -6198,12 +6126,6 @@ textarea.form-control-lg {
   color: #000;
 }
 
-@-webkit-keyframes spinner-border {
-  to {
-    transform: rotate(360deg) /* rtl:ignore */;
-  }
-}
-
 @keyframes spinner-border {
   to {
     transform: rotate(360deg) /* rtl:ignore */;
@@ -6217,7 +6139,6 @@ textarea.form-control-lg {
   border: 0.25em solid currentColor;
   border-right-color: transparent;
   border-radius: 50%;
-  -webkit-animation: 0.75s linear infinite spinner-border;
   animation: 0.75s linear infinite spinner-border;
 }
 
@@ -6227,16 +6148,6 @@ textarea.form-control-lg {
   border-width: 0.2em;
 }
 
-@-webkit-keyframes spinner-grow {
-  0% {
-    transform: scale(0);
-  }
-  50% {
-    opacity: 1;
-    transform: none;
-  }
-}
-
 @keyframes spinner-grow {
   0% {
     transform: scale(0);
@@ -6254,7 +6165,6 @@ textarea.form-control-lg {
   background-color: currentColor;
   border-radius: 50%;
   opacity: 0;
-  -webkit-animation: 0.75s linear infinite spinner-grow;
   animation: 0.75s linear infinite spinner-grow;
 }
 
@@ -6266,7 +6176,6 @@ textarea.form-control-lg {
 @media (prefers-reduced-motion: reduce) {
   .spinner-border,
 .spinner-grow {
-    -webkit-animation-duration: 1.5s;
     animation-duration: 1.5s;
   }
 }
@@ -6394,16 +6303,9 @@ textarea.form-control-lg {
 }
 
 .placeholder-glow .placeholder {
-  -webkit-animation: placeholder-glow 2s ease-in-out infinite;
   animation: placeholder-glow 2s ease-in-out infinite;
 }
 
-@-webkit-keyframes placeholder-glow {
-  50% {
-    opacity: 0.2;
-  }
-}
-
 @keyframes placeholder-glow {
   50% {
     opacity: 0.2;
@@ -6414,17 +6316,9 @@ textarea.form-control-lg {
   mask-image: linear-gradient(130deg, #000 55%, rgba(0, 0, 0, 0.8) 75%, #000 95%);
   -webkit-mask-size: 200% 100%;
   mask-size: 200% 100%;
-  -webkit-animation: placeholder-wave 2s linear infinite;
   animation: placeholder-wave 2s linear infinite;
 }
 
-@-webkit-keyframes placeholder-wave {
-  100% {
-    -webkit-mask-position: -200% 0%;
-    mask-position: -200% 0%;
-  }
-}
-
 @keyframes placeholder-wave {
   100% {
     -webkit-mask-position: -200% 0%;
@@ -6543,7 +6437,6 @@ textarea.form-control-lg {
 }
 
 .sticky-top {
-  position: -webkit-sticky;
   position: sticky;
   top: 0;
   z-index: 1020;
@@ -6551,7 +6444,6 @@ textarea.form-control-lg {
 
 @media (min-width: 576px) {
   .sticky-sm-top {
-    position: -webkit-sticky;
     position: sticky;
     top: 0;
     z-index: 1020;
@@ -6559,7 +6451,6 @@ textarea.form-control-lg {
 }
 @media (min-width: 768px) {
   .sticky-md-top {
-    position: -webkit-sticky;
     position: sticky;
     top: 0;
     z-index: 1020;
@@ -6567,7 +6458,6 @@ textarea.form-control-lg {
 }
 @media (min-width: 992px) {
   .sticky-lg-top {
-    position: -webkit-sticky;
     position: sticky;
     top: 0;
     z-index: 1020;
@@ -6575,7 +6465,6 @@ textarea.form-control-lg {
 }
 @media (min-width: 1200px) {
   .sticky-xl-top {
-    position: -webkit-sticky;
     position: sticky;
     top: 0;
     z-index: 1020;
@@ -6583,7 +6472,6 @@ textarea.form-control-lg {
 }
 @media (min-width: 1400px) {
   .sticky-xxl-top {
-    position: -webkit-sticky;
     position: sticky;
     top: 0;
     z-index: 1020;
@@ -6786,7 +6674,6 @@ textarea.form-control-lg {
 }
 
 .position-sticky {
-  position: -webkit-sticky !important;
   position: sticky !important;
 }
 
@@ -7907,14 +7794,12 @@ textarea.form-control-lg {
 .user-select-auto {
   -webkit-user-select: auto !important;
   -moz-user-select: auto !important;
-  -ms-user-select: auto !important;
   user-select: auto !important;
 }
 
 .user-select-none {
   -webkit-user-select: none !important;
   -moz-user-select: none !important;
-  -ms-user-select: none !important;
   user-select: none !important;
 }
 
@@ -11535,28 +11420,17 @@ textarea.form-control-lg {
   .form-control::-moz-placeholder {
     color: #5a5a5a;
   }
-  .form-control:-ms-input-placeholder {
-    color: #5a5a5a;
-  }
   .form-control::placeholder {
     color: #5a5a5a;
   }
   .form-control:disabled, .form-control[readonly] {
     background-color: #222;
   }
-  .form-control::-webkit-file-upload-button {
-    color: #b1b1b1;
-    background-color: #3b3b3b;
-    border-color: inherit;
-  }
   .form-control::file-selector-button {
     color: #b1b1b1;
     background-color: #3b3b3b;
     border-color: inherit;
   }
-  .form-control:hover:not(:disabled):not([readonly])::-webkit-file-upload-button {
-    background-color: #383838;
-  }
   .form-control:hover:not(:disabled):not([readonly])::file-selector-button {
     background-color: #383838;
   }
@@ -11683,19 +11557,12 @@ textarea.form-control-lg {
     color: transparent;
   }
 
-  .form-floating > .form-control:-ms-input-placeholder {
-    color: transparent;
-  }
-
   .form-floating > .form-control::placeholder {
     color: transparent;
   }
   .form-floating > .form-control:not(:-moz-placeholder-shown) ~ label {
     opacity: 0.65;
   }
-  .form-floating > .form-control:not(:-ms-input-placeholder) ~ label {
-    opacity: 0.65;
-  }
   .form-floating > .form-control:focus ~ label,
 .form-floating > .form-control:not(:placeholder-shown) ~ label,
 .form-floating > .form-select ~ label {
@@ -12994,12 +12861,6 @@ textarea.form-control-lg {
     opacity: 0.5;
   }
 
-  @-webkit-keyframes placeholder-glow {
-    50% {
-      opacity: 0.2;
-    }
-  }
-
   @keyframes placeholder-glow {
     50% {
       opacity: 0.2;

resources/views/layouts/guest.blade.php

@@ -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>

resources/views/layouts/index.blade.php

@@ -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')
+    @yield('css_links')
-    <script src="{{ asset('js/vue.min.js') }}"></script>
+    @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>