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

[FE] 사용성 개선 - Title component 변경 및 UX writing 수정 #352

Merged
merged 5 commits into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 2 additions & 2 deletions HDesign/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion HDesign/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "haengdong-design",
"version": "0.1.69",
"version": "0.1.72",
"description": "",
"main": "./dist/index.js",
"module": "./dist/index.js",
Expand Down
6 changes: 5 additions & 1 deletion HDesign/src/components/Text/Text.style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,9 @@ export const getSizeStyling = ({size, textColor, theme}: Required<TextStyleProps

const colorStyle = css({color: theme.colors[textColor]});

return [style[size], colorStyle];
const baseStyle = css({
whiteSpace: 'pre-line',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

엔터가 적용되도록 설정! 좋아요👍👍

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

줄바꿈 편-안

});

return [style[size], colorStyle, baseStyle];
};
3 changes: 2 additions & 1 deletion HDesign/src/components/Title/Title.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ const meta = {
},
args: {
title: '페이지 제목이에요',
description: '이곳에는 페이지 설명이 들어가요. 페이지에 대한 설명을 자세하게 적어주면 좋아요 :)',
description: `이곳에는 페이지 설명이 들어가요.
페이지에 대한 설명을 자세하게 적어주면 좋아요 :)`,
price: 100000,
},
} satisfies Meta<typeof Title>;
Expand Down
8 changes: 6 additions & 2 deletions HDesign/src/components/Title/Title.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/** @jsxImportSource @emotion/react */
import Flex from '@components/Flex/Flex';
import Text from '@components/Text/Text';
import {priceContainerStyle, titleContainerStyle} from '@components/Title/Title.style';
import {TitleProps} from '@components/Title/Title.type';
Expand All @@ -11,7 +12,7 @@ export const Title: React.FC<TitleProps> = ({title, description, price}: TitlePr
<div css={titleContainerStyle(theme)}>
<Text size="subTitle">{title}</Text>
{description && (
<Text textColor="darkGray" size="caption">
<Text textColor="darkGray" size="body">
{description}
</Text>
)}
Expand All @@ -20,7 +21,10 @@ export const Title: React.FC<TitleProps> = ({title, description, price}: TitlePr
<Text textColor="gray" size="caption">
전체 지출 금액
</Text>
<Text>{price.toLocaleString('ko-kr')}원</Text>
<Flex alignItems="center" gap="0.25rem">
<Text>{price.toLocaleString('ko-kr')}</Text>
<Text size="caption">원</Text>
</Flex>
Comment on lines +24 to +27
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

세세한 것까지 스타일 신경 쓰기 굳이에요~ 이것도 나중에 컴포넌트로 만들어도 좋을 것 같아요! 분명 많이 쓰일 것 같아서!

</div>
)}
</div>
Expand Down
8 changes: 4 additions & 4 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"dependencies": {
"@emotion/react": "^11.11.4",
"@sentry/react": "^8.25.0",
"haengdong-design": "^0.1.69",
"haengdong-design": "^0.1.72",
"react": "^18.3.1",
"react-copy-to-clipboard": "^5.1.0",
"react-dom": "^18.3.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const SetInitialMemberListModal = ({isOpenBottomSheet, setIsOpenBottomSheet}: Se
return (
<BottomSheet isOpened={isOpenBottomSheet} onClose={() => setIsOpenBottomSheet(false)}>
<div css={setInitialMemberListModalStyle}>
<Text size="bodyBold">초기 인원 설정하기</Text>
<Text size="bodyBold">시작 인원 추가하기</Text>
<div css={setInitialMemberListModalInputGroupStyle}>
<LabelGroupInput labelText="이름" errorText={errorMessage}>
{inputList.map(({value, index}) => (
Expand Down
7 changes: 4 additions & 3 deletions client/src/pages/EventPage/AdminPage/AdminPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ const AdminPage = () => {

const getTitleDescriptionByInitialMemberSetting = () => {
return allMemberList.length > 0
? '“행동 추가하기” 버튼을 눌러서 지출 내역 및 인원 변동사항을 추가해 주세요.'
: '“초기인원 설정하기” 버튼을 눌러서 행사 초기 인원을 설정해 주세요.';
? `지출 내역 및 인원 변동을 추가해 주세요.
인원 변동을 기준으로 몇 차인지 나뉘어져요.`
Comment on lines +39 to +40
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

확실히 인원 변동을 기준으로 흐름이 보여진다는 것이 강조될 것 같아요!

: '“시작 인원 추가” 버튼을 눌러 행사의 시작부터 참여하는 사람들의 이름을 입력해 주세요.';
};

return (
Expand All @@ -55,7 +56,7 @@ const AdminPage = () => {
<section css={receiptStyle}>
<StepList />
<FixedButton
children={allMemberList.length === 0 ? '초기인원 설정하기' : '행동 추가하기'}
children={allMemberList.length === 0 ? '시작인원 추가하기' : '행동 추가하기'}
onClick={() => setIsOpenFixedBottomBottomSheet(prev => !prev)}
/>
{isOpenFixedButtonBottomSheet && (
Expand Down
Loading