{
const isIncludeOtherStatus = includedStatusCodes?.some(
(code) => code === status,
);
- const renderCondition = !redirectUrl || isIncludeOtherStatus;
if (redirectUrl && !isIncludeOtherStatus) {
router.replace(redirectUrl);
}
@@ -94,7 +93,7 @@ class ErrorBoundary extends React.Component
{
return ;
}
- if (hasError && error !== null && renderCondition) {
+ if (hasError && error !== null) {
return errorFallback({
error,
reset: this.resetBoundary,
diff --git a/src/components/shared/templates/Skeleton/Filter/style.module.scss b/src/components/shared/templates/Skeleton/Filter/style.module.scss
index 678b3623..c27743e1 100644
--- a/src/components/shared/templates/Skeleton/Filter/style.module.scss
+++ b/src/components/shared/templates/Skeleton/Filter/style.module.scss
@@ -1,5 +1,6 @@
.skeleton-filter {
display: flex;
+ margin-left: 20px;
.filter {
@include iconLoading();
}
diff --git a/src/constants/link.ts b/src/constants/link.ts
index e3bc9d4c..5ea71b8d 100644
--- a/src/constants/link.ts
+++ b/src/constants/link.ts
@@ -1 +1,4 @@
-export const KAKAO_TALK_ONE_TO_ONE_CHAT = 'http://pf.kakao.com/_jNwnxj/chat';
+const KAKAO_TALK_ONE_TO_ONE_CHAT = 'http://pf.kakao.com/_jNwnxj/chat';
+const MAILTO = 'mailto:';
+const SMS = 'sms:';
+export { KAKAO_TALK_ONE_TO_ONE_CHAT, MAILTO, SMS };
diff --git a/src/constants/regExp.ts b/src/constants/regExp.ts
index c0cb3bd7..ecf2e92e 100644
--- a/src/constants/regExp.ts
+++ b/src/constants/regExp.ts
@@ -1,2 +1,6 @@
-export const URL_REGEX =
- /^(https?:\/\/)?([da-z.-]+).([a-z.]{2,6})([/\w_.#-]*)*$/;
+const URL_REGEX = /^(https?:\/\/)([da-z.-]+).([a-z.]{2,6})([/\w_.#-]*)*$/;
+const PHONE_REGEX = /^\d{3,4}-?\d{3,4}-?\d{4}$/;
+const EMAIL_REGEX =
+ /^[\da-zA-Z]([-_.]?[\da-zA-Z])*@[0-9a-zA-Z]([-_.]?[\da-zA-Z])*.[a-zA-Z]{2,3}$/i;
+
+export { URL_REGEX, PHONE_REGEX, EMAIL_REGEX };
diff --git a/src/hooks/api/login/index.ts b/src/hooks/api/login/index.ts
index 11b7f92a..049f6d0c 100644
--- a/src/hooks/api/login/index.ts
+++ b/src/hooks/api/login/index.ts
@@ -2,6 +2,7 @@ import { useRouter } from 'next/router';
import { postAuthToken, authTest } from 'src/api/login';
import { setAccessToken } from 'src/utils/auth';
+import { getPrevPath } from 'src/utils/pathStorage';
import { toastError, toastSuccess } from 'src/utils/toaster';
import { useCoreMutation, useCoreQuery } from '../core';
@@ -14,7 +15,7 @@ export const usePostAuthToken = () => {
toastSuccess({ message: '로그인되었습니다.' });
const { accessToken } = data.data;
setAccessToken(accessToken);
- router.replace('/');
+ router.replace(getPrevPath());
},
onSettled: (_, error) => {
if (error) {
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 888b05ad..0c2ea536 100755
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -16,6 +16,7 @@ import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
import '../styles/globals.scss';
import { useMounted, useWindowResize } from 'src/hooks';
import * as gtag from 'src/lib/gtag';
+import { setPathValue } from 'src/utils/pathStorage';
export type NextPageWithLayout = NextPage & {
getLayout?: (page: ReactElement) => ReactNode;
@@ -54,6 +55,7 @@ function MyApp({ Component, pageProps }: AppPropsWithLayout) {
useEffect(() => {
const handleRouteChange = (url: string) => {
+ setPathValue(url);
gtag.pageview(url);
};
router.events.on('routeChangeComplete', handleRouteChange);
diff --git a/src/pages/mypage/setting/index.tsx b/src/pages/mypage/setting/index.tsx
index e79a6f1b..c81c5b3d 100644
--- a/src/pages/mypage/setting/index.tsx
+++ b/src/pages/mypage/setting/index.tsx
@@ -42,13 +42,13 @@ function Setting() {
},
{
text: '앱 버전',
- icon: v1.0.1,
+ icon: v1.0.6,
},
{
text: '로그아웃',
onClick: () => {
logoutUtil();
- router.push('/shop');
+ router.push('/');
},
},
{
diff --git a/src/pages/shop/[id]/index.tsx b/src/pages/shop/[id]/index.tsx
index d22602a0..0f929263 100644
--- a/src/pages/shop/[id]/index.tsx
+++ b/src/pages/shop/[id]/index.tsx
@@ -5,7 +5,6 @@ import { useCallback } from 'react';
import HeadMeta from '@atoms/HeadMeta';
import { queryKey } from '@constants/react-query';
import { seoData } from '@constants/seo';
-import Profile from '@molecules/Profile';
import { dehydrate, QueryClient } from '@tanstack/react-query';
import Layout from '@templates/Layout';
import { withGetServerSideProps } from 'src/api/core/withGetServerSideProps';
@@ -16,6 +15,7 @@ import ProductFooter from 'src/components/Product/organisms/ProductFooter';
import ProductImgSlide from 'src/components/Product/organisms/ProductImgSlide';
import ProductNotice from 'src/components/Product/organisms/ProductNotice';
import ProductSize from 'src/components/Product/organisms/ProductSize';
+import ProfileInfo from 'src/components/Product/organisms/ProfileInfo';
import { useProdutDetail } from 'src/hooks/api/product';
import { useSearchStore } from 'src/store/useSearchStore';
@@ -66,7 +66,10 @@ function ShopDetail({ id }: { id: string }) {
-
+
+
diff --git a/src/utils/pathStorage.ts b/src/utils/pathStorage.ts
new file mode 100644
index 00000000..47c706fb
--- /dev/null
+++ b/src/utils/pathStorage.ts
@@ -0,0 +1,15 @@
+export function getPrevPath() {
+ return localStorage.getItem('prevPath') || '/';
+}
+
+export function getCurrentPath() {
+ return localStorage.getItem('currentPath') || '/';
+}
+
+export function setPathValue(currentUrl: string) {
+ const prevPath = getCurrentPath() || '/';
+ if (prevPath !== currentUrl) {
+ localStorage.setItem('prevPath', prevPath);
+ localStorage.setItem('currentPath', currentUrl);
+ }
+}
diff --git a/src/utils/regExp.ts b/src/utils/regExp.ts
index eb807081..cb2cca42 100644
--- a/src/utils/regExp.ts
+++ b/src/utils/regExp.ts
@@ -1,2 +1,6 @@
export const isSameRegExpCondition = (condition: RegExp, str: string) =>
condition.test(str);
+
+export const isSameMultipleRegExp = (regExps: RegExp[], str: string) => {
+ return regExps.map((regExp) => regExp.test(str));
+};