Просмотр исходного кода

Partly finished feature 1424

feature/1424
Djordje Mitrovic 3 лет назад
Родитель
Сommit
529aaed294

+ 17
- 0
src/components/Cards/ItemDetailsCard/ItemDetailsCard.js Просмотреть файл

RemoveIconContainer, RemoveIconContainer,
RemoveIcon, RemoveIcon,
ButtonContainer, ButtonContainer,
PinIconContainer,
PinIcon,
UnpinIcon,
// EditDeleteButtons, // EditDeleteButtons,
} from "./ItemDetailsCard.styled"; } from "./ItemDetailsCard.styled";
import selectedTheme from "../../../themes"; import selectedTheme from "../../../themes";
const showEditOfferModalHandler = () => { const showEditOfferModalHandler = () => {
dispatch(toggleEditOfferModal({ editOffer: true, offer: offer.offer })); dispatch(toggleEditOfferModal({ editOffer: true, offer: offer.offer }));
}; };
const showPinOfferModalHandler = () => {
console.log(offer);
dispatch(
toggleDeleteOfferModal({
offer: offer?.offer,
pin: true,
pinnedOffer: offer?.offer?.pinned,
deleteOffer: false,
})
);
};


return ( return (
<> <>
<DateButtonsContainer> <DateButtonsContainer>
{props.isMyOffer && ( {props.isMyOffer && (
<ButtonsContainer> <ButtonsContainer>
<PinIconContainer onClick={showPinOfferModalHandler}>
{offer?.offer?.pinned ? <UnpinIcon /> : <PinIcon />}
</PinIconContainer>
<EditIconContainer onClick={showEditOfferModalHandler}> <EditIconContainer onClick={showEditOfferModalHandler}>
<EditIcon /> <EditIcon />
</EditIconContainer> </EditIconContainer>

+ 39
- 2
src/components/Cards/ItemDetailsCard/ItemDetailsCard.styled.js Просмотреть файл

import { ReactComponent as Eye } from "../../../assets/images/svg/eye-striked.svg"; import { ReactComponent as Eye } from "../../../assets/images/svg/eye-striked.svg";
import { IconButton } from "../../Buttons/IconButton/IconButton"; import { IconButton } from "../../Buttons/IconButton/IconButton";
import { ReactComponent as Edit } from "../../../assets/images/svg/edit.svg"; import { ReactComponent as Edit } from "../../../assets/images/svg/edit.svg";
import { ReactComponent as Pin } from "../../../assets/images/svg/pin-outlined.svg";
import { ReactComponent as Unpin } from "../../../assets/images/svg/unpin-outlined.svg";
import { ReactComponent as Remove } from "../../../assets/images/svg/trash.svg"; import { ReactComponent as Remove } from "../../../assets/images/svg/trash.svg";


export const ItemDetailsCardContainer = styled(Container)` export const ItemDetailsCardContainer = styled(Container)`
border-radius: 100%; border-radius: 100%;
padding-top: 2px; padding-top: 2px;
text-align: center; text-align: center;
margin-left: 18px;
/* margin-left: 18px; */


@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
width: 32px; width: 32px;
height: 32px; height: 32px;
} }
`; `;

export const RemoveIcon = styled(Remove)` export const RemoveIcon = styled(Remove)`
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
width: 16px; width: 16px;
left: -2px; left: -2px;
} }
`; `;
export const PinIconContainer = styled(IconButton)`
width: 40px;
height: 40px;
position: relative;
top: 4px;
background-color: ${selectedTheme.colors.primaryIconBackgroundColor};
border-radius: 100%;
padding-top: 2px;
text-align: center;
/* margin-left: 18px; */

@media screen and (max-width: 600px) {
width: 32px;
top: 0;
height: 32px;
}
`;

export const PinIcon = styled(Pin)`
@media screen and (max-width: 600px) {
width: 20px;
height: 20px;
position: relative;
top: -4px;
left: -2px;
}
`;
export const UnpinIcon = styled(Unpin)`
@media screen and (max-width: 600px) {
width: 20px;
height: 20px;
position: relative;
top: -4px;
left: -2px;
}
`;


export const DateButtonsContainer = styled(Box)` export const DateButtonsContainer = styled(Box)`
display: flex; display: flex;

+ 18
- 1
src/components/Cards/OfferCard/OfferCard.js Просмотреть файл

} from "../../../store/actions/modal/modalActions"; } from "../../../store/actions/modal/modalActions";
import { Tooltip } from "@mui/material"; import { Tooltip } from "@mui/material";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { replaceInRoute } from "../../../util/helpers/routeHelpers";
import {
ADMIN_ITEM_DETAILS_PAGE,
ITEM_DETAILS_PAGE,
} from "../../../constants/pages";


const OfferCard = (props) => { const OfferCard = (props) => {
const dispatch = useDispatch(); const dispatch = useDispatch();
}; };
const routeToItem = (itemId) => { const routeToItem = (itemId) => {
if (!props.disabledCheckButton) { if (!props.disabledCheckButton) {
history.push(`/proizvodi/${itemId}`);
if (props.isAdmin) {
history.push(
replaceInRoute(ADMIN_ITEM_DETAILS_PAGE, {
idProizvod: itemId,
})
);
} else {
history.push(
replaceInRoute(ITEM_DETAILS_PAGE, {
idProizvod: itemId,
})
);
}
} }
}; };
const messageUser = (event) => { const messageUser = (event) => {

+ 8
- 3
src/components/ItemDetails/ItemDetails.js Просмотреть файл

selectIsLoadingByActionType(ONE_OFFER_SCOPE) selectIsLoadingByActionType(ONE_OFFER_SCOPE)
); );
let isMyProfile = useMemo(() => { let isMyProfile = useMemo(() => {
if (offer?.offer?.userId?.toString() === userId?.toString()) return true;
if (
offer?.offer?.userId?.toString() === userId?.toString() ||
props.isAdmin
)
return true;
return false; return false;
}, [offer, userId]);
}, [offer, userId, props.isAdmin]);


return ( return (
<ItemDetailsContainer> <ItemDetailsContainer>
<OfferIconText>{t("offer.product")}</OfferIconText> <OfferIconText>{t("offer.product")}</OfferIconText>
</OfferIconContainer> </OfferIconContainer>
)} )}
<ItemDetailsCard offer={offer} isMyOffer={isMyProfile} singleOffer />
<ItemDetailsCard offer={offer} isMyOffer={isMyProfile} isAdmin={props.isAdmin} singleOffer />
</> </>
)} )}
</ItemDetailsContainer> </ItemDetailsContainer>


ItemDetails.propTypes = { ItemDetails.propTypes = {
singleOffer: PropTypes.any, singleOffer: PropTypes.any,
isAdmin: PropTypes.bool,
}; };


export default ItemDetails; export default ItemDetails;

+ 1
- 1
src/components/ItemDetails/ItemDetailsHeaderCard/ItemDetailsHeaderCard.js Просмотреть файл

) : ( ) : (
<Tooltip title={t("messages.tooltip")}> <Tooltip title={t("messages.tooltip")}>
<TooltipInnerContainer> <TooltipInnerContainer>
<MessageIcon onClick={() => messageUser(offer)}>
<MessageIcon disabled onClick={() => messageUser(offer)}>
<MessageColor /> <MessageColor />
</MessageIcon> </MessageIcon>
</TooltipInnerContainer> </TooltipInnerContainer>

+ 13
- 3
src/components/ItemDetails/ItemDetailsHeaderCard/ItemDetailsHeaderCard.styled.js Просмотреть файл

import { Box, Typography } from "@mui/material"; import { Box, Typography } from "@mui/material";
import styled from "styled-components";
import styled, { css } from "styled-components";
import selectedTheme from "../../../themes"; import selectedTheme from "../../../themes";
import { IconButton } from "../../Buttons/IconButton/IconButton"; import { IconButton } from "../../Buttons/IconButton/IconButton";
import { PrimaryButton } from "../../Buttons/PrimaryButton/PrimaryButton"; import { PrimaryButton } from "../../Buttons/PrimaryButton/PrimaryButton";
background-color: ${selectedTheme.colors.primaryPurple}; background-color: ${selectedTheme.colors.primaryPurple};
border-radius: 100%; border-radius: 100%;
padding-top: 2px; padding-top: 2px;
${(props) =>
props.disabled &&
css`
border: 1px solid ${selectedTheme.colors.borderNormal};
background-color: ${selectedTheme.colors.primaryIconBackgroundColor};
& button svg path {
stroke: ${selectedTheme.colors.iconStrokePurpleDisabledColor};
padding-top: 1px;
}
`}
text-align: center; text-align: center;
@media (max-width: 600px) { @media (max-width: 600px) {
width: 32px; width: 32px;
width: 16px; width: 16px;
height: 16px; height: 16px;
position: relative; position: relative;
top: -4px;
left: -2px;
top: ${(props) => (props.disabled ? "-5px" : "-4px")};
left: ${(props) => (props.disabled ? "-3px" : "-2px")};
} }
} }
`; `;

+ 1
- 0
src/constants/pages.js Просмотреть файл

export const ADMIN_HOME_PAGE = "/admin"; export const ADMIN_HOME_PAGE = "/admin";
export const ADMIN_USERS_PAGE = "/admin/users"; export const ADMIN_USERS_PAGE = "/admin/users";
export const ADMIN_SINGLE_USER_PAGE = "/admin/users/:idProfile"; export const ADMIN_SINGLE_USER_PAGE = "/admin/users/:idProfile";
export const ADMIN_ITEM_DETAILS_PAGE = "/admin/proizvodi/:idProizvod";
export const ADMIN_CATEGORIES_PAGE = "/admin/categories"; export const ADMIN_CATEGORIES_PAGE = "/admin/categories";
export const ADMIN_LOCATIONS_PAGE = "/admin/locations"; export const ADMIN_LOCATIONS_PAGE = "/admin/locations";
export const ADMIN_PAYMENT_PAGE = "/admin/payment"; export const ADMIN_PAYMENT_PAGE = "/admin/payment";

+ 2
- 2
src/layouts/AdminLayout/AdminLayout.js Просмотреть файл

<AdminLayoutContainer className={props.className}> <AdminLayoutContainer className={props.className}>
{props.children} {props.children}
<Grid container maxHeight="xl"> <Grid container maxHeight="xl">
<LeftCard item xs={0} sm={0} md={3} lg={3} xl={3}>
<LeftCard item xs={0} sm={0} md={3} lg={3} xl={2.4}>
{props.leftCard} {props.leftCard}
</LeftCard> </LeftCard>
<Content item xs={12} sm={12} md={9} lg={9} xl={9}>
<Content item xs={12} sm={12} md={9} lg={9} xl={9.6}>
{props.content} {props.content}
</Content> </Content>
</Grid> </Grid>

+ 4
- 2
src/pages/AdminHomePage/AdminHomePage.js Просмотреть файл

import { Switch, useHistory } from "react-router-dom"; import { Switch, useHistory } from "react-router-dom";
import { import {
ADMIN_CATEGORIES_PAGE, ADMIN_CATEGORIES_PAGE,
ADMIN_ITEM_DETAILS_PAGE,
ADMIN_LOCATIONS_PAGE, ADMIN_LOCATIONS_PAGE,
ADMIN_PAYMENT_PAGE, ADMIN_PAYMENT_PAGE,
ADMIN_SINGLE_USER_PAGE, ADMIN_SINGLE_USER_PAGE,
import AdminPaymentPage from "./AdminPaymentPage/AdminPaymentPage"; import AdminPaymentPage from "./AdminPaymentPage/AdminPaymentPage";
import AdminSingleUserPage from "./AdminUsersPage/AdminSingleUserPage/AdminSingleUserPage"; import AdminSingleUserPage from "./AdminUsersPage/AdminSingleUserPage/AdminSingleUserPage";
import { AdminLayoutHomePage } from "./AdminHomePage.styled"; import { AdminLayoutHomePage } from "./AdminHomePage.styled";
import AdminItemDetailsPage from "./AdminItemDetailsPage/AdminItemDetailsPage";


const AdminHomePage = () => { const AdminHomePage = () => {
const profile = useSelector(selectMineProfile); const profile = useSelector(selectMineProfile);
component={AdminSingleUserPage} component={AdminSingleUserPage}
/> />
<AdminRoute <AdminRoute
path={ADMIN_SUBCATEGORIES_PAGE}
component={AdminSubcategoriesPage}
path={ADMIN_ITEM_DETAILS_PAGE}
component={AdminItemDetailsPage}
/> />
<AdminRoute <AdminRoute
path={ADMIN_SUBCATEGORIES_PAGE} path={ADMIN_SUBCATEGORIES_PAGE}

+ 61
- 0
src/pages/AdminHomePage/AdminItemDetailsPage/AdminItemDetailsPage.js Просмотреть файл

import React from 'react'
import PropTypes from 'prop-types'
import { useDispatch, useSelector } from 'react-redux';
import { selectOffer } from '../../../store/selectors/offersSelectors';
import { useState } from 'react';
import { useEffect } from 'react';
import { clearSelectedOffer, fetchOneOffer } from '../../../store/actions/offers/offersActions';
import { AdminItemDetailsPageContainer } from './AdminItemDetailsPage.styled';
import ItemDetailsLayout from '../../../layouts/ItemDetailsLayout/ItemDetailsLayout';
import ItemDetails from '../../../components/ItemDetails/ItemDetails';
import ProfileMini from '../../../components/ProfileMini/ProfileMini';
import UserReviews from '../../../components/UserReviews/UserReviews';

const AdminItemDetailsPage = (props) => {
const dispatch = useDispatch();
const selectedOffer = useSelector(selectOffer);
const [isInitiallyLoaded, setIsInitiallyLoaded] = useState(false);
const offerId = props.match.params.idProizvod;
useEffect(() => {
dispatch(fetchOneOffer(offerId));
() => dispatch(clearSelectedOffer());
}, []);
useEffect(() => {
if (!selectedOffer?.offer && isInitiallyLoaded) {
dispatch(fetchOneOffer(offerId));
}
if (selectedOffer?.offer) {
setIsInitiallyLoaded(true);
}
}, [selectedOffer?.offer]);
useEffect(() => {
window.scrollTo({ top: 0, behaviour: "smooth" });
}, []);
return (
<AdminItemDetailsPageContainer>
<ItemDetailsLayout
singleOffer
content={<ItemDetails singleOffer isAdmin />}
rightCard={
<>
<ProfileMini /> <UserReviews rightReviews />
</>
}
/>
</AdminItemDetailsPageContainer>
);
};
AdminItemDetailsPage.propTypes = {
match: PropTypes.shape({
params: PropTypes.shape({
idProizvod: PropTypes.string,
}),
}),
};

export default AdminItemDetailsPage

+ 19
- 0
src/pages/AdminHomePage/AdminItemDetailsPage/AdminItemDetailsPage.styled.js Просмотреть файл

import styled from "styled-components";
import { Box, Grid } from "@mui/material";
import selectedTheme from "../../../themes";
export const AdminItemDetailsPageContainer = styled(Box)`
padding: 0;
margin: 0;
height: 100%;
width: 100%;
max-width: none;
flex: 1;
display: flex;
flex-direction: column;
background-color: ${selectedTheme.colors.offerBackgroundColor};

@media screen and (max-width: 600px) {
margin-top: 65px;
}
`;
export const GridStyled = styled(Grid)``;

+ 2
- 0
src/util/helpers/routeHelpers.js Просмотреть файл

import { import {
ADMIN_CATEGORIES_PAGE, ADMIN_CATEGORIES_PAGE,
ADMIN_HOME_PAGE, ADMIN_HOME_PAGE,
ADMIN_ITEM_DETAILS_PAGE,
ADMIN_LOCATIONS_PAGE, ADMIN_LOCATIONS_PAGE,
ADMIN_LOGIN_PAGE, ADMIN_LOGIN_PAGE,
ADMIN_PAYMENT_PAGE, ADMIN_PAYMENT_PAGE,
routeMatches(ADMIN_LOCATIONS_PAGE) || routeMatches(ADMIN_LOCATIONS_PAGE) ||
routeMatches(ADMIN_PAYMENT_PAGE) || routeMatches(ADMIN_PAYMENT_PAGE) ||
dynamicRouteMatches(ADMIN_SINGLE_USER_PAGE) || dynamicRouteMatches(ADMIN_SINGLE_USER_PAGE) ||
dynamicRouteMatches(ADMIN_ITEM_DETAILS_PAGE) ||
isInRoute(ADMIN_HOME_PAGE) isInRoute(ADMIN_HOME_PAGE)
) )
return true; return true;

Загрузка…
Отмена
Сохранить