From da25fc32acc32bc0193782ad02cae4ecd1dfb917 Mon Sep 17 00:00:00 2001 From: dlantjdgkgk Date: Mon, 10 Apr 2023 13:08:19 +0900 Subject: [PATCH] =?UTF-8?q?feat=20:=20mypage=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/coupon.svg | 8 +++-- .../Common/ProfileAside/ProfileAside.style.ts | 1 - .../Common/ProfileAside/ProfileAside.tsx | 7 ++--- .../ProfileAside/ProfileAsideContainer.tsx | 7 ----- .../MyPage/Community/CommunityHook.tsx | 0 .../MyPage/ContentList/ContentListHook.tsx | 0 .../MyPage/MemberInfo/MemberInfo.tsx | 1 - .../MyOrderList/MyOrderListContainer.tsx | 29 +------------------ .../MyPage/MyOrderList/MyOrderListHook.tsx | 0 src/components/MyPage/MyPageHook.tsx | 0 .../ProductInterest/ProductInterest.style.ts | 2 +- .../ProductInterest/ProductInterestHook.tsx | 0 12 files changed, 10 insertions(+), 45 deletions(-) delete mode 100644 src/components/MyPage/Common/ProfileAside/ProfileAsideContainer.tsx delete mode 100644 src/components/MyPage/Community/CommunityHook.tsx delete mode 100644 src/components/MyPage/ContentList/ContentListHook.tsx delete mode 100644 src/components/MyPage/MyOrderList/MyOrderListHook.tsx delete mode 100644 src/components/MyPage/MyPageHook.tsx delete mode 100644 src/components/MyPage/ProductInterest/ProductInterestHook.tsx diff --git a/src/assets/images/coupon.svg b/src/assets/images/coupon.svg index 3ac3562..14cd675 100644 --- a/src/assets/images/coupon.svg +++ b/src/assets/images/coupon.svg @@ -1,4 +1,6 @@ - - - + + + + + diff --git a/src/components/MyPage/Common/ProfileAside/ProfileAside.style.ts b/src/components/MyPage/Common/ProfileAside/ProfileAside.style.ts index c3217bb..b27a5b9 100644 --- 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 index a73c98f..15953e7 100644 --- 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>; } -const ProfileAside = ({ setSelectCategoryNav }) => { +const ProfileAside = ({ setSelectCategoryNav }: IProfileAsideProps) => { const navigate = useNavigate(); const userInfo = useRecoilValue(userInfoAtom); - const accessToken = localStorage.getItem("accessToken"); const memberInfoAPI = async (): Promise => { @@ -51,7 +50,7 @@ const ProfileAside = ({ setSelectCategoryNav }) => { - {userInfo.nickname} + {userInfo.nickname}그리너스 조아 LV. {userInfo.level} 프로 그리너스 { diff --git a/src/components/MyPage/Common/ProfileAside/ProfileAsideContainer.tsx b/src/components/MyPage/Common/ProfileAside/ProfileAsideContainer.tsx deleted file mode 100644 index f0a1eda..0000000 --- a/src/components/MyPage/Common/ProfileAside/ProfileAsideContainer.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import ProfileAside from "./ProfileAside"; - -const ProfileAsideContainer = () => { - return ; -}; - -export default ProfileAsideContainer; diff --git a/src/components/MyPage/Community/CommunityHook.tsx b/src/components/MyPage/Community/CommunityHook.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/MyPage/ContentList/ContentListHook.tsx b/src/components/MyPage/ContentList/ContentListHook.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/MyPage/MemberInfo/MemberInfo.tsx b/src/components/MyPage/MemberInfo/MemberInfo.tsx index 6f9ac29..3cf9e21 100644 --- 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 index 3cac3a0..4b7f56b 100644 --- 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 ; + return ; }; export default MyOrderListContainer; diff --git a/src/components/MyPage/MyOrderList/MyOrderListHook.tsx b/src/components/MyPage/MyOrderList/MyOrderListHook.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/MyPage/MyPageHook.tsx b/src/components/MyPage/MyPageHook.tsx deleted file mode 100644 index e69de29..0000000 diff --git a/src/components/MyPage/ProductInterest/ProductInterest.style.ts b/src/components/MyPage/ProductInterest/ProductInterest.style.ts index 6b843c7..b4f64a1 100644 --- 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 deleted file mode 100644 index e69de29..0000000