-
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7 from fluentci-io/feat/setup-clerk
feat: migrate from Firebase Auth to Clerk
- Loading branch information
Showing
15 changed files
with
244 additions
and
165 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains 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 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 |
|---|---|---|
| @@ -1,52 +1,73 @@ | ||
| import { HashRouter, BrowserRouter, Route, Routes } from "react-router-dom"; | ||
| import Home from "./Containers/Home"; | ||
| import Run from "./Containers/Run"; | ||
| import Project from "./Containers/Project"; | ||
| import Auth from "./Containers/Auth"; | ||
| import AccessTokens from "./Containers/Settings/AccessTokens"; | ||
| import Billing from "./Containers/Settings/Billing"; | ||
| import Settings from "./Containers/Settings"; | ||
| import { useEffect } from "react"; | ||
| import { useGetMeLazyQuery } from "./Hooks/GraphQL"; | ||
| import { useAuthState } from "react-firebase-hooks/auth"; | ||
| import { auth } from "./firebase"; | ||
| import { useRecoilState } from "recoil"; | ||
| import { AuthState } from "./Containers/Auth/AuthState"; | ||
| import LinkProject from "./Containers/LinkProject"; | ||
| import { | ||
| RouterProvider, | ||
| createBrowserRouter, | ||
| createHashRouter, | ||
| } from "react-router-dom"; | ||
| import RootLayout from "./Layouts/Root"; | ||
| import { AuthenticateWithRedirectCallback } from "@clerk/clerk-react"; | ||
|
|
||
| function App() { | ||
| const Router = location.host ? BrowserRouter : HashRouter; | ||
| const [user, loading] = useAuthState(auth); | ||
| const [getMe] = useGetMeLazyQuery(); | ||
| const setMe = useRecoilState(AuthState)[1]; | ||
| const createRouter = location.host ? createBrowserRouter : createHashRouter; | ||
|
|
||
| const router = createRouter([ | ||
| { | ||
| element: <RootLayout />, | ||
| children: [ | ||
| { path: "/", element: <Home /> }, | ||
| { | ||
| path: "/auth", | ||
| element: <Auth />, | ||
| }, | ||
|
|
||
| useEffect(() => { | ||
| if (loading || !user) { | ||
| return; | ||
| } | ||
| // eslint-disable-next-line @typescript-eslint/no-explicit-any | ||
| getMe().then((response: any) => setMe(response?.data?.me)); | ||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| }, [user, loading]); | ||
| { | ||
| path: "/auth/sso-callback", | ||
| element: <AuthenticateWithRedirectCallback />, | ||
| }, | ||
| { | ||
| path: "/settings", | ||
| element: <Settings />, | ||
| }, | ||
| { | ||
| path: "/settings/account", | ||
| element: <Settings />, | ||
| }, | ||
| { | ||
| path: "/settings/billing", | ||
| element: <Billing />, | ||
| }, | ||
| { | ||
| path: "/settings/tokens", | ||
| element: <AccessTokens />, | ||
| }, | ||
| { | ||
| path: "/run/:id", | ||
| element: <Run />, | ||
| }, | ||
| { | ||
| path: "/project/:id", | ||
| element: <Project />, | ||
| }, | ||
| { | ||
| path: "/link-project/:id", | ||
| element: <LinkProject />, | ||
| }, | ||
| { | ||
| path: "/:id", | ||
| element: <Home />, | ||
| }, | ||
| ], | ||
| }, | ||
| ]); | ||
|
|
||
| return ( | ||
| <> | ||
| <Router> | ||
| <Routes> | ||
| <Route path="/" element={<Home />} /> | ||
| <Route path="/auth" element={<Auth />} /> | ||
| <Route path="/settings" element={<Settings />} /> | ||
| <Route path="/settings/account" element={<Settings />} /> | ||
| <Route path="/settings/billing" element={<Billing />} /> | ||
| <Route path="/settings/tokens" element={<AccessTokens />} /> | ||
| <Route path="/run/:id" element={<Run />} /> | ||
| <Route path="/project/:id" element={<Project />} /> | ||
| <Route path="/link-project/:id" element={<LinkProject />} /> | ||
| <Route path="/:id" element={<Home />} /> | ||
| </Routes> | ||
| </Router> | ||
| </> | ||
| ); | ||
| function App() { | ||
| return <RouterProvider router={router} />; | ||
| } | ||
|
|
||
| export default App; |
This file contains 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 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 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 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.