Merge pull request #35 from lara-zeus/better-ui

atmonshi · web-flow · commit 0409839d915c · 2024-02-09T18:27:46.000+03:00
fix UI and the usage of plugin config in FE
diff --git a/resources/views/filament/pages/builder.blade.php b/resources/views/filament/pages/builder.blade.php
@@ -4,7 +4,7 @@
         {{ $this->mainWidgetForm }}
 
         <div class="grid grid-cols-12 gap-4 w-full">
-            @foreach (\LaraZeus\DynamicDashboard\DynamicDashboardPlugin::get()->getModel('Columns')::all() as $layout)
+            @foreach (config('zeus-dynamic-dashboard.models.Columns')::all() as $layout)
                 <x-filament::section class="w-full {{ $layout->class }}">
                     <p>{{ $layout->name }}</p>
                     {{ $this->{'widgetsFrom'.$layout->key} }}
diff --git a/resources/views/filament/pages/dynamic-dashboard.blade.php b/resources/views/filament/pages/dynamic-dashboard.blade.php
@@ -1,7 +1,7 @@
 <x-filament::page>
     @if($dashLayout->widgets !== null)
         <div class="grid grid-cols-12 gap-2 w-full px-2">
-            @foreach (\LaraZeus\DynamicDashboard\DynamicDashboardPlugin::get()->getModel('Columns')::all() as $column)
+            @foreach (config('zeus-dynamic-dashboard.models.Columns')::all() as $column)
                 @if(isset($dashLayout->widgets[$column->key]))
                     @php
                         $widgetsItems = collect($dashLayout->widgets[$column->key])->sortBy('data.sort')->toArray();
diff --git a/resources/views/themes/zeus/dynamic-dashboard/layouts.blade.php b/resources/views/themes/zeus/dynamic-dashboard/layouts.blade.php
@@ -1,7 +1,7 @@
 <div>
     @if($dashLayout->widgets !== null)
         <div class="grid grid-cols-12 gap-2 w-full px-2">
-            @foreach (\LaraZeus\DynamicDashboard\DynamicDashboardPlugin::get()->getModel('Columns')::all() as $column)
+            @foreach (config('zeus-dynamic-dashboard.models.Columns')::all() as $column)
                 @if(isset($dashLayout->widgets[$column->key]))
                     @php
                         $widgetsItems = collect($dashLayout->widgets[$column->key])->sortBy('data.sort')->toArray();
diff --git a/resources/views/themes/zeus/dynamic-dashboard/widgets/FaqWidget.blade.php b/resources/views/themes/zeus/dynamic-dashboard/widgets/FaqWidget.blade.php
@@ -1,7 +1,7 @@
-<div class="space-y-3 bg-white dark:bg-black shadow my-10 py-3 px-4 hover:shadow-lg transition-all ease-in-out duration-500 ltr:rounded-tr-none rtl:rounded-tl-none rounded-3xl border border-primary-100 dark:border-primary-700/50">
+<div>
     @if($data['faqs'] !== null)
         @foreach($data['faqs'] as $faq)
-            <x-filament::section class="my-4" collapsible :collapsed="$data['faqs']->count() >1">
+            <x-filament::section class="my-4" collapsible :collapsed="$data['faqs']->count() > 1">
                 <x-slot name="heading">
                     <h3 class="font-semibold">{{ $faq->question }}</h3>
                 </x-slot>
diff --git a/resources/views/themes/zeus/dynamic-dashboard/widgets/FormsWidget.blade.php b/resources/views/themes/zeus/dynamic-dashboard/widgets/FormsWidget.blade.php
@@ -1,7 +1,7 @@
 <div class="my-4">
     @if($data['form_slug'] !== null)
         @php
-            $checkForm = \LaraZeus\Bolt\BoltPlugin::getModel('Form')::whereSlug($data['form_slug'])->first();
+            $checkForm = config('zeus-bolt.models.Form')::whereSlug($data['form_slug'])->first();
         @endphp
         @if($checkForm !== null)
             <livewire:bolt.fill-form :inline="true" :slug="$checkForm->slug" />
diff --git a/resources/views/themes/zeus/dynamic-dashboard/widgets/HeadingWidget.blade.php b/resources/views/themes/zeus/dynamic-dashboard/widgets/HeadingWidget.blade.php
@@ -1,6 +1,3 @@
-<div class="space-y-3 bg-white dark:bg-black shadow my-10 py-3 px-4 hover:shadow-lg transition-all ease-in-out duration-500 ltr:rounded-tr-none rtl:rounded-tl-none rounded-3xl border border-primary-100 dark:border-primary-700/50">
-
-<div class="p-4 prose lg:prose-xl prose-primary dark:prose-invert">
+<div class="max-w-none p-4 prose lg:prose-xl prose-primary dark:prose-invert">
     {!! str($data['content'])->markdown() !!}
 </div>
-</div>
diff --git a/resources/views/themes/zeus/dynamic-dashboard/widgets/ImageWidget.blade.php b/resources/views/themes/zeus/dynamic-dashboard/widgets/ImageWidget.blade.php
@@ -1,4 +1,4 @@
-<div class="py-4">
+<div>
     @if(isset($data['url']))
         <img alt="{{ $data['alt'] }}" src="{{ asset('storage/'.$data['url']) }}">
     @endif
diff --git a/resources/views/themes/zeus/dynamic-dashboard/widgets/PostsWidget.blade.php b/resources/views/themes/zeus/dynamic-dashboard/widgets/PostsWidget.blade.php
@@ -1,4 +1,4 @@
-<div class="py-2 space-y-4">
+<div>
     @foreach($data['posts'] as $post)
         <a href="{{ route('post',$post->slug) }}" class="group flex items-center justify-center gap-4">
             @if($post->image() !== null && $data['show_thumbnail'])
diff --git a/src/Livewire/Layouts.php b/src/Livewire/Layouts.php
@@ -3,7 +3,6 @@
 namespace LaraZeus\DynamicDashboard\Livewire;
 
 use Illuminate\View\View;
-use LaraZeus\DynamicDashboard\DynamicDashboardPlugin;
 use LaraZeus\DynamicDashboard\Models\Layout;
 use Livewire\Component;
 
@@ -13,8 +12,8 @@ class Layouts extends Component
 
     public function mount(?string $slug = null): void
     {
-        $l = $slug ?? DynamicDashboardPlugin::get()->getDefaultLayout();
-        $this->dashLayout = DynamicDashboardPlugin::get()->getModel('Layout')::where('layout_slug', $l)->firstOrFail();
+        $l = $slug ?? config('zeus-dynamic-dashboard.defaultLayout');
+        $this->dashLayout = config('zeus-dynamic-dashboard.models.Layout')::where('layout_slug', $l)->firstOrFail();
     }
 
     public function render(): View
diff --git a/src/Widgets/Classes/FaqWidget.php b/src/Widgets/Classes/FaqWidget.php
@@ -46,7 +46,7 @@ public function viewData(array $data): array
     {
         return [
             // @phpstan-ignore-next-line
-            'faqs' => ($data['faq_cat'] !== null) ? \LaraZeus\Sky\SkyPlugin::get()->getModel('Faq')::withAnyTags([$data['faq_cat']], 'faq')->get() : null,
+            'faqs' => ($data['faq_cat'] !== null) ? config('zeus-sky.models.Faq')::withAnyTags([$data['faq_cat']], 'faq')->get() : null,
         ];
     }
 }
diff --git a/src/Widgets/Classes/LibraryWidget.php b/src/Widgets/Classes/LibraryWidget.php
@@ -46,7 +46,7 @@ public function viewData(array $data): array
     {
         return [
             // @phpstan-ignore-next-line
-            'library' => ($data['library_slug'] !== null) ? \LaraZeus\Sky\SkyPlugin::get()->getModel('Library')::withAnyTags([$data['library_slug']], 'library')->get() : null,
+            'library' => ($data['library_slug'] !== null) ? config('zeus-sky.models.Library')::withAnyTags([$data['library_slug']], 'library')->get() : null,
         ];
     }
 }
diff --git a/src/Widgets/Classes/MenuWidget.php b/src/Widgets/Classes/MenuWidget.php
@@ -49,7 +49,7 @@ public function viewData(array $data): array
     {
         return [
             // @phpstan-ignore-next-line
-            'menu' => ($data['menu_slug'] !== null) ? \LaraZeus\Sky\SkyPlugin::get()->getModel('Navigation')::fromHandle($data['menu_slug']) : null,
+            'menu' => ($data['menu_slug'] !== null) ? config('zeus-sky.models.Navigation')::fromHandle($data['menu_slug']) : null,
         ];
     }
 }
diff --git a/src/Widgets/Classes/PostsWidget.php b/src/Widgets/Classes/PostsWidget.php
@@ -50,7 +50,7 @@ public function form(): Builder\Block
 
                                 Select::make('category')
                                     // @phpstan-ignore-next-line
-                                    ->options(\LaraZeus\Sky\SkyPlugin::get()->getModel('Tag')::query()
+                                    ->options(config('zeus-sky.models.Tag')::query()
                                         ->withType('category')
                                         ->pluck('name', 'id')),
 
@@ -65,11 +65,11 @@ public function form(): Builder\Block
     public function viewData(array $data): array
     {
         // @phpstan-ignore-next-line
-        $posts = \LaraZeus\Sky\SkyPlugin::get()->getModel('Post')::query();
+        $posts = config('zeus-sky.models.Post')::query();
 
         if ($data['category'] !== null) {
             // @phpstan-ignore-next-line
-            $category = \LaraZeus\Sky\SkyPlugin::get()->getModel('Tag')::where('type', 'category')->find($data['category']);
+            $category = config('zeus-sky.models.Tag')::where('type', 'category')->find($data['category']);
             if ($category !== null) {
                 $posts = $category->postsPublished();
             }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<div class="py-4">`
	`1`	`+<div>`
`2`	`2`	`@if(isset($data['url']))`
`3`	`3`	`<img alt="{{ $data['alt'] }}" src="{{ asset('storage/'.$data['url']) }}">`
`4`	`4`	`@endif`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<div class="py-2 space-y-4">`
	`1`	`+<div>`
`2`	`2`	`@foreach($data['posts'] as $post)`
`3`	`3`	`<a href="{{ route('post',$post->slug) }}" class="group flex items-center justify-center gap-4">`
`4`	`4`	`@if($post->image() !== null && $data['show_thumbnail'])`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`namespace LaraZeus\DynamicDashboard\Livewire;`
`4`	`4`
`5`	`5`	`use Illuminate\View\View;`
`6`		`-use LaraZeus\DynamicDashboard\DynamicDashboardPlugin;`
`7`	`6`	`use LaraZeus\DynamicDashboard\Models\Layout;`
`8`	`7`	`use Livewire\Component;`
`9`	`8`
`@@ -13,8 +12,8 @@ class Layouts extends Component`
`13`	`12`
`14`	`13`	`public function mount(?string $slug = null): void`
`15`	`14`	`{`
`16`		`- $l = $slug ?? DynamicDashboardPlugin::get()->getDefaultLayout();`
`17`		`- $this->dashLayout = DynamicDashboardPlugin::get()->getModel('Layout')::where('layout_slug', $l)->firstOrFail();`
	`15`	`+ $l = $slug ?? config('zeus-dynamic-dashboard.defaultLayout');`
	`16`	`+ $this->dashLayout = config('zeus-dynamic-dashboard.models.Layout')::where('layout_slug', $l)->firstOrFail();`
`18`	`17`	`}`
`19`	`18`
`20`	`19`	`public function render(): View`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function viewData(array $data): array`
`46`	`46`	`{`
`47`	`47`	`return [`
`48`	`48`	`// @phpstan-ignore-next-line`
`49`		`- 'faqs' => ($data['faq_cat'] !== null) ? \LaraZeus\Sky\SkyPlugin::get()->getModel('Faq')::withAnyTags([$data['faq_cat']], 'faq')->get() : null,`
	`49`	`+ 'faqs' => ($data['faq_cat'] !== null) ? config('zeus-sky.models.Faq')::withAnyTags([$data['faq_cat']], 'faq')->get() : null,`
`50`	`50`	`];`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public function viewData(array $data): array`
`49`	`49`	`{`
`50`	`50`	`return [`
`51`	`51`	`// @phpstan-ignore-next-line`
`52`		`- 'menu' => ($data['menu_slug'] !== null) ? \LaraZeus\Sky\SkyPlugin::get()->getModel('Navigation')::fromHandle($data['menu_slug']) : null,`
	`52`	`+ 'menu' => ($data['menu_slug'] !== null) ? config('zeus-sky.models.Navigation')::fromHandle($data['menu_slug']) : null,`
`53`	`53`	`];`
`54`	`54`	`}`
`55`	`55`	`}`