Merge pull request #111 from sharemindteam/inyoung

[Feature] 서비스 소개 페이지 단순 마크업

package.json

@@ -3,7 +3,11 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@mui/material": "^5.15.3",
+    "@emotion/react": "^11.11.3",
+    "@emotion/styled": "^11.11.0",
+    "@mui/material": "^5.15.6",
+    "@mui/styled-engine-sc": "^6.0.0-alpha.13",
+    "@stomp/stompjs": "^7.0.0",
     "@types/jest": "^29.5.11",
     "@types/node": "^20.10.6",
     "@types/react": "^18.2.46",
@@ -21,7 +25,8 @@
     "react-textarea-autosize": "^8.5.3",
     "recoil": "^0.7.7",
     "recoil-persist": "^5.1.0",
-    "styled-components": "^6.1.0",
+    "sockjs-client": "^1.6.1",
+    "styled-components": "^6.1.8",
     "styled-normalize": "^8.1.0",
     "typescript": "^4.9.5"
   },

public/browserconfig.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

public/index.html

@@ -10,7 +10,7 @@
       content="Web site created using create-react-app"
     />
 
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/favicon.ico" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

public/manifest.json

@@ -1,25 +1,41 @@
 {
-  "short_name": "React App",
-  "name": "Create React App Sample",
+  "name": "App",
   "icons": [
     {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
+      "src": "/android-icon-36x36.png",
+      "sizes": "36x36",
+      "type": "image/png",
+      "density": "0.75"
+    },
+    {
+      "src": "/android-icon-48x48.png",
+      "sizes": "48x48",
+      "type": "image/png",
+      "density": "1.0"
+    },
+    {
+      "src": "/android-icon-72x72.png",
+      "sizes": "72x72",
+      "type": "image/png",
+      "density": "1.5"
+    },
+    {
+      "src": "/android-icon-96x96.png",
+      "sizes": "96x96",
+      "type": "image/png",
+      "density": "2.0"
     },
     {
-      "src": "logo192.png",
+      "src": "/android-icon-144x144.png",
+      "sizes": "144x144",
       "type": "image/png",
-      "sizes": "192x192"
+      "density": "3.0"
     },
     {
-      "src": "logo512.png",
+      "src": "/android-icon-192x192.png",
+      "sizes": "192x192",
       "type": "image/png",
-      "sizes": "512x512"
+      "density": "4.0"
     }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
+  ]
 }

src/Router.tsx

@@ -43,111 +43,94 @@ import { SellerTerminate } from 'pages/Seller/SellerTerminate';
 import { SellerLogout } from 'pages/Seller/SellerLogout';
 import { Admin } from 'pages/Common/Admin';
 import { BuyerChat } from 'pages/Buyer/BuyerChat';
+import Service from 'pages/Common/Service';
 const Router = () => {
   const navigate = useNavigate();
   return (
     <Routes>
-      <Route
-        path="/"
-        element={
-          <>
-            <button
-              onClick={() => {
-                navigate('/buyer');
-              }}
-            >
-              BuyerHome
-            </button>
-            <button
-              onClick={() => {
-                navigate('/seller');
-              }}
-            >
-              SellerHome
-            </button>
-          </>
-        }
-      />
       {/* admin */}
       <Route path="/admin" element={<Admin />} />
       {/* minder(buyer) */}
-      <Route path="/buyer" element={<BuyerHome />} />
-      <Route path="/buyer/consult" element={<BuyerConsult />} />
-      <Route path="/buyer/profile/:id" element={<BuyerCounselorProfile />} />
-      <Route path="/buyer/search" element={<BuyerSearch />} />
-      <Route path="/buyer/categorySearch" element={<BuyerCategoryResult />} />
-      <Route path="/buyer/search/result" element={<BuyerSearchResult />} />
-      <Route path="/buyer/consultRequest" element={<BuyerConsultRequest />} />
-      <Route path="/buyer/paymentDetail/:id" element={<BuyerPaymentDetail />} />
-      <Route path="/buyer/paymentComplete" element={<BuyerPaymentComplete />} />
-      <Route path="/buyer/counselors" element={<BuyerAvailCounselor />} />
-      <Route path="/buyer/mypage" element={<BuyerMypage />} />
-      <Route path="/buyer/reviewManage" element={<BuyerReviewManage />} />
-      <Route path="/buyer/review" element={<BuyerWriteReview />} />
-      <Route path="/buyer/saved" element={<BuyerSavedCounselor />} />
-      <Route path="/buyer/payment" element={<BuyerPayment />} />
-      <Route path="/buyer/letter/:id" element={<BuyerLetter />} />
-      <Route path="/buyer/chat" element={<BuyerChat />} />
-      <Route path="/buyer/writeLetter/:id" element={<BuyerLetterWrite />} />
+      <Route path="/" element={<BuyerHome />} />
+      <Route path="/consult" element={<BuyerConsult />} />
+      <Route path="/profile/:id" element={<BuyerCounselorProfile />} />
+      <Route path="/search" element={<BuyerSearch />} />
+      <Route path="/categorySearch" element={<BuyerCategoryResult />} />
+      <Route path="/search/result" element={<BuyerSearchResult />} />
+      <Route path="/consultRequest" element={<BuyerConsultRequest />} />
+      <Route path="/paymentDetail/:id" element={<BuyerPaymentDetail />} />
+      <Route path="/paymentComplete" element={<BuyerPaymentComplete />} />
+      <Route path="/counselors" element={<BuyerAvailCounselor />} />
+      <Route path="/mypage" element={<BuyerMypage />} />
+      <Route path="/reviewManage" element={<BuyerReviewManage />} />
+      <Route path="/review" element={<BuyerWriteReview />} />
+      <Route path="/saved" element={<BuyerSavedCounselor />} />
+      <Route path="/payment" element={<BuyerPayment />} />
+      <Route path="/letter/:id" element={<BuyerLetter />} />
+      <Route path="/chat" element={<BuyerChat />} />
+      <Route path="/writeLetter/:id" element={<BuyerLetterWrite />} />
       {/* 로그인 관련 페이지는 앞에 buyer seller 구분 제외했음 */}
       <Route path="/login" element={<BuyerLogin />} />
       <Route path="/signup" element={<BuyerSignup />} />
       <Route path="/signup/nav" element={<BuyerSignupComplete />} />
       <Route path="/find" element={<BuyerFindInfo />} />
-      <Route path="/buyer/setting" element={<BuyerAccountSetting />} />
+      <Route path="/setting" element={<BuyerAccountSetting />} />
       <Route path="/setting/changePassword" element={<BuyerPwChange />} />
       <Route path="/setting/terminate" element={<BuyerTerminate />} />
       <Route path="/setting/logout" element={<BuyerLogout />} />
 
-      <Route path="/seller" element={<SellerHome />} />
+      <Route path="/minder" element={<SellerHome />} />
       {/* 판매자 설정 */}
-      <Route path="/seller/setting" element={<SellerAccountSetting />} />
+      <Route path="/minder/setting" element={<SellerAccountSetting />} />
       <Route
-        path="/seller/setting/changePassword"
+        path="/minder/setting/changePassword"
         element={<SellerPwChange />}
       />
       <Route
-        path="/setting/refundBankAccount"
+        path="/minder/refundBankAccount"
         element={<SellerRefundBankAccount />}
       />
-      <Route path="/seller/setting/terminate" element={<SellerTerminate />} />
-      <Route path="/seller/setting/logout" element={<SellerLogout />} />
+      <Route path="/minder/setting/terminate" element={<SellerTerminate />} />
+      <Route path="/minder/setting/logout" element={<SellerLogout />} />
 
       {/* 판매자 : 상담 */}
       {/* 판매자 : 채팅 */}
-      <Route path="/seller/chat/:consultid" element={<SellerChat />} />
+      <Route path="/minder/chat/:chatid" element={<SellerChat />} />
 
       {/* 판매자 : 편지 */}
       {/* 질문, 답장, 추가질문 , 추가답장 탭 페이지*/}
-      <Route path="/seller/letter/:consultid" element={<SellerLetter />} />
+      <Route path="/minder/letter/:consultid" element={<SellerLetter />} />
       {/* 답장쓰기, 추가답장쓰기*/}
       <Route
-        path="/seller/writeLetter/:consultid"
+        path="/minder/writeLetter/:consultid"
         element={<SellerLetterWrite />}
       />
 
-      <Route path="/seller/consult" element={<SellerConsult />} />
+      <Route path="/minder/consult" element={<SellerConsult />} />
       {/* 판매자 : 프로필 정보 */}
-      <Route path="/seller/mypage" element={<SellerMypage />} />
+      <Route path="/minder/mypage" element={<SellerMypage />} />
 
-      <Route path="/seller/mypage/review" element={<SellerMyPageReview />} />
+      <Route path="/minder/mypage/review" element={<SellerMyPageReview />} />
       <Route
-        path="/seller/mypage/viewProfile"
+        path="/minder/mypage/viewProfile"
         element={<SellerMypageViewProfile />}
       />
 
       <Route
-        path="/seller/mypage/modifyProfile"
+        path="/minder/mypage/modifyProfile"
         element={<SellerMypageModifyProfile />}
       />
       {/* 판매자 : 수익 관리 */}
       <Route
-        path="/seller/calculatemanagement"
+        path="/minder/calculatemanagement"
         element={<SellerCaculateManagement />}
       />
       {/* 판매자 : 마인더 인증 */}
-      <Route path="/seller/education/*" element={<SellerVerifyMaterial />} />
-      <Route path="/seller/quiz/*" element={<SellerVerifyQuiz />} />
+      <Route path="/minder/education/*" element={<SellerVerifyMaterial />} />
+      <Route path="/minder/quiz/*" element={<SellerVerifyQuiz />} />
+
+      {/* 서비스 소개 */}
+      <Route path="/service" element={<Service />} />
     </Routes>
   );
 };

src/api/axios.ts

@@ -39,8 +39,8 @@ instance.interceptors.response.use(
           originRequest.headers.Authorization = `${accessToken}`;
           return instance(originRequest);
         } else if (tokenResponse.response.status === 400) {
-          window.location.href = '/login';
-
+          alert('로그인 후 이용해 주세요.');
+          window.location.href = '/buyer/mypage';
           //나중에 지우고 로그인으로 navigate
         }
       } catch (error) {

src/api/get.ts

@@ -74,8 +74,12 @@ export const getCounselorConsults = async (
 export const getCounselors = async (counselorId: string | undefined) =>
   await getPublicInstance(`/counselors/${counselorId}`);
 // SearchWord Controller
-export const getSearchWords = async () => await getInstance('/searchWords');
+export const getSearchWords = async () =>
+  await getPublicInstance('/searchWords');
 
+//Payment Controller
+export const getPaymentsCustomers = async (params: any) =>
+  await getPublicInstance('/payments/customers', params);
 //Review Controller
 
 export const getMinderReviews = async (params: any) =>

src/api/patch.ts

@@ -35,7 +35,7 @@ export const patchReviews = async (body: any) =>
 //SearchWord Controller
 //검색 결과 반환
 export const patchSearchWordsResults = async (sortType: string, body: any) =>
-  await patchInstance(`/searchWords/results?sortType=${sortType}`, body);
+  await patchPublicInstance(`/searchWords/results?sortType=${sortType}`, body);
 
 //Wishlist Controlloer
 //찜하기 추가