@@ -390,12 +396,16 @@ onBeforeUnmount(() => {
>
-
-
diff --git a/resources/js/components/admin/UserRow.vue b/resources/js/components/admin/UserRow.vue
index 4c00b17..be72bcb 100644
--- a/resources/js/components/admin/UserRow.vue
+++ b/resources/js/components/admin/UserRow.vue
@@ -57,10 +57,12 @@ const deleteUser = (id: number) => {
- ![]()
+
+
+
+
- {{
- member.name
- .split(' ')
- .map((n) => n[0])
- .join('')
- }}
+ ![]()
+
-
+ {{ member.name.charAt(0).toUpperCase() }}
+
-
+
{{ member.name }} -
- - {{ - member.roles[0].name.toLowerCase() === 'manager' - ? 'Staff' - : member.roles[0].name - }} - + + + +
+
+ {{ roleInfo.label }}
+
+
+
+
{{ member.title }}
-+
- {{ member.institution }}
-
+
{{ member.about }}
- {{ user.name }}
+ {{ user.name }}
+
{
-
![]()
{{ comment.user?.name?.charAt(0) || 'U' }}
-
+
![]()
-
+
![]()
-
+
-
{{ comment.user?.name || 'Anonymous' }}
-
+
{
{{ blog.user?.name }}
@@ -745,13 +763,18 @@ const goBack = () => {
No reactions yet.
- {{ reactor.name }}
@@ -781,7 +804,7 @@ const goBack = () => { {{ reactor.institution }} {
class="flex items-center gap-1.5 text-xs text-slate-500 dark:text-gray-400"
>
{
No completions recorded yet.
- {{ completer.name }}
@@ -839,7 +848,7 @@ watch(isFullscreen, (val) => { {{ completer.institution }}
+import { Head, Link, usePage } from '@inertiajs/vue3';
+import {
+ Calendar,
+ GraduationCap,
+ Edit3,
+ Facebook,
+ Instagram,
+ Github,
+ BadgeCheck,
+ ArrowRight,
+ Heart,
+ MessageSquare,
+ Eye,
+ CheckCircle2,
+ BookOpen,
+ FileText,
+ UploadCloud,
+ Activity,
+ ArrowUpRight,
+} from 'lucide-vue-next';
+import { computed, ref } from 'vue';
+
+const props = defineProps<{
+ profileUser: {
+ id: number;
+ name: string;
+ username: string;
+ title: string | null;
+ about: string | null;
+ institution: string | null;
+ image_url: string | null;
+ facebook: string | null;
+ instagram: string | null;
+ github: string | null;
+ created_at: string;
+ roles: string[];
+ is_staff: boolean;
+ };
+ stats: {
+ completedResourcesCount: number;
+ blogsCount: number;
+ totalBlogLikes: number;
+ totalBlogViews: number;
+ sharedResourcesCount: number;
+ };
+ recentCompletions: Array<{
+ id: number;
+ title: string;
+ resource_type: string;
+ node?: {
+ id: number;
+ name: string;
+ subject?: {
+ id: number;
+ name: string;
+ };
+ };
+ }>;
+ blogs: Array<{
+ id: number;
+ title: string;
+ slug: string;
+ excerpt: string | null;
+ featured_image: string | null;
+ views: number;
+ reactions_count: number;
+ comments_count: number;
+ created_at: string;
+ }>;
+ recentActivities: {
+ uploads: Array<{
+ type: string;
+ title: string;
+ subtitle?: string;
+ resource_type?: string;
+ url: string | null;
+ created_at: string;
+ }>;
+ completions: Array<{
+ type: string;
+ title: string;
+ subtitle?: string;
+ url: string | null;
+ created_at: string;
+ }>;
+ reactions: Array<{
+ type: string;
+ title: string;
+ url: string | null;
+ created_at: string;
+ }>;
+ comments: Array<{
+ type: string;
+ title: string;
+ content?: string;
+ url: string | null;
+ created_at: string;
+ }>;
+ };
+}>();
+
+const page = usePage();
+const currentUser = computed(() => page.props.auth?.user);
+const isOwnProfile = computed(
+ () => currentUser.value?.id === props.profileUser.id,
+);
+
+const activeTab = ref<'completed' | 'blogs' | 'activity'>(
+ props.stats.completedResourcesCount > 0
+ ? 'completed'
+ : props.blogs.length > 0
+ ? 'blogs'
+ : 'completed',
+);
+
+const getRoleBadge = (roles: string[]) => {
+ if (roles.includes('admin')) {
+ return {
+ label: 'Admin',
+ class: 'bg-rose-50 text-rose-700 border-rose-200/80 dark:bg-rose-950/40 dark:text-rose-300 dark:border-rose-800/60',
+ };
+ }
+
+ if (roles.includes('editor')) {
+ return {
+ label: 'Editor',
+ class: 'bg-purple-50 text-purple-700 border-purple-200/80 dark:bg-purple-950/40 dark:text-purple-300 dark:border-purple-800/60',
+ };
+ }
+
+ if (roles.includes('manager')) {
+ return {
+ label: 'Staff',
+ class: 'bg-amber-50 text-amber-700 border-amber-200/80 dark:bg-amber-950/40 dark:text-amber-300 dark:border-amber-800/60',
+ };
+ }
+
+ return {
+ label: 'Student',
+ class: 'bg-blue-50 text-blue-700 border-blue-200/80 dark:bg-blue-950/40 dark:text-blue-300 dark:border-blue-800/60',
+ };
+};
+
+const roleInfo = computed(() => getRoleBadge(props.profileUser.roles));
+
+const totalActivitiesCount = computed(
+ () =>
+ (props.recentActivities.uploads?.length || 0) +
+ props.recentActivities.reactions.length +
+ props.recentActivities.comments.length,
+);
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/js/pages/platform/AboutUs.vue b/resources/js/pages/platform/AboutUs.vue
index 30b33d8..92851bd 100644
--- a/resources/js/pages/platform/AboutUs.vue
+++ b/resources/js/pages/platform/AboutUs.vue
@@ -51,15 +51,14 @@ const goBack = () => {
v-for="member in users"
:key="member.name"
:member="member"
- :id="member.id"
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+ {{
+ profileUser.name.charAt(0).toUpperCase()
+ }}
+
+
+
+
+
+
+
+ + {{ profileUser.name }} +
+ + + ++ @{{ profileUser.username }} +
+ + +
+
+
+
+ + {{ profileUser.title }} +
+
+
+
+
+
+
+
+
+ {{ profileUser.about }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + {{ stats.completedResourcesCount }} +
++ Topics Done +
+
+
+
+
+
+
+
+
+
+
+ + {{ stats.blogsCount }} +
++ Articles +
+
+
+
+
+
+
+
+
+
+
+ + {{ stats.totalBlogLikes }} +
++ Likes Gained +
+
+
+
+
+
+
+
+
+ + {{ stats.sharedResourcesCount }} +
++ Shared Notes +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + No study topics completed yet +
++ Topics marked as done while studying chapters will + show up here. +
+
+
+
+
+
+
+
+
+
+ + {{ resource.title }} +
++ {{ resource.node.subject.name }} · + {{ resource.node.name }} +
+
+
+
+
+
+
+
+
+ Published Guides & Notes
+
+
+ See all blogs
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+ + {{ blog.title }} +
++ {{ blog.excerpt }} +
+
+
+
+
+
+
+
+
+
+
+ + No recent activity yet +
++ Reactions and comments on study articles will show + up here. +
+
+
+
+
+
+
+
+
+
+
+ {{ item.created_at }}
+
+
+
+
+ Uploaded
+
+
+ {{ item.title }}
+
+
+ ({{ item.subtitle }})
+
+
+
+
+
+
+
+
+
+ {{ item.created_at }}
+
+
+
+
+ Liked
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+ {{ item.created_at }}
+
+
+
+
+ Commented on
+
+
+ {{ item.title }}
+
+
+ + "{{ item.content }}" +
+
-
+
Apply for a Role
diff --git a/routes/web.php b/routes/web.php
index a5d4787..4bfa768 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -8,6 +8,7 @@
use App\Http\Controllers\ResourceController;
use App\Http\Controllers\ShortUrlController;
use App\Http\Controllers\SubjectController;
+use App\Http\Controllers\UserProfileController;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Route;
@@ -58,6 +59,7 @@
Route::get('/blogs', [BlogController::class, 'index']);
Route::get('/blogs/{blog}', [BlogController::class, 'show']);
+ Route::get('/u/{username}', [UserProfileController::class, 'show'])->name('user.profile');
Route::get('/', [SubjectController::class, 'index'])
->defaults('course', 'hsc')
diff --git a/tests/Feature/UserProfileTest.php b/tests/Feature/UserProfileTest.php
new file mode 100644
index 0000000..b2e5c91
--- /dev/null
+++ b/tests/Feature/UserProfileTest.php
@@ -0,0 +1,97 @@
+create([
+ 'name' => 'Tajim Ahmed',
+ 'username' => 'tajim_pro',
+ 'institution' => 'Notre Dame College',
+ 'about' => 'HSC 26 Candidate',
+ ]);
+
+ $response = $this->get('/u/tajim_pro');
+
+ $response->assertOk();
+ $response->assertInertia(fn ($page) => $page
+ ->component('User/Show')
+ ->where('profileUser.username', 'tajim_pro')
+ ->where('profileUser.name', 'Tajim Ahmed')
+ ->where('profileUser.institution', 'Notre Dame College')
+ );
+});
+
+test('viewing non-existent username renders 404 page', function () {
+ $response = $this->get('/u/non_existent_student_999');
+
+ $response->assertInertia(fn ($page) => $page->component('errors/404'));
+});
+
+test('public profile renders authored blogs when available', function () {
+ Role::create(['name' => 'editor']);
+
+ $user = User::factory()->create(['username' => 'contributor_john']);
+ $user->assignRole('editor');
+
+ Blog::create([
+ 'user_id' => $user->id,
+ 'title' => 'Calculus Masterclass',
+ 'slug' => 'calculus-masterclass',
+ 'content' => 'Sample guide',
+ 'is_published' => true,
+ ]);
+
+ $response = $this->get('/u/contributor_john');
+
+ $response->assertOk();
+ $response->assertInertia(fn ($page) => $page
+ ->component('User/Show')
+ ->where('profileUser.is_staff', true)
+ ->where('stats.blogsCount', 1)
+ ->has('blogs', 1)
+ ->where('blogs.0.title', 'Calculus Masterclass')
+ );
+});
+
+test('public profile accurately displays completed study topics and activities', function () {
+ $user = User::factory()->create(['username' => 'studious_student']);
+ $subject = Subject::create([
+ 'name' => 'Physics',
+ 'slug' => 'physics',
+ 'course' => 'hsc',
+ 'tailwind_format' => 'bg-indigo-500',
+ 'icon' => 'atom',
+ ]);
+ $node = Node::create([
+ 'subject_id' => $subject->id,
+ 'name' => 'Vector',
+ 'slug' => 'vector',
+ ]);
+ $resource = App\Models\Resource::create([
+ 'node_id' => $node->id,
+ 'title' => 'Vector Lecture Notes',
+ 'resource_type' => 'image',
+ 'file_path' => 'resources/vector.jpg',
+ ]);
+
+ ResourceCompletion::create([
+ 'user_id' => $user->id,
+ 'resource_id' => $resource->id,
+ ]);
+
+ $response = $this->get('/u/studious_student');
+
+ $response->assertOk();
+ $response->assertInertia(fn ($page) => $page
+ ->component('User/Show')
+ ->where('stats.completedResourcesCount', 1)
+ ->has('recentCompletions', 1)
+ ->where('recentCompletions.0.title', 'Vector Lecture Notes')
+ ->has('recentActivities.completions', 1)
+ );
+});