From 82564845b4d03cc86ad090d13dab12d229c0ec1d Mon Sep 17 00:00:00 2001
From: "DESKTOP-SVBVC1U\\HP" <muhtasimhafiz@gmail.com>
Date: Fri, 27 Sep 2024 21:08:05 +0600
Subject: [PATCH] fixed goal board selector

---
 .../Goalcanvas/Templates/dashboard.blade.php  | 21 ++-----------
 .../Templates/partials/goalBoard.blade.php    | 18 +++++++++++
 .../Goalcanvas/Templates/showCanvas.blade.php | 31 ++-----------------
 3 files changed, 22 insertions(+), 48 deletions(-)
 create mode 100644 app/Domain/Goalcanvas/Templates/partials/goalBoard.blade.php

diff --git a/app/Domain/Goalcanvas/Templates/dashboard.blade.php b/app/Domain/Goalcanvas/Templates/dashboard.blade.php
index 552dd88ac..706672d0a 100644
--- a/app/Domain/Goalcanvas/Templates/dashboard.blade.php
+++ b/app/Domain/Goalcanvas/Templates/dashboard.blade.php
@@ -53,27 +53,10 @@
             <h5>{{ session('currentProjectClient') . ' // ' . session('currentProjectName') }}</h5>
 
             <h1>{{ __('headline.goal.dashboardboard') }} //
-                @if (count($allCanvas) > 0)
-                    <x-global::actions.dropdown label-text='All Goal Groups' contentRole="accent" position="bottom">
-                        <x-slot:menu>
-                            @if ($login::userIsAtLeast($roles::$editor))
-                                <x-global::actions.dropdown.item variant="link" href="#/goalcanvas/bigRock">
-                                    {!! __('links.icon.create_new_board') !!}
-                                </x-global::actions.dropdown.item>
-                                <x-global::actions.dropdown.item variant="border" />
-                            @endif
-                            @foreach ($allCanvas as $canvasRow)
-                                <x-global::actions.dropdown.item variant="link"
-                                    href="{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasRow['id'] }}">
-                                    {{ $tpl->escape($canvasRow['title']) }}
-                                </x-global::actions.dropdown.item>
-                            @endforeach
-                        </x-slot:menu>
-                    </x-global::actions.dropdown>
-                @endif
+                @include('goalcanvas::partials.goalBoard')
             </h1>
         </div>
-    </div><!--pageheader-->
+    </div>
 
     <div class="maincontent">
 
diff --git a/app/Domain/Goalcanvas/Templates/partials/goalBoard.blade.php b/app/Domain/Goalcanvas/Templates/partials/goalBoard.blade.php
new file mode 100644
index 000000000..6836ca691
--- /dev/null
+++ b/app/Domain/Goalcanvas/Templates/partials/goalBoard.blade.php
@@ -0,0 +1,18 @@
+@if (count($allCanvas) > 0)
+<x-global::actions.dropdown label-text='All Goal Groups' contentRole="ghost" class="header-title-dropdown" position="bottom">
+    <x-slot:menu>
+        @if ($login::userIsAtLeast($roles::$editor))
+            <x-global::actions.dropdown.item variant="link" href="#/goalcanvas/bigRock">
+                {!! __('links.icon.create_new_board') !!}
+            </x-global::actions.dropdown.item>
+            <x-global::actions.dropdown.item variant="border" />
+        @endif
+        @foreach ($allCanvas as $canvasRow)
+            <x-global::actions.dropdown.item variant="link"
+                href="{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasRow['id'] }}">
+                {{ $tpl->escape($canvasRow['title']) }}
+            </x-global::actions.dropdown.item>
+        @endforeach
+    </x-slot:menu>
+</x-global::actions.dropdown>
+@endif
\ No newline at end of file
diff --git a/app/Domain/Goalcanvas/Templates/showCanvas.blade.php b/app/Domain/Goalcanvas/Templates/showCanvas.blade.php
index 2ba368d1a..96e67066d 100644
--- a/app/Domain/Goalcanvas/Templates/showCanvas.blade.php
+++ b/app/Domain/Goalcanvas/Templates/showCanvas.blade.php
@@ -92,34 +92,7 @@ class="delete">
                 </span>
             @endif
             <h1>{{ __('headline.goal.board') }} //
-                @if (count($allCanvas) > 0)
-                    <span class="dropdown dropdownWrapper">
-                        @php
-                            $labelText = $canvasTitle . '&nbsp;<i class="fa fa-caret-down"></i>';
-                        @endphp
-
-                        <x-global::actions.dropdown :labelText="html_entity_decode($labelText)" class="header-title-dropdown" align="start"
-                            contentRole="menu">
-                            <x-slot:menu>
-                                @if ($login::userIsAtLeast($roles::$editor))
-                                    <x-global::actions.dropdown.item href="#/goalcanvas/bigRock">
-                                        {!! __('links.icon.create_new_bigrock') !!}
-                                    </x-global::actions.dropdown.item>
-                                @endif
-
-                                <li class="border"></li>
-
-                                @foreach ($allCanvas as $canvasRow)
-                                    <x-global::actions.dropdown.item
-                                        href="{{ BASE_URL }}/goalcanvas/showCanvas/{{ $canvasRow['id'] }}">
-                                        {{ $canvasRow['title'] }}
-                                    </x-global::actions.dropdown.item>
-                                @endforeach
-                            </x-slot:menu>
-                        </x-global::actions.dropdown>
-
-                    </span>
-                @endif
+                @include('goalcanvas::partials.goalBoard')
             </h1>
         </div>
     </div>
@@ -151,7 +124,7 @@ class="delete">
                                     $filterStatus = $filter['status'] ?? 'all';
                                     $filterRelates = $filter['relates'] ?? 'all';
                                 @endphp
-                                <x-global::actions.dropdown class="btn dropdown-toggle" align="start" contentRole="menu">
+                                <x-global::actions.dropdown class="btn dropdown-toggle" align="start" contentRole="ghost">
                                 <!-- Dropdown Trigger -->
                                 <x-slot:labelText>
                                     @if ($filter['status'] == 'all')