diff --git a/app/Livewire/Forms/MediaForm.php b/app/Livewire/Forms/MediaForm.php index b1cc410..1d3c40a 100644 --- a/app/Livewire/Forms/MediaForm.php +++ b/app/Livewire/Forms/MediaForm.php @@ -39,11 +39,13 @@ public function edit($id) $this->media = Media::findOrFail($id); $this->name = $this->media->name; - $this->states[] = $this->media->is_favorite ? 'is_favorite' : ''; - $this->states[] = $this->media->is_active ? 'is_active' : ''; - $this->states[] = $this->media->in_backlog ? 'in_backlog' : ''; - $this->states[] = $this->media->is_completed ? 'is_completed' : ''; - $this->states[] = $this->media->data && $this->media->data['total_completion'] ? 'total_completion' : ''; + $this->states[] = $this->media->is_favorite ? 'is_favorite' : null; + $this->states[] = $this->media->is_active ? 'is_active' : null; + $this->states[] = $this->media->in_backlog ? 'in_backlog' : null; + $this->states[] = $this->media->is_completed ? 'is_completed' : null; + $this->states[] = $this->media->data && $this->media->data['total_completion'] ? 'total_completion' : null; + + $this->states = collect($this->states)->filter()->values()->toArray(); } public function update() @@ -59,7 +61,5 @@ public function update() 'total_completion' => $states->contains('total_completion'), ], ]); - - $this->reset(); } } diff --git a/app/Livewire/Media/Music/Edit.php b/app/Livewire/Media/Music/Edit.php index f43ff5c..9e4e912 100644 --- a/app/Livewire/Media/Music/Edit.php +++ b/app/Livewire/Media/Music/Edit.php @@ -80,6 +80,7 @@ public function store($mediaId) ]); $this->phrase = ''; + $this->searchedMedia = []; Flux::toast(variant: 'success', text: "{$media->type->name} added!", duration: 3000); } diff --git a/app/Livewire/Photos/Gallery.php b/app/Livewire/Photos/Gallery.php index 12d609f..ff44f8c 100644 --- a/app/Livewire/Photos/Gallery.php +++ b/app/Livewire/Photos/Gallery.php @@ -32,7 +32,7 @@ public function photos() { return Asset::query() ->whereIn('type_id', is_array($this->type) ? $this->type : [$this->type]) - ->paginate(6); + ->paginate(9); } public function destroy($id) diff --git a/resources/views/components/prezet/article.blade.php b/resources/views/components/prezet/article.blade.php index df6040f..0c6ee95 100644 --- a/resources/views/components/prezet/article.blade.php +++ b/resources/views/components/prezet/article.blade.php @@ -1,38 +1,42 @@
Published on
-

+

{{ $article->frontmatter->title }}

-
- - {{ $article->category }} - - @foreach ($article->frontmatter->tags as $tag) +
+ +
+ @foreach ($article->frontmatter->tags as $tag) + + {{ $tag }} + + @endforeach +
diff --git a/resources/views/flux/main.blade.php b/resources/views/flux/main.blade.php index 88d7c0e..4bac25d 100644 --- a/resources/views/flux/main.blade.php +++ b/resources/views/flux/main.blade.php @@ -4,7 +4,7 @@ @php $classes = Flux::classes('[grid-area:main]') - ->add('p-6 lg:px-8 lg:pt-2') + ->add('p-4 lg:px-8') ->add('in-data-flux-container:px-0') // If there is a wrapping container, let IT handle the x padding... ->add($container ? 'mx-auto w-full [:where(&)]:max-w-7xl' : '') ; diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index c9541e7..f51c4b0 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -22,7 +22,7 @@ - + @if (isset($header))
diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php index bbcacc1..bc0ab01 100644 --- a/resources/views/layouts/guest.blade.php +++ b/resources/views/layouts/guest.blade.php @@ -26,7 +26,7 @@ - + @if (isset($header))
@@ -42,9 +42,7 @@ @endif -
- {{ $slot }} -
+ {{ $slot }} @persist('toast') diff --git a/resources/views/livewire/blog.blade.php b/resources/views/livewire/blog.blade.php index 96e4e37..21381e0 100644 --- a/resources/views/livewire/blog.blade.php +++ b/resources/views/livewire/blog.blade.php @@ -33,7 +33,9 @@ - {{ $data->title }} + + {{ str()->limit($data->title, 30) }} + diff --git a/resources/views/livewire/dashboard.blade.php b/resources/views/livewire/dashboard.blade.php index 1ea141d..75e3074 100644 --- a/resources/views/livewire/dashboard.blade.php +++ b/resources/views/livewire/dashboard.blade.php @@ -48,7 +48,7 @@ - Photo Gallery + Photo Manager diff --git a/resources/views/livewire/photos/gallery.blade.php b/resources/views/livewire/photos/gallery.blade.php index 212657f..39962f3 100644 --- a/resources/views/livewire/photos/gallery.blade.php +++ b/resources/views/livewire/photos/gallery.blade.php @@ -2,38 +2,39 @@ {{ $header }}
-
+
@forelse($this->photos as $photo) -
- {{ $photo->name }} + {{ $photo->name }} -
- {{ $photo->name }} - {{ $photo->captured_at }} -
+
+
+
+ {{ $photo->name }} -
- {{ $photo->description }} -
-
+ {{ $photo->description }} - @auth -
- + {{ $photo->captured_at }} +
- @endauth + + @if (auth()->check() && request()->routeIs('gallery.edit')) +
+ +
+ @endif +
@empty diff --git a/resources/views/prezet/index.blade.php b/resources/views/prezet/index.blade.php index 18b4ec6..cc40e39 100644 --- a/resources/views/prezet/index.blade.php +++ b/resources/views/prezet/index.blade.php @@ -6,11 +6,11 @@ ])
-
+
My Writings
-
+
@if ($currentTag)
    @foreach ($articles as $article) -
  • +
  • @endforeach diff --git a/resources/views/prezet/show.blade.php b/resources/views/prezet/show.blade.php index ecd5aa5..1b2f458 100644 --- a/resources/views/prezet/show.blade.php +++ b/resources/views/prezet/show.blade.php @@ -7,7 +7,7 @@ ]) {{-- Main Content --}} -
    +
    diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 19304d6..5032baf 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -3,16 +3,17 @@
    -
    +
    - +