Moved User model back to the app folder

app/Console/Kernel.php

@@ -4,7 +4,7 @@ namespace App\Console;
 
 use App\Models\AdminNotification;
 use App\Models\Notification;
-use App\Models\User;
+use App\User;
 use App\Http\Controllers\MarketController;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;

app/Http/Controllers/Auth/LoginController.php

@@ -9,7 +9,7 @@ use App\Models\UserSettings;
 use Carbon\Carbon;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Request;
-use App\Models\User;
+use App\User;
 use App\Models\RoleMapping;
 use App\Models\RoleUser;
 use Illuminate\Support\Facades\Event;

app/Http/Controllers/HomeController.php

@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\LimanRequest;
 use App\Models\Server;
-use App\Models\User;
+use App\User;
 use App\Models\UserSettings;
 use App\Models\Extension;
 use App\Models\Widget;

app/Http/Controllers/Notification/MainController.php

@@ -6,7 +6,7 @@ use App\Models\AdminNotification;
 use App\Models\Notification;
 use App\Http\Controllers\Controller;
 use App\Notifications\NotificationSent;
-use App\Models\User;
+use App\User;
 
 class MainController extends Controller
 {

app/Http/Controllers/Permission/MainController.php

@@ -4,7 +4,7 @@ namespace App\Http\Controllers\Permission;
 
 use App\Models\LimanRequest;
 use App\Models\Notification;
-use App\Models\User;
+use App\User;
 use App\Http\Controllers\Controller;
 
 class MainController extends Controller

app/Http/Controllers/Server/OneController.php

@@ -8,7 +8,7 @@ use App\Models\ConnectorToken;
 use App\Models\Extension;
 use App\Http\Controllers\Controller;
 use App\Models\Notification;
-use App\Models\User;
+use App\User;
 use App\Models\Permission;
 use Carbon\Carbon;
 use Exception;

app/Http/Controllers/Settings/MainController.php

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Settings;
 use App\Models\Extension;
 use App\Models\Permission;
 use App\Models\Server;
-use App\Models\User;
+use App\User;
 use App\Models\Role;
 use App\Http\Controllers\Controller;
 use App\Models\AdminNotification;
@@ -69,7 +69,7 @@ class MainController extends Controller
     public function getUserList()
     {
         return view('l.table', [
-            "value" => \App\Models\User::all(),
+            "value" => \App\User::all(),
             "title" => ["Kullanıcı Adı", "Email", "*hidden*"],
             "display" => ["name", "email", "id:user_id"],
             "menu" => [
@@ -618,7 +618,7 @@ input(type=\"imtcp\" port=\"514\")";
                 continue;
             }
             $foo = explode(" ", trim($ip));
-            if(count($foo) == 1){
+            if (count($foo) == 1) {
                 continue;
             }
             array_push($clean, $foo[1]);
@@ -629,7 +629,11 @@ input(type=\"imtcp\" port=\"514\")";
     public function setDNSServers()
     {
         $system = rootSystem();
-        $flag = $system->dnsUpdate(request('dns1'),request('dns2'),request('dns3'));
+        $flag = $system->dnsUpdate(
+            request('dns1'),
+            request('dns2'),
+            request('dns3')
+        );
         if ($flag) {
             return respond("DNS Ayarları güncellendi!");
         } else {

app/Http/Controllers/UserController.php

@@ -4,7 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\Permission;
 use App\Models\RoleUser;
-use App\Models\User;
+use App\User;
 use App\Models\UserSettings;
 use App\Models\AccessToken;
 use App\Models\Server;

app/Models/Permission.php

@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use App\User;
 
 class Permission extends Model
 {

app/Models/Role.php

@@ -17,6 +17,6 @@ class Role extends Model
 
     public function users()
     {
-        return $this->belongsToMany('App\Models\User', "role_users");
+        return $this->belongsToMany('App\User', "role_users");
     }
 }

app/Models/RoleUser.php

@@ -12,7 +12,7 @@ class RoleUser extends Model
 
     public function user()
     {
-        return $this->belongsTo('App\Models\User');
+        return $this->belongsTo('App\User');
     }
 
     public function role()

app/Observers/AdminNotificationObserver.php

@@ -3,7 +3,7 @@
 namespace App\Observers;
 
 use App\Models\AdminNotification;
-use App\Models\User;
+use App\User;
 use App\Notifications\NotificationSent;
 
 class AdminNotificationObserver

app/Observers/NotificationObserver.php

@@ -3,7 +3,7 @@
 namespace App\Observers;
 
 use App\Models\Notification;
-use App\Models\User;
+use App\User;
 use App\Notifications\NotificationSent;
 
 class NotificationObserver

app/Policies/ServerPolicy.php

@@ -3,7 +3,7 @@
 namespace App\Policies;
 
 use App\Models\Permission;
-use App\Models\User;
+use App\User;
 use App\Models\Server;
 use Illuminate\Auth\Access\HandlesAuthorization;
 
@@ -14,7 +14,7 @@ class ServerPolicy
     /**
      * Determine whether the user can view any servers.
      *
-     * @param  \App\Models\User  $user
+     * @param  \App\User  $user
      * @return mixed
      */
     public function viewAny(User $user)
@@ -25,7 +25,7 @@ class ServerPolicy
     /**
      * Determine whether the user can view the server.
      *
-     * @param  \App\Models\User  $user
+     * @param  \App\User  $user
      * @param  \App\Models\Server  $server
      * @return mixed
      */
@@ -37,7 +37,7 @@ class ServerPolicy
     /**
      * Determine whether the user can create servers.
      *
-     * @param  \App\Models\User  $user
+     * @param  \App\User  $user
      * @return mixed
      */
     public function create(User $user)
@@ -49,7 +49,7 @@ class ServerPolicy
     /**
      * Determine whether the user can update the server.
      *
-     * @param  \App\Models\User  $user
+     * @param  \App\User  $user
      * @param  \App\Models\Server  $server
      * @return mixed
      */
@@ -61,7 +61,7 @@ class ServerPolicy
     /**
      * Determine whether the user can delete the server.
      *
-     * @param  \App\Models\User  $user
+     * @param  \App\User  $user
      * @param  \App\Models\Server  $server
      * @return mixed
      */
@@ -73,7 +73,7 @@ class ServerPolicy
     /**
      * Determine whether the user can restore the server.
      *
-     * @param  \App\Models\User  $user
+     * @param  \App\User  $user
      * @param  \App\Models\Server  $server
      * @return mixed
      */
@@ -85,7 +85,7 @@ class ServerPolicy
     /**
      * Determine whether the user can permanently delete the server.
      *
-     * @param  \App\Models\User  $user
+     * @param  \App\User  $user
      * @param  \App\Models\Server  $server
      * @return mixed
      */

app/Providers/AppServiceProvider.php

@@ -30,7 +30,7 @@ class AppServiceProvider extends ServiceProvider
         Notification::observe(NotificationObserver::class);
         AdminNotification::observe(AdminNotificationObserver::class);
         Relation::morphMap([
-            'users' => 'App\Models\User',
+            'users' => 'App\User',
             'roles' => 'App\Models\Role',
         ]);
 

app/Sandboxes/PHPSandbox.php

@@ -5,7 +5,7 @@ namespace App\Sandboxes;
 use App\Models\Permission;
 use App\Models\Token;
 use Illuminate\Support\Str;
-use App\Models\UserSettings;
+use App\UserSettings;
 
 class PHPSandbox implements Sandbox
 {

app/Models/User.php → app/User.php

 <?php
 
-namespace App\Models;
+namespace App;
 
+use App\Models\Extension;
+use App\Models\Permission;
 use App\Models\Server;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
+use App\Models\UsesUuid;
 
 /**
- * App\Models\User
+ * App\User
  *
  * @property-read mixed $id
  * @method static Builder|User newModelQuery()

config/auth.php

@@ -66,7 +66,7 @@ return [
     'providers' => [
         'users' => [
             'driver' => 'eloquent',
-            'model' => App\Models\User::class,
+            'model' => App\User::class,
         ],
 
         // 'users' => [

config/services.php

@@ -30,7 +30,7 @@ return [
     ],
 
     'stripe' => [
-        'model' => App\Models\User::class,
+        'model' => App\User::class,
         'key' => env('STRIPE_KEY'),
         'secret' => env('STRIPE_SECRET'),
         'webhook' => [

database/factories/UserFactory.php

@@ -13,7 +13,7 @@ use Faker\Generator as Faker;
 |
 */
 
-$factory->define(App\Models\User::class, function (Faker $faker) {
+$factory->define(App\User::class, function (Faker $faker) {
     return [
         'name' => $faker->name,
         'email' => $faker->unique()->safeEmail,

resources/views/settings/index.blade.php

@@ -63,7 +63,7 @@
                     ])<br><br>
                     <div id="usersTable">
                         @include('table',[
-                            "value" => \App\Models\User::all(),
+                            "value" => \App\User::all(),
                             "title" => [
                                 "Kullanıcı Adı" , "Email" , "*hidden*" ,
                             ],

routes/console.php

 <?php
 
-use App\Models\User;
+use App\User;
 use App\Models\Module;
 use App\Models\AdminNotification;
 use Illuminate\Support\Facades\Hash;