diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php deleted file mode 100644 index 4829151..0000000 --- a/app/Http/Controllers/UserController.php +++ /dev/null @@ -1,22 +0,0 @@ -select('id', 'name', 'discord_id', 'discord_name', 'discord_avatar', 'created_at', 'is_patreon') - ->firstOrFail(); - - return view('user.index', [ - 'user' => $user, - ]); - } -} diff --git a/resources/views/livewire/admin-comment-search.blade.php b/resources/views/livewire/admin-comment-search.blade.php index f4c31d9..dcbf479 100644 --- a/resources/views/livewire/admin-comment-search.blade.php +++ b/resources/views/livewire/admin-comment-search.blade.php @@ -34,7 +34,7 @@ @foreach($comments as $comment) - {{ $comment->name }} + {{ $comment->name }} {{ $comment->comment }} diff --git a/resources/views/livewire/playlist-overview.blade.php b/resources/views/livewire/playlist-overview.blade.php index 6aa4bbf..3a947e2 100644 --- a/resources/views/livewire/playlist-overview.blade.php +++ b/resources/views/livewire/playlist-overview.blade.php @@ -4,20 +4,18 @@
- +
@if ($playlist->user->discord_avatar) @else @endif - +

{{ $playlist->name }}

Episodes: {{ count($playlistEpisodes) }}

-

Creator: {{ $playlist->user->name }} -

+

Creator: {{ $playlist->user->name }}

diff --git a/resources/views/partials/comment.blade.php b/resources/views/partials/comment.blade.php index 2719ac2..c14762f 100644 --- a/resources/views/partials/comment.blade.php +++ b/resources/views/partials/comment.blade.php @@ -5,21 +5,21 @@ @endphp
@php $user = cache()->rememberForever('commentUser'.$comment->commenter_id, fn () => \App\Models\User::where('id', $comment->commenter_id)->first()); @endphp - +
@if($user->discord_avatar) {{ $user->discord_name ?? $user->name }} Avatar @else {{ $user->discord_name ?? $user->name }} Avatar @endif - +
- +
@if($user->is_patreon)
{{ $user->discord_name ?? $user->name }} - {{ \Carbon\Carbon::parse($comment->created_at)->diffForHumans() }}
@else
{{ $user->discord_name ?? $user->name }} - {{ \Carbon\Carbon::parse($comment->created_at)->diffForHumans() }}
@endif - +
{!! $markdown->line($comment->comment) !!}

diff --git a/resources/views/vendor/comments/_comment.blade.php b/resources/views/vendor/comments/_comment.blade.php index aa1f275..2a85d50 100644 --- a/resources/views/vendor/comments/_comment.blade.php +++ b/resources/views/vendor/comments/_comment.blade.php @@ -7,22 +7,22 @@
- +
- +
@if($comment->commenter->is_patreon)
{{ $comment->commenter->discord_name ?? $comment->commenter->name }} - {{ $comment->created_at->diffForHumans() }}
@else
{{ $comment->commenter->discord_name ?? $comment->commenter->name }} - {{ $comment->created_at->diffForHumans() }}
@endif - +
{!! $markdown->line($comment->comment) !!}
@if (! Illuminate\Support\Facades\Route::is('profile.comments')) diff --git a/routes/web.php b/routes/web.php index f73e5ed..8bda491 100644 --- a/routes/web.php +++ b/routes/web.php @@ -86,8 +86,6 @@ Route::middleware('auth')->group(function () { Route::get('/download-search', [HomeController::class, 'downloadSearch'])->name('download.search'); }); -Route::get('/user/{username}', [UserController::class, 'index'])->name('user.index'); - /* |--------------------------------------------------------------------------------- | Admin Pages