| @@ -140,7 +140,7 @@ const FirstPartCreateOffer = (props) => { | |||
| }} | |||
| value={formik.values.location} | |||
| > | |||
| <SelectOption value="default"> | |||
| <SelectOption style={{ display: "none" }} value="default"> | |||
| {t("offer.choseLocation")} | |||
| </SelectOption> | |||
| {locations.map((loc) => { | |||
| @@ -160,7 +160,7 @@ const FirstPartCreateOffer = (props) => { | |||
| }} | |||
| value={formik.values.category} | |||
| > | |||
| <SelectOption value="default"> | |||
| <SelectOption style={{ display: "none" }} value="default"> | |||
| {t("offer.choseCategory")} | |||
| </SelectOption> | |||
| {categories.map((cat, i) => { | |||
| @@ -184,7 +184,7 @@ const FirstPartCreateOffer = (props) => { | |||
| }} | |||
| value={formik.values.subcategory} | |||
| > | |||
| <SelectOption value="default"> | |||
| <SelectOption style={{ display: "none" }} value="default"> | |||
| {t("offer.choseSubcategory")} | |||
| </SelectOption> | |||
| {subcat && | |||
| @@ -82,7 +82,8 @@ const SecondPartCreateOffer = (props) => { | |||
| const formik = useFormik({ | |||
| initialValues: { | |||
| images: images, | |||
| condition: props.informations?.condition || "default", | |||
| condition: | |||
| props.informations?.condition || props.offer?.condition || "default", | |||
| }, | |||
| validationSchema: Yup.object().shape({ | |||
| condition: Yup.string() | |||
| @@ -121,7 +122,7 @@ const SecondPartCreateOffer = (props) => { | |||
| }} | |||
| value={formik.values.condition} | |||
| > | |||
| <SelectOption value="default"> | |||
| <SelectOption style={{ display: "none" }} value="default"> | |||
| {t("offer.choseCondition")} | |||
| </SelectOption> | |||
| {Object.keys(conditionSelectEnum).map((key) => { | |||
| @@ -5,6 +5,7 @@ import { | |||
| ItemDetailsCardContainer, | |||
| OfferInfo, | |||
| Info, | |||
| DateButtonsContainer, | |||
| ButtonsContainer, | |||
| PostDate, | |||
| CategoryIcon, | |||
| @@ -98,8 +99,8 @@ const ItemDetailsCard = (props) => { | |||
| value={offer?.offer?.views?.count} | |||
| /> | |||
| </Info> | |||
| <PostDate> | |||
| {date} | |||
| <DateButtonsContainer> | |||
| <PostDate>{date}</PostDate> | |||
| {isMyProfile && ( | |||
| <ButtonsContainer> | |||
| <EditDeleteButtons> | |||
| @@ -112,7 +113,7 @@ const ItemDetailsCard = (props) => { | |||
| </EditDeleteButtons> | |||
| </ButtonsContainer> | |||
| )} | |||
| </PostDate> | |||
| </DateButtonsContainer> | |||
| </OfferInfo> | |||
| <OfferDetails | |||
| offer={offer} | |||
| @@ -52,6 +52,8 @@ export const ButtonsContainer = styled(Box)` | |||
| @media screen and (max-width: 600px) { | |||
| position: absolute; | |||
| top: 75px; | |||
| right: 143px; | |||
| } | |||
| `; | |||
| @@ -60,8 +62,6 @@ export const EditDeleteButtons = styled(Box)` | |||
| @media screen and (max-width: 600px) { | |||
| position: absolute; | |||
| right: -310px; | |||
| top: -265px; | |||
| } | |||
| `; | |||
| export const EditIconContainer = styled(IconButton)` | |||
| @@ -113,12 +113,15 @@ export const RemoveIcon = styled(Remove)` | |||
| } | |||
| `; | |||
| export const DateButtonsContainer = styled(Box)` | |||
| display: flex; | |||
| align-items: center; | |||
| `; | |||
| export const PostDate = styled(Typography)` | |||
| font-family: "Open Sans"; | |||
| font-size: 12px; | |||
| color: ${selectedTheme.primaryText}; | |||
| display: flex; | |||
| align-items: center; | |||
| &::before { | |||
| content: "Objavljeno: "; | |||
| @media (max-width: 600px) { | |||