.

laraxot · May 28, 2024 · cff7db6 · cff7db6
1 parent 09336b1
commit cff7db6
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 23 deletions.
diff --git a/Filament/Widgets/GroupWidget.php b/Filament/Widgets/GroupWidget.php
@@ -12,15 +12,8 @@ class GroupWidget extends BaseWidget
     use InteractsWithPageFilters;
 
     protected static ?string $pollingInterval = null;
-
     protected static string $view = 'ui::filament.widgets.group';
-
     public array $widgets = [];
-
     public string $title = '';
-<<<<<<< HEAD
-
-=======
->>>>>>> up
     public string $icon = '';
 }
diff --git a/Filament/Widgets/HeroWidget.php b/Filament/Widgets/HeroWidget.php
@@ -24,20 +24,11 @@ protected function getStats(): array
     {
         return [
             Stat::make('', $this->title)
-<<<<<<< HEAD
                 // ->description('32k increase '.$startDate)
                 // ->descriptionIcon('heroicon-m-arrow-trending-up')
                 // ->chart([7, 2, 10, 3, 15, 4, 17])
                 // ->color('success')
                 ->icon($this->icon),
-=======
-                //->description('32k increase '.$startDate)
-                //->descriptionIcon('heroicon-m-arrow-trending-up')
-                //->chart([7, 2, 10, 3, 15, 4, 17])
-                //->color('success')
-                ->icon('heroicon-o-rectangle-stack')
-                ,
->>>>>>> up
         ];
     }
 

diff --git a/Resources/views/filament/widgets/group.blade.php b/Resources/views/filament/widgets/group.blade.php
@@ -2,17 +2,11 @@
     <x-filament::section collapsible
         icon="{{ $icon }}"
         >
-<<<<<<< HEAD
         <x-slot name="description">
             {{ $title }}
         </x-slot>
-        @if (count($widgets)==1)
-=======
-        <x-slot name="heading">
-            {{ $title }}
-        </x-slot>
+
         @if(count($widgets)==1)
->>>>>>> up
             @livewire($widgets[0]['class'], $widgets[0]['properties'])
         @endif