Merge branch 'develop' of https://github.com/Team-Lecue/Lecue-Client …

…into Hotfix-Dori
Team-Lecue · Jan 19, 2024 · 90a0ee3 · 90a0ee3
2 parents dbf3d69 + b68afd3
commit 90a0ee3
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 46 deletions.
diff --git a/src/Detail/components/LecueNoteListContainer/index.tsx b/src/Detail/components/LecueNoteListContainer/index.tsx
@@ -80,7 +80,7 @@ function LecueNoteListContainer(props: LecueNoteListContainerProps) {
     ) {
       sessionStorage.setItem('scrollPosition', window.scrollY.toString());
 
-      navigate('/sticker-pack', { state: { bookId: bookId } });
+      navigate('/sticker-pack', { state: { bookId: bookId }, replace: true });
     } else {
       setModalOn(true);
     }

diff --git a/src/Detail/components/SmallLecueNote/SmallLecueNote.style.ts b/src/Detail/components/SmallLecueNote/SmallLecueNote.style.ts
@@ -62,7 +62,6 @@ export const SmallLecueNoteNickName = styled.p`
 
 export const SmallLecueNoteContentWrapper = styled.div`
   display: flex;
-  justify-content: center;
   align-items: center;
 
   height: 10rem;
@@ -81,6 +80,8 @@ export const SmallLecueNoteContent = styled.p`
 
   max-height: 100%;
 
+  white-space: pre-wrap;
+
   ${({ theme }) => theme.fonts.Body2_M_14};
 `;
 

diff --git a/src/Detail/components/ZigZagView/index.tsx b/src/Detail/components/ZigZagView/index.tsx
@@ -40,24 +40,6 @@ const ZigZagView = forwardRef(function ZigZagView(
           ))}
         </Fragment>
       )}
-
-      {isEditable && (
-        <Draggable
-          defaultPosition={{
-            x: 0,
-            y: savedScrollPosition,
-          }}
-          onDrag={handleDrag}
-          bounds="parent"
-          nodeRef={nodeRef}
-        >
-          <S.Sticker
-            ref={nodeRef}
-            stickerImage={stickerState.stickerImage}
-            isEditable
-          />
-        </Draggable>
-      )}
       {postedStickerList.length > 0 && (
         <Fragment>
           {postedStickerList.map(
@@ -78,6 +60,24 @@ const ZigZagView = forwardRef(function ZigZagView(
           )}
         </Fragment>
       )}
+
+      {isEditable && (
+        <Draggable
+          defaultPosition={{
+            x: 0,
+            y: savedScrollPosition,
+          }}
+          onDrag={handleDrag}
+          bounds="parent"
+          nodeRef={nodeRef}
+        >
+          <S.Sticker
+            ref={nodeRef}
+            stickerImage={stickerState.stickerImage}
+            isEditable
+          />
+        </Draggable>
+      )}
     </S.ZigZagViewWrapper>
   );
 });

diff --git a/src/LecueNote/page/LeceuNotePage/index.tsx b/src/LecueNote/page/LeceuNotePage/index.tsx
@@ -36,7 +36,7 @@ function LecueNotePage() {
   const postMutation = usePostLecueNote();
   const location = useLocation();
 
-  const { bookId } = location.state;
+  const { bookId } = location.state || {};
 
   const handleClickCategory = (
     e: React.MouseEvent<HTMLButtonElement, MouseEvent>,

diff --git a/src/Router.tsx b/src/Router.tsx
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Suspense } from 'react';
-import { ErrorBoundary } from 'react-error-boundary';
+import { ErrorBoundary, FallbackProps } from 'react-error-boundary';
+import { useQueryErrorResetBoundary } from 'react-query';
 import { BrowserRouter, Route, Routes } from 'react-router-dom';
 
 import ErrorPage from './components/common/ErrorPage';
@@ -20,9 +21,10 @@ import StickerPack from './StickerPack/page/StickerPack';
 import TargetPage from './Target/page/TargetPage';
 
 function Router() {
+  const { reset } = useQueryErrorResetBoundary();
   return (
     <BrowserRouter>
-      <ErrorBoundary FallbackComponent={fallbackRender}>
+      <ErrorBoundary FallbackComponent={fallbackRender} onReset={reset}>
         <Suspense fallback={<LoadingPage />}>
           <Routes>
             <Route path="/" element={<SelectView />} />
@@ -54,23 +56,9 @@ function Router() {
 
 export default Router;
 
-function fallbackRender({ error, resetErrorBoundary }: any) {
-  if (error.response.status === 404 || error.error.response.status === 404) {
-    resetErrorBoundary();
+function fallbackRender({ error }: FallbackProps) {
+  if (error.response?.status === 401 || error.response?.status === 403) {
     return <Login />;
-  } else if (
-    error.response.status === 401 ||
-    error.error.response.status === 401
-  ) {
-    resetErrorBoundary();
-    localStorage.removeItem('token');
-    localStorage.removeItem('nickname');
-    return <Login />;
-  } else {
-    alert(
-      ` ${error.response.status},
-      ${error.error.response.status},
-      에러 발생 : 콘솔창 캡쳐해서 개발자 보내주삼`,
-    );
   }
+  return <ErrorPage />;
 }
diff --git a/src/SelectBook/components/MakeLecueBookButton/index.tsx b/src/SelectBook/components/MakeLecueBookButton/index.tsx
@@ -10,7 +10,7 @@ function MakeLecueBookButton({ isActive, onClick }: MakeLecueBookButtonProps) {
   return (
     <S.MakeLecueBookButtonWrapper>
       <Button variant="choose" disabled={!isActive} onClick={onClick}>
-        레큐북 만들기
+        다음
       </Button>
     </S.MakeLecueBookButtonWrapper>
   );

diff --git a/src/SelectBook/page/SelectBookPage/index.tsx b/src/SelectBook/page/SelectBookPage/index.tsx
@@ -35,7 +35,7 @@ function SelectBookPage() {
 
   return (
     <S.SelectBookPageWrapper>
-      <Header headerTitle="레큐북 만들기" />
+      <Header headerTitle="요금 선택" />
       <S.SelectBookPageBodyWrapper>
         <S.SelectBookContainer isClickedSelectButton={isClickedSelectButton}>
           {isClickedSelectButton ? (

diff --git a/src/StickerAttach/hooks/usePostStickerState.ts b/src/StickerAttach/hooks/usePostStickerState.ts
@@ -21,7 +21,7 @@ const usePostStickerState = (bookUuId: string) => {
       });
     },
     onSuccess: () => {
-      navigate(`/lecue-book/${bookUuId}`);
+      navigate(`/lecue-book/${bookUuId}`, { replace: true });
     },
 
     onError: () => navigate('/error'),

diff --git a/src/StickerPack/page/StickerPack/index.tsx b/src/StickerPack/page/StickerPack/index.tsx
@@ -17,7 +17,7 @@ function StickerPack() {
   const navigate = useNavigate();
   const location = useLocation();
 
-  const { bookId } = location.state;
+  const { bookId } = location.state || {};
 
   const [selectedStickerData, setSelectedStickerData] = useState<stickerType>({
     stickerId: 0,
@@ -37,7 +37,7 @@ function StickerPack() {
 
   const handleClickDone = () => {
     navigate(`/sticker-attach/${bookUuId}`, {
-      state: { sticker: selectedStickerData },
+      state: { sticker: selectedStickerData, replace: true },
     });
   };
 

diff --git a/src/Target/components/CompleteButton/index.tsx b/src/Target/components/CompleteButton/index.tsx
@@ -10,7 +10,7 @@ function CompleteButton({ isActive, onClick }: CompleteButtonProps) {
   return (
     <S.CompleteButtonWrapper>
       <Button variant="complete" disabled={!isActive} onClick={onClick}>
-        완료
+        다음
       </Button>
     </S.CompleteButtonWrapper>
   );

diff --git a/src/Target/page/TargetPage/index.tsx b/src/Target/page/TargetPage/index.tsx
@@ -47,6 +47,8 @@ function TargetPage() {
       };
     }
 
+    sessionStorage.setItem('name', name);
+
     navigate('/select-book', {
       state: { presignedFileName: presignedFileName, name: name },
     });