Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[0421] Complete Modal component #12

Merged
merged 2 commits into from
Apr 21, 2021
Merged

[0421] Complete Modal component #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a21599d
feat: Add Modal.jsx
GleamingStar Apr 21, 2021
9166a9f
feat: Add clickevent in Card for popup Modal
GleamingStar Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 3 additions & 17 deletions src/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,9 @@
import BestList from "./js/components/bestList/BestList";
import TestCarousel from "./js/util/TestCarousel";
function App() {
const test = {
detail_hash: "HBDEF",
image:
"http://public.codesquad.kr/jk/storeapp/data/2d3f99a9a35601f4e98837bc4d39b2c8.jpg",
alt: "[미노리키친] 규동 250g",
delivery_type: ["새벽배송", "전국택배"],
title: "[미노리키친] 규동 250g",
description: "일본인의 소울푸드! 한국인도 좋아하는 소고기덮밥",
n_price: "6,500",
s_price: "7,000원",
badge: ["이벤트특가"],
};
import Main from "./js/components/Main"

function App() {
return (
<>
<BestList />
<TestCarousel />
<Main />
</>
);
}
Expand Down
28 changes: 28 additions & 0 deletions src/js/components/Main.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import { useState } from "react";
import BestList from "./bestList/BestList";
import Modal from "./Modal/Modal";

const Main = () => {
const test = {
data: {
top_image: "",
thumb_images: [""],
product_description: "",
point: "",
delivery_info: "",
delivery_fee: "",
prices: ["14000원"],
detail_section: [],
},
};
const [modalData, setModalData] = useState(test);
const [isModalOn, setModalOn] = useState(false);
return (
<>
<BestList setModalData={setModalData} setModalOn={setModalOn} />
<Modal data={modalData.data} isModalOn={isModalOn} setModalOn={setModalOn} />
</>
);
};

export default Main;
Empty file removed src/js/components/Modal/Modal.js
View file
Open in desktop
Empty file.
265 changes: 265 additions & 0 deletions src/js/components/Modal/Modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,265 @@
import styled from "styled-components";
import ThumbNail from "./ThumbNail";
import Badge from "../common/Badge";
import { useState } from "react";

const ContentWrapper = styled.div`
display: flex;
flex-direction: row;
align-items: flex-start;
font-family: Noto Sans KR;
font-style: normal;
font-weight: normal;
font-size: 16px;
line-height: 23px;
margin: 16px 0px;
`;
const ContentTitle = styled.div`
width: 76px;
color: #828282;
`;
const ContentBody = styled.div`
width: 364px;
color: #4f4f4f;
`;
const Content = ({ title, body }) => {
const free = "(40,000원 이상 구매 시 무료)";
return (
<ContentWrapper>
<ContentTitle>{title}</ContentTitle>
<ContentBody>
{body.replace(free, "")}
<b>{body.includes(free) ? free : ""}</b>
</ContentBody>
</ContentWrapper>
);
};

const ModalWrapper = styled.div`
visibility: ${props=>props.isOn? "visible" : "hidden"};
position: absolute;
width: 1000px;
height: 1076px;
left: 220px;
top: 170px;
`;

const Box = styled.div`
width: 960px;
height: 680px;
background: #ffffff;
border-radius: 5px 5px 0px 0px;
`;

const ProductInfo = styled.div`
position: absolute;
width: 440px;
height: 416px;
left: 472px;
top: 48px;
`;

const ProductName = styled.div`
font-family: Noto Sans KR;
font-style: normal;
font-weight: bold;
font-size: 24px;
line-height: 35px;
margin-bottom: 16px;
`;

const ProductDescription = styled.div`
font-family: Noto Sans KR;
font-style: normal;
font-weight: normal;
font-size: 18px;
line-height: 26px;
color: #828282;
margin-bottom: 16px;
`;

const ProductPrice = styled.div`
display: flex;
flex-direction: row;
align-items: flex-end;
padding: 0px;
height: 35px;
margin-bottom: 24px;
`;

const ProductPrice1 = styled.div`
font-family: Noto Sans KR;
font-style: normal;
font-weight: bold;
font-size: 24px;
line-height: 35px;
margin-right: 8px;
`;
const ProductPrice2 = styled.div`
font-family: Noto Sans KR;
font-style: normal;
font-weight: normal;
font-size: 16px;
line-height: 23px;
text-decoration-line: line-through;
color: #828282;
`;
const Line = styled.div`
width: 440px;
height: 1px;
background: #e0e0e0;
margin: 8px 0px;
`;
const Number = styled.div`
position: relative;
width: 440px;
height: 41px;
display: flex;
align-items: center;
margin: 16px 0px;
`;
const NumberLabel = styled.div`
width: 60px;
height: 23px;
font-family: Noto Sans KR;
font-style: normal;
font-weight: normal;
font-size: 16px;
line-height: 23px;
color: #828282;
`;
const NumberInput = styled.div`
display: flex;
align-items: center;
justify-content: center;
position: absolute;
width: 57px;
height: 41px;
top: 0px;
left: 354px;
border: 1px solid #e0e0e0;
`;
const NumberUpButton = styled.div`
display: flex;
align-items: center;
justify-content: center;
position: absolute;
width: 28px;
height: 20px;
left: 412px;
top: 0px;
border: 1px solid #e0e0e0;
`;
const NumberDownButton = styled.div`
display: flex;
align-items: center;
justify-content: center;
position: absolute;
width: 28px;
height: 20px;
left: 412px;
top: 21px;
border: 1px solid #e0e0e0;
`;
const TotalPrice = styled.div`
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: center;
padding: 0px;

position: absolute;
width: 360px;
height: 46px;
left: 552px;
top: 496px;
`;
const TotalPriceLabel = styled.div`
height: 26px;

font-family: Noto Sans KR;
font-style: normal;
font-weight: bold;
font-size: 18px;
line-height: 26px;
text-align: right;
color: #828282;
`;
const TotalPriceContent = styled.div`
height: 46px;

font-family: Noto Sans KR;
font-style: normal;
font-weight: bold;
font-size: 32px;
line-height: 46px;
text-align: right;
color: #010101;
margin-left: 24px;
`;
const CloseButton = styled.div`
position: absolute;
width: 32px;
height: 32px;
left: 968px;
top: 0px;
svg{
position:absolute;
}
`;

const Modal = ({ data, isModalOn, setModalOn }) => {
const [count, setCount] = useState(1);
const price = parseInt((data.prices[1] ? data.prices[1] : data.prices[0]).replace("원", "").replace(",", ""));
return (
<ModalWrapper isOn={isModalOn}>
<Box>
<ThumbNail {...data} />
<ProductInfo>
<ProductName>{data.name}</ProductName>
<ProductDescription>{data.product_description}</ProductDescription>
<ProductPrice>
{data.badge ? <Badge badge={data.badge} /> : ""}
<ProductPrice1>{data.prices[1] ? data.prices[1] : data.prices[0]}</ProductPrice1>
<ProductPrice2>{data.prices[1] ? data.prices[0] : ""}</ProductPrice2>
</ProductPrice>
<Line />
<Content title="적립금" body={data.point} />
<Content title="배송정보" body={data.delivery_info} />
<Content title="배송비" body={data.delivery_fee} />
<Line />
<Number>
<NumberLabel>수량</NumberLabel>
<NumberInput>{count}</NumberInput>
<NumberUpButton onClick={() => setCount((count) => ++count)}>
<svg width="8" height="6" viewBox="0 0 8 6" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M7 4.5L4 1.5L1 4.5" stroke="#333333" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" />
</svg>
</NumberUpButton>
<NumberDownButton onClick={() => setCount((count) => (count > 0 ? --count : 0))}>
<svg width="30" height="22" viewBox="0 0 30 22" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12 9.5L15 12.5L18 9.5" stroke="#333333" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" />
<rect x="0.5" y="0.5" width="29" height="21" stroke="#E0E0E0" />
</svg>
</NumberDownButton>
</Number>
<Line />
</ProductInfo>
<TotalPrice>
<TotalPriceLabel>총 주문금액</TotalPriceLabel>
<TotalPriceContent>{(price * count).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}원</TotalPriceContent>
</TotalPrice>
</Box>
<CloseButton onClick={()=>setModalOn(()=>false)}>
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1 1L17 17" stroke="white" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" />
</svg>
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M17 1L1 17" stroke="white" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" />
</svg>
</CloseButton>
</ModalWrapper>
);
};

export default Modal;
Empty file removed src/js/components/Modal/ThumbNail.js
View file
Open in desktop
Empty file.
54 changes: 54 additions & 0 deletions src/js/components/Modal/ThumbNail.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import { useEffect, useState } from "react";
import styled from "styled-components";

const ThumbNailWrapper = styled.div`
position: relative;
width: 392px;
height: 472px;
left: 48px;
top: 48px;
`;

const TopImage = styled.img`
width: 392px;
height: 392px;
margin-bottom: 8px;
`;

const ThumbImages = styled.ul`
display: flex;
flex-direction: row;
justify-content: space-between;
`;
const ThumbImage = styled.li`
width: 72px;
height: 72px;
img {
width: 100%;
height: 100%;
}
background: #f5f5f7;
border-radius: 5px;
`;
const ThumbNail = (props) => {
const { top_image, thumb_images } = props;
const [topImage, setTopImage] = useState();
const [thumbImages, setThumbImages] = useState([]);
const clickHandler = ({target}) => setTopImage(()=>target.currentSrc)
useEffect(() => {
setTopImage(() => top_image);
setThumbImages(() => {
const foo = [...thumb_images];
while (foo.length < 5) foo.push("");
return foo.map((e, i) => <ThumbImage key={top_image + i}>{e ? <img src={e} alt={i} onClick={clickHandler} /> : ""}</ThumbImage>);
});
}, [top_image, thumb_images]);
return (
<ThumbNailWrapper>
<TopImage src={topImage} />
<ThumbImages>{thumbImages}</ThumbImages>
</ThumbNailWrapper>
);
};

export default ThumbNail;
Loading