Merge branch '3.3-dev' into project-dashboard-avatar-createtodo-fix

Leantime · Sep 25, 2024 · 4925671 · 4925671
2 parents ff2360d + 3aaa931
commit 4925671
Show file tree

Hide file tree

Showing 43 changed files with 733 additions and 333 deletions.
diff --git a/.idea/laravel-idea.xml b/.idea/laravel-idea.xml
diff --git a/.idea/leantime-oss.iml b/.idea/leantime-oss.iml
diff --git a/.idea/php-test-framework.xml b/.idea/php-test-framework.xml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/.idea/phpspec.xml b/.idea/phpspec.xml
diff --git a/.idea/phpunit.xml b/.idea/phpunit.xml
diff --git a/app/Core/Configuration/laravelConfig.php b/app/Core/Configuration/laravelConfig.php
@@ -1,18 +1,8 @@
 <?php
 
-use \Illuminate\Support;
-use Leantime\Core\Providers\Auth;
 use Leantime\Core\Providers\Cache;
-use Leantime\Core\Providers\ConsoleSupport;
-use Leantime\Core\Providers\Db;
-use Leantime\Core\Providers\EncryptionServiceProvider;
-use Leantime\Core\Providers\FileSystemServiceProvider;
-use Leantime\Core\Providers\Frontcontroller;
-use Leantime\Core\Providers\Language;
-use Leantime\Core\Providers\RateLimiter;
 use Leantime\Core\Providers\Redis;
 use Leantime\Core\Providers\Session;
-use Leantime\Core\Providers\TemplateServiceProvider;
 use Leantime\Core\Providers\Views;
 
 return [
@@ -23,6 +13,7 @@
  */
  Barryvdh\Debugbar\ServiceProvider::class,
 
+
  /*
  * Application Service Providers...
  */
@@ -45,7 +36,6 @@
  \Illuminate\Pipeline\PipelineServiceProvider::class,
  //\Illuminate\Queue\QueueServiceProvider::class,
 
-
  \Leantime\Core\Providers\Session::class,
 
  //\Illuminate\Redis\RedisServiceProvider::class,
@@ -64,6 +54,7 @@
  \Leantime\Core\Providers\Views::class,
  \Leantime\Core\Providers\TemplateServiceProvider::class,
 
+
  ],
  ],
  'debug_blacklist' => [
@@ -112,7 +103,7 @@
  ],
  'default' => 'single',
  ],
- "debugbar" => [
+ 'debugbar' => [
 
  /*
  |--------------------------------------------------------------------------
@@ -149,14 +140,14 @@
  | Leaving it to null will allow localhost only.
  */
  'storage' => [
- 'enabled'  => true,
- 'open'  => true, // bool/callback.
- 'driver'  => 'file', // redis, file, pdo, socket, custom
- 'path'  => storage_path('debugbar'), // For file driver
+ 'enabled' => true,
+ 'open' => true, // bool/callback.
+ 'driver' => 'file', // redis, file, pdo, socket, custom
+ 'path' => storage_path('debugbar'), // For file driver
  'connection' => null, // Leave null for default connection (Redis/PDO)
- 'provider'  => '', // Instance of StorageInterface for custom driver
- 'hostname'  => '127.0.0.1', // Hostname to use with the "socket" driver
- 'port'  => 2304, // Port to use with the "socket" driver
+ 'provider' => '', // Instance of StorageInterface for custom driver
+ 'hostname' => '127.0.0.1', // Hostname to use with the "socket" driver
+ 'port' => 2304, // Port to use with the "socket" driver
  ],
 
  /*
@@ -175,7 +166,7 @@
 
  'editor' => 'phpstorm',
 
-  /*
+ /*
  |--------------------------------------------------------------------------
  | Vendors
  |--------------------------------------------------------------------------
@@ -245,30 +236,30 @@
  */
 
  'collectors' => [
- 'phpinfo'  => true, // Php version
- 'messages'  => true, // Messages
- 'time'  => true, // Time Datalogger
- 'memory'  => true, // Memory usage
- 'exceptions'  => true, // Exception displayer
- 'log'  => true, // Logs from Monolog (merged in messages if enabled)
- 'db'  => false, // Show database (PDO) queries and bindings
- 'views'  => true, // Views with their data
- 'route'  => true, // Current route information
- 'auth'  => false, // Display Laravel authentication status
- 'gate'  => false, // Display Laravel Gate checks
- 'session'  => true, // Display session data
+ 'phpinfo' => true, // Php version
+ 'messages' => true, // Messages
+ 'time' => true, // Time Datalogger
+ 'memory' => true, // Memory usage
+ 'exceptions' => true, // Exception displayer
+ 'log' => true, // Logs from Monolog (merged in messages if enabled)
+ 'db' => false, // Show database (PDO) queries and bindings
+ 'views' => true, // Views with their data
+ 'route' => true, // Current route information
+ 'auth' => false, // Display Laravel authentication status
+ 'gate' => false, // Display Laravel Gate checks
+ 'session' => true, // Display session data
  'symfony_request' => true, // Only one can be enabled..
- 'mail'  => false, // Catch mail messages
- 'laravel'  => false, // Laravel version and environment
- 'events'  => true, // All events fired
+ 'mail' => false, // Catch mail messages
+ 'laravel' => false, // Laravel version and environment
+ 'events' => true, // All events fired
  'default_request' => false, // Regular or special Symfony request logger
- 'logs'  => true, // Add the latest log messages
- 'files'  => true, // Show the included files
- 'config'  => true, // Display config settings
- 'cache'  => true, // Display cache events
- 'models'  => false, // Display models
- 'livewire'  => false, // Display Livewire (when available)
- 'jobs'  => false, // Display dispatched jobs
+ 'logs' => true, // Add the latest log messages
+ 'files' => true, // Show the included files
+ 'config' => true, // Display config settings
+ 'cache' => true, // Display cache events
+ 'models' => false, // Display models
+ 'livewire' => false, // Display Livewire (when available)
+ 'jobs' => false, // Display dispatched jobs
  ],
 
  /*
@@ -297,21 +288,21 @@
  'show_guards' => true, // Show the guards that are used
  ],
  'db' => [
- 'with_params'  => true, // Render SQL with the parameters substituted
- 'backtrace'  => true, // Use a backtrace to find the origin of the query in your files.
+ 'with_params' => true, // Render SQL with the parameters substituted
+ 'backtrace' => true, // Use a backtrace to find the origin of the query in your files.
  'backtrace_exclude_paths' => [], // Paths to exclude from backtrace. (in addition to defaults)
- 'timeline'  => false, // Add the queries to the timeline
- 'duration_background'  => true, // Show shaded background on each query relative to how long it took to execute.
+ 'timeline' => false, // Add the queries to the timeline
+ 'duration_background' => true, // Show shaded background on each query relative to how long it took to execute.
  'explain' => [ // Show EXPLAIN output on queries
  'enabled' => false,
  'types' => ['SELECT'], // Deprecated setting, is always only SELECT
  ],
- 'hints'  => false, // Show hints for common mistakes
- 'show_copy'  => false, // Show copy button next to the query,
- 'slow_threshold'  => false, // Only track queries that last longer than this time in ms
- 'memory_usage'  => false, // Show queries memory usage
- 'soft_limit'  => 100, // After the soft limit, no parameters/backtrace are captured
- 'hard_limit'  => 500, // After the hard limit, queries are ignored
+ 'hints' => false, // Show hints for common mistakes
+ 'show_copy' => false, // Show copy button next to the query,
+ 'slow_threshold' => false, // Only track queries that last longer than this time in ms
+ 'memory_usage' => false, // Show queries memory usage
+ 'soft_limit' => 100, // After the soft limit, no parameters/backtrace are captured
+ 'hard_limit' => 500, // After the hard limit, queries are ignored
  ],
  'mail' => [
  'timeline' => false, // Add mails to the timeline
@@ -322,7 +313,7 @@
  'data' => true, //true for all data, 'keys' for only names, false for no parameters.
  'group' => 50, // Group duplicate views. Pass value to auto-group, or true/false to force
  'exclude_paths' => [ // Add the paths which you don't want to appear in the views
- 'vendor/filament' // Exclude Filament components by default
+ 'vendor/filament', // Exclude Filament components by default
  ],
  ],
  'route' => [
@@ -691,4 +682,16 @@
  'compiled' => realpath(storage_path('framework/views')),
 
  ],
+ 'blade-icons' => [
+ 'path' => 'public/assets/images/svg',
+ 'class' => '',
+ 'components' => [
+ 'default' => 'svg',
+ ],
+ ],
+ 'blade-google-material-design-icons' => [
+ 'path' => 'public/assets/images/svg',
+ 'prefix' => 'gmdi',
+ ],
+
 ];
diff --git a/app/Domain/Calendar/Templates/partials/addEvent.blade.php b/app/Domain/Calendar/Templates/partials/addEvent.blade.php
@@ -68,7 +68,7 @@
  id="allDay"
  :checked="isset($values['allDay']) && $values['allDay']"
  labelText="{{ __('label.all_day') }}"
- labelPosition="left"
+ labelPosition="right"
  />
  <br /><br />
 

diff --git a/app/Domain/Calendar/Templates/partials/editEvent.blade.php b/app/Domain/Calendar/Templates/partials/editEvent.blade.php
@@ -48,7 +48,7 @@
  id="allDay"
  :checked="$values['allDay']"
  labelText="{{ __('label.all_day') }}"
- labelPosition="left"
+ labelPosition="right"
  />
 
  <?php $tpl->dispatchTplEvent('beforeSubmitButton'); ?>

diff --git a/app/Domain/Goalcanvas/Templates/dashboard.blade.php b/app/Domain/Goalcanvas/Templates/dashboard.blade.php
@@ -161,9 +161,6 @@ class="sr-only">{{ sprintf(__('text.percent_complete'), round($goalStats['avgPer
  $nbcomments = $comments->countComments(moduleId: $row['id']);
  @endphp
  <div class="col-md-4">
-
-
- <x-goalcanvas:goalcard :value="$row" :users="$users" ></x-goalcanvas:goalcard>
  <div class="ticketBox" id="item_{{ $row['id'] }}">
  <div class="row">
  <div class="col-md-12">

diff --git a/app/Domain/Goalcanvas/Templates/partials/canvasDialog.blade.php b/app/Domain/Goalcanvas/Templates/partials/canvasDialog.blade.php
@@ -43,20 +43,24 @@
  <div class="col-md-3">
  <x-global::forms.text-input type="number" step="0.01" name="startValue"
  value="{{ $canvasItem['startValue'] }}" labelText="{{ __('label.starting_value') }}"
- variant="compact" />
+ variant="compact"
+ class="w-20" />
 
  </div>
  <div class="col-md-3">
  <x-global::forms.text-input type="number" step="0.01" name="currentValue"
  id="currentValueField" value="{{ $canvasItem['currentValue'] }}"
  labelText="{{ __('label.current_value') }}" variant="compact"
- @if ($canvasItem['setting'] == 'linkAndReport') readonly
- data-tippy-content="Current value calculated from child goals" @endif />
+ class="w-20"
+{{-- @if ($canvasItem['setting'] == 'linkAndReport')--}}
+{{-- dataTippyContent="Current value calculated from child goals" @endif--}}
+ />
 
  </div>
  <div class="col-md-3">
  <x-global::forms.text-input type="number" step="0.01" name="endValue"
  value="{{ $canvasItem['endValue'] }}" labelText="{{ __('label.goal_value') }}"
+ class="w-20"
  variant="compact" />
 
  </div>

diff --git a/app/Domain/Projects/Templates/partials/projectCardProgressBar.blade.php b/app/Domain/Projects/Templates/partials/projectCardProgressBar.blade.php
@@ -21,11 +21,19 @@
  <div class="row">
  <div class="col-md-12">
  @if ($project['status'] !== null && $project['status'] != '')
- <span class="label label-{{ $project['status'] }}">
- {{ __("label.project_status_" . $project['status']) }}
- </span><br />
+ <x-global::elements.badge
+ :content-role="$project['status']"
+ :outline="true"
+ >
+ {{ __("label.project_status_" . $project['status']) }}
+ </x-global::elements.badge>
  @else
- <span class="label label-grey">{{ __("label.no_status") }}</span><br />
+ <x-global::elements.badge
+ content-role="ghost"
+ :outline="true"
+ >
+ {{ __("label.no_status") }}
+ </x-global::elements.badge>
  @endif
  </div>
  </div>

diff --git a/app/Domain/Tickets/Templates/components/duedate.blade.php b/app/Domain/Tickets/Templates/components/duedate.blade.php
@@ -0,0 +1,22 @@
+@props([
+ 'contentRole' => 'ghost',
+ 'variant' => '',
+ 'labelPosition' => 'top',
+ 'date' => '',
+])
+
+<x-global::forms.datepicker
+ no-date-label="{{ __('text.anytime') }}"
+ :value="$date"
+ name="test1"
+ :label-position="$labelPosition"
+ :variant="$variant"
+>
+ <x-slot:leading-visual>
+ </x-slot:leading-visual>
+
+ <x-slot:label-text>
+ <x-global::content.icon icon="acute" /> Due Date
+ </x-slot:label-text>
+
+</x-global::forms.datepicker>