Matt
f3fd9eebee
Some checks failed
Build and Push Docker Image / build (push) Has been cancelled
- Add roles UserRole[] to User model with migration + backfill from existing role column - Update auth JWT/session to propagate roles array with [role] fallback for stale tokens - Update tRPC hasRole() middleware and add userHasRole() helper for inline role checks - Update ~15 router inline checks and ~13 DB queries to use roles array - Add updateRoles admin mutation with SUPER_ADMIN guard and priority-based primary role - Add role switcher UI in admin sidebar and role-nav for multi-role users - Remove redundant stats cards from round detail, add window dates to header banner - Merge Members section into JuryProgressTable with inline cap editor and remove buttons - Reorder round detail assignments tab: Progress > Score Dist > Assignments > Coverage > Jury Group - Make score distribution fill full vertical height, reassignment history always open - Add per-juror progress bars to admin dashboard ActiveRoundPanel for EVALUATION rounds - Fix evaluation submit bug: use isSubmitting state instead of startMutation.isPending Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
45 lines
1.2 KiB
TypeScript
45 lines
1.2 KiB
TypeScript
import { redirect } from 'next/navigation'
|
|
import { prisma } from '@/lib/prisma'
|
|
import { requireRole } from '@/lib/auth-redirect'
|
|
import { MentorNav } from '@/components/layouts/mentor-nav'
|
|
|
|
export const dynamic = 'force-dynamic'
|
|
|
|
export default async function MentorLayout({
|
|
children,
|
|
}: {
|
|
children: React.ReactNode
|
|
}) {
|
|
const session = await requireRole('MENTOR', 'PROGRAM_ADMIN', 'SUPER_ADMIN')
|
|
|
|
// Check if user has completed onboarding (for mentors)
|
|
const userRoles = session.user.roles?.length ? session.user.roles : [session.user.role]
|
|
if (userRoles.includes('MENTOR') && !userRoles.some(r => r === 'SUPER_ADMIN' || r === 'PROGRAM_ADMIN')) {
|
|
const user = await prisma.user.findUnique({
|
|
where: { id: session.user.id },
|
|
select: { onboardingCompletedAt: true },
|
|
})
|
|
|
|
if (!user) {
|
|
// User was deleted — session is stale, send to login
|
|
redirect('/login')
|
|
}
|
|
|
|
if (!user.onboardingCompletedAt) {
|
|
redirect('/onboarding')
|
|
}
|
|
}
|
|
|
|
return (
|
|
<div className="min-h-screen bg-background">
|
|
<MentorNav
|
|
user={{
|
|
name: session.user.name,
|
|
email: session.user.email,
|
|
}}
|
|
/>
|
|
<main className="container-app py-6 lg:py-8">{children}</main>
|
|
</div>
|
|
)
|
|
}
|