Sfoglia il codice sorgente

Finished bug 1987

bugfix/1987
jovan.cirkovic 3 anni fa
parent
commit
a9ec57876f

+ 11
- 5
src/components/Header/Header.js Vedi File

const { isTablet } = useIsTablet(); const { isTablet } = useIsTablet();
const [logoClicked, setLogoClicked] = useState(false); const [logoClicked, setLogoClicked] = useState(false);
const { t } = useTranslation(); const { t } = useTranslation();
console.log(history.location.pathname.includes("messages"));


// Dont show header on auth routes(login, register, etc.) and admin routes // Dont show header on auth routes(login, register, etc.) and admin routes
useEffect(() => { useEffect(() => {
<LogoHorizontal /> <LogoHorizontal />
</LogoContainer> </LogoContainer>


<SearchInput
ref={searchRef}
handleSearch={handleSearch}
user={user}
/>
{!history.location.pathname.includes("messages") &&
!history.location.pathname.includes("profiles") ? (
<SearchInput
ref={searchRef}
handleSearch={handleSearch}
user={user}
/>
) : (
<></>
)}
{(routeMatches(ABOUT_PAGE) || {(routeMatches(ABOUT_PAGE) ||
(!user && (!user &&
(routeMatches(HOME_PAGE) || routeMatches(BASE_PAGE)))) && ( (routeMatches(HOME_PAGE) || routeMatches(BASE_PAGE)))) && (

+ 1
- 1
src/components/MarketPlace/Offers/Offers.js Vedi File

myOffers={props?.myOffers} myOffers={props?.myOffers}
toggleFilters={props?.toggleFilters} toggleFilters={props?.toggleFilters}
/> />
<OffersSearchField />
<OffersSearchField myOffers={props?.myOffers} offers={offers} />
{!props?.skeleton && <OffersNotFound />} {!props?.skeleton && <OffersNotFound />}
<OffersList <OffersList
loading={props?.skeleton} loading={props?.skeleton}

+ 1
- 1
src/components/MarketPlace/Offers/OffersSearchField/OffersSearchField.js Vedi File

return ( return (
<SearchField <SearchField
searchMyOffers={offers?.search?.searchOffers} searchMyOffers={offers?.search?.searchOffers}
handleSearch={offers?.apply}
handleSearch={offers?.applyFilters}
isAdmin={props?.isAdmin} isAdmin={props?.isAdmin}
offers={offers} offers={offers}
isUsers={props.isUsers} isUsers={props.isUsers}

+ 1
- 0
src/pages/MyOffers/MyOffers.js Vedi File

const toggleFilters = () => { const toggleFilters = () => {
setFiltersOpened((prevFiltersOpened) => !prevFiltersOpened); setFiltersOpened((prevFiltersOpened) => !prevFiltersOpened);
}; };
console.log(offers);
return ( return (
<MyOffersContainer> <MyOffersContainer>
<MainLayout <MainLayout

Loading…
Annulla
Salva