Change version + replace supported with icons

app/Application.php

@@ -40,7 +40,7 @@ class Application extends Model
     public static function applist()
     {
         $list = [];
-        $all = self::orderBy('name')->get();
+        $all = self::orderBy('name')->get()->sortBy('name', SORT_NATURAL|SORT_FLAG_CASE);
         $list['null'] = 'None';
         foreach($all as $app) {
             $name = $app->name;

app/Http/Controllers/SettingsController.php

@@ -68,6 +68,8 @@ class SettingsController extends Controller
         if (!is_null($setting)) {
             $data = Setting::getInput();
 
+            $setting_value = null;
+
             if ($setting->type == 'image') {
 
 

app/SupportedApps.php

@@ -129,6 +129,10 @@ abstract class SupportedApps
 
     public static function saveApp($details, $app)
     {
+        if(!file_exists(public_path('storage/icons')))  {
+            mkdir(public_path('storage/icons'), 0777, true);
+        }
+
         $img_src = app_path('SupportedApps/'.className($details->name).'/'.$details->icon);
         $img_dest = public_path('storage/icons/'.$details->icon);
         //die("i: ".$img_src);

config/app.php

@@ -14,7 +14,7 @@ return [
     */
 
     'name' => env('APP_NAME', 'Heimdall'),  
-    'version' => '2.1.5',
+    'version' => '2.1.7',
 
     /*
     |--------------------------------------------------------------------------

public/css/app.css

@@ -1318,6 +1318,10 @@ hr {
           flex-direction: column;
 }
 
+.livestats-container.black .livestats strong {
+  color: #000;
+}
+
 input:-webkit-autofill,
 input:-webkit-autofill:hover,
 input:-webkit-autofill:focus

public/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/css/app.css": "/css/app.css?id=fb2cfb67b5f04db8beee",
+    "/css/app.css": "/css/app.css?id=476a34b0b53427a036fd",
     "/js/app.js": "/js/app.js?id=8dc4a6ea723d0df7469d"
 }

resources/assets/sass/_app.scss

@@ -898,6 +898,13 @@ hr {
 		}
 
 	}
+	&.black {
+		.livestats {
+			strong {
+				color: #000;
+			}
+		}
+	}
 }
 
 input:-webkit-autofill,

resources/views/item.blade.php

@@ -1,14 +1,14 @@
                     <section class="item-container{{ $app->droppable }}" data-id="{{ $app->id }}">
                         <div class="item" style="background-color: {{ $app->colour }}">
                             @if($app->icon)
-                            <img class="app-icon" src="{{ asset('/storage/'.$app->icon) }}" />
+                            <img class="app-icon" src="{{ asset('/storage/'.str_replace('supportedapps', 'icons', $app->icon)) }}" />
                             @else
                             <img class="app-icon" src="{{ asset('/img/heimdall-icon-small.png') }}" />
                             @endif
                             <div class="details">
                                 <div class="title{{ title_color($app->colour) }}">{{ $app->title }}</div>
                                 @if($app->enabled())
-                                <div data-id="{{ $app->id }}" data-dataonly="{{ $app->getconfig()->dataonly ?? '0' }}" class="livestats-container"></div>
+                                <div data-id="{{ $app->id }}" data-dataonly="{{ $app->getconfig()->dataonly ?? '0' }}" class="livestats-container{{ title_color($app->colour) }}"></div>
                                 @endif
                             </div>
                             <a class="link{{ title_color($app->colour) }}"{!! $app->link_target !!} href="{{ $app->link }}"><i class="fas {{ $app->link_icon }}"></i></a>