diff --git a/src/components/CardItem/CardItem.js b/src/components/CardItem/CardItem.js index 1c30b27..a4b5286 100644 --- a/src/components/CardItem/CardItem.js +++ b/src/components/CardItem/CardItem.js @@ -11,6 +11,7 @@ export const CardItem = ({ restaurantCurency, uuid, createOrder, + setAltData, }) => { const srcImage = imageUrl || './images/no_image.png'; const srcTitle = title || 'no-image icon'; @@ -19,7 +20,17 @@ export const CardItem = ({
createOrder(event.target.id)} + onClick={ + (event) => { + createOrder(event.target.id); + setAltData({ + title, + imageUrl, + itemDescription: description, + price, + }); + } + } onKeyPress={event => createOrder(event.target.id)} role="presentation" > @@ -45,6 +56,7 @@ CardItem.propTypes = { price: PropTypes.number.isRequired, restaurantCurency: PropTypes.string, createOrder: PropTypes.func.isRequired, + setAltData: PropTypes.shape().isRequired, }; CardItem.defaultProps = { diff --git a/src/components/CardItem/index.js b/src/components/CardItem/index.js index 53cd66c..c99f9b7 100644 --- a/src/components/CardItem/index.js +++ b/src/components/CardItem/index.js @@ -4,7 +4,7 @@ import { CardItem } from './CardItem'; import { selectRestaurantCurency, } from '../../store/selector'; -import { loadMenuItem } from '../../store/actions'; +import { loadMenuItem, setAltDataModalWindow } from '../../store/actions'; const mapStateToProps = state => ({ restaurantCurency: selectRestaurantCurency(state), @@ -12,6 +12,7 @@ const mapStateToProps = state => ({ const mapDispatchToProps = dispatch => ({ createOrder: uuid => dispatch(loadMenuItem(uuid)), + setAltData: data => dispatch(setAltDataModalWindow(data)), }); const Enhanced = connect( diff --git a/src/components/Error/Error.js b/src/components/Error/Error.js index 6a41e28..b869ab4 100644 --- a/src/components/Error/Error.js +++ b/src/components/Error/Error.js @@ -8,7 +8,7 @@ export const Error = (props) => { return (
-

Sorry, something wrong(

+

something wrong

{message}

diff --git a/src/components/Error/Error.scss b/src/components/Error/Error.scss index fbd3c17..9d5921f 100644 --- a/src/components/Error/Error.scss +++ b/src/components/Error/Error.scss @@ -3,6 +3,7 @@ .error { @extend %absolute-center; flex-flow: column nowrap; + padding: 10px; &__text { font-size: 30px; diff --git a/src/components/Order/Order.js b/src/components/Order/Order.js index fd41cba..d4faf67 100644 --- a/src/components/Order/Order.js +++ b/src/components/Order/Order.js @@ -2,60 +2,59 @@ import React from 'react'; import PropTypes from 'prop-types'; import Loader from '../Loader'; -import Error from '../Error'; +import { OrderFooter } from '../OrderFooter'; +import { OrderCustomizationsSection } from '../OrderCustomizationsSection'; import './Order.scss'; export const Order = ({ - deleteOrder, + hideModalWindow, order, isLoading, error, + altData, }) => { if (isLoading) { return ; } - const { imageUrl, title, itemDescription } = order; - const countItem = 1; + const { + imageUrl, + title, + itemDescription, + customizationsList = [], + } = !error ? order : altData; + const srcImage = imageUrl || './images/no_image.png'; const srcTitle = title || 'no-image icon'; return (