Merge pull request #28 from ZeroWastePlatform/feature/ZERO-28-myPageW…

…ireframe feat : mypage 구현
ZeroWastePlatform · Apr 10, 2023 · 9a06559 · 9a06559
2 parents 8f8b6a0 + da25fc3
commit 9a06559
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 45 deletions.
diff --git a/src/assets/images/coupon.svg b/src/assets/images/coupon.svg
diff --git a/src/components/MyPage/Common/ProfileAside/ProfileAside.style.ts b/src/components/MyPage/Common/ProfileAside/ProfileAside.style.ts
@@ -53,7 +53,6 @@ export const MemberDataRow = styled.div`
   border-top: 1px solid #a7a7a8;
   display: flex;
   gap: 40px;
-  width: 250px;
   img {
     width: 30px;
     height: 30px;

diff --git a/src/components/MyPage/Common/ProfileAside/ProfileAside.tsx b/src/components/MyPage/Common/ProfileAside/ProfileAside.tsx
@@ -26,13 +26,12 @@ import { useEffect } from "react";
 import customAPI from "../../../../lib/customAPI";
 
 interface IProfileAsideProps {
-  setSelectCategoryNav: any;
+  setSelectCategoryNav: React.Dispatch<React.SetStateAction<string>>;
 }
 
-const ProfileAside = ({ setSelectCategoryNav }) => {
+const ProfileAside = ({ setSelectCategoryNav }: IProfileAsideProps) => {
   const navigate = useNavigate();
   const userInfo = useRecoilValue(userInfoAtom);
-
   const accessToken = localStorage.getItem("accessToken");
 
   const memberInfoAPI = async (): Promise<void> => {
@@ -51,7 +50,7 @@ const ProfileAside = ({ setSelectCategoryNav }) => {
     <ProfileAsideLayout>
       <img src={ProfileImg} />
       <ProfileBox>
-        <PropfileNickNameSpan>{userInfo.nickname}</PropfileNickNameSpan>
+        <PropfileNickNameSpan>{userInfo.nickname}그리너스 조아</PropfileNickNameSpan>
         <PropfileLevelSpan>LV. {userInfo.level} 프로 그리너스</PropfileLevelSpan>
         <MemberInfoButton
           onClick={() => {

diff --git a/src/components/MyPage/Common/ProfileAside/ProfileAsideContainer.tsx b/src/components/MyPage/Common/ProfileAside/ProfileAsideContainer.tsx
diff --git a/src/components/MyPage/Community/CommunityHook.tsx b/src/components/MyPage/Community/CommunityHook.tsx
diff --git a/src/components/MyPage/ContentList/ContentListHook.tsx b/src/components/MyPage/ContentList/ContentListHook.tsx
diff --git a/src/components/MyPage/MemberInfo/MemberInfo.tsx b/src/components/MyPage/MemberInfo/MemberInfo.tsx
@@ -31,7 +31,6 @@ import {
   PostCodeInput,
   RequiredItemSpan,
 } from "./MemberInfo.style";
-import KakaoImg from "../../../assets/images/kakao.svg";
 import { useRef, useState } from "react";
 import ZipCodeModal from "../../Common/ZipCodeModal/ZipCodeModal";
 import customAPI from "../../../lib/customAPI";

diff --git a/src/components/MyPage/MyOrderList/MyOrderListContainer.tsx b/src/components/MyPage/MyOrderList/MyOrderListContainer.tsx
@@ -1,34 +1,7 @@
 import MyOrderList from "./MyOrderList";
 
-const selectList = [
-  {
-    id: 1,
-    period: "기간",
-  },
-  {
-    id: 2,
-    period: "1개월 전 ",
-  },
-  {
-    id: 3,
-    period: "3개월 전 ",
-  },
-  {
-    id: 4,
-    period: "6개월 전 ",
-  },
-  {
-    id: 5,
-    period: "1년 전 ",
-  },
-  {
-    id: 6,
-    period: "3년 전 ",
-  },
-];
-
 const MyOrderListContainer = () => {
-  return <MyOrderList selectList={selectList} />;
+  return <MyOrderList />;
 };
 
 export default MyOrderListContainer;
diff --git a/src/components/MyPage/MyOrderList/MyOrderListHook.tsx b/src/components/MyPage/MyOrderList/MyOrderListHook.tsx
diff --git a/src/components/MyPage/MyPageHook.tsx b/src/components/MyPage/MyPageHook.tsx
diff --git a/src/components/MyPage/ProductInterest/ProductInterest.style.ts b/src/components/MyPage/ProductInterest/ProductInterest.style.ts
@@ -43,7 +43,7 @@ export const EditButon = styled.button`
 export const ProductInterestSection = styled.section`
   display: grid;
   grid-template-columns: repeat(2, 1fr);
-  grid-row-gap: 30px;
+  grid-gap: 30px;
 `;
 
 export const ProductArticle = styled.article`

diff --git a/src/components/MyPage/ProductInterest/ProductInterestHook.tsx b/src/components/MyPage/ProductInterest/ProductInterestHook.tsx