Merge branch 'refs/heads/frontend'

Md-Rubel-Ahmed-Rana · Jul 6, 2024 · ef3d89c · ef3d89c
2 parents 10b18ec + c9184ad
commit ef3d89c
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 131 deletions.
diff --git a/frontend/src/pages/api/hello.ts b/frontend/src/pages/api/hello.ts
diff --git 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 <div>{loading ? <Loader /> : <CheckoutPage />}</div>;
+  return <CheckoutPage />;
 };
 
 export default CheckoutRoute;

diff --git a/frontend/src/pages/dashboard/index.tsx b/frontend/src/pages/dashboard/index.tsx
@@ -1,36 +1,18 @@
 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 (
     <div className="py-5">
       <GetHead
         title="Dashboard: Team Manager"
         description="team management, project collaboration, task tracking, project details"
         keywords="team management, project collaboration, task tracking, project details"
       />
-      {loading ? <Loader /> : <Dashboard />}
+      <Dashboard />
     </div>
   );
 };

diff --git a/frontend/src/pages/projects/index.tsx b/frontend/src/pages/projects/index.tsx
@@ -1,48 +1,26 @@
 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 (
     <div className="py-5">
       <GetHead
         title="Projects: Team Manager"
         description="team management, project collaboration, task tracking, project details"
         keywords="team management, project collaboration, task tracking, project details"
       />
-      {loading ? (
-        <Loader />
-      ) : (
-        <div>
-          <div className="hidden lg:block">
-            <Projects />
-          </div>
-          <div className="sm:hidden">
-            <ProjectMobileView />
-          </div>
+      <div>
+        <div className="hidden lg:block">
+          <Projects />
         </div>
-      )}
+        <div className="sm:hidden">
+          <ProjectMobileView />
+        </div>
+      </div>
     </div>
   );
 };

diff --git a/frontend/src/pages/teams/[id].tsx b/frontend/src/pages/teams/[id].tsx
@@ -2,47 +2,25 @@ 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 (
     <div className="py-5">
       <GetHead
         title="Team Collaboration: Team Manager"
         description="team management, project collaboration, task tracking, project details"
         keywords="team management, project collaboration, task tracking, project details"
       />
-      {loading ? (
-        <Loader />
-      ) : (
-        <div>
-          <div className="hidden lg:block">
-            <TeamDetailsPage />
-          </div>
-          <div className="md:hidden">
-            <TeamDetailsMobilePage />
-          </div>
+      <div>
+        <div className="hidden lg:block">
+          <TeamDetailsPage />
         </div>
-      )}
+        <div className="md:hidden">
+          <TeamDetailsMobilePage />
+        </div>
+      </div>
     </div>
   );
 };

diff --git a/frontend/src/pages/teams/index.tsx b/frontend/src/pages/teams/index.tsx
@@ -1,36 +1,18 @@
 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 (
     <div>
       <GetHead
         title="Team: Team Manager"
         description="team management, project collaboration, task tracking, project details"
         keywords="team management, project collaboration, task tracking, project details"
       />
-      {loading ? <Loader /> : <Teams />}
+      <Teams />
     </div>
   );
 };