Update app.php

Portuguese (PT-PT) translation.

.env

@@ -1,31 +0,0 @@
-APP_NAME=Heimdall
-APP_ENV=local
-APP_KEY=base64:I206O8ibx+GQyRE7BeOxDobn04Mfmyyc5Ptzns/C0mY=
-APP_DEBUG=true
-APP_LOG_LEVEL=debug
-APP_URL=http://localhost
-
-DB_CONNECTION=sqlite
-DB_DATABASE=app.sqlite
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-QUEUE_DRIVER=sync
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_DRIVER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1

.env.example

@@ -1,16 +1,12 @@
-APP_NAME=Laravel
+APP_NAME=Heimdall
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
 APP_LOG_LEVEL=debug
 APP_URL=http://localhost
 
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=homestead
-DB_USERNAME=homestead
-DB_PASSWORD=secret
+DB_CONNECTION=sqlite
+DB_DATABASE=app.sqlite
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file

.gitignore

@@ -1,3 +1,4 @@
+/app/SupportedApps
 /node_modules
 /public/hot
 /public/storage
@@ -25,3 +26,4 @@ yarn-error.log
 .Trashes
 .VolumeIcon.icns
 storage/app/public/avatars/*
+.env

app/Application.php

@@ -13,6 +13,14 @@ class Application extends Model
     //
     public function icon()
     {
+        if(!file_exists(storage_path('app/public/'.$this->icon)))  {
+            $img_src = app_path('SupportedApps/'.$this->name.'/'.str_replace('icons/', '', $this->icon));
+            $img_dest = storage_path('app/public/'.$this->icon);
+            //die("i: ".$img_src);
+            @copy($img_src, $img_dest);
+        }
+
+
         return $this->icon;
     }
 

app/Item.php

@@ -7,6 +7,7 @@ use Symfony\Component\ClassLoader\ClassMapGenerator;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\Builder;
 use App\User;
+use App\Application;
 
 class Item extends Model
 {
@@ -124,6 +125,14 @@ class Item extends Model
         }
     }
 
+    public static function nameFromClass($class)
+    {
+        $explode = explode('\\', $class);
+        $name = end($explode);
+        
+        return $name;
+    }
+
     public function scopeOfType($query, $type)
     {
         switch($type) {
@@ -148,6 +157,12 @@ class Item extends Model
         return (bool)($app instanceof \App\EnhancedApps);
     }
 
+    public static function isEnhanced($class)
+    {
+        $app = new $class;
+        return (bool)($app instanceof \App\EnhancedApps);
+    }
+
     public function enabled()
     {
         if($this->enhanced()) {
@@ -186,7 +201,26 @@ class Item extends Model
         return $config;
     }
 
+    public static function applicationDetails($class)
+    {
+        if(!empty($class)) {
+            $name = self::nameFromClass($class);
+            $application = Application::where('name', $name)->first();
+            if($application) return $application;
+        }
 
+        return false;
+
+    }
+
+    public static function getApplicationDescription($class)
+    {
+        $details = self::applicationDetails($class);
+        if($details !== false) {
+            return $details->description.' - '.$details->license;
+        }
+        return '';
+    }
 
     /**
      * Get the user that owns the item.

app/Jobs/ProcessApps.php

@@ -34,11 +34,15 @@ class ProcessApps implements ShouldQueue
         $localapps = Application::all();
         $list = json_decode(SupportedApps::getList()->getBody());
         $validapps = [];
+        
         foreach($list->apps as $app) {
             $validapps[] = $app->appid;
+            $localapp = $localapps->where('appid', $app->appid)->first();
+
+            $application = ($localapp) ? $localapp : new Application;
+
             if(!file_exists(app_path('SupportedApps/'.className($app->name)))) {
                 SupportedApps::getFiles($app);
-                $application = new Application;
                 SupportedApps::saveApp($app, $application);
             } else {
                 // check if there has been an update for this app
@@ -46,11 +50,10 @@ class ProcessApps implements ShouldQueue
                 if($localapp) {
                     if($localapp->sha !== $app->sha) {
                         SupportedApps::getFiles($app);
-                        SupportedApps::saveApp($app, $localapp);
+                        SupportedApps::saveApp($app, $application);
                     }
                 }  else {
                     SupportedApps::getFiles($app);
-                    $application = new Application;
                     SupportedApps::saveApp($app, $application);
       
                 }

app/Providers/AppServiceProvider.php

@@ -21,9 +21,9 @@ class AppServiceProvider extends ServiceProvider
     {
 
         if(!is_file(base_path('.env'))) {
-            touch(base_path('.env'));
-            Artisan::call('key:generate');
+            copy(base_path('.env.example'), base_path('.env'));
         }
+        $this->genKey();
         if(!is_file(database_path('app.sqlite'))) {
             // first time setup
             touch(database_path('app.sqlite'));
@@ -47,6 +47,11 @@ class AppServiceProvider extends ServiceProvider
             }
 
         }
+
+        if(!is_file(public_path('storage/.gitignore'))) {
+            Artisan::call('storage:link');
+            \Session::put('current_user', null);
+        }
         
         $applications = Application::all();
         if($applications->count() <= 0) {
@@ -58,11 +63,6 @@ class AppServiceProvider extends ServiceProvider
             
         }
 
-        if(!is_file(public_path('storage'))) {
-            Artisan::call('storage:link');
-            \Session::put('current_user', null);
-        }
-
         // User specific settings need to go here as session isn't available at this point in the app
         view()->composer('*', function ($view) 
         {
@@ -117,6 +117,21 @@ class AppServiceProvider extends ServiceProvider
 
     }
 
+     /**
+     * Generate app key if missing and .env exists
+     *
+     * @return void
+     */
+    public function genKey()
+    {
+        if(is_file(base_path('.env'))) {
+            if(empty(env('APP_KEY'))) {
+                Artisan::call('key:generate', array('--force' => true, '--no-interaction' => true));
+            }
+        }
+    }
+
+
     /**
      * Register any application services.
      *

app/SupportedApps.php

@@ -13,6 +13,13 @@ abstract class SupportedApps
 
     public function appTest($url, $attrs = [], $overridevars=false)
     {
+        if(empty($this->config->url)) {
+            return (object)[
+                'code' => 404,
+                'status' => 'No URL has been specified',
+                'response' => 'No URL has been specified',
+            ];    
+        }
         $res = $this->execute($url, $attrs);
         if($res == null) {
             return (object)[
@@ -136,14 +143,14 @@ abstract class SupportedApps
 
     public static function saveApp($details, $app)
     {
-        if(!file_exists(public_path('storage/icons')))  {
-            mkdir(public_path('storage/icons'), 0777, true);
+        if(!file_exists(storage_path('app/public/icons')))  {
+            mkdir(storage_path('app/public/icons'), 0777, true);
         }
 
         $img_src = app_path('SupportedApps/'.className($details->name).'/'.$details->icon);
         $img_dest = storage_path('app/public/icons/'.$details->icon);
         //die("i: ".$img_src);
-        copy($img_src, $img_dest);
+        @copy($img_src, $img_dest);
         
         $app->appid = $details->appid;
         $app->name = $details->name;

config/app.php

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

public/mix-manifest.json

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

resources/assets/sass/_app.scss

@@ -434,6 +434,8 @@ body {
 				padding: 20px 25px;
 				font-size: 13px;
 				color: $app-text;
+				max-width: 500px;
+				word-break: break-word;
 				&.form-error {
 					background: #e69191;
 					color: white;
@@ -866,11 +868,6 @@ hr {
 		justify-content: space-between;
 		width: 100%;
 
-		li {
-			text-align: center;
-			margin: 0;
-			line-height: 1;
-		}
 		span {
 			display: block;
 			text-transform: uppercase;
@@ -893,6 +890,18 @@ hr {
 				margin-left: 4px;
 			}
 		}
+		li {
+			text-align: center;
+			margin: 0;
+			line-height: 1;
+			&.right {
+				text-align: right;
+				span {
+					justify-content: flex-end;
+				}
+			}
+		}
+
 		&.flexcolumn {
 			flex-direction: column;
 		}

resources/lang/pt/app.php

@@ -0,0 +1,115 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | App Language Lines
+    |--------------------------------------------------------------------------
+    |
+    */
+
+    'settings.system' => 'Sistema',
+    'settings.appearance' => 'Aparência',
+    'settings.miscellaneous' => 'Diversos',
+    'settings.support' => 'Ajuda',
+    'settings.donate' => 'Doar',
+
+    'settings.version' => 'Versão',
+    'settings.background_image' => 'Imagem de fundo',
+    'settings.window_target' => 'O link abre em',
+    'settings.window_target.current' => 'Abrir neste separador',
+    'settings.window_target.one' => 'Abrir no mesmo separador',
+    'settings.window_target.new' => 'Abrir num novo separador',
+    'settings.homepage_search' => 'Pesquisa na página inicial',
+    'settings.search_provider' => 'Provedor de pesquisa',
+    'settings.language' => 'Linguagem',
+    'settings.reset' => 'Restabelecer de volta ao inicial',
+    'settings.remove' => 'Remover',
+    'settings.search' => 'procura',
+    'settings.no_items' => 'Nenhum item encontrado',
+
+
+    'settings.label' => 'Etiqueta',
+    'settings.value' => 'Valor',
+    'settings.edit' => 'Editar',
+    'settings.view' => 'Ver',
+
+    'options.none' => '- não definido -',
+    'options.google' => 'Google',
+    'options.ddg' => 'DuckDuckGo',
+    'options.bing' => 'Bing',
+    'options.startpage' => 'StartPage',
+    'options.yes' => 'Sim',
+    'options.no' => 'Não',
+
+    'buttons.save' => 'Guardar',
+    'buttons.cancel' => 'Cancelar',
+    'buttons.add' => 'Adicionar',
+    'buttons.upload' => 'Carregar um ficheiro',
+    'buttons.downloadapps' => 'Atualizar lista de aplicações',
+
+    'dash.pin_item' => 'Afixar item na dashboard',
+    'dash.no_apps' => 'Atualmente não existem aplicações afixadas, :link1 or :link2',
+    'dash.link1' => 'Adicionar uma aplicação aqui',
+    'dash.link2' => 'Afixar um item na dashboard',
+    'dash.pinned_items' => 'Items Afixados',
+
+    'apps.app_list' => 'Lista de aplicações',
+    'apps.view_trash' => 'Ver lixo',
+    'apps.add_application' => 'Adicionar aplicação',
+    'apps.application_name' => 'Nome da aplicação',
+    'apps.colour' => 'Cor',
+    'apps.icon' => 'Ícone',
+    'apps.pinned' => 'Afixado',
+    'apps.title' => 'Título',
+    'apps.hex' => 'Cor hexadecimal',
+    'apps.username' => 'Username',
+    'apps.password' => 'Palavra-passe',
+    'apps.config' => 'Configuração',
+    'apps.apikey' => 'API Key',
+    'apps.enable' => 'Ativar',
+    'apps.tag_list' => 'Lista de tags',
+    'apps.add_tag' => 'Adicionar tag',
+    'apps.tag_name' => 'Nome da tag',
+    'apps.tags' => 'Tags',
+    'apps.override' => 'Se diferente do URL principal',
+    'apps.preview' => 'Pré-visualizar',
+    'apps.apptype' => 'Tipo de Aplicação',
+
+    'user.user_list' => 'Utilizadores',
+    'user.add_user' => 'Adicionar utilizador',
+    'user.username' => 'Username',
+    'user.avatar' => 'Avatar',
+    'user.email' => 'Email',
+    'user.password_confirm' => 'Confirmar Palavra-passe',
+    'user.secure_front' => 'Permitir acesso público à frente - Só é forçado se existir uma palavra-passe definida.',
+    'user.autologin' => 'Permitir o início de sessão a partir de um URL específico. Qualquer pessoa com o link pode iniciar a sessão.',
+
+    'url' => 'URL',
+    'title' => 'Título',
+    'delete' => 'Apagar',
+    'optional' => 'Opcional',
+    'restore' => 'Restaurar',
+
+    'alert.success.item_created' => 'Item criado com sucesso',
+    'alert.success.item_updated' => 'Item atualizado com sucesso',
+    'alert.success.item_deleted' => 'Item apagado com sucesso',
+    'alert.success.item_restored' => 'Item restaurado com sucesso',
+    'alert.success.updating' => 'A atualizar a lista de aplicações',
+
+    'alert.success.tag_created' => 'Tag criada com sucesso',
+    'alert.success.tag_updated' => 'Tag atualizada com sucesso',
+    'alert.success.tag_deleted' => 'Tag apagada com sucesso',
+    'alert.success.tag_restored' => 'Tag restaurada com sucesso',
+
+    'alert.success.setting_updated' => 'Definição editada com sucesso',
+    'alert.error.not_exist' => 'Esta definição não existe.',
+
+    'alert.success.user_created' => 'Utilizador criada com sucesso',
+    'alert.success.user_updated' => 'Utilizador atualizada com sucesso',
+    'alert.success.user_deleted' => 'Utilizador apagada com sucesso',
+    'alert.success.user_restored' => 'Utilizador restaurada com sucesso',
+
+
+];

resources/lang/pt/auth.php

@@ -0,0 +1,19 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'failed' => 'Estas credenciais não se encontram nos nossos registos.',
+    'throttle' => 'Demasiadas tentativas de início de sessão. Por favor tente de novo dentro de :seconds segundos',
+
+];

resources/lang/pt/pagination.php

@@ -0,0 +1,19 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Pagination Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used by the paginator library to build
+    | the simple pagination links. You are free to change them to anything
+    | you want to customize your views to better match your application.
+    |
+    */
+
+    'previous' => '&laquo; Anterior',
+    'next' => 'Próximo &raquo;',
+
+];

resources/lang/pt/passwords.php

@@ -0,0 +1,22 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reset Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    'password' => 'As palavras-passe necessitam de conter no mínimo seis caracteres e igualar a confirmação.',
+    'reset' => 'A sua palavra-passe foi restabelecida!',
+    'sent' => 'Enviámos-lhe por email o seu link de restauro de palavra-passe!',
+    'token' => 'Este token de restabelecimento de palavra-passe é inválido.',
+    'user' => "Não conseguimos encontrar nenhum utilizador com este endereço de email.",
+
+];

resources/lang/pt/validation.php

@@ -0,0 +1,121 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines contain the default error messages used by
+    | the validator class. Some of these rules have multiple versions such
+    | as the size rules. Feel free to tweak each of these messages here.
+    |
+    */
+
+    'accepted'             => 'The :attribute must be accepted.',
+    'active_url'           => 'The :attribute is not a valid URL.',
+    'after'                => 'The :attribute must be a date after :date.',
+    'after_or_equal'       => 'The :attribute must be a date after or equal to :date.',
+    'alpha'                => 'The :attribute may only contain letters.',
+    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
+    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
+    'array'                => 'The :attribute must be an array.',
+    'before'               => 'The :attribute must be a date before :date.',
+    'before_or_equal'      => 'The :attribute must be a date before or equal to :date.',
+    'between'              => [
+        'numeric' => 'The :attribute must be between :min and :max.',
+        'file'    => 'The :attribute must be between :min and :max kilobytes.',
+        'string'  => 'The :attribute must be between :min and :max characters.',
+        'array'   => 'The :attribute must have between :min and :max items.',
+    ],
+    'boolean'              => 'The :attribute field must be true or false.',
+    'confirmed'            => 'The :attribute confirmation does not match.',
+    'date'                 => 'The :attribute is not a valid date.',
+    'date_format'          => 'The :attribute does not match the format :format.',
+    'different'            => 'The :attribute and :other must be different.',
+    'digits'               => 'The :attribute must be :digits digits.',
+    'digits_between'       => 'The :attribute must be between :min and :max digits.',
+    'dimensions'           => 'The :attribute has invalid image dimensions.',
+    'distinct'             => 'The :attribute field has a duplicate value.',
+    'email'                => 'The :attribute must be a valid email address.',
+    'exists'               => 'The selected :attribute is invalid.',
+    'file'                 => 'The :attribute must be a file.',
+    'filled'               => 'The :attribute field must have a value.',
+    'image'                => 'The :attribute must be an image.',
+    'in'                   => 'The selected :attribute is invalid.',
+    'in_array'             => 'The :attribute field does not exist in :other.',
+    'integer'              => 'The :attribute must be an integer.',
+    'ip'                   => 'The :attribute must be a valid IP address.',
+    'ipv4'                 => 'The :attribute must be a valid IPv4 address.',
+    'ipv6'                 => 'The :attribute must be a valid IPv6 address.',
+    'json'                 => 'The :attribute must be a valid JSON string.',
+    'max'                  => [
+        'numeric' => 'The :attribute may not be greater than :max.',
+        'file'    => 'The :attribute may not be greater than :max kilobytes.',
+        'string'  => 'The :attribute may not be greater than :max characters.',
+        'array'   => 'The :attribute may not have more than :max items.',
+    ],
+    'mimes'                => 'The :attribute must be a file of type: :values.',
+    'mimetypes'            => 'The :attribute must be a file of type: :values.',
+    'min'                  => [
+        'numeric' => 'The :attribute must be at least :min.',
+        'file'    => 'The :attribute must be at least :min kilobytes.',
+        'string'  => 'The :attribute must be at least :min characters.',
+        'array'   => 'The :attribute must have at least :min items.',
+    ],
+    'not_in'               => 'The selected :attribute is invalid.',
+    'numeric'              => 'The :attribute must be a number.',
+    'present'              => 'The :attribute field must be present.',
+    'regex'                => 'The :attribute format is invalid.',
+    'required'             => 'The :attribute field is required.',
+    'required_if'          => 'The :attribute field is required when :other is :value.',
+    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
+    'required_with'        => 'The :attribute field is required when :values is present.',
+    'required_with_all'    => 'The :attribute field is required when :values is present.',
+    'required_without'     => 'The :attribute field is required when :values is not present.',
+    'required_without_all' => 'The :attribute field is required when none of :values are present.',
+    'same'                 => 'The :attribute and :other must match.',
+    'size'                 => [
+        'numeric' => 'The :attribute must be :size.',
+        'file'    => 'The :attribute must be :size kilobytes.',
+        'string'  => 'The :attribute must be :size characters.',
+        'array'   => 'The :attribute must contain :size items.',
+    ],
+    'string'               => 'The :attribute must be a string.',
+    'timezone'             => 'The :attribute must be a valid zone.',
+    'unique'               => 'The :attribute has already been taken.',
+    'uploaded'             => 'The :attribute failed to upload.',
+    'url'                  => 'The :attribute format is invalid.',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
+    'custom' => [
+        'attribute-name' => [
+            'rule-name' => 'custom-message',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Attributes
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used to swap attribute place-holders
+    | with something more reader friendly such as E-Mail Address instead
+    | of "email". This simply helps us make messages a little cleaner.
+    |
+    */
+
+    'attributes' => [],
+
+];

resources/views/auth/login.blade.php

@@ -15,7 +15,7 @@ $user = \App\User::currentUser();
             <img class="user-img" src="{{ asset('/img/heimdall-icon-small.png') }}" />
             @endif
             {{ $user->username }}
-            <input id="password" type="password" class="form-control" name="password" required>
+            <input id="password" type="password" class="form-control" name="password" autofocus required>
             <button type="submit" class="btn btn-primary">Login</button>
         </div>
     </div>

resources/views/item.blade.php

@@ -11,7 +11,7 @@
                                 <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>
+                            <a title="{{ App\Item::getApplicationDescription($app->class) }}" class="link{{ title_color($app->colour) }}"{!! $app->link_target !!} href="{{ $app->link }}"><i class="fas {{ $app->link_icon }}"></i></a>
                         </div>
                         <a class="item-edit" href="{{ route($app->link_type.'.edit', [ $app->id ], false) }}"><i class="fas fa-pencil"></i></a>
                         

resources/views/items/form.blade.php

@@ -81,13 +81,23 @@
 
             
             @if(isset($item) && $item->enhanced())
+
             <div id="sapconfig" style="display: block;">
                 @if(isset($item))
                 @include('SupportedApps::'.$item->getconfig()->name.'.config')
                 @endif
             </div>
+
+            @elseif(old('class') && App\Item::isEnhanced(old('class')))
+
+            <div id="sapconfig" style="display: block;">
+                @include('SupportedApps::'.App\Item::nameFromClass(old('class')).'.config')
+            </div>
+
             @else
+
             <div id="sapconfig"></div>
+            
             @endif
             
         </div>

resources/views/items/scripts.blade.php

@@ -26,6 +26,12 @@
                     appload(appvalue);
                 }
             });
+            // initial load
+            $('#tile-preview .title').html($('#appname').val());
+            $('#tile-preview .item').css('backgroundColor', $('#appcolour').val());
+            $('#tile-preview .app-icon').attr('src', $('#appimage img').attr('src'));
+
+            // Updates
             $('#appname').on('keyup change', function(e) {
                 $('#tile-preview .title').html($(this).val());
             })
@@ -39,7 +45,10 @@
             $('.tags').select2();
 
             function appload(appvalue) {
-                $.post('{{ route('appload') }}', { app: appvalue }, function(data) {
+                if(appvalue == 'None') {
+                    $('#sapconfig').html('').hide();
+                } else {
+                    $.post('{{ route('appload') }}', { app: appvalue }, function(data) {
                         // Main details
                         $('#appimage').html("<img src='"+data.iconview+"' /><input type='hidden' name='icon' value='"+data.icon+"' />");
                         $('input[name=colour]').val(data.colour);
@@ -53,8 +62,11 @@
                             $.get('/view/'+data.config, function(getdata) {
                                 $('#sapconfig').html(getdata).show();
                             });
+                        } else {
+                            $('#sapconfig').html('').hide();
                         }
                     }, "json");
+                }
 
             }
 

resources/views/tags/form.blade.php

@@ -52,15 +52,7 @@
                 </div>
             </div>
             
-            @if(isset($item) && isset($item->config->view))
-            <div id="sapconfig" style="display: block;">
-                @if(isset($item))
-                @include('supportedapps.'.$item->config->view)
-                @endif
-            </div>
-            @else
             <div id="sapconfig"></div>
-            @endif
             
         </div>
         <footer>

resources/views/tags/list.blade.php

@@ -30,7 +30,7 @@
                         @foreach($apps as $app)
                             <tr>
                                 <td>{{ $app->title }}</td>
-                                <td><a{{ $app->target }} href="{{ $app->url }}">{{ $app->link }}</a></td>
+                                <td><a{{ $app->target }} href="/tag/{{ $app->url }}">{{ $app->link }}</a></td>
                                 <td class="text-center"><a href="{!! route('tags.edit', [$app->id], false) !!}" title="{{ __('app.settings.edit') }} {!! $app->title !!}"><i class="fas fa-edit"></i></a></td>
                                 <td class="text-center">
                                         {!! Form::open(['method' => 'DELETE','route' => ['tags.destroy', $app->id],'style'=>'display:inline']) !!}

routes/web.php

@@ -29,6 +29,7 @@ Route::resources([
 
 Route::get('tag/{slug}', 'TagController@show')->name('tags.show');
 Route::get('tag/add/{tag}/{item}', 'TagController@add')->name('tags.add');
+Route::get('tag/restore/{id}', 'TagController@restore')->name('tags.restore');
 
 
 Route::get('items/pin/{id}', 'ItemController@pin')->name('items.pin');