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.

Sign up for GitHub

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

[Feat/#169] 회의 입장페이지에서 회의명 보여주기 #175

Merged
merged 1 commit into from
Sep 18, 2023
Merged

[Feat/#169] 회의 입장페이지에서 회의명 보여주기 #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions src/pages/SteppingStone/SteppingLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,13 @@ function SteppingLayout({ steppingType }: SteppingProps) {
const navigate = useNavigate();
const { meetingId } = useParams();

const [meetingTitle, setMeetingTitle] = useState('');

const isConfirmedMeet = async () => {
// 회의명 붙이기
const result = await client.get(`/meeting/${meetingId}`);
console.log(result);

setMeetingTitle(result.data.data.title);
Copy link
Member

Choose a reason for hiding this comment

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

P3) 구조분해할당 사용하시면 더 가독성있을 것 같습니다!

if (result.data.code === 409) {
navigate(`/q-card/${meetingId}`);
}
Expand All @@ -37,7 +41,7 @@ function SteppingLayout({ steppingType }: SteppingProps) {
<>
<SteppingWrapper>
<Header position={'stepping'} />
<SteppingBody steppingType={steppingType} />
<SteppingBody steppingType={steppingType} meetingTitle={meetingTitle} />
<SteppingBtnSection steppingType={steppingType} />
</SteppingWrapper>
</>
Expand Down
7 changes: 4 additions & 3 deletions src/pages/SteppingStone/components/SteppingBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const bodyType: BodyType = {
},
meetEntrance: {
img: <img src={stepingPlus} alt="png" />,
main: '에이셉 전체회의', // 찬우오빠.. 내가 범인 찾았어 - 2023.09.11 은서가
main: '',
sub: (
<>
<Text font={'title2'} color={`${theme.colors.grey4}`}>
Expand Down Expand Up @@ -67,16 +67,17 @@ const bodyType: BodyType = {

interface SteppingProps {
steppingType: string;
meetingTitle?: string;
Copy link
Member

Choose a reason for hiding this comment

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

P4) api요청이 이루어지면 undifined되는 경우가 있을까요?? 또는 prop이 안들어오는 경우가 있는지 궁금합니다(진짜 몰라서 물어봄)

}

function SteppingBody({ steppingType }: SteppingProps) {
function SteppingBody({ steppingType, meetingTitle }: SteppingProps) {
const stepInfo = bodyType[steppingType];
return (
<SteppingBodyWrapper>
<ImageSection>{stepInfo.img}</ImageSection>
<SteppingMentSection>
<Text font={'head1'} color={`${theme.colors.white}`}>
{stepInfo.main}
{meetingTitle ? meetingTitle : stepInfo.main}
</Text>
<SubMentWrapper>{stepInfo.sub}</SubMentWrapper>
</SteppingMentSection>
Expand Down
Loading