feat: 꿀조합 상세 페이지 디자인 마이그레이션 #71
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
|
There was a problem hiding this comment. 우리 이 Title 컴포넌트 통일 해야할 거 같아요. There was a problem hiding this comment. 그렇네여 안그래도 이거 한 번 정리 들어가야 할 것 같다고 생각했어요🤔 일단 이번 pr은 냅두고 작업하시면 나중에 합치는걸로 해요 There was a problem hiding this comment. 요거 지금 제가 작업중임다 일단 머지하구 나중에 제가 갈아끼울게용~~ |
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,54 +1,34 @@ | ||
| import { Link } from 'react-router-dom'; | ||
|
|
||
| import { container, wrapper } from './sectionTitle.css'; | ||
|
|
||
| import { SvgIcon, Text } from '@/components/Common'; | ||
| import { PATH } from '@/constants/path'; | ||
| import { vars } from '@/styles/theme.css'; | ||
|
|
||
| interface SectionTitleProps { | ||
| name: string; | ||
| hasSearchLink?: boolean; | ||
| } | ||
|
|
||
| const SectionTitle = ({ name, hasSearchLink }: SectionTitleProps) => { | ||
| return ( | ||
| <div className={container}> | ||
| <div className={wrapper}> | ||
| <Link to=".." relative="path"> | ||
| <SvgIcon variant="arrowLeft" stroke={vars.colors.black} height={24} /> | ||
| </Link> | ||
| <Text size="headline" weight="semiBold"> | ||
| {name} | ||
| </Text> | ||
| </div> | ||
| {hasSearchLink && ( | ||
| <Link to={PATH.SEARCH}> | ||
| <SvgIcon variant="search2" stroke={vars.colors.black} width={20} height={20} /> | ||
| </Link> | ||
| )} | ||
| </div> | ||
| ); | ||
| }; | ||
|
|
||
| export default SectionTitle; | ||
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,13 @@ | ||
| import { style } from '@vanilla-extract/css'; | ||
|
|
||
| export const container = style({ | ||
| display: 'flex', | ||
| justifyContent: 'space-between', | ||
| alignItems: 'center', | ||
| }); | ||
|
|
||
| export const wrapper = style({ | ||
| display: 'flex', | ||
| gap: 18, | ||
| alignItems: 'flex-start', | ||
| }); |
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
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,34 @@ | ||
| import { vars } from '@/styles/theme.css'; | ||
| import { style } from '@vanilla-extract/css'; | ||
|
|
||
| export const container = style({ | ||
| display: 'flex', | ||
| gap: 8, | ||
| alignItems: 'center', | ||
| marginBottom: 24, | ||
| padding: '6px 13px 6px 6px', | ||
| background: vars.colors.background.category, | ||
| borderRadius: 20, | ||
| }); | ||
|
|
||
| export const commentForm = style({ | ||
| display: 'flex', | ||
| gap: 8, | ||
| alignItems: 'center', | ||
| width: '100%', | ||
| }); | ||
|
|
||
| export const commentTextarea = style({ | ||
| width: '100%', | ||
| height: '100%', | ||
| border: 'none', | ||
| outline: 'none', | ||
| background: 'none', | ||
| fontSize: '1.4rem', | ||
|
|
||
| selectors: { | ||
| '&:placeholder': { | ||
| color: '#808080', | ||
| }, | ||
| }, | ||
| }); |
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,46 +1,20 @@ | ||
| import { commentItem, container } from './commentItem.css'; | ||
|
|
||
| import type { Comment } from '@/types/recipe'; | ||
|
|
||
| interface CommentItemProps { | ||
| recipeComment: Comment; | ||
| } | ||
|
|
||
| const CommentItem = ({ recipeComment }: CommentItemProps) => { | ||
|
There was a problem hiding this comment. ㅋㅋㅋㅋㅋ이거 전에 급하게 한거라서 없는듯 추가할게요 |
||
| const { author, comment } = recipeComment; | ||
|
|
||
| return ( | ||
| <li className={container}> | ||
| <span className={commentItem['nickname']}>{author.nickname}</span> | ||
| <p className={commentItem['content']}>{comment}</p> | ||
| </li> | ||
| ); | ||
| }; | ||
|
|
||
| export default CommentItem; | ||
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,16 @@ | ||
| import { style, styleVariants } from '@vanilla-extract/css'; | ||
|
|
||
| export const container = style({ | ||
| display: 'flex', | ||
| gap: 6, | ||
| }); | ||
|
|
||
| const baseText = style({ | ||
| color: '#3D3D3D', | ||
| fontSize: '1.2rem', | ||
| }); | ||
|
|
||
| export const commentItem = styleVariants({ | ||
| nickname: [baseText, { fontWeight: 600, whiteSpace: 'nowrap' }], | ||
|
There was a problem hiding this comment. 요 부분 fontWeight는 vars에서 가져와서 쓸 수 있나요??? |
||
| content: [baseText, { fontWeight: 400 }], | ||
| }); | ||
Oops, something went wrong.
Oops, something went wrong.
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.
얘가 지금 저랑 겹치는 아이콘인데, 저는 disk라는 이름으로 해놨거든요?
만약 제 레시피 PR이 먼저 머지되면, 타미가 땡긴후에 지우면 되고
타미 PR이 먼저 머지되면, 제가 땡긴 후에 컴포넌트도 교체할게요!
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.
오케............