Skip to content
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
6 changes: 3 additions & 3 deletions src/components/ProfileDetailPage/ProfileHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import profileBg from '@/assets/images/profile-bg.png';
import sampleProfile from '@/assets/basic-profile.png';
import profileBg from '../../assets/images/profile-bg.png';
import sampleProfile from '../../assets/basic-profile.png';
import { INTEREST_TYPE_LABELS } from '../../components/ProfileCard';
import Pencil from '@/assets/icons/pencil.svg';
import Pencil from '../../assets/icons/pencil.svg';
import { useNavigate } from 'react-router-dom';
import type { UserKeywordDto } from '../../types/profile';
import React, { useRef } from 'react';
Expand Down
48 changes: 24 additions & 24 deletions src/components/ProfileDetailPage/ProfileKeywords.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { useNavigate } from 'react-router-dom';
import KeywordCard from '../../components/KeywordCard';
import Pencil from '@/assets/icons/pencil.svg';
import Pencil from '../../assets/icons/pencil.svg';
import type { UserKeywordDto } from '../../types/profile';

interface ProfileKeywordsProps {
Expand All @@ -28,30 +28,30 @@ const ProfileKeywords = ({ my = false, userKeywords }: ProfileKeywordsProps) =>
)}
</div>
<p className="text-sm mb-4 font-medium">세 가지 “키워드”로 나를 소개할게요!</p>
{userKeywords
?
<>
<KeywordCard
key={userKeywords[0]?.id}
question="지금 나를 표현한 키워드는?"
keyword={userKeywords[0]?.title}
text={userKeywords[0]?.description}
/>
<KeywordCard
key={userKeywords[1]?.id}
question="요즘 나의 목표 키워드는?"
keyword={userKeywords[1]?.title}
text={userKeywords[1]?.description}
/>
<KeywordCard
key={userKeywords[2]?.id}
question="요즘 나의 최대 관심사 키워드는?"
keyword={userKeywords[2]?.title}
text={userKeywords[2]?.description}
/>
{userKeywords ? (
<>
<KeywordCard
key={userKeywords[0]?.id}
question="지금 나를 표현한 키워드는?"
keyword={userKeywords[0]?.title}
text={userKeywords[0]?.description}
/>
<KeywordCard
key={userKeywords[1]?.id}
question="요즘 나의 목표 키워드는?"
keyword={userKeywords[1]?.title}
text={userKeywords[1]?.description}
/>
<KeywordCard
key={userKeywords[2]?.id}
question="요즘 나의 최대 관심사 키워드는?"
keyword={userKeywords[2]?.title}
text={userKeywords[2]?.description}
/>
</>
: <p>로딩 중…</p>
}
) : (
<p>로딩 중…</p>
)}
</section>
);
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/ProfileDetailPage/ProfileTimeTable.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import TimeTable from '../../components/TimeTable';
import Pencil from '@/assets/icons/pencil.svg';
import Pencil from '../../assets/icons/pencil.svg';
import { useNavigate } from 'react-router-dom';
import type { TimeTableDto } from '../../types/profile';

Expand Down