-
Notifications
You must be signed in to change notification settings - Fork 988
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 #45 from gangjun06/refactor2
Edit frontend .prettierrc config
- Loading branch information
Showing
115 changed files
with
13,552 additions
and
9,703 deletions.
There are no files selected for viewing
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,4 +1,4 @@ | ||
| { | ||
| "tabWidth": 4, | ||
| "useTabs": true | ||
| "tabWidth": 2, | ||
| "useTabs": false | ||
| } |
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,85 +1,84 @@ | ||
| import { useEffect,useState } from "react"; | ||
| import { useEffect, useState } from "react"; | ||
| import Image from "next/image"; | ||
| import { useRouter } from "next/router"; | ||
|
|
||
| import { publicPaths } from "~/const"; | ||
| import checkAuth from "~/pages/api/auth/CheckAuth"; | ||
|
|
||
| import { publicPaths } from "../const"; | ||
|
|
||
| // #TODO: finish spinner only when the data loads fully | ||
| // #TODO: Redirect somewhere if the page does not exist | ||
|
|
||
| export default function RouteGuard({ children }) { | ||
| const router = useRouter(); | ||
| const [authorized, setAuthorized] = useState(false); | ||
| const router = useRouter(); | ||
| const [authorized, setAuthorized] = useState(false); | ||
|
|
||
| useEffect(() => { | ||
| // on initial load - run auth check | ||
| (async () => { | ||
| await authCheck(router.asPath); | ||
| })(); | ||
| useEffect(() => { | ||
| // on initial load - run auth check | ||
| (async () => { | ||
| await authCheck(router.asPath); | ||
| })(); | ||
|
|
||
| // on route change start - hide page content by setting authorized to false | ||
| // #TODO: add the loading page when not yet authorized. | ||
| const hideContent = () => setAuthorized(false); | ||
| // const onError = () => setAuthorized(true) | ||
| router.events.on("routeChangeStart", hideContent); | ||
| // router.events.on("routeChangeError", onError); | ||
| // on route change start - hide page content by setting authorized to false | ||
| // #TODO: add the loading page when not yet authorized. | ||
| const hideContent = () => setAuthorized(false); | ||
| // const onError = () => setAuthorized(true) | ||
| router.events.on("routeChangeStart", hideContent); | ||
| // router.events.on("routeChangeError", onError); | ||
|
|
||
| // on route change complete - run auth check | ||
| router.events.on("routeChangeComplete", authCheck); | ||
| // on route change complete - run auth check | ||
| router.events.on("routeChangeComplete", authCheck); | ||
|
|
||
| // unsubscribe from events in useEffect return function | ||
| return () => { | ||
| router.events.off("routeChangeStart", hideContent); | ||
| router.events.off("routeChangeComplete", authCheck); | ||
| // router.events.off("routeChangeError", onError); | ||
| }; | ||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| }, []); | ||
| // unsubscribe from events in useEffect return function | ||
| return () => { | ||
| router.events.off("routeChangeStart", hideContent); | ||
| router.events.off("routeChangeComplete", authCheck); | ||
| // router.events.off("routeChangeError", onError); | ||
| }; | ||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| }, []); | ||
|
|
||
| /** | ||
| * redirect to login page if accessing a private page and not logged in | ||
| * @param {*} url - the url of the page we are trying to go to | ||
| */ | ||
| async function authCheck(url) { | ||
| // Make sure that we don't redirect when the user is on the following pages. | ||
| const path = "/" + url.split("?")[0].split("/")[1]; | ||
| /** | ||
| * redirect to login page if accessing a private page and not logged in | ||
| * @param {*} url - the url of the page we are trying to go to | ||
| */ | ||
| async function authCheck(url) { | ||
| // Make sure that we don't redirect when the user is on the following pages. | ||
| const path = "/" + url.split("?")[0].split("/")[1]; | ||
|
|
||
| // Check if the user is authenticated | ||
| const response = await checkAuth(); | ||
| // #TODO: figure our why sometimes it doesn't output a response | ||
| if (!publicPaths.includes(path)) { | ||
| try { | ||
| if (response.status !== 200) { | ||
| router.push("/login"); | ||
| console.log("Unauthorized to access."); | ||
| setAuthorized(false); | ||
| } else { | ||
| setAuthorized(true); | ||
| console.log("Authorized to access."); | ||
| } | ||
| } catch (error) { | ||
| console.log( | ||
| "Error (probably the authCheck route is stuck again...):", | ||
| error | ||
| ); | ||
| } | ||
| } | ||
| } | ||
| // Check if the user is authenticated | ||
| const response = await checkAuth(); | ||
| // #TODO: figure our why sometimes it doesn't output a response | ||
| if (!publicPaths.includes(path)) { | ||
| try { | ||
| if (response.status !== 200) { | ||
| router.push("/login"); | ||
| console.log("Unauthorized to access."); | ||
| setAuthorized(false); | ||
| } else { | ||
| setAuthorized(true); | ||
| console.log("Authorized to access."); | ||
| } | ||
| } catch (error) { | ||
| console.log( | ||
| "Error (probably the authCheck route is stuck again...):", | ||
| error | ||
| ); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (authorized) { | ||
| return children; | ||
| } else { | ||
| return ( | ||
| <div className="w-screen h-screen bg-bunker-800 flex items-center justify-center"> | ||
| <Image | ||
| src="/images/loading/loading.gif" | ||
| height={70} | ||
| width={120} | ||
| alt="google logo" | ||
| ></Image> | ||
| </div> | ||
| ); | ||
| } | ||
| if (authorized) { | ||
| return children; | ||
| } else { | ||
| return ( | ||
| <div className="w-screen h-screen bg-bunker-800 flex items-center justify-center"> | ||
| <Image | ||
| src="/images/loading/loading.gif" | ||
| height={70} | ||
| width={120} | ||
| alt="google logo" | ||
| ></Image> | ||
| </div> | ||
| ); | ||
| } | ||
| } |
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,15 +1,20 @@ | ||
| import posthog from "posthog-js"; | ||
|
|
||
| import { ENV, POSTHOG_API_KEY, POSTHOG_HOST, TELEMETRY_ENABLED } from "../utilities/config"; | ||
| import { | ||
| ENV, | ||
| POSTHOG_API_KEY, | ||
| POSTHOG_HOST, | ||
| TELEMETRY_ENABLED, | ||
| } from "../utilities/config"; | ||
|
|
||
| export const initPostHog = () => { | ||
| if (typeof window !== "undefined") { | ||
| if (ENV == "production" && TELEMETRY_ENABLED) { | ||
| posthog.init(POSTHOG_API_KEY, { | ||
| api_host: POSTHOG_HOST, | ||
| }); | ||
| } | ||
| } | ||
| if (typeof window !== "undefined") { | ||
| if (ENV == "production" && TELEMETRY_ENABLED) { | ||
| posthog.init(POSTHOG_API_KEY, { | ||
| api_host: POSTHOG_HOST, | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| return posthog; | ||
| return posthog; | ||
| }; |
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.