Merge pull request #2711 from Leantime/select-replacement

Select replacement
Leantime · Oct 3, 2024 · 0fb4cac · 0fb4cac
2 parents 4a902c2 + c8541e0
commit 0fb4cac
Show file tree

Hide file tree

Showing 52 changed files with 2,949 additions and 2,703 deletions.
diff --git a/app/Core/Providers/RouteServiceProvider.php b/app/Core/Providers/RouteServiceProvider.php
@@ -69,18 +69,23 @@ public function boot(): void
  Route::middleware(['web'])->group(function() use ($frontController) {
 
  Route::any('{moduleName}/{actionName}/{id}', function (IncomingRequest $request, $moduleName, $actionName, $id) use ($frontController) {
+
  $httpMethod = Str::lower($request->getMethod());
  $controllerParts = $frontController->getValidControllerCall($moduleName, $actionName, $httpMethod, "Controllers");
  $request->query->set('id', $id);
  return $frontController->executeAction($controllerParts['class'], $controllerParts['method']);
  });
 
  Route::any('{moduleName}/{actionName}/{methodName}', function (IncomingRequest $request, $moduleName, $actionName, $methodName) use ($frontController) {
+ app('debugbar')->disable();
+
  $controllerParts = $frontController->getValidControllerCall($moduleName, $actionName, $methodName, "Controllers");
  return $frontController->executeAction($controllerParts['class'], $controllerParts['method']);
  });
 
  Route::any('{moduleName}/{actionName}', function (IncomingRequest $request, $moduleName, $actionName) use ($frontController) {
+ app('debugbar')->disable();
+
  $httpMethod = Str::lower($request->getMethod());
  $controllerParts = $frontController->getValidControllerCall($moduleName, $actionName, $httpMethod, "Controllers");
  return $frontController->executeAction($controllerParts['class'], $controllerParts['method']);
@@ -95,6 +100,8 @@ public function boot(): void
  });
 
  Route::any('', function (IncomingRequest $request) use ($frontController) {
+ app('debugbar')->disable();
+
  return $frontController->redirect(self::HOME);
  });
  });

diff --git a/app/Domain/Api/Templates/partials/apiKey.blade.php b/app/Domain/Api/Templates/partials/apiKey.blade.php
@@ -30,37 +30,36 @@
  value="<?php echo $values['firstname'] ?>" /><br />
 
 
- <label for="role">{{ __("label.role") }}</label><div class="clearfix"></div>
- <select name="role" id="role">
-
- <?php foreach ($tpl->get('roles') as $key => $role) { ?>
- <option value="<?php echo $key; ?>"
- <?php if ($key == $values['role']) {
- ?> selected="selected" <?php
- } ?>>
- <?=$tpl->__("label.roles." . $role) ?>
- </option>
- <?php } ?>
-
- </select> <br />
-
- <label for="status">{{ __("label.status") }}</label><div class="clearfix"></div>
- <select name="status" id="status">
- <option value="a"
- <?php if (strtolower($values['status']) == "a") {
- ?> selected="selected" <?php
- } ?>>
- <?=$tpl->__("label.active") ?>
- </option>
-
- <option value=""
- <?php if (strtolower($values['status']) == "") {
- ?> selected="selected" <?php
- } ?>>
- <?=$tpl->__("label.deactivated") ?>
- </option>
-
- </select>
+ <x-global::forms.select 
+ name="role" 
+ id="role" 
+ labelText="{!! __('label.role') !!}"
+ >
+ @foreach ($tpl->get('roles') as $key => $role)
+ <x-global::forms.select.select-option 
+ value="{{ $key }}" 
+ :selected="$key == $values['role']">
+ {!! __('label.roles.' . $role) !!}
+ </x-global::forms.select.select-option>
+ @endforeach
+ </x-global::forms.select>
+
+ <br />
+
+ <x-global::forms.select 
+ name="status" 
+ id="status" 
+ labelText="{!! __('label.status') !!}"
+ >
+ <x-global::forms.select.select-option value="a" :selected="strtolower($values['status']) == 'a'">
+ {!! __('label.active') !!}
+ </x-global::forms.select.select-option>
+
+ <x-global::forms.select.select-option value="" :selected="strtolower($values['status']) == ''">
+ {!! __('label.deactivated') !!}
+ </x-global::forms.select.select-option>
+ </x-global::forms.select>
+
 
  <div class="clearfix"></div>
 

diff --git a/app/Domain/Calendar/Templates/showMyCalendar.blade.php b/app/Domain/Calendar/Templates/showMyCalendar.blade.php
@@ -84,12 +84,40 @@
 
 
 
- <select id="my-select" style="margin-right:5px;" class="right">
- <option class="fc-timeGridDay-button fc-button fc-state-default fc-corner-right" value="timeGridDay" <?=session("usersettings.submenuToggle.myCalendarView") == 'timeGridDay' ? "selected" : '' ?>>Day</option>
- <option class="fc-timeGridWeek-button fc-button fc-state-default fc-corner-right" value="timeGridWeek" <?=session("usersettings.submenuToggle.myCalendarView") == 'timeGridWeek' ? "selected" : '' ?>>Week</option>
- <option class="fc-dayGridMonth-button fc-button fc-state-default fc-corner-right" value="dayGridMonth" <?=session("usersettings.submenuToggle.myCalendarView") == 'dayGridMonth' ? "selected" : '' ?>>Month</option>
- <option class="fc-multiMonthYear-button fc-button fc-state-default fc-corner-right" value="multiMonthYear" <?=session("usersettings.submenuToggle.myCalendarView") == 'multiMonthYear' ? "selected" : '' ?>>Year</option>
- </select>
+ <x-global::forms.select 
+ id="my-select" 
+ class="right" 
+ style="margin-right:5px;"
+ >
+ <x-global::forms.select.select-option 
+ value="timeGridDay" 
+ :selected="session('usersettings.submenuToggle.myCalendarView') == 'timeGridDay'"
+ >
+ Day
+ </x-global::forms.select.select-option>
+
+ <x-global::forms.select.select-option 
+ value="timeGridWeek" 
+ :selected="session('usersettings.submenuToggle.myCalendarView') == 'timeGridWeek'"
+ >
+ Week
+ </x-global::forms.select.select-option>
+
+ <x-global::forms.select.select-option 
+ value="dayGridMonth" 
+ :selected="session('usersettings.submenuToggle.myCalendarView') == 'dayGridMonth'"
+ >
+ Month
+ </x-global::forms.select.select-option>
+
+ <x-global::forms.select.select-option 
+ value="multiMonthYear" 
+ :selected="session('usersettings.submenuToggle.myCalendarView') == 'multiMonthYear'"
+ >
+ Year
+ </x-global::forms.select.select-option>
+ </x-global::forms.select>
+
  </div>
  </div>
  <div id="calendar"></div>

diff --git a/app/Domain/Calendar/Templates/showMyCalendar.tpl.php b/app/Domain/Calendar/Templates/showMyCalendar.tpl.php
@@ -83,12 +83,44 @@
  <button class="fc-today-button btn btn-default right" style="margin-right:5px;">today</button>
 
 
- <select id="my-select" style="margin-right:5px;" class="right">
- <option class="fc-timeGridDay-button fc-button fc-state-default fc-corner-right" value="timeGridDay" <?=session("usersettings.submenuToggle.myCalendarView") == 'timeGridDay' ? "selected" : '' ?>>Day</option>
- <option class="fc-timeGridWeek-button fc-button fc-state-default fc-corner-right" value="timeGridWeek" <?=session("usersettings.submenuToggle.myCalendarView") == 'timeGridWeek' ? "selected" : '' ?>>Week</option>
- <option class="fc-dayGridMonth-button fc-button fc-state-default fc-corner-right" value="dayGridMonth" <?=session("usersettings.submenuToggle.myCalendarView") == 'dayGridMonth' ? "selected" : '' ?>>Month</option>
- <option class="fc-multiMonthYear-button fc-button fc-state-default fc-corner-right" value="multiMonthYear" <?=session("usersettings.submenuToggle.myCalendarView") == 'multiMonthYear' ? "selected" : '' ?>>Year</option>
- </select>
+ <x-global::forms.select 
+ id="my-select" 
+ class="right" 
+ style="margin-right:5px;"
+ >
+ <x-global::forms.select.select-option 
+ class="fc-timeGridDay-button fc-button fc-state-default fc-corner-right" 
+ value="timeGridDay" 
+ :selected="session('usersettings.submenuToggle.myCalendarView') == 'timeGridDay'"
+ >
+ Day
+ </x-global::forms.select.select-option>
+
+ <x-global::forms.select.select-option 
+ class="fc-timeGridWeek-button fc-button fc-state-default fc-corner-right" 
+ value="timeGridWeek" 
+ :selected="session('usersettings.submenuToggle.myCalendarView') == 'timeGridWeek'"
+ >
+ Week
+ </x-global::forms.select.select-option>
+
+ <x-global::forms.select.select-option 
+ class="fc-dayGridMonth-button fc-button fc-state-default fc-corner-right" 
+ value="dayGridMonth" 
+ :selected="session('usersettings.submenuToggle.myCalendarView') == 'dayGridMonth'"
+ >
+ Month
+ </x-global::forms.select.select-option>
+
+ <x-global::forms.select.select-option 
+ class="fc-multiMonthYear-button fc-button fc-state-default fc-corner-right" 
+ value="multiMonthYear" 
+ :selected="session('usersettings.submenuToggle.myCalendarView') == 'multiMonthYear'"
+ >
+ Year
+ </x-global::forms.select.select-option>
+ </x-global::forms.select>
+
  </div>
  </div>
  <div id="calendar"></div>