gnims-project · AngelaChaejung · Mar 7, 2023 · Mar 7, 2023 · Mar 7, 2023 · Mar 7, 2023
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -7,6 +7,7 @@
       charset="utf-8"
     ></script>
     <meta charset="utf-8" />
+    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
@@ -29,7 +30,6 @@
     -->
 
     <title>Gnims</title>
-
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/src/components/Schedule/ScheduleDetail.jsx b/src/components/Schedule/ScheduleDetail.jsx
@@ -22,7 +22,6 @@ const ScheduleDetail = () => {
     dispatch(__getScheduleDetail(id));
   }, []);
   const joiner = schedule.invitees;
-  console.log(joiner);
   const numberOfJoiner = joiner && joiner.length;
   const hostId = schedule.hostId;
   //isHidden은 해당 스케쥴이 본인의 스케쥴이 아닐 땐 케밥버튼이 보이지 않게하기 위해 쓰인다. 기본값은 flex이고,
@@ -33,89 +32,83 @@ const ScheduleDetail = () => {
   }
 
   return (
-    <div>
+    <div className="width-[375px]">
       <div className="bg-[#F8FCFF] h-full width-[375px]">
-        <div>
-          <div className="fixed bottom-0">
-            {/* 케밥모달이 열리면 bottomNavi는 사라집니다 */}
-            {modalOpen ? false : <BottomNavi />}
-          </div>
-          {modalOpen && <KebabModal setModalOpen={setModalOpen} id={id} />}
-          <div
-            className={`h-[212px] bg-${schedule.cardColor} pl-[18px] w-[375px] pt-[23px] pr-[21px] text-white 
+        <div className="fixed bottom-0">
+          {/* 케밥모달이 열리면 bottomNavi는 사라집니다 */}
+          {modalOpen ? false : <BottomNavi />}
+        </div>
+        {modalOpen && <KebabModal setModalOpen={setModalOpen} id={id} />}
+        <div
+          className={`h-[212px] bg-${schedule.cardColor} pl-[18px] w-[375px] pt-[23px] pr-[21px] text-white 
            `}
-          >
-            <div className="flex flex-row-reverse ">
-              <div
-                className="w-[40px] mr-[-30px] right-0"
-                onClick={showModalHandler}
-              >
-                <img
-                  className={`h-[20px] ${isHidden} row cursor-pointer`}
-                  src={kebab}
-                  alt="케밥메뉴"
-                />
-              </div>
-            </div>
-            <div className="flex space-x-3 text-[18px]  font-light ">
-              <div>{schedule.date}</div> <div> {time}</div>
-            </div>
-            <div className="mt-[28px] font-semibold text-[24px]">
-              {schedule.subject}
-            </div>{" "}
-            <div className="place-content-end font-light flex text-[18px] mt-[45px]">
-              D-
-              {schedule.dday === 0 ? (
-                <div>DAY</div>
-              ) : (
-                <div>{schedule.dday}</div>
-              )}
+        >
+          <div className="flex flex-row-reverse ">
+            <div
+              className="w-[40px] mr-[-30px] right-0"
+              onClick={showModalHandler}
+            >
+              <img
+                className={`h-[20px] ${isHidden} row cursor-pointer`}
+                src={kebab}
+                alt="케밥메뉴"
+              />
             </div>
           </div>
-          <div className="">
-            <div>
-              {/* 참여자는 2명이상일 때부터 화면에 보입니다. */}
-              {numberOfJoiner !== 1 ? (
-                <div className="mt-[30px] h-[98px] ml-[20px]">
-                  참여자
-                  <div className="bg-white h-[50px] w-[335px] mt-[20px] p-[15px] drop-shadow-lg flex rounded-lg">
-                    {joiner &&
-                      joiner.map((a) => {
-                        return (
-                          <span className="text-sm ml-[5px]">{a.username}</span>
-                        );
-                      })}
-                  </div>
-                </div>
-              ) : (
-                false
-              )}
-            </div>
-            {/* 일정의 내용이 없을 땐 화면에 보이지 않습니다. */}
-            {schedule.content ? (
-              <div className="h-[234px] w-[375px] mt-[30px] mb-[8px] ml-[20px]">
-                일정내용{" "}
-                <div className="bg-white word-wrap break-words whitespace-normal  shadow-lg h-[186px] w-[335px] mt-[20px] p-[20px] flex rounded-lg">
-                  <div className="w-[295px] relative">{schedule.content}</div>
+          <div className="flex space-x-3 text-[18px]  font-light ">
+            <div>{schedule.date}</div> <div> {time}</div>
+          </div>
+          <div className="mt-[28px] font-semibold text-[24px]">
+            {schedule.subject}
+          </div>{" "}
+          <div className="place-content-end font-light flex text-[18px] mt-[45px]">
+            D-
+            {schedule.dday === 0 ? <div>DAY</div> : <div>{schedule.dday}</div>}
+          </div>
+        </div>
+        <div className="">
+          <div>
+            {/* 참여자는 2명이상일 때부터 화면에 보입니다. */}
+            {numberOfJoiner !== 1 ? (
+              <div className="mt-[30px] h-[98px] mx-auto]">
+                참여자
+                <div className="bg-white h-[50px] w-[335px] mt-[20px] p-[15px] drop-shadow-lg flex rounded-lg">
+                  {joiner &&
+                    joiner.map((a) => {
+                      return (
+                        <span className="text-sm ml-[5px]">{a.username}</span>
+                      );
+                    })}
                 </div>
               </div>
             ) : (
               false
             )}
-            {!schedule.content && numberOfJoiner === 1 ? (
-              <div className="m-auto justify-center items-center mt-[80px]">
-                <img
-                  src={schedulealoneIcon}
-                  alt="gnimslogo"
-                  className="m-auto w-[167px] h-[153px] flex justify-center items-center"
-                />
-                <div className="font-medium mt-[30px] text-[20px] text-center text-black">
-                  혼자만의 일정이군요! <br />
-                  때로는 개인시간도 중요한 법이죠.
-                </div>
-              </div>
-            ) : null}
           </div>
+          {/* 일정의 내용이 없을 땐 화면에 보이지 않습니다. */}
+          {schedule.content ? (
+            <div className="h-[234px] ml-[20px] mt-[30px] mb-[8px] ">
+              일정내용{" "}
+              <div className="bg-white word-wrap break-words whitespace-normal  shadow-lg h-[186px] w-[335px] mt-[20px] p-[20px] flex rounded-lg">
+                <div className="w-[295px] ">{schedule.content}</div>
+              </div>
+            </div>
+          ) : (
+            false
+          )}
+          {!schedule.content && numberOfJoiner === 1 ? (
+            <div className="m-auto justify-center items-center mt-[80px]">
+              <img
+                src={schedulealoneIcon}
+                alt="gnimslogo"
+                className="m-auto w-[167px] h-[153px] flex justify-center items-center"
+              />
+              <div className="font-medium mt-[30px] text-[20px] text-center text-black">
+                혼자만의 일정이군요! <br />
+                때로는 개인시간도 중요한 법이죠.
+              </div>
+            </div>
+          ) : null}
         </div>
       </div>
     </div>

diff --git a/src/components/follow/FollowerCard.jsx b/src/components/follow/FollowerCard.jsx
@@ -11,11 +11,11 @@ const FollowerCard = ({ follower }) => {
   const navigate = useNavigate();
   const dispatch = useDispatch();
   const [isFollowed, setIsFollowed] = useState(
-    follower.followStatus === "ACTIVE"
+    follower.followStatus === "ACTIVE" || "INIT"
   );
 
   const [btnColor, setBtnColor] = useState(
-    follower.followStatus === "ACTIVE" ? "#A31414" : "#002C51"
+    follower.followStatus === "ACTIVE" || "INIT" ? "#A31414" : "#002C51"
   );
 
   const handleClick = (e) => {

diff --git a/src/components/layout/TopNavBar.jsx b/src/components/layout/TopNavBar.jsx
@@ -85,9 +85,10 @@ const TopNavBar = () => {
     fetchSse();
     getNoti();
     //컴포넌트가 언마운트될 때 eventSource를 닫음
-    //return () => {
-    //   eventSource && eventSource.close();
-    // };
+    return () => {
+      eventSource && eventSource.close();
+      console.log("event source closed.");
+    };
   }, []);
 
   return (

diff --git a/src/components/layout/input/LoginSignupInputBox.jsx b/src/components/layout/input/LoginSignupInputBox.jsx
@@ -1,7 +1,7 @@
 import React, { forwardRef } from "react";
 
 const LoginSignupInputBox = forwardRef((props, ref) => {
-  const { type, placeholder, onChange, id, bgColor, shadow } = props;
+  const { type, placeholder, onChange, id, bgColor, shadow, maxLength } = props;
   return (
     <>
       <div>
@@ -13,6 +13,7 @@ const LoginSignupInputBox = forwardRef((props, ref) => {
           ref={ref}
           placeholder={placeholder}
           onChange={onChange}
+          maxLength={maxLength}
           autoComplete="off"
         />
       </div>

diff --git a/src/components/login/EmailLogin.jsx b/src/components/login/EmailLogin.jsx
@@ -225,7 +225,10 @@ const EmailLogin = () => {
             <div>간편 로그인</div>
           </div>
           <div className="flex gap-[110px] mx-auto h-[100px] mt-[46px]">
-            <div className="text-center ">
+            <div
+              className="text-center "
+              onClick={() => navigate("/developing")}
+            >
               <NaverLogin />
               <p className="mt-[20px] text-[#12396F] font-[400] text-[14px]">
                 네이버

diff --git a/src/components/login/NaverLogin.jsx b/src/components/login/NaverLogin.jsx
@@ -23,13 +23,12 @@ const NaverLogin = () => {
   };
   //원형아이콘클릭해도 네이버로그인이 가능.
   const handleClick = () => {
-    navigate("/developing");
-
+    // navigate("/developing");
     // naverRef.current.children[0].click();
   };
   // 화면 첫 렌더링이후 바로 실행
   useEffect(() => {
-    initializeNaverLogin();
+    // initializeNaverLogin();
   }, []);
 
   return (

diff --git a/src/components/notification/NotificationsList.jsx b/src/components/notification/NotificationsList.jsx
@@ -48,7 +48,7 @@ const NotificationsList = () => {
         eventSource = new EventSourcePolyfill(
           "https://eb.jxxhxxx.shop/connect",
           {
-            //headers에 토큰을 꼭 담아줘야 500이 안뜬다.
+            //headers에 토큰을 꼭 담아줘야 401이 안뜬다.
             headers: {
               Authorization: sessionStorage.getItem("accessToken"),
             },