Design #114
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,6 +8,7 @@ import { BrowserRouter, Routes, Route, useLocation } from "react-router-dom"; | |
| import { ThemeProvider } from "@/components/ThemeProvider"; | ||
| import { motion, AnimatePresence } from "framer-motion"; | ||
| import { lazy, Suspense } from "react"; | ||
| import { useIsMobile } from "@/hooks/use-mobile"; | ||
|
|
||
| const Index = lazy(() => import("./pages/Index")); | ||
| const Login = lazy(() => import("./pages/Login")); | ||
|
|
@@ -20,6 +21,17 @@ const PrivacyPolicy = lazy(() => import("./pages/PrivacyPolicy")); | |
| const Privacy = lazy(() => import("./pages/Privacy")); | ||
| const Terms = lazy(() => import("./pages/Terms")); | ||
| const WelcomeToZync = lazy(() => import("./pages/WelcomeToZync")); | ||
| const IndexMobile = lazy(() => import("./mobile/pages/IndexMobile")); | ||
| const LoginMobile = lazy(() => import("./mobile/pages/LoginMobile")); | ||
| const SignupMobile = lazy(() => import("./mobile/pages/SignupMobile")); | ||
| const NotFoundMobile = lazy(() => import("./mobile/pages/NotFoundMobile")); | ||
| const DashboardMobile = lazy(() => import("./mobile/pages/DashboardMobile")); | ||
| const NewProjectMobile = lazy(() => import("./mobile/pages/NewProjectMobile")); | ||
| const ProjectDetailsMobile = lazy(() => import("./mobile/pages/ProjectDetailsMobile")); | ||
| const PrivacyPolicyMobile = lazy(() => import("./mobile/pages/PrivacyPolicyMobile")); | ||
| const PrivacyMobile = lazy(() => import("./mobile/pages/PrivacyMobile")); | ||
| const TermsMobile = lazy(() => import("./mobile/pages/TermsMobile")); | ||
| const WelcomeToZyncMobile = lazy(() => import("./mobile/pages/WelcomeToZyncMobile")); | ||
| import { useActivityTracker } from "./hooks/use-activity-tracker"; | ||
| import { useChatNotifications } from "./hooks/use-chat-notifications"; | ||
| import { useUserSync } from "./hooks/use-user-sync"; | ||
|
|
@@ -32,6 +44,7 @@ const AppContent = () => { | |
| useUserSync(); | ||
| useSyncData(); // Trigger local-first data fetch and Dexie sync on login/app load | ||
| const location = useLocation(); | ||
| const isMobile = useIsMobile(); | ||
|
|
||
|
|
||
| const getPageKey = (pathname: string) => { | ||
|
|
@@ -55,33 +68,33 @@ const AppContent = () => { | |
| > | ||
| <Suspense fallback={<div className="h-full w-full flex items-center justify-center text-sm text-muted-foreground">Loading…</div>}> | ||
| <Routes location={location}> | ||
| <Route path="/" element={isMobile ? <IndexMobile /> : <Index />} /> | ||
| <Route path="/login" element={isMobile ? <LoginMobile /> : <Login />} /> | ||
| <Route path="/signup" element={isMobile ? <SignupMobile /> : <Signup />} /> | ||
| <Route path="/welcome" element={isMobile ? <WelcomeToZyncMobile /> : <WelcomeToZync />} /> | ||
| <Route path="/dashboard" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/dashboard/workspace" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/dashboard/workspace/project/:id" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/dashboard/projects" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/dashboard/calendar" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/dashboard/design" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/dashboard/tasks" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/dashboard/notes" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/dashboard/files" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/dashboard/activity" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/dashboard/people" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/dashboard/meet" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/dashboard/settings" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/dashboard/chat" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/dashboard/new-project" element={isMobile ? <DashboardMobile /> : <Dashboard />} /> | ||
| <Route path="/new-project" element={isMobile ? <NewProjectMobile /> : <NewProject />} /> | ||
|
Comment on lines
24
to
+90
There was a problem hiding this comment. Several of the new |
||
| <Route path="/projects/:id" element={isMobile ? <ProjectDetailsMobile /> : <ProjectDetails />} /> | ||
|
|
||
| <Route path="/privacy-policy" element={isMobile ? <PrivacyPolicyMobile /> : <PrivacyPolicy />} /> | ||
| <Route path="/privacy" element={isMobile ? <PrivacyMobile /> : <Privacy />} /> | ||
| <Route path="/terms" element={isMobile ? <TermsMobile /> : <Terms />} /> | ||
| {/* ADD ALL CUSTOM ROUTES ABOVE THE CATCH-ALL "*" ROUTE */} | ||
| <Route path="*" element={isMobile ? <NotFoundMobile /> : <NotFound />} /> | ||
| </Routes> | ||
| </Suspense> | ||
| </motion.div> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
useIsMobile()currently returnsfalseon the initial render (the hook initializes state toundefinedand returns!!isMobile), so mobile users will briefly render the desktop routes before the effect runs. Consider delaying route rendering until the mobile breakpoint is resolved (e.g., returnundefinedfrom the hook and show a loading shell), or initialize the hook state fromwindow.innerWidthto avoid a desktop->mobile flicker and unnecessary chunk loads.