feat(#6):결제5차수정

URECA-PODONG · Nov 5, 2024 · a17d59e · a17d59e
2 parents cf74c8c + 762df63
commit a17d59e
Show file tree

Hide file tree

Showing 35 changed files with 2,418 additions and 2,267 deletions.
diff --git a/.github/workflows/git-push.yml b/.github/workflows/git-push.yml
@@ -0,0 +1,30 @@
+name: git push into another repo to deploy to vercel
+
+on:
+  push:
+    branches: [develop]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: pandoc/latex
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install mustache (to update the date)
+        run: apk add ruby && gem install mustache
+      - name: creates output
+        run: sh ./build.sh
+      - name: Pushes to another repository
+        id: push_directory
+        uses: cpina/github-action-push-to-another-repository@main
+        env:
+          API_TOKEN_GITHUB: ${{ secrets.AUTO_ACTIONS  }}
+        with:
+          source-directory: 'output'
+          destination-github-username: uiop5809
+          destination-repository-name: Podong_FrontEnd
+          user-email: ${{ secrets.EMAIL  }}
+          commit-message: ${{ github.event.commits[0].message }}
+          target-branch: develop
+      - name: Test get variable exported by push-to-another-repository
+        run: echo $DESTINATION_CLONED_DIRECTORY
diff --git a/build.sh b/build.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+cd ../
+mkdir output
+cp -R ./FrontEnd/* ./output
+cp -R ./output ./FrontEnd/
diff --git a/index.html b/index.html
@@ -2,17 +2,17 @@
 <html lang="ko">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/vite.svg" />
+    <link rel="icon" type="image/png" href="public/sole.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React</title>
+    <title>발바닥천국</title>
     <script src="https://cdn.iamport.kr/v1/iamport.js"></script>
   </head>
   <body>
     <div id="root"></div>
     <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/public/sole.png b/public/sole.png
diff --git a/src/Router.jsx b/src/Router.jsx
@@ -1,44 +1,50 @@
-import { BrowserRouter, Routes, Route, Outlet, useLocation } from 'react-router-dom';
-import MainPage from './pages/MainPage/MainPage.jsx';
-import MainNav from './components/common/MainNav.jsx';
-import Footer from './components/common/Footer';
-import ScrollTop from './components/common/ScrollTop.jsx';
-import LoginPage from './pages/LoginPage/LoginPage.jsx';
-import NanumWrite from './pages/NanumPage/NanumWrite.jsx';
-import NanumList from './pages/NanumPage/NanumList.jsx';
-import NanumDetail from './pages/NanumPage/NanumDetail.jsx';
-import UserRegisterPage from './pages/RegisterPage/UserRegisterPage.jsx';
-import UserEditPage from './pages/MyPage/UserEditPage.jsx';
-import MyPage from './pages/MyPage/MyPage.jsx';
-import RegisterMissingSavePage from './pages/MyPage/RegisterMissingSavePage.jsx';
-import RegisterMissing from './pages/MyPage/RegisterMissing.jsx';
-import PetRegisterPage from './pages/RegisterPage/PetRegisterPage.jsx';
-import ShoppingDetail from './pages/MainPage/ShoppingDetail.jsx';
-import SideNav from './components/common/SideNav.jsx';
-import WalkPage from './pages/WalkPage/WalkPage.jsx';
-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 PetEditPage from './pages/MyPage/PetEditPage.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';
+import {
+  BrowserRouter,
+  Routes,
+  Route,
+  Outlet,
+  useLocation,
+} from "react-router-dom";
+import MainPage from "./pages/MainPage/MainPage.jsx";
+import MainNav from "./components/common/MainNav.jsx";
+import Footer from "./components/common/Footer";
+import ScrollTop from "./components/common/ScrollTop.jsx";
+import LoginPage from "./pages/LoginPage/LoginPage.jsx";
+import NanumWrite from "./pages/NanumPage/NanumWrite.jsx";
+import NanumList from "./pages/NanumPage/NanumList.jsx";
+import NanumDetail from "./pages/NanumPage/NanumDetail.jsx";
+import UserRegisterPage from "./pages/RegisterPage/UserRegisterPage.jsx";
+import UserEditPage from "./pages/MyPage/UserEditPage.jsx";
+import MyPage from "./pages/MyPage/MyPage.jsx";
+import RegisterMissingSavePage from "./pages/MyPage/RegisterMissingSavePage.jsx";
+import RegisterMissing from "./pages/MyPage/RegisterMissing.jsx";
+import PetRegisterPage from "./pages/RegisterPage/PetRegisterPage.jsx";
+import ShoppingDetail from "./pages/MainPage/ShoppingDetail.jsx";
+import SideNav from "./components/common/SideNav.jsx";
+import WalkPage from "./pages/WalkPage/WalkPage.jsx";
+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 PetEditPage from "./pages/MyPage/PetEditPage.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";
 import RecommendedRoutesPage from "./pages/WalkPage/RecommendedRoutesPage.jsx";
 import OrderList from './pages/OrderPage/OrderList.jsx';
 import OrderDetail from './pages/OrderPage/OrderDetail.jsx';
 import OrderCancel from './pages/OrderPage/OrderCancel.jsx';
 
-
 function Router() {
   return (
     <BrowserRouter>
+
       <CartProvider>
         <ScrollTop />
         <NavSelector />
@@ -74,7 +80,7 @@ function Router() {
             </Route>
 
             <Route path="userRegister/:email" element={<UserRegisterPage />} />
-            <Route path="petRegister" element={<PetRegisterPage />} />
+            <Route path="petRegister/:userId" element={<PetRegisterPage />} />
 
             <Route path="walking" element={<WalkPage />}>
               <Route path="map" element={<WalkMapPage />} />
@@ -85,12 +91,13 @@ function Router() {
               element={<RecommendedRoutesPage />}
             />
 
-            <Route path="myPage" element={<Outlet />}>
+            <Route path="myPage/:userId" element={<Outlet />}>
               <Route index element={<MyPage />} />
-              <Route path="editPetRegister" element={<PetEditPage />} />
-              <Route path="editUserRegister" element={<UserEditPage />} />
+              <Route path="editPetRegister/:petId" element={<PetEditPage />} />
+              <Route path="petRegister" element={<PetRegisterPage />} />
+              <Route path="editUserRegister/:userId" element={<UserEditPage />} />
               <Route path="missingSave" element={<RegisterMissingSavePage />} />
-              <Route path="missingRegister" element={<RegisterMissing />} />
+              <Route path="missingRegister/:petId" element={<RegisterMissing />} />
             </Route>
 
             <Route path="orderList" element={<Outlet />}>

diff --git a/src/apis/AxiosInstance.js b/src/apis/AxiosInstance.js
@@ -4,6 +4,7 @@ const tokenString = sessionStorage.getItem("token");
 const token = tokenString ? JSON.parse(tokenString) : null;
 
 const Axios = axios.create({
+  // eslint-disable-next-line no-undef
   baseURL: import.meta.env.VITE_BASE_URL,
   headers: {
     Authorization: `Bearer ${token?.loginState?.data?.accessToken}`,

diff --git a/src/components/Images.jsx b/src/components/Images.jsx
@@ -9,10 +9,10 @@ export const images = {
 
   // community
   categoryAll: '/images/community/categoryAll.svg',
-  categoryAnonymous: '/images/community/categoryAnonymous.svg',
+  categoryAnonymity: '/images/community/categoryAnonymity.svg',
   categoryDongNea: '/images/community/categoryDongNea.svg',
   categoryEvent: '/images/community/categoryEvent.svg',
-  categoryExport: '/images/community/categoryExport.svg',
+  categoryExpert: '/images/community/categoryExpert.svg',
   categoryFreedom: '/images/community/categoryFreedom.svg',
 
   // credit

diff --git a/src/components/common/Footer.jsx b/src/components/common/Footer.jsx
@@ -43,7 +43,7 @@ const Footer = () => {
   ];
 
   const handleTabClick = (tab, link) => {
-    setActiveTab(link); // 탭 클릭 시 activeTab 상태 업데이트
+    setActiveTab(link); 
   };
 
   return (
@@ -108,4 +108,4 @@ const FooterText = styled.div`
   font-family: 'TTLaundryGothicB';
   font-size: 12px;
   color: ${({ $active }) => ($active ? '#FF6E00' : '#000000')};
-`;
+`;