Merge pull request #149 from WildCodeSchool/fix/147/bugfix-admin-rout…

…e-protection

typo role ADMIN into Admin

.gitignore

@@ -1,2 +1,3 @@
 .env
 img/node_modules
+frontend/src/generated/graphql-types.ts

frontend/src/components/AdminRouteProtection.tsx

@@ -1,11 +1,12 @@
 import { useContext } from "react";
 import { Navigate } from "react-router-dom";
 import { UserContext } from "./Layout";
+import { Role } from "../interface/types";
 
 function AdminRouteProtection({ children }: { children: React.ReactNode }) {
   const userInfo = useContext(UserContext);
 
-  if (!userInfo.isLoggedIn || userInfo.role !== "ADMIN") {
+  if (!userInfo.isLoggedIn || userInfo.role !== Role.Admin) {
     return <Navigate to="/" replace />;
   }
 

frontend/src/components/Navbar.tsx

@@ -9,9 +9,10 @@ import {
 import { Input, Button, message } from "antd";
 import { Link } from "react-router-dom";
 import { UserContext } from "../components/Layout";
-import { Role, useLogoutLazyQuery } from "../generated/graphql-types";
+import { useLogoutLazyQuery } from "../generated/graphql-types";
 import Logo from "../assets/logo.png";
 import RangePicker from "./RangePicker";
+import { Role } from "../interface/types";
 
 const { Search } = Input;
 
@@ -27,14 +28,13 @@ function Navbar() {
   ];
 
   const onSearch = (value?: string) => {
-    console.log("value", value)
     if (value) {
-      navigate(`/search/${value}`)
+      navigate(`/search/${value}`);
     } else {
-      navigate("/search")
+      navigate("/search");
     }
-  }
-  
+  };
+
   return (
     <div className="flex flex-col p-4 bg-lightBlue">
       <div className="flex justify-between items-center">

frontend/src/interface/types.tsx

@@ -61,7 +61,7 @@ export interface NewProductFormValues {
 export type Article = {
   id: number;
   product?: ProductCard;
-  reservations?: Reservation[] | null
+  reservations?: Reservation[] | null;
 };
 
 export type Reservation = {
@@ -78,3 +78,8 @@ export type Reservation = {
 export type ReservationData = Reservation & {
   totalPrice?: number;
 };
+
+export enum Role {
+  Admin = "Admin",
+  User = "User",
+}