fix: 유저 정보 데이터 저장 수정

2024-Hanium-PlanDing · Jul 1, 2024 · 3d12dd1 · 3d12dd1
1 parent eec96dd
commit 3d12dd1
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 9 deletions.
diff --git a/src/components/ListPage/Information/UserCard/UserInfoContainer.jsx b/src/components/ListPage/Information/UserCard/UserInfoContainer.jsx
@@ -1,6 +1,22 @@
+import { useSelector } from 'react-redux'
+
 const UserInfoContainer = () => {
+  const userInfo = useSelector(state => state.user.user)
+
   return (
-    <div className="rounded-md w-[280px] h-[136px] border border-black"></div>
+    <div className="rounded-md w-[280px] h-[136px] bg-neutrals-20 py-5 px-4">
+      <div className="flex items-center">
+        <img
+          src={userInfo.userInfo?.profileImage}
+          alt="유저 프로필"
+          className="w-[40px] h-[40px] rounded-full"
+        />
+        <div className="flex flex-col ml-2">
+          <p>{userInfo.userInfo?.username}</p>
+          <p>{userInfo.userInfo?.userCode}</p>
+        </div>
+      </div>
+    </div>
   )
 }
 

diff --git a/src/components/ListPage/MainContent/MainContentContainer.jsx b/src/components/ListPage/MainContent/MainContentContainer.jsx
@@ -7,9 +7,9 @@ const MainContentContainer = () => {
     <div className="w-[1012px] h-[848px] rounded-lg shadow-md p-5 border border-black">
       <div className="border border-black w-full h-full flex flex-col">
         <MainTitle />
-        <SubTitle />
+        <SubTitle text="My Plan" />
         <ItemContainer />
-        <SubTitle />
+        <SubTitle text="Team Plan" />
         <ItemContainer />
       </div>
     </div>

diff --git a/src/components/ListPage/MainContent/atom/MainTitle.jsx b/src/components/ListPage/MainContent/atom/MainTitle.jsx
@@ -1,6 +1,6 @@
 const MainTitle = () => {
   return (
-    <div className="w-full h-[80px] flex items-center pl-4 border border-black">
+    <div className="w-full h-[80px] flex items-center pl-4 bg-primary-200 text-neutrals-0">
       Planding
     </div>
   )

diff --git a/src/components/ListPage/MainContent/atom/SubTitle.jsx b/src/components/ListPage/MainContent/atom/SubTitle.jsx
@@ -1,7 +1,7 @@
-const SubTitle = () => {
+const SubTitle = ({ text }) => {
   return (
     <div className="w-full h-[66px] flex items-center pl-4 border border-black">
-      My Plan
+      {text}
     </div>
   )
 }

diff --git a/src/pages/ListPage.jsx b/src/pages/ListPage.jsx
@@ -15,8 +15,8 @@ const ListPage = () => {
           nav(`/personal`)
         }}>
         <FavoritesContainer />
-        <MainContentContainer userInfo={userInfo} />
-        <InformationContainer />
+        <MainContentContainer />
+        <InformationContainer userInfo={userInfo} />
       </div>
     </div>
   )

diff --git a/src/services/User/userController.js b/src/services/User/userController.js
@@ -8,7 +8,8 @@ export const UserInfo = token => async dispatch => {
         Authorization: `Bearer ${token}`
       }
     })
-    dispatch(userInfo(response.data))
+
+    dispatch(userInfo(response.data.data))
   } catch (error) {
     console.error('Error fetching user info:', error)
     throw error