From 939dc222d4bd51437515b48dddc00b5962d201e3 Mon Sep 17 00:00:00 2001
From: 03hoho03 <ghwjd321@naver.com>
Date: Mon, 8 Apr 2024 20:26:34 +0900
Subject: [PATCH 1/7] =?UTF-8?q?[#52]=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/_common/nav/index.tsx | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/app/_common/nav/index.tsx b/app/_common/nav/index.tsx
index db33b46..3c32ec1 100644
--- a/app/_common/nav/index.tsx
+++ b/app/_common/nav/index.tsx
@@ -1,15 +1,38 @@
+'use client'
+
 import Image from 'next/image'
 import Link from 'next/link'
 import logo from '../../_assets/_images/logo.png'
 import S from './nav.module.css'
+import { useRouter } from 'next/navigation'
 
 //TODO: 사용자 프로필 이미지 가져오기
 function Nav() {
+  const router = useRouter()
+  const accessToken = localStorage.getItem('accessToken')
+
+  const handleLogout = () => {
+    localStorage.removeItem('accessToken')
+    location.reload()
+  }
+  const handleLogin = () => {
+    router.push('/signin')
+  }
+
   return (
     <div className={S.nav}>
       <Link href="/main">
         <Image src={logo} alt="로고" width={100} height={100} />
       </Link>
+      {accessToken ? (
+        <button type="button" onClick={handleLogout}>
+          로그아웃
+        </button>
+      ) : (
+        <button type="button" onClick={handleLogin}>
+          로그인
+        </button>
+      )}
 
       <Link href="/mypage">
         <div className={S.userProfileWrapper}>

From eb9b54cb5020f350c9db992cef46b53e7b556036 Mon Sep 17 00:00:00 2001
From: 03hoho03 <ghwjd321@naver.com>
Date: Mon, 8 Apr 2024 20:29:15 +0900
Subject: [PATCH 2/7] =?UTF-8?q?[#52]=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/_common/nav/index.tsx      | 15 ++-------------
 app/_common/nav/nav.module.css |  8 +++++++-
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/app/_common/nav/index.tsx b/app/_common/nav/index.tsx
index 3c32ec1..02ab272 100644
--- a/app/_common/nav/index.tsx
+++ b/app/_common/nav/index.tsx
@@ -25,25 +25,14 @@ function Nav() {
         <Image src={logo} alt="로고" width={100} height={100} />
       </Link>
       {accessToken ? (
-        <button type="button" onClick={handleLogout}>
+        <button className={S.btn} type="button" onClick={handleLogout}>
           로그아웃
         </button>
       ) : (
-        <button type="button" onClick={handleLogin}>
+        <button className={S.btn} type="button" onClick={handleLogin}>
           로그인
         </button>
       )}
-
-      <Link href="/mypage">
-        <div className={S.userProfileWrapper}>
-          {/* <Image
-            src="https://github.com/primus-teoSprint/FE/assets/63100352/b9d091d3-628e-4c16-a609-68b9e0acc3e4"
-            alt="사용자 프로필"
-            width={25}
-            height={25}
-          /> */}
-        </div>
-      </Link>
     </div>
   )
 }
diff --git a/app/_common/nav/nav.module.css b/app/_common/nav/nav.module.css
index b529fe4..1661d11 100644
--- a/app/_common/nav/nav.module.css
+++ b/app/_common/nav/nav.module.css
@@ -6,7 +6,13 @@
   width: 100%;
   padding: 18px 0px;
 }
-
+.btn {
+  background-color: rgb(106, 106, 255);
+  color: #ffffff;
+  font-size: 12px;
+  border-radius: 8px;
+  padding:4px 8px;
+}
 .userProfileWrapper {
   display: flex;
   justify-content: center;

From 5e715fd6b1cbe6b28e559a927538c5272c7bfad9 Mon Sep 17 00:00:00 2001
From: 03hoho03 <ghwjd321@naver.com>
Date: Mon, 8 Apr 2024 20:44:30 +0900
Subject: [PATCH 3/7] !!fix

---
 app/_common/nav/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/_common/nav/index.tsx b/app/_common/nav/index.tsx
index 02ab272..8aa8b5c 100644
--- a/app/_common/nav/index.tsx
+++ b/app/_common/nav/index.tsx
@@ -9,7 +9,7 @@ import { useRouter } from 'next/navigation'
 //TODO: 사용자 프로필 이미지 가져오기
 function Nav() {
   const router = useRouter()
-  const accessToken = localStorage.getItem('accessToken')
+  const accessToken = localStorage?.getItem('accessToken')
 
   const handleLogout = () => {
     localStorage.removeItem('accessToken')

From ea3ad8bdc03048205351245a791b2f43fc2d49ad Mon Sep 17 00:00:00 2001
From: 03hoho03 <ghwjd321@naver.com>
Date: Mon, 8 Apr 2024 20:50:36 +0900
Subject: [PATCH 4/7] =?UTF-8?q?!!fix=20suspense=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/(route)/main/page.tsx                |  99 +++++++-------
 app/(route)/mypage/page.tsx              |   5 +-
 app/(route)/toolDetail/[toolId]/page.tsx | 157 ++++++++++++-----------
 3 files changed, 133 insertions(+), 128 deletions(-)

diff --git a/app/(route)/main/page.tsx b/app/(route)/main/page.tsx
index 6c4b5ae..bb82b77 100644
--- a/app/(route)/main/page.tsx
+++ b/app/(route)/main/page.tsx
@@ -12,6 +12,7 @@ import Title from '../../_common/text/title'
 import Search from '../../_components/search'
 import { Root, Tool } from '../../_constants/toolcard'
 import S from './page.module.css'
+import { Suspense } from 'react'
 
 //TODO: 주석처리 사항들에 데이터 가져오기
 function Main() {
@@ -27,58 +28,60 @@ function Main() {
   const resData = data?.data.data.tool
 
   return (
-    <main className={S.wrapper}>
-      <Nav />
-      <div className={S.inWrapper}>
-        <Link href="/search">
-          <Search />
-        </Link>
-        <div className={S.marginWrapper}>
-          <Title title="인기 많은 툴" />
-        </div>
-        <div className={S.toolCardWrapper}>
-          <Swiper
-            spaceBetween={20}
-            slidesPerView={'auto'}
-            onSlideChange={() => console.log('slide change')}
-            onSwiper={(swiper) => console.log(swiper)}
-          >
-            {resData?.map((data: Tool, index: number) => {
+    <Suspense fallback={<div>...loading</div>}>
+      <main className={S.wrapper}>
+        <Nav />
+        <div className={S.inWrapper}>
+          <Link href="/search">
+            <Search />
+          </Link>
+          <div className={S.marginWrapper}>
+            <Title title="인기 많은 툴" />
+          </div>
+          <div className={S.toolCardWrapper}>
+            <Swiper
+              spaceBetween={20}
+              slidesPerView={'auto'}
+              onSlideChange={() => console.log('slide change')}
+              onSwiper={(swiper) => console.log(swiper)}
+            >
+              {resData?.map((data: Tool, index: number) => {
+                return (
+                  <SwiperSlide style={{ width: '390px' }} key={index}>
+                    <ToolCard
+                      title={data?.title || ''}
+                      subTitle={data?.subTitle || ''}
+                      description={data?.description || ''}
+                      toolImg={data?.toolImg || ''}
+                      toolId={index}
+                      company={data?.company}
+                    />
+                  </SwiperSlide>
+                )
+              })}
+            </Swiper>
+          </div>
+          <div className={S.rowWrapper}>
+            <Title title="검증 툴 리스트" />
+            <Link href="/list">자세히 보기</Link>
+          </div>
+          <div className={S.keyWordCardWrapper}>
+            {resData?.map((data: Tool, index) => {
               return (
-                <SwiperSlide style={{ width: '390px' }} key={index}>
-                  <ToolCard
-                    title={data?.title || ''}
-                    subTitle={data?.subTitle || ''}
-                    description={data?.description || ''}
-                    toolImg={data?.toolImg || ''}
-                    toolId={index}
-                    company={data?.company}
-                  />
-                </SwiperSlide>
+                <KeyWordTool
+                  title={data?.title || ''}
+                  subTitle={data?.subTitle || ''}
+                  toolImg={data?.toolImg || ''}
+                  key={index}
+                  toolId={index}
+                  keyword={data.keyword}
+                />
               )
             })}
-          </Swiper>
-        </div>
-        <div className={S.rowWrapper}>
-          <Title title="검증 툴 리스트" />
-          <Link href="/list">자세히 보기</Link>
-        </div>
-        <div className={S.keyWordCardWrapper}>
-          {resData?.map((data: Tool, index) => {
-            return (
-              <KeyWordTool
-                title={data?.title || ''}
-                subTitle={data?.subTitle || ''}
-                toolImg={data?.toolImg || ''}
-                key={index}
-                toolId={index}
-                keyword={data.keyword}
-              />
-            )
-          })}
+          </div>
         </div>
-      </div>
-    </main>
+      </main>
+    </Suspense>
   )
 }
 
diff --git a/app/(route)/mypage/page.tsx b/app/(route)/mypage/page.tsx
index f2644c4..5cad582 100644
--- a/app/(route)/mypage/page.tsx
+++ b/app/(route)/mypage/page.tsx
@@ -2,12 +2,13 @@ import Nav from '@/app/_common/nav'
 import Title from '@/app/_common/text/title'
 import IdeaCard from './_components/ideaCard'
 import S from './mypage.module.css'
+import { Suspense } from 'react'
 
 //TODO: 사용자 명, 아이디어 검증 수가 들어갑니다.
 //TODO: 완료된 아이디어, 입력 전 아이디어를 불러옵니다.(get)
 function Mypage() {
   return (
-    <>
+    <Suspense fallback={<div>로딩중...</div>}>
       <div className={S.wrapper}>
         <Nav />
         <Title title="아이디어" />
@@ -24,7 +25,7 @@ function Mypage() {
           <IdeaCard />
         </div>
       </div>
-    </>
+    </Suspense>
   )
 }
 
diff --git a/app/(route)/toolDetail/[toolId]/page.tsx b/app/(route)/toolDetail/[toolId]/page.tsx
index 5db4467..b8e86fe 100644
--- a/app/(route)/toolDetail/[toolId]/page.tsx
+++ b/app/(route)/toolDetail/[toolId]/page.tsx
@@ -3,9 +3,8 @@
 import Modal from '@/app/_common/modal'
 import Nav from '@/app/_common/nav'
 import Title from '@/app/_common/text/title'
-import { useState } from 'react'
+import { Suspense, useState } from 'react'
 import S from './toolDetail.module.css'
-import Link from 'next/link'
 import { useParams } from 'next/navigation'
 import { useQuery } from '@tanstack/react-query'
 import axios, { AxiosResponse } from 'axios'
@@ -30,91 +29,93 @@ function ToolDetail() {
   const resData = data?.data.data.tool[Number(toolId)]
 
   return (
-    <div className={S.wrapper}>
-      <Nav />
-      <div className={S.introWrapper}>
-        <div className={S.imgWrapper}>
-          <Image
-            src={resData?.toolImg || ''}
-            alt="아이디어 툴 이미지"
-            width={80}
-            height={80}
-          />
+    <Suspense fallback={<div>로딩중...</div>}>
+      <div className={S.wrapper}>
+        <Nav />
+        <div className={S.introWrapper}>
+          <div className={S.imgWrapper}>
+            <Image
+              src={resData?.toolImg || ''}
+              alt="아이디어 툴 이미지"
+              width={80}
+              height={80}
+            />
+          </div>
+          <Title title={resData?.title || ''} />
+          <p> {resData?.createdBy}</p>
         </div>
-        <Title title={resData?.title || ''} />
-        <p> {resData?.createdBy}</p>
-      </div>
 
-      <div className={S.contentWrapper}>
-        <div className={S.btnWrapper}>
-          <button
-            className={`${S.btn} ${!clickBtn ? S.clickBtn : ''}`}
-            onClick={() => setClickBtn((prevState) => !prevState)}
-          >
-            Description
-          </button>
-          <button
-            className={`${S.btn} ${clickBtn ? S.clickBtn : ''}`}
-            onClick={() => setClickBtn((prevState) => !prevState)}
-          >
-            Company
-          </button>
-        </div>
+        <div className={S.contentWrapper}>
+          <div className={S.btnWrapper}>
+            <button
+              className={`${S.btn} ${!clickBtn ? S.clickBtn : ''}`}
+              onClick={() => setClickBtn((prevState) => !prevState)}
+            >
+              Description
+            </button>
+            <button
+              className={`${S.btn} ${clickBtn ? S.clickBtn : ''}`}
+              onClick={() => setClickBtn((prevState) => !prevState)}
+            >
+              Company
+            </button>
+          </div>
 
-        {!clickBtn ? (
-          <>
+          {!clickBtn ? (
+            <>
+              <div className={S.marginWrapper}>
+                <Title title="개요" />
+                <p>{resData?.content}</p>
+              </div>
+              <div className={S.marginWrapper}>
+                <Title title="검증 방식" />
+                <ul>
+                  {resData?.verificationMethod.map((method, index) => {
+                    return (
+                      <li className={S.li} key={index}>
+                        <div className={S.circle}></div>
+                        <div className={S.method}>{method}</div>
+                      </li>
+                    )
+                  })}
+                </ul>
+              </div>
+            </>
+          ) : (
             <div className={S.marginWrapper}>
-              <Title title="개요" />
-              <p>{resData?.content}</p>
-            </div>
-            <div className={S.marginWrapper}>
-              <Title title="검증 방식" />
-              <ul>
-                {resData?.verificationMethod.map((method, index) => {
+              <Title title="실제 사례" />
+
+              <div className={S.columnWrapper}>
+                {resData?.company.map((company, index) => {
                   return (
-                    <li className={S.li} key={index}>
-                      <div className={S.circle}></div>
-                      <div className={S.method}>{method}</div>
-                    </li>
+                    <div className={S.examplewrap} key={index}>
+                      <div className={S.img}>
+                        <Image
+                          src={company || ''}
+                          alt="아이디어 툴 이미지"
+                          width={120}
+                          height={40}
+                        />
+                      </div>
+                      <div className={S.examplecontent}>
+                        {resData.exampleContent[index]}
+                      </div>
+                    </div>
                   )
                 })}
-              </ul>
+              </div>
             </div>
-          </>
-        ) : (
-          <div className={S.marginWrapper}>
-            <Title title="실제 사례" />
-
-            <div className={S.columnWrapper}>
-              {resData?.company.map((company, index) => {
-                return (
-                  <div className={S.examplewrap} key={index}>
-                    <div className={S.img}>
-                      <Image
-                        src={company || ''}
-                        alt="아이디어 툴 이미지"
-                        width={120}
-                        height={40}
-                      />
-                    </div>
-                    <div className={S.examplecontent}>
-                      {resData.exampleContent[index]}
-                    </div>
-                  </div>
-                )
-              })}
-            </div>
-          </div>
-        )}
+          )}
+        </div>
+        <Modal
+          open="검증하기"
+          title="아이디어 불패의 법칙"
+          subTitle="선택한 해당 아이디어 툴로 검사를 진행하시겠습니까? :)"
+          buttonTitle="해당 툴로 검증하기"
+          buttonLink="/verification/ibulsin?step=1"
+        ></Modal>
       </div>
-      <Modal
-        open="검증하기"
-        title="아이디어 불패의 법칙"
-        subTitle="선택한 해당 아이디어 툴로 검사를 진행하시겠습니까? :)"
-        buttonTitle="해당 툴로 검증하기"
-        buttonLink="/verification/ibulsin?step=1"
-      ></Modal>
-    </div>
+    </Suspense>
   )
 }
 

From a621a65360647fe520f155454d0f629d718c6046 Mon Sep 17 00:00:00 2001
From: 03hoho03 <ghwjd321@naver.com>
Date: Mon, 8 Apr 2024 20:53:56 +0900
Subject: [PATCH 5/7] !!fix localstorage

---
 app/_common/nav/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/_common/nav/index.tsx b/app/_common/nav/index.tsx
index 8aa8b5c..fe0c331 100644
--- a/app/_common/nav/index.tsx
+++ b/app/_common/nav/index.tsx
@@ -9,7 +9,7 @@ import { useRouter } from 'next/navigation'
 //TODO: 사용자 프로필 이미지 가져오기
 function Nav() {
   const router = useRouter()
-  const accessToken = localStorage?.getItem('accessToken')
+  const accessToken = typeof window && localStorage?.getItem('accessToken')
 
   const handleLogout = () => {
     localStorage.removeItem('accessToken')

From 747512bc07464634abd45d2d127ead3fa107ce92 Mon Sep 17 00:00:00 2001
From: 03hoho03 <ghwjd321@naver.com>
Date: Mon, 8 Apr 2024 20:56:01 +0900
Subject: [PATCH 6/7] !!fix

---
 app/(route)/mypage/page.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/(route)/mypage/page.tsx b/app/(route)/mypage/page.tsx
index 5cad582..f2d2ac8 100644
--- a/app/(route)/mypage/page.tsx
+++ b/app/(route)/mypage/page.tsx
@@ -1,3 +1,5 @@
+'use client'
+
 import Nav from '@/app/_common/nav'
 import Title from '@/app/_common/text/title'
 import IdeaCard from './_components/ideaCard'

From e544deb507ffe6863a2350b6c68752c870c9dc3c Mon Sep 17 00:00:00 2001
From: 03hoho03 <ghwjd321@naver.com>
Date: Mon, 8 Apr 2024 20:59:51 +0900
Subject: [PATCH 7/7] !!fix

---
 app/_common/nav/index.tsx | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/_common/nav/index.tsx b/app/_common/nav/index.tsx
index fe0c331..86fb999 100644
--- a/app/_common/nav/index.tsx
+++ b/app/_common/nav/index.tsx
@@ -5,14 +5,25 @@ import Link from 'next/link'
 import logo from '../../_assets/_images/logo.png'
 import S from './nav.module.css'
 import { useRouter } from 'next/navigation'
+import { useEffect, useState } from 'react'
 
 //TODO: 사용자 프로필 이미지 가져오기
 function Nav() {
   const router = useRouter()
-  const accessToken = typeof window && localStorage?.getItem('accessToken')
+  const [isAuth, setIsAuth] = useState(false)
+
+  useEffect(() => {
+    if (typeof window !== 'undefined') {
+      const item = localStorage.getItem('accessToken')
+      if (item) {
+        setIsAuth(true)
+      }
+    }
+  }, [])
 
   const handleLogout = () => {
     localStorage.removeItem('accessToken')
+    setIsAuth(false)
     location.reload()
   }
   const handleLogin = () => {
@@ -24,7 +35,7 @@ function Nav() {
       <Link href="/main">
         <Image src={logo} alt="로고" width={100} height={100} />
       </Link>
-      {accessToken ? (
+      {isAuth ? (
         <button className={S.btn} type="button" onClick={handleLogout}>
           로그아웃
         </button>