Merge branch 'dev' of https://github.com/CoolPeace-yanolza/frontend i…

…nto feature/#98
CoolPeace-yanolza · Jan 25, 2024 · 9507dd3 · 9507dd3
2 parents 74d8082 + 12d7c24
commit 9507dd3
Show file tree

Hide file tree

Showing 83 changed files with 2,483 additions and 359 deletions.
diff --git a/index.html b/index.html
@@ -1,12 +1,53 @@
 <!doctype html>
 <html lang="ko">
   <head>
+    <link
+      rel="icon"
+      type="image/svg+xml"
+      href="/favicon.ico"
+    />
     <meta charset="UTF-8" />
     <meta
       name="viewport"
-      content="width=device-width, initial-scale=1.0"
+      content="initial-scale=1, maximum-scale=1, width=device-width, shrink-to-fit=no, user-scalable=no, viewport-fit=cover"
+    />
+    <meta
+      name="description"
+      content="국내숙박 앱 1위 야놀자의 사장님들을 위한 셀프 쿠폰 등록 서비스! 지금 사장님 비서ya를 통해 우리 숙소 매출을 올려 보세요."
+    />
+    <meta
+      name="keywords"
+      content="사장님 비서ya, 사장님 비서야, 야놀자 비서야, 비서야, 비서ya, 야놀자 파트너센터, 야놀자, yanolja, 파트너센터, 파트너센타, 야놀자 사장님, 야놀자 사장님 페이지, 스마트프런트, 스마트프론트, 쿠폰, 사장님 쿠폰, 펜션, 모텔, 리조트, 호텔"
+    />
+    <meta
+      property="og:title"
+      content="사장님 비서ya : 셀프 쿠폰 운영"
+    />
+    <meta
+      property="og:image"
+      content="/og-image-800x400.png"
+    />
+    <meta
+      property="og:description"
+      content="국내숙박 앱 1위 야놀자의 사장님들을 위한 셀프 쿠폰 등록 서비스! 지금 사장님 비서ya를 통해 우리 숙소 매출을 올려 보세요."
+    />
+    <meta
+      property="og:type"
+      content="website"
+    />
+    <meta
+      name="twitter:card"
+      content="summary"
+    />
+    <meta
+      name="twitter:title"
+      content="사장님 비서ya : 셀프 쿠폰 운영"
+    />
+    <meta
+      name="twitter:description"
+      content="국내 호텔 모텔 펜션/풀빌라는 물론 레저/액티비티에 항공 및 해외숙소까지 모두 초특가! 지금 야놀자로 최대 80% 할인받으세요."
     />
-    <title>쿨피스</title>
+    <title>사장님 비서ya : 셀프 쿠폰 운영</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,6 +31,7 @@
     "recoil-persist": "^5.1.0",
     "semantic-ui-css": "^2.5.0",
     "semantic-ui-react": "^2.1.5",
+    "styled-components": "^6.1.8",
     "xlsx": "^0.18.5"
   },
   "devDependencies": {

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/og-image-800x400.png b/public/og-image-800x400.png
diff --git a/src/App.error.tsx b/src/App.error.tsx
@@ -1,11 +1,25 @@
 import { FallbackProps } from 'react-error-boundary';
 import styled from '@emotion/styled';
 
+import theme from '@styles/theme';
+import errorIcon from '@assets/icons/ic-error.svg';
+import reloadIcon from '@assets/icons/ic-reload.svg';
+
 const ErrorFallback = ({ resetErrorBoundary }: FallbackProps) => {
   return (
     <Container>
-      <span>App 전체 에러 발생</span>
-      <button onClick={resetErrorBoundary}>다시 시도</button>
+      <ErrorIcon
+        src={errorIcon}
+        alt="에러 발생"
+      />
+      <ErrorWord>서비스를 이용할 수 없습니다.</ErrorWord>
+      <ReLoadButton onClick={resetErrorBoundary}>
+        <ReloadIcon
+          src={reloadIcon}
+          alt="에러 발생"
+        />
+        다시 시도 하기
+      </ReLoadButton>
     </Container>
   );
 };
@@ -24,3 +38,60 @@ const Container = styled.div`
   align-items: center;
   gap: 10px;
 `;
+
+const ErrorIcon = styled.img`
+  width: 80px;
+  height: 80px;
+
+  ${theme.response.tablet} {
+    width: 50px;
+    height: 50px;
+  }
+`;
+
+const ErrorWord = styled.span`
+  font-size: 20px;
+  font-weight: 500;
+
+  ${theme.response.tablet} {
+    font-size: 15px;
+  }
+`;
+
+const ReLoadButton = styled.button`
+  margin-top: 15px;
+  margin-left: 3px;
+  border: none;
+
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  background-color: transparent;
+  font-size: 15px;
+  text-align: center;
+
+  transition: all 0.5s;
+
+  &:hover {
+    color: gray;
+  }
+
+  ${theme.response.tablet} {
+    margin-top: 10px;
+
+    font-size: 13px;
+  }
+`;
+
+const ReloadIcon = styled.img`
+  width: 25px;
+  height: 25px;
+
+  margin-right: 10px;
+
+  ${theme.response.tablet} {
+    width: 20px;
+    height: 20px;
+  }
+`;
diff --git a/src/App.loading.tsx b/src/App.loading.tsx
@@ -82,6 +82,7 @@ const Header = styled(BaseSkeleton)`
   width: 100%;
   height: 85px;
 
+  margin-top: 25px;
   border-radius: 20px;
 
   display: flex;
@@ -91,14 +92,15 @@ const Header = styled(BaseSkeleton)`
   ${theme.response.tablet} {
     height: 65px;
 
+    margin-top: 15px;
     border-radius: 10px;
   }
 `;
 
 const OutletLayout = styled(BaseSkeleton)`
   width: 100%;
-  height: 85vh;
-  max-height: 85vh;
+  height: 83vh;
+  max-height: 83vh;
 
   margin-top: 16px;
   border-radius: 20px;

diff --git a/src/api/index.ts b/src/api/index.ts
@@ -1,5 +1,6 @@
 export { default as instance } from './lib/instance';
 export { default as postLogin } from './lib/postLogin';
+export { default as postLogout } from './lib/postLogout';
 export { default as postRefreshToken } from './lib/postRefreshToken';
 export {
   getCouponList,
@@ -15,3 +16,7 @@ export { default as getDailyReport } from './lib/getDailyReport';
 export { default as getCouponRanking } from './lib/getCouponRanking';
 export { default as getLocalCouponUsage } from './lib/getLocalCouponUsage';
 export { default as getMonthStatus } from './lib/getMonthStatus';
+export { default as getEmailValid } from './lib/getEmailValid';
+export { default as postSignUp } from './lib/postSignUp';
+export { default as getSettlements } from './lib/getSettlements';
+export { default as getSettlemented } from './lib/getSettlemented';
diff --git a/src/api/lib/getEmailValid.ts b/src/api/lib/getEmailValid.ts
@@ -0,0 +1,18 @@
+import { AxiosError } from 'axios';
+
+import { instance } from '..';
+
+const getEmailValid = async (email: string) => {
+  try {
+    const response = await instance.get(
+      `/v1/member/register/check/email?email=${email}`
+    );
+    return response;
+  } catch (error) {
+    if (error instanceof AxiosError) {
+      return error.response;
+    }
+  }
+};
+
+export default getEmailValid;