Fixed minor bugs

src/assets/styles/_base.scss

@@ -34,6 +34,10 @@ body,
   flex: 1 0 auto;
 }
 
+#root {
+  margin-top: 80px;
+}
+
 input[type='search']::-webkit-search-decoration,
 input[type='search']::-webkit-search-cancel-button,
 input[type='search']::-webkit-search-results-button,

src/components/Buttons/PrimaryButton/PrimaryButton.js

@@ -6,7 +6,6 @@ import {
 } from "./PrimaryButton.styled";
 
 export const PrimaryButton = (props) => {
-  console.log(props);
   return (
     <PrimaryButtonContainer
       style={props.containerStyle}

src/components/Header/Header.js

@@ -1,4 +1,4 @@
-import React, { useState, useMemo } from "react";
+import React, { useState, useMemo, useEffect, useRef } from "react";
 import {
   AddOfferButton,
   DrawerContainer,
@@ -34,12 +34,17 @@ import selectedTheme from "../../themes";
 import { useTranslation } from "react-i18next";
 import { IconButton } from "../Buttons/IconButton/IconButton";
 import { Icon } from "../Icon/Icon";
+import { useSelector } from "react-redux";
+import { selectJWTToken } from "../../store/selectors/loginSelectors";
 
 const Header = () => {
   const [openDrawer, setOpenDrawer] = useState(false);
   const { t } = useTranslation();
   const theme = useTheme();
+  const searchRef = useRef(null);
   const matches = useMediaQuery(theme.breakpoints.down("md"));
+  const user = useSelector(selectJWTToken);
+
 
   const handleToggleDrawer = () => {
     setOpenDrawer(!openDrawer);
@@ -54,6 +59,41 @@ const Header = () => {
   const [userPopoverOpen, setUserPopoverOpen] = useState(false);
   const [userAnchorEl, setUserAnchorEl] = useState(null);
 
+  const [shouldShow, setShouldShow] = useState(true);
+
+  useEffect(() => {
+    let shouldShowHeader = true;
+    if (
+      location.pathname === "/login" ||
+      location.pathname === "/register" ||
+      location.pathname === "/forgot-password" ||
+      location.pathname === "/reset-password"
+    ) {
+      shouldShowHeader = false;
+    }
+    console.log(user);
+    if (location.pathname === "/" && user.JwtToken?.length === 0) {
+      shouldShowHeader = false;
+    }
+    setShouldShow(shouldShowHeader);
+  }, [location, user]);
+
+  // let listener;
+  const handleFocusSearch = () => {
+    // console.log('focus');
+    // listener = (event) => {
+    //   if (event.keyCode === 13) {
+    //     event.preventDefault();
+    //     console.log('detektovano');
+    //   }
+    // }
+    // searchRef.current.addEventListener('keyup', listener);
+  }
+  const handleBlurSearch = () => {
+    // console.log('blur');
+    // searchRef.current.removeEventListener('keyup', listener);
+  }
+
   const drawerContent = useMemo(
     () => (
       <DrawerContainer>
@@ -112,6 +152,7 @@ const Header = () => {
       elevation={0}
       positionFixed
       sx={{ backgroundColor: "white"}}
+      style={{display: shouldShow ? "flex" : "none"}}
     >
       <Toolbar>
         <ToolsContainer>
@@ -135,6 +176,9 @@ const Header = () => {
               ),
             }}
             label={t("header.searchOffers")}
+            onFocus={handleFocusSearch}
+            onBlur={handleBlurSearch}
+            ref={searchRef}
           />
           <ToolsButtonsContainer mobile={matches}>
             {matches ? (

src/components/TextFields/TextField/TextField.js

@@ -41,6 +41,8 @@ export const TextField = (props) => {
         InputProps={props.InputProps}
         sx={props.style}
         label={props.showAnimation ? props.placeholder : ""}
+        onFocus={props.onFocus}
+        onBlur={props.onBlur}
         
         
         italicplaceholder={(props.italicPlaceholder && isFieldEmpty) ? "true" : "false"}
@@ -85,6 +87,8 @@ TextField.propTypes = {
   ref: PropTypes.any,
   minRows: PropTypes.number,
   multiline: PropTypes.bool,
+  onFocus: PropTypes.onFocus,
+  onBlur: PropTypes.onBlur,
   focused: PropTypes.bool,
   InputProps: PropTypes.shape({
     startAdornment: PropTypes.node,

src/pages/HomePage/HomePageMUI.js

@@ -1,5 +1,4 @@
 import React from "react";
-import Navbar from "../../components/MUI/NavbarComponent";
 // import FilterCard from "../../components/Cards/FilterCard/FilterCard";
 import { HomePageContainer } from "./HomePage.styled";
 // import MarketPlace from "../../components/MarketPlace/MarketPlace";
@@ -62,7 +61,6 @@ const HomePage = () => {
 
   return (
     <HomePageContainer>
-      <Navbar />
       <MainLayout leftCard={<FilterCard />} content={<MarketPlace />} />
     </HomePageContainer>
   );