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
28 changes: 25 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

88 changes: 32 additions & 56 deletions src/app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,37 +117,7 @@ function LandingShell() {
transition={{ duration: loading.reducedMotion ? 0.2 : 0.8, ease: REVEAL_EASE }}
aria-hidden={!loading.isReady || undefined}
>
<BrowserRouter>
<ThemeProvider>
<ScrollToTop />
<AuthProvider>
<Routes>
<Route path="/" element={<LandingPage />} />
<Route path="/signin" element={<SignIn />} />
<Route path="/signup" element={<SignUp />} />
<Route path="/services/:slug" element={<ServiceDetailPage />} />
<Route
path="/dashboard"
element={
<ProtectedRoute>
<DashboardLayout />
</ProtectedRoute>
}
>
<Route index element={<DashboardOverview />} />
<Route path="progress" element={<ProjectProgress />} />
<Route path="updates" element={<UpdatesFeed />} />
<Route path="payments" element={<PaymentManagement />} />
<Route path="invoices" element={<InvoiceManagement />} />
<Route path="resources" element={<ProjectResources />} />
<Route path="estimation" element={<ProjectEstimation />} />
<Route path="pricing-config" element={<PricingConfig />} />
</Route>
<Route path="*" element={<NotFound />} />
</Routes>
</AuthProvider>
</ThemeProvider>
</BrowserRouter>
<LandingPage />
</motion.div>

<AnimatePresence onExitComplete={handleExitComplete}>
Expand Down Expand Up @@ -184,31 +154,37 @@ export default function App() {
return (
<div className="min-h-screen bg-white dark:bg-slate-950" style={{ fontFamily: "'Inter', 'Plus Jakarta Sans', sans-serif" }}>
<BrowserRouter>
<AuthProvider>
<Routes>
{/* Only the landing route is gated behind the splash intro. */}
<Route path="/" element={<LandingShell />} />
<Route path="/signin" element={<SignIn />} />
<Route path="/signup" element={<SignUp />} />
<Route path="/admin/*" element={<AdminApp />} />
<Route
path="/dashboard"
element={
<ProtectedRoute>
<DashboardLayout />
</ProtectedRoute>
}
>
<Route index element={<DashboardOverview />} />
<Route path="progress" element={<ProjectProgress />} />
<Route path="updates" element={<UpdatesFeed />} />
<Route path="payments" element={<PaymentManagement />} />
<Route path="invoices" element={<InvoiceManagement />} />
<Route path="resources" element={<ProjectResources />} />
</Route>
<Route path="*" element={<NotFound />} />
</Routes>
</AuthProvider>
<ThemeProvider>
<ScrollToTop />
<AuthProvider>
<Routes>
{/* Only the landing route is gated behind the splash intro. */}
<Route path="/" element={<LandingShell />} />
<Route path="/signin" element={<SignIn />} />
<Route path="/signup" element={<SignUp />} />
<Route path="/admin/*" element={<AdminApp />} />
<Route path="/services/:slug" element={<ServiceDetailPage />} />
<Route
path="/dashboard"
element={
<ProtectedRoute>
<DashboardLayout />
</ProtectedRoute>
}
>
<Route index element={<DashboardOverview />} />
<Route path="progress" element={<ProjectProgress />} />
<Route path="updates" element={<UpdatesFeed />} />
<Route path="payments" element={<PaymentManagement />} />
<Route path="invoices" element={<InvoiceManagement />} />
<Route path="resources" element={<ProjectResources />} />
<Route path="estimation" element={<ProjectEstimation />} />
<Route path="pricing-config" element={<PricingConfig />} />
</Route>
<Route path="*" element={<NotFound />} />
</Routes>
</AuthProvider>
</ThemeProvider>
</BrowserRouter>
</div>
);
Expand Down
Loading