Multi User Role Added

Multi User Role Added

Author: GaneshKandu

app/Http/Controllers/ActivityController.php

@@ -8,19 +8,28 @@
 class ActivityController extends Controller
 {
     function activity(Request $request){
+        
 		$infos = DB::table('activities')->orderBy('id', 'desc')->where('uid',Auth()->user()->id)->paginate(10);
-		print_r($infos->total());
+		
 		$pages = range(1, $infos->lastPage());
-        return view('activities',compact('infos','pages'));
+        
+        if($request->role == 'admin'){
+            return view('admin.activities',compact('infos','pages'));
+        }
+        
+        return view('user.activities',compact('infos','pages'));
 	}
 
     function delete(Request $request){
+        
 		if(isset($request->ids)){
+            
 			DB::table('activities')
 			->whereIn('id',$request->ids)
 			->where('uid',Auth()->user()->id)
 			->delete();
 		}else{
+            
 			DB::table('activities')
 			->where('id',$request->id)
 			->where('uid',Auth()->user()->id)

app/Http/Controllers/AuthController.php

@@ -4,10 +4,10 @@
 
 use Illuminate\Http\Request;
 use Session;
-use App\Models\User;
 use Hash;
 use Illuminate\Support\Facades\Auth;
 use KChat\ActivityLog;
+use Illuminate\Support\Facades\DB;
 
 class AuthController extends Controller
 {
@@ -23,7 +23,7 @@ function signon(Request $request)
 
         $data = $request->all();
 
-        User::create([
+        $id = DB::table('users')->insertGetId([
             'first_name'  =>  $data['first_name'],
             'last_name'  =>  $data['last_name'],
             'email' =>  $data['email'],
@@ -32,6 +32,13 @@ function signon(Request $request)
             'created_at' => now(),
         ]);
 
+        if($id == 0){
+            DB::table('users')
+            ->where('id',$id)
+            ->limit(1)
+            ->update(['role' => '0']);
+        }
+        
         return redirect('login')->with('success', 'Registration Completed');
     }
 
@@ -41,9 +48,9 @@ function login(Request $request)
             'email' =>  'required',
             'password'  =>  'required'
         ]);
-
+        
         $credentials = $request->only('email', 'password');
-
+        
         if(Auth::attempt($credentials)){
 			ActivityLog::log()->save('Login','You have successfully logged in.');
 		}

app/Http/Controllers/DashboardController.php

@@ -8,7 +8,52 @@
 class DashboardController extends Controller
 {
     function index(Request $request){
+        
+        $dates = $this->date_range();
+        $values = array_fill(0, count($dates), 0);
+        
+        $current_user_messages_count = DB::table('messages')->where('user_id', Auth()->user()->id)->count();
+        
+        $current_user_messages_count_this_month = DB::table('messages')->where('user_id', Auth()->user()->id)->where('created_at', '>=', DB::raw('DATE_SUB(NOW(), INTERVAL 1 MONTH)'))->count();
+        
+        $current_user_conversations_count = DB::table('participants')->where('user_id', Auth()->user()->id)->count();
+        
+        $current_user_new_conversations_this_month = DB::table('participants')->where('user_id', Auth()->user()->id)->where('created_at', '>=', DB::raw('DATE_SUB(NOW(), INTERVAL 1 MONTH)'))->count();
+        
+        $current_user_new_messages_perday = DB::table('messages')
+            ->select(DB::raw('COUNT(*) as count'), DB::raw('DATE(`created_at`) as date'))
+            ->groupBy(DB::raw('DATE(`created_at`)'))
+            ->where('created_at', '>=', DB::raw('DATE_SUB(NOW(), INTERVAL 1 MONTH)'))
+            ->where('user_id', Auth()->user()->id)
+            ->orderBy('date')
+            ->get()->toArray();
+            
+        $current_user_new_conversations_perday = DB::table('messages')
+            ->select(DB::raw('count(DISTINCT `conversation_id`) as count'), DB::raw('DATE(`created_at`) as date'))
+            ->groupBy(DB::raw('DATE(`created_at`)'))
+            ->where('created_at', '>=', DB::raw('DATE_SUB(NOW(), INTERVAL 1 MONTH)'))
+            ->where('user_id', Auth()->user()->id)
+            ->orderBy('date')
+            ->get()->toArray();
+        
+        // For Users
+        $tmp = $values;
+        foreach($current_user_new_messages_perday as $value){
+            $tmp[array_search($value->date,$dates)] = $value->count;
+        }
+        $current_user_new_messages_perday = $tmp;
+        
+        // For Messages
+        $tmp = $values;
+        foreach($current_user_new_conversations_perday as $value){
+            $tmp[array_search($value->date,$dates)] = $value->count;
+        }
+        $current_user_new_conversations_perday = $tmp;
 
+        if($request->role == 'user'){
+            return view('user.dashboard',compact('current_user_new_messages_perday','current_user_new_conversations_perday','current_user_new_conversations_this_month','current_user_messages_count_this_month','current_user_messages_count','current_user_conversations_count','dates')); 
+        }
+        
         $users_count = DB::table('users')->count();
 
         $new_users_this_month = DB::table('users')->where('created_at', '>=', DB::raw('DATE_SUB(NOW(), INTERVAL 1 MONTH)'))->count();
@@ -25,9 +70,6 @@ function index(Request $request){
 
         $average_messages_peruser = $average_messages_peruser[0]->avg;
 
-        $dates = $this->date_range();
-        $values = array_fill(0, count($dates), 0);
-        
         $new_users_perday = DB::table('users')
             ->select(DB::raw('COUNT(*) as count'), DB::raw('DATE(`created_at`) as date'))
             ->groupBy(DB::raw('DATE(`created_at`)'))
@@ -68,13 +110,13 @@ function index(Request $request){
         foreach($new_conversations_perday as $value){
             $tmp[array_search($value->date,$dates)] = $value->count;
         }
+        
         $new_conversations_perday = $tmp;
 
         //total messages per user per date
         //SELECT COUNT(*),`user_id`,DATE(`created_at`) FROM `messages` GROUP BY DATE(`created_at`), `user_id`;
 
-        //,compact('chat','conversation')
-        return view('dashboard',compact('new_conversations_this_month','new_messages_this_month','new_users_this_month','users_count','conversations_count','messages_count','new_users_perday','new_messages_perday','new_conversations_perday','average_messages_peruser','dates'));
+        return view('admin.dashboard',compact('current_user_new_messages_perday','current_user_new_conversations_perday','current_user_new_conversations_this_month','current_user_messages_count_this_month','current_user_messages_count','current_user_conversations_count','new_conversations_this_month','new_messages_this_month','new_users_this_month','users_count','conversations_count','messages_count','new_users_perday','new_messages_perday','new_conversations_perday','average_messages_peruser','dates'));
     }
 
     function date_range(){

app/Http/Controllers/MessageController.php

@@ -32,8 +32,12 @@ function messages(Request $request){
 		}
 
 		$conversation = $conversation[0];
-		
-		return view('msg',compact('chat','conversation'));
+        
+		if($request->role == 'admin'){
+            return view('admin.msg',compact('chat','conversation'));
+        }
+        
+		return view('user.msg',compact('chat','conversation'));
 	}
 
     function UpdateConversation(Request $request){

app/Http/Controllers/NotificationController.php

@@ -28,8 +28,12 @@ function notification(Request $request){
 
 			}
 		}
-		
-        return view('notifications',compact('infos','pages'));
+        
+        if($request->role == 'admin'){
+            return view('admin.notifications',compact('infos','pages'));
+        }
+        
+        return view('user.notifications',compact('infos','pages'));
 	}
 
     function delete(Request $request){

app/Http/Controllers/SettingController.php

@@ -10,18 +10,33 @@ class SettingController extends Controller
 {
 
     function Setting(Request $request){
-		
+        
+		if($request->role != 'admin'){
+			return false;
+        }
+        
 		$TimeZone = \DateTimeZone::listIdentifiers();
+        
 		$departments = DB::table('departments')->get();
-        return view('settings',compact('departments','TimeZone'));
+        
+        return view('admin.settings',compact('departments','TimeZone'));
 	}
 
     function TimeZone(Request $request){
+        
+		if($request->role != 'admin'){
+			return false;
+        }
+        
 		\Settings::set('Timezone',$request->timezone);
 		ActivityLog::log()->save('Timezone','You have successfully updated Timezone to  '.$request->timezone);
 	}
 
     function AddDepartment(Request $request){
+        
+		if($request->role != 'admin'){
+			return false;
+        }
 
 		DB::table('departments')->insert(
 			['department' => $request->adddepartment]
@@ -32,6 +47,10 @@ function AddDepartment(Request $request){
 	}
 
     function DeleteDepartment(Request $request){
+        
+		if($request->role != 'admin'){
+			return false;
+        }
 
 		DB::table('departments')->where('department', $request->deletedepartment)->delete();
 

app/Http/Controllers/UserController.php

@@ -37,7 +37,11 @@ function members_ajax(Request $request){
             $ms = $request->ms;
         }
 
-        return view('members_ajax',compact('users','pages','jsonusers','ms'));
+        if($request->role == 'admin'){
+            return view('admin.members_ajax',compact('users','pages','jsonusers','ms'));
+        }
+        
+        return view('user.members_ajax',compact('users','pages','jsonusers','ms'));
 	}
 
     function members(Request $request){
@@ -65,16 +69,24 @@ function members(Request $request){
             $ms = $request->ms;
         }
 
-        return view('members',compact('users','pages','jsonusers','ms'));
+		if($request->role == 'admin'){
+            return view('admin.members',compact('users','pages','jsonusers','ms'));
+		}
+        
+        return view('user.members',compact('users','pages','jsonusers','ms'));
 	}
 
     function delete_users(Request $request){
 
+        if($request->role != 'admin'){
+			return false;
+        }
+        
 		if($request->ids == null){
 			return false;
 		}
 
-		if(DB::table('users')->whereIn('id', $request->ids)->delete()){
+		if(DB::table('users')->whereIn('id', $request->ids)->whereIn('role', [1,2])->delete()){
 
 			$emails = implode(", ",array_column(User::select(['email'])->whereIn('id', $request->ids)->get()->toArray(), 'email'));
 
@@ -84,6 +96,10 @@ function delete_users(Request $request){
 
     function set_inactive_users(Request $request){
 
+        if($request->role != 'admin'){
+			return false;
+        }
+        
 		if($request->ids == null){
 			return false;
 		}
@@ -100,6 +116,10 @@ function set_inactive_users(Request $request){
 
     function set_active_users(Request $request){
 
+        if($request->role != 'admin'){
+			return false;
+        }
+        
 		if($request->ids == null){
 			return false;
 		}
@@ -115,11 +135,11 @@ function set_active_users(Request $request){
 	}
 
     function block_users(Request $request){
-		
+        
 		if($request->ids == null){
 			return false;
 		}
-		
+        
 		if(DB::table('users')->whereIn('id', $request->ids)->update(['status' => 'Blocked'])){
 
 			$emails = implode(", ",array_column(User::select(['email'])->whereIn('id', $request->ids)->get()->toArray(), 'email'));
@@ -146,15 +166,61 @@ function unblock_users(Request $request){
 		}
 	}
 
+    function MakeAdmin(Request $request){
+        
+		if($request->role != 'admin'){
+			return false;
+        }
+        
+		if($request->ids == null){
+			return false;
+		}
+		
+		if(DB::table('users')->whereIn('id', $request->ids)->where(['role' => 1])->update(['role' => 2])){
+			
+            $emails = implode(", ",array_column(User::select(['email'])->whereIn('id', $request->ids)->get()->toArray(), 'email'));
+            
+			ActivityLog::log()->save('Admin access granted','you have granted admin access to '.$emails.'.');
+			
+			NotificationsLog::log()->save($request->ids, 'Admin access granted',Auth()->user()->email.' granted admin access to you');
+		}
+        
+	}
+	
+    function RevokeAdmin(Request $request){
+        
+		if($request->role != 'admin'){
+			return false;
+        }
+        
+		if($request->ids == null){
+			return false;
+		}
+		
+		if(DB::table('users')->whereIn('id', $request->ids)->where(['role' => 2])->update(['role' => 1])){
+			
+            $emails = implode(", ",array_column(User::select(['email'])->whereIn('id', $request->ids)->get()->toArray(), 'email'));
+            
+			ActivityLog::log()->save('Admin access revoked','you revoked admin access '.$emails.'.');
+			
+			NotificationsLog::log()->save($request->ids, 'Admin access revoked',Auth()->user()->email.' revoked admin access to you');
+		}
+        
+	}
+	
     function Profile(Request $request){
 
         $profile = DB::table('users')->where('id',Auth()->user()->id)->get();
 
         $departments = DB::table('departments')->get();
 
 		$profile = $profile[0];
-		
-        return view('profile',compact('profile','departments'));
+        
+		if($request->role != 'admin'){
+            return view('user.profile',compact('profile','departments'));
+        }
+        
+        return view('admin.profile',compact('profile','departments'));
 
 	}
 
@@ -230,6 +296,10 @@ function SaveProfile(Request $request){
 
 		$data['updated_at'] = now();
 
+        if(isset($data['role'])){
+            unset($data['role']);
+        }
+        
 		DB::table('users')
         ->where('id',Auth()->user()->id)
         ->limit(1)

app/Http/Kernel.php

@@ -55,10 +55,7 @@ class Kernel extends HttpKernel
         'GetCounts' => [
             Middleware\GetCounts::class,
         ],
-
-        'CheckRole' => [
-            Middleware\CheckRole::class,
-        ],
+        
     ];
 
     /**