Skip to content

feat(dashboard): Add company context integration and loading states #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
codeunia-dev merged 1 commit into from
Nov 15, 2025
Merged

feat(dashboard): Add company context integration and loading states #327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion app/dashboard/company/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useParams } from 'next/navigation'
import { Button } from '@/components/ui/button'
import { CompanySidebar } from '@/components/dashboard/CompanySidebar'
import { CompanyHeader } from '@/components/dashboard/CompanyHeader'
import { CompanyProvider } from '@/contexts/CompanyContext'
import { CompanyProvider, useCompanyContext } from '@/contexts/CompanyContext'
import {
LayoutDashboard,
Calendar,
Expand Down Expand Up @@ -110,6 +110,7 @@ export default function CompanyDashboardLayout({
)
}

// Component that uses CompanyContext to conditionally render sidebar
function CompanyDashboardContent({
avatar,
name,
Expand All @@ -123,6 +124,21 @@ function CompanyDashboardContent({
}) {
const params = useParams()
const companySlug = params?.slug as string
const { currentCompany, loading, error } = useCompanyContext()

// Show loading while company context is loading
if (loading) {
return (
<div className="flex items-center justify-center min-h-screen bg-black">
<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary"></div>
</div>
)
}

// If no company access (error or no currentCompany), don't render sidebar
if (error || !currentCompany) {
return <div className="bg-black min-h-screen w-full">{children}</div>
}

// Generate sidebar items with dynamic company slug
const sidebarItems: SidebarGroupType[] = [
Expand Down
Loading