From 7fa7dd9a50e28f24d2dfadfe3323631b1e6ab339 Mon Sep 17 00:00:00 2001 From: marco Date: Wed, 26 Jun 2024 12:05:04 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20(Dashboard.php):=20Resolve=20con?= =?UTF-8?q?flict=20in=20Dashboard.php=20by=20keeping=20the=20new=20version?= =?UTF-8?q?=20of=20the=20stat=20chart=20widget=20=F0=9F=90=9B=20(OverlookV?= =?UTF-8?q?2Widget.php):=20Resolve=20conflict=20in=20OverlookV2Widget.php?= =?UTF-8?q?=20by=20keeping=20the=20new=20version=20of=20the=20stat=20chart?= =?UTF-8?q?=20widget=20=F0=9F=90=9B=20(manifest.json):=20Resolve=20conflic?= =?UTF-8?q?t=20in=20manifest.json=20by=20keeping=20the=20new=20version=20o?= =?UTF-8?q?f=20the=20stat=20chart=20file=20path=20=F0=9F=90=9B=20(overlook?= =?UTF-8?q?-v2.blade.php):=20Resolve=20conflict=20in=20overlook-v2.blade.p?= =?UTF-8?q?hp=20by=20keeping=20the=20new=20version=20of=20the=20stat=20cha?= =?UTF-8?q?rt=20widget=20view=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Filament/Pages/Dashboard.php | 3 ++ Filament/Widgets/Samples/OverlookV2Widget.php | 53 +++++++++++++++++++ Resources/dist/manifest.json | 4 ++ .../widgets/samples/overlook-v2.blade.php | 31 +++++++++++ 4 files changed, 91 insertions(+) diff --git a/Filament/Pages/Dashboard.php b/Filament/Pages/Dashboard.php index 770f6828..5a6f319f 100755 --- a/Filament/Pages/Dashboard.php +++ b/Filament/Pages/Dashboard.php @@ -26,7 +26,10 @@ public function getHeaderWidgets(): array { return [ WidgetsSamples\Bar02Chart::make(), +<<<<<<< HEAD WidgetsSamples\OverlookWidget::make(), +======= +>>>>>>> 6cf35d5 (add new version of stat chart) WidgetsSamples\OverlookV2Widget::make(), WidgetsSamples\Doughnut01Chart::make(), WidgetsSamples\Sample01Chart::make(), diff --git a/Filament/Widgets/Samples/OverlookV2Widget.php b/Filament/Widgets/Samples/OverlookV2Widget.php index 9a69db68..738d1b25 100644 --- a/Filament/Widgets/Samples/OverlookV2Widget.php +++ b/Filament/Widgets/Samples/OverlookV2Widget.php @@ -1,6 +1,9 @@ >>>>>> 6cf35d5 (add new version of stat chart) /** * @see https://github.com/awcodes/overlook/blob/2.x/src/Widgets/OverlookWidget.php */ @@ -9,6 +12,10 @@ use Awcodes\Overlook\Contracts\CustomizeOverlookWidget; use Awcodes\Overlook\OverlookPlugin; +<<<<<<< HEAD +======= +use Exception; +>>>>>>> 6cf35d5 (add new version of stat chart) use Filament\Widgets\Widget; use NumberFormatter; @@ -16,7 +23,11 @@ class OverlookV2Widget extends Widget { protected static string $view = 'chart::filament.widgets.samples.overlook-v2'; +<<<<<<< HEAD protected int|string|array $columnSpan = 'full'; +======= + protected int | string | array $columnSpan = 'full'; +>>>>>>> 6cf35d5 (add new version of stat chart) public array $data = []; @@ -29,7 +40,11 @@ class OverlookV2Widget extends Widget public array $icons = []; /** +<<<<<<< HEAD * @throws \Exception +======= + * @throws Exception +>>>>>>> 6cf35d5 (add new version of stat chart) */ public function mount(): void { @@ -69,10 +84,18 @@ public function formatRawCount(string $number): string } /** +<<<<<<< HEAD * @throws \Exception */ public function getData(): array { +======= + * @throws Exception + */ + public function getData(): array + { + +>>>>>>> 6cf35d5 (add new version of stat chart) $includes = []; $excludes = []; $icons = $this->icons; @@ -84,6 +107,10 @@ public function getData(): array return collect($rawResources)->filter(function ($resource) use ($excludes) { return ! in_array($resource, $excludes); })->transform(function ($resource) use ($icons) { +<<<<<<< HEAD +======= + +>>>>>>> 6cf35d5 (add new version of stat chart) $customIcon = array_search($resource, $icons); $res = app($resource); @@ -94,7 +121,11 @@ public function getData(): array $rawCount = $res->getOverlookWidgetQuery($widgetQuery)->count(); $title = $res->getOverlookWidgetTitle(); } else { +<<<<<<< HEAD $rawCount = 666; // $widgetQuery->count(); +======= + $rawCount = 666;//$widgetQuery->count(); +>>>>>>> 6cf35d5 (add new version of stat chart) $title = ucfirst($res->getPluralModelLabel()); } @@ -103,6 +134,7 @@ public function getData(): array 'name' => $title, 'raw_count' => $this->formatRawcount($rawCount), 'count' => $this->convertCount($rawCount), +<<<<<<< HEAD 'icon' => $customIcon ?: 'heroicon-o-envelope', 'url' => $res->getUrl('index'), ]; @@ -110,21 +142,42 @@ public function getData(): array }) ->filter() // ->when($plugin->shouldSortAlphabetical(), fn ($collection) => $collection->sortBy('name')) +======= + 'icon' => $customIcon ?: $res->getNavigationIcon(), + 'url' => $res->getUrl('index'), + ]; + } + + return null; + }) + ->filter() + //->when($plugin->shouldSortAlphabetical(), fn ($collection) => $collection->sortBy('name')) +>>>>>>> 6cf35d5 (add new version of stat chart) ->values() ->toArray(); } public static function getSort(): int { +<<<<<<< HEAD // return OverlookPlugin::get()->getSort(); +======= + //return OverlookPlugin::get()->getSort(); +>>>>>>> 6cf35d5 (add new version of stat chart) return 1; } public function shouldShowTooltips(string $number): bool { +<<<<<<< HEAD // $plugin = OverlookPlugin::get(); // return strlen($number) >= 4 && $plugin->shouldAbbreviateCount() && $plugin->shouldShowTooltips(); +======= + //$plugin = OverlookPlugin::get(); + + //return strlen($number) >= 4 && $plugin->shouldAbbreviateCount() && $plugin->shouldShowTooltips(); +>>>>>>> 6cf35d5 (add new version of stat chart) return true; } } diff --git a/Resources/dist/manifest.json b/Resources/dist/manifest.json index 284be460..a26d8287 100644 --- a/Resources/dist/manifest.json +++ b/Resources/dist/manifest.json @@ -1,6 +1,10 @@ { "Resources/css/app.css": { +<<<<<<< HEAD "file": "assets/app-Dh0FPYev.css", +======= + "file": "assets/app-D4rFEOff.css", +>>>>>>> 6cf35d5 (add new version of stat chart) "src": "Resources/css/app.css", "isEntry": true }, diff --git a/Resources/views/filament/widgets/samples/overlook-v2.blade.php b/Resources/views/filament/widgets/samples/overlook-v2.blade.php index 025bb3b3..190c8a34 100644 --- a/Resources/views/filament/widgets/samples/overlook-v2.blade.php +++ b/Resources/views/filament/widgets/samples/overlook-v2.blade.php @@ -11,7 +11,11 @@ class="gap-6" shouldShowTooltips($resource['raw_count'])) +======= + @if($this->shouldShowTooltips($resource['raw_count'])) +>>>>>>> 6cf35d5 (add new version of stat chart) x-data x-tooltip="'{{ $resource['raw_count'] }}'" @endif > @@ -19,6 +23,7 @@ class="gap-6"
{{ $resource['name'] }}
{{--
{{ $resource['count'] }}
--}} +<<<<<<< HEAD

2,318,589

@@ -40,6 +45,28 @@ class="gap-6"

1,241

+======= +
+

2,318,589

+
+ + Post views +
+
+
+
+
+

412

+
+ + SMS +
+
+
+

412

+
+ +>>>>>>> 6cf35d5 (add new version of stat chart) Email
@@ -49,7 +76,11 @@ class="gap-6" >>>>>> 6cf35d5 (add new version of stat chart) /> @endif