[🔀 merge] develop <- main

.github/workflows/develop_waved-fe.yml

@@ -64,14 +64,13 @@ jobs:
 
       - name: Unzip artifact for deployment
         run: unzip release.zip
-        
+
       - name: Login to Azure
         uses: azure/login@v1
         with:
           client-id: ${{ secrets.AZUREAPPSERVICE_CLIENTID }}
           tenant-id: ${{ secrets.AZUREAPPSERVICE_TENANTID }}
-          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID }}	
-
+          subscription-id: ${{ secrets.AZUREAPPSERVICE_SUBSCRIPTIONID }}
 
       - name: 'Deploy to Azure Web App'
         id: deploy-to-webapp
@@ -87,4 +86,4 @@ jobs:
           NEXT_PUBLIC_LOGIN_URL: ${{ secrets.NEXT_PUBLIC_LOGIN_URL }}
           NEXT_PUBLIC_CLIENT_BASE_URL: ${{ secrets.NEXT_PUBLIC_CLIENT_BASE_URL }}
           NEXT_PUBLIC_ADMIN_BASE_URL: ${{ secrets.NEXT_PUBLIC_ADMIN_BASE_URL }}
-          NEXT_PUBLIC_IMAGE_TOKEN: ${{ secrets.NEXT_PUBLIC_IMAGE_TOKEN }}
+          NEXT_PUBLIC_IMAGE_TOKEN: ${{ secrets.NEXT_PUBLIC_IMAGE_TOKEN }}

.gitignore

@@ -39,3 +39,5 @@ next-env.d.ts
 # pwa
 sw.js
 workbox-*.js
+sw.js.map
+workbox-*.js.map

next.config.mjs

@@ -1,6 +1,12 @@
 import withPWA from 'next-pwa';
 
-const prod = process.env.NODE_ENV === 'production';
+const isProd = process.env.NODE_ENV === 'production';
+
+const pwaConfig = withPWA({
+  dest: 'public',
+  disable: !isProd,
+  runtimeCaching: [],
+});
 
 /** @type {import('next').NextConfig} */
 const nextConfig = {
@@ -21,7 +27,4 @@ const nextConfig = {
   },
 };
 
-export default withPWA({
-  dest: 'public',
-  disable: prod ? false : true,
-})(nextConfig);
+export default pwaConfig(nextConfig);

src/components/common/Footer.tsx

@@ -2,7 +2,6 @@
 import styled from '@emotion/styled';
 import Image from 'next/image';
 import { useRouter } from 'next/router';
-import { getCookie } from 'cookies-next';
 import {
   homeNormal,
   homeFilled,
@@ -14,17 +13,22 @@ import {
 } from '../../../public/icons';
 import screenSize from '@/constants/screenSize';
 
-export default function Footer() {
+interface IFooterProps {
+  isLogined: boolean;
+}
+
+export default function Footer({ isLogined }: IFooterProps) {
   const router = useRouter();
-  const cookieToken = getCookie('accessToken');
+  // const cookieToken = getCookie('accessToken');
+  // const isLogined = !!cookieToken;
 
   const navigate = (
     e: React.MouseEvent<HTMLElement, MouseEvent>,
     path: string,
   ) => {
     e.preventDefault();
 
-    if (!cookieToken && path === '/mychallenge') {
+    if (!isLogined && path === '/mychallenge') {
       return;
     }
 
@@ -50,11 +54,11 @@ export default function Footer() {
       <SFooterNavLink onClick={(e) => navigate(e, '/mychallenge')}>
         <SMyChallengeNavItem
           isActive={router.pathname === '/mychallenge'}
-          isLogined={cookieToken !== null}
+          isLogined={isLogined}
         >
           <Image
             src={
-              cookieToken !== null
+              isLogined
                 ? router.pathname === '/mychallenge'
                   ? myChallengeFilled
                   : myChallengeNormal

src/components/common/Layout.tsx

@@ -15,6 +15,7 @@ interface ILayout {
   noHeader?: boolean;
   withBottomFixedBtn?: boolean;
   rightOnClick?: () => void;
+  isLogined?: boolean;
 }
 
 export default function Layout({
@@ -27,6 +28,7 @@ export default function Layout({
   noHeader,
   withBottomFixedBtn,
   rightOnClick,
+  isLogined,
 }: ILayout) {
   return (
     <SLayoutWrapper
@@ -55,7 +57,7 @@ export default function Layout({
         />
       )}
       <main>{children}</main>
-      {noFooter || <Footer />}
+      {noFooter || <Footer isLogined={isLogined !== undefined && isLogined} />}
     </SLayoutWrapper>
   );
 }

src/pages/home/index.tsx

@@ -83,6 +83,8 @@ export default function Home({
       const currentTime = Date.now();
       const timeUntilExpiry = expiresTime - currentTime;
 
+      console.log(timeUntilExpiry);
+
       if (timeUntilExpiry < 60000) {
         setReadyReconnect(true);
       }
@@ -238,7 +240,7 @@ export default function Home({
         )}
       </main>
       <FloatingBtn type={isLogined ? 'challengeRequest' : 'register'} />
-      <Footer />
+      <Footer isLogined={isLogined} />
     </SHomeWrapper>
   );
 }

src/pages/mychallenge/index.tsx

@@ -4,6 +4,7 @@ import { useRouter } from 'next/router';
 import Link from 'next/link';
 import styled from '@emotion/styled';
 import axios from 'axios';
+import { getCookie } from 'cookies-next';
 import REVIEW_SNACKBAR_TEXT from '@/constants/reviewSnackBarText';
 import ISnackBarState from '@/types/snackbar';
 import { TMyChallengeInfo } from '@/types/myChallenge';
@@ -22,6 +23,7 @@ interface IMyChallenges {
   getMyCompletedChallenges?: TMyChallengeInfo[];
   requireSnackBar?: boolean;
   errorMsg?: string;
+  isLogined: boolean;
 }
 
 export default function MyChallenge({
@@ -30,6 +32,7 @@ export default function MyChallenge({
   getMyCompletedChallenges,
   requireSnackBar,
   errorMsg,
+  isLogined,
 }: IMyChallenges) {
   const [completedData, setCompletedData] = useState<TMyChallengeInfo[]>(
     getMyCompletedChallenges || [],
@@ -134,6 +137,7 @@ export default function MyChallenge({
       headerText="MY 챌린지"
       title="마이챌린지"
       description="나의 챌린지 내역을 확인해보세요."
+      isLogined={isLogined}
     >
       <TabMenu
         tabs={[
@@ -182,6 +186,8 @@ export default function MyChallenge({
 
 async function getServerSidePropsFunction(context: GetServerSidePropsContext) {
   const serverInstance = createServerInstance(context);
+  const cookieToken = getCookie('accessToken', context);
+  const isLogined = !!cookieToken;
 
   const fetchMyChallenges = async (status: string) => {
     const response = await serverInstance.get<TMyChallengeInfo[]>(
@@ -201,6 +207,7 @@ async function getServerSidePropsFunction(context: GetServerSidePropsContext) {
       getMyProgressChallenges: myProgressChallenges,
       getMyWaitingChallenges: myWaitingChallenges,
       getMyCompletedChallenges: myCompletedChallenges,
+      isLogined,
     },
   };
 }

src/pages/profile/index.tsx

@@ -187,6 +187,7 @@ export default function Profile({
       noHeader
       title="프로필"
       description="WAVED 회원의 프로필 페이지입니다. 챌린지 기록, 계정 설정, 고객 센터 등을 확인할 수 있습니다. "
+      isLogined={isLogined}
     >
       <SProfileWrapper>
         <h2 className="a11yHidden">프로필</h2>
@@ -370,7 +371,7 @@ export default function Profile({
         <SProfileEtc>
           <div>
             <p>현재 버전</p>
-            <p>1.0.2</p>
+            <p>1.0.1</p>
           </div>
         </SProfileEtc>
         <SwithdrawalBtnWrapper>