From b7ef75d20463ace476542f86e9245f843114e42f Mon Sep 17 00:00:00 2001 From: funcsom Date: Mon, 31 Mar 2025 21:38:01 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=8E=A8=20design:=20speakerImage=20?= =?UTF-8?q?=EB=82=98=EC=98=A4=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../card/admin/adminSessionCard/AdminSessionCard.tsx | 7 ++++++- .../AdminSessionMessageCard.tsx | 10 +++++++++- .../card/profileContents/ProfileContents.tsx | 2 +- .../card/user/conferenceCard/ConferenceCard.tsx | 1 - src/components/common/profile/Profile.tsx | 2 +- src/pages/admin/AdminConferenceInfo.tsx | 2 +- src/pages/admin/MessageSend.tsx | 1 + src/pages/admin/adminDashboard/AdminDashboard.tsx | 3 +++ 8 files changed, 22 insertions(+), 6 deletions(-) diff --git a/src/components/card/admin/adminSessionCard/AdminSessionCard.tsx b/src/components/card/admin/adminSessionCard/AdminSessionCard.tsx index 49259003..f2b341d6 100644 --- a/src/components/card/admin/adminSessionCard/AdminSessionCard.tsx +++ b/src/components/card/admin/adminSessionCard/AdminSessionCard.tsx @@ -8,6 +8,7 @@ import { useState, useEffect } from 'react'; import { setActiveState } from '../../../../api/admin/active/setActiveState'; type AdminSessionCardProps = { title: string; + imageUrl: string | null; name: string | null; from: string | null; id: number; @@ -18,6 +19,7 @@ type AdminSessionCardProps = { const AdminSessionCard: React.FC = ({ title, + imageUrl, name, from, id, @@ -61,7 +63,10 @@ const AdminSessionCard: React.FC = ({ {title} - {name && } + {imageUrl && } + {name && ( + + )} diff --git a/src/components/card/admin/adminSessionMessageCard/AdminSessionMessageCard.tsx b/src/components/card/admin/adminSessionMessageCard/AdminSessionMessageCard.tsx index cd229c81..4b860d13 100644 --- a/src/components/card/admin/adminSessionMessageCard/AdminSessionMessageCard.tsx +++ b/src/components/card/admin/adminSessionMessageCard/AdminSessionMessageCard.tsx @@ -4,6 +4,7 @@ import ProfileContents from '../../profileContents/ProfileContents'; type AdminSessionMessageCardProps = { title: string; + imageUrl?: string | null; name?: string | null; from?: string | null; id: number; @@ -15,6 +16,7 @@ type AdminSessionMessageCardProps = { const AdminSessionMessageCard: React.FC = ({ title, + imageUrl, name, from, id, @@ -44,7 +46,13 @@ const AdminSessionMessageCard: React.FC = ({ {title} - {name && } + {name && ( + + )} ); diff --git a/src/components/card/profileContents/ProfileContents.tsx b/src/components/card/profileContents/ProfileContents.tsx index f5b1dcd2..77d59c8a 100644 --- a/src/components/card/profileContents/ProfileContents.tsx +++ b/src/components/card/profileContents/ProfileContents.tsx @@ -4,7 +4,7 @@ import Profile from '../../common/profile/Profile'; type ProfileProps = { name?: string | null; from?: string | null; - imageUrl?: string; + imageUrl?: string | null; isActive?: boolean; }; diff --git a/src/components/card/user/conferenceCard/ConferenceCard.tsx b/src/components/card/user/conferenceCard/ConferenceCard.tsx index e323155a..31ca40d0 100644 --- a/src/components/card/user/conferenceCard/ConferenceCard.tsx +++ b/src/components/card/user/conferenceCard/ConferenceCard.tsx @@ -30,7 +30,6 @@ const ConferenceCard: React.FC = ({ imageUrl, onClick, }) => { - console.log('img:', imageUrl); return ( {imageUrl && } diff --git a/src/components/common/profile/Profile.tsx b/src/components/common/profile/Profile.tsx index 79632523..930bd957 100644 --- a/src/components/common/profile/Profile.tsx +++ b/src/components/common/profile/Profile.tsx @@ -3,7 +3,7 @@ import * as S from './Profile.style'; type ProfileProps = { size?: 'L' | 'M' | 'S'; - imageUrl?: string; + imageUrl?: string | null; }; const Profile: React.FC = ({ size = 'M', imageUrl }) => { diff --git a/src/pages/admin/AdminConferenceInfo.tsx b/src/pages/admin/AdminConferenceInfo.tsx index f53d9079..206ef180 100644 --- a/src/pages/admin/AdminConferenceInfo.tsx +++ b/src/pages/admin/AdminConferenceInfo.tsx @@ -78,7 +78,7 @@ const AdminConferenceInfo = () => { state="disabled" placeholder={sessionData?.speakerName} /> - + )} diff --git a/src/pages/admin/MessageSend.tsx b/src/pages/admin/MessageSend.tsx index c5b1a5cb..d2eeb7ce 100644 --- a/src/pages/admin/MessageSend.tsx +++ b/src/pages/admin/MessageSend.tsx @@ -213,6 +213,7 @@ const MessageSend = () => { { name, endTime, startTime, + speakerImage, speakerName, speakerOrganization, location, @@ -60,8 +61,10 @@ const AdminDashboard = () => { } = data; return ( Date: Mon, 31 Mar 2025 23:05:50 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=90=9B=20fix:=20adminsessioncard=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/card/admin/adminSessionCard/AdminSessionCard.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/card/admin/adminSessionCard/AdminSessionCard.tsx b/src/components/card/admin/adminSessionCard/AdminSessionCard.tsx index f2b341d6..cf9bb543 100644 --- a/src/components/card/admin/adminSessionCard/AdminSessionCard.tsx +++ b/src/components/card/admin/adminSessionCard/AdminSessionCard.tsx @@ -63,7 +63,6 @@ const AdminSessionCard: React.FC = ({ {title} - {imageUrl && } {name && ( )}