-
Notifications
You must be signed in to change notification settings - Fork 2
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
[FEAT] 주문 상세 페이지 구현 #92
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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
4 changes: 3 additions & 1 deletion
4
src/components/orderDetail/productRecommend/productRecommendStyle.ts
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
4 changes: 3 additions & 1 deletion
4
src/components/orderDetail/serviceIntroduce/serviceIntroduceStyle.ts
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
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,19 @@ | ||
import Footer from '@components/footer/Footer'; | ||
import OrderHeader from '@components/header/orderHeader/OrderHeader'; | ||
import { ReactNode } from 'react'; | ||
|
||
import { orderLayoutContainerStyle, orderLayoutStyle } from './orderLayoutStyle'; | ||
|
||
interface LayoutProps { | ||
children: ReactNode; | ||
} | ||
|
||
const OrderLayout = ({ children }: LayoutProps) => ( | ||
<div css={orderLayoutContainerStyle}> | ||
<OrderHeader /> | ||
<main css={orderLayoutStyle}>{children}</main> | ||
<Footer /> | ||
</div> | ||
); | ||
|
||
export default OrderLayout; |
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,17 @@ | ||
import { Theme, css } from '@emotion/react'; | ||
|
||
export const orderLayoutContainerStyle = (theme: Theme) => css` | ||
width: 100vw; | ||
margin: 0 auto; | ||
|
||
background-color: ${theme.colors.gray2}; | ||
`; | ||
|
||
export const orderLayoutStyle = css` | ||
display: flex; | ||
gap: 1.2rem; | ||
width: 121.4rem; | ||
margin: 0 auto; | ||
margin-top: 0.6rem; | ||
margin-bottom: 4rem; | ||
`; |
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 |
---|---|---|
@@ -1,3 +1,23 @@ | ||
const OrderPage = () => <div>OrderPage</div>; | ||
import OrderLayout from 'layout/OrderLayout'; | ||
import { SideBarComponent } from '@components/orderDetail/sideBar/sideBar'; | ||
import { OrderInfoComponent } from '@components/orderDetail/orderInfo/orderInfo'; | ||
import OrderStatusComponent from '@components/orderDetail/orderStatus/orderStatus'; | ||
import OrderHistory from '@components/orderDetail/orderHistory/orderHistory'; | ||
import ServiceIntroduce from '@components/orderDetail/serviceIntroduce/serviceIntroduce'; | ||
import ProductRecommendComponent from '@components/orderDetail/productRecommend/productRecommend'; | ||
import { mainComponentStyle } from './orderPageStyle'; | ||
|
||
const OrderPage = () => ( | ||
<OrderLayout> | ||
<SideBarComponent /> | ||
<div css={mainComponentStyle}> | ||
<OrderInfoComponent /> | ||
<OrderStatusComponent /> | ||
<OrderHistory /> | ||
<ServiceIntroduce /> | ||
<ProductRecommendComponent /> | ||
</div> | ||
</OrderLayout> | ||
); | ||
|
||
export default OrderPage; |
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,11 @@ | ||
import { css } from '@emotion/react'; | ||
|
||
export const mainComponentStyle = css` | ||
display: flex; | ||
flex-direction: column; | ||
gap: 1.6rem; | ||
`; | ||
|
||
export const orderLayoutStyle = css` | ||
margin-top: 0.6rem; | ||
`; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
성희님 pr에서 layout공통으로 만들까 고민하실때 뷰상 유사성이 없어서 안만들어도 된다고 생각했었는데, 이제보니 이런 방법이..! 리드ㄷ ㄷ
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
우리리드짱👍👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
layout이 이렇게 공통으로 쓰일 수 있다는 게 완전히 와닿네요!!!