diff --git a/frontend/src/pages/api/hello.ts b/frontend/src/pages/api/hello.ts deleted file mode 100644 index ea77e8f..0000000 --- a/frontend/src/pages/api/hello.ts +++ /dev/null @@ -1,13 +0,0 @@ -// Next.js API route support: https://nextjs.org/docs/api-routes/introduction -import type { NextApiRequest, NextApiResponse } from "next"; - -type Data = { - name: string; -}; - -export default function handler( - req: NextApiRequest, - res: NextApiResponse, -) { - res.status(200).json({ name: "John Doe" }); -} diff --git a/frontend/src/pages/checkout/[id].tsx b/frontend/src/pages/checkout/[id].tsx index 3f2108c..72904ff 100644 --- a/frontend/src/pages/checkout/[id].tsx +++ b/frontend/src/pages/checkout/[id].tsx @@ -1,28 +1,10 @@ import CheckoutPage from "@/components/pages/checkout/Checkout"; import RootLayout from "@/layout/RootLayout"; import { NextPageWithLayout } from "pages/_app"; -import React, { ReactElement, useEffect, useState } from "react"; -import Cookies from "js-cookie"; -import { useRouter } from "next/router"; -import Loader from "@/components/shared/Loader"; +import React, { ReactElement } from "react"; const CheckoutRoute: NextPageWithLayout = () => { - const [loading, setLoading] = useState(true); - const router = useRouter(); - useEffect(() => { - const handleAuth = async () => { - setLoading(true); - const isLoggedIn = Cookies.get("tmAccessToken"); - if (!isLoggedIn) { - setLoading(false); - return router.push("/login"); - } else { - setLoading(false); - } - }; - handleAuth(); - }, [router]); - return
{loading ? : }
; + return ; }; export default CheckoutRoute; diff --git a/frontend/src/pages/dashboard/index.tsx b/frontend/src/pages/dashboard/index.tsx index 3673f7e..23bb2bc 100644 --- a/frontend/src/pages/dashboard/index.tsx +++ b/frontend/src/pages/dashboard/index.tsx @@ -1,28 +1,10 @@ import Dashboard from "@/components/pages/dashboard"; import RootLayout from "@/layout/RootLayout"; import { NextPageWithLayout } from "pages/_app"; -import React, { ReactElement, useEffect, useState } from "react"; -import Cookies from "js-cookie"; -import { useRouter } from "next/router"; -import Loader from "@/components/shared/Loader"; +import React, { ReactElement } from "react"; import GetHead from "@/utils/Head"; const DashboardPage: NextPageWithLayout = () => { - const [loading, setLoading] = useState(true); - const router = useRouter(); - useEffect(() => { - const handleAuth = async () => { - setLoading(true); - const isLoggedIn = Cookies.get("tmAccessToken"); - if (isLoggedIn === "undefined") { - setLoading(false); - return router.push("/login"); - } else { - setLoading(false); - } - }; - handleAuth(); - }, [router]); return (
{ description="team management, project collaboration, task tracking, project details" keywords="team management, project collaboration, task tracking, project details" /> - {loading ? : } +
); }; diff --git a/frontend/src/pages/projects/index.tsx b/frontend/src/pages/projects/index.tsx index dbf187f..9d51af8 100644 --- a/frontend/src/pages/projects/index.tsx +++ b/frontend/src/pages/projects/index.tsx @@ -1,29 +1,11 @@ import Projects from "@/components/pages/projects/desktop/ProjectPage"; import RootLayout from "@/layout/RootLayout"; -import { useRouter } from "next/router"; import { NextPageWithLayout } from "pages/_app"; -import React, { ReactElement, useEffect, useState } from "react"; -import Cookies from "js-cookie"; -import Loader from "@/components/shared/Loader"; +import React, { ReactElement } from "react"; import GetHead from "@/utils/Head"; import ProjectMobileView from "@/components/pages/projects/mobile/project/ProjectMobileView"; const ProjectPage: NextPageWithLayout = () => { - const [loading, setLoading] = useState(true); - const router = useRouter(); - useEffect(() => { - setLoading(true); - const handleAuth = async () => { - const isLoggedIn = Cookies.get("tmAccessToken"); - if (!isLoggedIn) { - setLoading(false); - return router.push("/login"); - } else { - setLoading(false); - } - }; - handleAuth(); - }, [router]); return (
{ description="team management, project collaboration, task tracking, project details" keywords="team management, project collaboration, task tracking, project details" /> - {loading ? ( - - ) : ( -
-
- -
-
- -
+
+
+
- )} +
+ +
+
); }; diff --git a/frontend/src/pages/teams/[id].tsx b/frontend/src/pages/teams/[id].tsx index 8b4a360..b477665 100644 --- a/frontend/src/pages/teams/[id].tsx +++ b/frontend/src/pages/teams/[id].tsx @@ -2,28 +2,10 @@ import TeamDetailsPage from "@/components/pages/teams/showTeam/TeamDetailsPage"; import RootLayout from "@/layout/RootLayout"; import { NextPageWithLayout } from "pages/_app"; import React, { ReactElement, useEffect, useState } from "react"; -import Cookies from "js-cookie"; -import { useRouter } from "next/router"; -import Loader from "@/components/shared/Loader"; import GetHead from "@/utils/Head"; import TeamDetailsMobilePage from "@/components/pages/teams/mobile"; const TeamDetails: NextPageWithLayout = () => { - const [loading, setLoading] = useState(true); - const router = useRouter(); - useEffect(() => { - const handleAuth = async () => { - setLoading(true); - const isLoggedIn = Cookies.get("tmAccessToken"); - if (!isLoggedIn) { - setLoading(false); - return router.push("/login"); - } else { - setLoading(false); - } - }; - handleAuth(); - }, [router]); return (
{ description="team management, project collaboration, task tracking, project details" keywords="team management, project collaboration, task tracking, project details" /> - {loading ? ( - - ) : ( -
-
- -
-
- -
+
+
+
- )} +
+ +
+
); }; diff --git a/frontend/src/pages/teams/index.tsx b/frontend/src/pages/teams/index.tsx index 58c07df..2978b2d 100644 --- a/frontend/src/pages/teams/index.tsx +++ b/frontend/src/pages/teams/index.tsx @@ -1,28 +1,10 @@ import Teams from "@/components/pages/teams/showTeam/TeamPage"; import RootLayout from "@/layout/RootLayout"; -import { useRouter } from "next/router"; import { NextPageWithLayout } from "pages/_app"; import React, { ReactElement, useEffect, useState } from "react"; -import Cookies from "js-cookie"; -import Loader from "@/components/shared/Loader"; import GetHead from "@/utils/Head"; const TeamPage: NextPageWithLayout = () => { - const [loading, setLoading] = useState(true); - const router = useRouter(); - useEffect(() => { - const handleAuth = async () => { - setLoading(true); - const isLoggedIn = Cookies.get("tmAccessToken"); - if (!isLoggedIn) { - setLoading(false); - return router.push("/login"); - } else { - setLoading(false); - } - }; - handleAuth(); - }, [router]); return (
{ description="team management, project collaboration, task tracking, project details" keywords="team management, project collaboration, task tracking, project details" /> - {loading ? : } +
); };