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

✨ 피드 신고하기 UI 피드백 반영 #74

Merged
merged 6 commits into from
May 20, 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 public/assets/sprites/common.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 28 additions & 2 deletions src/features/feed-hides/ui/HiddenFeed.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
@keyframes fadeInCompletion {
0% {
opacity: 0;
width: 0;
height: 0;
}
100% {
opacity: 1;
}
}

.feed-hidden-wrapper {
margin-top: 30px;

Expand All @@ -6,13 +17,28 @@
flex-direction: column;
align-items: center;

.feed-hidden-checkmark {
display: flex;
justify-content: center;
align-items: center;

width: 24px;
height: 24px;

svg {
animation: fadeInCompletion 0.35s ease-in-out 0s forwards;
}
}

.hidden-reason-msg {
margin-top: 8px;
margin: 8px 0 16px;
color: $gray4;
}

.hidden-cancel-btn {
margin-top: 16px;
display: flex;
align-items: center;

padding: 5px 10px;

border-radius: 30px;
Expand Down
4 changes: 3 additions & 1 deletion src/features/feed-hides/ui/HiddenFeed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ export const HiddenFeed: React.FC<HiddenFeedProps> = ({ feedId, type }) => {
return (
<div className='feed-hidden-wrapper'>
<div className='feed-hidden-container'>
<Icon name='check_mint' width='24' height='24' />
<div className='feed-hidden-checkmark'>
<Icon name='check_mint' width='24' height='24' />
</div>
<p className='hidden-reason-msg b2md'>{reasonMsg}</p>
<button
className='hidden-cancel-btn b2md'
Expand Down
2 changes: 1 addition & 1 deletion src/features/feed-reports/consts/reports.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ export const REPORT_CATEGORIES = [
'기타',
];

export const MAX_REPORT_CONTENT_LENGTH = 60;
export const MAX_REPORT_CONTENT_LENGTH = 80;
export const UNCLICKED_STATUS_ID = -1;
11 changes: 10 additions & 1 deletion src/features/feed-reports/ui/FeedReportsForm.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,13 @@
height: 20px;
}

.item-name {
.item-name_common {
color: $gray5;
}

.item-name_clicked {
color: $gray6;
}
}
}

Expand Down Expand Up @@ -62,6 +66,11 @@
align-items: center;
gap: 4px;

.checkbox-btn {
width: 20px;
height: 20px;
}

.hide-checkbox-text {
color: $gray5;
}
Expand Down
6 changes: 5 additions & 1 deletion src/features/feed-reports/ui/FeedReportsForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ export const FeedReportsForm: React.FC<FeedReportsFormProps> = ({
height='20'
/>
</button>
<p className='item-name b1md'>{category}</p>
<p
className={`item-name_${id === clickedId ? 'clicked' : 'common'} b1md`}
>
{category}
</p>
</li>
))}
</ul>
Expand Down
Loading