Merge pull request #135 from gnims-project/dev

Upload/Main Merge #100

Author: AngelaChaejung

src/components/follow/FollowList.jsx

@@ -24,7 +24,7 @@ const FollowList = () => {
 
   useEffect(() => {
     dispatch(__getFollowing());
-  }, [activeTab]);
+  }, []);
 
   useEffect(() => {
     dispatch(__getFollowerCount());

src/components/follow/FollowerCard.jsx

@@ -49,11 +49,11 @@ const FollowerCard = ({ follower }) => {
       </div>
       {isFollowed ? (
         <div className="flex items-center w-[62px] h-[39px] justify-center text-sm rounded-[4px] text-white bg-[#A31414]">
-          <span onClick={handleClick}>{isFollowed ? "삭제" : "팔로우"}</span>
+          <span onClick={handleClick}>삭제</span>
         </div>
       ) : (
         <div className="flex items-center w-[62px] h-[39px] justify-center text-sm rounded-[4px] text-white bg-[#002C51]">
-          <span onClick={handleClick}>{isFollowed ? "삭제" : "팔로우"}</span>
+          <span onClick={handleClick}>팔로우</span>
         </div>
       )}
     </div>

src/components/follow/FollowingCard.jsx

@@ -49,11 +49,11 @@ const FollowingCard = ({ following }) => {
       </div>
       {isFollowed ? (
         <div className="flex items-center w-[62px] h-[39px] justify-center text-sm rounded-[4px] text-white bg-[#A31414] cursor-pointer">
-          <span onClick={handleClick}>{isFollowed ? "삭제" : "팔로우"}</span>
+          <span onClick={handleClick}>삭제</span>
         </div>
       ) : (
         <div className="flex items-center w-[62px] h-[39px] justify-center text-sm rounded-[4px] text-white bg-[#002C51] cursor-pointer">
-          <span onClick={handleClick}>{isFollowed ? "삭제" : "팔로우"}</span>
+          <span onClick={handleClick}>팔로우</span>
         </div>
       )}
     </div>

src/components/login/EmailLogin.jsx

@@ -12,11 +12,11 @@ import Label from "../layout/Label";
 import LoginSignupInputBox from "../layout/input/LoginSignupInputBox";
 import gnimsLogo from "../../img/gnimslogo1.png";
 import { EventSourcePolyfill } from "event-source-polyfill";
+import { __closeModal } from "../../redux/modules/SingupSlice";
 
 const EmailLogin = () => {
   const dispatch = useDispatch();
   const navigate = useNavigate();
-  const [isOpen, setOpen] = useState(false);
   const [ModalStr, setModalStr] = useState({
     modalTitle: "",
     modalMessage: "",
@@ -84,11 +84,9 @@ const EmailLogin = () => {
   };
 
   //모달창
-  const onModalOpen = () => {
-    setOpen({ isOpen: true });
-  };
+
   const onMoalClose = () => {
-    setOpen({ isOpen: false });
+    dispatch(__closeModal());
   };
 
   //서버에 전달
@@ -124,8 +122,8 @@ const EmailLogin = () => {
       __emailLogin({
         email: emailValue,
         password: passwordValue,
+        dispatch,
         navigate,
-        onModalOpen,
         setModalStr,
       })
     );
@@ -240,11 +238,7 @@ const EmailLogin = () => {
               </p>
             </div>
           </div>
-          <IsModal
-            isModalOpen={isOpen.isOpen}
-            onMoalClose={onMoalClose}
-            message={{ ModalStr }}
-          />
+          <IsModal onMoalClose={onMoalClose} message={{ ModalStr }} />
         </div>
       </div>
     </div>

src/components/modal/Modal.jsx

@@ -1,11 +1,11 @@
-import React, { useState } from "react";
+import React from "react";
 import Modal from "react-modal";
 import MoonLoader from "react-spinners/MoonLoader";
-
-const IsModal = ({ isModalOpen, onMoalClose, message, isLoding }) => {
+import { useSelector } from "react-redux";
+const IsModal = ({ onMoalClose, message, isLoding }) => {
   const modalStr = message.ModalStr;
+  const modalState = useSelector((state) => state.SingupSlice.modal);
 
-  const [modalIsOpen, setModalIsOpen] = useState(false);
   const modalStyle = {
     overlay: {
       position: "fixed",
@@ -35,15 +35,14 @@ const IsModal = ({ isModalOpen, onMoalClose, message, isLoding }) => {
   };
   return (
     <Modal
-      isOpen={isModalOpen}
+      isOpen={modalState.isOpen}
       style={modalStyle}
       ariaHideApp={false}
       aria={{
         labelledby: "heading",
         describedby: "full_description",
       }}
       shouldCloseOnEsc={false}
-      onRequestClose={() => setModalIsOpen(false)}
     >
       <div className="grid grid-flow-row gap-[20px] text-center">
         {isLoding ? (

src/components/mypage/ InvitationCard.jsx

@@ -24,15 +24,15 @@ const InvitationCard = ({ invit }) => {
 
   const onRefuseHanddler = (e) => {
     e.stopPropagation();
-    const result = window.confirm("거절?");
+    const result = window.confirm("초대를 거절하시겠습니까?");
     if (result) {
       return dispatch(refuseInvitation(invit.eventId));
     }
   };
 
   const onAcceptHanddler = (e) => {
     e.stopPropagation();
-    const result = window.confirm("수락?");
+    const result = window.confirm("초대를 수락하시겠습니까?");
     if (result) {
       return dispatch(acceptInvitation(invit.eventId));
     }

src/components/mypage/Profile.jsx

@@ -6,6 +6,7 @@ import {
   __getFollowerCount,
   __getFollowingCount,
 } from "../../redux/modules/FollowSlice";
+import { Link } from "react-router-dom";
 
 const Profile = () => {
   const dispatch = useDispatch();
@@ -22,6 +23,8 @@ const Profile = () => {
   const nickname = sessionStorage.getItem("nickname");
   const email = sessionStorage.getItem("email");
   const profileImage = sessionStorage.getItem("profileImage");
+  const moveToFeedbackForm = (window.location.href =
+    "https://docs.google.com/forms/d/e/1FAIpQLSdOP_FEmMG5f0OtAER0ha4PR53XdXX6qVGLGMxYevd_ixD4QA/viewform");
 
   //페이지 렌더링시 팔로우 정보를 가져와야함
   useEffect(() => {
@@ -113,9 +116,7 @@ const Profile = () => {
           <img src={Vector} alt="화살표" className="h-[18px] w-[10px]" />
         </div>
         <div
-          onClick={() => {
-            navigate("/developing");
-          }}
+          onClick={moveToFeedbackForm}
           className="flex gap-[130px] p-[15px] border-b-[1px] border-[#BBD7FF] border-solid bg-white w-[375px] h-[50px] cursor-pointer"
         >
           <span className="text-sm w-[175px] h-[20px]">

src/components/signup/SetProfileImg.jsx

@@ -2,17 +2,15 @@ import React, { useState, useRef, useEffect } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import profilImg from "../../img/ProfilImg.png";
 import inputImgIcon from "../../img/Component01.png";
-import { SignupApi } from "../../api/Signup";
 import IsModal from "../modal/Modal";
 import axios from "axios";
 import { useNavigate } from "react-router";
-import { instance } from "../../shared/AxiosInstance";
 import LoadingPage from "../../page/LoadingPage";
-
+import { __closeModal, __openModal } from "../../redux/modules/SingupSlice";
 const SetProfileImg = () => {
+  const dispatch = useDispatch();
   const navigate = useNavigate();
   const [loading, setLoading] = useState(true);
-  const [isOpen, setOpen] = useState(false);
   const [ModalStr, setModalStr] = useState({
     modalTitle: "",
     modalMessage: "",
@@ -69,11 +67,9 @@ const SetProfileImg = () => {
   };
 
   //모달창
-  const onModalOpen = () => {
-    setOpen({ isOpen: true });
-  };
+
   const onMoalClose = () => {
-    setOpen({ isOpen: false });
+    dispatch(__closeModal(dispatch));
     if (disabled) {
       navigate("/login");
     }
@@ -107,7 +103,8 @@ const SetProfileImg = () => {
           sessionStorage.removeItem("password");
           sessionStorage.removeItem("nickname");
           sessionStorage.removeItem("singup");
-          onModalOpen();
+          dispatch(__openModal());
+          setLoading(false);
         }
       })
       .catch((error) => {
@@ -120,7 +117,8 @@ const SetProfileImg = () => {
             modalTitle: "다시 한 번 확인해주세요",
             modalMessage: "닉네임과 이름을 다시 한 번 확인해주세요.",
           });
-          onModalOpen();
+          dispatch(__openModal());
+          setLoading(false);
         }
       });
   };
@@ -188,11 +186,7 @@ const SetProfileImg = () => {
           </button>
         </div>
       </div>
-      <IsModal
-        isModalOpen={isOpen.isOpen}
-        onMoalClose={onMoalClose}
-        message={{ ModalStr }}
-      />
+      <IsModal onMoalClose={onMoalClose} message={{ ModalStr }} />
     </div>
   );
 };

src/components/signup/SetProfileName.jsx

@@ -1,24 +1,22 @@
 import React, { useEffect, useRef, useState } from "react";
-import { useDispatch } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
 import { useNavigate } from "react-router-dom";
-import { __nickNameCheck } from "../../redux/modules/SingupSlice";
+import { __closeModal, __nickNameCheck } from "../../redux/modules/SingupSlice";
 import Label from "../layout/Label";
 import LoginSignupInputBox from "../layout/input/LoginSignupInputBox";
 import IsModal from "../modal/Modal";
 
 const SetProfileName = () => {
   const dispatch = useDispatch();
   const navigate = useNavigate();
-  const [isOpen, setOpen] = useState(false);
   const [ModalStr, setModalStr] = useState({
     modalTitle: "",
     modalMessage: "",
   });
   const userNameRef = useRef();
   const userNickNameRef = useRef();
-  const [doubleCheck, setDoubleCheck] = useState({
-    nickNameDoubleCheck: false,
-  });
+
+  const { nickNameDoubleCheck } = useSelector((state) => state.SingupSlice);
 
   const [style, setStyle] = useState({
     bgColorName: "bg-inputBox",
@@ -34,7 +32,7 @@ const SetProfileName = () => {
     ) {
       navigate("/signup/setProfileImg");
     }
-  }, [dispatch, doubleCheck, navigate]);
+  }, [dispatch, navigate]);
 
   const nameRegulationExp = /^[ㄱ-ㅎ|가-힣|a-z|A-Z|]+$/;
   const nickNameReglationExp = /^(?=.*[a-z0-9가-힣])[a-z0-9가-힣]{2,8}$/;
@@ -96,11 +94,9 @@ const SetProfileName = () => {
   };
 
   //모달창
-  const onModalOpen = () => {
-    setOpen({ isOpen: true });
-  };
   const onMoalClose = () => {
-    setOpen({ isOpen: false });
+    console.log("닫기 동족하나?");
+    dispatch(__closeModal(dispatch));
   };
 
   const onNickNameCheck = (event) => {
@@ -117,10 +113,7 @@ const SetProfileName = () => {
     dispatch(
       __nickNameCheck({
         nickname: nickNameCurrent.value,
-        onModalOpen,
         setModalStr,
-        doubleCheck: doubleCheck,
-        setDoubleCheck: setDoubleCheck,
       })
     );
   };
@@ -160,7 +153,7 @@ const SetProfileName = () => {
       }));
       userNickNameCurrent.focus();
       return;
-    } else if (!doubleCheck) {
+    } else if (!nickNameDoubleCheck) {
       SetRegulation(() => ({
         ...regulation,
         regulationNickName: "닉네임 중복확인 해주세요.",
@@ -224,8 +217,10 @@ const SetProfileName = () => {
                   ref={userNickNameRef}
                   placeholder="2~8자리 숫자,한글,영문을 입력해주세요."
                   onChange={onValidity}
+                  maxLength={8}
                   className={`${style.bgColorNickname} ${style.shadowNickname} w-full px-1 h-[50px] text-[16px]  placeholder-inputPlaceHoldText`}
-                  disabled={doubleCheck.nickNameDoubleCheck}
+                  disabled={nickNameDoubleCheck}
+                  autoComplete="off"
                 ></input>
                 <button
                   className="absolute right-[8px]  mt-[18px] font-[600] text-textBlack text-[16px]"
@@ -249,11 +244,7 @@ const SetProfileName = () => {
             </button>
           </div>
         </form>
-        <IsModal
-          isModalOpen={isOpen.isOpen}
-          onMoalClose={onMoalClose}
-          message={{ ModalStr }}
-        />
+        <IsModal onMoalClose={onMoalClose} message={{ ModalStr }} />
       </div>
     </>
   );