From fbb1380e439770cae09358afab65e77c3fb54008 Mon Sep 17 00:00:00 2001 From: Joe Dixon Date: Wed, 25 Aug 2021 21:20:32 +0100 Subject: [PATCH 1/6] Implement profile page --- app/Http/Controllers/ProfileController.php | 4 +- resources/css/app.css | 4 - resources/svg/hammer.svg | 3 + .../views/_partials/_delete_modal.blade.php | 44 ++-- .../views/_partials/_update_modal.blade.php | 44 ++-- .../articles/user-summary.blade.php | 71 ++++++ .../threads/overview-summary.blade.php | 2 +- .../components/threads/reply-menu.blade.php | 12 +- resources/views/layouts/base.blade.php | 2 + .../views/users/_latest_replies.blade.php | 54 +---- .../views/users/_latest_threads.blade.php | 79 +------ resources/views/users/profile.blade.php | 210 +++++++++++++++--- 12 files changed, 335 insertions(+), 194 deletions(-) create mode 100644 resources/svg/hammer.svg create mode 100644 resources/views/components/articles/user-summary.blade.php diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index dce074b2f..257a3b176 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -8,6 +8,8 @@ class ProfileController extends Controller { public function show(User $user) { - return view('users.profile', compact('user')); + $articles = $user->latestArticles(3); + + return view('users.profile', compact('user', 'articles')); } } diff --git a/resources/css/app.css b/resources/css/app.css index 551eeff26..9e2100db2 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -54,10 +54,6 @@ svg .secondary { display: none; } -nav.dashboard-nav a.active { - @apply border-lio-500 text-lio-500; -} - .nav a { @apply border-transparent text-gray-500; } diff --git a/resources/svg/hammer.svg b/resources/svg/hammer.svg new file mode 100644 index 000000000..355a65b1f --- /dev/null +++ b/resources/svg/hammer.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/resources/views/_partials/_delete_modal.blade.php b/resources/views/_partials/_delete_modal.blade.php index 7fb6a92fe..031e968ff 100644 --- a/resources/views/_partials/_delete_modal.blade.php +++ b/resources/views/_partials/_delete_modal.blade.php @@ -1,24 +1,30 @@ -
-
-
- @csrf - @method('DELETE') +@push('modals') +
+
+ + @csrf + @method('DELETE') -
-
-
- -

{{ $title }}

+
+
+
+ + +

{{ $title }}

+
+ +
+ {!! $body !!} +
-
- {!! $body !!} + +
+ + +
-
- - -
-
- + +
-
+@endpush diff --git a/resources/views/_partials/_update_modal.blade.php b/resources/views/_partials/_update_modal.blade.php index 651fcd6b1..af5e942b0 100644 --- a/resources/views/_partials/_update_modal.blade.php +++ b/resources/views/_partials/_update_modal.blade.php @@ -1,24 +1,30 @@ -
-
-
- @csrf - @method('PUT') +@push('modals') +
+
+ + @csrf + @method('PUT') -
-
-
- -

{{ $title }}

+
+
+
+ + +

{{ $title }}

+
+ +
+ {!! $body !!} +
-
- {!! $body !!} + +
+ + +
-
- - -
-
- + +
-
+@endpush diff --git a/resources/views/components/articles/user-summary.blade.php b/resources/views/components/articles/user-summary.blade.php new file mode 100644 index 000000000..66e28eb66 --- /dev/null +++ b/resources/views/components/articles/user-summary.blade.php @@ -0,0 +1,71 @@ +@props([ + 'article', +]) + +
+
+ +
+
+ + +
+
+
+
+ + + + {{ $article->author()->username() }} + +
+ + + {{ $article->createdAt()->format('j M, Y') }} + +
+
+ +
+ +

+ {{ $article->title() }} +

+ + +

+ {!! $article->excerpt() !!} +

+
+ +
+
+ @if (count($tags = $article->tags())) +
+ @foreach ($tags as $tag) + + {{ $tag->name() }} + + @endforeach +
+ @endif +
+ +
+ + {{ $article->readTime() }} min read + + + + + {{ count($article->likes()) }} + Likes + +
+
+
+
+
diff --git a/resources/views/components/threads/overview-summary.blade.php b/resources/views/components/threads/overview-summary.blade.php index 88063e36a..d6444e097 100644 --- a/resources/views/components/threads/overview-summary.blade.php +++ b/resources/views/components/threads/overview-summary.blade.php @@ -25,7 +25,7 @@ @if (count($tags = $thread->tags()))
@foreach ($tags as $tag) - + {{ $tag->name() }} diff --git a/resources/views/components/threads/reply-menu.blade.php b/resources/views/components/threads/reply-menu.blade.php index fd406a925..3154b8cbe 100644 --- a/resources/views/components/threads/reply-menu.blade.php +++ b/resources/views/components/threads/reply-menu.blade.php @@ -71,10 +71,10 @@ class="absolute top-12 right-1 flex flex-col bg-white rounded shadow w-48"
@include('_partials._delete_modal', [ - 'identifier' => "delete-reply-{$reply->id}", - 'route' => ['replies.delete', $reply->id()], - 'title' => 'Delete Reply', - 'body' => '

Are you sure you want to delete this reply? This cannot be undone.

', - ]) - @endcan + 'identifier' => "delete-reply-{$reply->id}", + 'route' => ['replies.delete', $reply->id()], + 'title' => 'Delete Reply', + 'body' => '

Are you sure you want to delete this reply? This cannot be undone.

', + ]) + @endcan
\ No newline at end of file diff --git a/resources/views/layouts/base.blade.php b/resources/views/layouts/base.blade.php index fd473b0b6..9e60ff857 100644 --- a/resources/views/layouts/base.blade.php +++ b/resources/views/layouts/base.blade.php @@ -46,6 +46,8 @@ @include('layouts._footer') +@stack('modals') + @livewireScripts diff --git a/resources/views/users/_latest_replies.blade.php b/resources/views/users/_latest_replies.blade.php index 78367cdb6..ff9995603 100644 --- a/resources/views/users/_latest_replies.blade.php +++ b/resources/views/users/_latest_replies.blade.php @@ -1,47 +1,9 @@ -
-
- @forelse ($user->latestReplies(5) as $reply) -
-
- -

- {{ $reply->replyAble()->subject() }} -

- -

- {!! $reply->excerpt() !!} -

- - -
- - - {{ count($reply->likes()) }} - -
-
- -
-
-
-
- Posted {{ $reply->createdAt()->diffForHumans() }} -
-
-
- - @if ($reply->replyAble()->isSolutionReply($reply)) - - - Solution - - @endif -
-
- @empty -

- {{ $user->username() }} has not posted any replies yet -

- @endforelse -
+
+ @forelse ($user->latestReplies(5) as $reply) + + @empty +

+ {{ $user->username() }} has not posted any replies yet +

+ @endforelse
diff --git a/resources/views/users/_latest_threads.blade.php b/resources/views/users/_latest_threads.blade.php index b41e77f14..687fbf929 100644 --- a/resources/views/users/_latest_threads.blade.php +++ b/resources/views/users/_latest_threads.blade.php @@ -1,72 +1,9 @@ -
-
- @forelse ($user->latestThreads() as $thread) -
-
- -

- {{ $thread->subject() }} -

- -

- {!! $thread->excerpt() !!} -

- - -
- - - {{ count($thread->replies()) }} - - - - - {{ count($thread->likes()) }} - -
-
- -
-
-
- @if (count($thread->replies())) - @include('forum.threads.info.avatar', ['user' => $thread->replies()->last()->author()]) - @else - @include('forum.threads.info.avatar', ['user' => $thread->author()]) - @endif - -
- @if (count($thread->replies())) - @php($lastReply = $thread->replies()->last()) - - {{ $lastReply->author()->isLoggedInUser() ? 'You' : $lastReply->author()->username() }} - replied {{ $lastReply->createdAt()->diffForHumans() }} - @else - - {{ $thread->author()->isLoggedInUser() ? 'You' : $thread->author()->username() }} - posted {{ $thread->createdAt()->diffForHumans() }} - @endif -
-
- - @include('forum.threads.info.tags') -
- - @if ($thread->isSolved()) - - - View solution - - @endif -
-
- @empty -

- {{ $user->name() }} has not posted any threads yet -

- @endforelse -
+
+ @forelse ($user->latestThreads() as $thread) + + @empty +

+ {{ $user->username() }} has not posted any threads yet +

+ @endforelse
diff --git a/resources/views/users/profile.blade.php b/resources/views/users/profile.blade.php index 3a3be92d7..fa726d219 100644 --- a/resources/views/users/profile.blade.php +++ b/resources/views/users/profile.blade.php @@ -3,44 +3,200 @@ @extends('layouts.default') @section('content') -
-
-
-
- @include('users._user_info') -
+
+
+ +
+
+
-
-
- @include('users._metrics') -
+
+
+
+
+

{{ $user->name() }}

-
-
-
- + @if ($user->isAdmin() || $user->isModerator()) + + {{ $user->isAdmin() ? 'Admin' : 'Moderator' }} + + @endif
+ + + Joined {{ $user->createdAt()->format('j M Y') }} +
-
-
- @include('users._latest_threads') +
+ + {{ $user->bio() }} + +
+ +
+ @if ($user->githubUsername()) + + + + @endif + + @if ($user->hasTwitterAccount()) + + + + @endif +
+ +
+ @if ($user->isLoggedInUser()) + + + + Edit profile + + + @endif + + @can(App\Policies\UserPolicy::BAN, $user) + @if ($user->isBanned()) + + + + Unban User + + + @else + + + + Ban User + + + @endif + @endcan + + @if (Auth::check() && Auth::user()->isAdmin()) + @can(App\Policies\UserPolicy::DELETE, $user) + + + + Delete User + + + @endcan + @endif +
+
+ +
+

+ Statistics +

+ +
+
+ Threads + + {{ number_format($user->countThreads()) }} + +
+ +
+ Replies + + {{ number_format($user->countReplies()) }} + +
+ +
+ Solutions + + {{ number_format($user->countSolutions()) }} +
-
- @include('users._latest_replies') +
+ Articles + + {{ number_format($user->countArticles()) }} +
+ + @if ($articles->count() > 0) +
+

+ Articles +

+ +
+ @foreach ($articles as $article) +
+ +
+ @endforeach +
+
+ @endif +
+ +
+
+ +
+ +
+
+
+ @include('users._latest_threads') +
+ +
+ @include('users._latest_replies') +
+
+
-
+
+ + @can(App\Policies\UserPolicy::BAN, $user) + @if ($user->isBanned()) + @include('_partials._update_modal', [ + 'identifier' => 'unbanUser', + 'route' => ['admin.users.unban', $user->username()], + 'title' => "Unban {$user->username()}", + 'body' => '

Unbanning this user will allow them to login again and post content.

', + ]) + @else + @include('_partials._update_modal', [ + 'identifier' => 'banUser', + 'route' => ['admin.users.ban', $user->username()], + 'title' => "Ban {$user->username()}", + 'body' => '

Banning this user will prevent them from logging in, posting threads and replying to threads.

', + ]) + @endif + @endcan + + @can(App\Policies\UserPolicy::DELETE, $user) + @include('_partials._delete_modal', [ + 'identifier' => 'deleteUser', + 'route' => ['admin.users.delete', $user->username()], + 'title' => "Delete {$user->username()}", + 'body' => '

Deleting this user will remove their account and any related content like threads & replies. This cannot be undone.

', + ]) + @endcan @endsection From 2a91de742287f2ec78d7434c964e8a7594866b9f Mon Sep 17 00:00:00 2001 From: Joe Dixon Date: Wed, 1 Sep 2021 20:11:38 +0100 Subject: [PATCH 2/6] Remove class attribute --- resources/svg/hammer.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/svg/hammer.svg b/resources/svg/hammer.svg index 355a65b1f..55fbef1fc 100644 --- a/resources/svg/hammer.svg +++ b/resources/svg/hammer.svg @@ -1,3 +1,3 @@ - + \ No newline at end of file From 2ae832a5135db5f1845b48b9edbac96ef158a801 Mon Sep 17 00:00:00 2001 From: Joe Dixon Date: Wed, 1 Sep 2021 20:11:52 +0100 Subject: [PATCH 3/6] Remove profile link --- resources/views/components/articles/user-summary.blade.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/views/components/articles/user-summary.blade.php b/resources/views/components/articles/user-summary.blade.php index 66e28eb66..fcdfab4a7 100644 --- a/resources/views/components/articles/user-summary.blade.php +++ b/resources/views/components/articles/user-summary.blade.php @@ -18,9 +18,7 @@ class="w-full h-32 rounded-t-lg bg-center bg-cover bg-gray-900 lg:h-40"
- - {{ $article->author()->username() }} - + {{ $article->author()->username() }}
From e77879314e655645905921f8ead754df0e0b14c8 Mon Sep 17 00:00:00 2001 From: Joe Dixon Date: Wed, 1 Sep 2021 20:12:03 +0100 Subject: [PATCH 4/6] Update formatting --- .../views/components/threads/reply-menu.blade.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/components/threads/reply-menu.blade.php b/resources/views/components/threads/reply-menu.blade.php index 3154b8cbe..fd406a925 100644 --- a/resources/views/components/threads/reply-menu.blade.php +++ b/resources/views/components/threads/reply-menu.blade.php @@ -71,10 +71,10 @@ class="absolute top-12 right-1 flex flex-col bg-white rounded shadow w-48"
@include('_partials._delete_modal', [ - 'identifier' => "delete-reply-{$reply->id}", - 'route' => ['replies.delete', $reply->id()], - 'title' => 'Delete Reply', - 'body' => '

Are you sure you want to delete this reply? This cannot be undone.

', - ]) - @endcan + 'identifier' => "delete-reply-{$reply->id}", + 'route' => ['replies.delete', $reply->id()], + 'title' => 'Delete Reply', + 'body' => '

Are you sure you want to delete this reply? This cannot be undone.

', + ]) + @endcan
\ No newline at end of file From a951f4a5e9d80b424c20007491510a3377c40745 Mon Sep 17 00:00:00 2001 From: Joe Dixon Date: Wed, 1 Sep 2021 20:14:25 +0100 Subject: [PATCH 5/6] Add profile reply component --- .../views/components/users/reply.blade.php | 52 +++++++++++++++++++ .../views/users/_latest_replies.blade.php | 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 resources/views/components/users/reply.blade.php diff --git a/resources/views/components/users/reply.blade.php b/resources/views/components/users/reply.blade.php new file mode 100644 index 000000000..46e1f7253 --- /dev/null +++ b/resources/views/components/users/reply.blade.php @@ -0,0 +1,52 @@ +@props(['thread', 'reply']) + +
+
+
+
+
+ + + + + + {{ $reply->author()->username() }} + +
+ + + {{ $reply->createdAt()->format('j M, Y \a\t h:i') }} + +
+
+
+ +
+ +

+ {{ $thread->subject() }} +

+ + +

+ {!! $reply->excerpt() !!} +

+
+ +
+
+ + + {{ count($reply->likes()) }} + Likes + +
+ + @if ($thread->isSolutionReply($reply)) + + + Solved + + @endif +
+
diff --git a/resources/views/users/_latest_replies.blade.php b/resources/views/users/_latest_replies.blade.php index ff9995603..a7df0927c 100644 --- a/resources/views/users/_latest_replies.blade.php +++ b/resources/views/users/_latest_replies.blade.php @@ -1,6 +1,6 @@
@forelse ($user->latestReplies(5) as $reply) - + @empty

{{ $user->username() }} has not posted any replies yet From c080fb2609a446a7bec724f4fdfc45964acc70fa Mon Sep 17 00:00:00 2001 From: Joe Dixon Date: Thu, 2 Sep 2021 19:56:05 +0100 Subject: [PATCH 6/6] Add empty state --- resources/views/components/empty-state.blade.php | 10 ++++++++++ resources/views/users/_latest_replies.blade.php | 4 +--- resources/views/users/_latest_threads.blade.php | 4 +--- 3 files changed, 12 insertions(+), 6 deletions(-) create mode 100644 resources/views/components/empty-state.blade.php diff --git a/resources/views/components/empty-state.blade.php b/resources/views/components/empty-state.blade.php new file mode 100644 index 000000000..75081d7e4 --- /dev/null +++ b/resources/views/components/empty-state.blade.php @@ -0,0 +1,10 @@ + +@props(['icon', 'title']) + +

+ @svg($icon, 'mx-auto h-12 w-12 text-gray-400') + +

+ {{ $title }} +

+
\ No newline at end of file diff --git a/resources/views/users/_latest_replies.blade.php b/resources/views/users/_latest_replies.blade.php index a7df0927c..471019699 100644 --- a/resources/views/users/_latest_replies.blade.php +++ b/resources/views/users/_latest_replies.blade.php @@ -2,8 +2,6 @@ @forelse ($user->latestReplies(5) as $reply) @empty -

- {{ $user->username() }} has not posted any replies yet -

+ @endforelse
diff --git a/resources/views/users/_latest_threads.blade.php b/resources/views/users/_latest_threads.blade.php index 687fbf929..d1ba1931c 100644 --- a/resources/views/users/_latest_threads.blade.php +++ b/resources/views/users/_latest_threads.blade.php @@ -2,8 +2,6 @@ @forelse ($user->latestThreads() as $thread) @empty -

- {{ $user->username() }} has not posted any threads yet -

+ @endforelse