Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

app/Controllers/LoginController.php

@@ -41,8 +41,12 @@ class LoginController extends BaseController
                 $user = $UserModel->getUserByEmail($value->email);
                 if($user){
                     if($user->is_active !== '0'){
-
-                        $session_data = ['isLoggedIn' => True ,'userid' => $user->id, 'userData' => $user];
+                        $session_data = [
+                            'isLoggedIn'  => True ,
+                            'userid'      => $user->id, 
+                            'userData'    => $user, 
+                            'userProfile' => $value->picture,
+                        ];
                         set_session_data($session_data);
                         log_message('error', 'Set The UserId : `'. $user->id .'` in Session');
                         log_message('error', 'User Login Sucessfully');

app/Helpers/session_helper.php

@@ -28,6 +28,15 @@ if (!function_exists('get_session_userdata')) {
     }
 }
 
+if (!function_exists('get_userProfile')) {
+    function get_userProfile()
+    {
+        // $ci =& get_instance();
+        $session = \Config\Services::session();
+        return $session->get('userProfile');
+    }
+}
+
 if (!function_exists('get_session_user')) {
     function get_session_user()
     {

app/Views/layout/header.php

@@ -393,7 +393,7 @@
     
                         <li class="dropdown notification-list topbar-dropdown">
                             <a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
-                                <img src="<?= base_url()."public"; ?>/assets/images/users/avatar-1.jpg" alt="user-image" class="rounded-circle">
+                            <img src="<?= get_userProfile() != null && !empty(get_userProfile()) ? get_userProfile() : base_url() . 'public/assets/images/avatar_2x.png' ?>" alt="user-image" class="rounded-circle">
                                 <span class="pro-user-name ml-1" style="font-size: 16px;" >
                                    <?= (isset(get_session_userdata()->first_name) ? get_session_userdata()->first_name : 'NOT SET') ?>
                                     <!-- <i class="mdi mdi-chevron-down"></i>  -->