project clean

Bored-Programmers · Sep 30, 2023 · f8abf2e · f8abf2e
1 parent 26a06f6
commit f8abf2e
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 12 deletions.
diff --git a/resources/views/components/column-filter.blade.php b/resources/views/components/column-filter.blade.php
@@ -1,5 +1,5 @@
 @props([
-    /** @var \BoredProgrammers\LaraGrid\Livewire\Column $column */
+    /** @var \BoredProgrammers\LaraGrid\Components\Column $column */
     'column',
     'sortColumn',
     'sortDirection',

diff --git a/resources/views/components/date-range.blade.php b/resources/views/components/date-range.blade.php
@@ -1,5 +1,5 @@
 @props([
-    /** @var \BoredProgrammers\LaraGrid\Livewire\Column $column */
+    /** @var \BoredProgrammers\LaraGrid\Components\Column $column */
     'column',
     /** @var \BoredProgrammers\LaraGrid\Livewire\Theme $theme */
     'theme',

diff --git a/resources/views/components/select.blade.php b/resources/views/components/select.blade.php
@@ -1,5 +1,5 @@
 @props([
-    /** @var \BoredProgrammers\LaraGrid\Livewire\Column $column */
+    /** @var \BoredProgrammers\LaraGrid\Components\Column $column */
     'column',
 ])
 

diff --git a/resources/views/components/text.blade.php b/resources/views/components/text.blade.php
@@ -1,5 +1,5 @@
 @props([
-    /** @var \BoredProgrammers\LaraGrid\Livewire\Column $column */
+    /** @var \BoredProgrammers\LaraGrid\Components\Column $column */
     'column',
     /** @var \BoredProgrammers\LaraGrid\Livewire\Theme $theme */
     'theme'

diff --git a/resources/views/livewire/grid.blade.php b/resources/views/livewire/grid.blade.php
@@ -1,6 +1,6 @@
 @php
     /**
-    * @var \BoredProgrammers\LaraGrid\Livewire\Column[] $columns
+    * @var \BoredProgrammers\LaraGrid\Components\Column[] $columns
     * @var \BoredProgrammers\LaraGrid\Livewire\Theme $theme
  */
     $theme = new $theme(); // fixme - jde to jinak? Nejak mi to blblo a nechtel se objekt passnout z gridu

diff --git a/src/Livewire/Column.php → src/Components/Column.php b/src/Livewire/Column.php → src/Components/Column.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace BoredProgrammers\LaraGrid\Livewire;
+namespace BoredProgrammers\LaraGrid\Components;
 
-use Closure;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Carbon;
 use BoredProgrammers\LaraGrid\Enums\FilterType;
 use BoredProgrammers\LaraGrid\Filters\BaseFilter;
 use BoredProgrammers\LaraGrid\Filters\SelectFilterOption;
+use Closure;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Carbon;
 use UnitEnum;
 
 class Column

diff --git a/src/Livewire/BaseGrid.php b/src/Livewire/BaseGrid.php
@@ -2,6 +2,7 @@
 
 namespace BoredProgrammers\LaraGrid\Livewire;
 
+use BoredProgrammers\LaraGrid\Components\Column;
 use Exception;
 use Illuminate\Contracts\View\View;
 use Illuminate\Database\Eloquent\Builder;
@@ -27,6 +28,8 @@ abstract class BaseGrid extends Component
 
     public int $perPage = 25;
 
+    public string $theme;
+
     protected abstract function getColumns();
 
     protected abstract function getDataSource();
@@ -51,6 +54,10 @@ public function sort($column): void
      */
     public function render(): View
     {
+        if (!$this->theme) {
+            throw new Exception('Theme is not set!');
+        }
+
         /**
          * @var Column[] $columns
          * @var Builder  $query
@@ -104,7 +111,7 @@ public function render(): View
             );
         }
 
-        return view('grid', [
+        return view('livewire.grid', [
             'records' => $query->paginate($this->perPage),
             'columns' => $columns,
             'theme' => $this->theme,

diff --git a/src/Livewire/Theme.php → src/Theme/Theme.php b/src/Livewire/Theme.php → src/Theme/Theme.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BoredProgrammers\LaraGrid\Livewire;
+namespace BoredProgrammers\LaraGrid\Theme;
 
 class Theme
 {

diff --git a/src/Livewire/UiKitTheme.php → src/Theme/UiKitTheme.php b/src/Livewire/UiKitTheme.php → src/Theme/UiKitTheme.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace BoredProgrammers\LaraGrid\Livewire;
+namespace BoredProgrammers\LaraGrid\Theme;
 
 class UiKitTheme extends Theme
 {