From b35ccb0c44c6ffe0832cfa31d87da61ea2f4f5c9 Mon Sep 17 00:00:00 2001
From: "DESKTOP-SVBVC1U\\HP" <muhtasimhafiz@gmail.com>
Date: Thu, 26 Sep 2024 18:32:23 +0600
Subject: [PATCH 1/3] fix

---
 .idea/codeception.xml                         |  12 -
 .idea/leantime-oss.iml                        |   1 +
 .idea/php.xml                                 |   2 -
 .../Templates/components/input.blade.php      |  35 +-
 .../Templates/includes/ticketFilter.blade.php | 324 ++++++++----------
 .../Tickets/Templates/roadmap.blade.php       |   8 +-
 .../Tickets/Templates/showAll.blade.php       |  24 +-
 .../Templates/showAllMilestones.blade.php     |  42 +--
 .../showAllMilestonesOverview.blade.php       |  42 +--
 public/assets/less/components/pagetitle.css   |  12 +
 10 files changed, 224 insertions(+), 278 deletions(-)

diff --git a/.idea/codeception.xml b/.idea/codeception.xml
index 8f518b214..8e937f59c 100644
--- a/.idea/codeception.xml
+++ b/.idea/codeception.xml
@@ -6,18 +6,6 @@
         <Configuration>
           <option name="path" value="$PROJECT_DIR$/app/Plugins/Billing/tests" />
         </Configuration>
-        <Configuration>
-          <option name="path" value="$PROJECT_DIR$/app/Plugins/Billing/tests" />
-        </Configuration>
-        <Configuration>
-          <option name="path" value="$PROJECT_DIR$/app/Plugins/Sentry/tests" />
-        </Configuration>
-        <Configuration>
-          <option name="path" value="$PROJECT_DIR$/app/Plugins/Billing/tests" />
-        </Configuration>
-        <Configuration>
-          <option name="path" value="$PROJECT_DIR$/app/Plugins/Sentry/tests" />
-        </Configuration>
         <Configuration>
           <option name="path" value="$PROJECT_DIR$/app/Plugins/Sentry/tests" />
         </Configuration>
diff --git a/.idea/leantime-oss.iml b/.idea/leantime-oss.iml
index cf1e59de7..acd27cb2f 100644
--- a/.idea/leantime-oss.iml
+++ b/.idea/leantime-oss.iml
@@ -5,6 +5,7 @@
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/app/Plugins/Billing/tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/app/Plugins/Sentry/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/app" isTestSource="false" packagePrefix="Leantime\" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/league/html-to-markdown" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/bacon/bacon-qr-code" />
       <excludeFolder url="file://$MODULE_DIR$/vendor/htmlawed/htmlawed" />
diff --git a/.idea/php.xml b/.idea/php.xml
index 9c7031bae..fd7d4fa38 100644
--- a/.idea/php.xml
+++ b/.idea/php.xml
@@ -319,8 +319,6 @@
   <component name="PhpUnit">
     <phpunit_settings>
       <PhpUnitSettings custom_loader_path="$PROJECT_DIR$/app/Plugins/Sentry/vendor/autoload.php" phpunit_phar_path="" />
-      <PhpUnitSettings custom_loader_path="$PROJECT_DIR$/app/Plugins/Billing/vendor/autoload.php" phpunit_phar_path="" />
-      <PhpUnitSettings custom_loader_path="$PROJECT_DIR$/vendor/autoload.php" phpunit_phar_path="" />
     </phpunit_settings>
   </component>
   <component name="PsalmOptionsConfiguration">
diff --git a/app/Domain/Comments/Templates/components/input.blade.php b/app/Domain/Comments/Templates/components/input.blade.php
index bb97785ca..fbdbf0342 100644
--- a/app/Domain/Comments/Templates/components/input.blade.php
+++ b/app/Domain/Comments/Templates/components/input.blade.php
@@ -1,29 +1,38 @@
-
-
-<form hx-post="{{ BASE_URL }}/hx/comments/comment-list/save?module={{ $module }}&moduleId={{ $moduleId }}&includeStatus={{ $includeStatus }}"
-      hx-target="#comments-{{ $module }}-{{ $moduleId }}">
-    <div id="commentReplyBox-{{ $formHash }}-{{ $parentId }}" class="commentBox-{{ $formHash }} commentReplyBox-{{ $formHash }} commenterFields hidden mb-sm" >
+<form
+    hx-post="{{ BASE_URL }}/hx/comments/comment-list/save?module={{ $module }}&moduleId={{ $moduleId }}&includeStatus={{ $includeStatus }}"
+    hx-target="#comments-{{ $module }}-{{ $moduleId }}">
+    <div id="commentReplyBox-{{ $formHash }}-{{ $parentId }}"
+        class="commentBox-{{ $formHash }} commentReplyBox-{{ $formHash }} commenterFields hidden mb-sm">
         <div class="commentImage">
-            <x-users::profile-image :user="array('id'=> session('userdata.id'), 'modified' => session('userdata.modified'))" ></x-users::profile-image>
+            <x-users::profile-image :user="['id' => session('userdata.id'), 'modified' => session('userdata.modified')]"></x-users::profile-image>
         </div>
         <div class="commentReply">
             <x-global::forms.submit-button name="{{ __('links.save') }}" />
-            <x-global::forms.reset-button name="{{ __('links.cancel') }}" onclick="leantime.commentsComponent.resetForm(-1, '{{ $formHash }}')" />
+            <x-global::forms.reset-button name="{{ __('links.cancel') }}"
+                onclick="leantime.commentsComponent.resetForm(-1, '{{ $formHash }}')" />
 
-            @if(isset($statusUpdates) && $statusUpdates)
+            @if (isset($statusUpdates) && $statusUpdates)
                 <div class="inlineLabelDropdown float-right">
                     <label>{{ __('text.highlight_status') }}</label>
-                    <x-global::forms.dropdownPill class="float-right" :type="'simpleStatus'" :extraClass="'dropRight'" :selectedKey="'none'" :selectedClass="'none'" :options="['none'=>__('label.project_status_none'), 'red'=>__('label.project_status_red'), 'yellow'=>__('label.project_status_yellow'), 'green'=>__('label.project_status_green')]"></x-global::forms.dropdownPill>
+                    <x-global::forms._archive.dropdownPill class="float-right" :type="'simpleStatus'" :extraClass="'dropRight'"
+                        :selectedKey="'none'" :selectedClass="'none'" :options="[
+                            'none' => __('label.project_status_none'),
+                            'red' => __('label.project_status_red'),
+                            'yellow' => __('label.project_status_yellow'),
+                            'green' => __('label.project_status_green'),
+                        ]"></x-global::forms._archive.dropdownPill>
                 </div>
             @endif
 
         </div>
 
-        <input type="hidden" name="saveComment" class="commenterField" value="1"/>
-        <input type="hidden" name="editComment" class="commenterField" id="edit-comment-{{ $formHash }}-{{ $parentId }}" value="" />
-        <input type="hidden" name="father" class="commenterField" id="father-{{ $formHash }}" value="{{ $parentId }}"/>
+        <input type="hidden" name="saveComment" class="commenterField" value="1" />
+        <input type="hidden" name="editComment" class="commenterField"
+            id="edit-comment-{{ $formHash }}-{{ $parentId }}" value="" />
+        <input type="hidden" name="father" class="commenterField" id="father-{{ $formHash }}"
+            value="{{ $parentId }}" />
 
         <div class="clearall"></div>
-        <br/>
+        <br />
     </div>
 </form>
diff --git a/app/Domain/Tickets/Templates/includes/ticketFilter.blade.php b/app/Domain/Tickets/Templates/includes/ticketFilter.blade.php
index 243316411..17f2ae6a1 100644
--- a/app/Domain/Tickets/Templates/includes/ticketFilter.blade.php
+++ b/app/Domain/Tickets/Templates/includes/ticketFilter.blade.php
@@ -1,203 +1,157 @@
-
 <?php
 
 use Leantime\Core\Controller\Frontcontroller;
 
 $currentRoute = currentRoute();
 
-$currentUrlPath = BASE_URL . "/" . str_replace(".", "/", $currentRoute);
-$groupBy        = $tpl->get('groupByOptions');
-$sortBy        = $tpl->get('sortOptions');
-$searchCriteria = $tpl->get("searchCriteria");
-$statusLabels = $tpl->get("allTicketStates");
-$taskToggle = $tpl->get("enableTaskTypeToggle");
+$currentUrlPath = BASE_URL . '/' . str_replace('.', '/', $currentRoute);
+$groupBy = $tpl->get('groupByOptions');
+$sortBy = $tpl->get('sortOptions');
+$searchCriteria = $tpl->get('searchCriteria');
+$statusLabels = $tpl->get('allTicketStates');
+$taskToggle = $tpl->get('enableTaskTypeToggle');
 
 ?>
 <form action="" method="get" id="ticketSearch">
 
-    <input type="hidden" value="1" name="search"/>
-    <input type="hidden" value="<?php echo session("currentProject"); ?>" name="projectId" id="projectIdInput"/>
-
-    <div class="filterWrapper" style="display:inline-block; position:relative; vertical-align: bottom; margin-bottom:20px;">
-        <a onclick="leantime.ticketsController.toggleFilterBar();" style="margin-right:5px;"
-           class="btn btn-link" data-tippy-content="<?=$tpl->__("popover.filter") ?>">
-            <i class="fas fa-filter"></i> Filter<?=$tpl->get('numOfFilters') > 0 ? "  <span class='badge badge-primary'>" . $tpl->get('numOfFilters') . "</span> " : "" ?>
-            <?php /*Please don't change the code formatting below, if not right next to each other it somehow adds a space between the two buttons and increases the distance */ ?>
-        </a><?php if ($currentRoute !== 'tickets.roadmap' && $currentRoute != "tickets.showProjectCalendar") {
-            ?><div class="btn-group viewDropDown">
-            <button class="btn btn-link dropdown-toggle" type="button" data-toggle="dropdown" data-tippy-content="<?=$tpl->__("popover.group_by") ?>">
-                <span class="fa-solid fa-diagram-project"></span> Group By
-                <?php if ($searchCriteria["groupBy"] != 'all' && $searchCriteria["groupBy"] != '') { ?>
-                    <span class="badge badge-primary">1</span>
-                <?php } ?>
-            </button>
-            <ul class="dropdown-menu">
-                <?php foreach ($groupBy as $input) { ?>
-                    <li>
-                        <span class="radio">
-                            <input
-                                type="radio"
-                                name="groupBy"
-                                <?php if ($searchCriteria["groupBy"] == $input['field']) {
-                                    echo "checked='checked'";
-                                }?>
-                                value="<?php echo $input['field']; ?>"
-                                id="<?php echo $input['id']; ?>"
-                                onclick="leantime.ticketsController.initTicketSearchUrlBuilder('<?=$currentUrlPath; ?>')"
-                            />
-                            <label for="<?php echo $input['id'] ?>"><?=$tpl->__("label.{$input['label']}") ?></label>
-                        </span>
-                    </li>
-                <?php }; ?>
-            </ul>
-        </div>
-            <?php } ?>
-        <div class="filterBar hideOnLoad" style="width:250px;">
-
-            <div class="row-fluid">
-
-                <?php $tpl->dispatchTplEvent('filters.beforeFirstBarField'); ?>
-
-                <div class="">
-                    <label class="inline"><?=$tpl->__("label.user") ?></label>
-                    <div class="form-group">
-                        <select data-placeholder="<?=$tpl->__("input.placeholders.filter_by_user") ?>"  title="<?=$tpl->__("input.placeholders.filter_by_user") ?>" name="users" multiple="multiple" class="user-select" id="userSelect">
-                            <option value="" data-placeholder="true">All Users</option>
-                            <?php foreach ($tpl->get('users') as $userRow) {     ?>
-                                <?php echo"<option value='" . $userRow["id"] . "'";
-
-                                if ($searchCriteria['users'] !== false && $searchCriteria['users'] !== null && array_search($userRow["id"], explode(",", $searchCriteria['users'])) !== false) {
-                                    echo" selected='selected' ";
-                                }
-
-                                echo">" . sprintf($tpl->__('text.full_name'), $tpl->escape($userRow['firstname']), $tpl->escape($userRow['lastname'])) . "</option>"; ?>
-
-                            <?php }     ?>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="">
-                    <label class="inline"><?=$tpl->__("label.milestone") ?></label>
-                    <div class="form-group">
-                        <select data-placeholder="<?=$tpl->__("input.placeholders.filter_by_milestone") ?>" multiple="multiple" title="<?=$tpl->__("input.placeholders.filter_by_milestone") ?>" name="milestone" id="milestoneSelect">
-                            <option value="" data-placeholder="true"><?=$tpl->__("label.all_milestones") ?></option>
-                            <?php
-                            if (is_array($tpl->get('milestones'))) {
-                                foreach ($tpl->get('milestones') as $milestoneRow) {   ?>
-                                    <?php echo"<option value='" . $milestoneRow->id . "'";
-
-                                    if (isset($searchCriteria['milestone']) && ($searchCriteria['milestone'] == $milestoneRow->id) && array_search($milestoneRow->id, explode(",", $searchCriteria['milestone'])) !== false) {
-                                        echo" selected='selected' ";
-                                    }
-
-                                    echo">" . $tpl->escape($milestoneRow->headline) . "</option>"; ?>
-
-                                <?php }
-                            }?>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="">
-                    <label class="inline"><?=$tpl->__("label.todo_type") ?></label>
-                    <div class="form-group">
-                        <select multiple="multiple"  data-placeholder="<?=$tpl->__("input.placeholders.filter_by_type") ?>" title="<?=$tpl->__("input.placeholders.filter_by_type") ?>" name="type" id="typeSelect">
-                            <option value="" data-placeholder="true"><?=$tpl->__("label.all_types") ?></option>
-                            <?php foreach ($tpl->get('types') as $type) {    ?>
-                                <?php echo"<option value='" . $type . "'";
-
-                                if (isset($searchCriteria['type']) && array_search($type, explode(",", $searchCriteria['type'])) !== false) {
-                                    echo" selected='selected' ";
-                                }
-
-                                echo">$type</option>"; ?>
-
-                            <?php } ?>
-                        </select>
+    <input type="hidden" value="1" name="search" />
+    <input type="hidden" value="<?php echo session('currentProject'); ?>" name="projectId" id="projectIdInput" />
+
+    <div class="filterWrapper"style="display:inline-block; position:relative; vertical-align: bottom; margin-bottom:20px;">
+        <div class="filterWrapper" style="display:inline-block; position:relative; vertical-align: bottom; margin-bottom:20px;">
+            <!-- Trigger for the dropdown -->
+            <x-global::actions.dropdown variant="card" contentRole="ghost" cardLabel="Filter Options">
+                <x-slot:labelText>
+                    {{ __('popover.filter') }}
+                    <span class="fa-solid fa-filter"></span>
+                </x-slot:labelText>
+                <x-slot:cardContent>
+                    <!-- Filter Bar Content -->
+                    <div style="width:250px;">
+                        <div class="row-fluid">
+        
+                            @dispatchTplEvent('filters.beforeFirstBarField')
+        
+                            <div class="form-group">
+                                <label class="inline">{{ __('label.user') }}</label>
+                                <select data-placeholder="{{ __('input.placeholders.filter_by_user') }}" title="{{ __('input.placeholders.filter_by_user') }}" name="users" multiple="multiple" class="user-select" id="userSelect">
+                                    <option value="" data-placeholder="true">All Users</option>
+                                    @foreach ($tpl->get('users') as $userRow)
+                                        <option value="{{ $userRow['id'] }}" 
+                                            @if($searchCriteria['users'] && array_search($userRow['id'], explode(',', $searchCriteria['users'])) !== false) selected @endif>
+                                            {{ sprintf(__('text.full_name'), $tpl->escape($userRow['firstname']), $tpl->escape($userRow['lastname'])) }}
+                                        </option>
+                                    @endforeach
+                                </select>
+                            </div>
+        
+                            <div class="form-group">
+                                <label class="inline">{{ __('label.milestone') }}</label>
+                                <select data-placeholder="{{ __('input.placeholders.filter_by_milestone') }}" multiple="multiple" title="{{ __('input.placeholders.filter_by_milestone') }}" name="milestone" id="milestoneSelect">
+                                    <option value="" data-placeholder="true">{{ __('label.all_milestones') }}</option>
+                                    @foreach ($tpl->get('milestones') as $milestoneRow)
+                                        <option value="{{ $milestoneRow->id }}" 
+                                            @if(isset($searchCriteria['milestone']) && array_search($milestoneRow->id, explode(',', $searchCriteria['milestone'])) !== false) selected @endif>
+                                            {{ $tpl->escape($milestoneRow->headline) }}
+                                        </option>
+                                    @endforeach
+                                </select>
+                            </div>
+        
+                            <div class="form-group">
+                                <label class="inline">{{ __('label.todo_type') }}</label>
+                                <select multiple="multiple" data-placeholder="{{ __('input.placeholders.filter_by_type') }}" title="{{ __('input.placeholders.filter_by_type') }}" name="type" id="typeSelect">
+                                    <option value="" data-placeholder="true">{{ __('label.all_types') }}</option>
+                                    @foreach ($tpl->get('types') as $type)
+                                        <option value="{{ $type }}" 
+                                            @if(isset($searchCriteria['type']) && array_search($type, explode(',', $searchCriteria['type'])) !== false) selected @endif>
+                                            {{ $type }}
+                                        </option>
+                                    @endforeach
+                                </select>
+                            </div>
+        
+                            <div class="form-group">
+                                <label class="inline">{{ __('label.todo_priority') }}</label>
+                                <select multiple="multiple" data-placeholder="{{ __('input.placeholders.filter_by_priority') }}" title="{{ __('input.placeholders.filter_by_priority') }}" name="priority" id="prioritySelect">
+                                    <option value="" data-placeholder="true">{{ __('label.all_priorities') }}</option>
+                                    @foreach ($tpl->get('priorities') as $priorityKey => $priorityValue)
+                                        <option value="{{ $priorityKey }}" 
+                                            @if(isset($searchCriteria['priority']) && array_search($priorityKey, explode(',', $searchCriteria['priority'])) !== false) selected @endif>
+                                            {{ $priorityValue }}
+                                        </option>
+                                    @endforeach
+                                </select>
+                            </div>
+        
+                            <div class="form-group">
+                                <label class="inline">{{ __('label.todo_status') }}</label>
+                                <select multiple="multiple" data-placeholder="{{ __('input.placeholders.filter_by_status') }}" name="searchStatus" class="status-select" id="statusSelect">
+                                    <option value="" data-placeholder="true">All Statuses</option>
+                                    <option value="not_done" @if($searchCriteria['status'] && str_contains($searchCriteria['status'], 'not_done')) selected @endif>
+                                        {{ __('label.not_done') }}
+                                    </option>
+                                    @foreach ($statusLabels as $key => $label)
+                                        <option value="{{ $key }}" 
+                                            @if($searchCriteria['status'] && array_search((string) $key, explode(',', $searchCriteria['status'])) !== false) selected @endif>
+                                            {{ $tpl->escape($label['name']) }}
+                                        </option>
+                                    @endforeach
+                                </select>
+                            </div>
+        
+                            <div class="form-group">
+                                <label class="inline">{{ __('label.search_term') }}</label>
+                                <input type="text" name="termInput" id="termInput" style="width: 230px" value="{{ $searchCriteria['term'] }}" placeholder="{{ __('label.search_term') }}">
+                            </div>
+        
+                            <div class="form-group" style="margin-top:15px;">
+                                <input type="submit" value="{{ __('buttons.search') }}" name="search" class="form-control btn btn-primary" />
+                            </div>
+        
+                        </div>
                     </div>
-                </div>
-
-                <div class="">
-                    <label class="inline"><?=$tpl->__("label.todo_priority") ?></label>
-                    <div class="form-group">
-                        <select multiple="multiple"  data-placeholder="<?=$tpl->__("input.placeholders.filter_by_priority") ?>" title="<?=$tpl->__("input.placeholders.filter_by_priority") ?>" name="priority" id="prioritySelect">
-                            <option value="" data-placeholder="true"><?=$tpl->__("label.all_priorities") ?></option>
-                            <?php foreach ($tpl->get('priorities') as $priorityKey => $priorityValue) {    ?>
-                                <?php echo"<option value='" . $priorityKey . "'";
-
-                                if (isset($searchCriteria['priority']) && array_search($priorityKey, explode(",", $searchCriteria['priority'])) !== false) {
-                                    echo" selected='selected' ";
-                                }
-
-                                echo">$priorityValue</option>"; ?>
-
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="">
-                    <label class="inline"><?=$tpl->__("label.todo_status") ?></label>
-                    <div class="form-group">
-                        <select multiple="multiple"  data-placeholder="<?=$tpl->__("input.placeholders.filter_by_status")?>" name="searchStatus"  multiple="multiple" class="status-select" id="statusSelect">
-                            <option value="" data-placeholder="true">All Statuses</option>
-                            <option value="not_done" <?php if (
-                            $searchCriteria['status'] !== false && str_contains(
-                                $searchCriteria['status'],
-                                'not_done'
-                            )
-) {
-                                                                           echo" selected='selected' ";
-                                                     }?>><?=$tpl->__("label.not_done")?></option>
-                            <?php foreach ($statusLabels as $key => $label) {?>
-                                <?php echo"<option value='" . $key . "'";
-
-                                if ($searchCriteria['status'] !== false && array_search((string) $key, explode(",", $searchCriteria['status'])) !== false) {
-                                    echo" selected='selected' ";
-                                }
-                                echo">" . $tpl->escape($label["name"]) . "</option>"; ?>
-
-                            <?php } ?>
-                        </select>
-                    </div>
-                </div>
-
-                <div class="">
-                    <div class="form-group">
-                        <label class="inline"><?=$tpl->__("label.search_term")?></label>
-                        <input type="text" name="termInput" id="termInput"
-                        style="width: 230px"
-                        value="<?=$searchCriteria['term']?>"
-                        placeholder="<?=$tpl->__("label.search_term")?>">
-                    </div>
-                </div>
-
-                <div class="" style="margin-top:15px;">
-                    <input type="submit" value="<?=$tpl->__("buttons.search") ?>" name="search" class="form-control btn btn-primary" />
-                </div>
-
-            </div>
-
+                </x-slot:cardContent>
+            </x-global::actions.dropdown>
         </div>
+        
+        <?php if ($currentRoute !== 'tickets.roadmap' && $currentRoute != "tickets.showProjectCalendar") {
+            ?><div class="btn-group viewDropDown">
+            <x-global::actions.dropdown contentRole="ghost">
+                <x-slot:labelText>
+                        {{ __('popover.group_by') }}
+                        <span class="fa-solid fa-diagram-project"></span>
+                        @if ($searchCriteria['groupBy'] !== 'all' && $searchCriteria['groupBy'] !== '')
+                            <span class="badge badge-primary">1</span>
+                        @endif
+                    </button>
+                </x-slot:labelText>
+
+                <x-slot:menu>
+                    @foreach ($groupBy as $input)
+                        <x-global::actions.dropdown.item>
+                            <span class="radio">
+                                <input type="radio" name="groupBy"
+                                    @if ($searchCriteria['groupBy'] == $input['field']) checked='checked' @endif
+                                    value="{{ $input['field'] }}" id="{{ $input['id'] }}"
+                                    onclick="leantime.ticketsController.initTicketSearchUrlBuilder('{{ $currentUrlPath }}')" />
+                                <label for="{{ $input['id'] }}">{{ __('label.' . $input['label']) }}</label>
+                            </span>
+                        </x-global::actions.dropdown.item>
+                    @endforeach
+                </x-slot:menu>
+            </x-global::actions.dropdown>
 
-        <?php if(isset($taskToggle) && $taskToggle === true){ ?>
-            <div class="" style="float:right; margin-left:5px; ">
-                <x-global::forms.checkbox
-                    labelText="Show Tasks"
-                    labelPosition="right"
-                    name="showTasks"
-                    value="true"
-                    :checked="($tpl->get('showTasks') === 'true')"
-                    id="taskTypeToggle"
-                    class="toggle"
-                    onchange="jQuery('#ticketSearch').submit();"
-                />
-            </div>
+        </div>
         <?php } ?>
 
 
-
+        <?php if(isset($taskToggle) && $taskToggle === true){ ?>
+        <div class="" style="float:right; margin-left:5px; ">
+            <x-global::forms.checkbox labelText="Show Tasks" labelPosition="right" name="showTasks" value="true"
+                :checked="($tpl->get('showTasks') === 'true')" id="taskTypeToggle" class="toggle" onchange="jQuery('#ticketSearch').submit();" />
+        </div>
+        <?php } ?>
     </div>
 
 
@@ -245,7 +199,7 @@ class="toggle"
             },
         });
 
-        leantime.ticketsController.initTicketSearchSubmit('<?=$currentUrlPath; ?>');
+        leantime.ticketsController.initTicketSearchSubmit('<?= $currentUrlPath ?>');
 
     })
 </script>
diff --git a/app/Domain/Tickets/Templates/roadmap.blade.php b/app/Domain/Tickets/Templates/roadmap.blade.php
index 575f91719..0cba22bcf 100644
--- a/app/Domain/Tickets/Templates/roadmap.blade.php
+++ b/app/Domain/Tickets/Templates/roadmap.blade.php
@@ -57,13 +57,13 @@
                     <x-global::actions.dropdown 
                         class="btn dropdown-toggle"
                         id="ganttTimeControl"
-                        :label-text="$tpl->__('buttons.timeframe') . ': ' . $currentView"
+                        {{-- :label-text="$tpl->__('buttons.timeframe') . ': ' . $currentView" --}}
                         align="start"
-                        contentRole="menu"
+                        contentRole="ghost"
                     >
-                        <x-slot:trigger>
+                        <x-slot:labelText>
                             {{ $tpl->__('buttons.timeframe') }}: <span class="viewText">{{ $currentView }}</span> <span class="caret"></span>
-                        </x-slot:trigger>
+                        </x-slot:labelText>
                     
                         <x-slot:menu>
                             <x-global::actions.dropdown.item 
diff --git a/app/Domain/Tickets/Templates/showAll.blade.php b/app/Domain/Tickets/Templates/showAll.blade.php
index c47b7a71d..4be331dd5 100644
--- a/app/Domain/Tickets/Templates/showAll.blade.php
+++ b/app/Domain/Tickets/Templates/showAll.blade.php
@@ -152,7 +152,7 @@
                             }
                             ?>
                             <td data-order="{{ $name }}">
-                                <x-global::forms.dropdownPill
+                                <x-global::forms._archive.dropdownPill
                                     class="ticketDropdown statusDropdown colorized show {{ $class }} f-left"
                                     id="statusDropdownMenuLink{{ $row['id'] }}" :selectedKey="$selectedKey" :options="$statusLabels">
                                     <x-slot name="buttonText">
@@ -169,7 +169,7 @@ class="ticketDropdown statusDropdown colorized show {{ $class }} f-left"
                                             {{ $label['name'] }}
                                         </x-global::actions.dropdown.item>
                                     @endforeach
-                                </x-global::forms.dropdownPill>
+                                </x-global::forms._archive.dropdownPill>
                             </td>
 
 
@@ -185,7 +185,7 @@ class="ticketDropdown statusDropdown colorized show {{ $class }} f-left"
                             ?>
 
                             <td data-order="{{ $milestoneHeadline }}">
-                                <x-global::forms.dropdownPill
+                                <x-global::forms._archive.dropdownPill
                                     class="ticketDropdown milestoneDropdown colorized show label-default milestone f-left"
                                     id="{{ $milestoneDropdownId }}" :style="'background-color:' . $milestoneColor" :labelText="$milestoneHeadline" type="milestone"
                                     :parentId="$row['id']">
@@ -213,7 +213,7 @@ class="ticketDropdown milestoneDropdown colorized show label-default milestone f
                                             {{ $tpl->escape($milestone->headline) }}
                                         </x-global::actions.dropdown.item>
                                     @endforeach
-                                </x-global::forms.dropdownPill>
+                                </x-global::forms._archive.dropdownPill>
                             </td>
 
                             <td
@@ -225,7 +225,7 @@ class="ticketDropdown milestoneDropdown colorized show label-default milestone f
                                 $dropdownId = 'effortDropdownMenuLink' . $row['id'];
                                 ?>
 
-                                <x-global::forms.dropdownPill class="label-default effort f-left" id="{{ $dropdownId }}"
+                                <x-global::forms._archive.dropdownPill class="label-default effort f-left" id="{{ $dropdownId }}"
                                     :labelText="$effortText" type="effort" :parentId="$row['id']">
                                     <x-slot name="buttonText">
                                         {{ $effortText }} <i class="fa fa-caret-down" aria-hidden="true"></i>
@@ -241,7 +241,7 @@ class="ticketDropdown milestoneDropdown colorized show label-default milestone f
                                             {{ $effortValue }}
                                         </x-global::actions.dropdown.item>
                                     @endforeach
-                                </x-global::forms.dropdownPill>
+                                </x-global::forms._archive.dropdownPill>
 
                             </td>
 
@@ -253,7 +253,7 @@ class="ticketDropdown milestoneDropdown colorized show label-default milestone f
                             ?>
 
                             <td data-order="{{ $priorityText }}">
-                                <x-global::forms.dropdownPill
+                                <x-global::forms._archive.dropdownPill
                                     class="ticketDropdown priorityDropdown show label-default priority priority-bg-{{ $row['priority'] }} f-left"
                                     id="{{ $dropdownId }}" :labelText="$priorityText" type="priority" :parentId="$row['id']"
                                     :selectedKey="$row['priority']">
@@ -271,7 +271,7 @@ class="priority-bg-{{ $priorityKey }}" :data-value="$row['id'] . '_' . $priority
                                             {{ $priorityValue }}
                                         </x-global::actions.dropdown.item>
                                     @endforeach
-                                </x-global::forms.dropdownPill>
+                                </x-global::forms._archive.dropdownPill>
                             </td>
 
                             <?php
@@ -287,7 +287,7 @@ class="priority-bg-{{ $priorityKey }}" :data-value="$row['id'] . '_' . $priority
 
                             <td
                                 data-order="{{ $row['editorFirstname'] != '' ? $tpl->escape($row['editorFirstname']) : $tpl->__('dropdown.not_assigned') }}">
-                                <x-global::forms.dropdownPill class="ticketDropdown userDropdown noBg show f-left"
+                                <x-global::forms._archive.dropdownPill class="ticketDropdown userDropdown noBg show f-left"
                                     id="{{ $dropdownId }}" :labelText="html_entity_decode($userText)" type="user" :parentId="$row['id']">
                                     <x-slot name="buttonText">
                                         {!! $userText !!} <i class="fa fa-caret-down" aria-hidden="true"></i>
@@ -309,7 +309,7 @@ class="priority-bg-{{ $priorityKey }}" :data-value="$row['id'] . '_' . $priority
                                             {{ sprintf($tpl->__('text.full_name'), $tpl->escape($user['firstname']), $tpl->escape($user['lastname'])) }}
                                         </x-global::actions.dropdown.item>
                                     @endforeach
-                                </x-global::forms.dropdownPill>
+                                </x-global::forms._archive.dropdownPill>
                             </td>
 
                             <?php
@@ -320,7 +320,7 @@ class="priority-bg-{{ $priorityKey }}" :data-value="$row['id'] . '_' . $priority
                             ?>
 
                             <td data-order="{{ $sprintHeadline }}">
-                                <x-global::forms.dropdownPill
+                                <x-global::forms._archive.dropdownPill
                                     class="ticketDropdown sprintDropdown show label-default sprint f-left"
                                     id="{{ $dropdownId }}" :labelText="$sprintHeadline" type="sprint" :parentId="$row['id']">
                                     <x-slot name="buttonText">
@@ -342,7 +342,7 @@ class="ticketDropdown sprintDropdown show label-default sprint f-left"
                                             {{ $tpl->escape($sprint->name) }}
                                         </x-global::actions.dropdown.item>
                                     @endforeach
-                                </x-global::forms.dropdownPill>
+                                </x-global::forms._archive.dropdownPill>
                             </td>
 
 
diff --git a/app/Domain/Tickets/Templates/showAllMilestones.blade.php b/app/Domain/Tickets/Templates/showAllMilestones.blade.php
index 232bfcb33..1197c4137 100644
--- a/app/Domain/Tickets/Templates/showAllMilestones.blade.php
+++ b/app/Domain/Tickets/Templates/showAllMilestones.blade.php
@@ -159,7 +159,7 @@
                             ?>
 
                             <td data-order="{{ $milestoneHeadline }}">
-                                <x-global::forms.dropdownPill
+                                <x-global::forms._archive.dropdownPill
                                     class="ticketDropdown milestoneDropdown colorized show label-default milestone"
                                     id="{{ $dropdownId }}" :style="'background-color:' . $milestoneColor" :labelText="$milestoneHeadline" type="milestone"
                                     :parentId="$row['id']">
@@ -189,7 +189,7 @@ class="ticketDropdown milestoneDropdown colorized show label-default milestone"
                                             </x-global::actions.dropdown.item>
                                         @endif
                                     @endforeach
-                                </x-global::forms.dropdownPill>
+                                </x-global::forms._archive.dropdownPill>
                             </td>
 
                             <?php
@@ -207,7 +207,7 @@ class="ticketDropdown milestoneDropdown colorized show label-default milestone"
                             ?>
 
                             <td data-order="{{ $sortKey }}">
-                                <x-global::forms.dropdownPill
+                                <x-global::forms._archive.dropdownPill
                                     class="ticketDropdown statusDropdown colorized show {{ $class }}"
                                     id="statusDropdownMenuLink{{ $row['id'] }}" :labelText="$name" type="status"
                                     :parentId="$row['id']" :selectedKey="$selectedKey" :options="$statusLabels">
@@ -226,7 +226,7 @@ class="{{ $label['class'] }}" :data-label="$tpl->escape($label['name'])" :data-v
                                             {{ $tpl->escape($label['name']) }}
                                         </x-global::actions.dropdown.item>
                                     @endforeach
-                                </x-global::forms.dropdownPill>
+                                </x-global::forms._archive.dropdownPill>
                             </td>
 
                             <?php
@@ -242,7 +242,7 @@ class="{{ $label['class'] }}" :data-label="$tpl->escape($label['name'])" :data-v
 
                             <td
                                 data-order="{{ $row['editorFirstname'] != '' ? $tpl->escape($row['editorFirstname']) : $tpl->__('dropdown.not_assigned') }}">
-                                <x-global::forms.dropdownPill class="ticketDropdown userDropdown noBg show"
+                                <x-global::forms._archive.dropdownPill class="ticketDropdown userDropdown noBg show"
                                     id="{{ $dropdownId }}" :labelText="html_entity_decode($userText)" type="user" :parentId="$row['id']">
                                     <x-slot name="buttonText">
                                         {!! $userText !!} <i class="fa fa-caret-down" aria-hidden="true"></i>
@@ -264,35 +264,29 @@ class="{{ $label['class'] }}" :data-label="$tpl->escape($label['name'])" :data-v
                                             {{ sprintf($tpl->__('text.full_name'), $tpl->escape($user['firstname']), $tpl->escape($user['lastname'])) }}
                                         </x-global::actions.dropdown.item>
                                     @endforeach
-                                </x-global::forms.dropdownPill>
+                                </x-global::forms._archive.dropdownPill>
                             </td>
 
 
 
                             <td data-order="{{ $row['editFrom'] }}">
                                 {{ __('label.due_icon') }}
-                                <x-global::forms.text-input 
-                                    type="text" 
-                                    name="editFrom" 
-                                    value="{{ format($row['editFrom'])->date() }}" 
-                                    title="{{ __('label.planned_start_date') }}" 
-                                    class="editFromDate secretInput milestoneEditFromAsync fromDateTicket-{{ $row['id'] }}" 
-                                    data-id="{{ $row['id'] }}" 
-                                />
+                                <x-global::forms.text-input type="text" name="editFrom"
+                                    value="{{ format($row['editFrom'])->date() }}"
+                                    title="{{ __('label.planned_start_date') }}"
+                                    class="editFromDate secretInput milestoneEditFromAsync fromDateTicket-{{ $row['id'] }}"
+                                    data-id="{{ $row['id'] }}" />
                             </td>
-                            
+
                             <td data-order="{{ $row['editTo'] }}">
                                 {{ __('label.due_icon') }}
-                                <x-global::forms.text-input 
-                                    type="text" 
-                                    name="editTo" 
-                                    value="{{ format($row['editTo'])->date() }}" 
-                                    title="{{ __('label.planned_end_date') }}" 
-                                    class="editToDate secretInput milestoneEditToAsync toDateTicket-{{ $row['id'] }}" 
-                                    data-id="{{ $row['id'] }}" 
-                                />
+                                <x-global::forms.text-input type="text" name="editTo"
+                                    value="{{ format($row['editTo'])->date() }}"
+                                    title="{{ __('label.planned_end_date') }}"
+                                    class="editToDate secretInput milestoneEditToAsync toDateTicket-{{ $row['id'] }}"
+                                    data-id="{{ $row['id'] }}" />
                             </td>
-                            
+
 
                             <td data-order="<?= $row['planHours'] ?>">
                                 <?php echo $row['planHours']; ?>
diff --git a/app/Domain/Tickets/Templates/showAllMilestonesOverview.blade.php b/app/Domain/Tickets/Templates/showAllMilestonesOverview.blade.php
index 560b70838..d71e480ec 100644
--- a/app/Domain/Tickets/Templates/showAllMilestonesOverview.blade.php
+++ b/app/Domain/Tickets/Templates/showAllMilestonesOverview.blade.php
@@ -133,7 +133,7 @@
                         ?>
 
                         <td class="dropdown-cell" data-order="{{ $milestoneHeadline }}">
-                            <x-global::forms.dropdownPill
+                            <x-global::forms._archive.dropdownPill
                                 class="ticketDropdown milestoneDropdown colorized show label-default milestone"
                                 id="{{ $dropdownId }}" :style="'background-color:' . $milestoneColor" :labelText="$milestoneHeadline" type="milestone"
                                 :parentId="$row->id">
@@ -162,7 +162,7 @@ class="ticketDropdown milestoneDropdown colorized show label-default milestone"
                                         </x-global::actions.dropdown.item>
                                     @endif
                                 @endforeach
-                            </x-global::forms.dropdownPill>
+                            </x-global::forms._archive.dropdownPill>
                         </td>
 
 
@@ -179,7 +179,7 @@ class="ticketDropdown milestoneDropdown colorized show label-default milestone"
                         ?>
 
                         <td class="dropdown-cell" data-order="{{ $name }}">
-                            <x-global::forms.dropdownPill
+                            <x-global::forms._archive.dropdownPill
                                 class="ticketDropdown statusDropdown colorized show {{ $class }}"
                                 id="statusDropdownMenuLink{{ $row->id }}" :labelText="$name" type="status"
                                 :parentId="$row->id" :selectedKey="$selectedKey" :options="$statusLabels">
@@ -198,7 +198,7 @@ class="{{ $label['class'] }}" :data-label="$tpl->escape($label['name'])" :data-v
                                         {{ $tpl->escape($label['name']) }}
                                     </x-global::actions.dropdown.item>
                                 @endforeach
-                            </x-global::forms.dropdownPill>
+                            </x-global::forms._archive.dropdownPill>
                         </td>
 
 
@@ -219,7 +219,7 @@ class="{{ $label['class'] }}" :data-label="$tpl->escape($label['name'])" :data-v
 
                         <td class="dropdown-cell"
                             data-order="{{ $row->editorFirstname != '' ? $tpl->escape($row->editorFirstname) : $tpl->__('dropdown.not_assigned') }}">
-                            <x-global::forms.dropdownPill class="ticketDropdown userDropdown noBg show"
+                            <x-global::forms._archive.dropdownPill class="ticketDropdown userDropdown noBg show"
                                 id="{{ $dropdownId }}" :labelText="html_entity_decode($userText)" type="user" :parentId="$row->id"
                                 :selectedKey="$selectedKey" :options="$users">
                                 <x-slot name="buttonText">
@@ -242,34 +242,24 @@ class="{{ $label['class'] }}" :data-label="$tpl->escape($label['name'])" :data-v
                                         {{ sprintf($tpl->__('text.full_name'), $tpl->escape($user['firstname']), $tpl->escape($user['lastname'])) }}
                                     </x-global::actions.dropdown.item>
                                 @endforeach
-                            </x-global::forms.dropdownPill>
+                            </x-global::forms._archive.dropdownPill>
                         </td>
 
 
                         <td data-order="{!! $row->editFrom !!}">
-                            <x-global::forms.text-input 
-                                type="text" 
-                                name="editFrom" 
-                                value="{!! format($row->editFrom)->date() !!}" 
-                                title="{!! __('label.planned_start_date') !!}" 
-                                class="editFromDate secretInput milestoneEditFromAsync fromDateTicket-{!! $row->id !!}" 
-                                data-id="{!! $row->id !!}" 
-                                leadingVisual="{!! __('label.due_icon') !!}"
-                            />
+                            <x-global::forms.text-input type="text" name="editFrom" value="{!! format($row->editFrom)->date() !!}"
+                                title="{!! __('label.planned_start_date') !!}"
+                                class="editFromDate secretInput milestoneEditFromAsync fromDateTicket-{!! $row->id !!}"
+                                data-id="{!! $row->id !!}" leadingVisual="{!! __('label.due_icon') !!}" />
                         </td>
-                        
+
                         <td data-order="{!! $row->editTo !!}">
-                            <x-global::forms.text-input 
-                                type="text" 
-                                name="editTo" 
-                                value="{!! format($row->editTo)->date() !!}" 
-                                title="{!! __('label.planned_end_date') !!}" 
-                                class="editToDate secretInput milestoneEditToAsync toDateTicket-{!! $row->id !!}" 
-                                data-id="{!! $row->id !!}" 
-                                leadingVisual="{!! __('label.due_icon') !!}"
-                            />
+                            <x-global::forms.text-input type="text" name="editTo" value="{!! format($row->editTo)->date() !!}"
+                                title="{!! __('label.planned_end_date') !!}"
+                                class="editToDate secretInput milestoneEditToAsync toDateTicket-{!! $row->id !!}"
+                                data-id="{!! $row->id !!}" leadingVisual="{!! __('label.due_icon') !!}" />
                         </td>
-                        
+
 
                         <td data-order="<?= $row->planHours ?>">
                             <?php echo $row->planHours; ?>
diff --git a/public/assets/less/components/pagetitle.css b/public/assets/less/components/pagetitle.css
index 6b64e6b89..393964521 100644
--- a/public/assets/less/components/pagetitle.css
+++ b/public/assets/less/components/pagetitle.css
@@ -15,3 +15,15 @@
     }
 
 }
+
+.filterWrapper {
+    .dropdown {
+        .btn {
+            color: rgb(8, 8, 236) !important;  
+        }
+
+        .text-base-content {
+            color: blue !important;  
+        }
+    }
+}
\ No newline at end of file

From df4539ba6bc8ef27b8a53a5b2a7cd718cdfad459 Mon Sep 17 00:00:00 2001
From: "DESKTOP-SVBVC1U\\HP" <muhtasimhafiz@gmail.com>
Date: Fri, 27 Sep 2024 00:40:04 +0600
Subject: [PATCH 2/3] filter updated

---
 .../Templates/includes/ticketFilter.blade.php | 269 +++++++++---------
 public/dist/mix-manifest.json                 | 109 ++++---
 2 files changed, 189 insertions(+), 189 deletions(-)

diff --git a/app/Domain/Tickets/Templates/includes/ticketFilter.blade.php b/app/Domain/Tickets/Templates/includes/ticketFilter.blade.php
index 17f2ae6a1..63326c6be 100644
--- a/app/Domain/Tickets/Templates/includes/ticketFilter.blade.php
+++ b/app/Domain/Tickets/Templates/includes/ticketFilter.blade.php
@@ -17,142 +17,143 @@
     <input type="hidden" value="1" name="search" />
     <input type="hidden" value="<?php echo session('currentProject'); ?>" name="projectId" id="projectIdInput" />
 
-    <div class="filterWrapper"style="display:inline-block; position:relative; vertical-align: bottom; margin-bottom:20px;">
-        <div class="filterWrapper" style="display:inline-block; position:relative; vertical-align: bottom; margin-bottom:20px;">
-            <!-- Trigger for the dropdown -->
-            <x-global::actions.dropdown variant="card" contentRole="ghost" cardLabel="Filter Options">
-                <x-slot:labelText>
-                    {{ __('popover.filter') }}
-                    <span class="fa-solid fa-filter"></span>
-                </x-slot:labelText>
-                <x-slot:cardContent>
-                    <!-- Filter Bar Content -->
-                    <div style="width:250px;">
-                        <div class="row-fluid">
-        
-                            @dispatchTplEvent('filters.beforeFirstBarField')
-        
-                            <div class="form-group">
-                                <label class="inline">{{ __('label.user') }}</label>
-                                <select data-placeholder="{{ __('input.placeholders.filter_by_user') }}" title="{{ __('input.placeholders.filter_by_user') }}" name="users" multiple="multiple" class="user-select" id="userSelect">
-                                    <option value="" data-placeholder="true">All Users</option>
-                                    @foreach ($tpl->get('users') as $userRow)
-                                        <option value="{{ $userRow['id'] }}" 
-                                            @if($searchCriteria['users'] && array_search($userRow['id'], explode(',', $searchCriteria['users'])) !== false) selected @endif>
-                                            {{ sprintf(__('text.full_name'), $tpl->escape($userRow['firstname']), $tpl->escape($userRow['lastname'])) }}
-                                        </option>
-                                    @endforeach
-                                </select>
-                            </div>
-        
-                            <div class="form-group">
-                                <label class="inline">{{ __('label.milestone') }}</label>
-                                <select data-placeholder="{{ __('input.placeholders.filter_by_milestone') }}" multiple="multiple" title="{{ __('input.placeholders.filter_by_milestone') }}" name="milestone" id="milestoneSelect">
-                                    <option value="" data-placeholder="true">{{ __('label.all_milestones') }}</option>
-                                    @foreach ($tpl->get('milestones') as $milestoneRow)
-                                        <option value="{{ $milestoneRow->id }}" 
-                                            @if(isset($searchCriteria['milestone']) && array_search($milestoneRow->id, explode(',', $searchCriteria['milestone'])) !== false) selected @endif>
-                                            {{ $tpl->escape($milestoneRow->headline) }}
-                                        </option>
-                                    @endforeach
-                                </select>
-                            </div>
-        
-                            <div class="form-group">
-                                <label class="inline">{{ __('label.todo_type') }}</label>
-                                <select multiple="multiple" data-placeholder="{{ __('input.placeholders.filter_by_type') }}" title="{{ __('input.placeholders.filter_by_type') }}" name="type" id="typeSelect">
-                                    <option value="" data-placeholder="true">{{ __('label.all_types') }}</option>
-                                    @foreach ($tpl->get('types') as $type)
-                                        <option value="{{ $type }}" 
-                                            @if(isset($searchCriteria['type']) && array_search($type, explode(',', $searchCriteria['type'])) !== false) selected @endif>
-                                            {{ $type }}
-                                        </option>
-                                    @endforeach
-                                </select>
-                            </div>
-        
-                            <div class="form-group">
-                                <label class="inline">{{ __('label.todo_priority') }}</label>
-                                <select multiple="multiple" data-placeholder="{{ __('input.placeholders.filter_by_priority') }}" title="{{ __('input.placeholders.filter_by_priority') }}" name="priority" id="prioritySelect">
-                                    <option value="" data-placeholder="true">{{ __('label.all_priorities') }}</option>
-                                    @foreach ($tpl->get('priorities') as $priorityKey => $priorityValue)
-                                        <option value="{{ $priorityKey }}" 
-                                            @if(isset($searchCriteria['priority']) && array_search($priorityKey, explode(',', $searchCriteria['priority'])) !== false) selected @endif>
-                                            {{ $priorityValue }}
-                                        </option>
-                                    @endforeach
-                                </select>
-                            </div>
-        
-                            <div class="form-group">
-                                <label class="inline">{{ __('label.todo_status') }}</label>
-                                <select multiple="multiple" data-placeholder="{{ __('input.placeholders.filter_by_status') }}" name="searchStatus" class="status-select" id="statusSelect">
-                                    <option value="" data-placeholder="true">All Statuses</option>
-                                    <option value="not_done" @if($searchCriteria['status'] && str_contains($searchCriteria['status'], 'not_done')) selected @endif>
-                                        {{ __('label.not_done') }}
-                                    </option>
-                                    @foreach ($statusLabels as $key => $label)
-                                        <option value="{{ $key }}" 
-                                            @if($searchCriteria['status'] && array_search((string) $key, explode(',', $searchCriteria['status'])) !== false) selected @endif>
-                                            {{ $tpl->escape($label['name']) }}
-                                        </option>
-                                    @endforeach
-                                </select>
-                            </div>
-        
-                            <div class="form-group">
-                                <label class="inline">{{ __('label.search_term') }}</label>
-                                <input type="text" name="termInput" id="termInput" style="width: 230px" value="{{ $searchCriteria['term'] }}" placeholder="{{ __('label.search_term') }}">
-                            </div>
-        
-                            <div class="form-group" style="margin-top:15px;">
-                                <input type="submit" value="{{ __('buttons.search') }}" name="search" class="form-control btn btn-primary" />
-                            </div>
-        
-                        </div>
-                    </div>
-                </x-slot:cardContent>
-            </x-global::actions.dropdown>
-        </div>
-        
-        <?php if ($currentRoute !== 'tickets.roadmap' && $currentRoute != "tickets.showProjectCalendar") {
-            ?><div class="btn-group viewDropDown">
-            <x-global::actions.dropdown contentRole="ghost">
-                <x-slot:labelText>
-                        {{ __('popover.group_by') }}
-                        <span class="fa-solid fa-diagram-project"></span>
-                        @if ($searchCriteria['groupBy'] !== 'all' && $searchCriteria['groupBy'] !== '')
-                            <span class="badge badge-primary">1</span>
-                        @endif
-                    </button>
-                </x-slot:labelText>
-
-                <x-slot:menu>
-                    @foreach ($groupBy as $input)
-                        <x-global::actions.dropdown.item>
-                            <span class="radio">
-                                <input type="radio" name="groupBy"
-                                    @if ($searchCriteria['groupBy'] == $input['field']) checked='checked' @endif
-                                    value="{{ $input['field'] }}" id="{{ $input['id'] }}"
-                                    onclick="leantime.ticketsController.initTicketSearchUrlBuilder('{{ $currentUrlPath }}')" />
-                                <label for="{{ $input['id'] }}">{{ __('label.' . $input['label']) }}</label>
-                            </span>
-                        </x-global::actions.dropdown.item>
+    <!-- Trigger for the dropdown -->
+    <x-global::actions.dropdown variant="card" contentRole="ghost" cardLabel="Filter Options">
+        <x-slot:labelText>
+            {{ __('popover.filter') }}
+            <span class="fa-solid fa-filter"></span>
+        </x-slot:labelText>
+        <x-slot:cardContent>
+            <!-- Filter Bar Content -->
+            {{-- @dispatchTplEvent('filters.beforeFirstBarField') --}}
+
+            <div>
+                <x-global::forms.select name="users" id="userSelect" multiple
+                    data-placeholder="{{ __('input.placeholders.filter_by_user') }}"
+                    title="{{ __('input.placeholders.filter_by_user') }}">
+                    <x-slot:labelText>{{ __('label.user') }}</x-slot:labelText>
+                    <x-global::forms.select.select-option value="" data-placeholder="true">All
+                        Users</x-global::forms.select.select-option>
+                    @foreach ($tpl->get('users') as $userRow)
+                        <x-global::forms.select.select-option value="{{ $userRow['id'] }}" :selected="in_array($userRow['id'], explode(',', $searchCriteria['users'] ?? ''))">
+                            {{ sprintf(__('text.full_name'), $tpl->escape($userRow['firstname']), $tpl->escape($userRow['lastname'])) }}
+                        </x-global::forms.select.select-option>
                     @endforeach
-                </x-slot:menu>
-            </x-global::actions.dropdown>
-
-        </div>
-        <?php } ?>
-
-
-        <?php if(isset($taskToggle) && $taskToggle === true){ ?>
-        <div class="" style="float:right; margin-left:5px; ">
-            <x-global::forms.checkbox labelText="Show Tasks" labelPosition="right" name="showTasks" value="true"
-                :checked="($tpl->get('showTasks') === 'true')" id="taskTypeToggle" class="toggle" onchange="jQuery('#ticketSearch').submit();" />
-        </div>
-        <?php } ?>
+                </x-global::forms.select>
+            </div>
+
+            <div>
+                <x-global::forms.select name="milestone" id="milestoneSelect" multiple
+                    data-placeholder="{{ __('input.placeholders.filter_by_milestone') }}"
+                    title="{{ __('input.placeholders.filter_by_milestone') }}">
+                    <x-slot:labelText>{{ __('label.milestone') }}</x-slot:labelText>
+                    <x-global::forms.select.select-option value=""
+                        data-placeholder="true">{{ __('label.all_milestones') }}</x-global::forms.select.select-option>
+                    @foreach ($tpl->get('milestones') as $milestoneRow)
+                        <x-global::forms.select.select-option value="{{ $milestoneRow->id }}" :selected="in_array($milestoneRow->id, explode(',', $searchCriteria['milestone'] ?? ''))">
+                            {{ $tpl->escape($milestoneRow->headline) }}
+                        </x-global::forms.select.select-option>
+                    @endforeach
+                </x-global::forms.select>
+            </div>
+
+            <div>
+                <x-global::forms.select name="type" id="typeSelect" multiple
+                    data-placeholder="{{ __('input.placeholders.filter_by_type') }}"
+                    title="{{ __('input.placeholders.filter_by_type') }}">
+                    <x-slot:labelText>{{ __('label.todo_type') }}</x-slot:labelText>
+                    <x-global::forms.select.select-option value=""
+                        data-placeholder="true">{{ __('label.all_types') }}</x-global::forms.select.select-option>
+                    @foreach ($tpl->get('types') as $type)
+                        <x-global::forms.select.select-option value="{{ $type }}" :selected="in_array($type, explode(',', $searchCriteria['type'] ?? ''))">
+                            {{ $type }}
+                        </x-global::forms.select.select-option>
+                    @endforeach
+                </x-global::forms.select>
+            </div>
+
+            <div>
+                <x-global::forms.select name="priority" id="prioritySelect" multiple
+                    data-placeholder="{{ __('input.placeholders.filter_by_priority') }}"
+                    title="{{ __('input.placeholders.filter_by_priority') }}">
+                    <x-slot:labelText>{{ __('label.todo_priority') }}</x-slot:labelText>
+                    <x-global::forms.select.select-option value=""
+                        data-placeholder="true">{{ __('label.all_priorities') }}</x-global::forms.select.select-option>
+                    @foreach ($tpl->get('priorities') as $priorityKey => $priorityValue)
+                        <x-global::forms.select.select-option value="{{ $priorityKey }}" :selected="in_array($priorityKey, explode(',', $searchCriteria['priority'] ?? ''))">
+                            {{ $priorityValue }}
+                        </x-global::forms.select.select-option>
+                    @endforeach
+                </x-global::forms.select>
+            </div>
+
+            <div>
+                <x-global::forms.select name="searchStatus" id="statusSelect" multiple
+                    data-placeholder="{{ __('input.placeholders.filter_by_status') }}">
+                    <x-slot:labelText>{{ __('label.todo_status') }}</x-slot:labelText>
+                    <x-global::forms.select.select-option value=""
+                        data-placeholder="true">{{ __('label.all_statuses') }}</x-global::forms.select.select-option>
+                    <x-global::forms.select.select-option value="not_done" :selected="$searchCriteria['status'] && str_contains($searchCriteria['status'], 'not_done')">
+                        {{ __('label.not_done') }}
+                    </x-global::forms.select.select-option>
+                    @foreach ($statusLabels as $key => $label)
+                        <x-global::forms.select.select-option value="{{ $key }}" :selected="in_array((string) $key, explode(',', $searchCriteria['status'] ?? ''))">
+                            {{ $tpl->escape($label['name']) }}
+                        </x-global::forms.select.select-option>
+                    @endforeach
+                </x-global::forms.select>
+            </div>
+
+            <div>
+                <x-global::forms.text-input name="termInput" id="termInput" :value="$searchCriteria['term']"
+                    caption="{{ __('label.search_term') }}" placeholder="{{ __('label.search_term') }}"
+                    style="width: 230px" />
+            </div>
+
+            <div style="margin-top: 15px;">
+                <x-global::forms.button type="submit" name="search" class="btn btn-primary">
+                    {{ __('buttons.search') }}
+                </x-global::forms.button>
+            </div>
+
+
+        </x-slot:cardContent>
+    </x-global::actions.dropdown>
+
+
+    <?php if ($currentRoute !== 'tickets.roadmap' && $currentRoute != "tickets.showProjectCalendar") {?>
+    <x-global::actions.dropdown contentRole="ghost">
+        <x-slot:labelText>
+            {{ __('popover.group_by') }}
+            <span class="fa-solid fa-diagram-project"></span>
+            @if ($searchCriteria['groupBy'] !== 'all' && $searchCriteria['groupBy'] !== '')
+                <span class="badge badge-primary">1</span>
+            @endif
+            </button>
+        </x-slot:labelText>
+
+        <x-slot:menu>
+            @foreach ($groupBy as $input)
+                <x-global::actions.dropdown.item>
+                    <span class="radio">
+                        <input type="radio" name="groupBy" @if ($searchCriteria['groupBy'] == $input['field']) checked='checked' @endif
+                            value="{{ $input['field'] }}" id="{{ $input['id'] }}"
+                            onclick="leantime.ticketsController.initTicketSearchUrlBuilder('{{ $currentUrlPath }}')" />
+                        <label for="{{ $input['id'] }}">{{ __('label.' . $input['label']) }}</label>
+                    </span>
+                </x-global::actions.dropdown.item>
+            @endforeach
+        </x-slot:menu>
+    </x-global::actions.dropdown>
+    <?php } ?>
+
+
+    <?php if(isset($taskToggle) && $taskToggle === true){ ?>
+    <div class="" style="float:right; margin-left:5px; ">
+        <x-global::forms.checkbox labelText="Show Tasks" labelPosition="right" name="showTasks" value="true"
+            :checked="($tpl->get('showTasks') === 'true')" id="taskTypeToggle" class="toggle" onchange="jQuery('#ticketSearch').submit();" />
     </div>
+    <?php } ?>
 
 
 
diff --git a/public/dist/mix-manifest.json b/public/dist/mix-manifest.json
index 5c98ef47f..3e2b867e2 100644
--- a/public/dist/mix-manifest.json
+++ b/public/dist/mix-manifest.json
@@ -11,18 +11,6 @@
     "/images/03-1.png": "/images/03-1.png",
     "/images/32px.png": "/images/32px.png",
     "/images/40px.png": "/images/40px.png",
-    "/images/Screenshots/apps.png": "/images/Screenshots/apps.png",
-    "/images/Screenshots/blueprints.png": "/images/Screenshots/blueprints.png",
-    "/images/Screenshots/calendar.png": "/images/Screenshots/calendar.png",
-    "/images/Screenshots/dark.png": "/images/Screenshots/dark.png",
-    "/images/Screenshots/docs.png": "/images/Screenshots/docs.png",
-    "/images/Screenshots/goals.png": "/images/Screenshots/goals.png",
-    "/images/Screenshots/kanban.png": "/images/Screenshots/kanban.png",
-    "/images/Screenshots/mywork.png": "/images/Screenshots/mywork.png",
-    "/images/Screenshots/projectDashboard.png": "/images/Screenshots/projectDashboard.png",
-    "/images/Screenshots/table.png": "/images/Screenshots/table.png",
-    "/images/Screenshots/timeline.png": "/images/Screenshots/timeline.png",
-    "/images/Screenshots/timesheet.png": "/images/Screenshots/timesheet.png",
     "/images/apple-touch-icon.png": "/images/apple-touch-icon.png",
     "/images/backgrounds/bg0.png": "/images/backgrounds/bg0.png",
     "/images/backgrounds/bg1.png": "/images/backgrounds/bg1.png",
@@ -51,16 +39,27 @@
     "/images/logo_blue.svg": "/images/logo_blue.svg",
     "/images/mattermost-logoHorizontal.png": "/images/mattermost-logoHorizontal.png",
     "/images/openid-icon.png": "/images/openid-icon.png",
+    "/images/Screenshots/apps.png": "/images/Screenshots/apps.png",
+    "/images/Screenshots/blueprints.png": "/images/Screenshots/blueprints.png",
+    "/images/Screenshots/calendar.png": "/images/Screenshots/calendar.png",
+    "/images/Screenshots/dark.png": "/images/Screenshots/dark.png",
+    "/images/Screenshots/docs.png": "/images/Screenshots/docs.png",
+    "/images/Screenshots/goals.png": "/images/Screenshots/goals.png",
+    "/images/Screenshots/kanban.png": "/images/Screenshots/kanban.png",
+    "/images/Screenshots/mywork.png": "/images/Screenshots/mywork.png",
+    "/images/Screenshots/projectDashboard.png": "/images/Screenshots/projectDashboard.png",
+    "/images/Screenshots/table.png": "/images/Screenshots/table.png",
+    "/images/Screenshots/timeline.png": "/images/Screenshots/timeline.png",
+    "/images/Screenshots/timesheet.png": "/images/Screenshots/timesheet.png",
     "/images/spotlightBg.png": "/images/spotlightBg.png",
     "/images/svg/apps-grid-icon.svg": "/images/svg/apps-grid-icon.svg",
     "/images/svg/csv-icon.svg": "/images/svg/csv-icon.svg",
     "/images/svg/loading-animation.svg": "/images/svg/loading-animation.svg",
-    "/images/svg/undraw_Organizing_projects_0p9a.svg": "/images/svg/undraw_Organizing_projects_0p9a.svg",
-    "/images/svg/undraw_a_moment_to_relax_bbpa.svg": "/images/svg/undraw_a_moment_to_relax_bbpa.svg",
     "/images/svg/undraw_adjustments_p22m.svg": "/images/svg/undraw_adjustments_p22m.svg",
     "/images/svg/undraw_adventure_map_hnin.svg": "/images/svg/undraw_adventure_map_hnin.svg",
     "/images/svg/undraw_air_support_re_nybl.svg": "/images/svg/undraw_air_support_re_nybl.svg",
     "/images/svg/undraw_attached_file_re_0n9b.svg": "/images/svg/undraw_attached_file_re_0n9b.svg",
+    "/images/svg/undraw_a_moment_to_relax_bbpa.svg": "/images/svg/undraw_a_moment_to_relax_bbpa.svg",
     "/images/svg/undraw_blooming_re_2kc4.svg": "/images/svg/undraw_blooming_re_2kc4.svg",
     "/images/svg/undraw_book_reading_re_fu2c.svg": "/images/svg/undraw_book_reading_re_fu2c.svg",
     "/images/svg/undraw_business_decisions_re_84ag.svg": "/images/svg/undraw_business_decisions_re_84ag.svg",
@@ -89,8 +88,9 @@
     "/images/svg/undraw_no_data_re_kwbl.svg": "/images/svg/undraw_no_data_re_kwbl.svg",
     "/images/svg/undraw_online_connection_6778.svg": "/images/svg/undraw_online_connection_6778.svg",
     "/images/svg/undraw_online_party_re_7t6g.svg": "/images/svg/undraw_online_party_re_7t6g.svg",
-    "/images/svg/undraw_party_re_nmwj.svg": "/images/svg/undraw_party_re_nmwj.svg",
+    "/images/svg/undraw_Organizing_projects_0p9a.svg": "/images/svg/undraw_Organizing_projects_0p9a.svg",
     "/images/svg/undraw_partying_re_at7f.svg": "/images/svg/undraw_partying_re_at7f.svg",
+    "/images/svg/undraw_party_re_nmwj.svg": "/images/svg/undraw_party_re_nmwj.svg",
     "/images/svg/undraw_photos_re_pvh3.svg": "/images/svg/undraw_photos_re_pvh3.svg",
     "/images/svg/undraw_powerful_re_frhr.svg": "/images/svg/undraw_powerful_re_frhr.svg",
     "/images/svg/undraw_progressive_app_m-9-ms.svg": "/images/svg/undraw_progressive_app_m-9-ms.svg",
@@ -118,37 +118,6 @@
     "/images/throbber.gif": "/images/throbber.gif",
     "/images/undraw_progressive_app_m9ms.png": "/images/undraw_progressive_app_m9ms.png",
     "/images/zulip-org-logo.png": "/images/zulip-org-logo.png",
-    "/fonts/Atkinson-Hyperlegible-Bold-102.ttf": "/fonts/Atkinson-Hyperlegible-Bold-102.ttf",
-    "/fonts/Atkinson-Hyperlegible-Bold-102a.woff2": "/fonts/Atkinson-Hyperlegible-Bold-102a.woff2",
-    "/fonts/Atkinson-Hyperlegible-BoldItalic-102.ttf": "/fonts/Atkinson-Hyperlegible-BoldItalic-102.ttf",
-    "/fonts/Atkinson-Hyperlegible-BoldItalic-102a.woff2": "/fonts/Atkinson-Hyperlegible-BoldItalic-102a.woff2",
-    "/fonts/Atkinson-Hyperlegible-Italic-102.ttf": "/fonts/Atkinson-Hyperlegible-Italic-102.ttf",
-    "/fonts/Atkinson-Hyperlegible-Italic-102a.woff2": "/fonts/Atkinson-Hyperlegible-Italic-102a.woff2",
-    "/fonts/Atkinson-Hyperlegible-Regular-102.ttf": "/fonts/Atkinson-Hyperlegible-Regular-102.ttf",
-    "/fonts/Atkinson-Hyperlegible-Regular-102a.woff2": "/fonts/Atkinson-Hyperlegible-Regular-102a.woff2",
-    "/fonts/HankenGrotesk-Italic-VariableFont_wght.ttf": "/fonts/HankenGrotesk-Italic-VariableFont_wght.ttf",
-    "/fonts/HankenGrotesk-VariableFont_wght.ttf": "/fonts/HankenGrotesk-VariableFont_wght.ttf",
-    "/fonts/Hanken_Grotesk/HankenGrotesk-Italic-VariableFont_wght.ttf": "/fonts/Hanken_Grotesk/HankenGrotesk-Italic-VariableFont_wght.ttf",
-    "/fonts/Hanken_Grotesk/HankenGrotesk-VariableFont_wght.ttf": "/fonts/Hanken_Grotesk/HankenGrotesk-VariableFont_wght.ttf",
-    "/fonts/Hanken_Grotesk/OFL.txt": "/fonts/Hanken_Grotesk/OFL.txt",
-    "/fonts/Hanken_Grotesk/README.txt": "/fonts/Hanken_Grotesk/README.txt",
-    "/fonts/MaterialSymbolsRounded-VariableFont_FILL,GRAD,opsz,wght.ttf": "/fonts/MaterialSymbolsRounded-VariableFont_FILL,GRAD,opsz,wght.ttf",
-    "/fonts/Roboto-Bold.ttf": "/fonts/Roboto-Bold.ttf",
-    "/fonts/Roboto-Bold.woff2": "/fonts/Roboto-Bold.woff2",
-    "/fonts/Roboto-Italic.ttf": "/fonts/Roboto-Italic.ttf",
-    "/fonts/Roboto-Italic.woff2": "/fonts/Roboto-Italic.woff2",
-    "/fonts/Roboto-Light.ttf": "/fonts/Roboto-Light.ttf",
-    "/fonts/Roboto-Light.woff2": "/fonts/Roboto-Light.woff2",
-    "/fonts/Roboto-LightItalic.ttf": "/fonts/Roboto-LightItalic.ttf",
-    "/fonts/Roboto-LightItalic.woff2": "/fonts/Roboto-LightItalic.woff2",
-    "/fonts/Roboto-Medium.ttf": "/fonts/Roboto-Medium.ttf",
-    "/fonts/Roboto-Medium.woff2": "/fonts/Roboto-Medium.woff2",
-    "/fonts/Roboto-MediumItalic.ttf": "/fonts/Roboto-MediumItalic.ttf",
-    "/fonts/Roboto-MediumItalic.woff2": "/fonts/Roboto-MediumItalic.woff2",
-    "/fonts/Shantell_Sans-Informal_Bold.woff2": "/fonts/Shantell_Sans-Informal_Bold.woff2",
-    "/fonts/Shantell_Sans-Informal_Bold_Italic.woff2": "/fonts/Shantell_Sans-Informal_Bold_Italic.woff2",
-    "/fonts/Shantell_Sans-Informal_Regular.woff2": "/fonts/Shantell_Sans-Informal_Regular.woff2",
-    "/fonts/Shantell_Sans-Informal_Regular_Italic.woff2": "/fonts/Shantell_Sans-Informal_Regular_Italic.woff2",
     "/fonts/atkinson/Atkinson-Hyperlegible-Bold-102.ttf": "/fonts/atkinson/Atkinson-Hyperlegible-Bold-102.ttf",
     "/fonts/atkinson/Atkinson-Hyperlegible-Bold-102a.woff2": "/fonts/atkinson/Atkinson-Hyperlegible-Bold-102a.woff2",
     "/fonts/atkinson/Atkinson-Hyperlegible-BoldItalic-102.ttf": "/fonts/atkinson/Atkinson-Hyperlegible-BoldItalic-102.ttf",
@@ -158,6 +127,14 @@
     "/fonts/atkinson/Atkinson-Hyperlegible-Italic-102a.woff2": "/fonts/atkinson/Atkinson-Hyperlegible-Italic-102a.woff2",
     "/fonts/atkinson/Atkinson-Hyperlegible-Regular-102.ttf": "/fonts/atkinson/Atkinson-Hyperlegible-Regular-102.ttf",
     "/fonts/atkinson/Atkinson-Hyperlegible-Regular-102a.woff2": "/fonts/atkinson/Atkinson-Hyperlegible-Regular-102a.woff2",
+    "/fonts/Atkinson-Hyperlegible-Bold-102.ttf": "/fonts/Atkinson-Hyperlegible-Bold-102.ttf",
+    "/fonts/Atkinson-Hyperlegible-Bold-102a.woff2": "/fonts/Atkinson-Hyperlegible-Bold-102a.woff2",
+    "/fonts/Atkinson-Hyperlegible-BoldItalic-102.ttf": "/fonts/Atkinson-Hyperlegible-BoldItalic-102.ttf",
+    "/fonts/Atkinson-Hyperlegible-BoldItalic-102a.woff2": "/fonts/Atkinson-Hyperlegible-BoldItalic-102a.woff2",
+    "/fonts/Atkinson-Hyperlegible-Italic-102.ttf": "/fonts/Atkinson-Hyperlegible-Italic-102.ttf",
+    "/fonts/Atkinson-Hyperlegible-Italic-102a.woff2": "/fonts/Atkinson-Hyperlegible-Italic-102a.woff2",
+    "/fonts/Atkinson-Hyperlegible-Regular-102.ttf": "/fonts/Atkinson-Hyperlegible-Regular-102.ttf",
+    "/fonts/Atkinson-Hyperlegible-Regular-102a.woff2": "/fonts/Atkinson-Hyperlegible-Regular-102a.woff2",
     "/fonts/fa-brands-400.ttf": "/fonts/fa-brands-400.ttf",
     "/fonts/fa-brands-400.woff2": "/fonts/fa-brands-400.woff2",
     "/fonts/fa-regular-400.ttf": "/fonts/fa-regular-400.ttf",
@@ -166,7 +143,14 @@
     "/fonts/fa-solid-900.woff2": "/fonts/fa-solid-900.woff2",
     "/fonts/fa-v4compatibility.ttf": "/fonts/fa-v4compatibility.ttf",
     "/fonts/fa-v4compatibility.woff2": "/fonts/fa-v4compatibility.woff2",
+    "/fonts/HankenGrotesk-Italic-VariableFont_wght.ttf": "/fonts/HankenGrotesk-Italic-VariableFont_wght.ttf",
+    "/fonts/HankenGrotesk-VariableFont_wght.ttf": "/fonts/HankenGrotesk-VariableFont_wght.ttf",
+    "/fonts/Hanken_Grotesk/HankenGrotesk-Italic-VariableFont_wght.ttf": "/fonts/Hanken_Grotesk/HankenGrotesk-Italic-VariableFont_wght.ttf",
+    "/fonts/Hanken_Grotesk/HankenGrotesk-VariableFont_wght.ttf": "/fonts/Hanken_Grotesk/HankenGrotesk-VariableFont_wght.ttf",
+    "/fonts/Hanken_Grotesk/OFL.txt": "/fonts/Hanken_Grotesk/OFL.txt",
+    "/fonts/Hanken_Grotesk/README.txt": "/fonts/Hanken_Grotesk/README.txt",
     "/fonts/material-icons/MaterialSymbolsRounded-VariableFont_FILL,GRAD,opsz,wght.ttf": "/fonts/material-icons/MaterialSymbolsRounded-VariableFont_FILL,GRAD,opsz,wght.ttf",
+    "/fonts/MaterialSymbolsRounded-VariableFont_FILL,GRAD,opsz,wght.ttf": "/fonts/MaterialSymbolsRounded-VariableFont_FILL,GRAD,opsz,wght.ttf",
     "/fonts/roboto/Google Android License.txt": "/fonts/roboto/Google Android License.txt",
     "/fonts/roboto/LICENSE.txt": "/fonts/roboto/LICENSE.txt",
     "/fonts/roboto/Roboto-Black.ttf": "/fonts/roboto/Roboto-Black.ttf",
@@ -193,10 +177,26 @@
     "/fonts/roboto/Roboto-Thin.woff2": "/fonts/roboto/Roboto-Thin.woff2",
     "/fonts/roboto/Roboto-ThinItalic.ttf": "/fonts/roboto/Roboto-ThinItalic.ttf",
     "/fonts/roboto/Roboto-ThinItalic.woff2": "/fonts/roboto/Roboto-ThinItalic.woff2",
+    "/fonts/Roboto-Bold.ttf": "/fonts/Roboto-Bold.ttf",
+    "/fonts/Roboto-Bold.woff2": "/fonts/Roboto-Bold.woff2",
+    "/fonts/Roboto-Italic.ttf": "/fonts/Roboto-Italic.ttf",
+    "/fonts/Roboto-Italic.woff2": "/fonts/Roboto-Italic.woff2",
+    "/fonts/Roboto-Light.ttf": "/fonts/Roboto-Light.ttf",
+    "/fonts/Roboto-Light.woff2": "/fonts/Roboto-Light.woff2",
+    "/fonts/Roboto-LightItalic.ttf": "/fonts/Roboto-LightItalic.ttf",
+    "/fonts/Roboto-LightItalic.woff2": "/fonts/Roboto-LightItalic.woff2",
+    "/fonts/Roboto-Medium.ttf": "/fonts/Roboto-Medium.ttf",
+    "/fonts/Roboto-Medium.woff2": "/fonts/Roboto-Medium.woff2",
+    "/fonts/Roboto-MediumItalic.ttf": "/fonts/Roboto-MediumItalic.ttf",
+    "/fonts/Roboto-MediumItalic.woff2": "/fonts/Roboto-MediumItalic.woff2",
     "/fonts/shantell/Shantell_Sans-Informal_Bold.woff2": "/fonts/shantell/Shantell_Sans-Informal_Bold.woff2",
     "/fonts/shantell/Shantell_Sans-Informal_Bold_Italic.woff2": "/fonts/shantell/Shantell_Sans-Informal_Bold_Italic.woff2",
     "/fonts/shantell/Shantell_Sans-Informal_Regular.woff2": "/fonts/shantell/Shantell_Sans-Informal_Regular.woff2",
     "/fonts/shantell/Shantell_Sans-Informal_Regular_Italic.woff2": "/fonts/shantell/Shantell_Sans-Informal_Regular_Italic.woff2",
+    "/fonts/Shantell_Sans-Informal_Bold.woff2": "/fonts/Shantell_Sans-Informal_Bold.woff2",
+    "/fonts/Shantell_Sans-Informal_Bold_Italic.woff2": "/fonts/Shantell_Sans-Informal_Bold_Italic.woff2",
+    "/fonts/Shantell_Sans-Informal_Regular.woff2": "/fonts/Shantell_Sans-Informal_Regular.woff2",
+    "/fonts/Shantell_Sans-Informal_Regular_Italic.woff2": "/fonts/Shantell_Sans-Informal_Regular_Italic.woff2",
     "/fonts/webfonts/fa-brands-400.ttf": "/fonts/webfonts/fa-brands-400.ttf",
     "/fonts/webfonts/fa-brands-400.woff2": "/fonts/webfonts/fa-brands-400.woff2",
     "/fonts/webfonts/fa-regular-400.ttf": "/fonts/webfonts/fa-regular-400.ttf",
@@ -205,24 +205,23 @@
     "/fonts/webfonts/fa-solid-900.woff2": "/fonts/webfonts/fa-solid-900.woff2",
     "/fonts/webfonts/fa-v4compatibility.ttf": "/fonts/webfonts/fa-v4compatibility.ttf",
     "/fonts/webfonts/fa-v4compatibility.woff2": "/fonts/webfonts/fa-v4compatibility.woff2",
-    "/lottie/leo/Dino.json": "/lottie/leo/Dino.json",
-    "/lottie/leo/Loading_Clock_Animation.json": "/lottie/leo/Loading_Clock_Animation.json",
-    "/lottie/leo/Lochnes.json": "/lottie/leo/Lochnes.json",
-    "/lottie/leo/Mermaid.json": "/lottie/leo/Mermaid.json",
-    "/lottie/leo/Narhwal.json": "/lottie/leo/Narhwal.json",
-    "/lottie/leo/Peek_Unicorn.json": "/lottie/leo/Peek_Unicorn.json",
-    "/lottie/leo/Pirate.json": "/lottie/leo/Pirate.json",
-    "/lottie/leo/Rainbow_Unicorn.json": "/lottie/leo/Rainbow_Unicorn.json",
-    "/lottie/leo/Rolling LEO.json": "/lottie/leo/Rolling LEO.json",
     "/lottie/leo/announcement.json": "/lottie/leo/announcement.json",
+    "/lottie/leo/Dino.json": "/lottie/leo/Dino.json",
     "/lottie/leo/exclamation.json": "/lottie/leo/exclamation.json",
     "/lottie/leo/happy.json": "/lottie/leo/happy.json",
     "/lottie/leo/heart.json": "/lottie/leo/heart.json",
     "/lottie/leo/in-robo.json": "/lottie/leo/in-robo.json",
     "/lottie/leo/king_arthur.json": "/lottie/leo/king_arthur.json",
+    "/lottie/leo/Loading_Clock_Animation.json": "/lottie/leo/Loading_Clock_Animation.json",
+    "/lottie/leo/Lochnes.json": "/lottie/leo/Lochnes.json",
+    "/lottie/leo/Mermaid.json": "/lottie/leo/Mermaid.json",
     "/lottie/leo/motivational_speaker.json": "/lottie/leo/motivational_speaker.json",
+    "/lottie/leo/Narhwal.json": "/lottie/leo/Narhwal.json",
     "/lottie/leo/peaking.json": "/lottie/leo/peaking.json",
+    "/lottie/leo/Peek_Unicorn.json": "/lottie/leo/Peek_Unicorn.json",
     "/lottie/leo/pirate.json": "/lottie/leo/pirate.json",
+    "/lottie/leo/Rainbow_Unicorn.json": "/lottie/leo/Rainbow_Unicorn.json",
+    "/lottie/leo/Rolling LEO.json": "/lottie/leo/Rolling LEO.json",
     "/lottie/leo/sleep.json": "/lottie/leo/sleep.json",
     "/lottie/leo/smoking.json": "/lottie/leo/smoking.json",
     "/lottie/leo/still.json": "/lottie/leo/still.json",

From 8b4e6812c120b567a1b536dca53d2c9bdff256fe Mon Sep 17 00:00:00 2001
From: "DESKTOP-SVBVC1U\\HP" <muhtasimhafiz@gmail.com>
Date: Fri, 27 Sep 2024 17:36:45 +0600
Subject: [PATCH 3/3] fix for selectbox

---
 .../Templates/includes/ticketFilter.blade.php | 10 +--
 .../Tickets/Templates/showAll.blade.php       | 11 ---
 composer.lock                                 | 76 +++++++++----------
 3 files changed, 43 insertions(+), 54 deletions(-)

diff --git a/app/Domain/Tickets/Templates/includes/ticketFilter.blade.php b/app/Domain/Tickets/Templates/includes/ticketFilter.blade.php
index 63326c6be..8e870e8de 100644
--- a/app/Domain/Tickets/Templates/includes/ticketFilter.blade.php
+++ b/app/Domain/Tickets/Templates/includes/ticketFilter.blade.php
@@ -28,7 +28,7 @@
             {{-- @dispatchTplEvent('filters.beforeFirstBarField') --}}
 
             <div>
-                <x-global::forms.select name="users" id="userSelect" multiple
+                <x-global::forms.select name="users" id="userSelect" variant='multiple'
                     data-placeholder="{{ __('input.placeholders.filter_by_user') }}"
                     title="{{ __('input.placeholders.filter_by_user') }}">
                     <x-slot:labelText>{{ __('label.user') }}</x-slot:labelText>
@@ -43,7 +43,7 @@
             </div>
 
             <div>
-                <x-global::forms.select name="milestone" id="milestoneSelect" multiple
+                <x-global::forms.select name="milestone" id="milestoneSelect" variant='multiple'
                     data-placeholder="{{ __('input.placeholders.filter_by_milestone') }}"
                     title="{{ __('input.placeholders.filter_by_milestone') }}">
                     <x-slot:labelText>{{ __('label.milestone') }}</x-slot:labelText>
@@ -58,7 +58,7 @@
             </div>
 
             <div>
-                <x-global::forms.select name="type" id="typeSelect" multiple
+                <x-global::forms.select name="type" id="typeSelect" variant='multiple'
                     data-placeholder="{{ __('input.placeholders.filter_by_type') }}"
                     title="{{ __('input.placeholders.filter_by_type') }}">
                     <x-slot:labelText>{{ __('label.todo_type') }}</x-slot:labelText>
@@ -73,7 +73,7 @@
             </div>
 
             <div>
-                <x-global::forms.select name="priority" id="prioritySelect" multiple
+                <x-global::forms.select name="priority" id="prioritySelect" variant='multiple'
                     data-placeholder="{{ __('input.placeholders.filter_by_priority') }}"
                     title="{{ __('input.placeholders.filter_by_priority') }}">
                     <x-slot:labelText>{{ __('label.todo_priority') }}</x-slot:labelText>
@@ -88,7 +88,7 @@
             </div>
 
             <div>
-                <x-global::forms.select name="searchStatus" id="statusSelect" multiple
+                <x-global::forms.select name="searchStatus" id="statusSelect" variant='multiple'
                     data-placeholder="{{ __('input.placeholders.filter_by_status') }}">
                     <x-slot:labelText>{{ __('label.todo_status') }}</x-slot:labelText>
                     <x-global::forms.select.select-option value=""
diff --git a/app/Domain/Tickets/Templates/showAll.blade.php b/app/Domain/Tickets/Templates/showAll.blade.php
index 43ec64c56..89b4f31fd 100644
--- a/app/Domain/Tickets/Templates/showAll.blade.php
+++ b/app/Domain/Tickets/Templates/showAll.blade.php
@@ -152,7 +152,6 @@
                             }
                             ?>
                             <td data-order="{{ $name }}">
-                                <x-global::forms._archive.dropdownPill
                                 <x-global::forms._archive.dropdownPill
                                     class="ticketDropdown statusDropdown colorized show {{ $class }} f-left"
                                     id="statusDropdownMenuLink{{ $row['id'] }}" :selectedKey="$selectedKey" :options="$statusLabels">
@@ -171,7 +170,6 @@ class="ticketDropdown statusDropdown colorized show {{ $class }} f-left"
                                         </x-global::actions.dropdown.item>
                                     @endforeach
                                 </x-global::forms._archive.dropdownPill>
-                                </x-global::forms._archive.dropdownPill>
                             </td>
 
 
@@ -187,7 +185,6 @@ class="ticketDropdown statusDropdown colorized show {{ $class }} f-left"
                             ?>
 
                             <td data-order="{{ $milestoneHeadline }}">
-                                <x-global::forms._archive.dropdownPill
                                 <x-global::forms._archive.dropdownPill
                                     class="ticketDropdown milestoneDropdown colorized show label-default milestone f-left"
                                     id="{{ $milestoneDropdownId }}" :style="'background-color:' . $milestoneColor" :labelText="$milestoneHeadline" type="milestone"
@@ -217,7 +214,6 @@ class="ticketDropdown milestoneDropdown colorized show label-default milestone f
                                         </x-global::actions.dropdown.item>
                                     @endforeach
                                 </x-global::forms._archive.dropdownPill>
-                                </x-global::forms._archive.dropdownPill>
                             </td>
 
                             <td
@@ -246,7 +242,6 @@ class="ticketDropdown milestoneDropdown colorized show label-default milestone f
                                         </x-global::actions.dropdown.item>
                                     @endforeach
                                 </x-global::forms._archive.dropdownPill>
-                                </x-global::forms._archive.dropdownPill>
 
                             </td>
 
@@ -258,7 +253,6 @@ class="ticketDropdown milestoneDropdown colorized show label-default milestone f
                             ?>
 
                             <td data-order="{{ $priorityText }}">
-                                <x-global::forms._archive.dropdownPill
                                 <x-global::forms._archive.dropdownPill
                                     class="ticketDropdown priorityDropdown show label-default priority priority-bg-{{ $row['priority'] }} f-left"
                                     id="{{ $dropdownId }}" :labelText="$priorityText" type="priority" :parentId="$row['id']"
@@ -278,7 +272,6 @@ class="priority-bg-{{ $priorityKey }}" :data-value="$row['id'] . '_' . $priority
                                         </x-global::actions.dropdown.item>
                                     @endforeach
                                 </x-global::forms._archive.dropdownPill>
-                                </x-global::forms._archive.dropdownPill>
                             </td>
 
                             <?php
@@ -294,7 +287,6 @@ class="priority-bg-{{ $priorityKey }}" :data-value="$row['id'] . '_' . $priority
 
                             <td
                                 data-order="{{ $row['editorFirstname'] != '' ? $tpl->escape($row['editorFirstname']) : $tpl->__('dropdown.not_assigned') }}">
-                                <x-global::forms._archive.dropdownPill class="ticketDropdown userDropdown noBg show f-left"
                                 <x-global::forms._archive.dropdownPill class="ticketDropdown userDropdown noBg show f-left"
                                     id="{{ $dropdownId }}" :labelText="html_entity_decode($userText)" type="user" :parentId="$row['id']">
                                     <x-slot name="buttonText">
@@ -318,7 +310,6 @@ class="priority-bg-{{ $priorityKey }}" :data-value="$row['id'] . '_' . $priority
                                         </x-global::actions.dropdown.item>
                                     @endforeach
                                 </x-global::forms._archive.dropdownPill>
-                                </x-global::forms._archive.dropdownPill>
                             </td>
 
                             <?php
@@ -329,7 +320,6 @@ class="priority-bg-{{ $priorityKey }}" :data-value="$row['id'] . '_' . $priority
                             ?>
 
                             <td data-order="{{ $sprintHeadline }}">
-                                <x-global::forms._archive.dropdownPill
                                 <x-global::forms._archive.dropdownPill
                                     class="ticketDropdown sprintDropdown show label-default sprint f-left"
                                     id="{{ $dropdownId }}" :labelText="$sprintHeadline" type="sprint" :parentId="$row['id']">
@@ -353,7 +343,6 @@ class="ticketDropdown sprintDropdown show label-default sprint f-left"
                                         </x-global::actions.dropdown.item>
                                     @endforeach
                                 </x-global::forms._archive.dropdownPill>
-                                </x-global::forms._archive.dropdownPill>
                             </td>
 
 
diff --git a/composer.lock b/composer.lock
index 82b9b9186..c6fd0d636 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "990265ce74bda723ffd471df3df24e98",
+    "content-hash": "49a27b65a38d2fb0f9f58779e451651e",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -62,16 +62,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.322.2",
+            "version": "3.322.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "6a329cf111a4e54f2ca0e87ce07dd0b9e0befdad"
+                "reference": "ae7b0edab466c3440fe007c07cb62ae32a4dbfca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6a329cf111a4e54f2ca0e87ce07dd0b9e0befdad",
-                "reference": "6a329cf111a4e54f2ca0e87ce07dd0b9e0befdad",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/ae7b0edab466c3440fe007c07cb62ae32a4dbfca",
+                "reference": "ae7b0edab466c3440fe007c07cb62ae32a4dbfca",
                 "shasum": ""
             },
             "require": {
@@ -154,9 +154,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.322.2"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.322.6"
             },
-            "time": "2024-09-20T18:08:53+00:00"
+            "time": "2024-09-26T18:12:45+00:00"
         },
         {
             "name": "bacon/bacon-qr-code",
@@ -1041,26 +1041,26 @@
         },
         {
             "name": "filp/whoops",
-            "version": "2.15.4",
+            "version": "2.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546"
+                "reference": "befcdc0e5dce67252aa6322d82424be928214fa2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/a139776fa3f5985a50b509f2a02ff0f709d2a546",
-                "reference": "a139776fa3f5985a50b509f2a02ff0f709d2a546",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/befcdc0e5dce67252aa6322d82424be928214fa2",
+                "reference": "befcdc0e5dce67252aa6322d82424be928214fa2",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9 || ^7.0 || ^8.0",
+                "php": "^7.1 || ^8.0",
                 "psr/log": "^1.0.1 || ^2.0 || ^3.0"
             },
             "require-dev": {
-                "mockery/mockery": "^0.9 || ^1.0",
-                "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.3",
-                "symfony/var-dumper": "^2.6 || ^3.0 || ^4.0 || ^5.0"
+                "mockery/mockery": "^1.0",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.8 || ^9.3.3",
+                "symfony/var-dumper": "^4.0 || ^5.0"
             },
             "suggest": {
                 "symfony/var-dumper": "Pretty print complex values better with var-dumper available",
@@ -1100,7 +1100,7 @@
             ],
             "support": {
                 "issues": "https://github.com/filp/whoops/issues",
-                "source": "https://github.com/filp/whoops/tree/2.15.4"
+                "source": "https://github.com/filp/whoops/tree/2.16.0"
             },
             "funding": [
                 {
@@ -1108,7 +1108,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-03T12:00:00+00:00"
+            "time": "2024-09-25T12:00:00+00:00"
         },
         {
             "name": "fruitcake/php-cors",
@@ -2277,16 +2277,16 @@
         },
         {
             "name": "laravel/serializable-closure",
-            "version": "v1.3.4",
+            "version": "v1.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/serializable-closure.git",
-                "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81"
+                "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
-                "reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
+                "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c",
+                "reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c",
                 "shasum": ""
             },
             "require": {
@@ -2334,7 +2334,7 @@
                 "issues": "https://github.com/laravel/serializable-closure/issues",
                 "source": "https://github.com/laravel/serializable-closure"
             },
-            "time": "2024-08-02T07:48:17+00:00"
+            "time": "2024-09-23T13:33:08+00:00"
         },
         {
             "name": "lasserafn/php-initial-avatar-generator",
@@ -8486,16 +8486,16 @@
     "packages-dev": [
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v3.14.0",
+            "version": "v3.14.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "16a13cc5221aee90ae20aa59083ced2211e714eb"
+                "reference": "850be4e3c05add22d70a3a3fb564925fd7605973"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/16a13cc5221aee90ae20aa59083ced2211e714eb",
-                "reference": "16a13cc5221aee90ae20aa59083ced2211e714eb",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/850be4e3c05add22d70a3a3fb564925fd7605973",
+                "reference": "850be4e3c05add22d70a3a3fb564925fd7605973",
                 "shasum": ""
             },
             "require": {
@@ -8554,7 +8554,7 @@
             ],
             "support": {
                 "issues": "https://github.com/barryvdh/laravel-debugbar/issues",
-                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.14.0"
+                "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.14.2"
             },
             "funding": [
                 {
@@ -8566,7 +8566,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-20T12:16:37+00:00"
+            "time": "2024-09-24T17:03:19+00:00"
         },
         {
             "name": "behat/gherkin",
@@ -9345,16 +9345,16 @@
         },
         {
             "name": "laravel/pint",
-            "version": "v1.17.3",
+            "version": "v1.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/pint.git",
-                "reference": "9d77be916e145864f10788bb94531d03e1f7b482"
+                "reference": "35c00c05ec43e6b46d295efc0f4386ceb30d50d9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/9d77be916e145864f10788bb94531d03e1f7b482",
-                "reference": "9d77be916e145864f10788bb94531d03e1f7b482",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/35c00c05ec43e6b46d295efc0f4386ceb30d50d9",
+                "reference": "35c00c05ec43e6b46d295efc0f4386ceb30d50d9",
                 "shasum": ""
             },
             "require": {
@@ -9407,7 +9407,7 @@
                 "issues": "https://github.com/laravel/pint/issues",
                 "source": "https://github.com/laravel/pint"
             },
-            "time": "2024-09-03T15:00:28+00:00"
+            "time": "2024-09-24T17:22:50+00:00"
         },
         {
             "name": "masterminds/html5",
@@ -10004,16 +10004,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.4",
+            "version": "1.12.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "ffa517cb918591b93acc9b95c0bebdcd0e4538bd"
+                "reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ffa517cb918591b93acc9b95c0bebdcd0e4538bd",
-                "reference": "ffa517cb918591b93acc9b95c0bebdcd0e4538bd",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17",
+                "reference": "7e6c6cb7cecb0a6254009a1a8a7d54ec99812b17",
                 "shasum": ""
             },
             "require": {
@@ -10058,7 +10058,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-19T07:58:01+00:00"
+            "time": "2024-09-26T12:45:22+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",