add activity logs for models and roles/permissions for user

Author: MuhammadHanzala

app/Http/Controllers/API/SocialLoginController.php

@@ -11,7 +11,6 @@
 use Validator;
 use App\Image;
 use App\User;
-use App\Category;
 use App\TwoFACodes;
 use App\Mail\VerifyTwoFa;
 
@@ -105,15 +104,6 @@ public function socialLogin(Request $request){
             $success['user'] = $user;
             $success["user"]["token"] = $user->createToken($user->name)->accessToken;
             unset($user->{"media"});
-
-            $defaultCategories = ['Work', 'Home', 'Family', 'Sports', 'Travel'];
-            for($i = 0; $i < 5; $i++){
-                Category::create([
-                    'user_id' => $user->id,
-                    'name' => $defaultCategories[$i],
-                    'order' => $i + 1
-                ]);
-            }
             return response()->json(['success' => $success], 200);
         } catch (QueryException $exception) {
             return response()->json($exception, 400);

app/Http/Controllers/API/UserController.php

@@ -15,7 +15,6 @@
 use App\User;
 use App\VerifyUser;
 use App\PasswordReset;
-use App\Category;
 use App\TwoFACodes;
 use App\Mail\EmailVerification;
 use App\Mail\ForgotPasswordRequest;
@@ -73,14 +72,6 @@ public function register(Request $request)
                 'user_id' => $user->id,
                 'token' => str_random(40)
             ]);
-            $defaultCategories = ['Work', 'Home', 'Family', 'Sports', 'Travel'];
-            for ($i = 0; $i < 5; $i++) {
-                Category::create([
-                    'user_id' => $user->id,
-                    'name' => $defaultCategories[$i],
-                    'order' => $i + 1
-                ]);
-            }
             Mail::to($user->email)->send(new EmailVerification($user)); // Send Email for account verification
             $success['message'] = "We have sent a confirmation mail to your email. Please check your inbox.";
             return response()->json(['success' => $success], 200);

app/User.php

@@ -6,11 +6,13 @@
 use Illuminate\Notifications\Notifiable;
 use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
 use Spatie\MediaLibrary\HasMedia\HasMedia;
+use Spatie\Permission\Traits\HasRoles;
+use Spatie\Activitylog\Traits\LogsActivity;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 
 class User extends Authenticatable implements HasMedia
 {
-    use HasApiTokens, HasMediaTrait, Notifiable;
+    use LogsActivity, HasRoles, HasApiTokens, HasMediaTrait, Notifiable;
 
     /**
      * The attributes that are mass assignable.
@@ -21,6 +23,8 @@ class User extends Authenticatable implements HasMedia
         'name', 'email', 'password', 'imageUrl', 'isVerified', '2fa'
     ];
 
+    protected static $logAttributes = ['name', 'email', 'imageUrl', 'isVerified', '2fa'];
+
     /**
      * The attributes that should be hidden for arrays.
      *
@@ -35,30 +39,5 @@ public function verifyUser()
         return $this->hasOne('App\VerifyUser');
     }
 
-    public function categories(){
-        return $this->hasMany('App\Category');
-    }
-
-    public function subCategories(){
-        return $this->hasMany('App\SubCategory');
-    }
-
-    public function todos(){
-        return $this->hasMany('App\TodoItem');
-    }
-
-    public function groups(){
-        return $this->hasMany('App\Group','created_by');
-    }
-
-    public function friends(){
-        return $this->hasMany('App\Contact');
-    }
-    public function iAmFriend(){
-        return $this->hasMany('App\Contact','friend_id');
-    }
-    public function pendingRequests(){
-        return $this->hasMany('App\Contact');
-    }
 
 }

composer.json

@@ -12,7 +12,9 @@
         "laravel/passport": "^6.0",
         "laravel/tinker": "^1.0",
         "nesbot/carbon": "1.25.*",
-        "spatie/laravel-medialibrary": "7.0.0"
+        "spatie/laravel-activitylog": "^2.8",
+        "spatie/laravel-medialibrary": "7.0.0",
+        "spatie/laravel-permission": "^2.13"
     },
     "require-dev": {
         "filp/whoops": "^2.0",