Merge pull request #169 from gnims-project/dev

Feat/ 모두읽음버튼 Design, API변경, 유저피드백 반영(프로필수정시 비활성화된 버튼 색상 변경) #100

Author: AngelaChaejung

src/components/mypage/ProfileEdit.jsx

@@ -13,6 +13,13 @@ const ProfileEdit = () => {
   const isImageSelected =
     imgRef.current && imgRef.current.files && imgRef.current.files.length > 0;
   const isDisabled = loading || !isImageSelected;
+  let a;
+  if (isDisabled) {
+    a = "[#6F6F6F]";
+  } else {
+    a = "[#002C51]";
+  }
+
   //이미지 미리보기
   const imagePreview = () => {
     const reader = new FileReader();
@@ -113,14 +120,14 @@ const ProfileEdit = () => {
           </div>
           <div className="flex row">
             <button
-              className="h-[50px] rounded w-1/2 bg-[#002C51] font-[700] text-[#ffff] mt-[24px]"
+              className={`h-[50px] rounded w-1/2 bg-${a} font-[700] text-[#ffff] mt-[24px]`}
               onClick={editHandler}
               disabled={isDisabled}
             >
               수정 완료
             </button>
             <button
-              className="h-[50px] rounded w-1/2 ml-[15px] bg-[#6F6F6F] font-[700] text-[#ffff] mt-[24px]"
+              className="h-[50px] rounded w-1/2 ml-[15px] bg-[#002C51] font-[700] text-[#ffff] mt-[24px]"
               onClick={imgResetHandle}
             >
               기본 이미지로 변경

src/components/notification/NotificationsList.jsx

@@ -13,10 +13,11 @@ const NotificationsList = () => {
   const [notification, setNotification] = useState([]);
 
   const readAll = async () => {
-    const promises = notification.map((noti) =>
-      instance.get(`/notifications/${noti.id}`)
-    );
-    await Promise.all(promises);
+    await instance.put("/notifications");
+    // const promises = notification.map((noti) =>
+    //   instance.get(`/notifications/${noti.id}`)
+    // );
+    // await Promise.all(promises);
     // 여기서 responses 배열을 처리한다.
     window.location.reload();
   };
@@ -128,9 +129,9 @@ const NotificationsList = () => {
       <div className="flex flex-row-reverse">
         <div
           onClick={readAll}
-          className=" text-[12px] font-extralight items-center w-[100px] flex h-[19px] justify-center  rounded-[4px] text-black bg-[#E8E8E8] cursor-pointer"
+          className=" text-[14px] font-extralight items-center w-[100px] flex h-[40px] justify-center  rounded-[4px] text-[#002C51]  cursor-pointer"
         >
-          모두 읽음처리
+          모두 읽음표시
         </div>
       </div>
       <div>