Преглед изворни кода

Ready for demo

feature/646
Djordje Mitrovic пре 3 година
родитељ
комит
b2c77225fc

+ 1
- 1
src/components/Cards/CreateOfferCard/SecondPart/SecondPartCreateOffer.js Прегледај датотеку

props?.offer, props?.offer,
images images
); );
}, [props?.informations, props?.offer, images]);
}, [props?.informations, props?.offer]);


useEffect(() => { useEffect(() => {
formik.setFieldValue("images", images); formik.setFieldValue("images", images);

+ 1
- 1
src/components/Cards/OfferCard/OfferCard.styled.js Прегледај датотеку

height: 16px; height: 16px;
position: relative; position: relative;
top: -3px; top: -3px;
left: -2.4px;
left: -3.5px;
} }
} }
`; `;

+ 1
- 0
src/components/Header/Drawer/Buttons/PrivacyPolicyButton/PrivacyPolicyButton.js Прегледај датотеку

} from "./PrivacyPolicyButton.styled"; } from "./PrivacyPolicyButton.styled";
import { ABOUT_PAGE } from "../../../../../constants/pages"; import { ABOUT_PAGE } from "../../../../../constants/pages";
import scrollConstants from "../../../../../constants/scrollConstants"; import scrollConstants from "../../../../../constants/scrollConstants";
import history from "../../../../../store/utils/history";


const PrivacyPolicyButton = (props) => { const PrivacyPolicyButton = (props) => {
const { t } = useTranslation(); const { t } = useTranslation();

+ 33
- 10
src/components/MarketPlace/Header/Header.js Прегледај датотеку

import React, { useMemo } from "react"; import React, { useMemo } from "react";
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { import {
ButtonContainer,
// ButtonContainer, // ButtonContainer,
CategoryHeaderIcon, CategoryHeaderIcon,
HeaderAltLocation, HeaderAltLocation,
HeaderOptions, HeaderOptions,
HeaderSelect, HeaderSelect,
HeaderSubcategoryString, HeaderSubcategoryString,
HeaderText,
// HeaderText, // HeaderText,
HeaderTitleContainer, HeaderTitleContainer,
HeaderTitleText, HeaderTitleText,
import { useSelector } from "react-redux"; import { useSelector } from "react-redux";
import { selectHeaderString } from "../../../store/selectors/filtersSelectors"; import { selectHeaderString } from "../../../store/selectors/filtersSelectors";
import useIsMobile from "../../../hooks/useIsMobile"; import useIsMobile from "../../../hooks/useIsMobile";
import { ArrowButton } from "../../Buttons/ArrowButton/ArrowButton";
// import { ArrowButton } from "../../Buttons/ArrowButton/ArrowButton"; // import { ArrowButton } from "../../Buttons/ArrowButton/ArrowButton";
// import history from "../../../store/utils/history";
import history from "../../../store/utils/history";


const DownArrow = (props) => ( const DownArrow = (props) => (
<IconStyled {...props}> <IconStyled {...props}>
props.offers.filters.locations.clear(); props.offers.filters.locations.clear();
props.offers.applyFilters(); props.offers.applyFilters();
}; };
const goBack = () => {
history.goBack();
};


return ( return (
<> <>
<CategoryHeaderIcon /> <CategoryHeaderIcon />
<HeaderLocation> <HeaderLocation>
{/* {headerString} */} {/* {headerString} */}
<HeaderCategoryString component="span" onClick={handleClickCategory}>
<HeaderCategoryString
component="span"
onClick={handleClickCategory}
>
{headerString.categoryString} {headerString.categoryString}
{headerString.subcategoryString && <>&nbsp;</>}
{/* {headerString.subcategoryString && <>&nbsp;</>} */}
</HeaderCategoryString> </HeaderCategoryString>
<HeaderSubcategoryString component="span" onClick={handleClickSubcategory}>
<HeaderSubcategoryString
component="span"
onClick={handleClickSubcategory}
>
{headerString.subcategoryString} {headerString.subcategoryString}
{headerString.locationsString && <>&nbsp;</>}
{/* {headerString.locationsString && <>&nbsp;</>} */}
</HeaderSubcategoryString> </HeaderSubcategoryString>
<HeaderLocationsString component="span"> <HeaderLocationsString component="span">
<HeaderLocationsMainString component="span"> <HeaderLocationsMainString component="span">
{headerString.locationsString} {headerString.locationsString}
</HeaderLocationsMainString> </HeaderLocationsMainString>
<HeaderAltLocation component="span">{altString}</HeaderAltLocation>
<HeaderAltLocation component="span">
{altString}
</HeaderAltLocation>
</HeaderLocationsString> </HeaderLocationsString>
</HeaderLocation> </HeaderLocation>
</> </>
) : ( ) : (
<HeaderTitleContainer>
<SwapsHeaderIcon />
<HeaderTitleText>{t("header.myOffers")}</HeaderTitleText>
</HeaderTitleContainer>
<>
{!isMobile ? (
<HeaderTitleContainer>
<SwapsHeaderIcon />
<HeaderTitleText>{t("header.myOffers")}</HeaderTitleText>
</HeaderTitleContainer>
) : (
<ButtonContainer onClick={goBack}>
<ArrowButton side={"left"}></ArrowButton>
<HeaderText>{t("messages.goBack")}</HeaderText>
</ButtonContainer>
)}
</>
)} )}
</TooltipInnerContainer> </TooltipInnerContainer>
</Tooltip> </Tooltip>

+ 1
- 1
src/components/Paging/Paging.styled.js Прегледај датотеку

min-width: 30px; min-width: 30px;
max-width: 30px; max-width: 30px;
width: 30px !important; width: 30px !important;
padding-top: 6px;
padding-top: 5px;
font-size: 14px; font-size: 14px;
margin: 1px; margin: 1px;
} }

+ 0
- 15
src/components/Popovers/MyPosts/MyPosts.js Прегледај датотеку

import React, { useEffect, useState } from "react"; import React, { useEffect, useState } from "react";
import { EyeIcon, PostsImgSuit } from "./MyPosts.styled"; import { EyeIcon, PostsImgSuit } from "./MyPosts.styled";
import PropTypes from "prop-types"; import PropTypes from "prop-types";

// const dummyData2 = [
// {
// alt: "Remy Sharp",
// src: "/static/images/avatar/1.jpg",
// title: "Gitara",
// text: (<React.Fragment><PostsImgSuit/> Player.rs</React.Fragment>)
// },
// {
// alt: "Remy Sharp",
// src: "/static/images/avatar/1.jpg",
// title: "Gitara",
// text: (<React.Fragment><PostsImgSuit/> Player.rs</React.Fragment>)
// }
// ]
import HeaderPopover from "../HeaderPopover/HeaderPopover"; import HeaderPopover from "../HeaderPopover/HeaderPopover";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { useDispatch, useSelector } from "react-redux"; import { useDispatch, useSelector } from "react-redux";

+ 1
- 0
src/i18n/resources/rs.js Прегледај датотеку

labelNameRequired: "Ime firme je obavezno!", labelNameRequired: "Ime firme je obavezno!",
labelPIBRequired: "PIB firme je obavezan!", labelPIBRequired: "PIB firme je obavezan!",
labelLocationRequired: "Lokacija je obavezna!", labelLocationRequired: "Lokacija je obavezna!",
labelLocationValid: "Unesite ispravnu lokaciju!",
labelPhoneValid: "Unesite validan broj telefona", labelPhoneValid: "Unesite validan broj telefona",
labelPhoneRequired: "Broj telefona je obavezan!", labelPhoneRequired: "Broj telefona je obavezan!",
}, },

+ 2
- 2
src/layouts/ProfileLayout/ProfileLayout.styled.js Прегледај датотеку

/* flex: 1; */ /* flex: 1; */
height: 100%; height: 100%;
@media (max-width: 1200px) { @media (max-width: 1200px) {
padding-right: ${(props) => (props.profile ? 0 : "36px")};
padding-right: 36px;
} }
@media (max-width: 600px) { @media (max-width: 600px) {
padding-left: 18px; padding-left: 18px;
padding-right: ${(props) => (props.profile ? 0 : "18px")};
padding-right: 18px;
} }
`; `;



Loading…
Откажи
Сачувај