Localhost doesn't like the certificate so ignore the warning

added Baidu and sort order by alphabet

.env.example

@@ -1,15 +1,17 @@
 APP_NAME=Heimdall
 APP_ENV=local
 APP_KEY=
-APP_DEBUG=true
-APP_LOG_LEVEL=debug
+APP_DEBUG=false
 APP_URL=http://localhost
 
+LOG_CHANNEL=daily
+
 DB_CONNECTION=sqlite
 DB_DATABASE=app.sqlite
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
+QUEUE_CONNECTION=sync
 SESSION_DRIVER=file
 SESSION_LIFETIME=120
 QUEUE_DRIVER=sync
@@ -18,14 +20,24 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
-MAIL_DRIVER=smtp
+MAIL_MAILER=smtp
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
 MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS=null
+MAIL_FROM_NAME="${APP_NAME}"
+
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_DEFAULT_REGION=us-east-1
+AWS_BUCKET=
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
 PUSHER_APP_CLUSTER=mt1
+
+MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
+MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

SECURITY.md

@@ -0,0 +1,14 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 2.3.x   | :white_check_mark: |
+| < 2.3   | :x:                |
+
+## Reporting a Vulnerability
+
+You can report any vulnerabilities on our discord server by DM-ing a team member, or asking a team member to DM you.
+
+https://discord.com/invite/YWrKVTn

app/Application.php

@@ -13,14 +13,13 @@ class Application extends Model
     //
     public function icon()
     {
-        if(!file_exists(storage_path('app/public/'.$this->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;
     }
 
@@ -32,32 +31,103 @@ class Application extends Model
     public function defaultColour()
     {
         // check if light or dark
-        if($this->tile_background == 'light') return '#fafbfc';
+        if ($this->tile_background == 'light') {
+            return '#fafbfc';
+        }
+
         return '#161b1f';
     }
 
     public function class()
     {
         $name = $this->name;
-        $name = preg_replace('/\PL/u', '', $name);    
+        $name = preg_replace('/[^\p{L}\p{N}]/u', '', $name);
 
         $class = '\App\SupportedApps\\'.$name.'\\'.$name;
+
         return $class;
     }
 
+    public static function classFromName($name)
+    {
+        $name = preg_replace('/[^\p{L}\p{N}]/u', '', $name);
+
+        $class = '\App\SupportedApps\\'.$name.'\\'.$name;
+
+        return $class;
+    }
+
+    public static function apps()
+    {
+        $json = json_decode(file_get_contents(storage_path('app/supportedapps.json'))) ?? [];
+        $apps = collect($json->apps);
+        $sorted = $apps->sortBy('name', SORT_NATURAL | SORT_FLAG_CASE);
+
+        return $sorted;
+    }
+
+    public static function autocomplete()
+    {
+        $apps = self::apps();
+        $list = [];
+        foreach ($apps as $app) {
+            $list[] = (object) [
+                'label' => $app->name,
+                'value' => $app->appid,
+            ];
+        }
+
+        return $list;
+    }
+
+    public static function getApp($appid)
+    {
+        $localapp = self::where('appid', $appid)->first();
+        $app = self::single($appid);
+
+        $application = ($localapp) ? $localapp : new self;
+
+        if (! file_exists(app_path('SupportedApps/'.className($app->name)))) {
+            SupportedApps::getFiles($app);
+            SupportedApps::saveApp($app, $application);
+        } else {
+            // check if there has been an update for this app
+            if ($localapp) {
+                if ($localapp->sha !== $app->sha) {
+                    SupportedApps::getFiles($app);
+                    $app = SupportedApps::saveApp($app, $application);
+                }
+            } else {
+                SupportedApps::getFiles($app);
+                $app = SupportedApps::saveApp($app, $application);
+            }
+        }
+
+        return $app;
+    }
+
+    public static function single($appid)
+    {
+        $apps = self::apps();
+        $app = $apps->where('appid', $appid)->first();
+        if ($app === null) {
+            return null;
+        }
+        $classname = preg_replace('/[^\p{L}\p{N}]/u', '', $app->name);
+        $app->class = '\App\SupportedApps\\'.$classname.'\\'.$classname;
+
+        return $app;
+    }
+
     public static function applist()
     {
         $list = [];
-        $all = self::orderBy('name')->get()->sortBy('name', SORT_NATURAL|SORT_FLAG_CASE);
         $list['null'] = 'None';
-        foreach($all as $app) {
-            $name = $app->name;
-            $name = preg_replace('/\PL/u', '', $name);
-        
-            $list['\App\SupportedApps\\'.$name.'\\'.$name] = $app->name;
+        $apps = self::apps();
+        foreach ($apps as $app) {
+            $list[$app->appid] = $app->name;
         }
+
         return $list;
     }
-
-
 }

app/Console/Commands/RegisterApp.php

@@ -2,9 +2,9 @@
 
 namespace App\Console\Commands;
 
-use Illuminate\Console\Command;
 use App\Application;
 use App\SupportedApps;
+use Illuminate\Console\Command;
 
 class RegisterApp extends Command
 {
@@ -40,40 +40,38 @@ class RegisterApp extends Command
     public function handle()
     {
         $folder = $this->argument('folder');
-        if($folder == 'all') {
+        if ($folder == 'all') {
             $apps = scandir(app_path('SupportedApps'));
-            foreach($apps as $folder) {
-                if($folder == '.' || $folder == '..') continue;
+            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)) {
+        if (file_exists($json)) {
             $app = json_decode(file_get_contents($json));
-            if(isset($app->appid)) {
+            if (isset($app->appid)) {
                 $exists = Application::find($app->appid);
-                if($exists) {
-                    $this->error('Application already registered - '.$exists->name." - ".$exists->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);
+                    $this->info('Application Added - '.$app->name.' - '.$app->appid);
                 }
             } else {
                 $this->error('No App ID for - '.$folder);
             }
-            
         } else {
             $this->error('Could not find '.$json);
         }
-
     }
 }

app/EnhancedApps.php

@@ -1,12 +1,15 @@
-<?php namespace App;
+<?php
+
+namespace App;
 
-use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
 
 interface EnhancedApps
 {
     public function test();
-    public function livestats();
-    public function url($endpoint);
 
-}
+    public function livestats();
+
+    public function url($endpoint);
+}

app/Exceptions/Handler.php

@@ -2,8 +2,8 @@
 
 namespace App\Exceptions;
 
-use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -22,32 +22,20 @@ class Handler extends ExceptionHandler
      * @var array
      */
     protected $dontFlash = [
+        'current_password',
         'password',
         'password_confirmation',
     ];
 
     /**
-     * Report or log an exception.
+     * Register the exception handling callbacks for the application.
      *
-     * This is a great spot to send exceptions to Sentry, Bugsnag, etc.
-     *
-     * @param  \Exception  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function register()
     {
-        parent::report($exception);
-    }
-
-    /**
-     * Render an exception into an HTTP response.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
-     * @return \Illuminate\Http\Response
-     */
-    public function render($request, Exception $exception)
-    {
-        return parent::render($request, $exception);
+        $this->reportable(function (Throwable $e) {
+            //
+        });
     }
 }

app/Helper.php

@@ -1,34 +1,64 @@
 <?php
 
+use Illuminate\Support\Str;
+
 function format_bytes($bytes, $is_drive_size = true, $beforeunit = '', $afterunit = '')
 {
-	$btype = ($is_drive_size === true) ? 1000 : 1024;
-    $labels = array('B','KB','MB','GB','TB');
-    for($x = 0; $bytes >= $btype && $x < (count($labels) - 1); $bytes /= $btype, $x++); // use 1000 rather than 1024 to simulate HD size not real size
-    if($labels[$x] == "TB") return(round($bytes, 3).$beforeunit.$labels[$x].$afterunit);
-    elseif($labels[$x] == "GB") return(round($bytes, 2).$beforeunit.$labels[$x].$afterunit);
-    elseif($labels[$x] == "MB") return(round($bytes, 2).$beforeunit.$labels[$x].$afterunit);
-    else return(round($bytes, 0).$beforeunit.$labels[$x].$afterunit);
+    $btype = ($is_drive_size === true) ? 1000 : 1024;
+    $labels = ['B', 'KB', 'MB', 'GB', 'TB'];
+    for ($x = 0; $bytes >= $btype && $x < (count($labels) - 1); $bytes /= $btype, $x++); // use 1000 rather than 1024 to simulate HD size not real size
+    if ($labels[$x] == 'TB') {
+        return round($bytes, 3).$beforeunit.$labels[$x].$afterunit;
+    } elseif ($labels[$x] == 'GB') {
+        return round($bytes, 2).$beforeunit.$labels[$x].$afterunit;
+    } elseif ($labels[$x] == 'MB') {
+        return round($bytes, 2).$beforeunit.$labels[$x].$afterunit;
+    } else {
+        return round($bytes, 0).$beforeunit.$labels[$x].$afterunit;
+    }
 }
 
-function get_brightness($hex) {
+function str_slug($title, $separator = '-', $language = 'en')
+{
+    return Str::slug($title, $separator, $language);
+}
+
+if (! function_exists('str_is')) {
+    /**
+     * Determine if a given string matches a given pattern.
+     *
+     * @param  string|array  $pattern
+     * @param  string  $value
+     * @return bool
+     *
+     * @deprecated Str::is() should be used directly instead. Will be removed in Laravel 6.0.
+     */
+    function str_is($pattern, $value)
+    {
+        return Str::is($pattern, $value);
+    }
+}
+
+function get_brightness($hex)
+{
     // returns brightness value from 0 to 255
     // strip off any leading #
-    $hex = str_replace('#', '', $hex);
-    if(strlen($hex) == 3) {
+    // $hex = str_replace('#', '', $hex);
+    $hex = preg_replace("/[^0-9A-Fa-f]/", '', $hex);
+    if (strlen($hex) == 3) {
         $hex = $hex[0].$hex[0].$hex[1].$hex[1].$hex[2].$hex[2];
     }
-   
+
     $c_r = hexdec(substr($hex, 0, 2));
     $c_g = hexdec(substr($hex, 2, 2));
     $c_b = hexdec(substr($hex, 4, 2));
-   
+
     return (($c_r * 299) + ($c_g * 587) + ($c_b * 114)) / 1000;
 }
 
 function title_color($hex)
 {
-    if(get_brightness($hex) > 130) {
+    if (get_brightness($hex) > 130) {
         return ' black';
     } else {
         return ' white';
@@ -39,18 +69,16 @@ function getLinkTargetAttribute()
 {
     $target = \App\Setting::fetch('window_target');
 
-    if($target === 'current') {
+    if ($target === 'current') {
         return '';
     } else {
-        return ' target="' . $target . '"';
+        return ' target="'.$target.'"';
     }
 }
 
-
-
 function className($name)
 {
-    $name = preg_replace('/\PL/u', '', $name);
+    $name = preg_replace('/[^\p{L}\p{N}]/u', '', $name);
+
     return $name;
 }
-

app/Http/Controllers/Auth/LoginController.php

@@ -3,8 +3,8 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use App\User;
+use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
@@ -59,7 +59,7 @@ class LoginController extends Controller
     public function login(Request $request)
     {
         $current_user = User::currentUser();
-        $request->merge(['username' => $current_user->username]);
+        $request->merge(['username' => $current_user->username, 'remember' => true]);
         //die(print_r($request->all()));
         $this->validateLogin($request);
 
@@ -92,14 +92,16 @@ class LoginController extends Controller
     {
         Auth::logout();
         session(['current_user' => $user]);
+
         return redirect()->route('dash');
     }
 
     public function autologin($uuid)
     {
         $user = User::where('autologin', $uuid)->first();
-        Auth::login($user);
+        Auth::login($user, true);
         session(['current_user' => $user]);
+
         return redirect()->route('dash');
     }
 
@@ -122,5 +124,4 @@ class LoginController extends Controller
     {
         return Session::get('url.intended') ? Session::get('url.intended') : $this->redirectTo;
     }
-
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\User;
 use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Validator;
+use App\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
+use Illuminate\Support\Facades\Validator;
 
 class RegisterController extends Controller
 {

app/Http/Controllers/Controller.php

@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Routing\Controller as BaseController;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Support\Facades\Auth;
 use App\User;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Support\Facades\Auth;
 
 class Controller extends BaseController
 {
@@ -22,7 +22,6 @@ class Controller extends BaseController
             //print_r($this->user);
             return $next($request);
         });
-        
     }
 
     public function user()

app/Http/Controllers/ItemController.php

@@ -2,18 +2,21 @@
 
 namespace App\Http\Controllers;
 
-use Artisan;
 use App\Application;
 use App\Item;
-use App\Setting;
-use App\User;
-use GrahamCampbell\GitHub\Facades\GitHub;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
-use App\SupportedApps;
 use App\Jobs\ProcessApps;
 use App\Search;
+use App\Setting;
+use App\SupportedApps;
+use App\User;
+use Artisan;
+use GrahamCampbell\GitHub\Facades\GitHub;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Route;
+use Illuminate\Support\Facades\Storage;
 
 class ItemController extends Controller
 {
@@ -21,7 +24,8 @@ class ItemController extends Controller
     {
         $this->middleware('allowed');
     }
-     /**
+
+    /**
      * Display a listing of the resource on the dashboard.
      *
      * @return \Illuminate\Http\Response
@@ -30,18 +34,18 @@ class ItemController extends Controller
     {
         $data['apps'] = Item::whereHas('parents', function ($query) {
             $query->where('id', 0);
-        })->pinned()->orderBy('order', 'asc')->get();
+        })->orWhere('type', 1)->pinned()->orderBy('order', 'asc')->get();
 
         $data['all_apps'] = Item::whereHas('parents', function ($query) {
             $query->where('id', 0);
-        })->orderBy('order', 'asc')->get();
+        })->orWhere('type', 1)->orderBy('order', 'asc')->get();
 
         //$data['all_apps'] = Item::doesntHave('parents')->get();
         //die(print_r($data['apps']));
         return view('welcome', $data);
     }
 
-     /**
+    /**
      * Set order on the dashboard.
      *
      * @return \Illuminate\Http\Response
@@ -49,7 +53,7 @@ class ItemController extends Controller
     public function setOrder(Request $request)
     {
         $order = array_filter($request->input('order'));
-        foreach($order as $o => $id) {
+        foreach ($order as $o => $id) {
             $item = Item::find($id);
             $item->order = $o;
             $item->save();
@@ -67,10 +71,11 @@ class ItemController extends Controller
         $item->pinned = true;
         $item->save();
         $route = route('dash', []);
+
         return redirect($route);
     }
 
-     /**
+    /**
      * Unpin item on the dashboard.
      *
      * @return \Illuminate\Http\Response
@@ -81,36 +86,38 @@ class ItemController extends Controller
         $item->pinned = false;
         $item->save();
         $route = route('dash', []);
+
         return redirect($route);
     }
 
-     /**
+    /**
      * Unpin item on the dashboard.
      *
      * @return \Illuminate\Http\Response
      */
-    public function pinToggle($id, $ajax=false, $tag=false)
+    public function pinToggle($id, $ajax = false, $tag = false)
     {
         $item = Item::findOrFail($id);
-        $new = ((bool)$item->pinned === true) ? false : true;
+        $new = ((bool) $item->pinned === true) ? false : true;
         $item->pinned = $new;
         $item->save();
-        if($ajax) {
-            if(is_numeric($tag) && $tag > 0) {
+        if ($ajax) {
+            if (is_numeric($tag) && $tag > 0) {
                 $item = Item::whereId($tag)->first();
                 $data['apps'] = $item->children()->pinned()->orderBy('order', 'asc')->get();
             } else {
                 $data['apps'] = Item::pinned()->orderBy('order', 'asc')->get();
             }
             $data['ajax'] = true;
+
             return view('sortable', $data);
         } else {
             $route = route('dash', []);
+
             return redirect($route);
         }
     }
 
-   
     /**
      * Display a listing of the resource.
      *
@@ -118,18 +125,17 @@ class ItemController extends Controller
      */
     public function index(Request $request)
     {
-        $trash = (bool)$request->input('trash');
+        $trash = (bool) $request->input('trash');
 
         $data['apps'] = Item::ofType('item')->orderBy('title', 'asc')->get();
         $data['trash'] = Item::ofType('item')->onlyTrashed()->get();
-        if($trash) {
+        if ($trash) {
             return view('items.trash', $data);
         } else {
             return view('items.list', $data);
         }
     }
 
-
     /**
      * Show the form for creating a new resource.
      *
@@ -140,9 +146,93 @@ class ItemController extends Controller
         //
         $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
         $data['tags']->prepend(__('app.dashboard'), 0);
-        $data['current_tags'] = collect([0 => __('app.dashboard')]);
-        return view('items.create', $data);
+        $data['current_tags'] = '0';
 
+        return view('items.create', $data);
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($id)
+    {
+        // Get the item
+        $item = Item::find($id);
+        if ($item->appid === null && $item->class !== null) { // old apps wont have an app id so set it
+            $app = Application::where('class', $item->class)->first();
+            if ($app) {
+                $item->appid = $app->appid;
+            }
+        }
+        $data['item'] = $item;
+        $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
+        $data['tags']->prepend(__('app.dashboard'), 0);
+        $data['current_tags'] = $data['item']->tags();
+        //$data['current_tags'] = $data['item']->parent;
+        //die(print_r($data['current_tags']));
+        // show the edit form and pass the nerd
+        return view('items.edit', $data);
+    }
+
+    public function storelogic($request, $id = null)
+    {
+        $application = Application::single($request->input('appid'));
+        $validatedData = $request->validate([
+            'title' => 'required|max:255',
+            'url' => 'required',
+        ]);
+
+        if ($request->hasFile('file')) {
+            $path = $request->file('file')->store('icons');
+            $request->merge([
+                'icon' => $path,
+            ]);
+        } elseif (strpos($request->input('icon'), 'http') === 0) {
+            $contents = file_get_contents($request->input('icon'));
+
+            if ($application) {
+                $icon = $application->icon;
+            } else {
+                $file = $request->input('icon');
+                $path_parts = pathinfo($file);
+                $icon = md5($contents);
+                $icon .= '.'.$path_parts['extension'];
+            }
+            $path = 'icons/'.$icon;
+            Storage::disk('public')->put($path, $contents);
+            $request->merge([
+                'icon' => $path,
+            ]);
+        }
+
+        $config = Item::checkConfig($request->input('config'));
+        $current_user = User::currentUser();
+        $request->merge([
+            'description' => $config,
+            'user_id' => $current_user->id,
+        ]);
+
+        if ($request->input('appid') === 'null') {
+            $request->merge([
+                'class' => null,
+            ]);
+        } else {
+            $request->merge([
+                'class' => Application::classFromName($application->name),
+            ]);
+        }
+
+        if ($id === null) {
+            $item = Item::create($request->all());
+        } else {
+            $item = Item::find($id);
+            $item->update($request->all());
+        }
+
+        $item->parents()->sync($request->tags);
     }
 
     /**
@@ -153,42 +243,10 @@ class ItemController extends Controller
      */
     public function store(Request $request)
     {
-        //
-        $validatedData = $request->validate([
-            'title' => 'required|max:255',
-            'url' => 'required',
-        ]);
-
-        if($request->hasFile('file')) {
-            $path = $request->file('file')->store('icons');
-            $request->merge([
-                'icon' => $path
-            ]);
-        }
-
-        $config = Item::checkConfig($request->input('config'));
-        $current_user = User::currentUser();
-        $request->merge([
-            'description' => $config,
-            'user_id' => $current_user->id
-        ]);
-
-        if($request->input('class') === 'null') {
-            $request->merge([
-                'class' => null,
-            ]);
-        }
-
-
-        //die(print_r($request->input('config')));
-        
-        $item = Item::create($request->all());
-
-        //Search::storeSearchProvider($request->input('class'), $item);
-
-        $item->parents()->sync($request->tags);
+        $this->storelogic($request);
 
         $route = route('dash', []);
+
         return redirect($route)
             ->with('success', __('app.alert.success.item_created'));
     }
@@ -204,25 +262,6 @@ class ItemController extends Controller
         //
     }
 
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit($id)
-    {
-        // Get the item
-        $data['item'] = Item::find($id);
-        $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
-        $data['tags']->prepend(__('app.dashboard'), 0);
-        $data['current_tags'] = $data['item']->tags();
-        //$data['current_tags'] = $data['item']->parent;
-        //die(print_r($data['current_tags']));
-        // show the edit form and pass the nerd
-        return view('items.edit', $data);    
-    }
-
     /**
      * Update the specified resource in storage.
      *
@@ -232,42 +271,11 @@ class ItemController extends Controller
      */
     public function update(Request $request, $id)
     {
-        $validatedData = $request->validate([
-            'title' => 'required|max:255',
-            'url' => 'required',
-        ]);
-            //die(print_r($request->all()));
-        if($request->hasFile('file')) {
-            $path = $request->file('file')->store('icons');
-            $request->merge([
-                'icon' => $path
-            ]);
-        }
-        
-        $config = Item::checkConfig($request->input('config'));
-        $current_user = User::currentUser();
-        $request->merge([
-            'description' => $config,
-            'user_id' => $current_user->id
-        ]);
-
-        if($request->input('class') === 'null') {
-            $request->merge([
-                'class' => null,
-            ]);
-        }
-
-
-        $item = Item::find($id);
-        $item->update($request->all());
-
-        //Search::storeSearchProvider($request->input('class'), $item);
-
-        $item->parents()->sync($request->tags);
-
+        $this->storelogic($request, $id);
         $route = route('dash', []);
+
         return redirect($route)
-            ->with('success',__('app.alert.success.item_updated'));
+            ->with('success', __('app.alert.success.item_updated'));
     }
 
     /**
@@ -279,8 +287,8 @@ class ItemController extends Controller
     public function destroy(Request $request, $id)
     {
         //
-        $force = (bool)$request->input('force');
-        if($force) {
+        $force = (bool) $request->input('force');
+        if ($force) {
             Item::withTrashed()
                 ->where('id', $id)
                 ->forceDelete();
@@ -289,8 +297,9 @@ class ItemController extends Controller
         }
 
         $route = route('items.index', []);
-        return redirect($route)       
-            ->with('success',__('app.alert.success.item_deleted'));
+
+        return redirect($route)
+            ->with('success', __('app.alert.success.item_deleted'));
     }
 
     /**
@@ -304,11 +313,12 @@ class ItemController extends Controller
         //
         Item::withTrashed()
                 ->where('id', $id)
-                ->restore();      
-        
-        $route = route('items.inded', []);
+                ->restore();
+
+        $route = route('items.index', []);
+
         return redirect($route)
-            ->with('success',__('app.alert.success.item_restored'));
+            ->with('success', __('app.alert.success.item_restored'));
     }
 
     /**
@@ -319,7 +329,12 @@ class ItemController extends Controller
     public function appload(Request $request)
     {
         $output = [];
-        $appname = $request->input('app');
+        $appid = $request->input('app');
+
+        if ($appid === 'null') {
+            return null;
+        }
+        /*$appname = $request->input('app');
         //die($appname);
 
         $app_details = Application::where('name', $appname)->firstOrFail();
@@ -338,8 +353,25 @@ class ItemController extends Controller
             $output['config'] = className($app_details->name).'.config';
         } else {
             $output['config'] = null;
+        }*/
+
+        $output['config'] = null;
+        $output['custom'] = null;
+
+        $app = Application::single($appid);
+        $output = (array) $app;
+
+        $appdetails = Application::getApp($appid);
+
+        if ((bool) $app->enhanced === true) {
+            // if(!isset($app->config)) { // class based config
+            $output['custom'] = className($appdetails->name).'.config';
+            // }
         }
-        
+
+        $output['colour'] = ($app->tile_background == 'light') ? '#fafbfc' : '#161b1f';
+        $output['iconview'] = config('app.appsource').'icons/'.$app->icon;
+
         return json_encode($output);
     }
 
@@ -347,39 +379,68 @@ class ItemController extends Controller
     {
         $data = $request->input('data');
         //$url = $data[array_search('url', array_column($data, 'name'))]['value'];
-        
-        $app = $data['type'];
+        $single = Application::single($data['type']);
+        $app = $single->class;
 
         $app_details = new $app();
-        $app_details->config = (object)$data;
+        $app_details->config = (object) $data;
         $app_details->test();
     }
 
+    public function execute($url, $attrs = [], $overridevars = false)
+    {
+        $res = null;
+
+        $vars = ($overridevars !== false) ?
+        $overridevars : [
+            'http_errors' => false,
+            'timeout' => 15,
+            'connect_timeout' => 15,
+            'verify' => false,
+        ];
+
+        $client = new Client($vars);
+
+        $method = 'GET';
+
+        try {
+            return $client->request($method, $url, $attrs);
+        } catch (\GuzzleHttp\Exception\ConnectException $e) {
+            Log::error('Connection refused');
+            Log::debug($e->getMessage());
+        } catch (\GuzzleHttp\Exception\ServerException $e) {
+            Log::debug($e->getMessage());
+        }
+
+        return $res;
+    }
+
+    public function websitelookup($url)
+    {
+        $url = \base64_decode($url);
+        $data = $this->execute($url);
+
+        return $data->getBody();
+    }
+
     public function getStats($id)
     {
         $item = Item::find($id);
 
         $config = $item->getconfig();
-        if(isset($item->class)) {
+        if (isset($item->class)) {
             $application = new $item->class;
             $application->config = $config;
             echo $application->livestats();
         }
-        
     }
 
-
     public function checkAppList()
     {
         ProcessApps::dispatch();
         $route = route('items.index');
+
         return redirect($route)
             ->with('success', __('app.alert.success.updating'));
-
     }
-
-    
-    
-
-    
 }

app/Http/Controllers/SearchController.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Search;
+use Illuminate\Http\Request;
 
 class SearchController extends Controller
 {
@@ -15,9 +15,9 @@ class SearchController extends Controller
 
         $provider = Search::providerDetails($requestprovider);
 
-        if($provider->type == 'standard') {
-            return redirect($provider->url.'?'.$provider->var.'='.urlencode($query));
-        } elseif($provider->type == 'external') {
+        if ($provider->type == 'standard') {
+            return redirect($provider->url.'?'.$provider->query.'='.urlencode($query));
+        } elseif ($provider->type == 'external') {
             $class = new $provider->class;
             //print_r($provider);
             return $class->getResults($query, $provider);

app/Http/Controllers/SettingsController.php

@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
 use App\Setting;
 use App\SettingGroup;
 use App\User;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use App\Http\Controllers\Controller;
 
 class SettingsController extends Controller
 {
@@ -40,15 +40,18 @@ class SettingsController extends Controller
         $setting = Setting::find($id);
         //die("s: ".$setting->label);
 
-        if((bool)$setting->system === true) return abort(404);
+        if ((bool) $setting->system === true) {
+            return abort(404);
+        }
 
-        if (!is_null($setting)) {
+        if (! is_null($setting)) {
             return view('settings.edit')->with([
                 'setting' => $setting,
             ]);
         } else {
             $route = route('settings.list', []);
-            return redirect($route) 
+
+            return redirect($route)
             ->with([
                 'error' => __('app.alert.error.not_exist'),
             ]);
@@ -65,39 +68,39 @@ class SettingsController extends Controller
         $setting = Setting::find($id);
         $user = $this->user();
 
-        if (!is_null($setting)) {
-            $data = Setting::getInput();
+        if (! is_null($setting)) {
+            $data = Setting::getInput($request);
 
             $setting_value = null;
 
             if ($setting->type == 'image') {
-
-
-                if($request->hasFile('value')) {
+                if ($request->hasFile('value')) {
                     $path = $request->file('value')->store('backgrounds');
                     $setting_value = $path;
                 }
-            
             } else {
                 $setting_value = $data->value;
             }
 
             $user->settings()->detach($setting->id);
             $user->settings()->save($setting, ['uservalue' => $setting_value]);
-            
+
             $route = route('settings.index', []);
-            return redirect($route) 
+
+            return redirect($route)
             ->with([
                 'success' => __('app.alert.success.setting_updated'),
             ]);
         } else {
             $route = route('settings.index', []);
-            return redirect($route) 
+
+            return redirect($route)
             ->with([
                 'error' => __('app.alert.error.not_exist'),
             ]);
         }
     }
+
     /**
      * @param int $id
      *
@@ -107,21 +110,19 @@ class SettingsController extends Controller
     {
         $user = $this->user();
         $setting = Setting::find($id);
-        if((bool)$setting->system !== true) {
+        if ((bool) $setting->system !== true) {
             $user->settings()->detach($setting->id);
             $user->settings()->save($setting, ['uservalue' => '']);
         }
         $route = route('settings.index', []);
-        return redirect($route) 
+
+        return redirect($route)
         ->with([
             'success' => __('app.alert.success.setting_updated'),
         ]);
-    
     }
 
     public function search(Request $request)
     {
-        
     }
-
 }

app/Http/Controllers/TagController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use App\Item;
 use App\User;
 use DB;
+use Illuminate\Http\Request;
 
 class TagController extends Controller
 {
@@ -13,6 +13,7 @@ class TagController extends Controller
     {
         $this->middleware('allowed');
     }
+
     /**
      * Display a listing of the resource.
      *
@@ -20,11 +21,11 @@ class TagController extends Controller
      */
     public function index(Request $request)
     {
-        $trash = (bool)$request->input('trash');
+        $trash = (bool) $request->input('trash');
 
         $data['apps'] = Item::ofType('tag')->where('id', '>', 0)->orderBy('title', 'asc')->get();
         $data['trash'] = Item::ofType('tag')->where('id', '>', 0)->onlyTrashed()->get();
-        if($trash) {
+        if ($trash) {
             return view('tags.trash', $data);
         } else {
             return view('tags.list', $data);
@@ -39,6 +40,7 @@ class TagController extends Controller
     public function create()
     {
         $data = [];
+
         return view('tags.create', $data);
     }
 
@@ -54,10 +56,10 @@ class TagController extends Controller
             'title' => 'required|max:255',
         ]);
 
-        if($request->hasFile('file')) {
+        if ($request->hasFile('file')) {
             $path = $request->file('file')->store('icons');
             $request->merge([
-                'icon' => $path
+                'icon' => $path,
             ]);
         }
 
@@ -69,12 +71,13 @@ class TagController extends Controller
         $request->merge([
             'type' => '1',
             'url' => $slug,
-            'user_id' => $current_user->id
+            'user_id' => $current_user->id,
         ]);
         //die(print_r($request->all()));
         Item::create($request->all());
 
         $route = route('dash', []);
+
         return redirect($route)
             ->with('success', __('app.alert.success.tag_created'));
     }
@@ -92,6 +95,7 @@ class TagController extends Controller
         $data['apps'] = $item->children()->pinned()->orderBy('order', 'asc')->get();
         $data['tag'] = $item->id;
         $data['all_apps'] = $item->children;
+
         return view('welcome', $data);
     }
 
@@ -108,7 +112,7 @@ class TagController extends Controller
 
         // show the edit form and pass the nerd
         return view('tags.edit')
-            ->with('item', $item);    
+            ->with('item', $item);
     }
 
     /**
@@ -124,24 +128,25 @@ class TagController extends Controller
             'title' => 'required|max:255',
         ]);
 
-        if($request->hasFile('file')) {
+        if ($request->hasFile('file')) {
             $path = $request->file('file')->store('icons');
             $request->merge([
-                'icon' => $path
+                'icon' => $path,
             ]);
         }
 
         $slug = str_slug($request->title, '-');
         // set item type to tag
         $request->merge([
-            'url' => $slug
+            'url' => $slug,
         ]);
 
         Item::find($id)->update($request->all());
 
         $route = route('dash', []);
+
         return redirect($route)
-        ->with('success',__('app.alert.success.tag_updated'));
+        ->with('success', __('app.alert.success.tag_updated'));
     }
 
     /**
@@ -153,18 +158,19 @@ class TagController extends Controller
     public function destroy(Request $request, $id)
     {
         //
-        $force = (bool)$request->input('force');
-        if($force) {
+        $force = (bool) $request->input('force');
+        if ($force) {
             Item::withTrashed()
                 ->where('id', $id)
                 ->forceDelete();
         } else {
             Item::find($id)->delete();
         }
-        
+
         $route = route('tags.index', []);
+
         return redirect($route)
-            ->with('success',__('app.alert.success.item_deleted'));
+            ->with('success', __('app.alert.success.item_deleted'));
     }
 
     /**
@@ -178,10 +184,11 @@ class TagController extends Controller
         //
         Item::withTrashed()
                 ->where('id', $id)
-                ->restore();        
+                ->restore();
         $route = route('tags.index', []);
+
         return redirect($route)
-            ->with('success',__('app.alert.success.item_restored'));
+            ->with('success', __('app.alert.success.item_restored'));
     }
 
     public function add($tag, $item)
@@ -189,14 +196,15 @@ class TagController extends Controller
         $output = 0;
         $tag = Item::find($tag);
         $item = Item::find($item);
-        if($tag && $item) {
+        if ($tag && $item) {
             // only add items, not cats
-            if((int)$item->type === 0) {
+            if ((int) $item->type === 0) {
                 $tag->children()->attach($item);
+
                 return 1;
             }
         }
+
         return $output;
     }
-
 }

app/Http/Controllers/UserController.php

@@ -2,11 +2,11 @@
 
 namespace App\Http\Controllers;
 
-use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\User;
-use Illuminate\Support\Str;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Str;
 
 class UserController extends Controller
 {
@@ -14,6 +14,7 @@ class UserController extends Controller
     {
         $this->middleware('allowed')->except(['selectUser']);
     }
+
     /**
      * Display a listing of the resource.
      *
@@ -22,6 +23,7 @@ class UserController extends Controller
     public function index()
     {
         $data['users'] = User::all();
+
         return view('users.index', $data);
     }
 
@@ -33,6 +35,7 @@ class UserController extends Controller
     public function create()
     {
         $data = [];
+
         return view('users.create', $data);
     }
 
@@ -40,8 +43,8 @@ class UserController extends Controller
     {
         Auth::logout();
         $data['users'] = User::all();
-        return view('userselect', $data);
 
+        return view('userselect', $data);
     }
 
     /**
@@ -56,7 +59,7 @@ class UserController extends Controller
             'username' => 'required|max:255|unique:users',
             'email' => 'required|email',
             'password' => 'nullable|confirmed',
-            'password_confirmation' => 'nullable'
+            'password_confirmation' => 'nullable',
 
         ]);
         $user = new User;
@@ -65,24 +68,25 @@ class UserController extends Controller
         $user->public_front = $request->input('public_front');
 
         $password = $request->input('password');
-        if(!empty($password)) {
+        if (! empty($password)) {
             $user->password = bcrypt($password);
         }
 
-        if($request->hasFile('file')) {
+        if ($request->hasFile('file')) {
             $path = $request->file('file')->store('avatars');
             $user->avatar = $path;
         }
 
-        if ((bool)$request->input('autologin_allow') === true) {
-            $user->autologin = (string)Str::uuid();
+        if ((bool) $request->input('autologin_allow') === true) {
+            $user->autologin = (string) Str::uuid();
         }
 
         $user->save();
-        
+
         $route = route('dash', []);
+
         return redirect($route)
-            ->with('success',__('app.alert.success.user_updated'));
+            ->with('success', __('app.alert.success.user_updated'));
     }
 
     /**
@@ -105,8 +109,8 @@ class UserController extends Controller
     public function edit(User $user)
     {
         $data['user'] = $user;
-        return view('users.edit', $data);
 
+        return view('users.edit', $data);
     }
 
     /**
@@ -122,28 +126,28 @@ class UserController extends Controller
             'username' => 'required|max:255|unique:users,username,'.$user->id,
             'email' => 'required|email',
             'password' => 'nullable|confirmed',
-            'password_confirmation' => 'nullable'
+            'password_confirmation' => 'nullable',
         ]);
-            //die(print_r($request->all()));
+        //die(print_r($request->all()));
 
         $user->username = $request->input('username');
         $user->email = $request->input('email');
         $user->public_front = $request->input('public_front');
 
         $password = $request->input('password');
-        if(!empty($password)) {
+        if (! empty($password)) {
             $user->password = bcrypt($password);
-        } elseif($password == 'null') {
+        } elseif ($password == 'null') {
             $user->password = null;
         }
-    
-        if($request->hasFile('file')) {
+
+        if ($request->hasFile('file')) {
             $path = $request->file('file')->store('avatars');
             $user->avatar = $path;
         }
 
-        if ((bool)$request->input('autologin_allow') === true) {
-            $user->autologin = (is_null($user->autologin)) ? (string)Str::uuid() : $user->autologin;
+        if ((bool) $request->input('autologin_allow') === true) {
+            $user->autologin = (is_null($user->autologin)) ? (string) Str::uuid() : $user->autologin;
         } else {
             $user->autologin = null;
         }
@@ -151,9 +155,9 @@ class UserController extends Controller
         $user->save();
 
         $route = route('dash', []);
-        return redirect($route)
-            ->with('success',__('app.alert.success.user_updated'));
 
+        return redirect($route)
+            ->with('success', __('app.alert.success.user_updated'));
     }
 
     /**
@@ -164,12 +168,12 @@ class UserController extends Controller
      */
     public function destroy(User $user)
     {
-        if($user->id !== 1) {
+        if ($user->id !== 1) {
             $user->delete();
             $route = route('dash', []);
-            return redirect($route)
-            ->with('success',__('app.alert.success.user_deleted'));
 
+            return redirect($route)
+            ->with('success', __('app.alert.success.user_deleted'));
         }
     }
 }

app/Http/Middleware/CheckAllowed.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Middleware;
 
+use App\User;
 use Closure;
 use Illuminate\Support\Facades\Auth;
-use App\User;
 use Illuminate\Support\Facades\Route;
 use Session;
 
@@ -22,27 +22,32 @@ class CheckAllowed
         $route = Route::currentRouteName();
         $current_user = User::currentUser();
 
-        if(str_is('users*', $route)) {
-            if($current_user->id !== 1) {
+        if (str_is('users*', $route)) {
+            if ($current_user->id !== 1) {
                 return redirect()->route('dash');
             }
         }
 
-        if($route == 'dash') {
+        if ($route == 'dash') {
             //print_r(User::all());
             //die("here".var_dump($current_user->password));
-            if((bool)$current_user->public_front === true) return $next($request);
+            if ((bool) $current_user->public_front === true) {
+                return $next($request);
+            }
         }
 
-        if(empty($current_user->password)) return $next($request);
+        if (empty($current_user->password)) {
+            return $next($request);
+        }
 
         // Check if user is logged in as $current_user
         if (Auth::check()) {
             $loggedin_user = Auth::user();
-            if($loggedin_user->id === $current_user->id) return $next($request);
+            if ($loggedin_user->id === $current_user->id) {
+                return $next($request);
+            }
         }
 
         return Auth::authenticate();
-
     }
 }

app/Http/Middleware/TrustProxies.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Middleware;
 
-use Illuminate\Http\Request;
 use Fideloper\Proxy\TrustProxies as Middleware;
+use Illuminate\Http\Request;
 
 class TrustProxies extends Middleware
 {
@@ -12,7 +12,7 @@ class TrustProxies extends Middleware
      *
      * @var array
      */
-    protected $proxies = ['192.168.0.0/16', '172.16.0.0/12','10.0.0.0/8', '127.0.0.1'];
+    protected $proxies = ['192.168.0.0/16', '172.16.0.0/12', '10.0.0.0/8', '127.0.0.1'];
 
     /**
      * The current proxy header mappings.

app/Http/Middleware/VerifyCsrfToken.php

@@ -3,6 +3,7 @@
 namespace App\Http\Middleware;
 
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
+use Symfony\Component\HttpFoundation\Cookie;
 
 class VerifyCsrfToken extends Middleware
 {
@@ -18,4 +19,39 @@ class VerifyCsrfToken extends Middleware
         'test_config',
         //'get_stats'
     ];
+
+    /**
+     * Add the CSRF token to the response cookies.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Symfony\Component\HttpFoundation\Response  $response
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    protected function addCookieToResponse($request, $response)
+    {
+        $config = config('session');
+
+        if ($response instanceof Responsable) {
+            $response = $response->toResponse($request);
+        }
+
+        $response->headers->setCookie(
+            new Cookie(
+                'HEIMDALL-XSRF-TOKEN', $request->session()->token(), $this->availableAt(60 * $config['lifetime']),
+                $config['path'], $config['domain'], $config['secure'], false, false, $config['same_site'] ?? null
+            )
+        );
+
+        return $response;
+    }
+
+    /**
+     * Determine if the cookie contents should be serialized.
+     *
+     * @return bool
+     */
+    public static function serialized()
+    {
+        return EncryptCookies::serialized('HEIMDALL-XSRF-TOKEN');
+    }
 }

app/Item.php

@@ -2,13 +2,13 @@
 
 namespace App;
 
-use Illuminate\Database\Eloquent\Model;
-use Symfony\Component\ClassLoader\ClassMapGenerator;
-use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Database\Eloquent\Builder;
-use App\User;
-use App\ItemTag;
 use App\Application;
+use App\ItemTag;
+use App\User;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Symfony\Component\ClassLoader\ClassMapGenerator;
 
 class Item extends Model
 {
@@ -20,7 +20,7 @@ class Item extends Model
 
         static::addGlobalScope('user_id', function (Builder $builder) {
             $current_user = User::currentUser();
-            if($current_user) {
+            if ($current_user) {
                 $builder->where('user_id', $current_user->id)->orWhere('user_id', 0);
             } else {
                 $builder->where('user_id', 0);
@@ -30,15 +30,10 @@ class Item extends Model
 
     //
     protected $fillable = [
-        'title', 'url', 'colour', 'icon', 'description', 'pinned', 'order', 'type', 'class', 'user_id'
+        'title', 'url', 'colour', 'icon', 'appdescription', 'description', 'pinned', 'order', 'type', 'class', 'user_id', 'tag_id', 'appid',
     ];
 
-    /**
-     * The attributes that should be mutated to dates.
-     *
-     * @var array
-     */
-    protected $dates = ['deleted_at'];
+
 
     /**
      * Scope a query to only include pinned items.
@@ -53,60 +48,49 @@ class Item extends Model
 
     public static function checkConfig($config)
     {
-        if(empty($config)) {
+        // die(print_r($config));
+        if (empty($config)) {
             $config = null;
         } else {
-            $store = false;
-            //die(var_dump($config));
-            foreach($config as $key => $check) {
-                if($key == 'type') continue;
-                if($key == 'dataonly') continue;
-                if(!empty($check) && $check != '0') {
-                    $store = true;
-                    break;
-                }
-            }
-            //die(var_dump($store))
-
-            $config['enabled'] = ($store) ? true : false;
             $config = json_encode($config);
         }
+
         return $config;
-
     }
 
-
     public function tags()
     {
         $id = $this->id;
         $tags = ItemTag::select('tag_id')->where('item_id', $id)->pluck('tag_id')->toArray();
-        $tagdetails = Item::select('id', 'title', 'url', 'pinned')->whereIn('id', $tags)->get();
+        $tagdetails = self::select('id', 'title', 'url', 'pinned')->whereIn('id', $tags)->get();
         //print_r($tags);
-        if(in_array(0, $tags)) {
-            $details = new Item([
-                "id" => 0,
-                "title" => __('app.dashboard'),
-                "url" => '',
-                "pinned" => 0
+        if (in_array(0, $tags)) {
+            $details = new self([
+                'id' => 0,
+                'title' => __('app.dashboard'),
+                'url' => '',
+                'pinned' => 0,
             ]);
             $tagdetails->prepend($details);
         }
+
         return $tagdetails;
     }
 
     public function parents()
     {
-        return $this->belongsToMany('App\Item', 'item_tag', 'item_id', 'tag_id');
+        return $this->belongsToMany(\App\Item::class, 'item_tag', 'item_id', 'tag_id');
     }
+
     public function children()
     {
-        return $this->belongsToMany('App\Item', 'item_tag', 'tag_id', 'item_id');
+        return $this->belongsToMany(\App\Item::class, 'item_tag', 'tag_id', 'item_id');
     }
 
     public function getLinkAttribute()
     {
-        if((int)$this->type === 1) {
-            return '/tag/'.$this->url;
+        if ((int) $this->type === 1) {
+            return url('tag/'.$this->url);
         } else {
             return $this->url;
         }
@@ -114,7 +98,7 @@ class Item extends Model
 
     public function getDroppableAttribute()
     {
-        if((int)$this->type === 1) {
+        if ((int) $this->type === 1) {
             return ' droppable';
         } else {
             return '';
@@ -125,24 +109,25 @@ class Item extends Model
     {
         $target = Setting::fetch('window_target');
 
-        if((int)$this->type === 1 || $target === 'current') {
+        if ((int) $this->type === 1 || $target === 'current') {
             return '';
         } else {
-            return ' target="' . $target . '"';
+            return ' target="'.$target.'"';
         }
     }
 
     public function getLinkIconAttribute()
     {
-        if((int)$this->type === 1) {
+        if ((int) $this->type === 1) {
             return 'fa-tag';
         } else {
             return 'fa-arrow-alt-to-right';
         }
     }
+
     public function getLinkTypeAttribute()
     {
-        if((int)$this->type === 1) {
+        if ((int) $this->type === 1) {
             return 'tags';
         } else {
             return 'items';
@@ -153,13 +138,13 @@ class Item extends Model
     {
         $explode = explode('\\', $class);
         $name = end($explode);
-        
+
         return $name;
     }
 
     public function scopeOfType($query, $type)
     {
-        switch($type) {
+        switch ($type) {
             case 'item':
                 $typeid = 0;
                 break;
@@ -173,83 +158,95 @@ class Item extends Model
 
     public function enhanced()
     {
-        if(isset($this->class) && !empty($this->class)) {
+        /*if(isset($this->class) && !empty($this->class)) {
             $app = new $this->class;
         } else {
             return false;
         }
-        return (bool)($app instanceof \App\EnhancedApps);
+        return (bool)($app instanceof \App\EnhancedApps);*/
+        return $this->description !== null;
     }
 
     public static function isEnhanced($class)
     {
-        if($class === null || $class === 'null') return false;
+        if (!class_exists($class) || $class === null || $class === 'null') {
+            return false;
+        }
         $app = new $class;
-        return (bool)($app instanceof \App\EnhancedApps);
+
+        return (bool) ($app instanceof \App\EnhancedApps);
     }
 
     public static function isSearchProvider($class)
     {
+        if (!class_exists($class) || $class === null || $class === 'null') {
+            return false;
+        }
         $app = new $class;
-        return ((bool)($app instanceof \App\SearchInterface)) ? $app : false;
+
+        return ((bool) ($app instanceof \App\SearchInterface)) ? $app : false;
     }
 
     public function enabled()
     {
-        if($this->enhanced()) {
+        if ($this->enhanced()) {
             $config = $this->getconfig();
-            if($config) {
+            if ($config) {
                 return (bool) $config->enabled;
             }
         }
+
         return false;
     }
 
     public function getconfig()
     {
-        $explode = explode('\\', $this->class);
-        
+        // $explode = explode('\\', $this->class);
 
-        if(!isset($this->description) || empty($this->description)) {
+        if (! isset($this->description) || empty($this->description)) {
             $config = new \stdClass;
-            $config->name = end($explode);
+            // $config->name = end($explode);
             $config->enabled = false;
+            $config->override_url = null;
+            $config->apikey = null;
+
             return $config;
         }
 
-        
-
         $config = json_decode($this->description);
 
-        $config->name = end($explode);
+        // $config->name = end($explode);
 
-        
         $config->url = $this->url;
-        if(isset($config->override_url) && !empty($config->override_url)) {
+        if (isset($config->override_url) && ! empty($config->override_url)) {
             $config->url = $config->override_url;
+        } else {
+            $config->override_url = null;
         }
-    
+
         return $config;
     }
 
     public static function applicationDetails($class)
     {
-        if(!empty($class)) {
+        if (! empty($class)) {
             $name = self::nameFromClass($class);
             $application = Application::where('name', $name)->first();
-            if($application) return $application;
+            if ($application) {
+                return $application;
+            }
         }
 
         return false;
-
     }
 
     public static function getApplicationDescription($class)
     {
         $details = self::applicationDetails($class);
-        if($details !== false) {
+        if ($details !== false) {
             return $details->description.' - '.$details->license;
         }
+
         return '';
     }
 
@@ -258,8 +255,6 @@ class Item extends Model
      */
     public function user()
     {
-        return $this->belongsTo('App\User');
-    }   
-
-
+        return $this->belongsTo(\App\User::class);
+    }
 }

app/ItemTag.php

@@ -6,5 +6,4 @@ use Illuminate\Database\Eloquent\Relations\Pivot;
 
 class ItemTag extends Pivot
 {
-    
-}
+}

app/Jobs/ProcessApps.php

@@ -2,13 +2,15 @@
 
 namespace App\Jobs;
 
+use App\Application;
+use App\Item;
+use App\SupportedApps;
 use Illuminate\Bus\Queueable;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
-use App\Application;
-use App\SupportedApps;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Storage;
 
 class ProcessApps implements ShouldQueue
 {
@@ -31,36 +33,22 @@ class ProcessApps implements ShouldQueue
      */
     public function handle()
     {
-        $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();
+        $localapps = Application::whereNull('class')->get();
+        $json = SupportedApps::getList()->getBody();
 
-            $application = ($localapp) ? $localapp : new Application;
+        Storage::disk('local')->put('supportedapps.json', $json);
 
-            if(!file_exists(app_path('SupportedApps/'.className($app->name)))) {
-                SupportedApps::getFiles($app);
-                SupportedApps::saveApp($app, $application);
-            } else {
-                // check if there has been an update for this app
-                $localapp = $localapps->where('appid', $app->appid)->first();
-                if($localapp) {
-                    if($localapp->sha !== $app->sha) {
-                        SupportedApps::getFiles($app);
-                        SupportedApps::saveApp($app, $application);
-                    }
-                }  else {
-                    SupportedApps::getFiles($app);
-                    SupportedApps::saveApp($app, $application);
-      
-                }
+        foreach ($localapps as $app) {
+            $app->class = $app->class();
+            $app->save();
+        }
+
+        $items = Item::whereNotNull('class')->get();
+        foreach ($items as $item) {
+            if (! file_exists(app_path('SupportedApps/'.Item::nameFromClass($item->class)))) {
+                $app = Application::where('class', $item->class)->first();
+                Application::getApp($app->appid);
             }
         }
-        //$delete = Application::whereNotIn('appid', $validapps)->delete(); // delete any apps not in list
-        // removed the delete so local apps can be added
-
     }
 }

app/Providers/AppServiceProvider.php

@@ -2,13 +2,13 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
-use Artisan;
-use Schema;
-use App\Setting;
-use App\User;
 use App\Application;
 use App\Jobs\ProcessApps;
+use App\Setting;
+use App\User;
+use Artisan;
+use Illuminate\Support\ServiceProvider;
+use Schema;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -19,119 +19,114 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-
-        if(!is_file(base_path('.env'))) {
+        if (! is_file(base_path('.env'))) {
             copy(base_path('.env.example'), base_path('.env'));
         }
         $this->genKey();
-        if(!is_file(database_path('app.sqlite'))) {
+        if (! is_file(database_path('app.sqlite'))) {
             // first time setup
             touch(database_path('app.sqlite'));
-            Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true));
+            Artisan::call('migrate', ['--path' => 'database/migrations', '--force' => true, '--seed' => true]);
             //Cache
             //Artisan::call('config:cache');
             //Artisan::call('route:cache');
         }
-        if(is_file(database_path('app.sqlite'))) {
-            if(Schema::hasTable('settings')) {
+        if (is_file(database_path('app.sqlite'))) {
+            if (Schema::hasTable('settings')) {
 
                 // check version to see if an upgrade is needed
                 $db_version = Setting::_fetch('version');
                 $app_version = config('app.version');
-                if(version_compare($app_version, $db_version) == 1) { // app is higher than db, so need to run migrations etc
-                    Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true));                   
+                if (version_compare($app_version, $db_version) == 1) { // app is higher than db, so need to run migrations etc
+                    Artisan::call('migrate', ['--path' => 'database/migrations', '--force' => true, '--seed' => true]);
+                    ProcessApps::dispatch();                 
                 }
-
             } else {
-                Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true)); 
+                Artisan::call('migrate', ['--path' => 'database/migrations', '--force' => true, '--seed' => true]);
             }
-
         }
 
-        if(!is_file(public_path('storage/.gitignore'))) {
+        if (! is_file(public_path('storage/.gitignore'))) {
             Artisan::call('storage:link');
             \Session::put('current_user', null);
         }
-        
+
+        $lang = Setting::fetch('language');
+        \App::setLocale($lang);
+
         $applications = Application::all();
-        if($applications->count() <= 0) {
+        if ($applications->count() <= 0) {
             if (class_exists('ZipArchive')) {
                 ProcessApps::dispatch();
             } else {
-                die("You are missing php-zip");
+                die('You are missing php-zip');
             }
-            
         }
 
         // User specific settings need to go here as session isn't available at this point in the app
-        view()->composer('*', function ($view) 
-        {
-
-            if(isset($_SERVER['HTTP_AUTHORIZATION']) && !empty($_SERVER['HTTP_AUTHORIZATION'])) {
-                list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = 
+        view()->composer('*', function ($view) {
+            if (isset($_SERVER['HTTP_AUTHORIZATION']) && ! empty($_SERVER['HTTP_AUTHORIZATION'])) {
+                list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) =
                 explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
             }
-            if(!\Auth::check()) {
-                if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])) {
+            if (! \Auth::check()) {
+                if (isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW'])
+                        && ! empty($_SERVER['PHP_AUTH_USER']) && ! empty($_SERVER['PHP_AUTH_PW'])) {
                     $credentials = ['username' => $_SERVER['PHP_AUTH_USER'], 'password' => $_SERVER['PHP_AUTH_PW']];
-                    
-                    if (\Auth::attempt($credentials)) {
+
+                    if (\Auth::attempt($credentials, true)) {
                         // Authentication passed...
                         $user = \Auth::user();
                         //\Session::put('current_user', $user);
-                        session(['current_user' => $user]);                
+                        session(['current_user' => $user]);
+                    }
+                } elseif (isset($_SERVER['REMOTE_USER']) && ! empty($_SERVER['REMOTE_USER'])) {
+                    $user = User::where('username', $_SERVER['REMOTE_USER'])->first();
+                    if ($user) {
+                        \Auth::login($user, true);
+                        session(['current_user' => $user]);
                     }
                 }
             }
 
-
             $alt_bg = '';
-            if($bg_image = Setting::fetch('background_image')) {
-                $alt_bg = ' style="background-image: url(/storage/'.$bg_image.')"';
+            if ($bg_image = Setting::fetch('background_image')) {
+                $alt_bg = ' style="background-image: url(storage/'.$bg_image.')"';
             }
-            $lang = Setting::fetch('language');
-            \App::setLocale($lang);
 
             $allusers = User::all();
             $current_user = User::currentUser();
 
-            $view->with('alt_bg', $alt_bg );    
-            $view->with('allusers', $allusers );    
-            $view->with('current_user', $current_user );   
-
-    
-            
-            
-        });  
+            $view->with('alt_bg', $alt_bg);
+            $view->with('allusers', $allusers);
+            $view->with('current_user', $current_user);
+        });
 
         $this->app['view']->addNamespace('SupportedApps', app_path('SupportedApps'));
 
-
         if (env('FORCE_HTTPS') === true) {
             \URL::forceScheme('https');
         }
 
-        if(env('APP_URL') != 'http://localhost') {
+        if (env('APP_URL') != 'http://localhost') {
             \URL::forceRootUrl(env('APP_URL'));
         }
-
     }
 
-     /**
+    /**
      * 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));
+        if (is_file(base_path('.env'))) {
+            if (empty(env('APP_KEY'))) {
+                Artisan::call('key:generate', ['--force' => true, '--no-interaction' => true]);
             }
         }
     }
 
-
     /**
      * Register any application services.
      *

app/Providers/AuthServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Gate;
 
 class AuthServiceProvider extends ServiceProvider
 {

app/Providers/BroadcastServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Facades\Broadcast;
+use Illuminate\Support\ServiceProvider;
 
 class BroadcastServiceProvider extends ServiceProvider
 {

app/Providers/EventServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Event;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {

app/Providers/RouteServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace App\Providers;
 
-use Illuminate\Support\Facades\Route;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
+use Illuminate\Support\Facades\Route;
 
 class RouteServiceProvider extends ServiceProvider
 {

app/Search.php

@@ -1,108 +1,99 @@
-<?php namespace App;
+<?php
+
+namespace App;
 
-use GuzzleHttp\Exception\GuzzleException;
-use GuzzleHttp\Client;
 use App\Item;
 use App\Setting;
-use Form;
 use Cache;
+use Form;
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+use Yaml;
 
 abstract class Search
 {
-
     /**
      * List of all search providers
-     * 
-     * @return Array
+     *
+     * @return array
      */
     public static function providers()
     {
         $providers = self::standardProviders();
         $providers = $providers + self::appProviders();
-        return $providers;
+
+        return collect($providers);
     }
 
     /**
      * Gets details for a single provider
-     * 
-     * @return Object
+     *
+     * @return object
      */
     public static function providerDetails($provider)
     {
         $providers = self::providers();
-        if(!isset($providers[$provider])) return false;
-        return (object)$providers[$provider] ?? false;
+        if (! isset($providers[$provider])) {
+            return false;
+        }
+
+        return (object) $providers[$provider] ?? false;
     }
 
     /**
      * Array of the standard providers
-     * 
-     * @return Array
+     *
+     * @return array
      */
     public static function standardProviders()
     {
-        return [
-            'google' => [
-                'url' => 'https://www.google.com/search',
-                'var' => 'q',
-                'method' => 'get',
-                'type' => 'standard',
-            ],
-            'ddg' => [
-                'url' => 'https://duckduckgo.com/',
-                'var' => 'q',
-                'method' => 'get',
-                'type' => 'standard',
-            ],
-            'bing' => [
-                'url' => 'https://www.bing.com/search',
-                'var' => 'q',
-                'method' => 'get',
-                'type' => 'standard',
-            ],
-            'qwant' => [
-                'url' => 'https://www.qwant.com/',
-                'var' => 'q',
-                'method' => 'get',
-                'type' => 'standard',
-            ],
-            'startpage' => [
-                'url' => 'https://www.startpage.com/do/dsearch',
-                'var' => 'query',
-                'method' => 'get',
-                'type' => 'standard',
-            ],
-        ];
+        // $providers = json_decode(file_get_contents(storage_path('app/searchproviders.json')));
+        // print_r($providers);
+        $providers = Yaml::parseFile(storage_path('app/searchproviders.yaml'));
+        $all = [];
+        foreach ($providers as $key => $provider) {
+            $all[$key] = $provider;
+            $all[$key]['type'] = 'standard';
+        }
+
+        return $all;
     }
 
     /**
      * Loops through users apps to see if app is a search provider, might be worth
      * looking into caching this at some point
-     * 
-     * @return Array
+     *
+     * @return array
      */
     public static function appProviders()
     {
         $providers = [];
         $userapps = Item::all();
-        foreach($userapps as $app) {
-            if(empty($app->class)) continue;
-            if(($provider = Item::isSearchProvider($app->class)) !== false) {
+        foreach ($userapps as $app) {
+            if (empty($app->class)) {
+                continue;
+            }
+            if (($provider = Item::isSearchProvider($app->class)) !== false) {
                 $name = Item::nameFromClass($app->class);
-                $providers[strtolower($name)] = [
+                $providers[$app->id] = [
+                    'id' => $app->id,
                     'type' => $provider->type,
                     'class' => $app->class,
                     'url' => $app->url,
+                    'name' => $app->title,
+                    'colour' => $app->colour,
+                    'icon' => $app->icon,
+                    'description' => $app->description,
                 ];
-
             }
         }
+
         return $providers;
     }
 
     /**
      * Outputs the search form
-     * 
+     *
      * @return html
      */
     public static function form()
@@ -112,15 +103,16 @@ abstract class Search
         $search_provider = Setting::where('key', '=', 'search_provider')->first();
         $user_search_provider = Setting::fetch('search_provider');
         //die(print_r($search_provider));
-       
+
         //die(var_dump($user_search_provider));
         // return early if search isn't applicable
-        if((bool)$homepage_search !== true) return $output;
+        if ((bool) $homepage_search !== true) {
+            return $output;
+        }
         $user_search_provider = $user_search_provider ?? 'none';
 
-        if((bool)$homepage_search && (bool)$search_provider) {
-
-            if((bool)$user_search_provider) {
+        if ((bool) $homepage_search && (bool) $search_provider) {
+            if ((bool) $user_search_provider) {
                 $name = 'app.options.'.$user_search_provider;
                 $provider = self::providerDetails($user_search_provider);
 
@@ -128,9 +120,9 @@ abstract class Search
                 $output .= '<form action="'.url('search').'"'.getLinkTargetAttribute().' method="get">';
                 $output .= '<div id="search-container" class="input-container">';
                 $output .= '<select name="provider">';
-                foreach(self::providers() as $key => $searchprovider) {
-                    $selected = ($key === $user_search_provider) ? ' selected="selected"' : '';
-                    $output .= '<option value="'.$key.'"'.$selected.'>'.__('app.options.'.$key).'</option>';
+                foreach (self::providers() as $key => $searchprovider) {
+                    $selected = ((string) $key === (string) $user_search_provider) ? ' selected="selected"' : '';
+                    $output .= '<option value="'.$key.'"'.$selected.'>'.$searchprovider['name'].'</option>';
                 }
                 $output .= '</select>';
                 $output .= Form::text('q', null, ['class' => 'homesearch', 'autofocus' => 'autofocus', 'placeholder' => __('app.settings.search').'...']);
@@ -140,8 +132,7 @@ abstract class Search
                 $output .= '</div>';
             }
         }
+
         return $output;
     }
-
-
-}
+}

app/SearchInterface.php

@@ -1,10 +1,11 @@
-<?php namespace App;
+<?php
+
+namespace App;
 
-use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
 
 interface SearchInterface
 {
     public function getResults($query, $providerdetails);
-
-}
+}

app/Setting.php

@@ -2,12 +2,13 @@
 
 namespace App;
 
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Input;
-use Form;
-use Illuminate\Support\Facades\Auth;
-use App\User;
 use App\Search;
+use App\User;
+use Form;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Input;
 
 class Setting extends Model
 {
@@ -19,7 +20,7 @@ class Setting extends Model
     protected $table = 'settings';
 
     protected $fillable = [
-        'id', 'group_id', 'key', 'type', 'options', 'label', 'value', 'order', 'system'
+        'id', 'group_id', 'key', 'type', 'options', 'label', 'value', 'order', 'system',
     ];
 
     /**
@@ -39,44 +40,47 @@ class Setting extends Model
     /**
      * @return array
      */
-    public static function getInput()
+    public static function getInput(Request $request)
     {
         return (object) [
-            'value' => Input::get('value'),
-            'image' => Input::file('value'),
+            'value' => $request->input('value'),
+            'image' => $request->file('value'),
         ];
     }
 
     public function getListValueAttribute()
     {
-        if((bool)$this->system === true) {
+        if ((bool) $this->system === true) {
             $value = self::_fetch($this->key);
         } else {
             $value = self::fetch($this->key);
         }
         $this->value = $value;
-        switch($this->type) {
+        switch ($this->type) {
             case 'image':
-                if(!empty($this->value)) {
+                if (! empty($this->value)) {
                     $value = '<a href="'.asset('storage/'.$this->value).'" title="'.__('app.settings.view').'" target="_blank">'.__('app.settings.view').'</a>';
                 } else {
                     $value = __('app.options.none');
-                }    
+                }
                 break;
             case 'boolean':
-                if((bool)$this->value === true) {
+                if ((bool) $this->value === true) {
                     $value = __('app.options.yes');
                 } else {
                     $value = __('app.options.no');
-                }    
+                }
                 break;
             case 'select':
-                if(!empty($this->value) && $this->value !== 'none') {
-                    $options =  (array)json_decode($this->options);
+                if (! empty($this->value) && $this->value !== 'none') {
+                    $options = (array) json_decode($this->options);
+                    if ($this->key === 'search_provider') {
+                        $options = Search::providers()->pluck('name', 'id')->toArray();
+                    }
                     $value = __($options[$this->value]);
                 } else {
                     $value = __('app.options.none');
-                }                
+                }
                 break;
             default:
                 $value = __($this->value);
@@ -84,32 +88,33 @@ class Setting extends Model
         }
 
         return $value;
-
     }
 
     public function getEditValueAttribute()
     {
-        if((bool)$this->system === true) {
+        if ((bool) $this->system === true) {
             $value = self::_fetch($this->key);
         } else {
             $value = self::fetch($this->key);
         }
         $this->value = $value;
-        switch($this->type) {
+        switch ($this->type) {
             case 'image':
                 $value = '';
-                if(isset($this->value) && !empty($this->value)) {
+                if (isset($this->value) && ! empty($this->value)) {
                     $value .= '<a class="setting-view-image" href="'.asset('storage/'.$this->value).'" title="'.__('app.settings.view').'" target="_blank"><img src="'.asset('storage/'.$this->value).'" /></a>';
                 }
                 $value .= Form::file('value', ['class' => 'form-control']);
-                if(isset($this->value) && !empty($this->value)) {
+                if (isset($this->value) && ! empty($this->value)) {
                     $value .= '<a class="settinglink" href="'.route('settings.clear', $this->id).'" title="'.__('app.settings.remove').'">'.__('app.settings.reset').'</a>';
                 }
-                
+
                 break;
             case 'boolean':
                 $checked = false;
-                if(isset($this->value) && (bool)$this->value === true) $checked = true;
+                if (isset($this->value) && (bool) $this->value === true) {
+                    $checked = true;
+                }
                 $set_checked = ($checked) ? ' checked="checked"' : '';
                 $value = '
                 <input type="hidden" name="value" value="0" />
@@ -121,26 +126,30 @@ class Setting extends Model
                 break;
             case 'select':
                 $options = json_decode($this->options);
-                foreach($options as $key => $opt) {
+                if ($this->key === 'search_provider') {
+                    $options = Search::providers()->pluck('name', 'id');
+                }
+                foreach ($options as $key => $opt) {
                     $options->$key = __($opt);
                 }
                 $value = Form::select('value', $options, null, ['class' => 'form-control']);
                 break;
+            case 'textarea':
+                $value = Form::textarea('value', null, ['class' => 'form-control', 'cols' => '44', 'rows' => '15']);
+                break;
             default:
                 $value = Form::text('value', null, ['class' => 'form-control']);
                 break;
         }
 
         return $value;
-
     }
 
     public function group()
     {
-        return $this->belongsTo('App\SettingGroup', 'group_id');
+        return $this->belongsTo(\App\SettingGroup::class, 'group_id');
     }
 
-
     /**
      * @param string $key
      *
@@ -149,53 +158,54 @@ class Setting extends Model
     public static function fetch($key)
     {
         $user = self::user();
+
         return self::_fetch($key, $user);
     }
+
     /**
      * @param string $key
      *
      * @return mixed
      */
-    public static function _fetch($key, $user=null)
+    public static function _fetch($key, $user = null)
     {
-        #$cachekey = ($user === null) ? $key : $key.'-'.$user->id;
-        #if (Setting::cached($cachekey)) {
-        #    return Setting::$cache[$cachekey];
-        #} else {
-            $find = self::where('key', '=', $key)->first();
+        //$cachekey = ($user === null) ? $key : $key.'-'.$user->id;
+        //if (Setting::cached($cachekey)) {
+        //    return Setting::$cache[$cachekey];
+        //} else {
+        $find = self::where('key', '=', $key)->first();
 
-            if (!is_null($find)) {
-                if((bool)$find->system === true) { // if system variable use global value
+        if (! is_null($find)) {
+            if ((bool) $find->system === true) { // if system variable use global value
+                $value = $find->value;
+            } else { // not system variable so use user specific value
+                // check if user specified value has been set
+                //print_r($user);
+                $usersetting = $user->settings()->where('id', $find->id)->first();
+                //print_r($user->settings);
+                //die(var_dump($usersetting));
+                //->pivot->value;
+                //echo "user: ".$user->id." --- ".$usersettings;
+                if (isset($usersetting) && ! empty($usersetting)) {
+                    $value = $usersetting->pivot->uservalue;
+                } else { // if not get default from base setting
+                    //$user->settings()->save($find, ['value' => $find->value]);
+                    //$has_setting = $user->settings()->where('id', $find->id)->exists();
+                    //if($has_setting) {
+                    //    $user->settings()->updateExistingPivot($find->id, ['uservalue' => (string)$find->value]);
+                    //} else {
+                    //    $user->settings()->save($find, ['uservalue' => (string)$find->value]);
+                    //}
                     $value = $find->value;
-                } else { // not system variable so use user specific value
-                    // check if user specified value has been set
-                    //print_r($user);
-                    $usersetting = $user->settings()->where('id', $find->id)->first();
-                    //print_r($user->settings);
-                    //die(var_dump($usersetting));
-                    //->pivot->value;
-                    //echo "user: ".$user->id." --- ".$usersettings;
-                    if(isset($usersetting) && !empty($usersetting)) {
-                        $value = $usersetting->pivot->uservalue;
-                    } else { // if not get default from base setting
-                        //$user->settings()->save($find, ['value' => $find->value]);
-                        #$has_setting = $user->settings()->where('id', $find->id)->exists();
-                        #if($has_setting) {
-                        #    $user->settings()->updateExistingPivot($find->id, ['uservalue' => (string)$find->value]);
-                        #} else {
-                        #    $user->settings()->save($find, ['uservalue' => (string)$find->value]);
-                        #}
-                        $value = $find->value;
-                    }
-                    
                 }
-                #Setting::add($cachekey, $value);
-
-                return $value;
-            } else {
-                return false;
             }
-        #}
+            //Setting::add($cachekey, $value);
+
+            return $value;
+        } else {
+            return false;
+        }
+        //}
     }
 
     /**
@@ -204,7 +214,7 @@ class Setting extends Model
      */
     public static function add($key, $value)
     {
-        Setting::$cache[$key] = $value;
+        self::$cache[$key] = $value;
     }
 
     /**
@@ -214,22 +224,19 @@ class Setting extends Model
      */
     public static function cached($key)
     {
-        return array_key_exists($key, Setting::$cache);
+        return array_key_exists($key, self::$cache);
     }
 
-
     /**
      * The users that belong to the setting.
      */
     public function users()
     {
-        return $this->belongsToMany('App\User')->using('App\SettingUser')->withPivot('uservalue');
+        return $this->belongsToMany(\App\User::class)->using(\App\SettingUser::class)->withPivot('uservalue');
     }
 
     public static function user()
     {
         return User::currentUser();
     }
-
-
 }

app/SettingGroup.php

@@ -22,6 +22,6 @@ class SettingGroup extends Model
 
     public function settings()
     {
-        return $this->hasMany('App\Setting', 'group_id');
+        return $this->hasMany(\App\Setting::class, 'group_id');
     }
 }

app/SupportedApps.php

@@ -1,34 +1,37 @@
-<?php namespace App;
+<?php
+
+namespace App;
 
-use GuzzleHttp\Exception\GuzzleException;
 use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Support\Facades\Log;
 
 abstract class SupportedApps
 {
-
     protected $jar = false;
+
     protected $method = 'GET';
+
     protected $error;
 
-    public function appTest($url, $attrs = [], $overridevars=false)
+    public function appTest($url, $attrs = [], $overridevars = false)
     {
-        if(empty($this->config->url)) {
-            return (object)[
+        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)[
+        if ($res == null) {
+            return (object) [
                 'code' => null,
                 'status' => $this->error,
                 'response' => 'Connection failed',
             ];
         }
-        switch($res->getStatusCode()) {
+        switch ($res->getStatusCode()) {
             case 200:
                 $status = 'Successfully communicated with the API';
                 break;
@@ -42,21 +45,22 @@ abstract class SupportedApps
                 $status = 'Something went wrong... Code: '.$res->getStatusCode();
                 break;
         }
-        return (object)[
+
+        return (object) [
             'code' => $res->getStatusCode(),
             'status' => $status,
             'response' => $res->getBody(),
         ];
     }
 
-    public function execute($url, $attrs = [], $overridevars=false, $overridemethod=false)
+    public function execute($url, $attrs = [], $overridevars = false, $overridemethod = false)
     {
         $res = null;
 
         $vars = ($overridevars !== false) ?
         $overridevars : [
-            'http_errors' => false, 
-            'timeout' => 15, 
+            'http_errors' => false,
+            'timeout' => 15,
             'connect_timeout' => 15,
         ];
 
@@ -65,35 +69,34 @@ abstract class SupportedApps
         $method = ($overridemethod !== false) ? $overridemethod : $this->method;
 
         try {
-            return $client->request($method, $url, $attrs);  
+            return $client->request($method, $url, $attrs);
         } catch (\GuzzleHttp\Exception\ConnectException $e) {
-            Log::error("Connection refused");
+            Log::error('Connection refused');
             Log::debug($e->getMessage());
-            $this->error = "Connection refused - ".(string) $e->getMessage();
+            $this->error = 'Connection refused - '.(string) $e->getMessage();
         } catch (\GuzzleHttp\Exception\ServerException $e) {
             Log::debug($e->getMessage());
             $this->error = (string) $e->getResponse()->getBody();
         }
         $this->error = 'General error connecting with API';
+
         return $res;
     }
 
     public function login()
     {
-
     }
 
-    public function normaliseurl($url, $addslash=true)
+    public function normaliseurl($url, $addslash = true)
     {
-
         $url = rtrim($url, '/');
-        if($addslash) $url .= '/';
+        if ($addslash) {
+            $url .= '/';
+        }
 
         return $url;
-
     }
 
-
     public function getLiveStats($status, $data)
     {
         $className = get_class($this);
@@ -101,31 +104,37 @@ abstract class SupportedApps
         $name = end($explode);
 
         $html = view('SupportedApps::'.$name.'.livestats', $data)->with('data', $data)->render();
+
         return json_encode(['status' => $status, 'html' => $html]);
-        //return 
+        //return
     }
 
     public static function getList()
     {
-        $list_url = 'https://apps.heimdall.site/list';
-        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
+        // $list_url = 'https://apps.heimdall.site/list';
+        $list_url = config('app.appsource').'list.json';
+        $client = new Client(['http_errors' => false, 'verify' => false, 'timeout' => 15, 'connect_timeout' => 15]);
+
         return $client->request('GET', $list_url);
     }
 
-    public static function configValue($item=null, $key=null)
+    public static function configValue($item = null, $key = null)
     {
-        if(isset($item) && !empty($item)) {
+        if (isset($item) && ! empty($item)) {
             return $item->getconfig()->$key;
-        } else return null;
+        } else {
+            return null;
+        }
     }
 
     public static function getFiles($app)
     {
-        $zipurl = $app->files;
+        $zipurl = config('app.appsource').'files/'.$app->sha.'.zip';
+
         $client = new Client(['http_errors' => false, 'timeout' => 60, 'connect_timeout' => 15]);
         $res = $client->request('GET', $zipurl);
 
-        if(!file_exists(app_path('SupportedApps')))  {
+        if (! file_exists(app_path('SupportedApps'))) {
             mkdir(app_path('SupportedApps'), 0777, true);
         }
 
@@ -138,35 +147,28 @@ abstract class SupportedApps
             $zip->extractTo(app_path('SupportedApps')); // place in the directory with same name
             $zip->close();
             unlink($src); //Deleting the Zipped file
+        } else {
+            var_dump($x);
         }
     }
 
     public static function saveApp($details, $app)
     {
-        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);
-        
         $app->appid = $details->appid;
         $app->name = $details->name;
         $app->sha = $details->sha ?? null;
         $app->icon = 'icons/'.$details->icon;
         $app->website = $details->website;
         $app->license = $details->license;
-        $app->description = $details->description;
 
         $appclass = $app->class();
         $application = new $appclass;
-        $enhanced = (bool)($application instanceof \App\EnhancedApps);
-
+        $enhanced = (bool) ($application instanceof \App\EnhancedApps);
+        $app->class = $appclass;
         $app->enhanced = $enhanced;
         $app->tile_background = $details->tile_background;
         $app->save();
-    }
 
-}
+        return $app;
+    }
+}

app/User.php

@@ -2,8 +2,8 @@
 
 namespace App;
 
-use Illuminate\Notifications\Notifiable;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use Illuminate\Notifications\Notifiable;
 
 class User extends Authenticatable
 {
@@ -32,7 +32,7 @@ class User extends Authenticatable
      */
     public function items()
     {
-        return $this->hasMany('App\Item');
+        return $this->hasMany(\App\Item::class);
     }
 
     /**
@@ -40,7 +40,7 @@ class User extends Authenticatable
      */
     public function settings()
     {
-        return $this->belongsToMany('App\Setting')->withPivot('uservalue');
+        return $this->belongsToMany(\App\Setting::class)->withPivot('uservalue');
     }
 
     public static function currentUser()
@@ -49,15 +49,13 @@ class User extends Authenticatable
         if ($current_user) { // if logged in, set this user
             return $current_user;
         } else { // not logged in, get first user
-            $user = User::where('public_front',true)->first();
-            if(!$user) {
-                $user = User::first();
+            $user = self::where('public_front', true)->first();
+            if (! $user) {
+                $user = self::first();
             }
             session(['current_user' => $user]);
+
             return $user;
         }
-
     }
-
-
 }

bootstrap/app.php

@@ -12,7 +12,7 @@
 */
 
 $app = new Illuminate\Foundation\Application(
-    realpath(__DIR__.'/../')
+    $_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
 );
 
 /*

composer.json

@@ -5,14 +5,15 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": ">=7.0.0",
+        "php": ">=7.2.5",
         "fideloper/proxy": "^4.0",
-        "graham-campbell/github": "^7.5",
-        "guzzlehttp/guzzle": "^6.3",
-        "laravel/framework": "5.7.*",
-        "laravel/tinker": "~1.0",
-        "laravelcollective/html": "^5.5",
-        "php-http/guzzle6-adapter": "^1.1"
+        "graham-campbell/github": "^10.5",
+        "guzzlehttp/guzzle": "^7.4",
+        "laravel/framework": "^7.0",
+        "laravel/tinker": "^2.0",
+        "laravel/ui": "^2.4",
+        "laravelcollective/html": "^6.0",
+        "symfony/yaml": "^5.4"
     },
     "require-dev": {
         "filp/whoops": "~2.0",
@@ -59,6 +60,10 @@
     "config": {
         "preferred-install": "dist",
         "sort-packages": true,
-        "optimize-autoloader": true
+        "optimize-autoloader": true,
+        "allow-plugins": {
+            "kylekatarnls/update-helper": true,
+            "symfony/thanks": true
+        }
     }
 }

config/app.php

@@ -13,8 +13,8 @@ return [
     |
     */
 
-    'name' => env('APP_NAME', 'Heimdall'),  
-    'version' => '2.2.1',
+    'name' => env('APP_NAME', 'Heimdall'),
+    'version' => '2.4.9',
 
     /*
     |--------------------------------------------------------------------------
@@ -40,7 +40,7 @@ return [
     |
     */
 
-    'debug' => env('APP_DEBUG', false),
+    'debug' => (bool) env('APP_DEBUG', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -55,6 +55,9 @@ return [
 
     'url' => env('APP_URL', 'http://localhost'),
 
+    'asset_url' => env('ASSET_URL', null),
+    'appsource' => env('APP_SOURCE', 'https://appslist.heimdall.site/'),
+
     /*
     |--------------------------------------------------------------------------
     | Application Timezone
@@ -94,6 +97,19 @@ return [
 
     'fallback_locale' => 'en',
 
+    /*
+    |--------------------------------------------------------------------------
+    | Faker Locale
+    |--------------------------------------------------------------------------
+    |
+    | This locale will be used by the Faker PHP library when generating fake
+    | data for your database seeds. For example, this will be used to get
+    | localized telephone numbers, street address information and more.
+    |
+    */
+
+    'faker_locale' => 'en_US',
+
     /*
     |--------------------------------------------------------------------------
     | Encryption Key
@@ -109,23 +125,6 @@ return [
 
     'cipher' => 'AES-256-CBC',
 
-    /*
-    |--------------------------------------------------------------------------
-    | Logging Configuration
-    |--------------------------------------------------------------------------
-    |
-    | Here you may configure the log settings for your application. Out of
-    | the box, Laravel uses the Monolog PHP logging library. This gives
-    | you a variety of powerful log handlers / formatters to utilize.
-    |
-    | Available Settings: "single", "daily", "syslog", "errorlog"
-    |
-    */
-
-    'log' => env('APP_LOG', 'single'),
-
-    'log_level' => env('APP_LOG_LEVEL', 'debug'),
-
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers
@@ -194,6 +193,7 @@ return [
     'aliases' => [
 
         'App' => Illuminate\Support\Facades\App::class,
+        'Arr' => Illuminate\Support\Arr::class,
         'Artisan' => Illuminate\Support\Facades\Artisan::class,
         'Auth' => Illuminate\Support\Facades\Auth::class,
         'Blade' => Illuminate\Support\Facades\Blade::class,
@@ -211,6 +211,7 @@ return [
         'Gate' => Illuminate\Support\Facades\Gate::class,
         'Hash' => Illuminate\Support\Facades\Hash::class,
         'Html' => Collective\Html\HtmlFacade::class,
+        'Http' => Illuminate\Support\Facades\Http::class,
         'Lang' => Illuminate\Support\Facades\Lang::class,
         'Log' => Illuminate\Support\Facades\Log::class,
         'Mail' => Illuminate\Support\Facades\Mail::class,
@@ -225,9 +226,11 @@ return [
         'Schema' => Illuminate\Support\Facades\Schema::class,
         'Session' => Illuminate\Support\Facades\Session::class,
         'Storage' => Illuminate\Support\Facades\Storage::class,
+        'Str' => Illuminate\Support\Str::class,
         'URL' => Illuminate\Support\Facades\URL::class,
         'Validator' => Illuminate\Support\Facades\Validator::class,
         'View' => Illuminate\Support\Facades\View::class,
+        'Yaml' => Symfony\Component\Yaml\Yaml::class,
 
         'SupportedApps' => App\SupportedApps::class,
         'EnhancedApps' => App\EnhancedApps::class,

config/auth.php

@@ -44,6 +44,7 @@ return [
         'api' => [
             'driver' => 'token',
             'provider' => 'users',
+            'hash' => false,
         ],
     ],
 
@@ -96,7 +97,21 @@ return [
             'provider' => 'users',
             'table' => 'password_resets',
             'expire' => 60,
+            'throttle' => 60,
         ],
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Password Confirmation Timeout
+    |--------------------------------------------------------------------------
+    |
+    | Here you may define the amount of seconds before a password confirmation
+    | times out and the user is prompted to re-enter their password via the
+    | confirmation screen. By default, the timeout lasts for three hours.
+    |
+    */
+
+    'password_timeout' => 10800,
+
 ];

config/broadcasting.php

@@ -37,7 +37,7 @@ return [
             'app_id' => env('PUSHER_APP_ID'),
             'options' => [
                 'cluster' => env('PUSHER_APP_CLUSTER'),
-                'encrypted' => true,
+                'useTLS' => true,
             ],
         ],
 

config/cache.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -36,6 +38,7 @@ return [
 
         'array' => [
             'driver' => 'array',
+            'serialize' => false,
         ],
 
         'database' => [
@@ -73,6 +76,15 @@ return [
             'connection' => 'default',
         ],
 
+        'dynamodb' => [
+            'driver' => 'dynamodb',
+            'key' => env('AWS_ACCESS_KEY_ID'),
+            'secret' => env('AWS_SECRET_ACCESS_KEY'),
+            'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
+            'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
+            'endpoint' => env('DYNAMODB_ENDPOINT'),
+        ],
+
     ],
 
     /*
@@ -86,9 +98,6 @@ return [
     |
     */
 
-    'prefix' => env(
-        'CACHE_PREFIX',
-        str_slug(env('APP_NAME', 'laravel'), '_').'_cache'
-    ),
+    'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
 
 ];

config/database.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -42,6 +44,7 @@ return [
 
         'mysql' => [
             'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '3306'),
             'database' => env('DB_DATABASE', 'forge'),
@@ -51,12 +54,17 @@ return [
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
             'prefix' => '',
+            'prefix_indexes' => true,
             'strict' => true,
             'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
         ],
 
         'pgsql' => [
             'driver' => 'pgsql',
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', '127.0.0.1'),
             'port' => env('DB_PORT', '5432'),
             'database' => env('DB_DATABASE', 'forge'),
@@ -64,12 +72,14 @@ return [
             'password' => env('DB_PASSWORD', ''),
             'charset' => 'utf8',
             'prefix' => '',
+            'prefix_indexes' => true,
             'schema' => 'public',
             'sslmode' => 'prefer',
         ],
 
         'sqlsrv' => [
             'driver' => 'sqlsrv',
+            'url' => env('DATABASE_URL'),
             'host' => env('DB_HOST', 'localhost'),
             'port' => env('DB_PORT', '1433'),
             'database' => env('DB_DATABASE', 'forge'),
@@ -77,8 +87,9 @@ return [
             'password' => env('DB_PASSWORD', ''),
             'charset' => 'utf8',
             'prefix' => '',
+            'prefix_indexes' => true,
         ],
-
+        
     ],
 
     /*
@@ -107,13 +118,27 @@ return [
 
     'redis' => [
 
-        'client' => 'predis',
+        'client' => env('REDIS_CLIENT', 'phpredis'),
+
+        'options' => [
+            'cluster' => env('REDIS_CLUSTER', 'redis'),
+            'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
+        ],
 
         'default' => [
+            'url' => env('REDIS_URL'),
             'host' => env('REDIS_HOST', '127.0.0.1'),
             'password' => env('REDIS_PASSWORD', null),
-            'port' => env('REDIS_PORT', 6379),
-            'database' => 0,
+            'port' => env('REDIS_PORT', '6379'),
+            'database' => env('REDIS_DB', '0'),
+        ],
+
+        'cache' => [
+            'url' => env('REDIS_URL'),
+            'host' => env('REDIS_HOST', '127.0.0.1'),
+            'password' => env('REDIS_PASSWORD', null),
+            'port' => env('REDIS_PORT', '6379'),
+            'database' => env('REDIS_CACHE_DB', '1'),
         ],
 
     ],

config/filesystems.php

@@ -61,8 +61,10 @@ return [
             'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'region' => env('AWS_DEFAULT_REGION'),
             'bucket' => env('AWS_BUCKET'),
+            'url' => env('AWS_URL'),
+            'endpoint' => env('AWS_ENDPOINT'),
         ],
-
+        
     ],
 
 ];

config/hashing.php

@@ -0,0 +1,52 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Hash Driver
+    |--------------------------------------------------------------------------
+    |
+    | This option controls the default hash driver that will be used to hash
+    | passwords for your application. By default, the bcrypt algorithm is
+    | used; however, you remain free to modify this option if you wish.
+    |
+    | Supported: "bcrypt", "argon", "argon2id"
+    |
+    */
+
+    'driver' => 'bcrypt',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Bcrypt Options
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the configuration options that should be used when
+    | passwords are hashed using the Bcrypt algorithm. This will allow you
+    | to control the amount of time it takes to hash the given password.
+    |
+    */
+
+    'bcrypt' => [
+        'rounds' => env('BCRYPT_ROUNDS', 10),
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Argon Options
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify the configuration options that should be used when
+    | passwords are hashed using the Argon algorithm. These will allow you
+    | to control the amount of time it takes to hash the given password.
+    |
+    */
+
+    'argon' => [
+        'memory' => 1024,
+        'threads' => 2,
+        'time' => 2,
+    ],
+
+];

config/logging.php

@@ -0,0 +1,104 @@
+<?php
+
+use Monolog\Handler\NullHandler;
+use Monolog\Handler\StreamHandler;
+use Monolog\Handler\SyslogUdpHandler;
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Log Channel
+    |--------------------------------------------------------------------------
+    |
+    | This option defines the default log channel that gets used when writing
+    | messages to the logs. The name specified in this option should match
+    | one of the channels defined in the "channels" configuration array.
+    |
+    */
+
+    'default' => env('LOG_CHANNEL', 'stack'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Log Channels
+    |--------------------------------------------------------------------------
+    |
+    | Here you may configure the log channels for your application. Out of
+    | the box, Laravel uses the Monolog PHP logging library. This gives
+    | you a variety of powerful log handlers / formatters to utilize.
+    |
+    | Available Drivers: "single", "daily", "slack", "syslog",
+    |                    "errorlog", "monolog",
+    |                    "custom", "stack"
+    |
+    */
+
+    'channels' => [
+        'stack' => [
+            'driver' => 'stack',
+            'channels' => ['single'],
+            'ignore_exceptions' => false,
+        ],
+
+        'single' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/laravel.log'),
+            'level' => 'debug',
+        ],
+
+        'daily' => [
+            'driver' => 'daily',
+            'path' => storage_path('logs/laravel.log'),
+            'level' => 'debug',
+            'days' => 14,
+        ],
+
+        'slack' => [
+            'driver' => 'slack',
+            'url' => env('LOG_SLACK_WEBHOOK_URL'),
+            'username' => 'Laravel Log',
+            'emoji' => ':boom:',
+            'level' => 'critical',
+        ],
+
+        'papertrail' => [
+            'driver' => 'monolog',
+            'level' => 'debug',
+            'handler' => SyslogUdpHandler::class,
+            'handler_with' => [
+                'host' => env('PAPERTRAIL_URL'),
+                'port' => env('PAPERTRAIL_PORT'),
+            ],
+        ],
+
+        'stderr' => [
+            'driver' => 'monolog',
+            'handler' => StreamHandler::class,
+            'formatter' => env('LOG_STDERR_FORMATTER'),
+            'with' => [
+                'stream' => 'php://stderr',
+            ],
+        ],
+
+        'syslog' => [
+            'driver' => 'syslog',
+            'level' => 'debug',
+        ],
+
+        'errorlog' => [
+            'driver' => 'errorlog',
+            'level' => 'debug',
+        ],
+
+        'null' => [
+            'driver' => 'monolog',
+            'handler' => NullHandler::class,
+        ],
+
+        'emergency' => [
+            'path' => storage_path('logs/laravel.log'),
+        ],
+    ],
+
+];

config/queue.php

@@ -4,18 +4,16 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Default Queue Driver
+    | Default Queue Connection Name
     |--------------------------------------------------------------------------
     |
     | Laravel's queue API supports an assortment of back-ends via a single
     | API, giving you convenient access to each back-end using the same
-    | syntax for each one. Here you may set the default queue driver.
-    |
-    | Supported: "sync", "database", "beanstalkd", "sqs", "redis", "null"
+    | syntax for every one. Here you may define a default connection.
     |
     */
 
-    'default' => env('QUEUE_DRIVER', 'sync'),
+    'default' => env('QUEUE_CONNECTION', 'sync'),
 
     /*
     |--------------------------------------------------------------------------
@@ -26,6 +24,8 @@ return [
     | is used by your application. A default configuration has been added
     | for each back-end shipped with Laravel. You are free to add more.
     |
+    | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
+    |
     */
 
     'connections' => [
@@ -46,22 +46,25 @@ return [
             'host' => 'localhost',
             'queue' => 'default',
             'retry_after' => 90,
+            'block_for' => 0,
         ],
 
         'sqs' => [
             'driver' => 'sqs',
-            'key' => env('SQS_KEY', 'your-public-key'),
-            'secret' => env('SQS_SECRET', 'your-secret-key'),
+            'key' => env('AWS_ACCESS_KEY_ID'),
+            'secret' => env('AWS_SECRET_ACCESS_KEY'),
             'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
             'queue' => env('SQS_QUEUE', 'your-queue-name'),
-            'region' => env('SQS_REGION', 'us-east-1'),
+            'suffix' => env('SQS_SUFFIX'),
+            'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
         ],
 
         'redis' => [
             'driver' => 'redis',
             'connection' => 'default',
-            'queue' => 'default',
+            'queue' => env('REDIS_QUEUE', 'default'),
             'retry_after' => 90,
+            'block_for' => null,
         ],
 
     ],
@@ -78,6 +81,7 @@ return [
     */
 
     'failed' => [
+        'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
         'database' => env('DB_CONNECTION', 'mysql'),
         'table' => 'failed_jobs',
     ],

config/services.php

@@ -8,31 +8,26 @@ return [
     |--------------------------------------------------------------------------
     |
     | This file is for storing the credentials for third party services such
-    | as Stripe, Mailgun, SparkPost and others. This file provides a sane
-    | default location for this type of information, allowing packages
-    | to have a conventional place to find your various credentials.
+    | as Mailgun, Postmark, AWS and more. This file provides the de facto
+    | location for this type of information, allowing packages to have
+    | a conventional file to locate the various service credentials.
     |
     */
 
     'mailgun' => [
         'domain' => env('MAILGUN_DOMAIN'),
         'secret' => env('MAILGUN_SECRET'),
+        'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
+    ],
+
+    'postmark' => [
+        'token' => env('POSTMARK_TOKEN'),
     ],
 
     'ses' => [
-        'key' => env('SES_KEY'),
-        'secret' => env('SES_SECRET'),
-        'region' => 'us-east-1',
+        'key' => env('AWS_ACCESS_KEY_ID'),
+        'secret' => env('AWS_SECRET_ACCESS_KEY'),
+        'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
     ],
-
-    'sparkpost' => [
-        'secret' => env('SPARKPOST_SECRET'),
-    ],
-
-    'stripe' => [
-        'model' => App\User::class,
-        'key' => env('STRIPE_KEY'),
-        'secret' => env('STRIPE_SECRET'),
-    ],
-
+    
 ];

config/session.php

@@ -1,5 +1,7 @@
 <?php
 
+use Illuminate\Support\Str;
+
 return [
 
     /*
@@ -70,7 +72,7 @@ return [
     |
     */
 
-    'connection' => null,
+    'connection' => env('SESSION_CONNECTION', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -96,7 +98,7 @@ return [
     |
     */
 
-    'store' => null,
+    'store' => env('SESSION_STORE', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -124,7 +126,7 @@ return [
 
     'cookie' => env(
         'SESSION_COOKIE',
-        str_slug(env('APP_NAME', 'laravel'), '_').'_session'
+        Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
     ),
 
     /*
@@ -164,7 +166,7 @@ return [
     |
     */
 
-    'secure' => env('SESSION_SECURE_COOKIE', false),
+    'secure' => env('SESSION_SECURE_COOKIE'),
 
     /*
     |--------------------------------------------------------------------------

config/view.php

@@ -28,6 +28,9 @@ return [
     |
     */
 
-    'compiled' => realpath(storage_path('framework/views')),
+    'compiled' => env(
+        'VIEW_COMPILED_PATH',
+        realpath(storage_path('framework/views'))
+    ),
 
-];
+];

database/migrations/2018_01_27_155922_create_items_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateItemsTable extends Migration
 {

database/migrations/2018_02_04_185524_create_settings_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateSettingsTable extends Migration
 {

database/migrations/2018_02_04_185802_create_setting_groups_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateSettingGroupsTable extends Migration
 {

database/migrations/2018_02_16_175830_add_columns_to_items_for_groups.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class AddColumnsToItemsForGroups extends Migration
 {

database/migrations/2018_02_16_193703_item_tag.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class ItemTag extends Migration
 {

database/migrations/2018_10_12_122907_create_users_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateUsersTable extends Migration
 {

database/migrations/2018_10_12_123036_create_password_resets_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreatePasswordResetsTable extends Migration
 {

database/migrations/2018_10_12_131222_add_user_id_to_items_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class AddUserIdToItemsTable extends Migration
 {

database/migrations/2018_10_12_140451_create_setting_user_pivot_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateSettingUserPivotTable extends Migration
 {

database/migrations/2018_10_18_110905_create_applications_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateApplicationsTable extends Migration
 {
@@ -14,7 +14,6 @@ class CreateApplicationsTable extends Migration
     public function up()
     {
         Schema::create('applications', function (Blueprint $table) {
-            
             $table->string('appid')->unique();
             $table->string('name')->unique();
             $table->string('sha')->unique()->nullable();

database/migrations/2018_10_23_132008_add_class_to_items_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class AddClassToItemsTable extends Migration
 {

database/migrations/2018_10_31_191604_create_jobs_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateJobsTable extends Migration
 {

database/migrations/2018_11_06_112434_create_failed_jobs_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateFailedJobsTable extends Migration
 {

database/migrations/2022_03_15_140911_add_appid_to_items.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddAppidToItems extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('items', function (Blueprint $table) {
+            $table->string('appid')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('items', function (Blueprint $table) {
+            $table->dropColumn(['appid']);
+        });
+    }
+}

database/migrations/2022_03_16_093044_add_class_to_application.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddClassToApplication extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->string('class')->nullable()->index();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('applications', function (Blueprint $table) {
+            $table->dropColumn(['class']);
+        });
+    }
+}

database/migrations/2022_03_16_181343_add_app_description_to_items.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddAppDescriptionToItems extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('items', function (Blueprint $table) {
+            $table->text('appdescription')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('items', function (Blueprint $table) {
+            //
+        });
+    }
+}

database/seeds/SettingsSeeder.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Seeder;
 use App\Setting;
 use App\SettingGroup;
+use Illuminate\Database\Seeder;
 
 class SettingsSeeder extends Seeder
 {
@@ -14,7 +14,7 @@ class SettingsSeeder extends Seeder
     public function run()
     {
         // Groups
-        if(!$setting_group = SettingGroup::find(1)) {
+        if (! $setting_group = SettingGroup::find(1)) {
             $setting_group = new SettingGroup;
             $setting_group->id = 1;
             $setting_group->title = 'app.settings.system';
@@ -24,7 +24,7 @@ class SettingsSeeder extends Seeder
             $setting_group->title = 'app.settings.system';
             $setting_group->save();
         }
-        if(!$setting_group = SettingGroup::find(2)) {
+        if (! $setting_group = SettingGroup::find(2)) {
             $setting_group = new SettingGroup;
             $setting_group->id = 2;
             $setting_group->title = 'app.settings.appearance';
@@ -34,7 +34,7 @@ class SettingsSeeder extends Seeder
             $setting_group->title = 'app.settings.appearance';
             $setting_group->save();
         }
-        if(!$setting_group = SettingGroup::find(3)) {
+        if (! $setting_group = SettingGroup::find(3)) {
             $setting_group = new SettingGroup;
             $setting_group->id = 3;
             $setting_group->title = 'app.settings.miscellaneous';
@@ -44,8 +44,18 @@ class SettingsSeeder extends Seeder
             $setting_group->title = 'app.settings.miscellaneous';
             $setting_group->save();
         }
+        if (! $setting_group = SettingGroup::find(4)) {
+            $setting_group = new SettingGroup;
+            $setting_group->id = 4;
+            $setting_group->title = 'app.settings.advanced';
+            $setting_group->order = 3;
+            $setting_group->save();
+        } else {
+            $setting_group->title = 'app.settings.advanced';
+            $setting_group->save();
+        }
 
-        if($version = Setting::find(1)) {
+        if ($version = Setting::find(1)) {
             $version->label = 'app.settings.version';
             $version->value = config('app.version');
             $version->save();
@@ -61,7 +71,7 @@ class SettingsSeeder extends Seeder
             $setting->save();
         }
 
-        if(!$setting = Setting::find(2)) {
+        if (! $setting = Setting::find(2)) {
             $setting = new Setting;
             $setting->id = 2;
             $setting->group_id = 2;
@@ -73,7 +83,7 @@ class SettingsSeeder extends Seeder
             $setting->label = 'app.settings.background_image';
             $setting->save();
         }
-        if(!$setting = Setting::find(3)) {
+        if (! $setting = Setting::find(3)) {
             $setting = new Setting;
             $setting->id = 3;
             $setting->group_id = 3;
@@ -95,8 +105,7 @@ class SettingsSeeder extends Seeder
             'startpage' => 'app.options.startpage',
         ]);
 
-        if(!$setting = Setting::find(4)) {
-            
+        if (! $setting = Setting::find(4)) {
             $setting = new Setting;
             $setting->id = 4;
             $setting->group_id = 3;
@@ -111,20 +120,21 @@ class SettingsSeeder extends Seeder
             $setting->save();
         }
 
-
         $language_options = json_encode([
             'de' => 'Deutsch (German)',
             'en' => 'English',
+            'cn' => '简体中文 (Simplified Chinese)',
             'fi' => 'Suomi (Finnish)',
             'fr' => 'Français (French)',
+            'el' => 'Ελληνικά (Greek)',
             'it' => 'Italiano (Italian)',
-            'no' => 'Norsk (Norwegian)',   
-            'pl' => 'Polski (Polish)',            
+            'no' => 'Norsk (Norwegian)',
+            'pl' => 'Polski (Polish)',
             'sv' => 'Svenska (Swedish)',
             'es' => 'Español (Spanish)',
             'tr' => 'Türkçe (Turkish)',
         ]);
-        if($languages = Setting::find(5)) {
+        if ($languages = Setting::find(5)) {
             $languages->options = $language_options;
             $languages->save();
         } else {
@@ -145,8 +155,7 @@ class SettingsSeeder extends Seeder
             '_blank' => 'app.settings.window_target.new',
         ]);
 
-        if(!$setting = Setting::find(7)) {
-            
+        if (! $setting = Setting::find(7)) {
             $setting = new Setting;
             $setting->id = 7;
             $setting->group_id = 3;
@@ -162,7 +171,7 @@ class SettingsSeeder extends Seeder
             $setting->save();
         }
 
-        if($support = Setting::find(8)) {
+        if ($support = Setting::find(8)) {
             $support->label = 'app.settings.support';
             $support->value = '<a rel="noopener" target="_blank" href="https://discord.gg/CCjHKn4">Discord</a> | <a rel="noopener" target="_blank" href="https://github.com/linuxserver/Heimdall">Github</a> | <a rel="noopener" target="_blank" href="https://blog.heimdall.site/">Blog</a>';
             $support->save();
@@ -178,7 +187,7 @@ class SettingsSeeder extends Seeder
             $setting->save();
         }
 
-        if($donate = Setting::find(9)) {
+        if ($donate = Setting::find(9)) {
             $donate->label = 'app.settings.donate';
             $donate->value = '<a rel="noopener" target="_blank" href="https://www.paypal.me/heimdall">Paypal</a>';
             $donate->save();
@@ -194,7 +203,39 @@ class SettingsSeeder extends Seeder
             $setting->save();
         }
 
-        if(!$home_tag = \App\Item::find(0)) {
+        if (! $setting = Setting::find(10)) {
+            $setting = new Setting;
+            $setting->id = 10;
+            $setting->group_id = 4;
+            $setting->key = 'custom_css';
+            $setting->type = 'textarea';
+            $setting->label = 'app.settings.custom_css';
+            $setting->value = '';
+            $setting->save();
+        } else {
+            $setting->type = 'textarea';
+            $setting->group_id = 4;
+            $setting->label = 'app.settings.custom_css';
+            $setting->save();
+        }
+
+        if (! $setting = Setting::find(11)) {
+            $setting = new Setting;
+            $setting->id = 11;
+            $setting->group_id = 4;
+            $setting->key = 'custom_js';
+            $setting->type = 'textarea';
+            $setting->label = 'app.settings.custom_js';
+            $setting->value = '';
+            $setting->save();
+        } else {
+            $setting->type = 'textarea';
+            $setting->group_id = 4;
+            $setting->label = 'app.settings.custom_js';
+            $setting->save();
+        }
+
+        if (! $home_tag = \App\Item::find(0)) {
             $home_tag = new \App\Item;
             $home_tag->id = 0;
             $home_tag->title = 'app.dashboard';
@@ -205,11 +246,12 @@ class SettingsSeeder extends Seeder
             $home_tag->save();
 
             $homeapps = \App\Item::withoutGlobalScope('user_id')->doesntHave('parents')->get();
-            foreach($homeapps as $app) {
-                if($app->id === 0) continue;
+            foreach ($homeapps as $app) {
+                if ($app->id === 0) {
+                    continue;
+                }
                 $app->parents()->attach(0);
             }
         }
-
     }
 }

database/seeds/UsersSeeder.php

@@ -1,7 +1,7 @@
 <?php
 
-use Illuminate\Database\Seeder;
 use App\User;
+use Illuminate\Database\Seeder;
 
 class UsersSeeder extends Seeder
 {
@@ -13,7 +13,7 @@ class UsersSeeder extends Seeder
     public function run()
     {
         // Groups
-        if(!$user = User::find(1)) {
+        if (! $user = User::find(1)) {
             $user = new User;
             $user->id = 1;
             $user->username = 'admin';

package-lock.json

@@ -1962,6 +1962,17 @@
                 }
             }
         },
+        "clone-deep": {
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
+            "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==",
+            "dev": true,
+            "requires": {
+                "is-plain-object": "^2.0.4",
+                "kind-of": "^6.0.2",
+                "shallow-clone": "^3.0.0"
+            }
+        },
         "coa": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
@@ -3643,7 +3654,8 @@
                 "ansi-regex": {
                     "version": "2.1.1",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "aproba": {
                     "version": "1.2.0",
@@ -3664,12 +3676,14 @@
                 "balanced-match": {
                     "version": "1.0.0",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "brace-expansion": {
                     "version": "1.1.11",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "balanced-match": "^1.0.0",
                         "concat-map": "0.0.1"
@@ -3684,17 +3698,20 @@
                 "code-point-at": {
                     "version": "1.1.0",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "concat-map": {
                     "version": "0.0.1",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "console-control-strings": {
                     "version": "1.1.0",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "core-util-is": {
                     "version": "1.0.2",
@@ -3811,7 +3828,8 @@
                 "inherits": {
                     "version": "2.0.3",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "ini": {
                     "version": "1.3.5",
@@ -3823,6 +3841,7 @@
                     "version": "1.0.0",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "number-is-nan": "^1.0.0"
                     }
@@ -3837,6 +3856,7 @@
                     "version": "3.0.4",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "brace-expansion": "^1.1.7"
                     }
@@ -3844,12 +3864,14 @@
                 "minimist": {
                     "version": "0.0.8",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "minipass": {
                     "version": "2.3.5",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "safe-buffer": "^5.1.2",
                         "yallist": "^3.0.0"
@@ -3868,6 +3890,7 @@
                     "version": "0.5.1",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "minimist": "0.0.8"
                     }
@@ -3948,7 +3971,8 @@
                 "number-is-nan": {
                     "version": "1.0.1",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "object-assign": {
                     "version": "4.1.1",
@@ -3960,6 +3984,7 @@
                     "version": "1.4.0",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "wrappy": "1"
                     }
@@ -4045,7 +4070,8 @@
                 "safe-buffer": {
                     "version": "5.1.2",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "safer-buffer": {
                     "version": "2.1.2",
@@ -4081,6 +4107,7 @@
                     "version": "1.0.2",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "code-point-at": "^1.0.0",
                         "is-fullwidth-code-point": "^1.0.0",
@@ -4100,6 +4127,7 @@
                     "version": "3.0.1",
                     "bundled": true,
                     "dev": true,
+                    "optional": true,
                     "requires": {
                         "ansi-regex": "^2.0.0"
                     }
@@ -4143,12 +4171,14 @@
                 "wrappy": {
                     "version": "1.0.2",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 },
                 "yallist": {
                     "version": "3.0.3",
                     "bundled": true,
-                    "dev": true
+                    "dev": true,
+                    "optional": true
                 }
             }
         },
@@ -4641,6 +4671,12 @@
                 "loader-utils": "^1.1.0"
             }
         },
+        "immutable": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.0.0.tgz",
+            "integrity": "sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==",
+            "dev": true
+        },
         "import-cwd": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
@@ -5237,9 +5273,9 @@
             }
         },
         "lodash": {
-            "version": "4.17.11",
-            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-            "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+            "version": "4.17.21",
+            "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+            "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
             "dev": true
         },
         "lodash.memoize": {
@@ -6132,6 +6168,12 @@
                 "sha.js": "^2.4.8"
             }
         },
+        "picomatch": {
+            "version": "2.3.1",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+            "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "dev": true
+        },
         "pify": {
             "version": "4.0.1",
             "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
@@ -7195,6 +7237,139 @@
             "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
             "dev": true
         },
+        "sass": {
+            "version": "1.49.9",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.49.9.tgz",
+            "integrity": "sha512-YlYWkkHP9fbwaFRZQRXgDi3mXZShslVmmo+FVK3kHLUELHHEYrCmL1x6IUjC7wLS6VuJSAFXRQS/DxdsC4xL1A==",
+            "dev": true,
+            "requires": {
+                "chokidar": ">=3.0.0 <4.0.0",
+                "immutable": "^4.0.0",
+                "source-map-js": ">=0.6.2 <2.0.0"
+            },
+            "dependencies": {
+                "anymatch": {
+                    "version": "3.1.2",
+                    "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+                    "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+                    "dev": true,
+                    "requires": {
+                        "normalize-path": "^3.0.0",
+                        "picomatch": "^2.0.4"
+                    }
+                },
+                "binary-extensions": {
+                    "version": "2.2.0",
+                    "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+                    "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+                    "dev": true
+                },
+                "braces": {
+                    "version": "3.0.2",
+                    "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+                    "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+                    "dev": true,
+                    "requires": {
+                        "fill-range": "^7.0.1"
+                    }
+                },
+                "chokidar": {
+                    "version": "3.5.3",
+                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+                    "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+                    "dev": true,
+                    "requires": {
+                        "anymatch": "~3.1.2",
+                        "braces": "~3.0.2",
+                        "fsevents": "~2.3.2",
+                        "glob-parent": "~5.1.2",
+                        "is-binary-path": "~2.1.0",
+                        "is-glob": "~4.0.1",
+                        "normalize-path": "~3.0.0",
+                        "readdirp": "~3.6.0"
+                    }
+                },
+                "fill-range": {
+                    "version": "7.0.1",
+                    "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+                    "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+                    "dev": true,
+                    "requires": {
+                        "to-regex-range": "^5.0.1"
+                    }
+                },
+                "fsevents": {
+                    "version": "2.3.2",
+                    "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+                    "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+                    "dev": true,
+                    "optional": true
+                },
+                "glob-parent": {
+                    "version": "5.1.2",
+                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+                    "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+                    "dev": true,
+                    "requires": {
+                        "is-glob": "^4.0.1"
+                    }
+                },
+                "is-binary-path": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+                    "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+                    "dev": true,
+                    "requires": {
+                        "binary-extensions": "^2.0.0"
+                    }
+                },
+                "is-number": {
+                    "version": "7.0.0",
+                    "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+                    "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+                    "dev": true
+                },
+                "readdirp": {
+                    "version": "3.6.0",
+                    "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+                    "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+                    "dev": true,
+                    "requires": {
+                        "picomatch": "^2.2.1"
+                    }
+                },
+                "to-regex-range": {
+                    "version": "5.0.1",
+                    "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+                    "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+                    "dev": true,
+                    "requires": {
+                        "is-number": "^7.0.0"
+                    }
+                }
+            }
+        },
+        "sass-loader": {
+            "version": "7.3.1",
+            "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.3.1.tgz",
+            "integrity": "sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==",
+            "dev": true,
+            "requires": {
+                "clone-deep": "^4.0.1",
+                "loader-utils": "^1.0.1",
+                "neo-async": "^2.5.0",
+                "pify": "^4.0.1",
+                "semver": "^6.3.0"
+            },
+            "dependencies": {
+                "semver": {
+                    "version": "6.3.0",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+                    "dev": true
+                }
+            }
+        },
         "sax": {
             "version": "1.2.4",
             "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
@@ -7408,6 +7583,15 @@
                 "safe-buffer": "^5.0.1"
             }
         },
+        "shallow-clone": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz",
+            "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==",
+            "dev": true,
+            "requires": {
+                "kind-of": "^6.0.2"
+            }
+        },
         "shebang-command": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
@@ -7642,6 +7826,12 @@
             "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
             "dev": true
         },
+        "source-map-js": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+            "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+            "dev": true
+        },
         "source-map-resolve": {
             "version": "0.5.2",
             "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",

phpunit.xml

@@ -1,21 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+>
     <testsuites>
-        <testsuite name="Feature">
-            <directory suffix="Test.php">./tests/Feature</directory>
-        </testsuite>
-
         <testsuite name="Unit">
             <directory suffix="Test.php">./tests/Unit</directory>
         </testsuite>
+        <testsuite name="Feature">
+            <directory suffix="Test.php">./tests/Feature</directory>
+        </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
@@ -23,9 +18,14 @@
         </whitelist>
     </filter>
     <php>
-        <env name="APP_ENV" value="testing"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
+        <server name="APP_ENV" value="testing"/>
+        <server name="BCRYPT_ROUNDS" value="4"/>
+        <server name="CACHE_DRIVER" value="array"/>
+        <!-- <server name="DB_CONNECTION" value="sqlite"/> -->
+        <!-- <server name="DB_DATABASE" value=":memory:"/> -->
+        <server name="MAIL_MAILER" value="array"/>
+        <server name="QUEUE_CONNECTION" value="sync"/>
+        <server name="SESSION_DRIVER" value="array"/>
+        <server name="TELESCOPE_ENABLED" value="false"/>
     </php>
-</phpunit>
+</phpunit>

public/css/all.min.css

@@ -0,0 +1,5 @@
+/*!
+ * Font Awesome Pro 5.15.4 by @fontawesome - https://fontawesome.com
+ * License - https://fontawesome.com/license (Commercial License)
+ */
+.fa,.fab,.fad,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s linear infinite;animation:fa-spin 2s linear infinite}.fa-pulse{-webkit-animation:fa-spin 1s steps(8) infinite;animation:fa-spin 1s steps(8) infinite}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scaleX(-1);transform:scaleX(-1)}.fa-flip-vertical{-webkit-transform:scaleY(-1);transform:scaleY(-1)}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical{-webkit-transform:scale(-1);transform:scale(-1)}:root .fa-flip-both,:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-ban:before{content:"\f05e"}.fa-check:before{content:"\f00c"}.fa-cloud-download:before{content:"\f0ed"}.fa-cogs:before{content:"\f085"}.fa-edit:before{content:"\f044"}.fa-exchange:before{content:"\f0ec"}.fa-list:before{content:"\f03a"}.fa-pencil:before{content:"\f040"}.fa-plus:before{content:"\f067"}.fa-save:before{content:"\f0c7"}.fa-tag:before{content:"\f02b"}.fa-th:before{content:"\f00a"}.fa-thumbtack:before{content:"\f08d"}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-user:before{content:"\f007"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:"Font Awesome 5 Pro";font-style:normal;font-weight:900;font-display:block;src:url(../webfonts/fa-solid-900.eot);src:url(../webfonts/fa-solid-900.eot?#iefix) format("embedded-opentype"),url(../webfonts/fa-solid-900.woff2) format("woff2"),url(../webfonts/fa-solid-900.woff) format("woff"),url(../webfonts/fa-solid-900.ttf) format("truetype"),url(../webfonts/fa-solid-900.svg#fontawesome) format("svg")}.fa,.fas{font-family:"Font Awesome 5 Pro";font-weight:900}

public/js/fontawesome.js

@@ -480,7 +480,9 @@ function define(prefix, icons) {
 /* fas icons */
 var icons = {
   "arrow-alt-to-right": [448, 512, [], "f34c", "M448 88v336c0 13.3-10.7 24-24 24h-24c-13.3 0-24-10.7-24-24V88c0-13.3 10.7-24 24-24h24c13.3 0 24 10.7 24 24zM24 320h136v87.7c0 17.8 21.5 26.7 34.1 14.1l152.2-152.2c7.5-7.5 7.5-19.8 0-27.3L194.1 90.1c-12.6-12.6-34.1-3.7-34.1 14.1V192H24c-13.3 0-24 10.7-24 24v80c0 13.3 10.7 24 24 24z"],
+  "arrow-rotate-right": [512, 512, [8635, "arrow-right-rotate", "arrow-rotate-forward", "redo"], "f01e", "M496 48V192c0 17.69-14.31 32-32 32H320c-17.69 0-32-14.31-32-32s14.31-32 32-32h63.39c-29.97-39.7-77.25-63.78-127.6-63.78C167.7 96.22 96 167.9 96 256s71.69 159.8 159.8 159.8c34.88 0 68.03-11.03 95.88-31.94c14.22-10.53 34.22-7.75 44.81 6.375c10.59 14.16 7.75 34.22-6.375 44.81c-39.03 29.28-85.36 44.86-134.2 44.86C132.5 479.9 32 379.4 32 256s100.5-223.9 223.9-223.9c69.15 0 134 32.47 176.1 86.12V48c0-17.69 14.31-32 32-32S496 30.31 496 48z"],
   "ban": [512, 512, [], "f05e", "M256 8C119.034 8 8 119.033 8 256s111.034 248 248 248 248-111.034 248-248S392.967 8 256 8zm130.108 117.892c65.448 65.448 70 165.481 20.677 235.637L150.47 105.216c70.204-49.356 170.226-44.735 235.638 20.676zM125.892 386.108c-65.448-65.448-70-165.481-20.677-235.637L361.53 406.784c-70.203 49.356-170.226 44.736-235.638-20.676z"],
+  "check": [512, 512, [], "f00c", "M173.898 439.404l-166.4-166.4c-9.997-9.997-9.997-26.206 0-36.204l36.203-36.204c9.997-9.998 26.207-9.998 36.204 0L192 312.69 432.095 72.596c9.997-9.997 26.207-9.997 36.204 0l36.203 36.204c9.997 9.997 9.997 26.206 0 36.204l-294.4 294.401c-9.998 9.997-26.207 9.997-36.204-.001z"],
   "cloud-download": [640, 512, [], "f0ed", "M537.6 226.6c4.1-10.7 6.4-22.4 6.4-34.6 0-53-43-96-96-96-19.7 0-38.1 6-53.3 16.2C367 64.2 315.3 32 256 32c-88.4 0-160 71.6-160 160 0 2.7.1 5.4.2 8.1C40.2 219.8 0 273.2 0 336c0 79.5 64.5 144 144 144h368c70.7 0 128-57.3 128-128 0-61.9-44-113.6-102.4-125.4zm-139.9 93L305 412.3c-9.4 9.4-24.6 9.4-33.9 0l-92.7-92.7c-9.4-9.4-9.4-24.6 0-33.9l10.8-10.8c9.6-9.6 25.2-9.3 34.5.5l32.4 34.5V184c0-13.3 10.7-24 24-24h16c13.3 0 24 10.7 24 24v125.9l32.4-34.5c9.3-9.9 24.9-10.1 34.5-.5l10.8 10.8c9.2 9.3 9.2 24.5-.1 33.9z"],
   "cogs": [640, 512, [], "f085", "M512.1 191l-8.2 14.3c-3 5.3-9.4 7.5-15.1 5.4-11.8-4.4-22.6-10.7-32.1-18.6-4.6-3.8-5.8-10.5-2.8-15.7l8.2-14.3c-6.9-8-12.3-17.3-15.9-27.4h-16.5c-6 0-11.2-4.3-12.2-10.3-2-12-2.1-24.6 0-37.1 1-6 6.2-10.4 12.2-10.4h16.5c3.6-10.1 9-19.4 15.9-27.4l-8.2-14.3c-3-5.2-1.9-11.9 2.8-15.7 9.5-7.9 20.4-14.2 32.1-18.6 5.7-2.1 12.1.1 15.1 5.4l8.2 14.3c10.5-1.9 21.2-1.9 31.7 0L552 6.3c3-5.3 9.4-7.5 15.1-5.4 11.8 4.4 22.6 10.7 32.1 18.6 4.6 3.8 5.8 10.5 2.8 15.7l-8.2 14.3c6.9 8 12.3 17.3 15.9 27.4h16.5c6 0 11.2 4.3 12.2 10.3 2 12 2.1 24.6 0 37.1-1 6-6.2 10.4-12.2 10.4h-16.5c-3.6 10.1-9 19.4-15.9 27.4l8.2 14.3c3 5.2 1.9 11.9-2.8 15.7-9.5 7.9-20.4 14.2-32.1 18.6-5.7 2.1-12.1-.1-15.1-5.4l-8.2-14.3c-10.4 1.9-21.2 1.9-31.7 0zm-10.5-58.8c38.5 29.6 82.4-14.3 52.8-52.8-38.5-29.7-82.4 14.3-52.8 52.8zM386.3 286.1l33.7 16.8c10.1 5.8 14.5 18.1 10.5 29.1-8.9 24.2-26.4 46.4-42.6 65.8-7.4 8.9-20.2 11.1-30.3 5.3l-29.1-16.8c-16 13.7-34.6 24.6-54.9 31.7v33.6c0 11.6-8.3 21.6-19.7 23.6-24.6 4.2-50.4 4.4-75.9 0-11.5-2-20-11.9-20-23.6V418c-20.3-7.2-38.9-18-54.9-31.7L74 403c-10 5.8-22.9 3.6-30.3-5.3-16.2-19.4-33.3-41.6-42.2-65.7-4-10.9.4-23.2 10.5-29.1l33.3-16.8c-3.9-20.9-3.9-42.4 0-63.4L12 205.8c-10.1-5.8-14.6-18.1-10.5-29 8.9-24.2 26-46.4 42.2-65.8 7.4-8.9 20.2-11.1 30.3-5.3l29.1 16.8c16-13.7 34.6-24.6 54.9-31.7V57.1c0-11.5 8.2-21.5 19.6-23.5 24.6-4.2 50.5-4.4 76-.1 11.5 2 20 11.9 20 23.6v33.6c20.3 7.2 38.9 18 54.9 31.7l29.1-16.8c10-5.8 22.9-3.6 30.3 5.3 16.2 19.4 33.2 41.6 42.1 65.8 4 10.9.1 23.2-10 29.1l-33.7 16.8c3.9 21 3.9 42.5 0 63.5zm-117.6 21.1c59.2-77-28.7-164.9-105.7-105.7-59.2 77 28.7 164.9 105.7 105.7zm243.4 182.7l-8.2 14.3c-3 5.3-9.4 7.5-15.1 5.4-11.8-4.4-22.6-10.7-32.1-18.6-4.6-3.8-5.8-10.5-2.8-15.7l8.2-14.3c-6.9-8-12.3-17.3-15.9-27.4h-16.5c-6 0-11.2-4.3-12.2-10.3-2-12-2.1-24.6 0-37.1 1-6 6.2-10.4 12.2-10.4h16.5c3.6-10.1 9-19.4 15.9-27.4l-8.2-14.3c-3-5.2-1.9-11.9 2.8-15.7 9.5-7.9 20.4-14.2 32.1-18.6 5.7-2.1 12.1.1 15.1 5.4l8.2 14.3c10.5-1.9 21.2-1.9 31.7 0l8.2-14.3c3-5.3 9.4-7.5 15.1-5.4 11.8 4.4 22.6 10.7 32.1 18.6 4.6 3.8 5.8 10.5 2.8 15.7l-8.2 14.3c6.9 8 12.3 17.3 15.9 27.4h16.5c6 0 11.2 4.3 12.2 10.3 2 12 2.1 24.6 0 37.1-1 6-6.2 10.4-12.2 10.4h-16.5c-3.6 10.1-9 19.4-15.9 27.4l8.2 14.3c3 5.2 1.9 11.9-2.8 15.7-9.5 7.9-20.4 14.2-32.1 18.6-5.7 2.1-12.1-.1-15.1-5.4l-8.2-14.3c-10.4 1.9-21.2 1.9-31.7 0zM501.6 431c38.5 29.6 82.4-14.3 52.8-52.8-38.5-29.6-82.4 14.3-52.8 52.8z"],
   "edit": [576, 512, [], "f044", "M402.6 83.2l90.2 90.2c3.8 3.8 3.8 10 0 13.8L274.4 405.6l-92.8 10.3c-12.4 1.4-22.9-9.1-21.5-21.5l10.3-92.8L388.8 83.2c3.8-3.8 10-3.8 13.8 0zm162-22.9l-48.8-48.8c-15.2-15.2-39.9-15.2-55.2 0l-35.4 35.4c-3.8 3.8-3.8 10 0 13.8l90.2 90.2c3.8 3.8 10 3.8 13.8 0l35.4-35.4c15.2-15.3 15.2-40 0-55.2zM384 346.2V448H64V128h229.8c3.2 0 6.2-1.3 8.5-3.5l40-40c7.6-7.6 2.2-20.5-8.5-20.5H48C21.5 64 0 85.5 0 112v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V306.2c0-10.7-12.9-16-20.5-8.5l-40 40c-2.2 2.3-3.5 5.3-3.5 8.5z"],

public/manifest.json

@@ -1,5 +1,5 @@
 {
- "name": "App",
+ "name": "Heimdall",
  "icons": [
   {
    "src": "\/android-icon-36x36.png",

public/mix-manifest.json

@@ -1,4 +1,4 @@
 {
-    "/css/app.css": "/css/app.css?id=e4ac968c3a08d246c3b0",
-    "/js/app.js": "/js/app.js?id=f5edf362209887248205"
+    "/css/app.css": "/css/app.css?id=ad45b1705b7f7906db0b",
+    "/js/app.js": "/js/app.js?id=5446aeb4aa754e641c77"
 }

readme.md

@@ -34,11 +34,11 @@ Supported applications are recognized by the title of the application as entered
 [![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, Filter 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).
+Apart from the Laravel dependencies, namely PHP >= 7.2.5, BCMath PHP Extension, Ctype PHP Extension, Fileinfo PHP extension, JSON PHP Extension, Mbstring PHP Extension, OpenSSL PHP Extension, PDO PHP Extension, Tokenizer PHP Extension, XML 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.
 
-Installation is as simple as cloning the repository somewhere, or downloading and extracting the zip/tar and pointing your httpd document root to the `/public` folder. 
+Installation is as simple as cloning the repository somewhere, or downloading and extracting the zip/tar and pointing your httpd document root to the `/public` folder then creating the .env file and generating an encryption key (this is all taken care of for you with the docker). 
 
 ```
 cd /path/to/heimdall
@@ -52,6 +52,18 @@ There is also a multi-arch Docker which supports x86-64, armhf and arm64, instru
 
 - https://hub.docker.com/r/linuxserver/heimdall/
 
+## Updating
+To update your instance, simply clone this repository or download the zip/tar file with the new version and copy it over the old installation.
+
+## Search Providers
+v2.3.0 added the ability for users to customise the search options.
+
+Options are stored in `/storage/app/searchproviders.yaml` (`/config/www/searchproviders.yaml` on docker installs), feel free to rearrange the options, add new ones, delete ones you don't use, etc.
+
+Consider contributing to https://github.com/linuxserver/Heimdall/discussions/categories/search-providers to help others add new ones.
+
+The item at the top of the list `Tiles` allows you to search for apps on your dashboard by name, helpful when you have lots of icons.
+
 ## New background image not being set
 If you are using the docker image or a default php install you may find images over 2MB wont get set as the background image, you just need to change the `upload_max_filesize` in the php.ini.
 
@@ -78,6 +90,8 @@ Currently added languages are
 - Swedish
 - Spanish
 - Turkish
+- Russian
+- Chinese
 
 ## Web Server Configuration
 
@@ -129,7 +143,7 @@ location /webfonts {
 If there are any other locations which might interfere with any of the folders in the `/public` folder, you might have to do the same for those as well, but it's a super fringe case.
 
 ### Reverse proxy
-If you'd like to reverse proxy this app, we recommend using our letsencrypt/nginx docker image: [Letsencrypt/Nginx](https://hub.docker.com/r/linuxserver/letsencrypt/)
+If you'd like to reverse proxy this app, we recommend using our letsencrypt/nginx docker image: [SWAG - Secure Web Application Gateway](https://hub.docker.com/r/linuxserver/swag)
 You can either reverse proxy from the root location, or from a subdomain (subfolder method is currently not supported). For HTTPS proxy, make sure you use the HTTPS port of Heimdall webserver, otherwise some links may break. You can add security through `.htpasswd`
 
 ```
@@ -137,12 +151,11 @@ location / {
     auth_basic "Restricted";
     auth_basic_user_file /config/nginx/.htpasswd;
     include /config/nginx/proxy.conf;
-    proxy_pass https://heimdall:443;
+    proxy_set_header X-Forwarded-Proto https;
+    proxy_pass http://heimdall;
 }
 ```
 
-If you are using HTTPS and things aren't working try adding `FORCE_HTTPS=true` to the end of your `.env` file or proxy to the https version of the app.
-
 ### Self-signed certificates and local CAs
 Per default Heimdall uses the standard certificate bundle file (`ca-certificates.crt`) to verify HTTPS sites and will ignore additional certificates placed in `/etc/ssl/certs`. If you wish to use enhanced apps with HTTPS sites that use a self-signed certificate or certs signed with your own local CA, you can override the default bundle:
 

resources/assets/js/app.js

@@ -60,7 +60,7 @@ $.when( $.ready ).then(function() {
             var timer = 5000;
             var fun = function worker() {
                 $.ajax({
-                    url: base+'/get_stats/'+id,
+                    url: base+'get_stats/'+id,
                     dataType: 'json',
                     success: function(data) {
                         container.html(data.html);
@@ -120,7 +120,7 @@ $.when( $.ready ).then(function() {
                 attribute: 'data-id'
             });
             $.post(
-                base+'/order',
+                base+'order',
                 { order:idsInOrder }
             );
         }
@@ -128,7 +128,49 @@ $.when( $.ready ).then(function() {
     });
     $('#sortable').sortable('disable');
 
+    $('#sortable').on('mouseenter', '.item', function () {
+        $(this).siblings('.tooltip').addClass('active')
+        $('.refresh', this).addClass('active')
+    }).on('mouseleave', '.item', function () {
+        $(this).siblings('.tooltip').removeClass('active')
+        $('.refresh', this).removeClass('active')
+    })
 
+    $('#search-container').on('input', 'input[name=q]', function () {
+        const search = this.value
+        const items = $('#sortable').children('.item-container')
+        if($('#search-container select[name=provider]').val() === 'tiles') {
+            if(search.length > 0) {
+                items.hide()
+                items.filter(function () {
+                    const name = $(this).data('name').toLowerCase();
+                    return name.includes(search.toLowerCase())
+                }).show()
+            } else {
+                items.show()
+            }
+        } else {
+            items.show()
+        }
+    }).on('change', 'select[name=provider]', function () {
+        const items = $('#sortable').children('.item-container')
+        if($(this).val() === 'tiles') {
+            $('#search-container button').hide()
+            const search = $('#search-container input[name=q]').val()
+            if(search.length > 0) {
+                items.hide()
+                items.filter(function () {
+                    const name = $(this).data('name').toLowerCase();
+                    return name.includes(search.toLowerCase())
+                }).show()
+            } else {
+                items.show()
+            }
+        } else {
+            $('#search-container button').show()
+            items.show()
+        }
+    })
 
     $('#app').on('click', '#config-button', function(e) {
         e.preventDefault();
@@ -163,7 +205,7 @@ $.when( $.ready ).then(function() {
         e.preventDefault();
         var apiurl = $('#create input[name=url]').val();
 
-        var override_url = $('#create input[name="config[override_url]"]').val();
+        var override_url = $('#sapconfig input[name="config[override_url]"]').val();
         if(override_url.length && override_url != '') {
             apiurl = override_url;
         }
@@ -175,7 +217,7 @@ $.when( $.ready ).then(function() {
             data[config] = $(this).val();
         });
 
-        $.post(base+'/test_config', { data: data }, function(data) {
+        $.post(base+'test_config', { data: data }, function(data) {
             alert(data);
         });
 
@@ -185,7 +227,7 @@ $.when( $.ready ).then(function() {
         var current = $(this);
         var id = current.data('id');
         var tag = current.data('tag');
-        $.get(base+'/items/pintoggle/'+id+'/true/'+tag, function(data) {
+        $.get(base+'items/pintoggle/'+id+'/true/'+tag, function(data) {
             var inner = $(data).filter('#sortable').html();
             $('#sortable').html(inner);
             current.toggleClass('active');

resources/assets/sass/_app.scss

@@ -47,6 +47,66 @@ body {
 		}
 	}
 }
+#tile-preview {
+	align-items: center;
+}
+.create {
+	.textarea {
+		width: 100%;
+		margin: 0px 20px;
+		textarea{
+				width: 100%;
+				border: 1px solid #dedfe2;
+				padding: 15px;
+				border-radius: 6px;
+				height: 100px;
+				font-size: 14px;
+		}
+		label:not(.switch) {
+			width: 100%;
+			font-size: 13px;
+			color: lighten($app-text, 40%);
+			margin-bottom: 15px;
+			display: block;
+			font-weight: 300;
+		}
+	}
+}
+.appoptions {
+	display: flex;
+	flex-direction: column;
+	padding: 20px;
+	gap: 5px;
+	.optdetails {
+		display: flex;
+		.input {
+			margin: 0 20px;
+			width: 200px;
+		}
+	}
+	.optvalue {
+		display: flex;
+		align-items: center;
+		opacity: 0;
+		width: 0;
+		height: 0;
+		overflow: hidden;
+		&.active {
+			opacity: 1;
+			width: auto;
+			height: auto;
+			overflow: visible;
+		}
+	}
+	button.dark {
+		background: #1b1b1b;
+		border: none;
+		padding: 12px 15px;
+		border-radius: 4px;
+		color: white;
+		min-width: 240px;
+	}
+}
 #app {
 	display: flex;
 	min-height: 100vh;
@@ -200,6 +260,59 @@ body {
 		text-align: center;
 		line-height: 30px;
 		display: none;
+		z-index: 1;
+	}
+
+	.tooltip {
+		padding: 25px;
+		border-radius: 5px;
+		background: #000000c8;
+		color: white;
+		position: absolute;
+		bottom: 120px;
+		left: 0;
+		right: 0;
+		font-size: 13px;
+		backdrop-filter: blur(8px);
+		z-index: 0;
+		opacity: 0;
+		transform: translateY(-20px);
+		transition: all 0.3s;
+		&.active {
+			transform: translateY(0);
+			opacity: 1;
+			z-index: 4;
+		}
+	}
+}
+.tile-actions {
+    position: absolute;
+    top: 0px;
+    left: 0;
+    padding: 7px;
+    background: #000000d9;
+    font-size: 12px;
+    line-height: 1;
+    border-radius: 6px;
+    width: 80px;
+    height: 90px;
+    display: flex;
+    opacity: 0;
+    align-items: center;
+    justify-content: center;
+    transition: all 0.3s;
+    flex-direction: column;
+    text-align: center;
+	cursor: pointer;
+	&.active {
+		opacity: 1;
+	}
+}
+.refresh {
+	z-index: 3;
+	.icon {
+		font-size: 20px;
+		margin-bottom: 5px;
 	}
 }
 .black {
@@ -511,6 +624,15 @@ body {
         }
     }
 }
+.input {
+	position: relative;
+	.help {
+		position: absolute;
+		bottom: -22px;
+		left: 10px;
+		color: #c00;
+	}
+}
 div.create {
 	padding: 30px 15px;
 	display: flex;
@@ -534,10 +656,19 @@ div.create {
 		}
 	}
 }
-
+.app-icon-container {
+	width: 60px;
+	height: 60px;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	margin-right: 15px;
+	flex: 0 0 60px;
+}
 .app-icon {
 	max-width: 60px;
-	margin-right: 15px;
+	display: block;
+	max-height: 60px;
 }
 
 .sidenav {
@@ -576,6 +707,41 @@ div.create {
 	color: #91a1b3;
 	margin-left: 20px;
 }
+#websiteiconoptions {
+	display: flex;
+	flex-direction: column;
+	padding: 20px;
+	.results {
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		gap: 8px;
+	}
+	.header {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		gap: 10px;
+		padding: 10px 0;
+	}
+	.selectclose {
+		cursor: pointer;
+	}
+}
+.iconbutton {
+	width: 160px;
+	height: 160px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border: 1px solid #ccc;
+	border-radius: 4px;
+	cursor: pointer;
+}
+.selecticon {
+	max-width: 120px;
+	height: auto;
+}
 
 .switch {
 	position: relative;
@@ -694,6 +860,8 @@ div.create {
 	  position: relative;
 	  width: 100%;
 	  max-width: 620px;
+	  position: relative;
+	  z-index: 4;
 	  form { 
 		width: 100%;
 	  }
@@ -784,7 +952,7 @@ div.create {
 
 #appimage {
 	img {
-		max-width: 95px;
+		width: 95px;
 	}
 }
 

resources/lang/br/app.php

@@ -29,7 +29,6 @@ return [
     'settings.search' => 'busca',
     'settings.no_items' => 'Nenhum item encontrado',
 
-
     'settings.label' => 'Rótulo',
     'settings.value' => 'Valor',
     'settings.edit' => 'Editar',

resources/lang/cn/app.php

@@ -0,0 +1,129 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | App Language Lines
+    |--------------------------------------------------------------------------
+    |
+    */
+
+    'settings.system' => '系统',
+    'settings.appearance' => '外观',
+    'settings.miscellaneous' => '杂项',
+    'settings.advanced' => '高级',
+
+    'settings.support' => '支持',
+    'settings.donate' => '捐赠',
+
+    'settings.version' => '版本',
+    'settings.background_image' => '背景图片',
+    'settings.window_target' => '链接打开方式',
+    'settings.window_target.current' => '在当前选项卡中打开',
+    'settings.window_target.one' => '在同一个选项卡中打开',
+    'settings.window_target.new' => '在新的选项卡中打开',
+    'settings.homepage_search' => '主页搜索',
+    'settings.search_provider' => '默认搜索引擎',
+    'settings.language' => '语言',
+    'settings.reset' => '重置为默认值',
+    'settings.remove' => '移除',
+    'settings.search' => '搜索',
+    'settings.no_items' => '没有可用项目',
+
+    'settings.label' => '设置项',
+    'settings.value' => '内容',
+    'settings.edit' => '编辑',
+    'settings.view' => '查看',
+
+    'settings.custom_css' => '自定义 CSS',
+    'settings.custom_js' => '自定义 JavaScript',
+
+    'options.none' => '- 未设置 -',
+    'options.google' => 'Google',
+    'options.baidu' => '百度',
+    'options.ddg' => 'DuckDuckGo',
+    'options.bing' => 'Bing',
+    'options.qwant' => 'Qwant',
+    'options.startpage' => '起始页',
+    'options.yes' => '是',
+    'options.no' => '否',
+    'options.nzbhydra' => 'NZBHydra',
+    'options.jackett' => 'Jackett',
+
+    'buttons.save' => '保存',
+    'buttons.cancel' => '取消',
+    'buttons.add' => '添加',
+    'buttons.upload' => '上传图标',
+    'buttons.downloadapps' => '更新应用列表',
+
+    'dash.pin_item' => '固定应用到仪表盘',
+    'dash.no_apps' => '当前没有固定的应用, :link1 或 :link2',
+    'dash.link1' => '添加应用',
+    'dash.link2' => '将应用固定到仪表盘',
+    'dash.pinned_items' => '已固定应用',
+
+    'apps.app_list' => '应用列表',
+    'apps.view_trash' => '查看垃圾箱',
+    'apps.add_application' => '添加应用',
+    'apps.application_name' => '应用名称',
+    'apps.colour' => '颜色',
+    'apps.icon' => '图标',
+    'apps.pinned' => '固定',
+    'apps.title' => '标题',
+    'apps.hex' => 'Hex色值',
+    'apps.username' => '用户名',
+    'apps.password' => '密码',
+    'apps.config' => '配置',
+    'apps.apikey' => 'API 密钥',
+    'apps.enable' => '开启',
+    'apps.tag_list' => '标签列表',
+    'apps.add_tag' => '添加标签',
+    'apps.tag_name' => '标签名称',
+    'apps.tags' => '标签',
+    'apps.override' => '如果与主链接不同',
+    'apps.preview' => '预览',
+    'apps.apptype' => '应用类型',
+    'apps.website' => '网址',
+    'apps.description' => '描述',
+    'apps.only_admin_account' => '您必须拥有管理员账户！',
+    'apps.autologin_url' => '自动登录网址',
+    'apps.show_deleted' => '显示已移除的应用',
+
+    'dashboard' => '仪表盘',
+
+    'user.user_list' => '用户',
+    'user.add_user' => '增加用户',
+    'user.username' => '用户名',
+    'user.avatar' => '头像',
+    'user.email' => '邮箱',
+    'user.password_confirm' => '确认密码',
+    'user.secure_front' => '允许公开访问 - 仅在设置密码时有效',
+    'user.autologin' => '允许从特定链接进入 - 任何拥有链接的人均可访问',
+
+    'url' => '网址',
+    'title' => '标题',
+    'delete' => '移除',
+    'optional' => '可选',
+    'restore' => '恢复',
+
+    'alert.success.item_created' => '应用创建成功',
+    'alert.success.item_updated' => '应用修改成功',
+    'alert.success.item_deleted' => '应用移除成功',
+    'alert.success.item_restored' => '应用恢复成功',
+    'alert.success.updating' => '应用列表升级中...',
+
+    'alert.success.tag_created' => '标签创建成功',
+    'alert.success.tag_updated' => '标签修改成功',
+    'alert.success.tag_deleted' => '标签移除成功',
+    'alert.success.tag_restored' => '标签恢复成功',
+
+    'alert.success.setting_updated' => '您成功编辑了此设置',
+    'alert.error.not_exist' => '此设置项不存在',
+
+    'alert.success.user_created' => '用户创建成功',
+    'alert.success.user_updated' => '用户修改成功',
+    'alert.success.user_deleted' => '用户移除成功',
+    'alert.success.user_restored' => '用户恢复成功',
+
+];

resources/lang/cn/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' => '此凭据无效，请重试。',
+    'throttle' => '登录尝试次数过多. 请等待 :seconds 秒后重试.',
+
+];

resources/lang/cn/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; 上一页',
+    'next' => '下一页 &raquo;',
+
+];

resources/lang/cn/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' => '密码必须至少包含6个字符, 且两次输入一致.',
+    'reset' => '您的密码已重置!',
+    'sent' => '我们已通过邮件将密码重置链接发送至您的邮箱!',
+    'token' => '密码重置令牌无效.',
+    'user' => "我们无法找到该邮箱对应的用户.",
+
+];

resources/lang/cn/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'             => '必须同意 :attribute.',
+    'active_url'           => ':attribute 不是一个有效的网址.',
+    'after'                => ':attribute 必须在 :date 之后.',
+    'after_or_equal'       => ':attribute 必须是 :date 或在其之后.',
+    'alpha'                => ':attribute 只能包含英文字母.',
+    'alpha_dash'           => ':attribute 只能包含英文字母, 数字或"-"符号.',
+    'alpha_num'            => ':attribute 只能包含英文字母与数字.',
+    'array'                => ':attribute 只能是一个数组.',
+    'before'               => ':attribute 必须在 :date 之前.',
+    'before_or_equal'      => ':attribute 必须是 :date 或在其之前.',
+    'between'              => [
+        'numeric' => ':attribute 必须在 :min 到 :max 之间.',
+        'file'    => ':attribute 必须在 :min 到 :max 千字节 之间.',
+        'string'  => ':attribute 必须在 :min 到 :max 个字符 之间.',
+        'array'   => ':attribute 必须在 :min 到 :max 个项 之间.',
+    ],
+    'boolean'              => ':attribute 只能是真或假.',
+    'confirmed'            => ':attribute 确认不匹配.',
+    'date'                 => ':attribute 是无效日期.',
+    'date_format'          => ':attribute 不符合 :format 的格式.',
+    'different'            => ':attribute 与 :other 必须不一致.',
+    'digits'               => ':attribute 必须是 :digits 位.',
+    'digits_between'       => ':attribute 必须在 :min 到 :max 位 之间.',
+    'dimensions'           => ':attribute 图像尺寸无效.',
+    'distinct'             => ':attribute 字段有重复值.',
+    'email'                => ':attribute 必须是有效的邮箱地址.',
+    'exists'               => '选中的 :attribute 已存在.',
+    'file'                 => ':attribute 只能是文件.',
+    'filled'               => ':attribute 必须填写.',
+    'image'                => ':attribute 只能是图片.',
+    'in'                   => '选中的 :attribute 无效.',
+    'in_array'             => ':attribute 必须不存在于 :other 中.',
+    'integer'              => ':attribute 只能是整数.',
+    'ip'                   => ':attribute 只能是 IP 地址.',
+    'ipv4'                 => ':attribute 必须是有效的 IPv4 地址.',
+    'ipv6'                 => ':attribute 必须是有效的 IPv6 地址.',
+    'json'                 => ':attribute 必须是有效的 JSON 字符串.',
+    'max'                  => [
+        'numeric' => ':attribute 不应比 :max 大.',
+        'file'    => ':attribute 不应比 :max 千字节 多.',
+        'string'  => ':attribute 不应比 :max 个字符 多.',
+        'array'   => ':attribute 不应有多于 :max 个项.',
+    ],
+    'mimes'                => ':attribute 必须是 :values 类型的文件.',
+    'mimetypes'            => ':attribute 必须是 :values 类型的文件.',
+    'min'                  => [
+        'numeric' => ':attribute 不应比 :min 小.',
+        'file'    => ':attribute 不应比 :min 千字节 少.',
+        'string'  => ':attribute 不应比 :min 个字符 少.',
+        'array'   => ':attribute 不应有多于 :min 个项.',
+    ],
+    'not_in'               => '选中的 :attribute 无效.',
+    'numeric'              => ':attribute 只能是数字.',
+    'present'              => ':attribute 字段必须存在.',
+    'regex'                => ':attribute 格式无效.',
+    'required'             => ':attribute 字段必须填写.',
+    'required_if'          => ':attribute 字段必须填写, 因 :other 是 :value.',
+    'required_unless'      => ':attribute 字段必须填写, 除非 :other 在 :values 中.',
+    'required_with'        => ':attribute 字段必须填写, 因 :values 存在.',
+    'required_with_all'    => ':attribute 字段必须填写, 因 :values 存在.',
+    'required_without'     => ':attribute 字段必须填写, 因 :values 不存在.',
+    'required_without_all' => ':attribute 字段必须填写, 因任何 :values 均不存在.',
+    'same'                 => ':attribute 与 :other 必须相符.',
+    'size'                 => [
+        'numeric' => ':attribute 必须是 :size.',
+        'file'    => ':attribute 必须是 :size 千字节.',
+        'string'  => ':attribute 必须是 :size 个字符.',
+        'array'   => ':attribute 必须包含 :size 个项.',
+    ],
+    'string'               => ':attribute 必须是字符串.',
+    'timezone'             => ':attribute 必须是有效时区.',
+    'unique'               => ':attribute 已被占用.',
+    'uploaded'             => ':attribute 上传失败.',
+    'url'                  => ':attribute 格式无效.',
+
+    /*
+    |--------------------------------------------------------------------------
+    | 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 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/lang/da/app.php

@@ -0,0 +1,118 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | App Language Lines
+    |--------------------------------------------------------------------------
+    |
+    */
+
+    'settings.system' => 'System',
+    'settings.appearance' => 'Appearance',
+    'settings.miscellaneous' => 'Miscellaneous',
+    'settings.support' => 'Support',
+    'settings.donate' => 'Doner',
+
+    'settings.version' => 'Version',
+    'settings.background_image' => 'Baggrundsbillede',
+    'settings.window_target' => 'Link opens in',
+    'settings.window_target.current' => 'Åbn i denne fane',
+    'settings.window_target.one' => 'Åbn i den samme fane',
+    'settings.window_target.new' => 'Åbn i en ny fane',
+    'settings.homepage_search' => 'Homepage Search',
+    'settings.search_provider' => 'Standardsøgemaskine',
+    'settings.language' => 'Sprog',
+    'settings.reset' => 'Nulstil tilbage til standard',
+    'settings.remove' => 'Fjern',
+    'settings.search' => 'søg',
+    'settings.no_items' => 'Intet fundet',
+
+    'settings.label' => 'Etiket',
+    'settings.value' => 'Værdi',
+    'settings.edit' => 'Rediger',
+    'settings.view' => 'Vis',
+
+    'options.none' => '- ikke indstillet -',
+    'options.google' => 'Google',
+    'options.ddg' => 'DuckDuckGo',
+    'options.bing' => 'Bing',
+    'options.qwant' => 'Qwant',
+    'options.startpage' => 'Startside',
+    'options.yes' => 'Ja',
+    'options.no' => 'Nej',
+    'options.nzbhydra' => 'NZBHydra',
+    'options.jackett' => 'Jackett',
+
+    'buttons.save' => 'Gem',
+    'buttons.cancel' => 'Afbryd',
+    'buttons.add' => 'Tilføj',
+    'buttons.upload' => 'Upload et ikon',
+    'buttons.downloadapps' => 'Opdater apps-listen',
+
+    'dash.pin_item' => 'Fastgør element til dashboard',
+    'dash.no_apps' => 'Der er i øjeblikket ingen fastgjorte applikationer, :link1 eller :link2',
+    'dash.link1' => 'Add an application here',
+    'dash.link2' => 'Pin an item to the dash',
+    'dash.pinned_items' => 'Fastgjorte elementer',
+
+    'apps.app_list' => 'Applikations liste',
+    'apps.view_trash' => 'View trash',
+    'apps.add_application' => 'Tilføj applikation',
+    'apps.application_name' => 'Applikations navn',
+    'apps.colour' => 'Farver',
+    'apps.icon' => 'Ikon',
+    'apps.pinned' => 'Fastgjort',
+    'apps.title' => 'Titel',
+    'apps.hex' => 'Hex farver',
+    'apps.username' => 'brugernavn',
+    'apps.password' => 'kodeord',
+    'apps.config' => 'Config',
+    'apps.apikey' => 'API nøgle',
+    'apps.enable' => 'Aktiver',
+    'apps.tag_list' => 'Tags liste',
+    'apps.add_tag' => 'Tilføj tag',
+    'apps.tag_name' => 'Tag navn',
+    'apps.tags' => 'Tags',
+    'apps.override' => 'Hvis det er anderledes end hovedwebadressen',
+    'apps.preview' => 'Eksempel',
+    'apps.apptype' => 'Applikationstype',
+
+    'dashboard' => 'Home dashboard',
+
+    'user.user_list' => 'Brugere',
+    'user.add_user' => 'Tilføj bruger',
+    'user.username' => 'Brugernavn',
+    'user.avatar' => 'Avatar',
+    'user.email' => 'E-mail',
+    'user.password_confirm' => 'Bekræft kodeord',
+    'user.secure_front' => 'Tillad offentlig adgang til forsiden - Kun håndhævet, hvis der er angivet en adgangskode.',
+    'user.autologin' => 'Tillad at logge ind fra en bestemt URL. Alle med linket kan logge ind.',
+
+    'url' => 'URL',
+    'title' => 'Title',
+    'delete' => 'Slet',
+    'optional' => 'Valgfri',
+    'restore' => 'Genskab',
+
+    'alert.success.item_created' => 'Item created successfully',
+    'alert.success.item_updated' => 'Item updated successfully',
+    'alert.success.item_deleted' => 'Item deleted successfully',
+    'alert.success.item_restored' => 'Item restored successfully',
+    'alert.success.updating' => 'Updating apps list',
+
+    'alert.success.tag_created' => 'Tag oprettet med succes',
+    'alert.success.tag_updated' => 'Tag opdateret med succes',
+    'alert.success.tag_deleted' => 'Tag slettet med succes',
+    'alert.success.tag_restored' => 'Tag genskabt med succes',
+
+    'alert.success.setting_updated' => 'You have successfully edited this setting',
+    'alert.error.not_exist' => 'Denne indstilling findes ikke.',
+
+    'alert.success.user_created' => 'Bruger oprettet med succes',
+    'alert.success.user_updated' => 'Bruger opdateret med succes',
+    'alert.success.user_deleted' => 'Bruger slettet med succes',
+    'alert.success.user_restored' => 'Bruger genskabt med succes',
+
+];

resources/lang/da/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; Tidligere',
+    'next' => 'Næste &raquo;',
+
+];

resources/lang/da/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' => 'Adgangskoder skal bestå af mindst seks tegn og matche bekræftelsen.',
+    'reset' => 'Din adgangskode er nulstillet!',
+    'sent' => 'Vi har sendt dig en e-mail med et link til nulstilling af adgangskode!',
+    'token' => 'Dit token er ikke gyldigt!',
+    'user' => 'Vi kan ikke finde en bruger med den e-mail-adresse.',
+
+];

resources/lang/de/app.php

@@ -1,59 +1,60 @@
 <?php
 
-return array (
-  'settings.system' => 'System',
-  'settings.appearance' => 'Aussehen',
-  'settings.miscellaneous' => 'Sonstiges',
-  'settings.version' => 'Ausführung',
-  'settings.background_image' => 'Hintergrundbild',
-  'settings.homepage_search' => 'Homepage Suchen',
-  'settings.search_provider' => 'Suchanbieter',
-  'settings.language' => 'Sprache',
-  'settings.reset' => 'Zurücksetzen auf Standard zurück',
-  'settings.remove' => 'Entfernen',
-  'settings.search' => 'suche',
-  'settings.no_items' => 'Keine Elemente gefunden',
-  'settings.label' => 'Etikett',
-  'settings.value' => 'Wert',
-  'settings.edit' => 'Bearbeiten',
-  'settings.view' => 'Ansicht',
-  'options.none' => '- nicht festgelegt -',
-  'options.google' => 'Google',
-  'options.ddg' => 'DuckDuckGo',
-  'options.bing' => 'Bing',
-  'options.qwant' => 'Qwant',
-  'options.yes' => 'Ja',
-  'options.no' => 'Nein',
-  'buttons.save' => 'Speichern',
-  'buttons.cancel' => 'Abbrechen',
-  'buttons.add' => 'Hinzufügen',
-  'buttons.upload' => 'Hochladen einer Datei',
-  'dash.pin_item' => 'Element auf dem Dashboard anheften',
-  'dash.no_apps' => 'Derzeit gibt es keine angeheftete Anwendungen :link1 oder :link2',
-  'dash.link1' => 'Hinzufügen einer Anwendung hier',
-  'dash.link2' => 'Heften Sie ein Element auf dem Armaturenbrett',
-  'dash.pinned_items' => 'Angeheftete Elemente',
-  'apps.app_list' => 'Anwendungsliste',
-  'apps.view_trash' => 'Ansicht Papierkorb',
-  'apps.add_application' => 'Anwendung hinzufügen',
-  'apps.application_name' => 'Anwendungsname',
-  'apps.colour' => 'Farbe',
-  'apps.icon' => 'Symbol',
-  'apps.pinned' => 'Festgesteckt',
-  'apps.title' => 'Titel',
-  'apps.hex' => 'Hex-Farbe',
-  'apps.username' => 'Benutzername',
-  'apps.password' => 'Passwort',
-  'apps.config' => 'Konfig',
-  'url' => 'Url',
-  'title' => 'Titel',
-  'delete' => 'Löschen',
-  'optional' => 'Wahlweise',
-  'restore' => 'Wiederherstellen',
-  'alert.success.item_created' => 'Element erfolgreich erstellt',
-  'alert.success.item_updated' => 'Artikel erfolgreich aktualisiert',
-  'alert.success.item_deleted' => 'Element erfolgreich gelöscht',
-  'alert.success.item_restored' => 'Element erfolgreich wiederhergestellt',
-  'alert.success.setting_updated' => 'Sie haben diese Einstellung erfolgreich bearbeitet',
-  'alert.error.not_exist' => 'Diese Einstellung existiert nicht.',
-);
+return [
+    'settings.system' => 'System',
+    'settings.appearance' => 'Aussehen',
+    'settings.miscellaneous' => 'Sonstiges',
+    'settings.version' => 'Version',
+    'settings.background_image' => 'Hintergrundbild',
+    'settings.homepage_search' => 'Startseite Sucheingabe',
+    'settings.search_provider' => 'Suchanbieter',
+    'settings.language' => 'Sprache',
+    'settings.reset' => 'Zurücksetzen auf Standard',
+    'settings.remove' => 'Entfernen',
+    'settings.search' => 'suche',
+    'settings.no_items' => 'Keine Elemente gefunden',
+    'settings.label' => 'Bezeichnung',
+    'settings.value' => 'Wert',
+    'settings.edit' => 'Bearbeiten',
+    'settings.view' => 'Ansicht',
+    'options.none' => '- nicht festgelegt -',
+    'options.google' => 'Google',
+    'options.ddg' => 'DuckDuckGo',
+    'options.bing' => 'Bing',
+    'options.qwant' => 'Qwant',
+    'options.yes' => 'Ja',
+    'options.no' => 'Nein',
+    'buttons.save' => 'Speichern',
+    'buttons.cancel' => 'Abbrechen',
+    'buttons.add' => 'Hinzufügen',
+    'buttons.upload' => 'Hochladen einer Datei',
+    'dash.pin_item' => 'Element auf dem Dashboard anheften',
+    'dash.no_apps' => 'Derzeit gibt es keine angeheftete Anwendungen. :link1 oder :link2',
+    'dash.link1' => 'Anwendung neu hinzufügen',
+    'dash.link2' => 'anheften',
+    'dash.pinned_items' => 'Angeheftete Elemente',
+    'apps.app_list' => 'Anwendungsliste',
+    'apps.view_trash' => 'Ansicht Papierkorb',
+    'apps.add_application' => 'Anwendung hinzufügen',
+    'apps.application_name' => 'Anwendungsname',
+    'apps.colour' => 'Farbe',
+    'apps.icon' => 'Symbol',
+    'apps.pinned' => 'Angeheftet',
+    'apps.title' => 'Titel',
+    'apps.hex' => 'Hex-Farbe',
+    'apps.username' => 'Benutzername',
+    'apps.password' => 'Passwort',
+    'apps.config' => 'Konfiguration',
+    'apps.only_admin_account' => 'Nur mit Admin-Konto!',
+    'url' => 'URL',
+    'title' => 'Titel',
+    'delete' => 'Löschen',
+    'optional' => 'Optional',
+    'restore' => 'Wiederherstellen',
+    'alert.success.item_created' => 'Element erfolgreich erstellt',
+    'alert.success.item_updated' => 'Element erfolgreich aktualisiert',
+    'alert.success.item_deleted' => 'Element erfolgreich gelöscht',
+    'alert.success.item_restored' => 'Element erfolgreich wiederhergestellt',
+    'alert.success.setting_updated' => 'Die Einstellungen wurden übernommen',
+    'alert.error.not_exist' => 'Diese Einstellung existiert nicht.',
+];

resources/lang/el/app.php

@@ -0,0 +1,118 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | App Language Lines
+    |--------------------------------------------------------------------------
+    |
+    */
+
+    'settings.system' => 'Σύστημα',
+    'settings.appearance' => 'Εμφάνιση',
+    'settings.miscellaneous' => 'Λοιπά',
+    'settings.support' => 'Υποστήριξη',
+    'settings.donate' => 'Δωρεά',
+
+    'settings.version' => 'Έκδοση',
+    'settings.background_image' => 'Εικόνα Παρασκηνίου',
+    'settings.window_target' => 'Ο Σύνδεσμος ανοίγει σε',
+    'settings.window_target.current' => 'Άνοιγμα σε αυτή την καρτέλα',
+    'settings.window_target.one' => 'Άνοιγμα στην ίδια καρτέλα',
+    'settings.window_target.new' => 'Άνοιγμα σε νέα καρτέλα',
+    'settings.homepage_search' => 'Αναζήτηση στην Αρχική Σελίδα',
+    'settings.search_provider' => 'Προεπιλεγμένος Πάροχος Αναζήτησης',
+    'settings.language' => 'Γλώσσα',
+    'settings.reset' => 'Επαναφορά πίσω στις προεπιλογές',
+    'settings.remove' => 'Αφαίρεση',
+    'settings.search' => 'αναζήτηση',
+    'settings.no_items' => 'Δε βρεθηκαν αποτελέσματα',
+
+    'settings.label' => 'Ετικέτα',
+    'settings.value' => 'Τιμή',
+    'settings.edit' => 'Επεξεργασία',
+    'settings.view' => 'Προβολή',
+
+    'options.none' => '- μη ορισμένο -',
+    'options.google' => 'Google',
+    'options.ddg' => 'DuckDuckGo',
+    'options.bing' => 'Bing',
+    'options.qwant' => 'Qwant',
+    'options.startpage' => 'StartPage',
+    'options.yes' => 'Ναι',
+    'options.no' => 'Όχι',
+    'options.nzbhydra' => 'NZBHydra',
+    'options.jackett' => 'Jackett',
+
+    'buttons.save' => 'Αποθήκευση',
+    'buttons.cancel' => 'Ακύρωση',
+    'buttons.add' => 'Προσθήκη',
+    'buttons.upload' => 'Μεταφόρτωση ενός αρχείου',
+    'buttons.downloadapps' => 'Ανανέωση Λίστας Εφαρμογών',
+
+    'dash.pin_item' => 'Καρφίτσωμα του αντικειμένου στο ταμπλό',
+    'dash.no_apps' => 'Δεν υπάρχουν προς το παρόν καρφιτσωμένες εφαρμογές, :link1 ή :link2',
+    'dash.link1' => 'Προσθήκη μίας εφαρμογής εδώ',
+    'dash.link2' => 'Καρφίτσωμα ενός αντικειμένου στο ταμπλό',
+    'dash.pinned_items' => 'Καρφιτσωμένα αντικείμενα',
+
+    'apps.app_list' => 'Λίστα Εφαρμογών',
+    'apps.view_trash' => 'Εμφάνιση Απορριμμάτων',
+    'apps.add_application' => 'Προσθήκη εφαρμογής',
+    'apps.application_name' => 'Όνομα Εφαρμογής',
+    'apps.colour' => 'Χρώμα',
+    'apps.icon' => 'Εικονίδιο',
+    'apps.pinned' => 'Καρφιτσωμένο',
+    'apps.title' => 'Τίτλος',
+    'apps.hex' => 'Hex χρώμα',
+    'apps.username' => 'Όνομα χρήστη',
+    'apps.password' => 'Κωδικός πρόσβασης',
+    'apps.config' => 'Ρύθμιση',
+    'apps.apikey' => 'Κλειδί API',
+    'apps.enable' => 'Ενεργοποίηση',
+    'apps.tag_list' => 'Λίστα Ετικετών',
+    'apps.add_tag' => 'Προσθήκη ετικέτας',
+    'apps.tag_name' => 'Όνομα Ετικέτας',
+    'apps.tags' => 'Ετικέτες',
+    'apps.override' => 'Αν διαφορετικό με το κύριο url',
+    'apps.preview' => 'Προεπισκόπιση',
+    'apps.apptype' => 'Τύπος Εφαρμογής',
+
+    'dashboard' => 'Αρχικό ταμπλό',
+
+    'user.user_list' => 'Χρήστες',
+    'user.add_user' => 'Προσθήκη χρήστη',
+    'user.username' => 'Όνομα χρήστη',
+    'user.avatar' => 'Εικόνα χρήστη',
+    'user.email' => 'Email',
+    'user.password_confirm' => 'Επιβεβαίωση κωδικού πρόσβασης',
+    'user.secure_front' => 'Χορήγηση δημόσιας πρόσβασης στο εμπρόσθιο τμήμα - Τίθεται σε ενέργεια μόνο εαν έχει ορισθεί κωδικός.',
+    'user.autologin' => 'Χορήγηση πρόσβασης από ένα συγκεκριμένο URL. Οποιοσδήποτε με τον σύνδεσμο μπορεί να εισέρθει.',
+
+    'url' => 'URL',
+    'title' => 'Τίτλος',
+    'delete' => 'Διαγραφή',
+    'optional' => 'Προεραιτικό',
+    'restore' => 'Επαναφορά',
+
+    'alert.success.item_created' => 'Το αντικείμενο δημιουργήθηκε επιτυχώς',
+    'alert.success.item_updated' => 'Το αντικείμενο ενημερώθηκε επιτυχώς',
+    'alert.success.item_deleted' => 'Το αντικείμενο διαγράφηκε επιτυχώς',
+    'alert.success.item_restored' => 'Το αντικείμενο επαναφέρθηκε επιτυχώς',
+    'alert.success.updating' => 'Η λίστα των εφαρμογών ενημερώνεται',
+
+    'alert.success.tag_created' => 'Η ετικέτα δημιουργήθηκε επιτυχώ',
+    'alert.success.tag_updated' => 'Η ετικέτα ενημερώθηκε επιτυχώς',
+    'alert.success.tag_deleted' => 'Η ετικέτα διαγράφηκε επιτυχώς',
+    'alert.success.tag_restored' => 'Η ετικέτα επαναφέρθηκε επιτυχώς',
+
+    'alert.success.setting_updated' => 'Επεξεργαστήκατε επιτυχώς αυτή τη ρύθμιση',
+    'alert.error.not_exist' => 'Αυτή η ρύθμιση δεν υπάρχει.',
+
+    'alert.success.user_created' => 'Ο χρήστης δημιουργήθηκε επιτυχώς',
+    'alert.success.user_updated' => 'Ο χρήστης ενημερώθηκε επιτυχώς',
+    'alert.success.user_deleted' => 'Ο χρήστης διαγράφηκε επιτυχώς',
+    'alert.success.user_restored' => 'Ο χρήστης επαναφέρθηκε επιτυχώς',
+
+];

resources/lang/el/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' => 'Αυτά τα διαπιστευτήρια δεν ταιριάζουν με τα μητρώα μας.',
+    'throttle' => 'Πολλές προσπάθειες εισόδου. Παρακαλούμε προσπαθήστε ξανά σε :seconds δευτερόλεπτα.',
+
+];

resources/lang/el/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; Προηγούμενη',
+    'next' => 'Επόμενη &raquo;',
+
+];

resources/lang/el/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' => 'Οι κωδικοί πρόσβασης πρέπει να αποτελλούνται τουλάχιστον από έξι χαρακτήρες και να ταιριάζουν με την επικύρωση.',
+    'reset' => 'Έχει γίνει επαναφορά του κωδικού σας!',
+    'sent' => 'Σας στείλαμε ένα Ε-mail με τον σύνδεσμο για την επαναφορά του κωδικού πρόσβασής σας!',
+    'token' => 'Αυτό το token για την επαναφορά του κωδικού πρόσβασής σας είναι άκυρο.',
+    'user' => 'Δεν μπορούμε να βρόυμε κάποιον χρήστη με αυτή τη διεύθυνση E-mail.',
+
+];

resources/lang/el/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'             => 'Το πεδίο :attribute πρέπει να έχει γίνει αποδεκτό.',
+    'active_url'           => 'Το πεδίο :attribute δέν είναι μία έγκυρη διεύθυνση URL.',
+    'after'                => 'Το πεδίο :attribute πρέπει να είναι μία ημερομηνία μετά από :date.',
+    'after_or_equal'       => 'Το πεδίο :attribute πρέπει να είναι μία ημερομηνία μετά από :date ή ίδια με :date.',
+    'alpha'                => 'Το πεδίο :attribute μπορεί να περιέχει μόνο γράμματαμπορεί να περιέχει μόνο γράμματα.',
+    'alpha_dash'           => 'Το πεδίο :attribute μπορεί να περιέχει μόνο γράμματα, αριθμούς, και παύλες.',
+    'alpha_num'            => 'Το πεδίο :attribute μπορεί να περιέχει μόνο γράμματα και αριθμούς.',
+    'array'                => 'Το πεδίο :attribute πρέπει να είναι ένας πίνακας.',
+    'before'               => 'Το πεδίο :attribute πρέπει να είναι μία ημερομηνία πρίν από :date.',
+    'before_or_equal'      => 'Το πεδίο :attribute πρέπει να είναι μία ημερομηνία πρίν από :date ή ίση με :date.',
+    'between'              => [
+        'numeric' => 'Το πεδίο :attribute πρέπει να είναι μεταξύ από :min και :max.',
+        'file'    => 'Το πεδίο :attribute πρέπει να είναι μεταξύ από :min και :max kilobytes.',
+        'string'  => 'Το πεδίο :attribute πρέπει να είναι μεταξύ από :min και :max characters.',
+        'array'   => 'Το πεδίο :attribute πρέπει να έχει μεταξύ :min και :max αντικείμενα.',
+    ],
+    'boolean'              => 'Το πεδίο :attribute πρέπει να είναι αληθές ή ψευδές.',
+    'confirmed'            => 'Η επικύρωση του πεδίου :attribute δεν ταιριάζει.',
+    'date'                 => 'Το πεδίο :attribute δεν είναι μία έγκυρη ημερομηνία.',
+    'date_format'          => 'Το πεδίο :attribute δεν ταιριάζει με τη μορφή :format.',
+    'different'            => 'Τα πεδία :attribute και :other πρέπει να είναι διαφορετικά.',
+    'digits'               => 'Το πεδίο :attribute πρέπει να είναι :digits ψηφία.',
+    'digits_between'       => 'Το πεδίο :attribute πρέπει να είναι μεταξύ από :min και :max ψηφία.',
+    'dimensions'           => 'Το πεδίο :attribute δεν έχει έγκυρες διαστάσεις εικόνας.',
+    'distinct'             => 'Το πεδίο :attribute έχει μία διπλότυπη τιμή.',
+    'email'                => 'Το πεδίο :attribute πρέπει να είναι μία έγκυρη διεύθυνση E-mail.',
+    'exists'               => 'Το επιλεγμένο πεδίο :attribute είναι άκυρο.',
+    'file'                 => 'Το πεδίο :attribute πρέπει να έιναι ένα αρχείο.',
+    'filled'               => 'Το πεδίο :attribute πρέπει να έχει μία τιμή.',
+    'image'                => 'Το πεδίο :attribute πρέπει να είναι μία εικόνα.',
+    'in'                   => 'Το πεδίο selected :attribute είναι άκυρο.',
+    'in_array'             => 'Το πεδίο :attribute δεν υπάρχει στο :other.',
+    'integer'              => 'Το πεδίο :attribute πρέπει να είναι ένας ακέραιος αριθμός.',
+    'ip'                   => 'Το πεδίο :attribute πρέπει να είναι μία έγκυρη διεύθυνση IP.',
+    'ipv4'                 => 'Το πεδίο :attribute πρέπει να είναι μία έγκυρη διεύθυνση IPv4.',
+    'ipv6'                 => 'Το πεδίο :attribute πρέπει να είναι μία έγκυρη διεύθυνση IPv6.',
+    'json'                 => 'Το πεδίο :attribute πρέπει να είναι ένα έγκυρο JSON string.',
+    'max'                  => [
+        'numeric' => 'Το πεδίο :attribute δεν γίνεται να είναι μεγαλύτερο από :max.',
+        'file'    => 'Το πεδίο :attribute δεν γίνεται να είναι μεγαλύτερο από :max kilobytes.',
+        'string'  => 'Το πεδίο :attribute δεν γίνεται να είναι μεγαλύτερο από :max χαρακτήρες.',
+        'array'   => 'Το πεδίο :attribute δεν γίνεται να έχει περισσότερα από :max αντικείμενα.',
+    ],
+    'mimes'                => 'Το πεδίο :attribute πρέπει να είναι ένα αρχείου τύπου: :values.',
+    'mimetypes'            => 'Το πεδίο :attribute πρέπει να είναι ένα αρχείου τύπου: :values.',
+    'min'                  => [
+        'numeric' => 'Το πεδίο :attribute πρέπει να είναι τουλάχιστον :min.',
+        'file'    => 'Το πεδίο :attribute πρέπει να είναι τουλάχιστον :min kilobytes.',
+        'string'  => 'Το πεδίο :attribute πρέπει να είναι τουλάχιστον :min χαρακτήρες.',
+        'array'   => 'Το πεδίο :attribute πρέπει να έχει τουλάχιστον :min αντικείμενα.',
+    ],
+    'not_in'               => 'Το επιλεγμένο πεδίο :attribute είναι άκυρο.',
+    'numeric'              => 'Το πεδίο :attribute πρέπει να ένας αριθμός.',
+    'present'              => 'Το πεδίο :attribute πρέπει να είναι παρόν.',
+    'regex'                => 'Η μορφή του πεδίου :attribute είναι άκυρη.',
+    'required'             => 'Το πεδίο :attribute είναι απαιτούμενο.',
+    'required_if'          => 'Το πεδίο :attribute είναι απαιτούμενο εάν :other είναι :value.',
+    'required_unless'      => 'Το πεδίο :attribute είναι απαιτούμενο εκτός αν :other βρίσκεται στις τιμές :values.',
+    'required_with'        => 'Το πεδίο :attribute είναι απαιτούμενο εάν οι τιμές :values είναι παρούσες.',
+    'required_with_all'    => 'Το πεδίο :attribute είναι απαιτούμενο εάν οι τιμές :values είναι παρούσες.',
+    'required_without'     => 'Το πεδίο :attribute είναι απαιτούμενο εάν οι τιμές :values δεν είναι παρούσες.',
+    'required_without_all' => 'Το πεδίο :attribute είναι απαιτούμενο εάν καμία από τις τιμές :values δεν είναι παρούσες.',
+    'same'                 => 'Το πεδίο :attribute και :other πρέπει να είναι ίδια.',
+    'size'                 => [
+        'numeric' => 'Το πεδίο :attribute πρέπει να είναι :size.',
+        'file'    => 'Το πεδίο :attribute πρέπει να είναι :size kilobytes.',
+        'string'  => 'Το πεδίο :attribute πρέπει να είναι :size χαρακτήρες.',
+        'array'   => 'Το πεδίο :attribute πρέπει να περιέχει :size αντικείμενα.',
+    ],
+    'string'               => 'Το πεδίο :attribute πρέπει να είναι ένα string.',
+    'timezone'             => 'Το πεδίο :attribute πρέπει να είναι μία έγκυρη ζώνη ώρας.',
+    'unique'               => 'Το πεδίο :attribute έχει ήδη χρησιμοποιηθεί.',
+    'uploaded'             => 'Το πεδίο :attribute απέτυχε να μεταφορτωθεί.',
+    'url'                  => 'Η μορφή του πεδίου :attribute είναι άκυρη.',
+
+    /*
+    |--------------------------------------------------------------------------
+    | 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/lang/en/app.php

@@ -12,6 +12,8 @@ return [
     'settings.system' => 'System',
     'settings.appearance' => 'Appearance',
     'settings.miscellaneous' => 'Miscellaneous',
+    'settings.advanced' => 'Advanced',
+
     'settings.support' => 'Support',
     'settings.donate' => 'Donate',
 
@@ -29,12 +31,14 @@ return [
     'settings.search' => 'search',
     'settings.no_items' => 'No items found',
 
-
     'settings.label' => 'Label',
     'settings.value' => 'Value',
     'settings.edit' => 'Edit',
     'settings.view' => 'View',
 
+    'settings.custom_css' => 'Custom CSS',
+    'settings.custom_js' => 'Custom JavaScript',
+
     'options.none' => '- not set -',
     'options.google' => 'Google',
     'options.ddg' => 'DuckDuckGo',
@@ -44,11 +48,12 @@ return [
     'options.yes' => 'Yes',
     'options.no' => 'No',
     'options.nzbhydra' => 'NZBHydra',
+    'options.jackett' => 'Jackett',
 
     'buttons.save' => 'Save',
     'buttons.cancel' => 'Cancel',
     'buttons.add' => 'Add',
-    'buttons.upload' => 'Upload a file',
+    'buttons.upload' => 'Upload an icon',
     'buttons.downloadapps' => 'Update Apps List',
 
     'dash.pin_item' => 'Pin item to dashboard',
@@ -78,6 +83,11 @@ return [
     'apps.override' => 'If different to main url',
     'apps.preview' => 'Preview',
     'apps.apptype' => 'Application Type',
+    'apps.website' => 'Website',
+    'apps.description' => 'Description',
+    'apps.only_admin_account' => 'Only if you have admin-account!',
+    'apps.autologin_url' => 'Auto login url',
+    'apps.show_deleted' => 'Showing Deleted Applications',
 
     'dashboard' => 'Home dashboard',
 
@@ -115,5 +125,4 @@ return [
     'alert.success.user_deleted' => 'User deleted successfully',
     'alert.success.user_restored' => 'User restored successfully',
 
-
 ];

resources/lang/es/app.php

@@ -1,59 +1,60 @@
 <?php
 
-return array (
-  'settings.system' => 'Sistema',
-  'settings.appearance' => 'Apariencia',
-  'settings.miscellaneous' => 'Miscelánea',
-  'settings.version' => 'Versión',
-  'settings.background_image' => 'Imagen De Fondo',
-  'settings.homepage_search' => 'Página De Inicio De Búsqueda',
-  'settings.search_provider' => 'Proveedor de búsqueda',
-  'settings.language' => 'Idioma',
-  'settings.reset' => 'Restablecer a predeterminado',
-  'settings.remove' => 'Quitar',
-  'settings.search' => 'búsqueda',
-  'settings.no_items' => 'No se encontraron elementos',
-  'settings.label' => 'Etiqueta',
-  'settings.value' => 'Valor',
-  'settings.edit' => 'Editar',
-  'settings.view' => 'Ver',
-  'options.none' => '- no establecido -',
-  'options.google' => 'Google',
-  'options.ddg' => 'DuckDuckGo',
-  'options.bing' => 'Bing',
-  'options.qwant' => 'Qwant',
-  'options.yes' => 'Sí',
-  'options.no' => 'No',
-  'buttons.save' => 'Guardar',
-  'buttons.cancel' => 'Cancelar',
-  'buttons.add' => 'Añadir',
-  'buttons.upload' => 'Cargar un archivo',
-  'dash.pin_item' => 'Pin elemento al tablero',
-  'dash.no_apps' => 'Actualmente no hay anclados aplicaciones :link1 o :link2',
-  'dash.link1' => 'Agregue una aplicación aquí',
-  'dash.link2' => 'Pin de un elemento en el tablero',
-  'dash.pinned_items' => 'Elementos Anclados',
-  'apps.app_list' => 'Lista de aplicaciones',
-  'apps.view_trash' => 'Vista de la basura',
-  'apps.add_application' => 'Agregar aplicación',
-  'apps.application_name' => 'Nombre de la aplicación',
-  'apps.colour' => 'Color',
-  'apps.icon' => 'Icono',
-  'apps.pinned' => 'Fijado',
-  'apps.title' => 'Título',
-  'apps.hex' => 'Hexagonal de color',
-  'apps.username' => 'Nombre de usuario',
-  'apps.password' => 'Contraseña',
-  'apps.config' => 'Config',
-  'url' => 'Url',
-  'title' => 'Título',
-  'delete' => 'Borrar',
-  'optional' => 'Opcional',
-  'restore' => 'Restaurar',
-  'alert.success.item_created' => 'Elemento creado con éxito',
-  'alert.success.item_updated' => 'Artículo actualizado con éxito',
-  'alert.success.item_deleted' => 'Elemento eliminado correctamente',
-  'alert.success.item_restored' => 'Elemento restaurado con éxito',
-  'alert.success.setting_updated' => 'Ha editado con éxito esta configuración',
-  'alert.error.not_exist' => 'Esta configuración no existe.',
-);
+return [
+    'settings.system' => 'Sistema',
+    'settings.appearance' => 'Apariencia',
+    'settings.miscellaneous' => 'Miscelánea',
+    'settings.version' => 'Versión',
+    'settings.background_image' => 'Imagen De Fondo',
+    'settings.homepage_search' => 'Página De Inicio De Búsqueda',
+    'settings.search_provider' => 'Proveedor de búsqueda',
+    'settings.language' => 'Idioma',
+    'settings.reset' => 'Restablecer a predeterminado',
+    'settings.remove' => 'Quitar',
+    'settings.search' => 'búsqueda',
+    'settings.no_items' => 'No se encontraron elementos',
+    'settings.label' => 'Etiqueta',
+    'settings.value' => 'Valor',
+    'settings.edit' => 'Editar',
+    'settings.view' => 'Ver',
+    'options.none' => '- no establecido -',
+    'options.google' => 'Google',
+    'options.ddg' => 'DuckDuckGo',
+    'options.bing' => 'Bing',
+    'options.qwant' => 'Qwant',
+    'options.jackett' => 'Jackett',
+    'options.yes' => 'Sí',
+    'options.no' => 'No',
+    'buttons.save' => 'Guardar',
+    'buttons.cancel' => 'Cancelar',
+    'buttons.add' => 'Añadir',
+    'buttons.upload' => 'Cargar un archivo',
+    'dash.pin_item' => 'Pin elemento al tablero',
+    'dash.no_apps' => 'Actualmente no hay aplicaciones ancladas, :link1 o :link2',
+    'dash.link1' => 'Agregue una aplicación aquí',
+    'dash.link2' => 'Pin de un elemento en el tablero',
+    'dash.pinned_items' => 'Elementos Anclados',
+    'apps.app_list' => 'Lista de aplicaciones',
+    'apps.view_trash' => 'Vista de la papelera de reciclaje',
+    'apps.add_application' => 'Agregar aplicación',
+    'apps.application_name' => 'Nombre de la aplicación',
+    'apps.colour' => 'Color',
+    'apps.icon' => 'Icono',
+    'apps.pinned' => 'Fijado',
+    'apps.title' => 'Título',
+    'apps.hex' => 'Código de color hexadecimal',
+    'apps.username' => 'Nombre de usuario',
+    'apps.password' => 'Contraseña',
+    'apps.config' => 'Config',
+    'url' => 'Url',
+    'title' => 'Título',
+    'delete' => 'Borrar',
+    'optional' => 'Opcional',
+    'restore' => 'Restaurar',
+    'alert.success.item_created' => 'Elemento creado con éxito',
+    'alert.success.item_updated' => 'Artículo actualizado con éxito',
+    'alert.success.item_deleted' => 'Elemento eliminado correctamente',
+    'alert.success.item_restored' => 'Elemento restaurado con éxito',
+    'alert.success.setting_updated' => 'Ha editado con éxito esta configuración',
+    'alert.error.not_exist' => 'Esta configuración no existe.',
+];

resources/lang/fi/app.php

@@ -1,115 +1,104 @@
 <?php
 
-return array (
-  'settings.system' => 'Järjestelmä',
-  'settings.appearance' => 'Ulkonäkö',
-  'settings.miscellaneous' => 'Sekalainen',
-  'settings.support' => 'Tue',
-  'settings.donate' => 'Lahjoita',
+return [
+    'settings.system' => 'Järjestelmä',
+    'settings.appearance' => 'Ulkonäkö',
+    'settings.miscellaneous' => 'Sekalainen',
+    'settings.support' => 'Tue',
+    'settings.donate' => 'Lahjoita',
 
-  'settings.version' => 'Versio',
-  'settings.background_image' => 'Taustakuva',
-  'settings.window_target' => 'Linkit aukeaa',
-  'settings.window_target.current' => 'Avaa tässä välilehdessä',
-  'settings.window_target.one' => 'Avaa samassa välilehdessä',
-  'settings.window_target.new' => 'Avaa uudessa välilehdessä',
-  'settings.homepage_search' => 'Kotisivu Haku',
-  'settings.search_provider' => 'Hakupalvelu',
-  'settings.language' => 'Kieli',
-  'settings.reset' => 'Palauta oletusasetukset',
-  'settings.remove' => 'Poista',
-  'settings.search' => 'haku',
-  'settings.no_items' => 'Kohteita ei löytynyt',
+    'settings.version' => 'Versio',
+    'settings.background_image' => 'Taustakuva',
+    'settings.window_target' => 'Linkit aukeaa',
+    'settings.window_target.current' => 'Avaa tässä välilehdessä',
+    'settings.window_target.one' => 'Avaa samassa välilehdessä',
+    'settings.window_target.new' => 'Avaa uudessa välilehdessä',
+    'settings.homepage_search' => 'Kotisivu Haku',
+    'settings.search_provider' => 'Hakupalvelu',
+    'settings.language' => 'Kieli',
+    'settings.reset' => 'Palauta oletusasetukset',
+    'settings.remove' => 'Poista',
+    'settings.search' => 'haku',
+    'settings.no_items' => 'Kohteita ei löytynyt',
 
+    'settings.label' => 'Etiketti',
+    'settings.value' => 'Arvo',
+    'settings.edit' => 'Muokkaa',
+    'settings.view' => 'Näkymä',
 
-  'settings.label' => 'Etiketti',
-  'settings.value' => 'Arvo',
-  'settings.edit' => 'Muokkaa',
-  'settings.view' => 'Näkymä',
+    'options.none' => '- ei asetettu -',
+    'options.google' => 'Google',
+    'options.ddg' => 'DuckDuckGo',
+    'options.bing' => 'Bing',
+    'options.qwant' => 'Qwant',
+    'options.startpage' => 'Etusivu',
+    'options.yes' => 'Kyllä',
+    'options.no' => 'Ei',
 
+    'buttons.save' => 'Tallenna',
+    'buttons.cancel' => 'Peruuta',
+    'buttons.add' => 'Lisää',
+    'buttons.upload' => 'Lataa tiedosto',
+    'buttons.downloadapps' => 'Päivitä sovelluslistaa',
 
-  'options.none' => '- ei asetettu -',
-  'options.google' => 'Google',
-  'options.ddg' => 'DuckDuckGo',
-  'options.bing' => 'Bing',
-  'options.qwant' => 'Qwant',
-  'options.startpage' => 'Etusivu',
-  'options.yes' => 'Kyllä',
-  'options.no' => 'Ei',
+    'dash.pin_item' => 'Kiinnitä kohde hallintapaneliin',
+    'dash.no_apps' => 'Tällä hetkellä ei ole kiinnitettyjä sovelluksia :link1 tai :link2',
+    'dash.link1' => 'Lisää sovellus tähän',
+    'dash.link2' => 'Kiinnitä kohde hallintapaneliin',
+    'dash.pinned_items' => 'Kiinnitetyt Kohteet',
 
+    'apps.app_list' => 'Sovellusluettelo',
+    'apps.view_trash' => 'Näytä roskakori',
+    'apps.add_application' => 'Lisää sovellus',
+    'apps.application_name' => 'Sovelluksen nimi',
+    'apps.colour' => 'Väri',
+    'apps.icon' => 'Kuvake',
+    'apps.pinned' => 'Kiinnitetty',
+    'apps.title' => 'Otsikko',
+    'apps.hex' => 'Hex väri',
+    'apps.username' => 'Käyttäjätunnus',
+    'apps.password' => 'Salasana',
+    'apps.config' => 'Konfiguraatio',
+    'apps.apikey' => 'API Avain',
+    'apps.enable' => 'Aktivoi',
+    'apps.tag_list' => 'Tagi lista',
+    'apps.add_tag' => 'Lisää tagi',
+    'apps.tag_name' => 'Tagin nimi',
+    'apps.tags' => 'Tagit',
+    'apps.override' => 'Jos eri kuin pää-osoite',
+    'apps.preview' => 'Esikatsele',
 
-  'buttons.save' => 'Tallenna',
-  'buttons.cancel' => 'Peruuta',
-  'buttons.add' => 'Lisää',
-  'buttons.upload' => 'Lataa tiedosto',
-  'buttons.downloadapps' => 'Päivitä sovelluslistaa',
+    'user.user_list' => 'Käyttäjät',
+    'user.add_user' => 'Lisää käyttäjä',
+    'user.username' => 'Käyttäjänimi',
+    'user.avatar' => 'Avatar',
+    'user.email' => 'Sähköposti',
+    'user.password_confirm' => 'Vahvista salasana',
+    'user.secure_front' => 'Salli yleinen pääsy etusivulle - Pakotetaan ainoastaan jos salasana on asetettu.',
+    'user.autologin' => 'Salli sisäänkirjautuminen tietystä URLista. Linkilläk uka tahansa pystyy kirjautua.',
 
+    'url' => 'Url',
+    'title' => 'Otsikko',
+    'delete' => 'Poistaa',
+    'optional' => 'Valinnainen',
+    'restore' => 'Palauta',
 
-  'dash.pin_item' => 'Kiinnitä kohde hallintapaneliin',
-  'dash.no_apps' => 'Tällä hetkellä ei ole kiinnitettyjä sovelluksia :link1 tai :link2',
-  'dash.link1' => 'Lisää sovellus tähän',
-  'dash.link2' => 'Kiinnitä kohde hallintapaneliin',
-  'dash.pinned_items' => 'Kiinnitetyt Kohteet',
+    'alert.success.item_created' => 'Kohde luotu onnistuneesti',
+    'alert.success.item_updated' => 'Kohde päivitetty onnistuneesti',
+    'alert.success.item_deleted' => 'Kohde poistettu onnistuneesti',
+    'alert.success.item_restored' => 'Kohde palautettu onnistuneesti',
 
+    'alert.success.tag_created' => 'Tagi luotu onnistuneesti',
+    'alert.success.tag_updated' => 'Tagi päivitetty onnistuneesti',
+    'alert.success.tag_deleted' => 'Tagi poistettu onnistuneesti',
+    'alert.success.tag_restored' => 'Tagi palautettu onnistuneesti',
+    'alert.success.updating' => 'Päivitetään sovelluslistaa',
 
-  'apps.app_list' => 'Sovellusluettelo',
-  'apps.view_trash' => 'Näytä roskakori',
-  'apps.add_application' => 'Lisää sovellus',
-  'apps.application_name' => 'Sovelluksen nimi',
-  'apps.colour' => 'Väri',
-  'apps.icon' => 'Kuvake',
-  'apps.pinned' => 'Kiinnitetty',
-  'apps.title' => 'Otsikko',
-  'apps.hex' => 'Hex väri',
-  'apps.username' => 'Käyttäjätunnus',
-  'apps.password' => 'Salasana',
-  'apps.config' => 'Konfiguraatio',
-  'apps.apikey' => 'API Avain',
-  'apps.enable' => 'Aktivoi',
-  'apps.tag_list' => 'Tagi lista',
-  'apps.add_tag' => 'Lisää tagi',
-  'apps.tag_name' => 'Tagin nimi',
-  'apps.tags' => 'Tagit',
-  'apps.override' => 'Jos eri kuin pää-osoite',
-  'apps.preview' => 'Esikatsele',
+    'alert.success.setting_updated' => 'Asetus muokattu onnistuneesti',
+    'alert.error.not_exist' => 'Tätä asetusta ei ole olemassa.',
 
-
-  'user.user_list' => 'Käyttäjät',
-  'user.add_user' => 'Lisää käyttäjä',
-  'user.username' => 'Käyttäjänimi',
-  'user.avatar' => 'Avatar',
-  'user.email' => 'Sähköposti',
-  'user.password_confirm' => 'Vahvista salasana',
-  'user.secure_front' => 'Salli yleinen pääsy etusivulle - Pakotetaan ainoastaan jos salasana on asetettu.',
-  'user.autologin' => 'Salli sisäänkirjautuminen tietystä URLista. Linkilläk uka tahansa pystyy kirjautua.',
-
-
-  'url' => 'Url',
-  'title' => 'Otsikko',
-  'delete' => 'Poistaa',
-  'optional' => 'Valinnainen',
-  'restore' => 'Palauta',
-
-
-  'alert.success.item_created' => 'Kohde luotu onnistuneesti',
-  'alert.success.item_updated' => 'Kohde päivitetty onnistuneesti',
-  'alert.success.item_deleted' => 'Kohde poistettu onnistuneesti',
-  'alert.success.item_restored' => 'Kohde palautettu onnistuneesti',
-
-
-  'alert.success.tag_created' => 'Tagi luotu onnistuneesti',
-  'alert.success.tag_updated' => 'Tagi päivitetty onnistuneesti',
-  'alert.success.tag_deleted' => 'Tagi poistettu onnistuneesti',
-  'alert.success.tag_restored' => 'Tagi palautettu onnistuneesti',
-  'alert.success.updating' => 'Päivitetään sovelluslistaa',
-
-
-  'alert.success.setting_updated' => 'Asetus muokattu onnistuneesti',
-  'alert.error.not_exist' => 'Tätä asetusta ei ole olemassa.',
-
-
-  'alert.success.user_created' => 'Käyttäjä luotu onnistuneesti',
-  'alert.success.user_updated' => 'Käyttäjä päivitetty onnistuneesti',
-  'alert.success.user_deleted' => 'Käyttäjä poistettu onnistuneesti',
-  'alert.success.user_restored' => 'Käyttäjä palautettu onnistuneesti',
-);
+    'alert.success.user_created' => 'Käyttäjä luotu onnistuneesti',
+    'alert.success.user_updated' => 'Käyttäjä päivitetty onnistuneesti',
+    'alert.success.user_deleted' => 'Käyttäjä poistettu onnistuneesti',
+    'alert.success.user_restored' => 'Käyttäjä palautettu onnistuneesti',
+];

resources/lang/fr/app.php

@@ -1,92 +1,114 @@
 <?php
 
-return array (
-  'settings.system' => 'Système',
-  'settings.appearance' => 'Apparence',
-  'settings.miscellaneous' => 'Divers',
-  'settings.support' => 'Support',
-  'settings.donate' => 'Contribuer',
-  
-  'settings.version' => 'Version',
-  'settings.background_image' => 'Image d\'arrière-plan',
-  'settings.window_target' => 'Ouverture des liens',
-  'settings.window_target.current' => 'Dans l\'onglet courant',
-  'settings.window_target.one' => 'Dans le même nouvel onglet',
-  'settings.window_target.new' => 'Dans un nouvel onglet',
-  'settings.homepage_search' => 'Barre de recherche',
-  'settings.search_provider' => 'Moteur de recherche',
-  'settings.language' => 'Langue',
-  'settings.reset' => 'Réinitialiser les valeurs par défaut',
-  'settings.remove' => 'Supprimer',
-  'settings.search' => 'Chercher',
-  'settings.no_items' => 'Aucun élement trouvé',
-  
-  'settings.label' => 'Étiquette',
-  'settings.value' => 'Valeur',
-  'settings.edit' => 'Modifier',
-  'settings.view' => 'Vue',
-  
-  'options.none' => '- non défini -',
-  'options.google' => 'Google',
-  'options.ddg' => 'DuckDuckGo',
-  'options.bing' => 'Bing',
-  'options.qwant' => 'Qwant',
-  'options.startpage' => 'Page d\'accueil',
-  'options.yes' => 'Oui',
-  'options.no' => 'Non',
-  
-  'buttons.save' => 'Enregistrer',
-  'buttons.cancel' => 'Annuler',
-  'buttons.add' => 'Ajouter',
-  'buttons.upload' => 'Choisir un fichier',
-  
-  'dash.pin_item' => 'Épingler l\'application au tableau de bord',
-  'dash.no_apps' => 'Il n\'existe actuellement aucune application épinglée :link1 ou :link2',
-  'dash.link1' => 'Ajouter une application',
-  'dash.link2' => 'Épingler une application au tableau de bord',
-  'dash.pinned_items' => 'Applications épinglées',
-  
-  'apps.app_list' => 'Liste des applications',
-  'apps.view_trash' => 'Voir la corbeille',
-  'apps.add_application' => 'Ajouter une application',
-  'apps.application_name' => 'Nom de l\'application',
-  'apps.colour' => 'Couleur',
-  'apps.icon' => 'Icône',
-  'apps.pinned' => 'Épinglée',
-  'apps.title' => 'Titre',
-  'apps.hex' => 'Hexadécimal de la couleur',
-  'apps.username' => 'Nom d\'utilisateur',
-  'apps.password' => 'Mot de passe',
-  'apps.config' => 'Config',
-  'apps.enable' => 'Actif',
-  'apps.tag_list' => 'Liste des labels',
-  'apps.add_tag' => 'Ajouter un label',
-  'apps.tag_name' => 'Nom du label',
-  'apps.tags' => 'Labels',
-  'apps.override' => 'Si différent de l\'url actuelle',
-  
-  'url' => 'Url',
-  'title' => 'Titre',
-  'delete' => 'Effacer',
-  'optional' => 'Optionnel',
-  'restore' => 'Restaurer',
-  
-  'alert.success.item_created' => 'Application créée avec succès',
-  'alert.success.item_updated' => 'Application mise à jour avec succès',
-  'alert.success.item_deleted' => 'Application supprimée avec succès',
-  'alert.success.item_restored' => 'Application restaurée avec succès',
-  
-  'alert.success.tag_created' => 'Label crée avec succès',
-  'alert.success.tag_updated' => 'Label mis à jour avec succès',
-  'alert.success.tag_deleted' => 'Label supprimé avec succès',
-  'alert.success.tag_restored' => 'Label restauré avec succès',
-  
-  'alert.success.setting_updated' => 'Paramètre mis à jour avec succès',
-  'alert.error.not_exist' => 'Ce paramètre n\'existe pas.',
-  
-  'alert.success.user_created' => 'Utilisateur crée avec succès',
-  'alert.success.user_updated' => 'Utilisateur mis à jour avec succès',
-  'alert.success.user_deleted' => 'Utilisateur supprimé avec succès',
-  'alert.success.user_restored' => 'Utilisateur restoré avec succès',
-  
-);
+return [
+    'settings.system' => 'Système',
+    'settings.appearance' => 'Apparence',
+    'settings.miscellaneous' => 'Divers',
+    'settings.support' => 'Support',
+    'settings.donate' => 'Contribuer',
+    'settings.advanced' => 'Options avancées',
+
+    'settings.version' => 'Version',
+    'settings.background_image' => 'Image d\'arrière-plan',
+    'settings.window_target' => 'Ouverture des liens',
+    'settings.window_target.current' => 'Dans l\'onglet courant',
+    'settings.window_target.one' => 'Dans le même nouvel onglet',
+    'settings.window_target.new' => 'Dans un nouvel onglet',
+    'settings.homepage_search' => 'Barre de recherche',
+    'settings.search_provider' => 'Moteur de recherche',
+    'settings.language' => 'Langue',
+    'settings.reset' => 'Réinitialiser les valeurs par défaut',
+    'settings.remove' => 'Supprimer',
+    'settings.search' => 'Chercher',
+    'settings.no_items' => 'Aucun élement trouvé',
+
+    'settings.label' => 'Étiquette',
+    'settings.value' => 'Valeur',
+    'settings.edit' => 'Modifier',
+    'settings.view' => 'Vue',
+
+    'options.none' => '- non défini -',
+    'options.google' => 'Google',
+    'options.ddg' => 'DuckDuckGo',
+    'options.bing' => 'Bing',
+    'options.qwant' => 'Qwant',
+    'options.startpage' => 'Page d\'accueil',
+    'options.yes' => 'Oui',
+    'options.no' => 'Non',
+    'options.nzbhydra' => 'NZBHydra',
+    'options.jackett' => 'Jackett',
+
+    'buttons.save' => 'Enregistrer',
+    'buttons.cancel' => 'Annuler',
+    'buttons.add' => 'Ajouter',
+    'buttons.upload' => 'Choisir un fichier',
+    'buttons.downloadapps' => 'Mettre à jour la liste',
+
+    'dash.pin_item' => 'Épingler l\'application au tableau de bord',
+    'dash.no_apps' => 'Il n\'existe actuellement aucune application épinglée :link1 ou :link2',
+    'dash.link1' => 'Ajouter une application',
+    'dash.link2' => 'Épingler une application au tableau de bord',
+    'dash.pinned_items' => 'Applications épinglées',
+
+    'apps.app_list' => 'Liste des applications',
+    'apps.view_trash' => 'Voir la corbeille',
+    'apps.add_application' => 'Ajouter une application',
+    'apps.application_name' => 'Nom de l\'application',
+    'apps.colour' => 'Couleur',
+    'apps.icon' => 'Icône',
+    'apps.pinned' => 'Épinglée',
+    'apps.title' => 'Titre',
+    'apps.hex' => 'Hexadécimal de la couleur',
+    'apps.username' => 'Nom d\'utilisateur',
+    'apps.password' => 'Mot de passe',
+    'apps.config' => 'Config',
+    'apps.apikey' => 'Clé de l\'API',
+    'apps.enable' => 'Actif',
+    'apps.tag_list' => 'Liste des labels',
+    'apps.add_tag' => 'Ajouter un label',
+    'apps.tag_name' => 'Nom du label',
+    'apps.tags' => 'Labels',
+    'apps.override' => 'Si différent de l\'url actuelle',
+    'apps.preview' => 'Aperçu',
+    'apps.apptype' => 'Type d\'application ',
+    'apps.only_admin_account' => 'Seulement si vous avez un compte administrateur!',
+    'apps.autologin_url' => 'URL de connexion automatique',
+    'apps.show_deleted' => 'Afficher les applications supprimées',
+
+    'dashboard' => 'Tableau de bord',
+
+    'user.user_list' => 'Utilisateurs',
+    'user.add_user' => 'Ajouter un utilisateur',
+    'user.username' => 'Nom d\'utilisateur',
+    'user.avatar' => 'Avatar',
+    'user.email' => 'Email',
+    'user.password_confirm' => 'Confirmer le mot de passe',
+    'user.secure_front' => 'Autoriser l\'accès public au front - Uniquement appliqué si un mot de passe est défini.',
+    'user.autologin' => 'Autorisez la connexion à partir d\'une URL spécifique. Toute personne disposant du lien peut se connecter.',
+
+    'url' => 'Url',
+    'title' => 'Titre',
+    'delete' => 'Effacer',
+    'optional' => 'Optionnel',
+    'restore' => 'Restaurer',
+
+    'alert.success.item_created' => 'Application créée avec succès',
+    'alert.success.item_updated' => 'Application mise à jour avec succès',
+    'alert.success.item_deleted' => 'Application supprimée avec succès',
+    'alert.success.item_restored' => 'Application restaurée avec succès',
+    'alert.success.updating' => 'Liste des applications mise à jour avec succès',
+
+    'alert.success.tag_created' => 'Label crée avec succès',
+    'alert.success.tag_updated' => 'Label mis à jour avec succès',
+    'alert.success.tag_deleted' => 'Label supprimé avec succès',
+    'alert.success.tag_restored' => 'Label restauré avec succès',
+
+    'alert.success.setting_updated' => 'Paramètre mis à jour avec succès',
+    'alert.error.not_exist' => 'Ce paramètre n\'existe pas.',
+
+    'alert.success.user_created' => 'Utilisateur crée avec succès',
+    'alert.success.user_updated' => 'Utilisateur mis à jour avec succès',
+    'alert.success.user_deleted' => 'Utilisateur supprimé avec succès',
+    'alert.success.user_restored' => 'Utilisateur restoré avec succès',
+
+];

resources/lang/fr/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' => 'Ces informations d\'identification ne correspondent pas à nos enregistrements.',
+    'throttle' => 'Trop de tentatives de connexion. Veuillez réessayer dans :seconds secondes.',
+
+];

resources/lang/fr/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; précédents',
+    'next' => '&raquo; suivants',
+
+];

resources/lang/fr/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' => 'Les mots de passe doivent comporter au moins six caractères et correspondre à la confirmation.',
+    'reset' => 'Votre mot de passe a été réinitialisé!',
+    'sent' => 'Nous avons envoyé votre lien de réinitialisation de mot de passe par e-mail!',
+    'token' => 'Ce jeton de réinitialisation de mot de passe n\'est pas valide.',
+    'user' => 'Nous ne pouvons pas trouver un utilisateur avec cette adresse e-mail.',
+
+];