Merge branch '3.x' of github.com:lara-zeus/sky into 3.x

lara-zeus · Jul 27, 2023 · b90e4bf · b90e4bf
2 parents c5ae736 + 61c130f
commit b90e4bf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/routes/web.php b/routes/web.php
@@ -39,7 +39,7 @@
                     ->first();
 
                 if ($post !== null) {
-                    request()->session()->put($slug.'-'.request('password'), request('password'));
+                    request()->session()->put($slug . '-' . request('password'), request('password'));
 
                     return redirect()->route($post->post_type, ['slug' => $post->slug]);
                 }
@@ -49,8 +49,8 @@
                 ->name('passwordConfirmation');
 
             Route::get('/', Posts::class)->name('blogs');
-            Route::get(SkyPlugin::get()->getUriPrefix()['post'].'/{slug}', Post::class)->name('post');
-            Route::get(SkyPlugin::get()->getUriPrefix()['page'].'/{slug}', Page::class)->name('page');
+            Route::get(SkyPlugin::get()->getUriPrefix()['post'] . '/{slug}', Post::class)->name('post');
+            Route::get(SkyPlugin::get()->getUriPrefix()['page'] . '/{slug}', Page::class)->name('page');
             Route::get('{type}/{slug}', Tags::class)->name('tags');
         });
 }
diff --git a/src/Http/Livewire/LibrarTag.php b/src/Http/Livewire/LibrarTag.php
@@ -11,7 +11,7 @@ class LibrarTag extends Component
 
     public function mount($slug)
     {
-        $this->tag = SkyPlugin::get()->getTagModel()::findBySlug($slug,'library');
+        $this->tag = SkyPlugin::get()->getTagModel()::findBySlug($slug, 'library');
 
         abort_if($this->tag === null, 404);
     }

diff --git a/src/Models/Tag.php b/src/Models/Tag.php
@@ -59,6 +59,7 @@ protected function generateSlug(string $locale): string
     public static function findBySlug(string $slug, string $type = null, string $locale = null): ?Model
     {
         $locale = $locale ?? static::getLocale();
+
         return static::query()
             ->where("slug->{$locale}", $slug)
             ->where('type', $type)