Fix eslint errors

con2 · Dec 15, 2024 · dc5ea0d · dc5ea0d
1 parent f739bb5
commit dc5ea0d
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 18 deletions.
diff --git a/client/src/components/KompassiLoginCallback.tsx b/client/src/components/KompassiLoginCallback.tsx
@@ -3,6 +3,7 @@ import { useNavigate, useSearchParams } from "react-router";
 import { submitKompassiLogin } from "client/views/login/loginThunks";
 import { useAppDispatch } from "client/utils/hooks";
 import { Loading } from "client/components/Loading";
+import { AppRoute } from "client/app/AppRoutes";
 
 export const KompassiLoginCallback = (): ReactElement => {
   const dispatch = useAppDispatch();
@@ -18,15 +19,15 @@ export const KompassiLoginCallback = (): ReactElement => {
       if (code) {
         const errorMessage = await dispatch(submitKompassiLogin(code));
         if (errorMessage) {
-          navigate(`/login?error=${errorMessage}`);
+          await navigate(`${AppRoute.LOGIN}?error=${errorMessage}`);
           return;
         }
       }
       if (error) {
-        navigate(`/login`);
+        await navigate(AppRoute.LOGIN);
         return;
       }
-      navigate(`/`);
+      await navigate(AppRoute.ROOT);
     };
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     fetchData();

diff --git a/client/src/utils/navigation.ts b/client/src/utils/navigation.ts
@@ -1,4 +1,5 @@
 import { NavigateFunction } from "react-router";
+import { AppRoute } from "client/app/AppRoutes";
 
 // Navigate to previous page or front page if no previous page exists
 export const navigateToPreviousOrRoot = async (
@@ -9,5 +10,5 @@ export const navigateToPreviousOrRoot = async (
   if (history.state?.idx > 0) {
     await navigate(-1);
   }
-  await navigate("/");
+  await navigate(AppRoute.ROOT);
 };
diff --git a/client/src/views/login/LoginView.tsx b/client/src/views/login/LoginView.tsx
@@ -6,6 +6,7 @@ import { useAppSelector } from "client/utils/hooks";
 import { LoginProvider } from "shared/config/eventConfigTypes";
 import { KompassiLogin } from "client/views/login/components/KompassiLogin";
 import { Button, ButtonStyle } from "client/components/Button";
+import { AppRoute } from "client/app/AppRoutes";
 
 export const LoginView = (): ReactElement => {
   const { t } = useTranslation();
@@ -19,8 +20,12 @@ export const LoginView = (): ReactElement => {
   const adminLogin = location.pathname === "/admin/login";
 
   useEffect(() => {
+    const navigateToRoot = async (): Promise<void> => {
+      await navigate(AppRoute.ROOT);
+    };
     if (loggedIn) {
-      navigate("/");
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      navigateToRoot();
     }
   }, [loggedIn, navigate]);
 

diff --git a/client/src/views/my-program-items/components/DirectSignupItem.tsx b/client/src/views/my-program-items/components/DirectSignupItem.tsx
@@ -21,6 +21,7 @@ import {
 } from "client/views/my-program-items/components/shared";
 import { ErrorMessage } from "client/components/ErrorMessage";
 import { InfoText, InfoTextVariant } from "client/components/InfoText";
+import { AppRoute } from "client/app/AppRoutes";
 
 interface Props {
   signup: Signup;
@@ -113,17 +114,19 @@ export const DirectSignupItem = ({
         <StyledButtonContainer>
           <TertiaryButton
             icon="circle-arrow-right"
-            onClick={() => {
-              navigate(`/program/item/${signup.programItem.programItemId}`);
+            onClick={async () => {
+              await navigate(
+                `${AppRoute.PROGRAM_ITEM}/${signup.programItem.programItemId}`,
+              );
             }}
           >
             {t("button.showInfo")}
           </TertiaryButton>
           <TertiaryButton
             icon="ticket"
-            onClick={() => {
-              navigate(
-                `/program/item/${signup.programItem.programItemId}/admission`,
+            onClick={async () => {
+              await navigate(
+                `${AppRoute.PROGRAM_ITEM}/${signup.programItem.programItemId}/admission`,
               );
             }}
           >

diff --git a/client/src/views/my-program-items/components/FavoritesByStartTimes.tsx b/client/src/views/my-program-items/components/FavoritesByStartTimes.tsx
@@ -15,6 +15,7 @@ import {
   MyProgramListItem,
   MyProgramTime,
 } from "client/views/my-program-items/components/shared";
+import { AppRoute } from "client/app/AppRoutes";
 
 interface Props {
   programItems: readonly ProgramItem[];
@@ -62,9 +63,9 @@ export const FavoritesByStartTimes = ({
                       <MyProgramButtonContainer>
                         <TertiaryButton
                           icon="circle-arrow-right"
-                          onClick={() => {
-                            navigate(
-                              `/program/item/${programItem.programItemId}`,
+                          onClick={async () => {
+                            await navigate(
+                              `${AppRoute.PROGRAM_ITEM}/${programItem.programItemId}`,
                             );
                           }}
                         >

diff --git a/client/src/views/my-program-items/components/LotterySignupsByStartTimes.tsx b/client/src/views/my-program-items/components/LotterySignupsByStartTimes.tsx
@@ -14,6 +14,7 @@ import {
   MyProgramTime,
 } from "client/views/my-program-items/components/shared";
 import { TertiaryButton } from "client/components/TertiaryButton";
+import { AppRoute } from "client/app/AppRoutes";
 
 interface Props {
   lotterySignups: Signup[];
@@ -54,9 +55,9 @@ export const LotterySignupsByStartTimes = ({
                         <StyledButtons>
                           <TertiaryButton
                             icon="circle-arrow-right"
-                            onClick={() => {
-                              navigate(
-                                `/program/item/${signup.programItem.programItemId}`,
+                            onClick={async () => {
+                              await navigate(
+                                `${AppRoute.PROGRAM_ITEM}/${signup.programItem.programItemId}`,
                               );
                             }}
                           >

diff --git a/client/src/views/profile/ProfileView.tsx b/client/src/views/profile/ProfileView.tsx
@@ -6,6 +6,7 @@ import { ChangePasswordForm } from "client/views/helper/components/ChangePasswor
 import { useAppSelector } from "client/utils/hooks";
 import { Button, ButtonStyle } from "client/components/Button";
 import { LoginProvider } from "shared/config/eventConfigTypes";
+import { AppRoute } from "client/app/AppRoutes";
 
 export const ProfileView = (): ReactElement => {
   const { t } = useTranslation();
@@ -30,7 +31,7 @@ export const ProfileView = (): ReactElement => {
         )}
         <StyledButton
           buttonStyle={ButtonStyle.SECONDARY}
-          onClick={() => navigate("/logout")}
+          onClick={() => navigate(AppRoute.LOGOUT)}
         >
           {t("button.logout")}
         </StyledButton>

diff --git a/client/src/views/program-item/signup/components/AdmissionTicketLink.tsx b/client/src/views/program-item/signup/components/AdmissionTicketLink.tsx
@@ -3,6 +3,7 @@ import { NavLink } from "react-router";
 import { useTranslation } from "react-i18next";
 import styled from "styled-components";
 import { Button, ButtonStyle } from "client/components/Button";
+import { AppRoute } from "client/app/AppRoutes";
 
 interface Props {
   programItemId: string;
@@ -11,7 +12,7 @@ export const AdmissionTicketLink = ({ programItemId }: Props): ReactElement => {
   const { t } = useTranslation();
 
   return (
-    <StyledLink to={`/program/item/${programItemId}/admission`}>
+    <StyledLink to={`${AppRoute.PROGRAM_ITEM}/${programItemId}/admission`}>
       <StyledButton buttonStyle={ButtonStyle.PRIMARY}>
         {t("button.showAdmissionTicket")}
       </StyledButton>