Skip to content

Commit 3470e59

Browse files
authored
Merge pull request #368 from kookmin-sw/frontend/fix/#367-meeting-modal-profile-image
[Fix/#367] 회의 생성 모달 프로필 사진 추가
2 parents 8ff7ad3 + 487f2e9 commit 3470e59

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

frontend/src/components/projects/node-flow/ParticipantsSelect.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export interface ParticipantOption {
1111
id: number;
1212
name: string;
1313
email?: string;
14+
profileImageUrl?: string;
1415
}
1516

1617
interface ParticipantsSelectProps {
@@ -136,7 +137,7 @@ export const ParticipantsSelect = ({
136137
onClick={() => addParticipant(option)}
137138
className="hover:bg-fill-normal flex w-full items-center gap-3 border-none bg-transparent px-5 py-2 text-left"
138139
>
139-
<Avatar variant="person" size="xsmall" alt={option.name} />
140+
<Avatar variant="person" size="xsmall" src={option.profileImageUrl} alt={option.name} />
140141
<span className="text-body-1 text-label-normal flex-1 truncate font-normal">
141142
{option.name}
142143
</span>
@@ -164,7 +165,7 @@ export const ParticipantsSelect = ({
164165
inputRef.current?.focus();
165166
}}
166167
className={cn(
167-
'border-line-normal-neutral shadow-normal-xsmall flex h-12 w-full cursor-text items-center gap-2 overflow-hidden rounded-xl border bg-transparent focus-within:border-primary-40',
168+
'border-line-normal-neutral shadow-normal-xsmall focus-within:border-primary-40 flex h-12 w-full cursor-text items-center gap-2 overflow-hidden rounded-xl border bg-transparent',
168169
open && 'border-primary-40',
169170
)}
170171
>
@@ -175,7 +176,7 @@ export const ParticipantsSelect = ({
175176
size="medium"
176177
variant="solid"
177178
disableInteraction
178-
leadingContent={<Avatar variant="person" size="xsmall" alt={item.name} />}
179+
leadingContent={<Avatar variant="person" size="xsmall" src={item.profileImageUrl} alt={item.name} />}
179180
trailingContent={
180181
<span
181182
role="button"

frontend/src/hooks/useNodeMenuActions.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ function ConnectedMeetingCreateModal({
5353
id: m.userId ?? 0,
5454
name: m.nickname ?? '',
5555
email: m.email,
56+
profileImageUrl: m.profileImageUrl ?? undefined,
5657
}))}
5758
onClose={onClose}
5859
onCreate={async (payload) => {
@@ -142,6 +143,7 @@ function ConnectedMeetingEditModal({
142143
id: m.userId ?? 0,
143144
name: m.nickname ?? '',
144145
email: m.email ?? '',
146+
profileImageUrl: m.profileImageUrl ?? undefined,
145147
}))}
146148
initialValues={initialValues}
147149
onClose={onClose}

0 commit comments

Comments
 (0)