From cd0707ec283f413bacec01550204552f3fb27c28 Mon Sep 17 00:00:00 2001
From: Ashraf Monshi <wh7r.com@gmail.com>
Date: Sat, 17 Sep 2022 12:56:08 +0300
Subject: [PATCH] refactor status

---
 composer.json                            |  1 -
 resources/views/status-clasess.blade.php |  9 ---------
 src/Models/Post.php                      |  2 +-
 src/Models/PostStatus.php                | 16 ++++++++--------
 src/SkyServiceProvider.php               |  4 ++--
 5 files changed, 11 insertions(+), 21 deletions(-)
 delete mode 100644 resources/views/status-clasess.blade.php

diff --git a/composer.json b/composer.json
index fc046bb..be40484 100644
--- a/composer.json
+++ b/composer.json
@@ -41,7 +41,6 @@
         "orchestra/testbench": "^6.0 || ^7.0",
         "laravel/pint": "^1.0",
         "nunomaduro/larastan": "^2.0.1",
-        "orchestra/testbench": "^7.0",
         "pestphp/pest": "^1.21",
         "pestphp/pest-plugin-laravel": "^1.1",
         "pestphp/pest-plugin-livewire": "^1.0",
diff --git a/resources/views/status-clasess.blade.php b/resources/views/status-clasess.blade.php
deleted file mode 100644
index 4544a86..0000000
--- a/resources/views/status-clasess.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="px-2 py-0.5 text-xs rounded-xl
-            text-success-700 bg-success-500/10
-            text-warning-700 bg-warning-500/10
-            text-primary-700 bg-primary-500/10
-            text-danger-700 bg-danger-500/10
-            text-info-700 bg-info-500/10
-            text-secondary-700 bg-secondary-500/10
-        ">
-</div>
diff --git a/src/Models/Post.php b/src/Models/Post.php
index 8f8a653..3baecda 100644
--- a/src/Models/Post.php
+++ b/src/Models/Post.php
@@ -61,7 +61,7 @@ public function statusDesc(): string
         $PostStatus = PostStatus::where('name', $this->status)->first();
         $icon = Blade::render('@svg("' . $PostStatus->icon . '","w-4 h-4 inline-flex")');
 
-        return "<span title='" . __('post status') . "' class='px-2 py-0.5 text-xs rounded-xl text-{$PostStatus->class}-700 bg-{$PostStatus->class}-500/10'> " . $icon . " {$PostStatus->label}</span>";
+        return "<span title='" . __('post status') . "' class='$PostStatus->class'> " . $icon . " {$PostStatus->label}</span>";
     }
 
     public function author()
diff --git a/src/Models/PostStatus.php b/src/Models/PostStatus.php
index 43faa6d..eb1aa5d 100644
--- a/src/Models/PostStatus.php
+++ b/src/Models/PostStatus.php
@@ -11,14 +11,14 @@ class PostStatus extends Model
     public function getRows()
     {
         return [
-            ['name' => 'publish', 'label' => __('Publish'), 'class' => 'success', 'icon' => 'iconpark-filesuccessone'],
-            ['name' => 'future', 'label' => __('Future'), 'class' => 'warning', 'icon' => 'iconpark-filedateone'],
-            ['name' => 'draft', 'label' => __('Draft'), 'class' => 'secondary', 'icon' => 'iconpark-filehidingone'],
-            ['name' => 'auto-draft', 'label' => __('Auto draft'), 'class' => 'primary', 'icon' => 'iconpark-filesearchone'],
-            ['name' => 'pending', 'label' => __('Pending'), 'class' => 'info', 'icon' => 'iconpark-fileeditingone'],
-            ['name' => 'private', 'label' => __('Private'), 'class' => 'danger', 'icon' => 'iconpark-filelockone'],
-            ['name' => 'trash', 'label' => __('Trash'), 'class' => 'danger', 'icon' => 'iconpark-filetextone'],
-            ['name' => 'inherit', 'label' => __('Inherit'), 'class' => 'primary', 'icon' => 'iconpark-filetipsone'],
+            ['name' => 'publish', 'label' => __('Publish'), 'class' => 'px-2 py-0.5 text-xs rounded-xl text-success-700 bg-success-500/10', 'icon' => 'iconpark-filesuccessone'],
+            ['name' => 'future', 'label' => __('Future'), 'class' => 'px-2 py-0.5 text-xs rounded-xl text-warning-700 bg-warning-500/10', 'icon' => 'iconpark-filedateone'],
+            ['name' => 'draft', 'label' => __('Draft'), 'class' => 'px-2 py-0.5 text-xs rounded-xl text-secondary-700 bg-secondary-500/10', 'icon' => 'iconpark-filehidingone'],
+            ['name' => 'auto-draft', 'label' => __('Auto draft'), 'class' => 'px-2 py-0.5 text-xs rounded-xl text-primary-700 bg-primary-500/10', 'icon' => 'iconpark-filesearchone'],
+            ['name' => 'pending', 'label' => __('Pending'), 'class' => 'px-2 py-0.5 text-xs rounded-xl text-info-700 bg-info-500/10', 'icon' => 'iconpark-fileeditingone'],
+            ['name' => 'private', 'label' => __('Private'), 'class' => 'px-2 py-0.5 text-xs rounded-xl text-danger-700 bg-danger-500/10', 'icon' => 'iconpark-filelockone'],
+            ['name' => 'trash', 'label' => __('Trash'), 'class' => 'px-2 py-0.5 text-xs rounded-xl text-danger-700 bg-danger-500/10', 'icon' => 'iconpark-filetextone'],
+            ['name' => 'inherit', 'label' => __('Inherit'), 'class' => 'px-2 py-0.5 text-xs rounded-xl text-primary-700 bg-primary-500/10', 'icon' => 'iconpark-filetipsone'],
         ];
     }
 
diff --git a/src/SkyServiceProvider.php b/src/SkyServiceProvider.php
index 7eac3f6..28b8242 100644
--- a/src/SkyServiceProvider.php
+++ b/src/SkyServiceProvider.php
@@ -15,10 +15,10 @@ class SkyServiceProvider extends PluginServiceProvider
 
     public function boot()
     {
-        View::share('theme', 'zeus-sky::themes.' . config('zeus-sky.theme'));
+        View::share('theme', 'zeus-sky::themes.' . config('zeus-sky.theme', 'zeus'));
 
         App::singleton('theme', function () {
-            return 'zeus-sky::themes.' . config('zeus-sky.theme');
+            return 'zeus-sky::themes.' . config('zeus-sky.theme', 'zeus');
         });
 
         return parent::boot();