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

Commit 6d2cf1f

Browse files
narthurnarthur
authored
Merge pull request #187 from TaskRatchet/payment-method-prompt
fix clerk provider usage
2 parents bc094b8 + 01a6bc0 commit 6d2cf1f

1 file changed

Lines changed: 90 additions & 93 deletions

File tree

‎src/App.tsx‎

Lines changed: 90 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -62,105 +62,102 @@ export function App(): JSX.Element {
6262
}, [location]);
6363

6464
return (
65-
<ClerkProvider
66-
publishableKey={PUBLISHABLE_KEY}
67-
appearance={{
68-
theme: browser.prefersDarkMode() ? dark : undefined,
69-
}}
70-
>
71-
<QueryClientProvider client={queryClient}>
72-
<AndTheme>
73-
<Stack sx={{ height: '100vh' }}>
74-
<NavBar onTodayClick={handleTodayClick} />
75-
<Box ref={ref} overflow={'scroll'} flexGrow={1}>
76-
<Container
77-
maxWidth={'sm'}
78-
disableGutters
79-
sx={{
80-
minHeight: 1,
81-
}}
82-
>
83-
<PaymentMethodAlert />
84-
<Routes>
85-
<Route
86-
path={'/success'}
87-
element={
88-
<Box sx={{ p: 2 }}>
89-
<Alert severity="success">
90-
Your payment method has been saved successfully.
91-
</Alert>
92-
</Box>
93-
}
94-
/>
95-
96-
<Route
97-
path={'/cancel'}
98-
element={
99-
<Box sx={{ p: 2 }}>
100-
<Alert severity="error">
101-
Your payment method could not be saved. Please contact{' '}
102-
<Link
103-
component="a"
104-
href="mailto:support@taskratchet.com"
105-
target={'_blank'}
106-
rel="noopener noreferrer"
107-
>
108-
support@taskratchet.com
109-
</Link>{' '}
110-
for assistance.
111-
</Alert>
112-
</Box>
113-
}
114-
/>
115-
116-
<Route
117-
path={'/settings'}
118-
element={
119-
<Authenticated>
120-
<Settings />
121-
</Authenticated>
122-
}
123-
/>
124-
125-
<Route path={'/reset'} element={<ResetPassword />} />
126-
127-
<Route
128-
path={'/complete-registration'}
129-
element={<Register />}
130-
/>
131-
132-
<Route
133-
path={'/login'}
134-
element={<RedirectToSignIn redirectUrl={'/'} />}
135-
/>
136-
137-
<Route
138-
path={'/register'}
139-
element={<RedirectToSignUp redirectUrl={'/'} />}
140-
/>
141-
142-
<Route
143-
path={'/'}
144-
element={
145-
<Authenticated>
146-
<Tasks lastToday={lastToday} />
147-
</Authenticated>
148-
}
149-
/>
150-
</Routes>
151-
</Container>
152-
</Box>
153-
</Stack>
154-
</AndTheme>
155-
</QueryClientProvider>
156-
</ClerkProvider>
65+
<QueryClientProvider client={queryClient}>
66+
<AndTheme>
67+
<Stack sx={{ height: '100vh' }}>
68+
<NavBar onTodayClick={handleTodayClick} />
69+
<Box ref={ref} overflow={'scroll'} flexGrow={1}>
70+
<Container
71+
maxWidth={'sm'}
72+
disableGutters
73+
sx={{
74+
minHeight: 1,
75+
}}
76+
>
77+
<PaymentMethodAlert />
78+
<Routes>
79+
<Route
80+
path={'/success'}
81+
element={
82+
<Box sx={{ p: 2 }}>
83+
<Alert severity="success">
84+
Your payment method has been saved successfully.
85+
</Alert>
86+
</Box>
87+
}
88+
/>
89+
90+
<Route
91+
path={'/cancel'}
92+
element={
93+
<Box sx={{ p: 2 }}>
94+
<Alert severity="error">
95+
Your payment method could not be saved. Please contact{' '}
96+
<Link
97+
component="a"
98+
href="mailto:support@taskratchet.com"
99+
target={'_blank'}
100+
rel="noopener noreferrer"
101+
>
102+
support@taskratchet.com
103+
</Link>{' '}
104+
for assistance.
105+
</Alert>
106+
</Box>
107+
}
108+
/>
109+
110+
<Route
111+
path={'/settings'}
112+
element={
113+
<Authenticated>
114+
<Settings />
115+
</Authenticated>
116+
}
117+
/>
118+
119+
<Route path={'/reset'} element={<ResetPassword />} />
120+
121+
<Route path={'/complete-registration'} element={<Register />} />
122+
123+
<Route
124+
path={'/login'}
125+
element={<RedirectToSignIn redirectUrl={'/'} />}
126+
/>
127+
128+
<Route
129+
path={'/register'}
130+
element={<RedirectToSignUp redirectUrl={'/'} />}
131+
/>
132+
133+
<Route
134+
path={'/'}
135+
element={
136+
<Authenticated>
137+
<Tasks lastToday={lastToday} />
138+
</Authenticated>
139+
}
140+
/>
141+
</Routes>
142+
</Container>
143+
</Box>
144+
</Stack>
145+
</AndTheme>
146+
</QueryClientProvider>
157147
);
158148
}
159149

160150
export default function AppWithRouter(): JSX.Element {
161151
return (
162152
<Router>
163-
<App />
153+
<ClerkProvider
154+
publishableKey={PUBLISHABLE_KEY}
155+
appearance={{
156+
theme: browser.prefersDarkMode() ? dark : undefined,
157+
}}
158+
>
159+
<App />
160+
</ClerkProvider>
164161
</Router>
165162
);
166163
}

0 commit comments

Comments
 (0)