feat(#5)중간 저장용

URECA-PODONG · Nov 4, 2024 · 7166537 · 7166537
1 parent 8db0a53
commit 7166537
Show file tree

Hide file tree

Showing 25 changed files with 1,168 additions and 635 deletions.
diff --git a/index.html b/index.html
@@ -12,8 +12,7 @@
     <script type="module" src="/src/main.jsx"></script>
     <script
       type="text/javascript"
-      src="//dapi.kakao.com/v2/maps/sdk.js?appkey=356aa1c57243e551c6ea0db569b098cf&libraries=services,geometry"
-    ></script>
+      src="//dapi.kakao.com/v2/maps/sdk.js?appkey=356aa1c57243e551c6ea0db569b098cf&libraries=services,geometry"></script>
 
   </body>
 </html>
diff --git a/package.json b/package.json
@@ -10,8 +10,10 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "@react-google-maps/api": "^2.20.3",
     "axios": "^1.7.7",
     "http-proxy-middleware": "^3.0.3",
+    "js-cookie": "^3.0.5",
     "lottie-react": "^2.4.0",
     "react": "^18.3.1",
     "react-calendar": "^5.1.0",

diff --git a/public/images/common/kakaobtn.svg b/public/images/common/kakaobtn.svg
diff --git a/public/images/myPage/dogprofile.svg b/public/images/myPage/dogprofile.svg
diff --git a/public/images/myPage/mypagecat.svg b/public/images/myPage/mypagecat.svg
diff --git a/src/Router.jsx b/src/Router.jsx
@@ -20,24 +20,21 @@ import WalkMapPage from './pages/WalkPage/WalkMapPage.jsx';
 import WalkJournalPage from './pages/WalkPage/WalkJournalPage.jsx';
 import Payment from './pages/PaymentPage/Payment.jsx';
 import PaymentEnd from './pages/PaymentPage/PaymentEnd.jsx';
-import CancelPay from './pages/PaymentPage/CancelPay.jsx';
 import PetEditPage from './pages/MyPage/PetEditPage.jsx';
-
-import PayListTest from './pages/PaymentPage/paylisttest.jsx';
-import PaymentCancelList from './pages/PaymentPage/PaymentCancelList.jsx';
 import PaymentHistory from './pages/PaymentPage/PaymentHistory.jsx';
-
 import ComunityWrite from './pages/CommunityPage/CommunityWrite.jsx';
 import CommunityList from './pages/CommunityPage/CommunityList.jsx';
 import CommunityDetail from './pages/CommunityPage/CommunityDetail.jsx';
-
 import HealthCare from './pages/HealthCare/HealthCare.jsx';
 import ShoppingCart from './pages/ShoppingCart/ShoppingCart.jsx';
 import { CartProvider } from './pages/ShoppingCart/CartContext';
+import PayCancelReq from './pages/PaymentPage/PayCancelReq.jsx';
+import PaymentCancelDone from './pages/PaymentPage/PaymentCancelDone.jsx';
 
 function Router() {
   return (
     <BrowserRouter>
+
       <CartProvider>
         <ScrollTop />
         <NavSelector />
@@ -50,12 +47,13 @@ function Router() {
             <Route path="healthCare" element={<HealthCare />} />
 
             <Route path="payment" element={<Payment />} />
-            <Route path="paymentCancelList" element={<PaymentCancelList />} />
+            <Route path="payCancelReq" element={<PayCancelReq />} />
             <Route path="paymentEnd" element={<PaymentEnd />} />
             <Route path="paymentHistory" element={<PaymentHistory />} />
-            <Route path="cancelpay" element={<CancelPay />} />
-            <Route path="paymentlist" element={<PayListTest />} />
+            <Route path="paymentlist" element={<PaymentHistory />} />
+            <Route path="paymentCancelDone" element={<PaymentCancelDone />} />
 
+            <Route path="mainpage/:userId" element={<MainPage />} />  
             <Route path="nanumList" element={<Outlet />}>
               <Route index element={<NanumList />} />
               <Route path="write" element={<NanumWrite />} />
@@ -68,7 +66,7 @@ function Router() {
               <Route path="detail/:no" element={<CommunityDetail />} />
             </Route>
 
-            <Route path="userRegister/:userId" element={<UserRegisterPage />} />
+            <Route path="userRegister/:email" element={<UserRegisterPage />} />
             <Route path="petRegister" element={<PetRegisterPage />} />
 
             <Route path="walking" element={<WalkPage />}>

diff --git a/src/components/Images.jsx b/src/components/Images.jsx
@@ -3,8 +3,10 @@ export const images = {
   cameraIcon: '/images/common/cameraIcon.svg',
   loginDogCat: '/images/common/loginDogCat.svg',
   logo: '/images/common/logo.svg',
+  kakaobtn:'/images/common/kakaobtn.svg',
   cancel: '/images/common/cancelButton.svg',
 
+
   // community
   categoryAll: '/images/community/categoryAll.svg',
   categoryAnonymous: '/images/community/categoryAnonymous.svg',
@@ -26,19 +28,24 @@ export const images = {
   home: '/images/footer/home.svg',
 
   // mypage
-  alert: '/images/myPage/alert.svg',
-  blockHand: '/images/myPage/blockHand.svg',
-  bogwan: '/images/myPage/bogwan.svg',
-  calendar: '/images/myPage/calendar.svg',
-  hide: '/images/myPage/hide.svg',
-  imseeJeojang: '/images/myPage/imseeJeojang.svg',
-  myActivity: '/images/myPage/myActivity.svg',
-  bag: '/images/myPage/bag.svg',
-  coupon: '/images/myPage/coupon.svg',
-  missing: '/images/myPage/missing.svg',
-  paw: '/images/myPage/paw.svg',
-  point: '/images/myPage/point.svg',
-  review: '/images/myPage/review.svg',
+
+  alert: "/images/myPage/alert.svg",
+  blockHand: "/images/myPage/blockHand.svg",
+  bogwan: "/images/myPage/bogwan.svg",
+  calendar: "/images/myPage/calendar.svg",
+  hide: "/images/myPage/hide.svg",
+  imseeJeojang: "/images/myPage/imseeJeojang.svg",
+  myActivity: "/images/myPage/myActivity.svg",
+  bag: "/images/myPage/bag.svg",
+  coupon: "/images/myPage/coupon.svg",
+  missing: "/images/myPage/missing.svg",
+  paw: "/images/myPage/paw.svg",
+  point:"/images/myPage/point.svg",
+  review:"/images/myPage/review.svg",
+  mypagecat:"/images/myPage/mypagecat.svg",
+  dogprofile:"/images/myPage/dogprofile.svg",
+
+
 
   // walk
   walkMap: '/images/walk/walkMap.svg',