Skip to content

Commit 97f25ed

Browse files
authored
Merge pull request #86 from part3-4team-Taskify/feature/Gnb
[Refactor] 폴더명 변경, 타입 공통화
2 parents 8845a42 + 1fa79c1 commit 97f25ed

26 files changed

+12
-78
lines changed

src/api/members.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import axios from "axios";
2-
import { MemberType } from "@/components/gnb/type";
2+
import { MemberType } from "@/types/users";
33

44
interface ApiResponse {
55
members: MemberType[]; // 실제 데이터
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useState, useEffect } from "react";
22
import { useRouter } from "next/router";
3-
import SkeletonUser from "./skeletonUser";
4-
import { MemberType, UserType } from "./type";
3+
import SkeletonUser from "../../shared/skeletonUser";
4+
import { MemberType, UserType } from "../../types/users";
55
import { getMembers } from "@/api/members";
66
import { getUserInfo } from "@/api/user";
77
import RandomProfile from "../table/member/RandomProfile";
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useState, useEffect } from "react";
22
import { useRouter } from "next/router";
3-
import SkeletonUser from "./skeletonUser";
4-
import { UserType } from "./type";
3+
import SkeletonUser from "../../shared/skeletonUser";
4+
import { UserType } from "../../types/users";
55
import { getUserInfo } from "@/api/user";
66
import RandomProfile from "../table/member/RandomProfile";
77
import NewDashboard from "../modal/NewDashboard";
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useState, useEffect } from "react";
22
import { useRouter } from "next/router";
3-
import SkeletonUser from "./skeletonUser";
4-
import { MemberType, UserType } from "./type";
3+
import SkeletonUser from "../../shared/skeletonUser";
4+
import { MemberType, UserType } from "../../types/users";
55
import { getMembers } from "@/api/members";
66
import { getUserInfo } from "@/api/user";
77
import RandomProfile from "../table/member/RandomProfile";
@@ -105,7 +105,7 @@ const HeaderMyPage = () => {
105105
{members.slice(0, 4).map((member) => (
106106
<img
107107
key={member.id}
108-
src={member.profileImageUrl || "/svgs/dummy-icon.png"}
108+
src={member.profileImageUrl}
109109
alt={member.nickname}
110110
className="w-[34px] h-[34px] md:w-[38px] md:h-[38px] rounded-full border-[2px] border-white"
111111
/>
File renamed without changes.

0 commit comments

Comments
 (0)