Merge branch 'master' into 조혜진

eunji-0623 · Jul 19, 2024 · e11fce4 · e11fce4
2 parents c750ec8 + c165c3c
commit e11fce4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/components/NavigationDropdown/NotificationDropdown.tsx b/components/NavigationDropdown/NotificationDropdown.tsx
@@ -71,7 +71,7 @@ export default function NotificationDropdown({
               key={notification.id}
               className="flex-col  items-center px-[12px] py-[16px] justify-between rounded-[5px] border-b w-[328px] min-h-[120px] m:w-[335px] m:h-[105px] bg-white border-gray-200 dark:bg-var-dark4 "
             >
-              <div className="flex justify-between m:mb-[5px]">
+              <div className="flex justify-between">
                 <StatusIndicator
                   size="small"
                   status={
@@ -80,14 +80,16 @@ export default function NotificationDropdown({
                       : 'denied'
                   }
                 />
-                <div className="m:hidden h-[24px]">
+                <div className="h-[24px]">
                   <CloseButton onClick={() => handleDelete(notification.id)} />
                 </div>
               </div>
               <div className="w-[298px] min-h-[44px] mb-[4px]">
-                <p>{ContentWithHighlights(notification.content)}</p>
+                {ContentWithHighlights(notification.content)}
+              </div>
+              <div className="text-[12px]">
+                {formatTimeAgo(notification.updatedAt)}
               </div>
-              <p>{formatTimeAgo(notification.updatedAt)}</p>
             </div>
           ))}
           {hasNextPage && <div ref={ref} />}

diff --git a/pages/mypage.tsx b/pages/mypage.tsx
@@ -1,12 +1,26 @@
 import MyPageInput from '@/components/MyPageInput/MyPageInput';
 import SidenNavigation from '@/components/SideNavigation/SideNavigation';
 import SidenNavigationMobile from '@/components/SideNavigation/SideNavigationMobile';
+import useLoginState from '@/hooks/useLoginState';
 import { useSideNavigation } from '@/hooks/useSideNavigation';
 import { useRouter } from 'next/router';
-import { useEffect, useState } from 'react';
+import { useEffect } from 'react';
 
 export default function MyPage() {
+  const route = useRouter();
+  const { isLoggedIn } = useLoginState();
   const { isOpen } = useSideNavigation();
+
+  useEffect(() => {
+    if (!isLoggedIn) {
+      route.push('/login');
+    }
+  }, [isLoggedIn, route]);
+
+  if (!isLoggedIn) {
+    return null;
+  }
+
   return (
     <>
       <div