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
17 changes: 10 additions & 7 deletions app/dashboard/company/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,16 @@ function CompanyDashboardContent({
}

// Generate sidebar items with dynamic company slug
// Use currentCompany.slug as fallback when companySlug from params is undefined
const effectiveSlug = companySlug || currentCompany.slug

const sidebarItems: SidebarGroupType[] = [
{
title: 'Dashboard',
items: [
{
title: 'Overview',
url: `/dashboard/company/${companySlug}`,
url: `/dashboard/company/${effectiveSlug}`,
icon: LayoutDashboard,
},
],
Expand All @@ -201,17 +204,17 @@ function CompanyDashboardContent({
items: [
{
title: 'Events',
url: `/dashboard/company/${companySlug}/events`,
url: `/dashboard/company/${effectiveSlug}/events`,
icon: Calendar,
},
{
title: 'Hackathons',
url: `/dashboard/company/${companySlug}/hackathons`,
url: `/dashboard/company/${effectiveSlug}/hackathons`,
icon: Trophy,
},
{
title: 'Team',
url: `/dashboard/company/${companySlug}/team`,
url: `/dashboard/company/${effectiveSlug}/team`,
icon: Users,
},
],
Expand All @@ -221,7 +224,7 @@ function CompanyDashboardContent({
items: [
{
title: 'Analytics',
url: `/dashboard/company/${companySlug}/analytics`,
url: `/dashboard/company/${effectiveSlug}/analytics`,
icon: BarChart3,
},
],
Expand All @@ -231,12 +234,12 @@ function CompanyDashboardContent({
items: [
{
title: 'Company Settings',
url: `/dashboard/company/${companySlug}/settings`,
url: `/dashboard/company/${effectiveSlug}/settings`,
icon: Settings,
},
{
title: 'Subscription',
url: `/dashboard/company/${companySlug}/subscription`,
url: `/dashboard/company/${effectiveSlug}/subscription`,
icon: CreditCard,
},
],
Expand Down
18 changes: 15 additions & 3 deletions lib/hooks/useRoleProtection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,15 @@ export function useRoleProtection(requiredRole: 'student' | 'company_member') {
return
}

// Check if user is a company member (FIXED: changed from 'company_users' to 'company_members')
// Check if user is a company member and get their company slug
const { data: companyMembership } = await supabase
.from('company_members')
.select('id')
.select(`
id,
company:companies(slug)
`)
.eq('user_id', user.id)
.eq('status', 'active')
.maybeSingle()

const isCompanyMember = !!companyMembership
Expand All @@ -39,7 +43,15 @@ export function useRoleProtection(requiredRole: 'student' | 'company_member') {
} else if (requiredRole === 'student') {
if (isCompanyMember) {
// User is a company member trying to access student routes
router.push('/dashboard/company')
// Redirect to their company dashboard with the correct slug
const company = companyMembership.company as unknown as { slug: string } | null
const companySlug = company?.slug
if (companySlug) {
router.push(`/dashboard/company/${companySlug}`)
} else {
// Fallback if slug is not available
router.push('/dashboard/company')
}
return
}
}
Expand Down
Loading