-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from svetanti/sprint-2/step-2
Sprint 2/step 2
- Loading branch information
Showing
24 changed files
with
1,337 additions
and
438 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,168 @@ | ||
| import React, { | ||
| useCallback, useEffect, useState, | ||
| } from 'react'; | ||
| import { useSelector, useDispatch } from 'react-redux'; | ||
| import { DndProvider } from 'react-dnd'; | ||
| import { HTML5Backend } from 'react-dnd-html5-backend'; | ||
| import update from 'immutability-helper'; | ||
| import AppHeader from '../app-header/app-header'; | ||
| import BurgerIngredients from '../burger-ingredients/burger-ingredients'; | ||
| import appStyles from './app.module.css'; | ||
| import Main from '../main/main'; | ||
| import Modal from '../modal/modal'; | ||
| import OrderDetails from '../order-details/order-details'; | ||
| import IngredientDetails from '../ingredient-details/ingredient-details'; | ||
| import useWindowSize from '../../hooks/useWindowSize'; | ||
| import { | ||
| ADD_INGREDIENT, | ||
| ADD_INGREDIENT_DATA, | ||
| DELETE_INGREDIENT, | ||
| DELETE_INGREDIENT_DATA, | ||
| MOVE_CONSTRUCTOR_ELEMENT, | ||
| getIngredients, | ||
| TOGGLE_MODAL, | ||
| getOrder, | ||
| } from '../../services/actions/actions'; | ||
| import BurgerConstructor from '../burger-constructor/burger-constructor'; | ||
|
|
||
| function App() { | ||
| const dispatch = useDispatch(); | ||
| const [isMenuOpen] = useState(false); | ||
| const [currentModal, setCurrentModal] = useState(''); | ||
| const { width } = useWindowSize(); | ||
| const isTablet = width <= 1024; | ||
| const [isConstructorOpened, setIsConstructorOpened] = useState(true); | ||
|
|
||
| const { currentBurger } = useSelector((store) => store.currentBurgerReducer); | ||
| const { isModalOpened } = useSelector((store) => store.modalReducer); | ||
| const { order } = useSelector((store) => store.orderReducer); | ||
|
|
||
| const currentBurgerIngredients = [...currentBurger].filter((item) => item.type !== 'bun'); | ||
|
|
||
| let modalContent; | ||
| let headerText; | ||
| switch (currentModal) { | ||
| case 'ingredientDetails': { | ||
| modalContent = <IngredientDetails />; | ||
| headerText = 'Детали ингредиента'; | ||
| break; | ||
| } | ||
| case 'orderDetails': { | ||
| modalContent = <OrderDetails orderNumber={order.number} />; | ||
| headerText = isTablet ? 'Заказ оформлен' : ''; | ||
| break; | ||
| } | ||
| default: { | ||
| modalContent = ''; | ||
| } | ||
| } | ||
|
|
||
| const openIngredientDetails = (item) => { | ||
| dispatch({ type: ADD_INGREDIENT_DATA, item }); | ||
| dispatch({ type: TOGGLE_MODAL }); | ||
| setCurrentModal('ingredientDetails'); | ||
| }; | ||
|
|
||
| const openOrderDetails = () => { | ||
| setCurrentModal('orderDetails'); | ||
| dispatch({ type: TOGGLE_MODAL }); | ||
| }; | ||
|
|
||
| const makeOrder = (orderData) => { | ||
| dispatch(getOrder(orderData)); | ||
| openOrderDetails(); | ||
| }; | ||
|
|
||
| const closeModal = () => { | ||
| dispatch({ type: DELETE_INGREDIENT_DATA }); | ||
| dispatch({ type: TOGGLE_MODAL }); | ||
| }; | ||
|
|
||
| const openConstructor = () => { | ||
| setIsConstructorOpened(true); | ||
| }; | ||
|
|
||
| const closeConstructor = () => { | ||
| setIsConstructorOpened(false); | ||
| }; | ||
|
|
||
| const handleDrop = (item) => { | ||
| if (item.type === 'bun') { | ||
| const bun = currentBurger.find((el) => el.type === 'bun'); | ||
| const index = currentBurger.indexOf(bun); | ||
| if (index !== -1) { | ||
| dispatch({ type: DELETE_INGREDIENT, index }); | ||
| } | ||
| } | ||
| dispatch({ type: ADD_INGREDIENT, item }); | ||
| }; | ||
|
|
||
| const handleMove = useCallback((dragIndex, hoverIndex) => { | ||
| const bun = [...currentBurger].find((item) => item.type === 'bun'); | ||
| const dragElement = currentBurgerIngredients[dragIndex]; | ||
| const payload = bun | ||
| ? [bun, ...update(currentBurgerIngredients, { | ||
| $splice: [ | ||
| [dragIndex, 1], | ||
| [hoverIndex, 0, dragElement], | ||
| ], | ||
| })] | ||
| : update(currentBurgerIngredients, { | ||
| $splice: [ | ||
| [dragIndex, 1], | ||
| [hoverIndex, 0, dragElement], | ||
| ], | ||
| }); | ||
| dispatch({ type: MOVE_CONSTRUCTOR_ELEMENT, payload }); | ||
| }, [currentBurgerIngredients]); | ||
|
|
||
| const handleDeleteIngredient = (item) => { | ||
| const index = currentBurger.indexOf(item); | ||
| dispatch({ type: DELETE_INGREDIENT, index }); | ||
| }; | ||
|
|
||
| useEffect(() => { | ||
| dispatch(getIngredients()); | ||
| }, [dispatch]); | ||
|
|
||
| useEffect(() => { | ||
| setIsConstructorOpened(!isTablet); | ||
| }, [isTablet]); | ||
|
|
||
| return ( | ||
| <div className={appStyles.app}> | ||
| <DndProvider backend={HTML5Backend}> | ||
| <AppHeader isMenuOpen={isMenuOpen} isTablet={isTablet} /> | ||
| <Main> | ||
| <BurgerIngredients | ||
| onModalOpen={openIngredientDetails} | ||
| onOpenConstructor={openConstructor} | ||
| onIngredientAdd={handleDrop} | ||
| isTablet={isTablet} | ||
| /> | ||
| { isConstructorOpened && ( | ||
| <BurgerConstructor | ||
| onOrder={makeOrder} | ||
| isTablet={isTablet} | ||
| onCloseConstructor={closeConstructor} | ||
| onDropHandler={handleDrop} | ||
| onMove={handleMove} | ||
| onDelete={handleDeleteIngredient} | ||
| /> | ||
| )} | ||
| </Main> | ||
| {isModalOpened && ( | ||
| <Modal | ||
| onClose={closeModal} | ||
| header={headerText} | ||
| > | ||
| {modalContent} | ||
| </Modal> | ||
| )} | ||
| </DndProvider> | ||
| </div> | ||
|
|
||
| ); | ||
| } | ||
|
|
||
| export default App; |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.