Merge branch 'master' into CodeLabzAppBar

scorelab · Jul 14, 2023 · e74907c · e74907c
2 parents 55dd68f + 6446e9e
commit e74907c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/cypress/e2e/components/auth/forgotPassword/forgotpassword.cy.js b/cypress/e2e/components/auth/forgotPassword/forgotpassword.cy.js
@@ -23,9 +23,7 @@ describe("Forgot Password Page | CodeLabz", () => {
 
   it("empty email ", function () {
     cy.visit(`${this.base_url}forgotpassword`);
-    cy.get("[data-testId=forgotPasswordButton]").click();
-    cy.contains("The email address is badly formatted.");
-    cy.should('be.disabled')
+    cy.get("[data-testId=forgotPasswordButton]").should('be.disabled');
   });
   it("successfull ", function () {
     cy.visit(`${this.base_url}forgotpassword`);

diff --git a/src/components/NavBar/new/MiniNavbar/index.jsx b/src/components/NavBar/new/MiniNavbar/index.jsx
@@ -8,6 +8,7 @@ import {
 } from "@mui/material";
 import { makeStyles } from "@mui/styles";
 import React, { useCallback, useEffect, useRef, useState } from "react";
+import { useLocation } from 'react-router-dom';
 import Headroom from "react-headroom";
 import BrandName from "../../../../helpers/brandName";
 import SearchIcon from "@mui/icons-material/Search";
@@ -74,6 +75,11 @@ function MiniNavbar() {
 
   const windowSize = useWindowSize();
 
+  const location = useLocation();
+  const routeName = location.pathname; 
+
+  const excludedRoutes = ['/login', '/signup']
+
   const toggleDrawer = useCallback(state => {
     setOpenDrawer(state);
   }, []);
@@ -135,7 +141,8 @@ function MiniNavbar() {
               </IconButton>
             </Grid>
           </Grid>
-          <Grid style={{ display: "inline-block" }} item xs={12} md={4}>
+          {!excludedRoutes.includes(routeName) && 
+            <Grid style={{ display: "inline-block" }} item xs={12} md={4}>
             <Paper component={"form"} className={classes.root} elevation={0}>
               <IconButton
                 type="submit"
@@ -159,7 +166,7 @@ function MiniNavbar() {
                 placeholder="Search..."
               />
             </Paper>
-          </Grid>
+          </Grid>}
           <Grid item className={classes.gridButton}>
             <Button
               variant="contained"