Merge branch 'devel'

Author: rakieta2015

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\Hash;
 use Illuminate\Support\Facades\Validator;
@@ -59,7 +59,7 @@ protected function validator(array $data)
      * Create a new user instance after a valid registration.
      *
      * @param  array  $data
-     * @return \App\User
+     * @return \App\Models\User
      */
     protected function create(array $data)
     {

app/Http/Controllers/UsersController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\User;
+use App\Models\User;
 
 class UsersController extends Controller
 {

app/Http/Controllers/admin/UsersController.php

@@ -4,7 +4,7 @@
 
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
-use App\User;
+use App\Models\User;
 
 class UsersController extends Controller
 {

app/Models/Folder.php

@@ -3,12 +3,12 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use Spatie\MediaLibrary\HasMedia\HasMedia;
-use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
+use Spatie\MediaLibrary\HasMedia;
+use Spatie\MediaLibrary\InteractsWithMedia;
 
 class Folder extends Model implements HasMedia
 {
-    use HasMediaTrait;
+    use InteractsWithMedia;
 
     protected $table = 'folder';
 

app/Models/Notes.php

@@ -3,17 +3,21 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Notes extends Model
 {
+
+    use HasFactory;
+
     protected $table = 'notes';
 
     /**
      * Get the User that owns the Notes.
      */
     public function user()
     {
-        return $this->belongsTo('App\User', 'users_id')->withTrashed();
+        return $this->belongsTo('App\Models\User', 'users_id')->withTrashed();
     }
 
     /**

app/Models/Status.php

@@ -3,9 +3,12 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Status extends Model
 {
+    use HasFactory;
+
     protected $table = 'status';
     public $timestamps = false; 
     /**

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

@@ -1,18 +1,22 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Spatie\Permission\Traits\HasRoles;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class User extends Authenticatable
 {
     use Notifiable;
     use SoftDeletes;
     use HasRoles;
+    use HasFactory;
+    
+    protected $table = 'users';
 
     /**
      * The attributes that are mass assignable.

app/Models/Users.php

@@ -4,10 +4,12 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class Users extends Model
 {
     use SoftDeletes;
+    use HasFactory;
 
     /**
      * Get the notes for the users.

app/Providers/AppServiceProvider.php

@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Pagination\Paginator;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -23,6 +24,6 @@ public function register()
      */
     public function boot()
     {
-
+        Paginator::useBootstrap();
     }
 }

composer.json

@@ -10,20 +10,20 @@
     "require": {
         "php": "^7.2.5",
         "fideloper/proxy": "^4.2",
-        "laravel/framework": "7.4",
+        "laravel/framework": "^8.0",
         "fruitcake/laravel-cors": "^1.0",
-        "guzzlehttp/guzzle": "^6.3",
+        "guzzlehttp/guzzle": "^7.0.1",
         "laravel/tinker": "^2.3.0",
-        "spatie/laravel-medialibrary": "^7.19.0",
-        "spatie/laravel-permission": "^3.8",
-        "laravel/ui": "^2.0.1"
+        "spatie/laravel-medialibrary": "^8.7.2",
+        "spatie/laravel-permission": "^3.17",
+        "laravel/ui": "^3.0"
     },
     "require-dev": {
-        "facade/ignition": "^2.0",
+        "facade/ignition": "^2.3.6",
         "fzaninotto/faker": "^1.9.1",
         "mockery/mockery": "^1.3.1",
-        "nunomaduro/collision": "^4.1",
-        "phpunit/phpunit": "^8.5"
+        "nunomaduro/collision": "^5.0",
+        "phpunit/phpunit": "^9.0"
     },
     "config": {
         "optimize-autoloader": true,
@@ -37,16 +37,17 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\": "app/"
+            "App\\": "app/",
+            "Database\\Factories\\": "database/factories/",
+            "Database\\Seeders\\": "database/seeders/"
         },
         "classmap": [
             "database",
-            "database/seeds",
+            "database/seeders",
             "database/factories"
         ],
         "files": [
-            "database/seeds/UsersAndNotesSeeder.php",
-            "database/seeds/MenusTableSeeder.php"
+
         ]
     },
     "autoload-dev": {