Skip to content
This repository was archived by the owner on Oct 2, 2025. It is now read-only.

fix clerk provider usage #187

Merged
narthur merged 2 commits into from
Sep 30, 2025
Merged

fix clerk provider usage #187

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae58e97
fix clerk provider usage
narthur Sep 30, 2025
01a6bc0
Merge branch 'master' into payment-method-prompt
narthur Sep 30, 2025
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
183 changes: 90 additions & 93 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,105 +62,102 @@ export function App(): JSX.Element {
}, [location]);

return (
<ClerkProvider
publishableKey={PUBLISHABLE_KEY}
appearance={{
theme: browser.prefersDarkMode() ? dark : undefined,
}}
>
<QueryClientProvider client={queryClient}>
<AndTheme>
<Stack sx={{ height: '100vh' }}>
<NavBar onTodayClick={handleTodayClick} />
<Box ref={ref} overflow={'scroll'} flexGrow={1}>
<Container
maxWidth={'sm'}
disableGutters
sx={{
minHeight: 1,
}}
>
<PaymentMethodAlert />
<Routes>
<Route
path={'/success'}
element={
<Box sx={{ p: 2 }}>
<Alert severity="success">
Your payment method has been saved successfully.
</Alert>
</Box>
}
/>

<Route
path={'/cancel'}
element={
<Box sx={{ p: 2 }}>
<Alert severity="error">
Your payment method could not be saved. Please contact{' '}
<Link
component="a"
href="mailto:support@taskratchet.com"
target={'_blank'}
rel="noopener noreferrer"
>
support@taskratchet.com
</Link>{' '}
for assistance.
</Alert>
</Box>
}
/>

<Route
path={'/settings'}
element={
<Authenticated>
<Settings />
</Authenticated>
}
/>

<Route path={'/reset'} element={<ResetPassword />} />

<Route
path={'/complete-registration'}
element={<Register />}
/>

<Route
path={'/login'}
element={<RedirectToSignIn redirectUrl={'/'} />}
/>

<Route
path={'/register'}
element={<RedirectToSignUp redirectUrl={'/'} />}
/>

<Route
path={'/'}
element={
<Authenticated>
<Tasks lastToday={lastToday} />
</Authenticated>
}
/>
</Routes>
</Container>
</Box>
</Stack>
</AndTheme>
</QueryClientProvider>
</ClerkProvider>
<QueryClientProvider client={queryClient}>
<AndTheme>
<Stack sx={{ height: '100vh' }}>
<NavBar onTodayClick={handleTodayClick} />
<Box ref={ref} overflow={'scroll'} flexGrow={1}>
<Container
maxWidth={'sm'}
disableGutters
sx={{
minHeight: 1,
}}
>
<PaymentMethodAlert />
<Routes>
<Route
path={'/success'}
element={
<Box sx={{ p: 2 }}>
<Alert severity="success">
Your payment method has been saved successfully.
</Alert>
</Box>
}
/>

<Route
path={'/cancel'}
element={
<Box sx={{ p: 2 }}>
<Alert severity="error">
Your payment method could not be saved. Please contact{' '}
<Link
component="a"
href="mailto:support@taskratchet.com"
target={'_blank'}
rel="noopener noreferrer"
>
support@taskratchet.com
</Link>{' '}
for assistance.
</Alert>
</Box>
}
/>

<Route
path={'/settings'}
element={
<Authenticated>
<Settings />
</Authenticated>
}
/>

<Route path={'/reset'} element={<ResetPassword />} />

<Route path={'/complete-registration'} element={<Register />} />

<Route
path={'/login'}
element={<RedirectToSignIn redirectUrl={'/'} />}
/>

<Route
path={'/register'}
element={<RedirectToSignUp redirectUrl={'/'} />}
/>

<Route
path={'/'}
element={
<Authenticated>
<Tasks lastToday={lastToday} />
</Authenticated>
}
/>
</Routes>
</Container>
</Box>
</Stack>
</AndTheme>
</QueryClientProvider>
);
}

export default function AppWithRouter(): JSX.Element {
return (
<Router>
<App />
<ClerkProvider
publishableKey={PUBLISHABLE_KEY}
appearance={{
theme: browser.prefersDarkMode() ? dark : undefined,
}}
>
<App />
</ClerkProvider>
</Router>
);
}
Loading