From 64c53b031469eab6310e6293da071fd77aa89686 Mon Sep 17 00:00:00 2001 From: Yoga Pangestu Date: Mon, 13 Oct 2025 11:09:35 +0700 Subject: [PATCH] fix(announcement): hide menu from sidebar -feat query for mark when announcements unread -change var for calendar in overview --- .../Dashboard/OverviewController.php | 2 +- .../Middleware/AnnouncementMiddleware.php | 8 +- .../partials/app/calendars/media.blade.php | 2 +- .../views/partials/dashboard/footer.blade.php | 4 +- .../views/partials/dashboard/header.blade.php | 226 ++++++++++-------- .../partials/dashboard/sidebar.blade.php | 4 +- 6 files changed, 136 insertions(+), 110 deletions(-) diff --git a/app/Http/Controllers/Dashboard/OverviewController.php b/app/Http/Controllers/Dashboard/OverviewController.php index 1b2f768..b1996d6 100644 --- a/app/Http/Controllers/Dashboard/OverviewController.php +++ b/app/Http/Controllers/Dashboard/OverviewController.php @@ -120,7 +120,7 @@ public function index(Request $request) $user = User::with(['announcements'])->find(Auth::id()); // Data pengumuman - $data['announcements'] = $user->announcements() + $data['overview_announcements'] = $user->announcements() ->where(function ($query) { $query->where('announcements_users.category', '=', 'general'); }) diff --git a/app/Http/Middleware/AnnouncementMiddleware.php b/app/Http/Middleware/AnnouncementMiddleware.php index b1c3fd4..6b44f8f 100644 --- a/app/Http/Middleware/AnnouncementMiddleware.php +++ b/app/Http/Middleware/AnnouncementMiddleware.php @@ -23,7 +23,13 @@ public function handle(Request $request, Closure $next): Response $query->orderBy('id', 'desc'); }])->find(Auth::user()->id); - View::share('announcements', $user->announcements); + $announcements = $user->announcements; + $hasUnread = $announcements->some(fn ($a) => $a->pivot->status == 0); + + View::share([ + 'announcements' => $announcements, + 'hasUnread' => $hasUnread, + ]); } return $next($request); diff --git a/resources/views/partials/app/calendars/media.blade.php b/resources/views/partials/app/calendars/media.blade.php index f4f3c6e..60a4c2d 100644 --- a/resources/views/partials/app/calendars/media.blade.php +++ b/resources/views/partials/app/calendars/media.blade.php @@ -118,7 +118,7 @@ $('.popover').popover('hide'); }, events: [ - @foreach($announcements as $announcement) + @foreach($overview_announcements as $announcement) { id: 'default-event-id-' + Math.floor(Math.random() * 9999999), title: "Pengumuman", diff --git a/resources/views/partials/dashboard/footer.blade.php b/resources/views/partials/dashboard/footer.blade.php index fa58423..9281e2d 100644 --- a/resources/views/partials/dashboard/footer.blade.php +++ b/resources/views/partials/dashboard/footer.blade.php @@ -74,8 +74,6 @@ @include('partials.app.sweetalert') -{{-- {{dd(request()->all())}} --}} - @if (isset($page)) @if ($page === 'create_issue_management') @@ -96,7 +94,7 @@ @if(is_role(['1'])) @include('partials.app.calendars.admin') @elseif (is_role(['3'])) -@include('partials.app.calendars.media') +@include('partials.app.calendars.media',['overview_announcements' => $overview_announcements]) @endif @endif diff --git a/resources/views/partials/dashboard/header.blade.php b/resources/views/partials/dashboard/header.blade.php index 2c2c180..fcb27a6 100644 --- a/resources/views/partials/dashboard/header.blade.php +++ b/resources/views/partials/dashboard/header.blade.php @@ -1,74 +1,87 @@ - -
- -
-
-
-
- -
-
- - logo - logo-dark - -
-
- +
+
+ +
+
+
+
+ +
+ +
+
+
+ +
+
+ +
-
-
+ +
- + + + + diff --git a/resources/views/partials/dashboard/sidebar.blade.php b/resources/views/partials/dashboard/sidebar.blade.php index 30a801b..f490bf8 100644 --- a/resources/views/partials/dashboard/sidebar.blade.php +++ b/resources/views/partials/dashboard/sidebar.blade.php @@ -38,7 +38,7 @@ {{get_cooperation_notif()}} -
  • + {{--
  • Informasi
  • @@ -47,7 +47,7 @@ Pengumuman {{get_unread_announcements()}} -
    • + --}} @endif @if (is_role(['1']))