Move models to app/Models

.phpstorm.meta.php

@@ -210,7 +210,7 @@
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
-            'settings' => \App\Setting::class,
+            'settings' => \App\Models\Setting::class,
             'translation.loader' => \Illuminate\Translation\FileLoader::class,
             'translator' => \Illuminate\Translation\Translator::class,
             'url' => \Illuminate\Routing\UrlGenerator::class,
@@ -418,7 +418,7 @@
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
-            'settings' => \App\Setting::class,
+            'settings' => \App\Models\Setting::class,
             'translation.loader' => \Illuminate\Translation\FileLoader::class,
             'translator' => \Illuminate\Translation\Translator::class,
             'url' => \Illuminate\Routing\UrlGenerator::class,
@@ -626,7 +626,7 @@
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
-            'settings' => \App\Setting::class,
+            'settings' => \App\Models\Setting::class,
             'translation.loader' => \Illuminate\Translation\FileLoader::class,
             'translator' => \Illuminate\Translation\Translator::class,
             'url' => \Illuminate\Routing\UrlGenerator::class,
@@ -834,7 +834,7 @@
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
-            'settings' => \App\Setting::class,
+            'settings' => \App\Models\Setting::class,
             'translation.loader' => \Illuminate\Translation\FileLoader::class,
             'translator' => \Illuminate\Translation\Translator::class,
             'url' => \Illuminate\Routing\UrlGenerator::class,
@@ -1042,7 +1042,7 @@
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
-            'settings' => \App\Setting::class,
+            'settings' => \App\Models\Setting::class,
             'translation.loader' => \Illuminate\Translation\FileLoader::class,
             'translator' => \Illuminate\Translation\Translator::class,
             'url' => \Illuminate\Routing\UrlGenerator::class,
@@ -1250,7 +1250,7 @@
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
-            'settings' => \App\Setting::class,
+            'settings' => \App\Models\Setting::class,
             'translation.loader' => \Illuminate\Translation\FileLoader::class,
             'translator' => \Illuminate\Translation\Translator::class,
             'url' => \Illuminate\Routing\UrlGenerator::class,
@@ -1458,7 +1458,7 @@
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
-            'settings' => \App\Setting::class,
+            'settings' => \App\Models\Setting::class,
             'translation.loader' => \Illuminate\Translation\FileLoader::class,
             'translator' => \Illuminate\Translation\Translator::class,
             'url' => \Illuminate\Routing\UrlGenerator::class,
@@ -1666,7 +1666,7 @@
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
-            'settings' => \App\Setting::class,
+            'settings' => \App\Models\Setting::class,
             'translation.loader' => \Illuminate\Translation\FileLoader::class,
             'translator' => \Illuminate\Translation\Translator::class,
             'url' => \Illuminate\Routing\UrlGenerator::class,
@@ -1874,7 +1874,7 @@
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
-            'settings' => \App\Setting::class,
+            'settings' => \App\Models\Setting::class,
             'translation.loader' => \Illuminate\Translation\FileLoader::class,
             'translator' => \Illuminate\Translation\Translator::class,
             'url' => \Illuminate\Routing\UrlGenerator::class,
@@ -2082,7 +2082,7 @@
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
-            'settings' => \App\Setting::class,
+            'settings' => \App\Models\Setting::class,
             'translation.loader' => \Illuminate\Translation\FileLoader::class,
             'translator' => \Illuminate\Translation\Translator::class,
             'url' => \Illuminate\Routing\UrlGenerator::class,
@@ -2290,7 +2290,7 @@
             'router' => \Illuminate\Routing\Router::class,
             'session' => \Illuminate\Session\SessionManager::class,
             'session.store' => \Illuminate\Session\Store::class,
-            'settings' => \App\Setting::class,
+            'settings' => \App\Models\Setting::class,
             'translation.loader' => \Illuminate\Translation\FileLoader::class,
             'translator' => \Illuminate\Translation\Translator::class,
             'url' => \Illuminate\Routing\UrlGenerator::class,

_ide_helper.php

@@ -1823,7 +1823,7 @@
                     /**
          * Get the currently authenticated user.
          *
-         * @return \App\User|null 
+         * @return \App\Models\User|null 
          * @static 
          */        public static function user()
         {
@@ -1855,7 +1855,7 @@
          * Log the given user ID into the application without sessions or cookies.
          *
          * @param mixed $id
-         * @return \App\User|false 
+         * @return \App\Models\User|false 
          * @static 
          */        public static function onceUsingId($id)
         {
@@ -1929,7 +1929,7 @@
          *
          * @param mixed $id
          * @param bool $remember
-         * @return \App\User|false 
+         * @return \App\Models\User|false 
          * @static 
          */        public static function loginUsingId($id, $remember = false)
         {
@@ -1977,7 +1977,7 @@
          *
          * @param string $password
          * @param string $attribute
-         * @return \App\User|null 
+         * @return \App\Models\User|null 
          * @throws \Illuminate\Auth\AuthenticationException
          * @static 
          */        public static function logoutOtherDevices($password, $attribute = 'password')
@@ -1999,7 +1999,7 @@
                     /**
          * Get the last user we attempted to authenticate.
          *
-         * @return \App\User 
+         * @return \App\Models\User 
          * @static 
          */        public static function getLastAttempted()
         {
@@ -2103,7 +2103,7 @@
                     /**
          * Return the currently cached user.
          *
-         * @return \App\User|null 
+         * @return \App\Models\User|null 
          * @static 
          */        public static function getUser()
         {
@@ -2155,7 +2155,7 @@
                     /**
          * Determine if the current user is authenticated. If not, throw an exception.
          *
-         * @return \App\User 
+         * @return \App\Models\User 
          * @throws \Illuminate\Auth\AuthenticationException
          * @static 
          */        public static function authenticate()

app/Console/Commands/RegisterApp.php

@@ -2,7 +2,7 @@
 
 namespace App\Console\Commands;
 
-use App\Application;
+use App\Models\Application;
 use App\SupportedApps;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Storage;

app/Helper.php

@@ -92,7 +92,7 @@ function title_color($hex): string
  */
 function getLinkTargetAttribute(): string
 {
-    $target = \App\Setting::fetch('window_target');
+    $target = \App\Models\Setting::fetch('window_target');
 
     if ($target === 'current') {
         return '';

app/Http/Controllers/Auth/LoginController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\User;
+use App\Models\User;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;

app/Http/Controllers/Auth/RegisterController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use App\User;
+use App\Models\User;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Validator;
 

app/Http/Controllers/Controller.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;

app/Http/Controllers/HealthController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Item;
-use App\User;
+use App\Models\Item;
+use App\Models\User;
 use Illuminate\Contracts\Container\BindingResolutionException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;

app/Http/Controllers/ItemController.php

@@ -2,10 +2,10 @@
 
 namespace App\Http\Controllers;
 
-use App\Application;
-use App\Item;
 use App\Jobs\ProcessApps;
-use App\User;
+use App\Models\Application;
+use App\Models\Item;
+use App\Models\User;
 use GuzzleHttp\Client;
 use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\GuzzleException;
@@ -35,7 +35,7 @@ public function __construct()
      */
     public function dash(): View
     {
-        $treat_tags_as = \App\Setting::fetch('treat_tags_as');
+        $treat_tags_as = \App\Models\Setting::fetch('treat_tags_as');
 
         $data["treat_tags_as"] = $treat_tags_as;
 

app/Http/Controllers/ItemRestController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Item;
+use App\Models\Item;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 use Illuminate\Support\Collection;

app/Http/Controllers/SettingsController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Setting;
-use App\SettingGroup;
+use App\Models\Setting;
+use App\Models\SettingGroup;
 use Exception;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;

app/Http/Controllers/TagController.php

@@ -2,8 +2,8 @@
 
 namespace App\Http\Controllers;
 
-use App\Item;
-use App\User;
+use App\Models\Item;
+use App\Models\User;
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\View\View;

app/Http/Controllers/UserController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;

app/Http/Middleware/CheckAllowed.php

@@ -2,14 +2,13 @@
 
 namespace App\Http\Middleware;
 
-use Symfony\Component\HttpFoundation\Response;
-use App\User;
+use App\Models\User;
 use Closure;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
-use Session;
+use Symfony\Component\HttpFoundation\Response;
 
 class CheckAllowed
 {

app/Jobs/ProcessApps.php

@@ -2,8 +2,8 @@
 
 namespace App\Jobs;
 
-use App\Application;
-use App\Item;
+use App\Models\Application;
+use App\Models\Item;
 use App\SupportedApps;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Bus\Queueable;

app/Jobs/UpdateApps.php

@@ -2,7 +2,7 @@
 
 namespace App\Jobs;
 
-use App\Application;
+use App\Models\Application;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeUnique;

app/Application.php → app/Models/Application.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
+use App\SupportedApps;
 use GuzzleHttp\Exception\GuzzleException;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
@@ -38,6 +39,7 @@
  * @method static Builder|Application whereTileBackground($value)
  * @method static Builder|Application whereUpdatedAt($value)
  * @method static Builder|Application whereWebsite($value)
+ * @mixin \Eloquent
  */
 class Application extends Model
 {
@@ -86,7 +88,7 @@ public function class(): string
         $name = $this->name;
         $name = preg_replace('/[^\p{L}\p{N}]/u', '', $name);
 
-        return \App\SupportedApps::class.'\\'.$name.'\\'.$name;
+        return SupportedApps::class.'\\'.$name.'\\'.$name;
     }
 
     /**
@@ -96,7 +98,7 @@ public static function classFromName($name): string
     {
         $name = preg_replace('/[^\p{L}\p{N}]/u', '', $name);
 
-        $class = \App\SupportedApps::class.'\\'.$name.'\\'.$name;
+        $class = SupportedApps::class.'\\'.$name.'\\'.$name;
 
         return $class;
     }
@@ -172,7 +174,7 @@ public static function single($appid)
             return null;
         }
         $classname = preg_replace('/[^\p{L}\p{N}]/u', '', $app->name);
-        $app->class = \App\SupportedApps::class.'\\'.$classname.'\\'.$classname;
+        $app->class = SupportedApps::class.'\\'.$classname.'\\'.$classname;
 
         return $app;
     }

app/Item.php → app/Models/Item.php

@@ -1,15 +1,17 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
+use App\EnhancedApps;
+use App\SearchInterface;
 use Illuminate\Contracts\Routing\UrlGenerator;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Database\Eloquent\Casts\Attribute;
 use stdClass;
 use Symfony\Component\ClassLoader\ClassMapGenerator;
 
@@ -42,7 +44,7 @@
  * @property-read string $link_type
  * @property-read \Illuminate\Database\Eloquent\Collection|Item[] $parents
  * @property-read int|null $parents_count
- * @property-read \App\User|null $user
+ * @property-read \App\Models\User|null $user
  * @method static \Database\Factories\ItemFactory factory(...$parameters)
  * @method static Builder|Item newModelQuery()
  * @method static Builder|Item newQuery()
@@ -68,6 +70,7 @@
  * @method static Builder|Item whereUserId($value)
  * @method static \Illuminate\Database\Query\Builder|Item withTrashed()
  * @method static \Illuminate\Database\Query\Builder|Item withoutTrashed()
+ * @property-read mixed $tag_url
  * @mixin \Eloquent
  */
 // @codingStandardsIgnoreEnd