Merge pull request #266 from linuxserver/Multi-user

v2.0.0

.env

@@ -28,4 +28,4 @@ MAIL_ENCRYPTION=null
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
 PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
+PUSHER_APP_CLUSTER=mt1

.gitattributes

@@ -1,5 +1,49 @@
+# Configuration file for Git attributes
+
+# Core Settings {{{
+# .gitattributes
+.gitattributes !filter !diff
+
+# Line Endings
 * text=auto
+
+# Set binary to none-text files
+*.png -text
+
+# }}}
+
+
+# GitHub Linguist {{{
+
+# Exclude files/folder from being detected by the GitHub linguist
+# statistic.
+node_modules/* linguist-vendored
+public/*  linguist-generated=true
+vendor/* linguist-vendored
+
+# Remove Vue as it's currently not used in the project.
+resources/assets/js/components/ExampleComponent.vue linguist-vendored
+
+# System Wide
 *.css linguist-vendored
 *.scss linguist-vendored
 *.js linguist-vendored
+
+# Include user generated files that's removed bu the setting above.
+resources/assets/js/app.js linguist-vendored=false
+resources/assets/sass/_app.scss linguist-vendored=false
+resources/assets/sass/_rune.scss linguist-vendored=false
+resources/assets/sass/_variables.scss linguist-vendored=false
+
+# }}}
+
+
+# Archive Exlude {{{
+# Exclude files/folders from being exported when creating an archive.
+
+.gitattributes export-ignore
+.gitignore export-ignore
+.travis.yml export-ignore
 CHANGELOG.md export-ignore
+
+# }}}

.gitignore

@@ -9,4 +9,19 @@ Homestead.yaml
 npm-debug.log
 yarn-error.log
 
-storage/app/public/.DS_Store
+### macOS ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+storage/app/public/avatars/*

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Release Notes
 
+## v1.4.0 (2018-02-18)
+
+### Added
+- Tag(folder) support
+- Image preview for uploading icons
+- A load of supported apps, full list of apps https://github.com/linuxserver/Heimdall/projects/1
+
+### Changed
+- Edited vendor/laravelcollective/html/src/FormBuilder.php to allow relative links #3369de9
+- Changed links to use relative links for reverse proxy support
+- Links open in new tab
+
+### Fixed
+- adds all the fixes in the 1.3.x point releases and on master
+
 ## v1.3.0 (2018-02-09)
 
 ### Added

app/Helper.php

@@ -10,3 +10,27 @@ function format_bytes($bytes, $is_drive_size = true, $beforeunit = '', $afteruni
     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) {
+    // returns brightness value from 0 to 255
+    // strip off any leading #
+    $hex = str_replace('#', '', $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) {
+        return ' black';
+    } else {
+        return ' white';
+    }
+}

app/Http/Controllers/Auth/LoginController.php

@@ -4,6 +4,11 @@ namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use App\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Session;
+use Illuminate\Support\Facades\URL;
 
 class LoginController extends Controller
 {
@@ -25,7 +30,7 @@ class LoginController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.
@@ -34,6 +39,88 @@ class LoginController extends Controller
      */
     public function __construct()
     {
+        Session::put('backUrl', URL::previous());
         $this->middleware('guest')->except('logout');
     }
+
+    public function username()
+    {
+        return 'username';
+    }
+
+    /**
+     * Handle a login request to the application.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\Response|\Illuminate\Http\JsonResponse
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    public function login(Request $request)
+    {
+        $current_user = User::currentUser();
+        $request->merge(['username' => $current_user->username]);
+        //die(print_r($request->all()));
+        $this->validateLogin($request);
+
+        // If the class is using the ThrottlesLogins trait, we can automatically throttle
+        // the login attempts for this application. We'll key this by the username and
+        // the IP address of the client making these requests into this application.
+        if ($this->hasTooManyLoginAttempts($request)) {
+            $this->fireLockoutEvent($request);
+
+            return $this->sendLockoutResponse($request);
+        }
+
+        if ($this->attemptLogin($request)) {
+            return $this->sendLoginResponse($request);
+        }
+
+        // If the login attempt was unsuccessful we will increment the number of attempts
+        // to login and redirect the user back to the login form. Of course, when this
+        // user surpasses their maximum number of attempts they will get locked out.
+        $this->incrementLoginAttempts($request);
+
+        return $this->sendFailedLoginResponse($request);
+    }
+
+    public function index()
+    {
+    }
+
+    public function setUser(User $user)
+    {
+        Auth::logout();
+        session(['current_user' => $user]);
+        return redirect()->route('dash');
+    }
+
+    public function autologin($uuid)
+    {
+        $user = User::where('autologin', $uuid)->first();
+        Auth::login($user);
+        session(['current_user' => $user]);
+        return redirect()->route('dash');
+    }
+
+    /**
+     * Show the application's login form.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function showLoginForm()
+    {
+        return view('auth.login');
+    }
+
+    protected function authenticated(Request $request, $user)
+    {
+        return back();
+    }
+
+    public function redirectTo()
+    {
+        return Session::get('url.intended') ? Session::get('url.intended') : $this->redirectTo;
+    }
+
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -27,7 +27,7 @@ class RegisterController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -25,7 +25,7 @@ class ResetPasswordController extends Controller
      *
      * @var string
      */
-    protected $redirectTo = '/home';
+    protected $redirectTo = '/';
 
     /**
      * Create a new controller instance.

app/Http/Controllers/Controller.php

@@ -6,8 +6,27 @@ 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;
 
 class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
+
+    protected $user;
+
+    public function __construct()
+    {
+        $this->middleware(function ($request, $next) {
+            $this->user = $this->user();
+            //print_r($this->user);
+            return $next($request);
+        });
+        
+    }
+
+    public function user()
+    {
+        return User::currentUser();
+    }
 }

app/Http/Controllers/HomeController.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class HomeController extends Controller
+{
+    /**
+     * Create a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Show the application dashboard.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        return redirect()->route('dash');
+    }
+}

app/Http/Controllers/ItemController.php

@@ -5,12 +5,16 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use App\Item;
 use App\Setting;
+use App\User;
 use App\SupportedApps\Nzbget;
 use Illuminate\Support\Facades\Storage;
 
 class ItemController extends Controller
 {
-
+    public function __construct()
+    {
+        $this->middleware('allowed');
+    }
      /**
      * Display a listing of the resource on the dashboard.
      *
@@ -18,8 +22,8 @@ class ItemController extends Controller
      */
     public function dash()
     {
-        $data['apps'] = Item::pinned()->orderBy('order', 'asc')->get();
-        $data['all_apps'] = Item::all();
+        $data['apps'] = Item::doesntHave('parents')->pinned()->orderBy('order', 'asc')->get();
+        $data['all_apps'] = Item::doesntHave('parents')->get();
         return view('welcome', $data);
     }
 
@@ -49,7 +53,8 @@ class ItemController extends Controller
         $item = Item::findOrFail($id);
         $item->pinned = true;
         $item->save();
-        return redirect()->route('dash');
+        $route = route('dash', [], false);
+        return redirect($route);
     }
 
      /**
@@ -62,7 +67,8 @@ class ItemController extends Controller
         $item = Item::findOrFail($id);
         $item->pinned = false;
         $item->save();
-        return redirect()->route('dash');
+        $route = route('dash', [], false);
+        return redirect($route);
     }
 
      /**
@@ -81,8 +87,9 @@ class ItemController extends Controller
             $data['ajax'] = true;
             return view('sortable', $data);
         } else {
-            return redirect()->route('dash');           
-        }
+            $route = route('dash', [], false);
+            return redirect($route);
+            }
     }
 
    
@@ -95,8 +102,8 @@ class ItemController extends Controller
     {
         $trash = (bool)$request->input('trash');
 
-        $data['apps'] = Item::orderBy('title', 'asc')->get();
-        $data['trash'] = Item::onlyTrashed()->get();
+        $data['apps'] = Item::ofType('item')->orderBy('title', 'asc')->get();
+        $data['trash'] = Item::ofType('item')->onlyTrashed()->get();
         if($trash) {
             return view('items.trash', $data);
         } else {
@@ -113,7 +120,8 @@ class ItemController extends Controller
     public function create()
     {
         //
-        $data = [];
+        $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
+        $data['current_tags'] = [];
         return view('items.create', $data);
 
     }
@@ -129,7 +137,7 @@ class ItemController extends Controller
         //
         $validatedData = $request->validate([
             'title' => 'required|max:255',
-            'url' => 'required',
+            'url' => 'required|url',
         ]);
 
         if($request->hasFile('file')) {
@@ -140,15 +148,21 @@ class ItemController extends Controller
         }
 
         $config = Item::checkConfig($request->input('config'));
+        $current_user = User::currentUser();
         $request->merge([
-            'description' => $config
+            'description' => $config,
+            'user_id' => $current_user->id
         ]);
 
+
         //die(print_r($request->input('config')));
         
-        Item::create($request->all());
+        $item = Item::create($request->all());
 
-        return redirect()->route('dash')
+        $item->parents()->sync($request->tags);
+
+        $route = route('dash', [], false);
+        return redirect($route)
             ->with('success', __('app.alert.success.item_created'));
     }
 
@@ -172,11 +186,12 @@ class ItemController extends Controller
     public function edit($id)
     {
         // Get the item
-        $item = Item::find($id);
+        $data['item'] = Item::find($id);
+        $data['tags'] = Item::ofType('tag')->orderBy('title', 'asc')->pluck('title', 'id');
+        $data['current_tags'] = $data['item']->parents;
 
         // show the edit form and pass the nerd
-        return view('items.edit')
-            ->with('item', $item);    
+        return view('items.edit', $data);    
     }
 
     /**
@@ -190,7 +205,7 @@ class ItemController extends Controller
     {
         $validatedData = $request->validate([
             'title' => 'required|max:255',
-            'url' => 'required',
+            'url' => 'required|url',
         ]);
             //die(print_r($request->all()));
         if($request->hasFile('file')) {
@@ -201,13 +216,19 @@ class ItemController extends Controller
         }
         
         $config = Item::checkConfig($request->input('config'));
+        $current_user = User::currentUser();
         $request->merge([
-            'description' => $config
+            'description' => $config,
+            'user_id' => $current_user->id
         ]);
 
-        Item::find($id)->update($request->all());
+        $item = Item::find($id);
+        $item->update($request->all());
 
-        return redirect()->route('dash')
+        $item->parents()->sync($request->tags);
+
+        $route = route('dash', [], false);
+        return redirect($route)
             ->with('success',__('app.alert.success.item_updated'));
     }
 
@@ -228,8 +249,9 @@ class ItemController extends Controller
         } else {
             Item::find($id)->delete();
         }
-        
-        return redirect()->route('items.index')
+
+        $route = route('items.index', [], false);
+        return redirect($route)       
             ->with('success',__('app.alert.success.item_deleted'));
     }
 
@@ -244,8 +266,10 @@ class ItemController extends Controller
         //
         Item::withTrashed()
                 ->where('id', $id)
-                ->restore();        
-        return redirect()->route('items.index')
+                ->restore();      
+        
+        $route = route('items.inded', [], false);
+        return redirect($route)
             ->with('success',__('app.alert.success.item_restored'));
     }
 

app/Http/Controllers/SettingsController.php

@@ -5,10 +5,17 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use App\Setting;
 use App\SettingGroup;
+use App\User;
+use Illuminate\Support\Facades\Auth;
 use App\Http\Controllers\Controller;
 
 class SettingsController extends Controller
 {
+    public function __construct()
+    {
+        $this->middleware('allowed');
+    }
+
     /**
      * @return \Illuminate\View\View
      */
@@ -31,6 +38,7 @@ class SettingsController extends Controller
     public function edit($id)
     {
         $setting = Setting::find($id);
+        //die("s: ".$setting->label);
 
         if((bool)$setting->system === true) return abort(404);
 
@@ -39,7 +47,9 @@ class SettingsController extends Controller
                 'setting' => $setting,
             ]);
         } else {
-            return redirect()->route('settings.list')->with([
+            $route = route('settings.list', [], false);
+            return redirect($route) 
+            ->with([
                 'error' => __('app.alert.error.not_exist'),
             ]);
         }
@@ -53,6 +63,7 @@ class SettingsController extends Controller
     public function update(Request $request, $id)
     {
         $setting = Setting::find($id);
+        $user = $this->user();
 
         if (!is_null($setting)) {
             $data = Setting::getInput();
@@ -62,22 +73,25 @@ class SettingsController extends Controller
 
                 if($request->hasFile('value')) {
                     $path = $request->file('value')->store('backgrounds');
-                    $setting->value = $path;
+                    $setting_value = $path;
                 }
             
-
-
             } else {
-                $setting->value = $data->value;
+                $setting_value = $data->value;
             }
 
-            $setting->save();
-
-            return redirect()->route('settings.index')->with([
+            $user->settings()->detach($setting->id);
+            $user->settings()->save($setting, ['uservalue' => $setting_value]);
+            
+            $route = route('settings.index', [], false);
+            return redirect($route) 
+            ->with([
                 'success' => __('app.alert.success.setting_updated'),
             ]);
         } else {
-            return redirect()->route('settings.index')->with([
+            $route = route('settings.index', [], false);
+            return redirect($route) 
+            ->with([
                 'error' => __('app.alert.error.not_exist'),
             ]);
         }
@@ -89,12 +103,15 @@ class SettingsController extends Controller
      */
     public function clear($id)
     {
+        $user = $this->user();
         $setting = Setting::find($id);
         if((bool)$setting->system !== true) {
-            $setting->value = '';
-            $setting->save();
+            $user->settings()->detach($setting->id);
+            $user->settings()->save($setting, ['uservalue' => '']);
         }
-        return redirect()->route('settings.index')->with([
+        $route = route('settings.index', [], false);
+        return redirect($route) 
+        ->with([
             'success' => __('app.alert.success.setting_updated'),
         ]);
     

app/Http/Controllers/TagController.php

@@ -0,0 +1,197 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Item;
+use DB;
+
+class TagController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('allowed');
+    }
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index(Request $request)
+    {
+        $trash = (bool)$request->input('trash');
+
+        $data['apps'] = Item::ofType('tag')->orderBy('title', 'asc')->get();
+        $data['trash'] = Item::ofType('tag')->onlyTrashed()->get();
+        if($trash) {
+            return view('tags.trash', $data);
+        } else {
+            return view('tags.list', $data);
+        }
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        $data = [];
+        return view('tags.create', $data);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $validatedData = $request->validate([
+            'title' => 'required|max:255',
+        ]);
+
+        if($request->hasFile('file')) {
+            $path = $request->file('file')->store('icons');
+            $request->merge([
+                'icon' => $path
+            ]);
+        }
+
+        $slug = str_slug($request->title, '-');
+
+        // set item type to tag
+        $request->merge([
+            'type' => '1',
+            'url' => $slug
+        ]);
+        //die(print_r($request->all()));
+        Item::create($request->all());
+
+        $route = route('dash', [], false);
+        return redirect($route)
+            ->with('success', __('app.alert.success.tag_created'));
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($slug)
+    {
+        $item = Item::whereUrl($slug)->first();
+        //print_r($item);
+        $data['apps'] = $item->children()->pinned()->orderBy('order', 'asc')->get();
+        $data['all_apps'] = $item->children;
+        return view('welcome', $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);
+
+        // show the edit form and pass the nerd
+        return view('tags.edit')
+            ->with('item', $item);    
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        $validatedData = $request->validate([
+            'title' => 'required|max:255',
+        ]);
+
+        if($request->hasFile('file')) {
+            $path = $request->file('file')->store('icons');
+            $request->merge([
+                'icon' => $path
+            ]);
+        }
+
+        $slug = str_slug($request->title, '-');
+        // set item type to tag
+        $request->merge([
+            'url' => $slug
+        ]);
+
+        Item::find($id)->update($request->all());
+
+        $route = route('dash', [], false);
+        return redirect($route)
+        ->with('success',__('app.alert.success.tag_updated'));
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Request $request, $id)
+    {
+        //
+        $force = (bool)$request->input('force');
+        if($force) {
+            Item::withTrashed()
+                ->where('id', $id)
+                ->forceDelete();
+        } else {
+            Item::find($id)->delete();
+        }
+        
+        $route = route('tags.index', [], false);
+        return redirect($route)
+            ->with('success',__('app.alert.success.item_deleted'));
+    }
+
+    /**
+     * Restore the specified resource from soft deletion.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function restore($id)
+    {
+        //
+        Item::withTrashed()
+                ->where('id', $id)
+                ->restore();        
+        $route = route('tags.index', [], false);
+        return redirect($route)
+            ->with('success',__('app.alert.success.item_restored'));
+    }
+
+    public function add($tag, $item)
+    {
+        $output = 0;
+        $tag = Item::find($tag);
+        $item = Item::find($item);
+        if($tag && $item) {
+            // only add items, not cats
+            if((int)$item->type === 0) {
+                $tag->children()->attach($item);
+                return 1;
+            }
+        }
+        return $output;
+    }
+
+}

app/Http/Controllers/UserController.php

@@ -0,0 +1,175 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Controller;
+use App\User;
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Auth;
+
+class UserController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('allowed')->except(['selectUser']);
+    }
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        $data['users'] = User::all();
+        return view('users.index', $data);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        $data = [];
+        return view('users.create', $data);
+    }
+
+    public function selectUser()
+    {
+        Auth::logout();
+        $data['users'] = User::all();
+        return view('userselect', $data);
+
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        $validatedData = $request->validate([
+            'username' => 'required|max:255|unique:users',
+            'email' => 'required|email',
+            'password' => 'nullable|confirmed',
+            'password_confirmation' => 'nullable'
+
+        ]);
+        $user = new User;
+        $user->username = $request->input('username');
+        $user->email = $request->input('email');
+        $user->public_front = $request->input('public_front');
+
+        $password = $request->input('password');
+        if(!empty($password)) {
+            $user->password = bcrypt($password);
+        }
+
+        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();
+        }
+
+        $user->save();
+        
+        $route = route('dash', [], false);
+        return redirect($route)
+            ->with('success',__('app.alert.success.user_updated'));
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(User $user)
+    {
+        $data['user'] = $user;
+        return view('users.edit', $data);
+
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, User $user)
+    {
+        $validatedData = $request->validate([
+            'username' => 'required|max:255|unique:users,username,'.$user->id,
+            'email' => 'required|email',
+            'password' => 'nullable|confirmed',
+            'password_confirmation' => 'nullable'
+        ]);
+            //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)) {
+            $user->password = bcrypt($password);
+        } elseif($password == 'null') {
+            $user->password = null;
+        }
+    
+        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;
+        } else {
+            $user->autologin = null;
+        }
+
+        $user->save();
+
+        $route = route('dash', [], false);
+        return redirect($route)
+            ->with('success',__('app.alert.success.user_updated'));
+
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(User $user)
+    {
+        if($user->id !== 1) {
+            $user->delete();
+            $route = route('dash', [], false);
+            return redirect($route)
+            ->with('success',__('app.alert.success.user_deleted'));
+
+        }
+    }
+}

app/Http/Kernel.php

@@ -51,6 +51,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $routeMiddleware = [
+        'allowed' => \App\Http\Middleware\CheckAllowed::class,
         'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
         'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,

app/Http/Middleware/CheckAllowed.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\Auth;
+use App\User;
+use Illuminate\Support\Facades\Route;
+use Session;
+
+class CheckAllowed
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        $route = Route::currentRouteName();
+        $current_user = User::currentUser();
+
+        if(str_is('users*', $route)) {
+            if($current_user->id !== 1) {
+                return redirect()->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(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);
+        }
+
+        return Auth::authenticate();
+
+    }
+}

app/Http/Middleware/RedirectIfAuthenticated.php

@@ -18,7 +18,7 @@ class RedirectIfAuthenticated
     public function handle($request, Closure $next, $guard = null)
     {
         if (Auth::guard($guard)->check()) {
-            return redirect('/home');
+            return redirect()->intended();
         }
 
         return $next($request);

app/Http/Middleware/TrustProxies.php

@@ -19,11 +19,5 @@ class TrustProxies extends Middleware
      *
      * @var array
      */
-    protected $headers = [
-        Request::HEADER_FORWARDED => 'FORWARDED',
-        Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
-        Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
-        Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
-        Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
-    ];
+    protected $headers = Request::HEADER_X_FORWARDED_ALL;
 }

app/Item.php

@@ -5,15 +5,26 @@ 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;
 
 class Item extends Model
 {
     use SoftDeletes;
 
+    protected static function boot()
+    {
+        parent::boot();
+
+        static::addGlobalScope('user_id', function (Builder $builder) {
+            $current_user = User::currentUser();
+            $builder->where('user_id', $current_user->id);
+        });
+    }
+
     //
     protected $fillable = [
-        'title', 'url', 'colour', 'icon', 'description', 'pinned', 'order'
+        'title', 'url', 'colour', 'icon', 'description', 'pinned', 'order', 'type', 'user_id'
     ];
 
     /**
@@ -26,22 +37,72 @@ class Item extends Model
     public static function supportedList()
     {
         return [
+            'AirSonic' => \App\SupportedApps\AirSonic::class,
+            'Cardigann' => \App\SupportedApps\Cardigann::class,
+            'CouchPotato' => \App\SupportedApps\CouchPotato::class,
+            'Bazarr' => \App\SupportedApps\Bazarr::class,
+            'Bitwarden' => \App\SupportedApps\Bitwarden::class,
+            'Booksonic' => \App\SupportedApps\Booksonic::class,
+            'BookStack' => \App\SupportedApps\BookStack::class,
+            'Deluge' => \App\SupportedApps\Deluge::class,
+            'Dokuwiki' => \App\SupportedApps\Dokuwiki::class,
             'Duplicati' => \App\SupportedApps\Duplicati::class,
             'Emby' => \App\SupportedApps\Emby::class,
+            'Flood' => \App\SupportedApps\Flood::class,
+            'FreshRSS' => \App\SupportedApps\FreshRSS::class,
+            'Gitea' => \App\SupportedApps\Gitea::class,
+            'Glances' => \App\SupportedApps\Glances::class,
+            'Grafana' => \App\SupportedApps\Grafana::class,
+            'Graylog' => \App\SupportedApps\Graylog::class,
+            'Headphones' => \App\SupportedApps\Headphones::class,
+            'Home Assistant' => \App\SupportedApps\HomeAssistant::class,
+            'Jackett' => \App\SupportedApps\Jackett::class,
             'Jdownloader' => \App\SupportedApps\Jdownloader::class,
+            'Krusader' => \App\SupportedApps\Krusader::class,
+            'LibreNMS' => \App\SupportedApps\LibreNMS::class,
+            'Lidarr' => \App\SupportedApps\Lidarr::class,
+            'Mailcow' => \App\SupportedApps\Mailcow::class,
             'Mcmyadmin' => \App\SupportedApps\Mcmyadmin::class,
+            'Medusa' => \App\SupportedApps\Medusa::class,
+            'Monica' => \App\SupportedApps\Monica::class,
+            'MusicBrainz' => \App\SupportedApps\MusicBrainz::class,
+            'Mylar' => \App\SupportedApps\Mylar::class,
             'NZBGet' => \App\SupportedApps\Nzbget::class,
+            'Netdata' => \App\SupportedApps\Netdata::class,
             'Nextcloud' => \App\SupportedApps\Nextcloud::class,
+            'Now Showing' => \App\SupportedApps\NowShowing::class,
+            'Nzbhydra' => \App\SupportedApps\Nzbhydra::class,
+            'OPNSense' => \App\SupportedApps\Opnsense::class,
+            'Ombi' => \App\SupportedApps\Ombi::class,
             'Openhab' => \App\SupportedApps\Openhab::class,
+            'OpenMediaVault' => \App\SupportedApps\OpenMediaVault::class,
             'Pihole' => \App\SupportedApps\Pihole::class,
             'Plex' => \App\SupportedApps\Plex::class,
             'Plexpy' => \App\SupportedApps\Plexpy::class,
             'Plexrequests' => \App\SupportedApps\Plexrequests::class,
             'Portainer' => \App\SupportedApps\Portainer::class,
+            'Proxmox' => \App\SupportedApps\Proxmox::class,
+            'Radarr' => \App\SupportedApps\Radarr::class,
+            'Rancher' => \App\SupportedApps\Rancher::class,
+            'Runeaudio' => \App\SupportedApps\Runeaudio::class,
             'Sabnzbd' => \App\SupportedApps\Sabnzbd::class,
+            'Sickrage' => \App\SupportedApps\Sickrage::class,
+            'Sonarr' => \App\SupportedApps\Sonarr::class,
+            'Syncthing' => \App\SupportedApps\Syncthing::class,
+            'Tautulli' => \App\SupportedApps\Tautulli::class,
+            'Transmission' => \App\SupportedApps\Transmission::class,
             'Traefik' => \App\SupportedApps\Traefik::class,
+            'tt-rss' => \App\SupportedApps\Ttrss::class,
+            'TVheadend' => \App\SupportedApps\TVheadend::class,
             'UniFi' => \App\SupportedApps\Unifi::class,
-            'pFsense' => \App\SupportedApps\Pfsense::class,
+            'unRAID' => \App\SupportedApps\Unraid::class,
+            'pfSense' => \App\SupportedApps\Pfsense::class,
+            'pyLoad' => \App\SupportedApps\pyLoad::class,
+            'ruTorrent' => \App\SupportedApps\ruTorrent::class,
+            'Virtualmin' => \App\SupportedApps\Virtualmin::class,
+            'Watcher3' => \App\SupportedApps\Watcher3::class,
+            'Webmin' => \App\SupportedApps\Webmin::class,
+            'WebTools' => \App\SupportedApps\WebTools::class,
         ];
     }
     public static function supportedOptions()
@@ -74,7 +135,7 @@ class Item extends Model
                 $output->view = $view;
             }
             if(!isset($output->dataonly)) $output->dataonly = '0';
-            
+
         }
         return (object)$output;
     }
@@ -94,11 +155,90 @@ class Item extends Model
                 }
             }
             //die(var_dump($store))
-            
+
             $config['enabled'] = ($store) ? true : false;
             $config = json_encode($config);
         }
         return $config;
 
     }
+
+    public function parents()
+    {
+        return $this->belongsToMany('App\Item', 'item_tag', 'item_id', 'tag_id');
+    }
+    public function children()
+    {
+        return $this->belongsToMany('App\Item', 'item_tag', 'tag_id', 'item_id');
+    }
+
+    public function getLinkAttribute()
+    {
+        if((int)$this->type === 1) {
+            return '/tag/'.$this->url;
+        } else {
+            return $this->url;
+        }
+    }
+
+    public function getDroppableAttribute()
+    {
+        if((int)$this->type === 1) {
+            return ' droppable';
+        } else {
+            return '';
+        }
+    }
+
+    public function getLinkTargetAttribute()
+    {
+        $target = Setting::fetch('window_target');
+
+        if((int)$this->type === 1 || $target === 'current') {
+            return '';
+        } else {
+            return ' target="' . $target . '"';
+        }
+    }
+
+    public function getLinkIconAttribute()
+    {
+        if((int)$this->type === 1) {
+            return 'fa-tag';
+        } else {
+            return 'fa-arrow-alt-to-right';
+        }
+    }
+    public function getLinkTypeAttribute()
+    {
+        if((int)$this->type === 1) {
+            return 'tags';
+        } else {
+            return 'items';
+        }
+    }
+
+    public function scopeOfType($query, $type)
+    {
+        switch($type) {
+            case 'item':
+                $typeid = 0;
+                break;
+            case 'tag':
+                $typeid = 1;
+                break;
+        }
+
+        return $query->where('type', $typeid);
+    }
+
+    /**
+     * Get the user that owns the item.
+     */
+    public function user()
+    {
+        return $this->belongsTo('App\User');
+    }   
+
+
 }

app/Providers/AppServiceProvider.php

@@ -6,6 +6,7 @@ use Illuminate\Support\ServiceProvider;
 use Artisan;
 use Schema;
 use App\Setting;
+use App\User;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -16,7 +17,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        $alt_bg = '';
+        
 
         if(!is_file(base_path('.env'))) {
             touch(base_path('.env'));
@@ -32,12 +33,9 @@ class AppServiceProvider extends ServiceProvider
         }
         if(is_file(database_path('app.sqlite'))) {
             if(Schema::hasTable('settings')) {
-                if($bg_image = Setting::fetch('background_image')) {
-                    $alt_bg = ' style="background-image: url('.asset('storage/'.$bg_image).')"';
-                }
 
                 // check version to see if an upgrade is needed
-                $db_version = Setting::fetch('version');
+                $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));                   
@@ -45,14 +43,62 @@ class AppServiceProvider extends ServiceProvider
             } else {
                 Artisan::call('migrate', array('--path' => 'database/migrations', '--force' => true, '--seed' => true)); 
             }
-            $lang = Setting::fetch('language');
-            \App::setLocale($lang);
 
         }
         if(!is_file(public_path('storage'))) {
             Artisan::call('storage:link');
+            \Session::put('current_user', null);
+        }
+
+        // User specific settings need to go here as session isn't available at this point in the app
+        view()->composer('*', function ($view) 
+        {
+
+            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'])) {
+                    $credentials = ['username' => $_SERVER['PHP_AUTH_USER'], 'password' => $_SERVER['PHP_AUTH_PW']];
+                    
+                    if (\Auth::attempt($credentials)) {
+                        // Authentication passed...
+                        $user = \Auth::user();
+                        //\Session::put('current_user', $user);
+                        session(['current_user' => $user]);                
+                    }
+                }
+            }
+
+
+            $alt_bg = '';
+            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 );   
+
+    
+            
+            
+        });  
+
+
+        if (env('FORCE_HTTPS') === true) {
+            \URL::forceScheme('https');
+        }
+
+        if(env('APP_URL') != 'http://localhost') {
+            \URL::forceRootUrl(env('APP_URL'));
         }
-        view()->share('alt_bg', $alt_bg);
 
     }
 

app/Setting.php

@@ -5,6 +5,8 @@ namespace App;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Input;
 use Form;
+use Illuminate\Support\Facades\Auth;
+use App\User;
 
 class Setting extends Model
 {
@@ -46,6 +48,12 @@ class Setting extends Model
 
     public function getListValueAttribute()
     {
+        if((bool)$this->system === true) {
+            $value = self::_fetch($this->key);
+        } else {
+            $value = self::fetch($this->key);
+        }
+        $this->value = $value;
         switch($this->type) {
             case 'image':
                 if(!empty($this->value)) {
@@ -80,6 +88,12 @@ class Setting extends Model
 
     public function getEditValueAttribute()
     {
+        if((bool)$this->system === true) {
+            $value = self::_fetch($this->key);
+        } else {
+            $value = self::fetch($this->key);
+        }
+        $this->value = $value;
         switch($this->type) {
             case 'image':
                 $value = '';
@@ -125,6 +139,7 @@ class Setting extends Model
         return $this->belongsTo('App\SettingGroup', 'group_id');
     }
 
+
     /**
      * @param string $key
      *
@@ -132,20 +147,54 @@ class Setting extends Model
      */
     public static function fetch($key)
     {
-        if (Setting::cached($key)) {
-            return Setting::$cache[$key];
-        } else {
+        $user = self::user();
+        return self::_fetch($key, $user);
+    }
+    /**
+     * @param string $key
+     *
+     * @return mixed
+     */
+    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();
 
             if (!is_null($find)) {
-                $value = $find->value;
-                Setting::add($key, $value);
+                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;
+                    }
+                    
+                }
+                #Setting::add($cachekey, $value);
 
                 return $value;
             } else {
                 return false;
             }
-        }
+        #}
     }
 
     /**
@@ -175,21 +224,23 @@ class Setting extends Model
         $output = '';
         $homepage_search = self::fetch('homepage_search');
         $search_provider = self::where('key', '=', 'search_provider')->first();
-        
-        //die(var_dump($search_provider->value));
+        $user_search_provider = self::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($search_provider->value === 'none') return $output;
-        if(empty($search_provider->value)) return $output;
-        if(is_null($search_provider->value)) return $output;
+        if($user_search_provider === 'none') return $output;
+        if(empty($user_search_provider)) return $output;
+        if(is_null($user_search_provider)) return $output;
 
 
         if((bool)$homepage_search && (bool)$search_provider) {
 
             $options = (array)json_decode($search_provider->options);
-            $name = $options[$search_provider->value];
-            if((bool)$search_provider->value) {
-                switch($search_provider->value) {
+            $name = $options[$user_search_provider];
+            if((bool)$user_search_provider) {
+                switch($user_search_provider) {
                     case 'google':
                         $url = 'https://www.google.com/search';
                         $var = 'q';
@@ -202,11 +253,14 @@ class Setting extends Model
                         $url = 'https://www.bing.com/search';
                         $var = 'q';
                         break;
+                    case 'startpage':
+                        $url = 'https://www.startpage.com/';
+                        $var = 'q';
                 }
                 $output .= '<div class="searchform">';
                 $output .= Form::open(['url' => $url, 'method' => 'get']);
                 $output .= '<div class="input-container">';
-                $output .= Form::text($var, null, ['class' => 'homesearch', 'placeholder' => __($name).' '.__('app.settings.search').'...']);
+                $output .= Form::text($var, null, ['class' => 'homesearch', 'autofocus' => 'autofocus', 'placeholder' => __($name).' '.__('app.settings.search').'...']);
                 $output .= '<button type="submit">'.ucwords(__('app.settings.search')).'</button>';
                 $output .= '</div>';
                 $output .= Form::close();
@@ -215,4 +269,19 @@ class Setting extends Model
         }
         return $output;
     }
+
+    /**
+     * The users that belong to the setting.
+     */
+    public function users()
+    {
+        return $this->belongsToMany('App\User')->using('App\SettingUser')->withPivot('uservalue');
+    }
+
+    public static function user()
+    {
+        return User::currentUser();
+    }
+
+
 }

app/SettingUser.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Relations\Pivot;
+
+class SettingUser extends Pivot
+{
+    //
+}

app/SupportedApps/AirSonic.php

@@ -0,0 +1,11 @@
+<?php namespace App\SupportedApps;
+class AirSonic implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#08F';
+    }
+    public function icon()
+    {
+        return 'supportedapps/airsonic.png';
+    }
+}

app/SupportedApps/Bazarr.php

@@ -0,0 +1,14 @@
+<?php namespace App\SupportedApps;
+
+class Bazarr implements Contracts\Applications {
+    
+    public function defaultColour()
+    {
+        return '#222';
+    }
+    public function icon()
+    {
+        return 'supportedapps/bazarr.png';
+    }
+   
+}

app/SupportedApps/Bitwarden.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Bitwarden implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#3c8dbc';
+    }
+    public function icon()
+    {
+        return 'supportedapps/bitwarden.png';
+    }
+}

app/SupportedApps/BookStack.php

@@ -0,0 +1,14 @@
+<?php namespace App\SupportedApps;
+
+class BookStack implements Contracts\Applications {
+    
+    public function defaultColour()
+    {
+        return '#02679E';
+    }
+    public function icon()
+    {
+        return 'supportedapps/bookstack.png';
+    }
+   
+}

app/SupportedApps/Booksonic.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Booksonic implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#58a';
+    }
+    public function icon()
+    {
+        return 'supportedapps/booksonic.png';
+    }
+}

app/SupportedApps/Cardigann.php

@@ -0,0 +1,11 @@
+<?php namespace App\SupportedApps;
+class Cardigann implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#753';
+    }
+    public function icon()
+    {
+        return 'supportedapps/cardigann.png';
+    }
+}

app/SupportedApps/CouchPotato.php

@@ -0,0 +1,122 @@
+<?php namespace App\SupportedApps;
+
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Client;
+use Illuminate\Support\Facades\Log;
+
+class CouchPotato implements Contracts\Applications, Contracts\Livestats
+{
+
+    private $_client;
+
+    public function __construct()
+    {
+        $this->_client = new Client(
+            ['http_errors' => false,
+            'timeout' => 10]
+        );
+    }
+
+    public function defaultColour()
+    {
+        return '#363840';
+    }
+    public function icon()
+    {
+        return 'supportedapps/couchpotato.png';
+    }
+    public function configDetails()
+    {
+        return 'couchpotato';
+    }
+    public function testConfig()
+    {
+        $res = $this->sendRequest();
+        if ($res == null) {
+            echo 'CouchPotato connection failed';
+            return;
+        }
+        switch($res->getStatusCode()) {
+        case 200:
+            echo "Successfully connected to CouchPotato";
+            break;
+        case 401:
+            echo 'Failed: Invalid credentials';
+            break;
+        case 404:
+            echo 'Failed: Please make sure your URL is correct and includes the port';
+            break;
+        case 409:
+            echo 'Failed: Incorrect session id';
+            break;
+        default:
+            echo 'Something went wrong... Code: '.$res->getStatusCode();
+            break;
+        }
+    }
+
+    public function executeConfig()
+    {
+        $html = '';
+        $res = $this->sendRequest();
+        if ($res == null) {
+            Log::debug('CouchPotato connection failed');
+            return '';
+        }
+        $data = json_decode($res->getBody());
+        if (! isset($data->movies)) {
+            Log::debug('Failed to fetch data from CouchPotato');
+            return '';
+        }
+        $movies = $data->movies;
+        $wantedMovies = $availableMovies = 0;
+        foreach ($movies as $v) {
+            switch ($v->status) {
+            case 'active':
+                $wantedMovies++;
+                break;
+            case 'done':
+                $availableMovies++;
+                break;
+            default:
+                Log::warning('Unexpected CouchPotato status received: '.$v['status']);
+                break;
+            }
+        }
+
+        $html = '
+        <ul class="livestats">
+            <li><span class="title">Wanted</span><sub>'.$wantedMovies.'</sub></li>
+            <li><span class="title">Available</span><sub>'.$availableMovies.'</sub></li>
+        </ul>
+        ';
+        return json_encode(['status' => 'inactive', 'html' => $html]);
+    }
+
+    private function sendRequest()
+    {
+        $res = null;
+        try{
+            $res = $this->_client->request(
+                'GET',
+                $this->getApiUrl()
+            );
+        }catch(\GuzzleHttp\Exception\BadResponseException $e){
+            Log::error("Connection to {$e->getRequest()->getUrl()} failed");
+            Log::debug($e->getMessage());
+            $res = $e->getRequest();
+        }catch(\GuzzleHttp\Exception\ConnectException $e) {
+            Log::error("CouchPotato connection refused");
+            Log::debug($e->getMessage());
+        }
+        return $res;
+    }
+
+    private function getApiUrl()
+    {
+        $url = $this->config->url;
+        $url = rtrim($url, '/');
+        $apiUrl = $url.'/api/'.$this->config->apikey.'/movie.list';
+        return $apiUrl;
+    }
+}

app/SupportedApps/Deluge.php

@@ -0,0 +1,109 @@
+<?php namespace App\SupportedApps;
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Client;
+class Deluge implements Contracts\Applications, Contracts\Livestats {
+    public function defaultColour()
+    {
+        return '#357';
+    }
+    public function icon()
+    {
+        return 'supportedapps/deluge.png';
+    }
+
+    public function configDetails()
+    {
+        return 'deluge';
+    }
+
+    public function testConfig()
+    {
+        $res = $this->login()[0];
+        switch($res->getStatusCode()) {
+            case 200:
+                $data = json_decode($res->getBody());
+                if(!isset($data->result) || is_null($data->result) || $data->result == false) {
+                    echo 'Failed: Invalid Credentials';
+                } else {
+                    echo 'Successfully connected to the API';
+                }
+                break;
+            case 401:
+                echo 'Failed: Invalid credentials';
+                break;
+            case 404:
+                echo 'Failed: Please make sure your URL is correct and that there is a trailing slash';
+                break;
+            default:
+                echo 'Something went wrong... Code: '.$res->getStatusCode();
+                break;
+        }
+    }
+    public function executeConfig()
+    {
+        $html = '';
+        $active = 'active';
+        $jar = $this->login()[1];
+        $res = $this->getDetails($jar);
+        $data = json_decode($res->getBody());
+        $download_rate = $data->result->stats->download_rate;
+        $upload_rate = $data->result->stats->upload_rate;
+        $seed_count = $data->result->filters->state[2];
+        $leech_count = $data->result->filters->state[1];
+        $html = '
+        <ul class="livestats">
+            <li><span class="title"><i class="fas fa-arrow-down"></i> '.$this->formatBytes($download_rate).'</span></li>
+            <li><span class="title"><i class="fas fa-arrow-up"></i> '.$this->formatBytes($upload_rate).'</span></li>
+        </ul>
+        <ul class="livestats">
+            <li><span class="title">Leech: '.$leech_count[1].'</span></li>
+            <li><span class="title">Seed: '.$seed_count[1].'</span></li>
+        </ul>
+        ';
+        return json_encode(['status' => $active, 'html' => $html]);
+    }
+    public function getDetails($jar)
+    {
+        $config = $this->config;
+        $url = $config->url;
+        $url = rtrim($url, '/');
+        $api_url = $url.'/json';
+        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
+        $res = $client->request('POST', $api_url, [
+            'body' => '{"method": "web.update_ui", "params": [["none"], {}], "id": 1}',
+            'cookies' => $jar,
+            'headers'  => ['content-type' => 'application/json', 'Accept' => 'application/json']
+        ]);
+        return $res;
+    }
+    public function login()
+    {
+        $config = $this->config;
+        $url = $config->url;
+        $password = $config->password;
+        $url = rtrim($url, '/');
+        $api_url = $url.'/json';
+        $jar = new \GuzzleHttp\Cookie\CookieJar();
+        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
+        $res = $client->request('POST', $api_url, [
+            'body' => '{"method": "auth.login", "params": ["'.$password.'"], "id": 1}',
+            'cookies' => $jar,
+            'headers'  => ['content-type' => 'application/json', 'Accept' => 'application/json']
+        ]);
+        return array($res,$jar);
+    }
+
+    function formatBytes($bytes, $precision = 2) { 
+        $units = array('B', 'KB', 'MB', 'GB', 'TB'); 
+
+        $bytes = max($bytes, 0); 
+        $pow = floor(($bytes ? log($bytes) : 0) / log(1024)); 
+        $pow = min($pow, count($units) - 1); 
+
+        // Uncomment one of the following alternatives
+        $bytes /= pow(1024, $pow);
+        // $bytes /= (1 << (10 * $pow)); 
+
+        return round($bytes, $precision) . ' ' . $units[$pow] . 'ps'; 
+    }
+}

app/SupportedApps/Dokuwiki.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Dokuwiki implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#9d7056';
+    }
+    public function icon()
+    {
+        return 'supportedapps/dokuwiki.png';
+    }
+}

app/SupportedApps/Flood.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Flood implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '##00D091';
+    }
+    public function icon()
+    {
+        return 'supportedapps/Flood.png';
+    }
+}

app/SupportedApps/FreshRSS.php

@@ -0,0 +1,11 @@
+<?php namespace App\SupportedApps;
+class FreshRSS implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#003B73';
+    }
+    public function icon()
+    {
+        return 'supportedapps/freshrss.png';
+    }
+}

app/SupportedApps/Gitea.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Gitea implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#585e52';
+    }
+    public function icon()
+    {
+        return 'supportedapps/gitea.png';
+    }
+}

app/SupportedApps/Glances.php

@@ -0,0 +1,14 @@
+<?php namespace App\SupportedApps;
+
+class Glances implements Contracts\Applications {
+    
+    public function defaultColour()
+    {
+        return '#2c363f';
+    }
+    public function icon()
+    {
+        return 'supportedapps/glances.png';
+    }
+   
+}

app/SupportedApps/Grafana.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Grafana implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#a56e4d';
+    }
+    public function icon()
+    {
+        return 'supportedapps/grafana.png';
+    }
+}

app/SupportedApps/Graylog.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Graylog implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#158';
+    }
+    public function icon()
+    {
+        return 'supportedapps/graylog.png';
+    }
+}

app/SupportedApps/Headphones.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Headphones implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#185';
+    }
+    public function icon()
+    {
+        return 'supportedapps/headphones.png';
+    }
+}

app/SupportedApps/HomeAssistant.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class HomeAssistant implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#073c52';
+    }
+    public function icon()
+    {
+        return 'supportedapps/homeassistant.png';
+    }
+}

app/SupportedApps/Jackett.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Jackett implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#484814';
+    }
+    public function icon()
+    {
+        return 'supportedapps/jackett.png';
+    }
+}

app/SupportedApps/Krusader.php

@@ -0,0 +1,11 @@
+<?php namespace App\SupportedApps;
+class Krusader implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#5A5';
+    }
+    public function icon()
+    {
+        return 'supportedapps/krusader.png';
+    }
+}

app/SupportedApps/Lidarr.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Lidarr implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#183c18';
+    }
+    public function icon()
+    {
+        return 'supportedapps/lidarr.png';
+    }
+}

app/SupportedApps/Mailcow.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Mailcow implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#161b1f';
+    }
+    public function icon()
+    {
+        return 'supportedapps/mailcow.svg';
+    }
+}

app/SupportedApps/Medusa.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Medusa implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#4b5e55';
+    }
+    public function icon()
+    {
+        return 'supportedapps/medusa.png';
+    }
+}

app/SupportedApps/Monica.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Monica implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#fafbfc';
+    }
+    public function icon()
+    {
+        return 'supportedapps/monica.png';
+    }
+}

app/SupportedApps/MusicBrainz.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class MusicBrainz implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#a0a';
+    }
+    public function icon()
+    {
+        return 'supportedapps/musicbrainz.png';
+    }
+}

app/SupportedApps/Mylar.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Mylar implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#aa0';
+    }
+    public function icon()
+    {
+        return 'supportedapps/mylar.png';
+    }
+}

app/SupportedApps/Netdata.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Netdata implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#543737';
+    }
+    public function icon()
+    {
+        return 'supportedapps/netdata.png';
+    }
+}

app/SupportedApps/NowShowing.php

@@ -0,0 +1,11 @@
+<?php namespace App\SupportedApps;
+class NowShowing implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#690000';
+    }
+    public function icon()
+    {
+        return 'supportedapps/nowshowing.png';
+    }
+}

app/SupportedApps/Nzbget.php

@@ -39,25 +39,27 @@ class Nzbget implements Contracts\Applications, Contracts\Livestats {
     }
     public function executeConfig()
     {
-        $output = '';
+        $html = '';
+        $active = 'inactive';
         $res = $this->buildRequest('status');
         $data = json_decode($res->getBody());
         //$data->result->RemainingSizeMB = '10000000';
         //$data->result->DownloadRate = '100000000';
-        $size = $data->result->RemainingSizeMB;
-        $rate = $data->result->DownloadRate;
-        $queue_size = format_bytes($size*1000*1000, false, ' <span>', '</span>');
-        $current_speed = format_bytes($rate, false, ' <span>');
+        if($data) {
+            $size = $data->result->RemainingSizeMB;
+            $rate = $data->result->DownloadRate;
+            $queue_size = format_bytes($size*1000*1000, false, ' <span>', '</span>');
+            $current_speed = format_bytes($rate, false, ' <span>');
 
-        if($size > 0 || $rate > 0) {
-            $output = '
+            $active = ($size > 0 || $rate > 0) ? 'active' : 'inactive';
+            $html = '
             <ul class="livestats">
                 <li><span class="title">Queue</span><strong>'.$queue_size.'</strong></li>
                 <li><span class="title">Speed</span><strong>'.$current_speed.'/s</span></strong></li>
             </ul>
             ';
         }
-        return $output;
+        return json_encode(['status' => $active, 'html' => $html]);
     }
     public function buildRequest($endpoint)
     {
@@ -68,10 +70,12 @@ class Nzbget implements Contracts\Applications, Contracts\Livestats {
 
         $rebuild_url = str_replace('http://', 'http://'.$username.':'.$password.'@', $url);
         $rebuild_url = str_replace('https://', 'https://'.$username.':'.$password.'@', $rebuild_url);
+        $rebuild_url = rtrim($rebuild_url, '/');
 
-        $api_url = $rebuild_url.'jsonrpc/'.$endpoint;
 
-        $client = new Client(['http_errors' => false]);
+        $api_url = $rebuild_url.'/jsonrpc/'.$endpoint;
+
+        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
         $res = $client->request('GET', $api_url);
         return $res;
 

app/SupportedApps/Nzbhydra.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Nzbhydra implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#53644d';
+    }
+    public function icon()
+    {
+        return 'supportedapps/nzbhydra.png';
+    }
+}

app/SupportedApps/Ombi.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Ombi implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#150f09';
+    }
+    public function icon()
+    {
+        return 'supportedapps/ombi.png';
+    }
+}

app/SupportedApps/OpenMediaVault.php

@@ -0,0 +1,11 @@
+<?php namespace App\SupportedApps;
+class OpenMediaVault implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#5AF';
+    }
+    public function icon()
+    {
+        return 'supportedapps/openmediavault.png';
+    }
+}

app/SupportedApps/Openhab.php

@@ -3,7 +3,7 @@
 class Openhab implements Contracts\Applications {
     public function defaultColour()
     {
-        return '#b7b7b7';
+        return '#2b2525';
     }
     public function icon()
     {

app/SupportedApps/Opnsense.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Opnsense implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#211914';
+    }
+    public function icon()
+    {
+        return 'supportedapps/opnsense.png';
+    }
+}

app/SupportedApps/Pfsense.php

@@ -3,10 +3,10 @@
 class Pfsense implements Contracts\Applications {
     public function defaultColour()
     {
-        return '#4e4742';
+        return '#243699';
     }
     public function icon()
     {
         return 'supportedapps/pfsense.png';
     }
-}
+}

app/SupportedApps/Pihole.php

@@ -39,17 +39,18 @@ class Pihole implements Contracts\Applications, Contracts\Livestats {
 
     public function executeConfig()
     {
-        $output = '';
+        $html = '';
+        $active = 'active';
         $res = $this->buildRequest();
         $data = json_decode($res->getBody());
 
-            $output = '
+        $html = '
             <ul class="livestats">
                 <li><span class="title">Domains<br />Blocked</span><strong>'.$data->domains_being_blocked.'</strong></li>
                 <li><span class="title">Blocked<br />Today</span><strong>'.$data->ads_blocked_today.'</span></strong></li>
             </ul>
             ';
-        return $output;
+        return json_encode(['status' => $active, 'html' => $html]);
     }
 
     public function buildRequest()
@@ -57,10 +58,12 @@ class Pihole implements Contracts\Applications, Contracts\Livestats {
         $config = $this->config;
         $url = $config->url;
 
-        $api_url = $url.'admin/api.php';
+        $url = rtrim($url, '/');
+
+        $api_url = $url.'/api.php';
         //die( $api_url.' --- ');
 
-        $client = new Client(['http_errors' => false]);
+        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
         $res = $client->request('GET', $api_url);
         return $res;
 

app/SupportedApps/Plexpy.php

@@ -1,6 +1,12 @@
 <?php namespace App\SupportedApps;
 
-class Plexpy implements Contracts\Applications {
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Client;
+
+class Plexpy implements Contracts\Applications, Contracts\Livestats {
+
+    public $config;
+
     public function defaultColour()
     {
         return '#2d2208';
@@ -9,4 +15,63 @@ class Plexpy implements Contracts\Applications {
     {
         return 'supportedapps/plexpy.png';
     }
-}
+    public function configDetails()
+    {
+        return 'plexpy';
+    }
+    public function testConfig()
+    {
+        $res = $this->buildRequest('arnold');
+        switch($res->getStatusCode()) {
+            case 200:
+                $data = json_decode($res->getBody());
+                if(isset($data->error) && !empty($data->error)) {
+                    echo 'Failed: '.$data->error;
+                } else {
+                    echo 'Successfully connected to the API';
+                }
+                break;
+            case 401:
+                echo 'Failed: Invalid credentials';
+                break;
+            case 404:
+                echo 'Failed: Please make sure your URL is correct and that there is a trailing slash';
+                break;
+            default:
+                echo 'Something went wrong... Code: '.$res->getStatusCode();
+                break;
+        }
+    }
+    public function executeConfig()
+    {
+        $html = '';
+        $active = 'active';
+        $res = $this->buildRequest('get_activity');
+        $data = json_decode($res->getBody());
+        $stream_count = $data->response->data->stream_count;
+
+        $html = '
+        <ul class="livestats">
+            <li><span class="title">Stream Count</span><strong>'.$stream_count.'</strong></li>
+        </ul>
+        ';
+
+        return json_encode(['status' => $active, 'html' => $html]);
+    }
+    public function buildRequest($endpoint)
+    {
+        $config = $this->config;
+        $url = $config->url;
+        $apikey = $config->apikey;
+
+        $url = rtrim($url, '/');
+
+        $api_url = $url.'/api/v2?apikey='.$apikey.'&cmd='.$endpoint;
+
+        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
+        $res = $client->request('GET', $api_url);
+        return $res;
+
+    }
+   
+}

app/SupportedApps/Plexrequests.php

@@ -3,7 +3,7 @@
 class Plexrequests implements Contracts\Applications {
     public function defaultColour()
     {
-        return '#845c2c';
+        return '#3c2d1c';
     }
     public function icon()
     {

app/SupportedApps/Proxmox.php

@@ -0,0 +1,80 @@
+<?php namespace App\SupportedApps;
+
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Client;
+
+class Proxmox implements Contracts\Applications, Contracts\Livestats {
+    public function defaultColour()
+    {
+        return '#542e0a';
+    }
+    public function icon()
+    {
+        return 'supportedapps/proxmox.png';
+    }
+
+    public function configDetails()
+    {
+        //return 'proxmox';
+        return null;
+    }
+
+    public function testConfig()
+    {
+        /*$res = $this->buildRequest();
+        switch($res->getStatusCode()) {
+            case 200:
+                echo 'Successfully connected to the API';
+                break;
+            case 401:
+                echo 'Failed: Invalid credentials';
+                break;
+            case 404:
+                echo 'Failed: Please make sure your URL is correct and that there is a trailing slash';
+                break;
+            default:
+                echo 'Something went wrong... Code: '.$res->getStatusCode();
+                break;
+        }*/
+        return null;
+    }
+
+    public function executeConfig()
+    {
+        /*
+        $output = '';
+        $res = $this->buildRequest();
+        $data = json_decode($res->getBody());
+
+            $output = '
+            <ul class="livestats">
+                <li><span class="title">Domains<br />Blocked</span><strong>'.$data->domains_being_blocked.'</strong></li>
+                <li><span class="title">Blocked<br />Today</span><strong>'.$data->ads_blocked_today.'</span></strong></li>
+            </ul>
+            ';
+        return $output;
+        */
+        return null;
+    }
+
+    public function buildRequest($endpoint='')
+    {
+        $config = $this->config;
+
+        $username = $config->username;
+        $password = $config->password;
+
+        $url = $config->url;
+        $url = rtrim($url, '/');
+
+        $api_url = $url.'/api2/json/'.$endpoint.'?username='.$username.'&password='.$password;
+        //die( $api_url.' --- ');
+
+        $client = new Client(['http_errors' => false, 'verify' => false ]);
+        $res = $client->request('GET', $api_url);
+        return $res;
+
+    }
+
+
+}

app/SupportedApps/Radarr.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Radarr implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#3e3726';
+    }
+    public function icon()
+    {
+        return 'supportedapps/radarr.png';
+    }
+}

app/SupportedApps/Rancher.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Rancher implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#78c9cf';
+    }
+    public function icon()
+    {
+        return 'supportedapps/rancher.png';
+    }
+}

app/SupportedApps/Runeaudio.php

@@ -0,0 +1,95 @@
+<?php namespace App\SupportedApps;
+
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Client;
+
+class Runeaudio implements Contracts\Applications, Contracts\Livestats {
+    public function defaultColour()
+    {
+        return '#05A';
+    }
+    public function icon()
+    {
+        return 'supportedapps/runeaudio.png';
+    }
+
+    public function configDetails()
+    {
+        return 'runeaudio';
+    }
+
+    public function testConfig()
+    {
+        $res = $this->buildRequest('status');
+        switch($res->getStatusCode()) {
+            case 200:
+                echo 'Successfully connected to the API';
+                break;
+            case 401:
+                echo 'Failed: Invalid credentials';
+                break;
+            case 404:
+                echo 'Failed: Please make sure your URL is correct and that there is a trailing slash';
+                break;
+            default:
+                echo 'Something went wrong... Code: '.$res->getStatusCode();
+                break;
+        }
+    }
+
+    public function executeConfig()
+    {
+        $output = '';
+        $active = 'active';
+        $artist = '';
+        $song_title = '';
+        $res = $this->buildRequest('currentsong');
+        $array = explode("\n", $res->getBody());
+        foreach($array as $item) {
+            $item_array = explode(": ", $item);
+            if ($item_array[0] == 'Artist') {
+                $artist = $item_array[1];
+            } elseif ($item_array[0] == 'Title') {
+                $song_title = $item_array[1];
+            }
+        }
+
+        $output = '<ul class="livestats">';
+
+        if (strlen($artist) > 12) {
+            $output = $output.'<li><span class="title-marquee"><span>'.$artist.'</span></span></li>';
+        } else {
+            $output = $output.'<li><span class="title">'.$artist.'</span></li>';
+        }
+
+        $output = $output.'</ul><ul class="livestats">';
+
+        if (strlen($song_title) > 12) {
+            $output = $output.'<li><span class="title-marquee"><span>'.$song_title.'</span></span></li>';
+        } else {
+            $output = $output.'<li><span class="title">'.$song_title.'</span></li>';
+        }
+
+        $output = $output.'</ul>';
+
+        return json_encode(['status' => $active, 'html' => $output]);
+    }
+
+    public function buildRequest($endpoint)
+    {
+        $config = $this->config;
+        $url = $config->url;
+
+        $url = rtrim($url, '/');
+
+        $api_url = $url.'/command/?cmd='.$endpoint;
+        //die( $api_url.' --- ');
+
+        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
+        $res = $client->request('GET', $api_url);
+        return $res;
+
+    }
+
+
+}

app/SupportedApps/Sabnzbd.php

@@ -44,25 +44,27 @@ class Sabnzbd implements Contracts\Applications, Contracts\Livestats {
     }
     public function executeConfig()
     {
-        $output = '';
+        $html = '';
+        $active = 'inactive';
         $res = $this->buildRequest('queue');
         $data = json_decode($res->getBody());
         //$data->result->RemainingSizeMB = '10000000';
         //$data->result->DownloadRate = '100000000';
-        $size = $data->queue->mbleft;
-        $rate = $data->queue->kbpersec;
-        $queue_size = format_bytes($size*1000*1000, false, ' <span>', '</span>');
-        $current_speed = format_bytes($rate*1000, false, ' <span>');
+        if($data) {
+            $size = $data->queue->mbleft;
+            $rate = $data->queue->kbpersec;
+            $queue_size = format_bytes($size*1000*1000, false, ' <span>', '</span>');
+            $current_speed = format_bytes($rate*1000, false, ' <span>');
 
-        if($size > 0 || $rate > 0) {
-            $output = '
-            <ul class="livestats">
-                <li><span class="title">Queue</span><strong>'.$queue_size.'</strong></li>
-                <li><span class="title">Speed</span><strong>'.$current_speed.'/s</span></strong></li>
-            </ul>
+            $active = ($size > 0 || $rate > 0) ? 'active' : 'inactive';
+            $html = '
+                <ul class="livestats">
+                    <li><span class="title">Queue</span><strong>'.$queue_size.'</strong></li>
+                    <li><span class="title">Speed</span><strong>'.$current_speed.'/s</span></strong></li>
+                </ul>
             ';
         }
-        return $output;
+        return json_encode(['status' => $active, 'html' => $html]);
     }
     public function buildRequest($endpoint)
     {
@@ -70,10 +72,15 @@ class Sabnzbd implements Contracts\Applications, Contracts\Livestats {
         $url = $config->url;
         $apikey = $config->apikey;
 
-        $api_url = $url.'api?output=json&apikey='.$apikey.'&mode='.$endpoint;
+        //print_r($config);
+        //die();
+
+        $url = rtrim($url, '/');
+
+        $api_url = $url.'/api?output=json&apikey='.$apikey.'&mode='.$endpoint;
         //die( $api_url.' --- ');
 
-        $client = new Client(['http_errors' => false]);
+        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
         $res = $client->request('GET', $api_url);
         return $res;
 

app/SupportedApps/Sickrage.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Sickrage implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#6185a6';
+    }
+    public function icon()
+    {
+        return 'supportedapps/sickrage.png';
+    }
+}

app/SupportedApps/Sonarr.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Sonarr implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#163740';
+    }
+    public function icon()
+    {
+        return 'supportedapps/sonarr.png';
+    }
+}

app/SupportedApps/Syncthing.php

@@ -0,0 +1,11 @@
+<?php namespace App\SupportedApps;
+class Syncthing implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#888';
+    }
+    public function icon()
+    {
+        return 'supportedapps/syncthing.png';
+    }
+}

app/SupportedApps/TVheadend.php

@@ -0,0 +1,14 @@
+<?php namespace App\SupportedApps;
+
+class TVheadend implements Contracts\Applications {
+    
+    public function defaultColour()
+    {
+        return '#006080';
+    }
+    public function icon()
+    {
+        return 'supportedapps/tvheadend.png';
+    }
+   
+}

app/SupportedApps/Tautulli.php

@@ -0,0 +1,77 @@
+<?php namespace App\SupportedApps;
+
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Client;
+
+class Tautulli implements Contracts\Applications, Contracts\Livestats {
+
+    public $config;
+
+    public function defaultColour()
+    {
+        return '#2d2208';
+    }
+    public function icon()
+    {
+        return 'supportedapps/tautulli.png';
+    }
+    public function configDetails()
+    {
+        return 'tautulli';
+    }
+    public function testConfig()
+    {
+        $res = $this->buildRequest('arnold');
+        switch($res->getStatusCode()) {
+            case 200:
+                $data = json_decode($res->getBody());
+                if(isset($data->error) && !empty($data->error)) {
+                    echo 'Failed: '.$data->error;
+                } else {
+                    echo 'Successfully connected to the API';
+                }
+                break;
+            case 401:
+                echo 'Failed: Invalid credentials';
+                break;
+            case 404:
+                echo 'Failed: Please make sure your URL is correct and that there is a trailing slash';
+                break;
+            default:
+                echo 'Something went wrong... Code: '.$res->getStatusCode();
+                break;
+        }
+    }
+    public function executeConfig()
+    {
+        $html = '';
+        $active = 'active';
+        $res = $this->buildRequest('get_activity');
+        $data = json_decode($res->getBody());
+        $stream_count = $data->response->data->stream_count;
+
+        $html = '
+        <ul class="livestats">
+            <li><span class="title">Stream Count</span><strong>'.$stream_count.'</strong></li>
+        </ul>
+        ';
+
+        return json_encode(['status' => $active, 'html' => $html]);
+    }
+    public function buildRequest($endpoint)
+    {
+        $config = $this->config;
+        $url = $config->url;
+        $apikey = $config->apikey;
+
+        $url = rtrim($url, '/');
+
+        $api_url = $url.'/api/v2?apikey='.$apikey.'&cmd='.$endpoint;
+
+        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
+        $res = $client->request('GET', $api_url);
+        return $res;
+
+    }
+   
+}

app/SupportedApps/Traefik.php

@@ -1,12 +1,78 @@
 <?php namespace App\SupportedApps;
 
-class Traefik implements Contracts\Applications {
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\GuzzleException;
+
+class Traefik implements Contracts\Applications, Contracts\Livestats
+{
+
     public function defaultColour()
     {
-        return '#427d8c';
+        return '#28434a';
     }
+
     public function icon()
     {
         return 'supportedapps/traefik.png';
     }
-}
+
+    public function configDetails()
+    {
+        return 'traefik';
+    }
+
+    public function testConfig()
+    {
+        $res = $this->sendRequest();
+        if ($res == null) {
+            echo 'Traefik connection failed';
+            return;
+        }
+        switch($res->getStatusCode()) {
+        case 200:
+            $data = json_decode($res->getBody());
+            echo "Successfully connected with status: ".$data->result."\n";
+            break;
+        case 404:
+            echo 'Failed: Please make sure your URL is correct and includes the port';
+            break;
+        default:
+            echo 'Something went wrong... Code: '.$res->getStatusCode();
+            break;
+        }
+    }
+
+    public function executeConfig()
+    {
+        $html = '';
+        $active = 'inactive';
+        $res = $this->sendRequest();
+        $data = json_decode($res->getBody());
+        if ($data) {
+            $avg_response_time = $data->average_response_time_sec;
+            $time = $avg_response_time*1000;
+            $time_output = number_format($time, 2);
+            $active = ($time > 0) ? 'active' : 'inactive';
+            $html = '
+                <ul class="livestats">
+                    <li><span class="title">Avg. Response Time</span><sub><i class="fas fa-heartbeat"></i> '.$time_output.' ms</sub></li>
+                </ul>
+            ';
+        }
+        return json_encode(['status' => $active, 'html' => $html]);
+    }
+
+    public function sendRequest()
+    {
+        $config = $this->config;
+        $url = $config->url;
+
+        $url = rtrim($url, '/');
+        $api_url = $url.'/health';
+
+        $client = new Client(['http_errors' => false, 'timeout' => 15, 'connect_timeout' => 15]);
+        $res = $client->request('GET', $api_url);
+
+        return $res;
+    }
+}

app/SupportedApps/Transmission.php

@@ -0,0 +1,169 @@
+<?php namespace App\SupportedApps;
+
+use GuzzleHttp\Exception\GuzzleException;
+use GuzzleHttp\Client;
+use Illuminate\Support\Facades\Log;
+
+class Transmission implements Contracts\Applications, Contracts\Livestats
+{
+
+    private $_client;
+    private $_clientOptions = array();
+
+    public function __construct()
+    {
+        $body = array();
+        $body["method"] = "torrent-get";
+        $body["arguments"] = array("fields" => ["percentDone","status","rateDownload","rateUpload"]);
+        $this->_client = new Client(
+            ['http_errors' => false,
+            'timeout' => 10,
+            'body' => json_encode($body)]
+        );
+    }
+
+    public function defaultColour()
+    {
+        return '#950003';
+    }
+    public function icon()
+    {
+        return 'supportedapps/transmission.png';
+    }
+    public function configDetails()
+    {
+        return 'transmission';
+    }
+    public function testConfig()
+    {
+        $res = $this->sendRequest();
+        if ($res == null) {
+            echo 'Transmission connection failed';
+            return;
+        }
+        switch($res->getStatusCode()) {
+        case 200:
+            $data = json_decode($res->getBody());
+            echo "Successfully connected with status: ".$data->result."\n";
+            break;
+        case 401:
+            echo 'Failed: Invalid credentials';
+            break;
+        case 404:
+            echo 'Failed: Please make sure your URL is correct and includes the port';
+            break;
+        case 409:
+            echo 'Failed: Incorrect session id';
+            break;
+        default:
+            echo 'Something went wrong... Code: '.$res->getStatusCode();
+            break;
+        }
+    }
+
+    public function executeConfig()
+    {
+        $html = '';
+        $active = 'active';
+        $res = $this->sendRequest();
+        if ($res == null) {
+            Log::debug('Transmission connection failed');
+            return '';
+        }
+        $data = json_decode($res->getBody());
+        if (! isset($data->arguments)) {
+            Log::debug('Failed to fetch data from Transmission');
+            return '';
+        }
+        $torrents = $data->arguments->torrents;
+        $torrentCount = count($torrents);
+        $rateDownload = $rateUpload = $completedTorrents = 0;
+        foreach ($torrents as $thisTorrent) {
+            $rateDownload += $thisTorrent->rateDownload;
+            $rateUpload += $thisTorrent->rateUpload;
+            if ($thisTorrent->percentDone == 1) {
+                $completedTorrents += 1;
+            }
+        }
+        if ($torrentCount - $completedTorrents == 0) {
+            // Don't poll as frequently if we don't have any active torrents
+            $active = 'inactive';
+        }
+
+        $html = '
+        <ul class="livestats">
+            <li><span class="title">Done</span><sub>'.$completedTorrents.' / '.$torrentCount.'</sub></li>
+            <li><span class="title">Down</span><sub>'.format_bytes($rateDownload).'</sub></li>
+            <li><span class="title">Up</span><sub>'.format_bytes($rateUpload).'</sub></li>
+        </ul>
+        ';
+        return json_encode(['status' => $active, 'html' => $html]);;
+    }
+
+    private function sendRequest()
+    {
+        $optionsSet = $this->setClientOptions();
+        if (! $optionsSet) {
+            // Pass the failed response back up the chain
+            return null;
+        }
+        $res = $this->torrentGet();
+        if ($res->getStatusCode() == 409) {
+            $this->setClientOptions();
+            $res = $this->torrentGet();
+        }
+        return $res;
+    }
+
+    private function torrentGet()
+    {
+        $res = null;
+        try{
+            $res = $this->_client->request(
+                'POST',
+                $this->getApiUrl(),
+                $this->_clientOptions
+            );
+        }catch(\GuzzleHttp\Exception\BadResponseException $e){
+            Log::error("Connection to {$e->getRequest()->getUrl()} failed");
+            Log::debug($e->getMessage());
+            $res = $e->getRequest();
+        }catch(\GuzzleHttp\Exception\ConnectException $e) {
+            Log::error("Transmission connection refused");
+            Log::debug($e->getMessage());
+        }
+        return $res;
+    }
+
+    private function setClientOptions()
+    {
+        if ($this->config->username != '' || $this->config->password != '') {
+            $this->_clientOptions = ['auth'=> [$this->config->username, $this->config->password, 'Basic']];
+        }
+        try{
+            $res = $this->_client->request('HEAD', $this->getApiUrl(), $this->_clientOptions);
+            $xtId = $res->getHeaderLine('X-Transmission-Session-Id');
+            if ($xtId != null) {
+                $this->_clientOptions['headers'] = ['X-Transmission-Session-Id' => $xtId];
+            } else {
+                Log::error("Unable to get Transmission session information");
+                Log::debug("Status Code: ".$res->getStatusCode());
+            }
+        }catch(\GuzzleHttp\Exception\ConnectException $e){
+            Log::error("Failed connection to Transmission");
+            return false;
+        }
+        return true;
+    }
+
+    private function getApiUrl()
+    {
+        $config = $this->config;
+        $url = $config->url;
+
+        $url = rtrim($url, '/');
+        $api_url = $url.'/transmission/rpc';
+
+        return $api_url;
+    }
+}

app/SupportedApps/Ttrss.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Ttrss implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#9d704c';
+    }
+    public function icon()
+    {
+        return 'supportedapps/tt-rss.png';
+    }
+}

app/SupportedApps/Unraid.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Unraid implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#A12624';
+    }
+    public function icon()
+    {
+        return 'supportedapps/unraid.png';
+    }
+}

app/SupportedApps/Virtualmin.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Virtualmin implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#161b1f';
+    }
+    public function icon()
+    {
+        return 'supportedapps/virtualmin.svg';
+    }
+}

app/SupportedApps/Watcher3.php

@@ -0,0 +1,11 @@
+<?php namespace App\SupportedApps;
+class Watcher3 implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#500';
+    }
+    public function icon()
+    {
+        return 'supportedapps/watcher3.png';
+    }
+}

app/SupportedApps/WebTools.php

@@ -0,0 +1,11 @@
+<?php namespace App\SupportedApps;
+class WebTools implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#555';
+    }
+    public function icon()
+    {
+        return 'supportedapps/webtools.png';
+    }
+}

app/SupportedApps/Webmin.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class Webmin implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#161b1f';
+    }
+    public function icon()
+    {
+        return 'supportedapps/webmin.svg';
+    }
+}

app/SupportedApps/pyLoad.php

@@ -0,0 +1,11 @@
+<?php namespace App\SupportedApps;
+class pyLoad implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#881';
+    }
+    public function icon()
+    {
+        return 'supportedapps/pyload.png';
+    }
+}

app/SupportedApps/ruTorrent.php

@@ -0,0 +1,12 @@
+<?php namespace App\SupportedApps;
+
+class ruTorrent implements Contracts\Applications {
+    public function defaultColour()
+    {
+        return '#004';
+    }
+    public function icon()
+    {
+        return 'supportedapps/rutorrent.png';
+    }
+}

app/User.php

@@ -15,7 +15,7 @@ class User extends Authenticatable
      * @var array
      */
     protected $fillable = [
-        'name', 'email', 'password',
+        'username', 'email', 'password',
     ];
 
     /**
@@ -26,4 +26,35 @@ class User extends Authenticatable
     protected $hidden = [
         'password', 'remember_token',
     ];
+
+    /**
+     * Get the items for the user.
+     */
+    public function items()
+    {
+        return $this->hasMany('App\Item');
+    }
+
+    /**
+     * The settings that belong to the user.
+     */
+    public function settings()
+    {
+        return $this->belongsToMany('App\Setting')->withPivot('uservalue');
+    }
+
+    public static function currentUser()
+    {
+        $current_user = session('current_user');
+        if ($current_user) { // if logged in, set this user
+            return $current_user;
+        } else { // not logged in, get first user
+            $user = User::first();
+            session(['current_user' => $user]);
+            return $user;
+        }
+
+    }
+
+
 }

composer.json

@@ -6,9 +6,9 @@
     "type": "project",
     "require": {
         "php": ">=7.0.0",
-        "fideloper/proxy": "~3.3",
+        "fideloper/proxy": "^4.0",
         "guzzlehttp/guzzle": "^6.3",
-        "laravel/framework": "5.5.*",
+        "laravel/framework": "5.7.*",
         "laravel/tinker": "~1.0",
         "laravelcollective/html": "^5.5"
     },

config/app.php

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

database/migrations/2018_02_16_175830_add_columns_to_items_for_groups.php

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

database/migrations/2018_02_16_193703_item_tag.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class ItemTag extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('item_tag', function (Blueprint $table) {
+            $table->integer('item_id')->unsigned()->index();
+            $table->foreign('item_id')->references('id')->on('items')->onDelete('cascade');
+
+            $table->integer('tag_id')->unsigned()->index();
+            $table->foreign('tag_id')->references('id')->on('items')->onDelete('cascade');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('item_tag');
+    }
+}

database/migrations/2018_10_12_122907_create_users_table.php

@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('users', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('username')->unique();
+            $table->string('email');
+            $table->string('avatar')->nullable();
+            $table->string('password')->nullable();
+            $table->string('autologin')->nullable()->index();
+            $table->boolean('public_front')->default(false);
+            $table->rememberToken();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('users');
+    }
+}

database/migrations/2018_10_12_123036_create_password_resets_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePasswordResetsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('password_resets', function (Blueprint $table) {
+            $table->string('email')->index();
+            $table->string('token');
+            $table->timestamp('created_at')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('password_resets');
+    }
+}

database/migrations/2018_10_12_131222_add_user_id_to_items_table.php

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

database/migrations/2018_10_12_140451_create_setting_user_pivot_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateSettingUserPivotTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('setting_user', function (Blueprint $table) {
+            $table->integer('setting_id')->unsigned()->index();
+            $table->foreign('setting_id')->references('id')->on('settings')->onDelete('cascade');
+            $table->integer('user_id')->unsigned()->index();
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+            $table->primary(['setting_id', 'user_id']);
+            $table->string('uservalue')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('setting_user');
+    }
+}

database/seeds/DatabaseSeeder.php

@@ -12,5 +12,6 @@ class DatabaseSeeder extends Seeder
     public function run()
     {
         $this->call(SettingsSeeder::class);
+        $this->call(UsersSeeder::class);
     }
 }

database/seeds/SettingsSeeder.php

@@ -90,7 +90,8 @@ class SettingsSeeder extends Seeder
             'none' => 'app.options.none',
             'google' => 'app.options.google',
             'ddg' => 'app.options.ddg',
-            'bing' => 'app.options.bing'
+            'bing' => 'app.options.bing',
+            'startpage' => 'app.options.startpage',
         ]);
 
         if(!$setting = Setting::find(4)) {
@@ -115,6 +116,9 @@ class SettingsSeeder extends Seeder
             'en' => 'English',
             'fi' => 'Suomi (Finnish)',
             'fr' => 'Français (French)',
+            'it' => 'Italiano (Italian)',
+            'no' => 'Norsk (Norwegian)',   
+            'pl' => 'Polski (Polish)',            
             'sv' => 'Svenska (Swedish)',
             'es' => 'Español (Spanish)',
             'tr' => 'Türkçe (Turkish)',
@@ -134,6 +138,60 @@ class SettingsSeeder extends Seeder
             $setting->save();
         }
 
-        
+        $window_target_options = json_encode([
+            'current' => 'app.settings.window_target.current',
+            'heimdall' => 'app.settings.window_target.one',
+            '_blank' => 'app.settings.window_target.new',
+        ]);
+
+        if(!$setting = Setting::find(7)) {
+            
+            $setting = new Setting;
+            $setting->id = 7;
+            $setting->group_id = 3;
+            $setting->key = 'window_target';
+            $setting->type = 'select';
+            $setting->options = $window_target_options;
+            $setting->label = 'app.settings.window_target';
+            $setting->value = 'heimdall';
+            $setting->save();
+        } else {
+            $setting->options = $window_target_options;
+            $setting->label = 'app.settings.window_target';
+            $setting->save();
+        }
+
+        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();
+        } else {
+            $setting = new Setting;
+            $setting->id = 8;
+            $setting->group_id = 1;
+            $setting->key = 'support';
+            $setting->type = 'text';
+            $setting->label = 'app.settings.support';
+            $setting->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>';
+            $setting->system = true;
+            $setting->save();
+        }
+
+        if($donate = Setting::find(9)) {
+            $donate->label = 'app.settings.donate';
+            $donate->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>';
+            $donate->save();
+        } else {
+            $setting = new Setting;
+            $setting->id = 9;
+            $setting->group_id = 1;
+            $setting->key = 'donate';
+            $setting->type = 'text';
+            $setting->label = 'app.settings.donate';
+            $setting->value = '<a rel="noopener" target="_blank" href="https://paypal.me/pools/c/81ZR4dfBGo">Paypal</a>';
+            $setting->system = true;
+            $setting->save();
+        }
+
     }
 }

database/seeds/UsersSeeder.php

@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Seeder;
+use App\User;
+
+class UsersSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        // Groups
+        if(!$user = User::find(1)) {
+            $user = new User;
+            $user->id = 1;
+            $user->username = 'admin';
+            $user->email = 'admin@test.com';
+            $user->password = null;
+            $user->save();
+        } else {
+            //$user->save();
+        }
+    }
+}

mix-manifest.json

@@ -0,0 +1,3 @@
+{
+    "/css/app.css": "/css/app.css"
+}

package.json

@@ -10,15 +10,12 @@
         "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
     },
     "devDependencies": {
-        "axios": "^0.17",
         "bootstrap-sass": "^3.3.7",
-        "cross-env": "^5.1.3",
+        "cross-env": "^5.2.0",
         "jquery": "^3.2",
-        "laravel-mix": "^1.0",
-        "lodash": "^4.17.4",
-        "vue": "^2.5.7"
+        "laravel-mix": "^2.0"
     },
     "dependencies": {
-        "node-sass": "^4.7.2"
+        "select2": "^4.0.6-rc.1"
     }
 }

public/img/heimdall-logo-small.svg

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="15pt" height="12pt" viewBox="0 0 16 16" version="1.1">
+<g id="surface1">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 8.464844 8.046875 L 8.464844 7.566406 L 8.628906 7.050781 C 9.78125 5.898438 10.6875 4.824219 10.847656 4.492188 L 10.648438 4.5625 C 10.648438 4.5625 10.832031 4.332031 10.8125 4.203125 C 10.667969 1.949219 9.40625 0.773438 9.058594 0.484375 C 9.570312 1.105469 9.429688 1.308594 9.429688 1.308594 C 9.207031 0.882812 8.742188 0.472656 8.652344 0.367188 L 8.542969 1.023438 C 8.980469 1.28125 8.863281 1.429688 8.863281 1.429688 C 8.761719 1.28125 8.480469 1.152344 8.480469 1.152344 L 8.449219 1.335938 C 8.585938 1.398438 9.1875 1.765625 9.191406 2.710938 C 9.191406 3.863281 8.542969 4.164062 8.429688 4.210938 C 8.050781 3.980469 7.640625 3.984375 7.539062 3.976562 C 7.4375 3.984375 7.027344 3.980469 6.648438 4.210938 C 6.535156 4.164062 5.882812 3.863281 5.882812 2.710938 C 5.890625 1.765625 6.492188 1.398438 6.625 1.335938 L 6.597656 1.152344 C 6.597656 1.152344 6.316406 1.28125 6.210938 1.429688 C 6.210938 1.429688 6.097656 1.28125 6.535156 1.023438 L 6.425781 0.367188 C 6.332031 0.472656 5.871094 0.882812 5.644531 1.308594 C 5.644531 1.308594 5.503906 1.105469 6.015625 0.484375 C 5.667969 0.773438 4.410156 1.949219 4.261719 4.203125 C 4.246094 4.332031 4.425781 4.5625 4.425781 4.5625 L 4.230469 4.492188 C 4.390625 4.824219 5.296875 5.898438 6.445312 7.050781 L 6.609375 7.566406 L 6.609375 8.046875 L 6.464844 7.53125 L 6.132812 6.980469 L 6.132812 7.542969 C 6.269531 7.933594 6.804688 8.722656 6.804688 8.722656 L 6.804688 7.085938 L 4.757812 4.835938 C 4.757812 4.835938 6.035156 5.886719 6.402344 6.261719 L 6.59375 6.066406 C 6.355469 5.894531 5.324219 4.851562 5.230469 3.929688 C 6.007812 5.585938 6.753906 5.792969 7.300781 6.4375 L 7.300781 6.59375 L 7.777344 6.59375 L 7.777344 6.4375 C 8.324219 5.792969 9.070312 5.585938 9.84375 3.929688 C 9.753906 4.851562 8.722656 5.894531 8.484375 6.066406 L 8.675781 6.261719 C 9.042969 5.886719 10.320312 4.835938 10.320312 4.835938 L 8.273438 7.085938 L 8.273438 8.722656 C 8.273438 8.722656 8.808594 7.933594 8.945312 7.542969 L 8.945312 6.980469 L 8.613281 7.53125 Z M 7.539062 6.070312 C 7.195312 5.839844 6.3125 5.300781 5.949219 4.460938 C 6.152344 4.703125 6.375 4.929688 6.609375 5.136719 C 6.609375 5.136719 6.589844 4.542969 6.632812 4.414062 C 6.714844 5.125 6.886719 5.429688 7.539062 5.808594 C 8.191406 5.429688 8.359375 5.125 8.441406 4.414062 C 8.488281 4.542969 8.464844 5.136719 8.464844 5.136719 C 8.703125 4.929688 8.925781 4.703125 9.128906 4.460938 C 8.761719 5.300781 7.882812 5.839844 7.539062 6.070312 Z M 7.539062 6.070312 "/>
+</g>
+</svg>

public/img/heimdall-logo.svg

@@ -0,0 +1,14 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="780" height="619" viewBox="0 0 780 619">
+  <metadata><?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.6-c138 79.159824, 2016/09/14-01:09:01        ">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""/>
+   </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?></metadata>
+  <path class="cls-1" d="M440.227,415.119V390.2l8.552-26.577C508.647,304.3,555.686,248.776,564,231.691l-10.215,3.56s9.5-11.864,8.552-18.51c-7.6-116.273-73.17-176.862-91.226-191.732,26.607,31.955,19.326,42.4,19.326,42.4C478.714,45.576,454.64,24.377,449.888,19l-5.7,33.853c22.806,13.289,16.79,20.882,16.79,20.882C455.591,66.141,441.021,59.5,441.021,59.5l-1.586,9.491c6.973,3.165,38.327,22.149,38.565,70.872,0,59.323-33.735,74.985-39.674,77.357-19.718-11.865-41.1-11.627-46.326-12.1-5.226.474-26.608,0.236-46.324,12.1C339.735,214.844,306,199.182,306,139.859c0.238-48.723,31.6-67.707,38.564-70.872L342.983,59.5s-14.574,6.644-19.955,14.238c0,0-6.022-7.593,16.786-20.882L334.112,19c-4.752,5.378-28.824,26.577-40.543,48.407,0,0-7.288-10.443,19.32-42.4-18.054,14.87-83.625,75.459-91.226,191.732-0.95,6.646,8.554,18.51,8.554,18.51L220,231.691c8.316,17.085,55.355,72.612,115.221,131.935l8.554,26.577v24.916l-7.6-26.577L318.83,360.067v28.95C325.957,409.186,353.751,450,353.751,450V365.525L247.32,249.488s66.52,54.1,85.526,73.56l9.978-10.2c-12.355-8.78-66.045-62.646-70.8-110.1,40.388,85.426,79.111,96.1,107.62,129.325V340.2h24.707v-8.131c28.508-33.221,67.233-43.9,107.619-129.325-4.75,47.459-58.442,101.325-70.8,110.1l9.976,10.2c19.006-19.458,85.526-73.56,85.526-73.56L430.249,365.525V450s27.8-40.815,34.923-60.984v-28.95l-17.343,28.475ZM392,313.083c-17.818-11.865-63.668-39.629-82.672-83.053a314.117,314.117,0,0,0,34.447,34.882s-1.189-30.61,1.186-37.255c4.276,36.781,13.068,52.442,47.039,71.9,33.973-19.458,42.763-35.119,47.039-71.9,2.375,6.645,1.188,37.255,1.188,37.255a314.117,314.117,0,0,0,34.447-34.882C455.668,273.454,409.818,301.218,392,313.083Z"/>
+</svg>

public/js/app.js

@@ -11,10 +11,10 @@ $.when( $.ready ).then(function() {
 
     if($('.message-container').length) {
         setTimeout(
-        function() 
-        {
-            $('.message-container').fadeOut();
-        }, 3500);
+            function()
+            {
+                $('.message-container').fadeOut();
+            }, 3500);
     }
 
     if($('.livestats-container').length) {
@@ -27,27 +27,61 @@ $.when( $.ready ).then(function() {
             var timer = 5000;
             (function worker() {
                 $.ajax({
-                  url: '/get_stats/'+id, 
-                  success: function(data) {
-                    container.html(data);
-                    if(data != '') timer = increaseby;
-                    else {
-                        if(timer < max_timer) timer += 2000;
-                    }
-                  },
-                  complete: function() {
+                    url: '/get_stats/'+id,
+                    dataType: 'json',
+                    success: function(data) {
+                        container.html(data.html);
+                        if(data.status == 'active') timer = increaseby;
+                        else {
+                            if(timer < max_timer) timer += 2000;
+                        }
+                    },
+                    complete: function() {
                     // Schedule the next request when the current one's complete
-                    setTimeout(worker, timer);
-                  }
+                        setTimeout(worker, timer);
+                    }
                 });
-              })();
+            })();
         });
 
     }
 
-    $( "#sortable" ).sortable({
+    function readURL(input) {
+
+        if (input.files && input.files[0]) {
+            var reader = new FileReader();
+
+            reader.onload = function(e) {
+                $('#appimage img').attr('src', e.target.result);
+            };
+
+            reader.readAsDataURL(input.files[0]);
+        }
+    }
+
+    $('#upload').change(function() {
+        readURL(this);
+    });
+    /*$(".droppable").droppable({
+        tolerance: "intersect",
+        drop: function( event, ui ) {
+            var tag = $( this ).data('id');
+            var item = $( ui.draggable ).data('id');
+
+            $.get('tag/add/'+tag+'/'+item, function(data) {
+                if(data == 1) {
+                    $( ui.draggable ).remove();
+                } else {
+                    alert('not added');
+                }
+            });
+
+        }
+      });*/
+
+    $( '#sortable' ).sortable({
         stop: function (event, ui) {
-            var idsInOrder = $("#sortable").sortable('toArray', {
+            var idsInOrder = $('#sortable').sortable('toArray', {
                 attribute: 'data-id'
             });
             $.post(
@@ -55,11 +89,12 @@ $.when( $.ready ).then(function() {
                 { order:idsInOrder }
             );
         }
-    
-    });
-    $("#sortable").sortable("disable");
 
-    
+    });
+    $('#sortable').sortable('disable');
+
+
+
     $('#app').on('click', '#config-button', function(e) {
         e.preventDefault();
         var app = $('#app');
@@ -69,50 +104,45 @@ $.when( $.ready ).then(function() {
             $('.add-item').hide();
             $('.item-edit').hide();
             $('#app').removeClass('sidebar');
-            $("#sortable").sortable("disable")
+            $('#sortable').sortable('disable');
         } else {
-            $("#sortable").sortable("enable")
-            setTimeout(
-                function() 
-                {
-                  $('.add-item').fadeIn();
-                  $('.item-edit').fadeIn();
-                }, 350);
-    
+            $('#sortable').sortable('enable');
+            setTimeout(function() {
+                $('.add-item').fadeIn();
+                $('.item-edit').fadeIn();
+            }, 350);
+
         }
     }).on('click', '#add-item, #pin-item', function(e) {
         e.preventDefault();
         var app = $('#app');
         var active = (app.hasClass('sidebar'));
         app.toggleClass('sidebar');
-        
+
     }).on('click', '.close-sidenav', function(e) {
         e.preventDefault();
         var app = $('#app');
         app.removeClass('sidebar');
-        
+
     }).on('click', '#test_config', function(e) {
         e.preventDefault();
         var apiurl = $('#create input[name=url]').val();
-        
-        
-        var override_url = $('#create input[name=override_url]');
-        if(override_url.length && override_url.val() != '') {
+
+        var override_url = $('#create input[name="config[override_url]"]').val();
+        if(override_url.length && override_url != '') {
             apiurl = override_url;
         }
+
         var data = {};
         data['url'] = apiurl;
         $('input.config-item').each(function(index){
             var config = $(this).data('config');
             data[config] = $(this).val();
-        })
+        });
 
-        $.post(
-            '/test_config',
-            { data }, function(data) {
-                alert(data);
-            }
-        );
+        $.post('/test_config', { data: data }, function(data) {
+            alert(data);
+        });
 
     });
     $('#pinlist').on('click', 'a', function(e) {
@@ -125,5 +155,5 @@ $.when( $.ready ).then(function() {
             current.toggleClass('active');
         });
     });
-    
-});
+
+});