Skip to content

Design enhancement: Main menu #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
heloufir merged 2 commits into from
Sep 24, 2022
Merged

Design enhancement: Main menu #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2660b8a
Design enhancement: Main menu
Sep 24, 2022
d043746
Merge pull request #84 from devaslanphp/dev
heloufir Sep 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"flowbite": "^1.5.3",
"jquery": "^3.6.1",
"magnific-popup": "^1.1.0",
"sass": "^1.54.9"
"sass": "^1.54.9",
"tippy.js": "^6.3.7"
}
}
10 changes: 10 additions & 0 deletions resources/js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import './bootstrap';
import jQuery from '$';
import 'flowbite';

import tippy from 'tippy.js';
import 'tippy.js/dist/tippy.css';

import '@fortawesome/fontawesome-free/scss/fontawesome.scss';
import '@fortawesome/fontawesome-free/scss/brands.scss';
import '@fortawesome/fontawesome-free/scss/regular.scss';
Expand Down Expand Up @@ -67,3 +70,10 @@ window.unsecuredCopyToClipboard = function (text) {
}
document.body.removeChild(textArea);
}

// Tippy helper
window.makeTippy = function (selector, title) {
tippy(selector, {
content: title,
});
}
17 changes: 16 additions & 1 deletion resources/views/components/main-menu.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,21 +38,36 @@
<li>
<a
href="{{ route($key) }}"
id="{{ $key }}"
class="relative flex items-center justify-between gap-2 py-2 px-3 text-base rounded-lg dark:text-white {{ (Route::is($key) || Route::is($key . '.*')) ? 'text-white bg-primary-500 font-medium' : 'text-gray-500 font-normal hover:bg-gray-100 dark:hover:bg-gray-700' }}">
<span>@lang($value['title'])</span>
<div class="relative">
<i class="fa {{ $value['icon'] }}"></i>
@if($value['show_notification_indicator'] && auth()->user()->unreadNotifications()->count())
<i class="fa fa-circle fa-beat-fade {{ (Route::is($key) || Route::is($key . '.*')) ? 'text-white' : 'text-primary-500' }} absolute -right-1" style="font-size: .4rem; --fa-beat-fade-opacity: .65; --fa-beat-fade-scale: 1.075;"></i>
@endif
</div>
@if((Route::is($key) || Route::is($key . '.*')))
<span>@lang($value['title'])</span>
@endif
</a>
</li>
@endif
@endforeach
</ul>
</div>
</div>

@push('scripts')
<script>
window.addEventListener('load', () => {
@foreach($menu as $key => $value)
@if(!(Route::is($key) || Route::is($key . '.*')))
window.makeTippy('#{{ $key }}', '{{ $value['title'] }}');
@endif
@endforeach
})
</script>
@endpush
</nav>
{{--

Expand Down