Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/Http/Controllers/BlogController.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function index(Request $request)
'views',
'created_at',
])
->with('user:id,name')
->with('user:id,name,username')
->withCount(['reactions', 'comments'])
->where('is_published', true);

Expand Down Expand Up @@ -56,13 +56,13 @@ public function show(Blog $blog)
{
abort_unless($blog->is_published, 404);

$blog->load('user:id,name');
$blog->load('user:id,name,username,image_path');
$blog->increment('views');

$reactionsCount = $blog->reactions()->count();

$reactors = $blog->reactions()
->with('user:id,name,image_path,institution')
->with('user:id,name,username,image_path,institution')
->latest('id')
->limit(50)
->get()
Expand All @@ -71,7 +71,7 @@ public function show(Blog $blog)
->values();

$comments = $blog->comments()
->with('user:id,name,image_path,institution')
->with('user:id,name,username,image_path,institution')
->latest()
->get();

Expand Down Expand Up @@ -131,7 +131,7 @@ public function storeComment(Request $request, Blog $blog)
'content' => trim($validated['content']),
]);

$comment->load('user:id,name');
$comment->load('user:id,name,username,image_path,institution');
$blog->loadMissing('user:id,name,email,receive_emails');

if ($blog->user && $blog->user_id !== $userId && $blog->user->email && $blog->user->receive_emails !== false) {
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/ResourceController.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public function show($id)
$completionsCount = ResourceCompletion::where('resource_id', $id)->count();

$completers = ResourceCompletion::where('resource_id', $id)
->with('user:id,name,image_path,institution')
->with('user:id,name,username,image_path,institution')
->latest()
->take(10)
->get()
Expand Down
2 changes: 1 addition & 1 deletion app/Http/Controllers/SubjectController.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function index($course)

$featuredBlogs = Blog::where('is_featured', true)
->where('is_published', true)
->with('user:id,name')
->with('user:id,name,username')
->withCount(['reactions', 'comments'])
->inRandomOrder()
->limit(3)
Expand Down
130 changes: 130 additions & 0 deletions app/Http/Controllers/UserProfileController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
<?php

namespace App\Http\Controllers;

use App\Models\BlogComment;
use App\Models\BlogReaction;
use App\Models\Resource;
use App\Models\ResourceCompletion;
use App\Models\User;
use Inertia\Inertia;

class UserProfileController extends Controller
{
public function show(string $username)
{
$user = User::where('username', $username)
->firstOrFail();

$user->load('roles:id,name');

// Study Completions
$completedResourcesCount = $user->completedResources()->count();
$recentCompletions = $user->completedResources()
->with(['node:id,name,subject_id', 'node.subject:id,name'])
->latest('resource_completions.created_at')
->take(6)
->get();

// Contributor Stats & Blogs
$publishedBlogs = $user->blogs()
->where('is_published', true)
->withCount(['reactions', 'comments'])
->latest()
->take(3)
->get();
$blogsCount = $user->blogs()->where('is_published', true)->count();
$totalBlogViews = (int) $user->blogs()->where('is_published', true)->sum('views');
$totalBlogLikes = BlogReaction::whereIn('blog_id', $user->blogs()->where('is_published', true)->select('id'))->count();
$sharedResourcesCount = Resource::where('user_id', $user->id)->count();

// Recent Community Activities (Uploads, completed topics, comments made, reactions given)
$recentUploads = Resource::where('user_id', $user->id)
->with(['node:id,name,subject_id', 'node.subject:id,name'])
->latest()
->take(4)
->get()
->map(fn ($item) => [
'type' => 'upload',
'title' => $item->title,
'subtitle' => $item->node?->subject?->name.' · '.$item->node?->name,
'resource_type' => $item->resource_type,
'url' => "/resources/{$item->id}",
'created_at' => $item->created_at?->diffForHumans(),
]);

$recentCompleted = ResourceCompletion::where('user_id', $user->id)
->with(['resource:id,title,node_id', 'resource.node:id,name,subject_id', 'resource.node.subject:id,name'])
->latest()
->take(4)
->get()
->map(fn ($item) => [
'type' => 'completion',
'title' => $item->resource?->title,
'subtitle' => $item->resource?->node?->subject?->name.' · '.$item->resource?->node?->name,
'url' => $item->resource ? "/resources/{$item->resource->id}" : null,
'created_at' => $item->created_at?->diffForHumans(),
])
->filter(fn ($item) => $item['title'] !== null);

$recentReactions = BlogReaction::where('user_id', $user->id)
->with('blog:id,title,slug')
->latest()
->take(4)
->get()
->map(fn ($item) => [
'type' => 'reaction',
'title' => $item->blog?->title,
'url' => $item->blog ? "/blogs/{$item->blog->slug}" : null,
'created_at' => $item->created_at?->diffForHumans(),
])
->filter(fn ($item) => $item['title'] !== null);

$recentComments = BlogComment::where('user_id', $user->id)
->with('blog:id,title,slug')
->latest()
->take(4)
->get()
->map(fn ($item) => [
'type' => 'comment',
'title' => $item->blog?->title,
'content' => $item->content,
'url' => $item->blog ? "/blogs/{$item->blog->slug}" : null,
'created_at' => $item->created_at?->diffForHumans(),
])
->filter(fn ($item) => $item['title'] !== null);

return Inertia::render('User/Show', [
'profileUser' => [
'id' => $user->id,
'name' => $user->name,
'username' => $user->username,
'title' => $user->title,
'about' => $user->about,
'institution' => $user->institution,
'image_url' => $user->image_url,
'facebook' => $user->facebook,
'instagram' => $user->instagram,
'github' => $user->github,
'created_at' => $user->created_at?->format('M Y') ?? '2026',
'roles' => $user->roles->pluck('name'),
'is_staff' => $user->roles->isNotEmpty(),
],
'stats' => [
'completedResourcesCount' => $completedResourcesCount,
'blogsCount' => $blogsCount,
'totalBlogLikes' => (int) $totalBlogLikes,
'totalBlogViews' => (int) $totalBlogViews,
'sharedResourcesCount' => $sharedResourcesCount,
],
'recentCompletions' => $recentCompletions,
'blogs' => $publishedBlogs,
'recentActivities' => [
'uploads' => $recentUploads->values(),
'completions' => $recentCompleted->values(),
'reactions' => $recentReactions->values(),
'comments' => $recentComments->values(),
],
]);
}
}
9 changes: 8 additions & 1 deletion resources/js/components/BlogCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,18 @@ const formattedDate = computed(() => {
>
<span class="text-slate-400 dark:text-gray-500">Author</span>
<Link
:href="`/about-us#${blog.user?.id}`"
v-if="blog.user?.username"
:href="`/u/${blog.user.username}`"
class="font-medium text-indigo-600 underline transition-colors hover:underline dark:text-indigo-400"
>
{{ blog.user?.name }}
</Link>
<span
v-else
class="font-medium text-slate-700 dark:text-gray-300"
>
{{ blog.user?.name }}
</span>

<span
v-if="formattedDate"
Expand Down
24 changes: 17 additions & 7 deletions resources/js/components/NavBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,16 @@ onBeforeUnmount(() => {

<div class="py-1">
<Link
href="/profile"
:href="
user.username
? `/u/${user.username}`
: '/profile'
"
class="flex items-center gap-2.5 rounded-xl px-3 py-2 text-xs font-semibold text-slate-700 transition-colors hover:bg-slate-50 hover:text-slate-900 dark:text-gray-300 dark:hover:bg-gray-800 dark:hover:text-white"
@click="closeDropdown"
>
<User class="h-3.5 w-3.5 text-slate-400" />
Profile Settings
Profile
</Link>

<Link
Expand Down Expand Up @@ -319,9 +323,11 @@ onBeforeUnmount(() => {
class="border-t border-slate-200/80 bg-white/95 px-4 pt-3 pb-6 shadow-2xl backdrop-blur-xl md:hidden dark:border-gray-800 dark:bg-gray-950/95"
>
<!-- User Profile Header on Mobile (if logged in) -->
<div
<Link
v-if="user"
class="mb-3 flex items-center gap-3 rounded-2xl border border-slate-200/80 bg-slate-50/80 p-3 dark:border-gray-800 dark:bg-gray-900/80"
:href="user.username ? `/u/${user.username}` : '/profile'"
@click="closeMobileMenu"
class="mb-3 flex items-center gap-3 rounded-2xl border border-slate-200/80 bg-slate-50/80 p-3 transition hover:bg-slate-100 dark:border-gray-800 dark:bg-gray-900/80 dark:hover:bg-gray-800"
>
<img
v-if="user.image_url"
Expand All @@ -347,7 +353,7 @@ onBeforeUnmount(() => {
{{ user.email }}
</p>
</div>
</div>
</Link>

<!-- Navigation Links List -->
<div class="space-y-1">
Expand Down Expand Up @@ -390,12 +396,16 @@ onBeforeUnmount(() => {
></div>

<Link
href="/profile"
:href="
user.username
? `/u/${user.username}`
: '/profile'
"
@click="closeMobileMenu"
class="flex items-center gap-3 rounded-xl px-3.5 py-2.5 text-xs font-semibold text-slate-700 transition-colors hover:bg-slate-100 dark:text-gray-300 dark:hover:bg-gray-900"
>
<User class="h-4 w-4 text-slate-400" />
<span>Profile Settings</span>
<span>Profile</span>
</Link>

<Link
Expand Down
Loading