From 7eda9550ba38564713c3cae8f925811a4de68def Mon Sep 17 00:00:00 2001 From: myejinni Date: Mon, 24 Jul 2023 20:41:51 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=EB=A7=88=EC=9D=B4=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80,=20=EC=95=84=EC=9D=B4=EC=BD=98=20svg=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/myChat.svg | 3 + src/assets/img/myCoupon.svg | 4 + src/assets/img/myData.svg | 7 ++ src/assets/img/myLevel.svg | 3 + src/assets/img/myLikes.svg | 4 + src/assets/img/myPlace.svg | 3 + src/assets/img/mySecurity.svg | 4 + src/assets/img/myUseage.svg | 3 + src/pages/MyPage/MyCateg.js | 165 ++++++++++++++++++++++++++++++++++ 9 files changed, 196 insertions(+) create mode 100644 src/assets/img/myChat.svg create mode 100644 src/assets/img/myCoupon.svg create mode 100644 src/assets/img/myData.svg create mode 100644 src/assets/img/myLevel.svg create mode 100644 src/assets/img/myLikes.svg create mode 100644 src/assets/img/myPlace.svg create mode 100644 src/assets/img/mySecurity.svg create mode 100644 src/assets/img/myUseage.svg create mode 100644 src/pages/MyPage/MyCateg.js diff --git a/src/assets/img/myChat.svg b/src/assets/img/myChat.svg new file mode 100644 index 0000000..eb68d52 --- /dev/null +++ b/src/assets/img/myChat.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/myCoupon.svg b/src/assets/img/myCoupon.svg new file mode 100644 index 0000000..ba225bd --- /dev/null +++ b/src/assets/img/myCoupon.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/img/myData.svg b/src/assets/img/myData.svg new file mode 100644 index 0000000..d18983f --- /dev/null +++ b/src/assets/img/myData.svg @@ -0,0 +1,7 @@ + + + + diff --git a/src/assets/img/myLevel.svg b/src/assets/img/myLevel.svg new file mode 100644 index 0000000..4513628 --- /dev/null +++ b/src/assets/img/myLevel.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/myLikes.svg b/src/assets/img/myLikes.svg new file mode 100644 index 0000000..9317363 --- /dev/null +++ b/src/assets/img/myLikes.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/img/myPlace.svg b/src/assets/img/myPlace.svg new file mode 100644 index 0000000..dc7e900 --- /dev/null +++ b/src/assets/img/myPlace.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/img/mySecurity.svg b/src/assets/img/mySecurity.svg new file mode 100644 index 0000000..3ec1157 --- /dev/null +++ b/src/assets/img/mySecurity.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/img/myUseage.svg b/src/assets/img/myUseage.svg new file mode 100644 index 0000000..2579320 --- /dev/null +++ b/src/assets/img/myUseage.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/pages/MyPage/MyCateg.js b/src/pages/MyPage/MyCateg.js new file mode 100644 index 0000000..0d256a4 --- /dev/null +++ b/src/pages/MyPage/MyCateg.js @@ -0,0 +1,165 @@ +import styled from "styled-components"; +import { Link } from "react-router-dom"; +import Button from '@mui/material/Button'; +import { ReactComponent as MyData } from "../../assets/img/myData.svg"; +import { ReactComponent as MySecurity} from "../../assets/img/mySecurity.svg"; +import { ReactComponent as MyCoupon } from "../../assets/img/myCoupon.svg"; +import { ReactComponent as MyLike } from "../../assets/img/myLikes.svg"; +import { ReactComponent as MyUseage } from "../../assets/img/myUseage.svg"; +import { ReactComponent as MyPlace } from "../../assets/img/myPlace.svg"; +import { ReactComponent as MyChat } from "../../assets/img/myChat.svg"; +import { ReactComponent as MyLevel } from "../../assets/img/myLevel.svg"; + +const Center = styled.div` + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +`; + +const Header=styled.div` + height: 70px; + width: 100%; + + border: 3px black solid; +`; + +const Title=styled.div` + width: 505px; + height: 110px; + + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + margin-top: 110px; + margin-right: 600px; + + & > h1 { + font-size: 48px; + } +`; + +const Circle=styled.div` + width: 84px; + height: 84px; + + border-radius: 50px; + border: 3px black solid; + margin-left: 7px; +`; + +const Box = styled.div` + width: 1119px; + height: 603px; + background-color: #F3F3F3; + + /* offset-x | offset-y | blur-radius | spread-radius | color */ + box-shadow: 4px 4px 4px 4px #AFB4BE; + + display: flex; + justify-content: center; + margin-top: 23px; + margin-bottom: 168px; + border-radius: 30px; + font-size: 15px; +`; + +const Content = styled.div` + height: 495px; + width: 640px; + margin-top: 62px; + + display: flex; + flex-direction: column; + align-items: center; +`; + +const Div1 =styled.div` + height: 80px; + width: 640px; + + display: flex; + flex-direction: row; + justify-content: space-around; + align-items: center; +`; + +const Sub=styled.div` + width: 640px; + margin-top: 23px; + margin-left: 25px; + + font-size: 20px; + display: flex; + flex-direction: row; + justify-content: space-around; +`; + +const Div2 =styled.div` + height: 80px; + width: 640px; + margin-top: 50px; + + display: flex; + flex-direction: row; + justify-content: space-around; + align-items: center; +`; + +const Div3 =styled.div` + height: 80px; + width: 300px; + margin-top: 50px; + margin-right: 190px; + + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; +`; + +// const Button=styled.div` +// width: 74px; +// height: 76px; +// //margin-top: 124px; +// `; + +const MyCateg = () => { + + return ( + +
+
헤더입니다
+ + <Circle></Circle> + <h1>마이페이지</h1> + {/* 추후 링크 투 수정 */} + <Link to="/" style={{fontSize:'24px'}}>프로필로 이동</Link> + + + + + + + + +
개인정보
   로그인 및 보안
결제 및 쿠폰
 + + + + + +
찜 목록
     이용 내역
선택 지역 확인
 + + + + +
나의 등급 및 뱃지
      채팅 내역
 + + +
+ ); + }; + +export default MyCateg; From eb0925bc1cca5dba805eefc2955865c9241e2917 Mon Sep 17 00:00:00 2001 From: myejinni Date: Mon, 24 Jul 2023 20:45:36 +0900 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=EB=A7=88=EC=9D=B4=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80,=20=EC=95=84=EC=9D=B4=EC=BD=98=20svg=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/img/myChat.svg | 1 + src/assets/img/myCoupon.svg | 1 + src/assets/img/myData.svg | 1 + src/assets/img/myLevel.svg | 1 + src/assets/img/myLikes.svg | 1 + src/assets/img/myPlace.svg | 1 + src/assets/img/mySecurity.svg | 1 + src/assets/img/myUseage.svg | 1 + src/pages/MyPage/MyCateg.js | 1 + 9 files changed, 9 insertions(+) diff --git a/src/assets/img/myChat.svg b/src/assets/img/myChat.svg index eb68d52..8708044 100644 --- a/src/assets/img/myChat.svg +++ b/src/assets/img/myChat.svg @@ -1,3 +1,4 @@ + diff --git a/src/assets/img/myCoupon.svg b/src/assets/img/myCoupon.svg index ba225bd..61193fa 100644 --- a/src/assets/img/myCoupon.svg +++ b/src/assets/img/myCoupon.svg @@ -2,3 +2,4 @@ + diff --git a/src/assets/img/myData.svg b/src/assets/img/myData.svg index d18983f..a9c1f13 100644 --- a/src/assets/img/myData.svg +++ b/src/assets/img/myData.svg @@ -5,3 +5,4 @@ + \ No newline at end of file diff --git a/src/assets/img/myLevel.svg b/src/assets/img/myLevel.svg index 4513628..c989857 100644 --- a/src/assets/img/myLevel.svg +++ b/src/assets/img/myLevel.svg @@ -1,3 +1,4 @@ + \ No newline at end of file diff --git a/src/assets/img/myLikes.svg b/src/assets/img/myLikes.svg index 9317363..e7a8eac 100644 --- a/src/assets/img/myLikes.svg +++ b/src/assets/img/myLikes.svg @@ -2,3 +2,4 @@ + \ No newline at end of file diff --git a/src/assets/img/myPlace.svg b/src/assets/img/myPlace.svg index dc7e900..338b690 100644 --- a/src/assets/img/myPlace.svg +++ b/src/assets/img/myPlace.svg @@ -1,3 +1,4 @@ + \ No newline at end of file diff --git a/src/assets/img/mySecurity.svg b/src/assets/img/mySecurity.svg index 3ec1157..ba594fc 100644 --- a/src/assets/img/mySecurity.svg +++ b/src/assets/img/mySecurity.svg @@ -2,3 +2,4 @@ + \ No newline at end of file diff --git a/src/assets/img/myUseage.svg b/src/assets/img/myUseage.svg index 2579320..2649202 100644 --- a/src/assets/img/myUseage.svg +++ b/src/assets/img/myUseage.svg @@ -1,3 +1,4 @@ + \ No newline at end of file diff --git a/src/pages/MyPage/MyCateg.js b/src/pages/MyPage/MyCateg.js index 0d256a4..1994e6c 100644 --- a/src/pages/MyPage/MyCateg.js +++ b/src/pages/MyPage/MyCateg.js @@ -163,3 +163,4 @@ const MyCateg = () => { }; export default MyCateg; + From c967a9777ad3326bb071b941a6e3c93ad141151b Mon Sep 17 00:00:00 2001 From: myejinni Date: Mon, 24 Jul 2023 20:50:06 +0900 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=EB=A7=88=EC=9D=B4=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/App.js b/src/App.js index 982d341..4bbfdf3 100644 --- a/src/App.js +++ b/src/App.js @@ -15,6 +15,9 @@ import FindPw from "./pages/FindPw"; import MainPage from "./pages/MainPage"; import Footer from "./components/footer"; +import MyCateg from './pages/MyPage/MyCateg'; + + function App() { @@ -45,6 +48,10 @@ function App() { }> }> + }> + + +