make sidebar notifcation have a picture, and nicer looking

tradaz · Jul 9, 2017 · a29375c · a29375c
1 parent 5bb79db
commit a29375c
Show file tree

Hide file tree

Showing 6 changed files with 167 additions and 27 deletions.
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -6,6 +6,7 @@
 use Cache;
 use Zizaco\Entrust\Traits\EntrustUserTrait;
 use Illuminate\Foundation\Auth\User as Authenticatable;
+use App\Models\Setting;
 
 class User extends Authenticatable
 {
@@ -92,4 +93,10 @@ public function moveClients($user_id)
             $client->save();
         }
     }
+
+    public function getAvatarattribute()
+    {
+        $setting = Setting::first();
+        return $this->image_path ? 'images/' . $setting->company . '/' . $this->image_path : 'images/default_avatar.jpg';
+    }
 }
diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/css/app.css.map b/public/css/app.css.map
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
@@ -31,7 +31,7 @@
 
     <a href="{{ route('notification.read', ['id' => $notification->id])  }}" onClick="postRead({{ $notification->id }})">
     <li> 
- <img src="http://placekitten.com/g/300/300" class="notification-profile-image">
+ <img src="/{{ auth()->user()->avatar }}" class="notification-profile-image">
     <p>{{ $notification->data['message']}}</p></li>
     </a>
     @endforeach 

diff --git a/resources/views/partials/userheader.blade.php b/resources/views/partials/userheader.blade.php
@@ -1,15 +1,8 @@
 <div class="col-lg-6">
-    <div class="profilepic"><img class="profilepicsize"
-                                 @if($contact->image_path != "")
-                                 src="../images/{{$companyname}}/{{$contact->image_path}}"
-                                 @else
-                                 src="../images/default_avatar.jpg"
-                @endif />
-    </div>
 
+    <div class="profilepic"><img class="profilepicsize" src="../{{ $contact->avatar }}" /></div>
     <h1>{{ $contact->nameAndDepartment }} </h1>
 
-
     <!--MAIL-->
     <p><span class="glyphicon glyphicon-envelope" aria-hidden="true"></span>
         <a href="mailto:{{ $contact->email }}">{{ $contact->email }}</a></p>