From b4e88e3e6d1b11ceb7e98d22e5db7211d2f2fe8a Mon Sep 17 00:00:00 2001 From: Tony Lea Date: Thu, 9 May 2024 20:16:03 -0400 Subject: [PATCH] Making improvements --- composer.json | 2 +- public/app.css | 2 +- resources/views/pages/auth/setup/appearance.blade.php | 9 +++------ resources/views/pages/auth/setup/language.blade.php | 1 - resources/views/pages/auth/setup/providers.blade.php | 7 +++---- resources/views/pages/auth/setup/settings.blade.php | 8 ++++---- src/AuthServiceProvider.php | 2 ++ src/Livewire/Setup/Alignment.php | 7 +------ src/Livewire/Setup/Background.php | 6 +----- src/Livewire/Setup/Color.php | 7 +------ src/Livewire/Setup/Css.php | 1 - src/Livewire/Setup/Favicon.php | 7 +------ src/Livewire/Setup/Logo.php | 9 +++++---- 13 files changed, 23 insertions(+), 45 deletions(-) diff --git a/composer.json b/composer.json index c3e3a41..93fc13b 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "livewire/livewire": "^3.0", "livewire/volt": "^1.0", "codeat3/blade-phosphor-icons": "^2.0", - "winter/laravel-config-writer": "^1.0", + "devdojo/config-writer": "^0.0.7", "laravel/socialite": "^5.0", "calebporzio/sushi": "^2.5", "pragmarx/google2fa": "^8.0", diff --git a/public/app.css b/public/app.css index 51b5b31..81c519c 100644 --- a/public/app.css +++ b/public/app.css @@ -1,3 +1,3 @@ #auth-body{ opacity:80; -} \ No newline at end of file +} diff --git a/resources/views/pages/auth/setup/appearance.blade.php b/resources/views/pages/auth/setup/appearance.blade.php index 1d6afa3..b320840 100644 --- a/resources/views/pages/auth/setup/appearance.blade.php +++ b/resources/views/pages/auth/setup/appearance.blade.php @@ -4,7 +4,6 @@ use Livewire\Volt\Component; use Livewire\Attributes\Validate; use Devdojo\Auth\Helper; -use Winter\LaravelConfigWriter\ArrayFile; name('auth.setup.appearance'); @@ -21,11 +20,9 @@ public function mount(){ $this->descriptions = (object)config('devdojo.auth.descriptions'); } - public function update($key, $value){ - $this->config = ArrayFile::open(base_path('config/devdojo/auth/appearance.php')); - $this->config->set($key, $value); - $this->config->write(); - $this->appearance = (object)config('devdojo.auth.appearance'); + private function update($key, $value){ + \Config::write('devdojo.auth.appearance.' . $key, $value); + Artisan::call('config:clear'); $this->js('savedMessageOpen()'); } }; diff --git a/resources/views/pages/auth/setup/language.blade.php b/resources/views/pages/auth/setup/language.blade.php index 95abc9c..c6973d7 100644 --- a/resources/views/pages/auth/setup/language.blade.php +++ b/resources/views/pages/auth/setup/language.blade.php @@ -4,7 +4,6 @@ use Livewire\Volt\Component; use Livewire\Attributes\Validate; use Devdojo\Auth\Helper; -use Winter\LaravelConfigWriter\ArrayFile; name('auth.setup.language'); diff --git a/resources/views/pages/auth/setup/providers.blade.php b/resources/views/pages/auth/setup/providers.blade.php index f52e3e4..c04d087 100644 --- a/resources/views/pages/auth/setup/providers.blade.php +++ b/resources/views/pages/auth/setup/providers.blade.php @@ -4,7 +4,7 @@ use Livewire\Volt\Component; use Livewire\Attributes\Validate; use Devdojo\Auth\Helper; -use Winter\LaravelConfigWriter\ArrayFile; +use Devdojo\ConfigWriter\ArrayFile; name('auth.setup.providers'); @@ -20,9 +20,8 @@ public function mount(){ } public function update($slug, $checked){ - $this->config = ArrayFile::open(base_path('config/devdojo/auth/providers.php')); - $this->config->set($slug . '.active', $checked); - $this->config->write(); + \Config::write('devdojo.auth.providers.' . $slug . '.active', $checked); + Artisan::call('config:clear'); $this->providers = (object)config('devdojo.auth.providers'); $this->js('savedMessageOpen()'); } diff --git a/resources/views/pages/auth/setup/settings.blade.php b/resources/views/pages/auth/setup/settings.blade.php index 2f03eae..8730c39 100644 --- a/resources/views/pages/auth/setup/settings.blade.php +++ b/resources/views/pages/auth/setup/settings.blade.php @@ -4,7 +4,7 @@ use Livewire\Volt\Component; use Livewire\Attributes\Validate; use Devdojo\Auth\Helper; -use Winter\LaravelConfigWriter\ArrayFile; +use Devdojo\ConfigWriter\ArrayFile; name('auth.setup.settings'); @@ -20,9 +20,9 @@ public function mount(){ } public function update($key, $value){ - $this->config = ArrayFile::open(base_path('config/devdojo/auth/settings.php')); - $this->config->set($key, $value); - $this->config->write(); + \Config::write('devdojo.auth.settings.' . $key, $value); + Artisan::call('config:clear'); + $this->settings = (object)config('devdojo.auth.settings'); $this->js('savedMessageOpen()'); } diff --git a/src/AuthServiceProvider.php b/src/AuthServiceProvider.php index b741307..2e06793 100644 --- a/src/AuthServiceProvider.php +++ b/src/AuthServiceProvider.php @@ -60,6 +60,8 @@ public function boot() Livewire::component('auth.setup.favicon', \Devdojo\Auth\Livewire\Setup\Favicon::class); Livewire::component('auth.setup.css', \Devdojo\Auth\Livewire\Setup\Css::class); } + + //app()->register(\October\Rain\Config\ServiceProvider::class); } private function registerAuthFolioDirectory(){ diff --git a/src/Livewire/Setup/Alignment.php b/src/Livewire/Setup/Alignment.php index d606f7a..91eeffb 100644 --- a/src/Livewire/Setup/Alignment.php +++ b/src/Livewire/Setup/Alignment.php @@ -4,7 +4,6 @@ use Livewire\Component; use Illuminate\Support\Facades\Artisan; -use Winter\LaravelConfigWriter\ArrayFile; class Alignment extends Component { @@ -33,12 +32,8 @@ public function updatingContainer($value){ } private function updateConfigKeyValue($key, $value){ - $config = ArrayFile::open(base_path('config/devdojo/auth/appearance.php')); - $config->set($key, $value); - $config->write(); - + \Config::write('devdojo.auth.appearance.' . $key, $value); Artisan::call('config:clear'); - $this->js('savedMessageOpen()'); } diff --git a/src/Livewire/Setup/Background.php b/src/Livewire/Setup/Background.php index 654c9d2..a47b909 100644 --- a/src/Livewire/Setup/Background.php +++ b/src/Livewire/Setup/Background.php @@ -5,7 +5,6 @@ use Livewire\Component; use Livewire\WithFileUploads; use Illuminate\Support\Facades\Artisan; -use Winter\LaravelConfigWriter\ArrayFile; class Background extends Component { @@ -53,10 +52,7 @@ public function updated($property, $value){ } private function updateConfigKeyValue($key, $value){ - $config = ArrayFile::open(base_path('config/devdojo/auth/appearance.php')); - $config->set($key, $value); - $config->write(); - + \Config::write('devdojo.auth.appearance.' . $key, $value); Artisan::call('config:clear'); $this->js('savedMessageOpen()'); diff --git a/src/Livewire/Setup/Color.php b/src/Livewire/Setup/Color.php index bfececf..f9c1eae 100644 --- a/src/Livewire/Setup/Color.php +++ b/src/Livewire/Setup/Color.php @@ -5,7 +5,6 @@ use Livewire\Component; use Livewire\WithFileUploads; use Illuminate\Support\Facades\Artisan; -use Winter\LaravelConfigWriter\ArrayFile; class Color extends Component { @@ -46,12 +45,8 @@ public function updatingInputBorderColor($value){ } private function updateConfigKeyValue($key, $value){ - $config = ArrayFile::open(base_path('config/devdojo/auth/appearance.php')); - $config->set($key, $value); - $config->write(); - + \Config::write('devdojo.auth.appearance.' . $key, $value); Artisan::call('config:clear'); - $this->js('savedMessageOpen()'); } diff --git a/src/Livewire/Setup/Css.php b/src/Livewire/Setup/Css.php index 92f5642..4bc2953 100644 --- a/src/Livewire/Setup/Css.php +++ b/src/Livewire/Setup/Css.php @@ -4,7 +4,6 @@ use Livewire\Component; use Illuminate\Support\Facades\Artisan; -use Winter\LaravelConfigWriter\ArrayFile; class Css extends Component { diff --git a/src/Livewire/Setup/Favicon.php b/src/Livewire/Setup/Favicon.php index a449ffb..692b6a6 100644 --- a/src/Livewire/Setup/Favicon.php +++ b/src/Livewire/Setup/Favicon.php @@ -5,7 +5,6 @@ use Livewire\Component; use Livewire\WithFileUploads; use Illuminate\Support\Facades\Artisan; -use Winter\LaravelConfigWriter\ArrayFile; class Favicon extends Component { @@ -46,12 +45,8 @@ public function updated($property, $value){ } private function updateConfigKeyValue($key, $value){ - $config = ArrayFile::open(base_path('config/devdojo/auth/appearance.php')); - $config->set($key, $value); - $config->write(); - + \Config::write('devdojo.auth.appearance.' . $key, $value); Artisan::call('config:clear'); - $this->js('savedMessageOpen()'); } diff --git a/src/Livewire/Setup/Logo.php b/src/Livewire/Setup/Logo.php index ce6641a..4bbe754 100644 --- a/src/Livewire/Setup/Logo.php +++ b/src/Livewire/Setup/Logo.php @@ -3,8 +3,8 @@ namespace Devdojo\Auth\Livewire\Setup; use Livewire\Component; -use Winter\LaravelConfigWriter\ArrayFile; use Livewire\WithFileUploads; +use Illuminate\Support\Facades\Artisan; class Logo extends Component { @@ -68,10 +68,11 @@ public function updating($property, $value) } } + private function updateConfigKeyValue($key, $value){ - $config = ArrayFile::open(base_path('config/devdojo/auth/appearance.php')); - $config->set($key, $value); - $config->write(); + \Config::write('devdojo.auth.appearance.' . $key, $value); + Artisan::call('config:clear'); + $this->js('savedMessageOpen()'); }