diff --git a/public/image/graphics/image_spicker_apply.png b/public/image/graphics/image_spicker_apply.png index 9183063d..3856ead5 100644 Binary files a/public/image/graphics/image_spicker_apply.png and b/public/image/graphics/image_spicker_apply.png differ diff --git a/src/pages/class/components/NoticeCard/NoticeCard.style.ts b/src/pages/class/components/NoticeCard/NoticeCard.style.ts index 7ad2884d..4edaa311 100644 --- a/src/pages/class/components/NoticeCard/NoticeCard.style.ts +++ b/src/pages/class/components/NoticeCard/NoticeCard.style.ts @@ -15,7 +15,8 @@ export const noticeCardContainer = (theme: Theme) => css` `; export const profileWrapper = css` - ${flexGenerator('row', 'flex-start')}; + ${flexGenerator('row', 'space-between', 'flex-start')}; + width: 100%; gap: 1.2rem; `; @@ -27,6 +28,7 @@ export const profileImage = css` export const profileTextBox = css` ${flexGenerator('column', 'center', 'flex-start')}; + margin-top: 0.4rem; `; export const profilePosition = (theme: Theme) => css` @@ -97,3 +99,8 @@ export const noticeCommentNumber = (theme: Theme) => css` color: ${theme.color.midgray2}; ${theme.font['body04-m-12']}; `; + +export const profileCardWrapper = css` + ${flexGenerator('row', 'flex-start', 'center')} + gap:1.2rem +`; diff --git a/src/pages/class/components/NoticeCard/NoticeCard.tsx b/src/pages/class/components/NoticeCard/NoticeCard.tsx index 085cc0e3..4297c4b8 100644 --- a/src/pages/class/components/NoticeCard/NoticeCard.tsx +++ b/src/pages/class/components/NoticeCard/NoticeCard.tsx @@ -1,4 +1,5 @@ -import { IcSpickerMark, IcComment } from '@svg'; +import { Label } from '@components'; +import { IcSpickerMark, IcComment, IcLock, IcUnlock } from '@svg'; import { formatCreatedDate } from '@utils'; import { @@ -19,6 +20,7 @@ import { noticeComment, noticeCommentNumber, noticeWrapper, + profileCardWrapper, } from './NoticeCard.style'; import { components } from '@schema'; @@ -31,20 +33,41 @@ interface NoticeCardProps { } const NoticeCard = ({ noticeData, onClick }: NoticeCardProps) => { - const { hostNickName, hostImageUrl, title, content, date, noticeImageUrl, commentNumber } = - noticeData; + const { + hostNickName, + hostImageUrl, + title, + content, + date, + noticeImageUrl, + commentNumber, + isPrivate, + } = noticeData; return (
- {`${hostNickName}의 -
- 스픽커 -
- {hostNickName} - +
+ {`${hostNickName}의 +
+ 스픽커 +
+ {hostNickName} + +
+
+ {isPrivate ? ( + + ) : ( + + )} +

{title}

diff --git a/src/pages/guest/page/GuestMyClass/GuestMyClass.tsx b/src/pages/guest/page/GuestMyClass/GuestMyClass.tsx index 2123391c..c614b345 100644 --- a/src/pages/guest/page/GuestMyClass/GuestMyClass.tsx +++ b/src/pages/guest/page/GuestMyClass/GuestMyClass.tsx @@ -77,7 +77,7 @@ const GuestMyClass = () => {
- {activeTab === '신청한' && ( + {activeTab === '신청한' && (currentData?.length ?? 0) > 0 && (