-
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.
[Feature/BAR-255] 메모가 없는 경우, 끄적이는 페이지 안내 메시지 노출 (#83)
* feat: 글 수정 및 삭제시 토스트 노출 * fix: 메모 저장 해제인 경우, 툴팁 노출 제거 * refactor: WriteTabContent 컴포넌트 분리 * refactor: DayMessage 컴포넌트 적용 및 중복 코드 제거 * fix: 맞춤법 수정 사항이 없는 경우도 카드 메뉴 보이도록 수정 * feat: 신규 유저인 경우, 끄적이는 페이지 안내 메시지 노출 * style(Layout): min-width 값 적용
- Loading branch information
Showing
20 changed files
with
284 additions
and
182 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
import { type PropsWithChildren } from 'react'; | ||
|
||
import Icon from '@components/Icon'; | ||
import { type Icons } from '@constants/icon'; | ||
|
||
import * as styles from './style.css'; | ||
|
||
interface DayMessageProps { | ||
icon?: Icons; | ||
} | ||
|
||
const DayMessage = ({ children, icon }: PropsWithChildren<DayMessageProps>) => { | ||
return ( | ||
<div className={styles.wrapper}> | ||
<div className={styles.message}> | ||
{icon && <Icon icon={icon} width={20} height={20} />} | ||
<span className={styles.text}>{children}</span> | ||
</div> | ||
</div> | ||
); | ||
}; | ||
|
||
export default DayMessage; |
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,29 @@ | ||
import { style } from '@vanilla-extract/css'; | ||
|
||
import { sprinkles } from '@styles/sprinkles.css'; | ||
import { COLORS } from '@styles/tokens'; | ||
import * as utils from '@styles/utils.css'; | ||
|
||
export const wrapper = style([ | ||
utils.flexCenter, | ||
{ | ||
marginTop: '12px', | ||
marginBottom: '24px', | ||
}, | ||
]); | ||
|
||
export const message = style([ | ||
utils.flexCenter, | ||
{ | ||
padding: '6px 28px', | ||
border: `1px solid ${COLORS['Grey/200']}`, | ||
borderRadius: '100px', | ||
}, | ||
]); | ||
|
||
export const text = style([ | ||
sprinkles({ typography: '15/Body/Medium' }), | ||
{ | ||
marginLeft: '6px', | ||
}, | ||
]); |
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 |
---|---|---|
@@ -1,11 +1,61 @@ | ||
import Message from '@assets/images/message.svg'; | ||
import Card from '@components/Card'; | ||
import DayMessage from '@components/DayMessage'; | ||
import Icon from '@components/Icon'; | ||
import Responsive from '@components/Responsive'; | ||
|
||
import * as styles from './style.css'; | ||
|
||
const WriteGuide = () => { | ||
const EXAMPLE_CARD = [ | ||
{ | ||
title: '자료 확인 요청', | ||
description: | ||
'안녕하세요, 바로님. 현재 baro 추천 상품 팝업 프로젝트에 대한 세부 기획 작업 진행 중입니다. 관련하여 첨부된 pdf 파일을 차주 목요일까지 확인 후 피드백 주시면 프로젝트 진행에 큰 도움이 될 것 같습니다. 감사합니다.', | ||
}, | ||
{ | ||
title: '권한 요청', | ||
description: | ||
'안녕하세요, 바로님. 다름이 아니라 업무 진행을 위해 JIRA 권한을 받고자 하는데 시간 괜찮으실 때 권한 추가해 주실 수 있을까요?', | ||
}, | ||
{ | ||
title: '일정 참석 요청', | ||
description: | ||
'바로님, 최종으로 업무 산출물 공유 드리기 전에 여쭤보고 싶은 마이너한 부분들이 있습니다. 혹시 시간 괜찮으실 때 논의 가능하실까요?', | ||
}, | ||
]; | ||
|
||
interface GuideProps { | ||
hasMemo: boolean; | ||
} | ||
|
||
const Guide = ({ hasMemo }: GuideProps) => { | ||
return ( | ||
<p className={styles.guideText}> | ||
끄적인 글은 일주일 후에 사라져요! 오래 간직하고 싶다면 저장해주세요 😊 | ||
</p> | ||
<> | ||
{hasMemo ? ( | ||
<p className={styles.guide}> | ||
<span className={styles.guideText}> | ||
끄적인 글은 일주일 후에 사라져요! 오래 간직하고 싶다면 저장해주세요 | ||
</span> | ||
<Icon icon="smileFace" width={20} height={20} /> | ||
</p> | ||
) : ( | ||
<div className={styles.newMemberGuide}> | ||
<div className={styles.guideImage}> | ||
<Message /> | ||
</div> | ||
<DayMessage>끄적이는 예시</DayMessage> | ||
<Responsive> | ||
{EXAMPLE_CARD.map(({ title, description }) => ( | ||
<Card key={title} color="grey"> | ||
<Card.Header>{title}</Card.Header> | ||
<Card.Body>{description}</Card.Body> | ||
</Card> | ||
))} | ||
</Responsive> | ||
</div> | ||
)} | ||
</> | ||
); | ||
}; | ||
|
||
export default WriteGuide; | ||
export default Guide; |
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,12 +1,32 @@ | ||
import { style } from '@vanilla-extract/css'; | ||
|
||
import { sprinkles } from '@styles/sprinkles.css'; | ||
import { COLORS } from '@styles/tokens'; | ||
import * as utils from '@styles/utils.css'; | ||
|
||
export const guideText = style({ | ||
marginTop: '220px', | ||
marginBottom: '12px', | ||
color: COLORS['Grey/500'], | ||
textAlign: 'center', | ||
fontSize: '15px', | ||
fontWeight: '500', | ||
export const guide = style([ | ||
utils.flexCenter, | ||
{ | ||
marginTop: '220px', | ||
marginBottom: '12px', | ||
gap: '2px', | ||
}, | ||
]); | ||
|
||
export const guideText = style([ | ||
sprinkles({ typography: '15/Title/Medium' }), | ||
{ | ||
color: COLORS['Grey/500'], | ||
}, | ||
]); | ||
|
||
export const newMemberGuide = style({ | ||
marginBottom: '48px', | ||
}); | ||
|
||
export const guideImage = style({ | ||
display: 'flex', | ||
justifyContent: 'center', | ||
marginTop: '240px', | ||
marginBottom: '64px', | ||
}); |
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,36 +1,8 @@ | ||
import { style } from '@vanilla-extract/css'; | ||
|
||
import { COLORS } from '@styles/tokens'; | ||
|
||
export const container = style({ | ||
marginBottom: '48px', | ||
display: 'flex', | ||
flexDirection: 'column', | ||
gap: '64px', | ||
}); | ||
|
||
export const dateLabelWrapper = style({ | ||
display: 'flex', | ||
justifyContent: 'center', | ||
alignItems: 'center', | ||
marginTop: '12px', | ||
marginBottom: '24px', | ||
}); | ||
|
||
export const dateLabel = style({ | ||
padding: '6px 28px', | ||
display: 'flex', | ||
justifyContent: 'center', | ||
alignItems: 'center', | ||
border: `1px solid ${COLORS['Grey/200']}`, | ||
borderRadius: '100px', | ||
}); | ||
|
||
export const dateLabelText = style({ | ||
marginLeft: '6px', | ||
color: COLORS['Grey/700'], | ||
fontSize: '15px', | ||
fontWeight: 500, | ||
lineHeight: '24px', | ||
letterSpacing: '-0.2px', | ||
}); |
Oops, something went wrong.