up

.git-blame-ignore-revs

@@ -1,6 +1,29 @@
 0463050dd3afea19c3f280d0c34381436f428abb
+<<<<<<< HEAD
 9d95fd18120b4f2a8ae2e1facc4f870d4f68ac26
 e2d7c899d57f8cc854a80081d3103e996677ad70
 00faf59df1cef04b015291e6911525fca46f24be
 eab2da904ddbc2c013e7d98c39c6d15e7b07b207
 472a5add1dfa06d77cd84025e73f1f532073bab7
+=======
+0a1ffbd1e07b1f8f4854d0c50f46e9b692e270c2
+<<<<<<< HEAD
+<<<<<<< HEAD
+eebbc6a384a051ecbc3bba74f93f1bb390eb092b
+31e7ad71e085965c05cdb9898d0869b78ca84140
+<<<<<<< HEAD
+<<<<<<< HEAD
+6ccf0d857c3fec72f88a047cf0e1df0b98c99a55
+be2e5d5d0e04779ca2f7229d2e2f793b241a27b8
+=======
+>>>>>>> d617e9e (Ignore Dusting commit in git blame)
+=======
+eebbc6a384a051ecbc3bba74f93f1bb390eb092b
+>>>>>>> 411bdbf (Ignore Dusting commit in git blame)
+=======
+>>>>>>> d8d5269 (Ignore Dusting commit in git blame)
+=======
+6ccf0d857c3fec72f88a047cf0e1df0b98c99a55
+>>>>>>> d9fc513 (Ignore Dusting commit in git blame)
+63a678a112a68d79446d77da7067a07eb80664a8
+>>>>>>> fe9987d44e3b418ea86a93b61dddb76d3131a2f8

Datas/AnswersChartData.php

@@ -397,7 +397,11 @@ public function getChartJsDoughnutOptionsJs(string $js): string
         }
         $first_answer = $this->answers->first();
         $label = '--';
+<<<<<<< HEAD
         if ($first_answer !== null) {
+=======
+        if ($first_answer != null) {
+>>>>>>> fe9987d44e3b418ea86a93b61dddb76d3131a2f8
             Assert::isInstanceOf($first_answer, AnswerData::class, '['.__LINE__.']['.__FILE__.']');
             $label = round((float) $this->answers->first()->avg, 2);
         }

Filament/Pages/Dashboard.php

@@ -26,7 +26,6 @@ public function getHeaderWidgets(): array
     {
         return [
             WidgetsSamples\Bar02Chart::make(),
-            WidgetsSamples\OverlookWidget::make(),
             WidgetsSamples\OverlookV2Widget::make(),
             WidgetsSamples\Doughnut01Chart::make(),
             WidgetsSamples\Sample01Chart::make(),

Filament/Widgets/Samples/OverlookV2Widget.php

@@ -107,7 +107,10 @@ public function getData(): array
                     'url' => $res->getUrl('index'),
                 ];
             }
+<<<<<<< HEAD
 
+=======
+>>>>>>> fe9987d44e3b418ea86a93b61dddb76d3131a2f8
         })
             ->filter()
             // ->when($plugin->shouldSortAlphabetical(), fn ($collection) => $collection->sortBy('name'))

Resources/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "Resources/css/app.css": {
-    "file": "assets/app-DCrGIFR-.css",
+    "file": "assets/app-Dh0FPYev.css",
     "src": "Resources/css/app.css",
     "isEntry": true
   },

composer.json

@@ -29,11 +29,11 @@
             "Modules\\Chart\\": ""
         }
     },
-    "require": {
-        "laraxot/module_xot_fila3": "dev-master",
+    "require_comment": {
+        "laraxot/module_xot_fila3": "*",
         "thecodingmachine/safe": "^2.5"
     },
-    "require-dev": {
+    "require-dev_comment": {
         "driftingly/rector-laravel": "^0.26.2",
         "enlightn/enlightn": "^2.5",
         "laravel/pint": "^1.13",
@@ -46,15 +46,15 @@
         "pestphp/pest-plugin-laravel": "*",
         "phpstan/phpstan-deprecation-rules": "*",
         "phpstan/phpstan-phpunit": "*",
-        "psalm/plugin-laravel": "^2.8",
+        "psalm/plugin-laravel": "*",
         "rector/phpstan-rules": "*",
-        "rector/rector": "^0.18.6",
+        "rector/rector": "*",
         "spatie/laravel-ray": "*",
         "thecodingmachine/phpstan-safe-rule": "^1.2",
         "tightenco/duster": "^2.2",
         "vimeo/psalm": "^5.15"
     },
-    "repositories": [ {
+    "repositories_comment_self": [ {
         "type": "path",
         "url": "../module_xot_fila3"
     },
@@ -66,6 +66,18 @@
         "type": "path",
         "url": "../module_ui_fila3"
     }],
+    "repositories": [ {
+        "type": "path",
+        "url": "../Xot"
+    },
+    {
+        "type": "path",
+        "url": "../Tenant"
+    },
+    {
+        "type": "path",
+        "url": "../UI"
+    }],
     "scripts": {
         "analyse": "vendor/bin/phpstan analyse",
         "test": "./vendor/bin/pest --no-coverage",