From acacacbe62eeb6c235e7428ddf4b64397c4e30ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Duli=C3=A7i?= <denisdulici@gmail.com>
Date: Sat, 4 Jul 2020 19:14:15 +0300
Subject: [PATCH] fixed #1512

---
 .../views/partials/admin/navbar.blade.php      | 12 +++++-------
 .../views/partials/portal/navbar.blade.php     | 18 ++++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/resources/views/partials/admin/navbar.blade.php b/resources/views/partials/admin/navbar.blade.php
index dfe84cbe6..0fb445efe 100644
--- a/resources/views/partials/admin/navbar.blade.php
+++ b/resources/views/partials/admin/navbar.blade.php
@@ -232,13 +232,11 @@
                             @else
                                 <img src="{{ asset('public/img/user.svg') }}" class="user-img" alt="{{ $user->name }}"/>
                             @endif
-                            <div class="media-body ml-2 d-none d-lg-block">
-                                <span class="mb-0 text-sm  font-weight-bold">
-                                    @if (!empty($user->name))
-                                        {{ $user->name }}
-                                    @endif
-                                </span>
-                            </div>
+                            @if (!empty($user->name))
+                                <div class="media-body ml-2 d-none d-lg-block">
+                                    <span class="mb-0 text-sm font-weight-bold">{{ $user->name }}</span>
+                                </div>
+                            @endif
                         </div>
                     </a>
 
diff --git a/resources/views/partials/portal/navbar.blade.php b/resources/views/partials/portal/navbar.blade.php
index 1c4b46d3d..01e834e6c 100644
--- a/resources/views/partials/portal/navbar.blade.php
+++ b/resources/views/partials/portal/navbar.blade.php
@@ -91,14 +91,16 @@
                 <li class="nav-item dropdown">
                     <a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <div class="media align-items-center">
-                            <img src="{{ asset('public/img/user.svg') }}" height="36" width="36" alt="User"/>
-                            <div class="media-body ml-2">
-                                <span class="mb-0 text-sm font-weight-bold">
-                                    @if (!empty($user->name))
-                                        {{ $user->name }}
-                                    @endif
-                                </span>
-                            </div>
+                            @if (is_object($user->picture))
+                                <img src="{{ Storage::url($user->picture->id) }}" class="rounded-circle image-style user-img" alt="{{ $user->name }}"/>
+                            @else
+                                <img src="{{ asset('public/img/user.svg') }}" class="user-img" alt="{{ $user->name }}"/>
+                            @endif
+                            @if (!empty($user->name))
+                                <div class="media-body ml-2">
+                                    <span class="mb-0 text-sm font-weight-bold">{{ $user->name }}</span>
+                                </div>
+                            @endif
                         </div>
                     </a>
                     <div class="dropdown-menu dropdown-menu-right">