Skip to content

Commit 83f6e3b

Browse files
authored
Merge pull request #149 from part3-4team-Taskify/feature/Gnb
[Fix] 대시보드 api 호출 에러 fix
2 parents fd9aff3 + a0c1c8b commit 83f6e3b

File tree

6 files changed

+11
-20
lines changed

6 files changed

+11
-20
lines changed

src/components/gnb/MembersProfileIconList.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export const MembersProfileIconList: React.FC<MemberIconProps> = ({
4242
{members.slice(0, maxVisibleMembers).map((member) => (
4343
<div key={member.id} className="relative rounded-full">
4444
{member.profileImageUrl ? (
45-
<div className="relative w-[34px] h-[34px] md:w-[38px] md:h-[38px] rounded-full border-[2px] border-white overflow-hidden">
45+
<div className="relative flex items-center justify-center w-[34px] h-[34px] md:w-[38px] md:h-[38px] rounded-full border-[2px] border-white overflow-hidden">
4646
<Image
4747
src={member.profileImageUrl}
4848
alt={member.nickname}
@@ -51,7 +51,9 @@ export const MembersProfileIconList: React.FC<MemberIconProps> = ({
5151
/>
5252
</div>
5353
) : (
54-
<RandomProfile name={member.nickname} />
54+
<div className="relative flex items-center justify-center w-[34px] h-[34px] md:w-[38px] md:h-[38px] rounded-full border-[2px] border-white overflow-hidden">
55+
<RandomProfile name={member.nickname} />
56+
</div>
5557
)}
5658
</div>
5759
))}

src/components/gnb/ProfileIcon.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ interface MemberIconProps {
1010
}
1111

1212
export const MemberProfileIcon: React.FC<MemberIconProps> = ({ members }) => (
13-
<div className="relative w-[34px] h-[34px] md:w-[38px] md:h-[38px] rounded-full overflow-hidden">
13+
<div className="relative flex items-center justify-center w-[34px] h-[34px] md:w-[38px] md:h-[38px] rounded-full border-[2px] border-white overflow-hidden">
1414
{members.profileImageUrl ? (
1515
<Image
1616
src={members.profileImageUrl}

src/components/modal/DeleteModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export const DeleteModal: React.FC<DeleteModalProps> = ({
5656
setIsConfirmDeleteModalOpen(true); // 재확인 모달 오픈
5757
} else {
5858
handleLeave(); // 탈퇴일 때는 바로 닫힘
59-
toast.success("대시보드 탈퇴가 완료되었습니다.");
59+
toast.error("현재 탈퇴 기능이 준비 중입니다.");
6060
}
6161
}}
6262
className="cursor-pointer bg-[var(--primary)] text-white px-3 py-1 rounded-md w-[84px] h-[32px]"

src/components/modal/NewDashboard.tsx

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import { useState } from "react";
22
import Input from "../input/Input";
33
import Image from "next/image";
44
import axios from "axios";
5+
import { createDashboard } from "@/api/dashboards";
6+
import { TEAM_ID } from "@/constants/team";
57

68
interface Dashboard {
79
id: number;
@@ -39,17 +41,7 @@ export default function NewDashboard({
3941

4042
try {
4143
setLoading(true);
42-
const response = await axios.post(
43-
`${process.env.NEXT_PUBLIC_BASE_URL}/${teamId}/dashboards`,
44-
payload,
45-
{
46-
headers: {
47-
Authorization: `Bearer ${token}`,
48-
"Content-Type": "application/json",
49-
},
50-
}
51-
);
52-
44+
const response = await createDashboard(payload);
5345
onCreate?.(response.data);
5446
onClose?.();
5547
} catch {

src/components/table/member/RandomProfile.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export default function RandomProfile({ name, index }: RandomProfileProps) {
1515

1616
return (
1717
<div
18-
className={`flex items-center justify-center text-white font-16sb rounded-full ${bgColor} w-[34px] h-[34px] md:w-[38px] md:h-[38px] border-[2px]`}
18+
className={`flex items-center justify-center text-white font-16sb rounded-full ${bgColor} w-[34px] h-[34px] md:w-[38px] md:h-[38px]`}
1919
>
2020
{name[0]}
2121
</div>

src/pages/mydashboard.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,6 @@ export default function MyDashboardPage() {
119119

120120
const handleLeave = () => {
121121
if (!selectedDashboardId) return;
122-
setDashboardList((prev) =>
123-
prev.filter((d) => d.id !== selectedDashboardId)
124-
);
125122
setIsDeleteModalOpen(false);
126123
setSelectedDashboardId(null);
127124
};
@@ -156,7 +153,7 @@ export default function MyDashboardPage() {
156153
setCurrentPage(1);
157154
}}
158155
placeholder="대시보드 이름을 입력하세요"
159-
className="w-full max-w-[332px] px-4 py-2 border border-[var(--color-gray3)] border rounded-md outline-none bg-[var(--color-white)]"
156+
className="w-full max-w-[332px] px-4 py-2 border border-[var(--color-gray3)] rounded-md outline-none bg-[var(--color-white)]"
160157
/>
161158
</section>
162159

0 commit comments

Comments
 (0)