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
2 changes: 0 additions & 2 deletions packages/bot/src/commands/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import type { CommandHandler } from '../bot';

// Import user commands
import { 핑Command } from './ping';
import { 참가Command } from './join';
import { 탈퇴Command } from './leave';
import { 내정보Command } from './my-info';
import { 참가자목록Command } from './member-list';
Expand All @@ -21,7 +20,6 @@ import { getAdminCommands as getAdminCommandsFromDir } from './admin';
// User commands array
const userCommands: CommandHandler[] = [
핑Command,
참가Command,
탈퇴Command,
내정보Command,
참가자목록Command,
Expand Down
156 changes: 0 additions & 156 deletions packages/bot/src/commands/join.ts

This file was deleted.

7 changes: 6 additions & 1 deletion packages/web/src/app/(admin)/admin/members/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
TableHeader,
TableRow,
} from '@/components/ui/table';
import { getPartStyle, getPartLabel } from '@/lib/part-config';
import { MemberFormDialog } from './member-form-dialog';
import { DeleteMemberDialog } from './delete-member-dialog';

Expand Down Expand Up @@ -285,7 +286,11 @@ export default function AdminMembersPage() {
filteredMembers.map((member) => (
<TableRow key={member.id}>
<TableCell className="font-medium">{member.name}</TableCell>
<TableCell>{member.part}</TableCell>
<TableCell>
<span className={`inline-flex items-center rounded-full px-2 py-0.5 text-xs font-medium ${getPartStyle(member.part).bg} ${getPartStyle(member.part).text}`}>
{getPartLabel(member.part)}
</span>
</TableCell>
<TableCell className="text-muted-foreground">
{member.discordUsername}
</TableCell>
Expand Down
25 changes: 22 additions & 3 deletions packages/web/src/app/(user)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client';

import { useEffect, useState, useCallback } from 'react';
import { useRouter } from 'next/navigation';
import { useRouter, usePathname } from 'next/navigation';
import { MainLayout } from '@/components/layout';

interface UserInfo {
Expand All @@ -16,15 +16,23 @@ export default function UserLayout({
children: React.ReactNode;
}) {
const router = useRouter();
const pathname = usePathname();
const [user, setUser] = useState<UserInfo | null>(null);
const [onboardingChecked, setOnboardingChecked] = useState(false);

useEffect(() => {
// Get user info from cookie or API
const fetchUser = async () => {
try {
const response = await fetch('/api/auth/me');
if (response.ok) {
const data = await response.json();

// 온보딩 미완료 시 리다이렉트 (온보딩 페이지 자체는 예외)
if (!data.onboardingCompleted && pathname !== '/profile/onboarding') {
router.push('/profile/onboarding');
return;
}

setUser({
name: data.name || data.discordUsername || data.email?.split('@')[0] || '',
email: data.email || '',
Expand All @@ -33,10 +41,12 @@ export default function UserLayout({
}
} catch {
// User not authenticated, middleware will handle redirect
} finally {
setOnboardingChecked(true);
}
};
fetchUser();
}, []);
}, [pathname, router]);

const handleLogout = useCallback(async () => {
try {
Expand All @@ -48,6 +58,15 @@ export default function UserLayout({
}
}, [router]);

// 온보딩 체크 중에는 로딩 표시 (무한루프 방지를 위해 온보딩 페이지는 바로 표시)
if (!onboardingChecked && pathname !== '/profile/onboarding') {
return (
<div className="flex items-center justify-center min-h-screen">
<div className="text-muted-foreground">로딩 중...</div>
</div>
);
}

return (
<MainLayout user={user} isAdmin={false} showSidebar={true} onLogout={handleLogout}>
{children}
Expand Down
7 changes: 5 additions & 2 deletions packages/web/src/app/(user)/members/[id]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Button } from '@/components/ui/button';
import { Badge } from '@/components/ui/badge';
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
import { Separator } from '@/components/ui/separator';
import { getPartStyle, getPartLabel } from '@/lib/part-config';

interface MemberInfo {
id: string;
Expand Down Expand Up @@ -151,15 +152,17 @@ export default function MemberProfilePage() {
<p className="text-2xl font-semibold">{member.name}</p>
<p className="text-muted-foreground">@{member.discordUsername}</p>
</div>
<Badge variant="outline">{member.part}</Badge>
<span className={`inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-medium ${getPartStyle(member.part).bg} ${getPartStyle(member.part).text}`}>
{getPartLabel(member.part)}
</span>
</div>
</div>

{member.bio && (
<>
<Separator />
<div>
<p className="text-sm text-muted-foreground mb-1">한줄 소개</p>
<p className="text-sm text-muted-foreground mb-1">자기소개</p>
<p>{member.bio}</p>
</div>
</>
Expand Down
Loading