Skip to content

Commit

Permalink
Fixed bug on logout and refactored it into a separate partial component
Browse files Browse the repository at this point in the history
  • Loading branch information
PavlosIsaris committed Nov 13, 2024
1 parent 3f368d1 commit 769a203
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 64 deletions.
2 changes: 1 addition & 1 deletion resources/assets/js/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if (import.meta.env.VITE_SENTRY_DSN_PUBLIC) {
});

const handleLogoutBtnClick = function () {
$("#log-out").click(function (e) {
$(document).on("click", "#log-out", function (e) {
e.preventDefault();
$("#logout-form").submit();
});
Expand Down
6 changes: 6 additions & 0 deletions resources/assets/sass/common/navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,10 @@
.nav-link {
align-content: center;
height: 100%;
}

.user-menu {
.dropdown-toggle::after {
display: none;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,37 +33,7 @@ class="fa fa-chevron-left"></i></a>
<a class="nav-link"
href="{{ route('my-contributions') }}"> {{ __('my-history.my_contributions') }} </a>
</li>
<li class="nav-item dropdown user user-menu">
<a class="nav-link dropdown-toggle" href="#" id="userMenu" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="false">
@if (Auth::user()->avatar)
<img loading="lazy" src="{{ Auth::user()->avatar }}" class="user-image" alt="User Image">
@endif
<span class="hidden-xs">{{ Auth::user()->nickname }}</span>
<i class="fas fa-caret-down"></i>
</a>
<div class="dropdown-menu dropdown-menu-right py-2" aria-labelledby="userMenu">
<!-- User image -->
<div class="dropdown-item user-header text-center">
@if (Auth::user()->avatar)
<img loading="lazy" src="{{ Auth::user()->avatar }}" class="img-circle" alt="User Image">
@endif
<p>
{{ Auth::user()->name }} {{ Auth::user()->nickname }}
<small>Member since {{ Auth::user()->created_at }}</small>
</p>
</div>
<a class="dropdown-item text-center"
href="{{ route('my-account') }}"> {{ __('menu.my_account') }} </a>
<div class="dropdown-divider"></div>
<a id="log-out" href="{{ route('logout') }}"
class="dropdown-item text-center">{{ __('menu.sign_out') }}</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
</form>
</div>
@include('partials.language-selector')
</li>
@include('partials.user-actions-header-dropdown')
</ul>
</div>
</nav>
33 changes: 1 addition & 32 deletions resources/views/partials/login-menu-options.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,7 @@
<li class="nav-item">
<a class="nav-link" href="{{ route('my-dashboard') }}"> {{ __("menu.dashboard") }} </a>
</li>

<li class="nav-item dropdown user user-menu">
<a class="nav-link" href="#" class="dropdown-toggle" data-toggle="dropdown">
@if (Auth::user()->avatar)
<img loading="lazy" src="{{ Auth::user()->avatar}}" class="user-image" alt="User Image">
@endif
<span class="hidden-xs">{{Auth::user()->nickname}}</span>
<i class="fas fa-caret-down"></i>
</a>
<ul class="dropdown-menu">
<!-- User image -->
<li class="user-header">
@if (Auth::user()->avatar)
<img loading="lazy" src="{{Auth::user()->avatar}}" class="img-circle">
@endif
<p>
{{ Auth::user()->name }} {{ Auth::user()->nickname }}
<small>Member since {{ Auth::user()->created_at }}</small>
</p>
</li>

<li class="user-footer">
<div class="pull-right">
<a id="log-out" href="{{ route('logout') }}"
class="btn btn-default btn-flat">{{ __("menu.sign_out")}}</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
</form>
</div>
</li>
</ul>
</li>
@include('partials.user-actions-header-dropdown')
@else
<li class="nav-item">
<a class="nav-link" href="{{ isset($redirectLoginURL) ? $redirectLoginURL : route("login") }}">{{ __("menu.login")}}</a>
Expand Down
21 changes: 21 additions & 0 deletions resources/views/partials/user-actions-header-dropdown.blade.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<li class="nav-item dropdown user user-menu">
<a class="nav-link dropdown-toggle" href="#" id="userMenu" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="false">
@if (Auth::user()->avatar)
<img loading="lazy" src="{{ Auth::user()->avatar }}" class="user-image" alt="User Image">
@endif
<span class="hidden-xs">{{ Auth::user()->nickname }}</span>
<i class="fas fa-caret-down"></i>
</a>
<div class="dropdown-menu dropdown-menu-right py-2" aria-labelledby="userMenu">
<a class="dropdown-item text-center"
href="{{ route('my-account') }}"> {{ __('menu.my_account') }} </a>
<div class="dropdown-divider"></div>
<a id="log-out" href="javascript:void(0);"
class="dropdown-item text-center">{{ __('menu.sign_out') }}</a>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
</form>
</div>
@include('partials.language-selector')
</li>

0 comments on commit 769a203

Please sign in to comment.