Skip to content

Commit d043746

Browse files
authored
Merge pull request #84 from devaslanphp/dev
Design enhancement: Main menu
2 parents 30f1733 + 2660b8a commit d043746

4 files changed

Lines changed: 46 additions & 3 deletions

File tree

package-lock.json

Lines changed: 18 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"flowbite": "^1.5.3",
2929
"jquery": "^3.6.1",
3030
"magnific-popup": "^1.1.0",
31-
"sass": "^1.54.9"
31+
"sass": "^1.54.9",
32+
"tippy.js": "^6.3.7"
3233
}
3334
}

resources/js/app.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ import './bootstrap';
33
import jQuery from '$';
44
import 'flowbite';
55

6+
import tippy from 'tippy.js';
7+
import 'tippy.js/dist/tippy.css';
8+
69
import '@fortawesome/fontawesome-free/scss/fontawesome.scss';
710
import '@fortawesome/fontawesome-free/scss/brands.scss';
811
import '@fortawesome/fontawesome-free/scss/regular.scss';
@@ -67,3 +70,10 @@ window.unsecuredCopyToClipboard = function (text) {
6770
}
6871
document.body.removeChild(textArea);
6972
}
73+
74+
// Tippy helper
75+
window.makeTippy = function (selector, title) {
76+
tippy(selector, {
77+
content: title,
78+
});
79+
}

resources/views/components/main-menu.blade.php

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,36 @@
3838
<li>
3939
<a
4040
href="{{ route($key) }}"
41+
id="{{ $key }}"
4142
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' }}">
42-
<span>@lang($value['title'])</span>
4343
<div class="relative">
4444
<i class="fa {{ $value['icon'] }}"></i>
4545
@if($value['show_notification_indicator'] && auth()->user()->unreadNotifications()->count())
4646
<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>
4747
@endif
4848
</div>
49+
@if((Route::is($key) || Route::is($key . '.*')))
50+
<span>@lang($value['title'])</span>
51+
@endif
4952
</a>
5053
</li>
5154
@endif
5255
@endforeach
5356
</ul>
5457
</div>
5558
</div>
59+
60+
@push('scripts')
61+
<script>
62+
window.addEventListener('load', () => {
63+
@foreach($menu as $key => $value)
64+
@if(!(Route::is($key) || Route::is($key . '.*')))
65+
window.makeTippy('#{{ $key }}', '{{ $value['title'] }}');
66+
@endif
67+
@endforeach
68+
})
69+
</script>
70+
@endpush
5671
</nav>
5772
{{--
5873

0 commit comments

Comments
 (0)