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/Console/Commands/RegisterApp.php

@@ -40,22 +40,40 @@ class RegisterApp extends Command
     public function handle()
     {
         $folder = $this->argument('folder');
+        if($folder == 'all') {
+            $apps = scandir(app_path('SupportedApps'));
+            foreach($apps as $folder) {
+                if($folder == '.' || $folder == '..') continue;
+                $this->addApp($folder);
+            }
+
+        } else {
+            $this->addApp($folder);
+        }
+        
+    }
+
+    public function addApp($folder)
+    {
         $json = app_path('SupportedApps/'.$folder.'/app.json');
         if(file_exists($json)) {
             $app = json_decode(file_get_contents($json));
-            $exists = Application::find($app->appid);
-            if($exists) {
-                $this->error('This app is already registered');
-                exit;
+            if(isset($app->appid)) {
+                $exists = Application::find($app->appid);
+                if($exists) {
+                    $this->error('Application already registered - '.$exists->name." - ".$exists->appid);
+                } else {
+                    // Doesn't exist so add it
+                    SupportedApps::saveApp($app, new Application);
+                    $this->info("Application Added - ".$app->name." - ".$app->appid);
+                }
+            } else {
+                $this->error('No App ID for - '.$folder);
             }
-            // Doesn't exist so add it
-            SupportedApps::saveApp($app, new Application);
-            $this->info("Application Added - ".$app->name." - ".$app->appid);
             
         } else {
             $this->error('Could not find '.$json);
         }
-        
-        
+
     }
 }

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/Providers/AppServiceProvider.php

@@ -50,7 +50,12 @@ class AppServiceProvider extends ServiceProvider
         
         $applications = Application::all();
         if($applications->count() <= 0) {
-            ProcessApps::dispatch();
+            if (class_exists('ZipArchive')) {
+                ProcessApps::dispatch();
+            } else {
+                die("You are missing php-zip");
+            }
+            
         }
 
         if(!is_file(public_path('storage'))) {

app/SupportedApps.php

@@ -129,15 +129,19 @@ 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/supportedapps/'.$details->icon);
+        $img_dest = public_path('storage/icons/'.$details->icon);
         //die("i: ".$img_src);
         copy($img_src, $img_dest);
         
         $app->appid = $details->appid;
         $app->name = $details->name;
         $app->sha = $details->sha ?? null;
-        $app->icon = 'supportedapps/'.$details->icon;
+        $app->icon = 'icons/'.$details->icon;
         $app->website = $details->website;
         $app->license = $details->license;
         $app->description = $details->description;

config/app.php

@@ -14,7 +14,7 @@ return [
     */
 
     'name' => env('APP_NAME', 'Heimdall'),  
-    'version' => '2.1.0',
+    '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"
 }

readme.md

@@ -29,73 +29,12 @@ You can use the app to link to any site or application, but Foundation apps will
 
 Supported applications are recognized by the title of the application as entered in the title field when adding an application. For example, to add a link to pfSense, begin by typing "p" in the title field and then select "pfSense" from the list of supported applications.
 
-**Enhanced**
-- CouchPotato
-- Deluge
-- NZBGet
-- Pihole
-- PlexPy
-- Proxmox
-- Runeaudio
-- Sabnzbd
-- Tautulli
-- Traefik
-- Transmission
+[![enhancedapps](https://img.shields.io/badge/dynamic/json.svg?label=Enhanced%20Apps&url=https%3A%2F%2Fapps.heimdall.site%2Fstats&query=enhanced_apps&colorB=3f8483&style=for-the-badge&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAjCAMAAACw/5reAAAAnFBMVEUAAADu7u7u7u7u7u7u7u7x8fHu7u7u7u7u7u7u7u7u7u7u7u7r6+vu7u7v7+/u7u7t7e3v7+/v7+/u7u7u7u7u7u7u7u7u7u7u7u7u7u7v7+/u7u7p6ent7e3v7+/v7+/v7+/u7u7u7u7u7u7u7u7t7e3////u7u7u7u7u7u7u7u7w8PDw8PDt7e3u7u7t7e3s7Ozu7u7t7e3u7u4TnCP6AAAAM3RSTlMA+9n3phHw3czC088M5Y5zG6mflWdJFumyfj4sB2NeTi7hiWlDOQPGt5lsMiG9hFQntpFqxQJtAAABnElEQVQoz2WRh3KrQAxFtYWO6ZhucItrynv6/3/LFnA24c6wurpnYBkJZvXduNix6+GXTo8qWnxUPU4m2w0O1ktTozPsftiZpejGlm7C2MWUnRcWOohIo36+PaKyDZdLUOgDXvqQfaT9kwkfvP3AN18E7Kl8hkJHMHSXSSadxaTtTNjJhMkfjFHKMqGlolg4T7mtCbcq8gBCotxkwklFLIQSlQoTHnVWQqzNxYQuzpfmqGVMc5ijHK5yAuIhxbZ5p/S92RZkjv5BKs6aosSIr0JrcXBo1FtICVINKRKK6u0GnraoN84O5KbhjRwYzxCJnQCMtotkdNxjq2F7dJ2RoGuXIBTvc3ROthdmat6hZ7cOyfcxKGV+wTxBkxQxTQTzWOFny/7qS2nzx37T7nbtZj9xu7zUr/323nVy0sQnhwMJktSZrl5v7CjgSQmWi+haUCY8sH4tyc/FGSKGouS+WqBJm8U2NIE/+nLu2tzpF/xVNGy02QzRClafC/ysVpDzQJuA8xXsKl8bv+pgpXz57H9Yy3J1lQNY62wUrW+mdzrylWS0QwAAAABJRU5ErkJggg==)](https://apps.heimdall.site/applications/enhanced)
 
-**Foundation**
-- AirSonic
-- Bazarr
-- Bitwarden
-- Booksonic
-- BookStack
-- Cardigann
-- DokuWiki
-- Duplicati
-- Emby
-- FreshRSS
-- Gitea
-- Grafana
-- Graylog
-- Headphones
-- Jdownloader
-- Krusader
-- LibreNMS
-- Lidarr
-- Mailcow
-- McMyAdmin
-- Medusa
-- Monica
-- MusicBrainz
-- Mylar
-- NZBhydra & NZBhydra2
-- Netdata
-- Nextcloud
-- Ombi
-- OpenHAB
-- OpenMediaVault
-- Plex
-- Plexrequests
-- Portainer
-- Radarr
-- Rancher
-- SickRage
-- Sonarr
-- TT-RSS
-- TVheadend
-- UniFI
-- unRAID
-- pfSense
-- pyLoad
-- rTorrent/Flood
-- rTorrent/ruTorrent
-- Syncthing
-- Virtualmin
-- Watcher3
-- Webmin
-- WebTools
+[![foundationapps](https://img.shields.io/badge/dynamic/json.svg?label=Foundation%20Apps&url=https%3A%2F%2Fapps.heimdall.site%2Fstats&query=foundation_apps&colorB=3f8483&style=for-the-badge&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAjCAMAAACw/5reAAAAnFBMVEUAAADu7u7u7u7u7u7u7u7x8fHu7u7u7u7u7u7u7u7u7u7u7u7r6+vu7u7v7+/u7u7t7e3v7+/v7+/u7u7u7u7u7u7u7u7u7u7u7u7u7u7v7+/u7u7p6ent7e3v7+/v7+/v7+/u7u7u7u7u7u7u7u7t7e3////u7u7u7u7u7u7u7u7w8PDw8PDt7e3u7u7t7e3s7Ozu7u7t7e3u7u4TnCP6AAAAM3RSTlMA+9n3phHw3czC088M5Y5zG6mflWdJFumyfj4sB2NeTi7hiWlDOQPGt5lsMiG9hFQntpFqxQJtAAABnElEQVQoz2WRh3KrQAxFtYWO6ZhucItrynv6/3/LFnA24c6wurpnYBkJZvXduNix6+GXTo8qWnxUPU4m2w0O1ktTozPsftiZpejGlm7C2MWUnRcWOohIo36+PaKyDZdLUOgDXvqQfaT9kwkfvP3AN18E7Kl8hkJHMHSXSSadxaTtTNjJhMkfjFHKMqGlolg4T7mtCbcq8gBCotxkwklFLIQSlQoTHnVWQqzNxYQuzpfmqGVMc5ijHK5yAuIhxbZ5p/S92RZkjv5BKs6aosSIr0JrcXBo1FtICVINKRKK6u0GnraoN84O5KbhjRwYzxCJnQCMtotkdNxjq2F7dJ2RoGuXIBTvc3ROthdmat6hZ7cOyfcxKGV+wTxBkxQxTQTzWOFny/7qS2nzx37T7nbtZj9xu7zUr/323nVy0sQnhwMJktSZrl5v7CjgSQmWi+haUCY8sH4tyc/FGSKGouS+WqBJm8U2NIE/+nLu2tzpF/xVNGy02QzRClafC/ysVpDzQJuA8xXsKl8bv+pgpXz57H9Yy3J1lQNY62wUrW+mdzrylWS0QwAAAABJRU5ErkJggg==)](https://apps.heimdall.site/applications/foundation)
 
 ## Installing
-Apart from the Laravel dependencies, namely PHP >= 7.1.3, OpenSSL PHP Extension, PDO PHP Extension, Mbstring PHP Extension, Tokenizer PHP Extension, XML PHP Extension, Ctype PHP Extension and JSON PHP Extension, the only other thing Heimdall needs is sqlite support.
+Apart from the Laravel dependencies, namely PHP >= 7.1.3, OpenSSL PHP Extension, PDO PHP Extension, Mbstring PHP Extension, Tokenizer PHP Extension, XML PHP Extension, Ctype PHP Extension and JSON PHP Extension, the only other thing Heimdall needs is sqlite support and zip support (php-zip).
 
 If you find you can't change the background make sure `php_fileinfo` is enabled in your php.ini. I believe it should be by default, but one user came across the issue on a windows system.
 

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>

resources/views/settings/form.blade.php

@@ -8,10 +8,10 @@
         </header>
         <div class="create">
             {!! csrf_field() !!}
-            <!--<div class="input">
+            <?php /*<div class="input">
                 <label>Application name</label>
                 {!! Form::select('supported', \App\Item::supportedOptions(), array('placeholder' => 'Title','class' => 'form-control')) !!}
-            </div>-->
+            </div>*/ ?>
 
             <div class="input">
                     {!! $setting->edit_value !!}