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.

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

[9주차] : 9주차 개발 코드 Merge #74

Merged
merged 14 commits into from
Nov 5, 2023
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
[fix] : 마감 기한이 이상하게 렌더링 되는 부분 수정 & Info 컴포넌트 경로 변경
rktdnjs committed Nov 5, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 1f5b130cf0224434d3971d90338abca6bad3c39c
45 changes: 45 additions & 0 deletions src/components/atoms/Info.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import time from '../../utils/time';

/* eslint-disable */
const Info = ({ response }) => {
// 마감시간
let finishTime = new Date(response.finishedAt);

// 메뉴들 나열하는 거
const showMenu = (item) => {
return item.map(({ name }) => {
return <div key={name}>{name}</div>;
});
};

return (
<div className="px-8 pt-6">
{/* 주문정보 */}
<div>
<div className="text-xl font-bold text-blue py-2">주문 정보</div>
<div>{showMenu(response.beverage)}</div>
</div>
{/* 요청사항 */}
<div className="my-12">
<div className="text-xl font-bold text-blue py-2">요청 사항</div>
<div>
<div className="flex">
<div className="text-zinc-400">픽업팁</div>
<div className="ml-8">{response.tip}</div>
</div>
<div className="flex">
<div className="text-zinc-400">요청사항</div>
<div className="ml-5">{response.request}</div>
</div>
</div>
</div>
{/* 마감기한 */}
<div className="my-12">
<div className="text-xl font-bold text-blue py-2">마감기한</div>
<div>{time(finishTime)}</div>
</div>
</div>
);
};

export default Info;
20 changes: 0 additions & 20 deletions src/components/atoms/Time.jsx

This file was deleted.