瀏覽代碼

Finished bug 1987

bugfix/1987
jovan.cirkovic 3 年之前
父節點
當前提交
a9ec57876f

+ 11
- 5
src/components/Header/Header.js 查看文件

@@ -61,6 +61,7 @@ const Header = () => {
const { isTablet } = useIsTablet();
const [logoClicked, setLogoClicked] = useState(false);
const { t } = useTranslation();
console.log(history.location.pathname.includes("messages"));

// Dont show header on auth routes(login, register, etc.) and admin routes
useEffect(() => {
@@ -164,11 +165,16 @@ const Header = () => {
<LogoHorizontal />
</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) ||
(!user &&
(routeMatches(HOME_PAGE) || routeMatches(BASE_PAGE)))) && (

+ 1
- 1
src/components/MarketPlace/Offers/Offers.js 查看文件

@@ -19,7 +19,7 @@ const Offers = (props) => {
myOffers={props?.myOffers}
toggleFilters={props?.toggleFilters}
/>
<OffersSearchField />
<OffersSearchField myOffers={props?.myOffers} offers={offers} />
{!props?.skeleton && <OffersNotFound />}
<OffersList
loading={props?.skeleton}

+ 1
- 1
src/components/MarketPlace/Offers/OffersSearchField/OffersSearchField.js 查看文件

@@ -10,7 +10,7 @@ const OffersSearchField = (props) => {
return (
<SearchField
searchMyOffers={offers?.search?.searchOffers}
handleSearch={offers?.apply}
handleSearch={offers?.applyFilters}
isAdmin={props?.isAdmin}
offers={offers}
isUsers={props.isUsers}

+ 1
- 0
src/pages/MyOffers/MyOffers.js 查看文件

@@ -19,6 +19,7 @@ const MyOffers = () => {
const toggleFilters = () => {
setFiltersOpened((prevFiltersOpened) => !prevFiltersOpened);
};
console.log(offers);
return (
<MyOffersContainer>
<MainLayout

Loading…
取消
儲存