release-1.1.12

choooz · May 12, 2023 · 906b9ad · 906b9ad · vercel · May 12, 2023
2 parents 6640032 + 4944fd6
commit 906b9ad
Show file tree

Hide file tree

Showing 34 changed files with 1,656 additions and 299 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/apps/web/app/[id]/layout.tsx b/apps/web/app/[id]/layout.tsx
diff --git a/apps/web/app/[id]/page.tsx → apps/web/app/detail/[id]/page.tsx b/apps/web/app/[id]/page.tsx → apps/web/app/detail/[id]/page.tsx
diff --git a/apps/web/app/layout.tsx b/apps/web/app/layout.tsx
@@ -7,6 +7,7 @@ import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
 import { GlobalStyles } from "styles/globalStyles";
 import StyledComponentsRegistry from "../lib/registry";
 import useReplaceUser from "hooks/useReplaceUser";
+import Header from "components/common/header/Header";
 
 function RootLayout({
   // Layouts must accept a children prop.
@@ -37,6 +38,7 @@ function RootLayout({
           <StyledComponentsRegistry>
             <ThemeProvider theme={theme}>
               <GlobalStyles />
+              <Header />
               <Applayout>
                 <div id="stars" />
                 <div id="stars2" />

diff --git a/apps/web/app/login/kakaoLoginProcess/page.tsx b/apps/web/app/login/kakaoLoginProcess/page.tsx
@@ -21,11 +21,11 @@ function kakaoLoginProcess() {
 
   const kakaoLogin = async () => {
     try {
-      const { accessToken, newUser } = await kakaoLoginAPI({
+      const { accessToken, refreshToken, newUser } = await kakaoLoginAPI({
         code,
         redirectUrl: KAKAO_LOGIN_REDIRECT_URL,
       });
-      userStorage.set(accessToken);
+      userStorage.set({ accessToken, refreshToken });
       newUser ? router.push(Path.REGISTER_PAGE) : router.push(Path.MAIN_PAGE);
     } catch (error) {
       alert("에러가 발생하였습니다.");

diff --git a/apps/web/app/login/layout.tsx b/apps/web/app/login/layout.tsx
diff --git a/apps/web/app/login/naverLoginProcess/page.tsx b/apps/web/app/login/naverLoginProcess/page.tsx
@@ -20,8 +20,8 @@ function naverLoginProcess() {
 
   const naverLogin = async () => {
     try {
-      const { accessToken, newUser } = await naverLoginAPI({ code, state: "test" });
-      userStorage.set(accessToken);
+      const { accessToken, refreshToken, newUser } = await naverLoginAPI({ code, state: "test" });
+      userStorage.set({ accessToken, refreshToken });
       newUser ? router.push(Path.REGISTER_PAGE) : router.push(Path.MAIN_PAGE);
     } catch (error) {
       alert("에러가 발생하였습니다.");

diff --git a/apps/web/app/my/edit/layout.tsx b/apps/web/app/my/edit/layout.tsx
diff --git a/apps/web/app/my/page.tsx b/apps/web/app/my/page.tsx
@@ -2,7 +2,6 @@
 
 import { media } from "@chooz/ui/styles/media";
 import { useQuery } from "@tanstack/react-query";
-import Header from "components/common/Header";
 import ImageUploadButton from "components/common/ImageUploadButton";
 import TabContainer from "components/my/TabContainer";
 import VoteList from "components/my/VoteList";
@@ -44,57 +43,54 @@ function MyPage() {
   const { countCreatedVote, countParticipatedVote, countBookmarkedVote } = voteCount;
 
   return (
-    <>
-      <Header leftMenu="back" centerMenu="My page" rightMenu="logout" />;
-      <PageWrapper>
-        <PageInner>
-          <AddImageButtonWrapper>
-            <ImageUploadButton width="107px" height="107px" />
-          </AddImageButtonWrapper>
-          <Profile>
-            <UserInfo>
-              <>
-                {gender === Gender.MALE ? "남" : "여"}
-                <Divider />
-                {age}
-                <Divider />
-                {mbti}
-              </>
-            </UserInfo>
-            <Nickname>{username}</Nickname>
-            <ProfileModifyButton>
-              <Link href={Path.PROFILE_EDIT}>프로필 수정</Link>
-            </ProfileModifyButton>
-          </Profile>
-          {/* @TODO api 연결하면 map 사용 */}
-          <NumberOfVoteSection>
-            <NumberOfVoteContainer>
-              <NumberOfVote>{countCreatedVote}</NumberOfVote>
-              <NumberOfVoteText>작성한 투표</NumberOfVoteText>
-            </NumberOfVoteContainer>
-            <NumberOfVoteContainer>
-              <NumberOfVote>{countParticipatedVote}</NumberOfVote>
-              <NumberOfVoteText>참여한 투표</NumberOfVoteText>
-            </NumberOfVoteContainer>
-            <NumberOfVoteContainer>
-              <NumberOfVote>{countBookmarkedVote}</NumberOfVote>
-              <NumberOfVoteText>북마크 투표</NumberOfVoteText>
-            </NumberOfVoteContainer>
-          </NumberOfVoteSection>
-        </PageInner>
-        <TabContainerWrapper>
-          <TabContainer
-            tabList={MY_PAGE_VOTE_TYPE}
-            selectedTab={selectedTab}
-            onClickSelectedTab={onClickSelectedTab}
-          />
-        </TabContainerWrapper>
-        <VoteListSection>
-          <VoteList voteList={voteList} />
-          <div ref={subscribe} />
-        </VoteListSection>
-      </PageWrapper>
-    </>
+    <PageWrapper>
+      <PageInner>
+        <AddImageButtonWrapper>
+          <ImageUploadButton width="107px" height="107px" />
+        </AddImageButtonWrapper>
+        <Profile>
+          <UserInfo>
+            <>
+              {gender === Gender.MALE ? "남" : "여"}
+              <Divider />
+              {age}
+              <Divider />
+              {mbti}
+            </>
+          </UserInfo>
+          <Nickname>{username}</Nickname>
+          <ProfileModifyButton>
+            <Link href={Path.PROFILE_EDIT}>프로필 수정</Link>
+          </ProfileModifyButton>
+        </Profile>
+        {/* @TODO api 연결하면 map 사용 */}
+        <NumberOfVoteSection>
+          <NumberOfVoteContainer>
+            <NumberOfVote>{countCreatedVote}</NumberOfVote>
+            <NumberOfVoteText>작성한 투표</NumberOfVoteText>
+          </NumberOfVoteContainer>
+          <NumberOfVoteContainer>
+            <NumberOfVote>{countParticipatedVote}</NumberOfVote>
+            <NumberOfVoteText>참여한 투표</NumberOfVoteText>
+          </NumberOfVoteContainer>
+          <NumberOfVoteContainer>
+            <NumberOfVote>{countBookmarkedVote}</NumberOfVote>
+            <NumberOfVoteText>북마크 투표</NumberOfVoteText>
+          </NumberOfVoteContainer>
+        </NumberOfVoteSection>
+      </PageInner>
+      <TabContainerWrapper>
+        <TabContainer
+          tabList={MY_PAGE_VOTE_TYPE}
+          selectedTab={selectedTab}
+          onClickSelectedTab={onClickSelectedTab}
+        />
+      </TabContainerWrapper>
+      <VoteListSection>
+        <VoteList voteList={voteList} />
+        <div ref={subscribe} />
+      </VoteListSection>
+    </PageWrapper>
   );
 }
 

diff --git a/apps/web/app/page.tsx b/apps/web/app/page.tsx
@@ -3,7 +3,7 @@
 import { useToggle, useOutsideClick } from "@chooz/hooks";
 import { Button, FloatModalTemplate } from "@chooz/ui";
 import { media } from "@chooz/ui/styles/media";
-import Header from "components/common/Header";
+import Header from "components/common/header/Header";
 import AddDetailModalContainer from "components/select/AddDetailModalContainer";
 import useFlipAnimation, { Drag } from "components/select/hooks/useFlipAnimation";
 import SelectAB from "components/select/SelectAB";
@@ -27,25 +27,28 @@ function SelectPage() {
   const params = new URLSearchParams(searchParams);
   const router = useRouter();
   const { data, isError, isLoading, mainVoteList, nowShowing, onChangeNowShowing } =
-    useInfiniteMainListService(10, "ByTime");
+    useInfiniteMainListService(20, "ByTime");
   const [toggleDetail, onChangeToggleDetail] = useToggle(false);
   const [toggleMenu, onChangeToggleMenu] = useToggle(false);
   const { targetEl } = useOutsideClick<HTMLImageElement>(toggleMenu, onChangeToggleMenu);
-  const { onActFlip, drag } = useFlipAnimation(onChangeNowShowing);
+  const { onActFlip, drag, onTouchMoveActFlip } = useFlipAnimation(onChangeNowShowing);
   const { select, onMutateVoting } = useMutateVotingService(mainVoteList[nowShowing]?.voteId);
 
   if (isLoading) return <PageInner drag={drag}>로딩중</PageInner>;
   if (isError) return <PageInner drag={drag}>에러</PageInner>;
   if (!data) return <PageInner drag={drag}>데이터 없음</PageInner>;
 
   const { modifiedDate, title, imageA, imageB, titleA, titleB, detail, category } =
-    mainVoteList[nowShowing];
-
+    mainVoteList[nowShowing] || {};
   return (
     <>
-      <Header leftMenu="logo" rightMenu="menu" />
       <PageWrapper>
-        <PageInner className="animate" onWheel={onActFlip} drag={drag}>
+        <PageInner
+          className="animate"
+          onWheel={onActFlip}
+          onTouchMove={onTouchMoveActFlip}
+          drag={drag}
+        >
           <VoteToolbar
             onChangeToggleDetail={onChangeToggleDetail}
             onChangeToggleMenu={onChangeToggleMenu}
@@ -65,7 +68,7 @@ function SelectPage() {
           />
           <AddDescriptionButton>﹢</AddDescriptionButton>
           <DetailButton width="127px" height="48px" variant="primary" borderRadius="100px">
-            <Link href={`${Path.MAIN_PAGE}${mainVoteList[nowShowing].voteId}`}>
+            <Link href={`${Path.VOTE_DETAIL_PAGE}${mainVoteList[nowShowing].voteId}`}>
               <DetailButtonInner>
                 <Image alt="자세히 보기" src={AmplifyIcon} width={40} height={40} /> 자세히 보기
               </DetailButtonInner>

diff --git a/apps/web/app/post/layout.tsx b/apps/web/app/post/layout.tsx
diff --git a/apps/web/app/tutorial/layout.tsx b/apps/web/app/tutorial/layout.tsx
diff --git a/apps/web/app/vote-list/layout.tsx b/apps/web/app/vote-list/layout.tsx