Merge pull request #138 from gnims-project/dev

최종 배포 merge

Author: dong-fa

src/components/follow/UserSearch.jsx

@@ -52,7 +52,7 @@ const UserSearch = () => {
             }}
           >
             <img
-              className="absolute top-[15px] right-[40px]"
+              className="absolute top-[15px] right-[15px]"
               src={searchIcon}
               alt="돋보기 아이콘"
             />

src/components/login/NaverLogin.jsx

@@ -1,7 +1,9 @@
 import { useEffect, useRef } from "react";
+import { useNavigate } from "react-router-dom";
 import NaverUnion from "../../img/NaverUnion.png";
 
 const NaverLogin = () => {
+  const navigate = useNavigate();
   const naverRef = useRef();
   const { naver } = window;
 
@@ -21,7 +23,9 @@ const NaverLogin = () => {
   };
   //원형아이콘클릭해도 네이버로그인이 가능.
   const handleClick = () => {
-    naverRef.current.children[0].click();
+    navigate("/developing");
+
+    // naverRef.current.children[0].click();
   };
   // 화면 첫 렌더링이후 바로 실행
   useEffect(() => {

src/components/main/Main.jsx

@@ -13,11 +13,7 @@ const Main = () => {
   const { schedules } = useSelector((state) => state.ScheduleSlice);
   const [sortList, setSortList] = useState("D-Day");
   const [modalOpen, setModalOpen] = useState(false);
-  const welcomText = [
-    "환영합니다.",
-    "좋은하루 되세요!",
-    "안녕하세요.",
-  ];
+  const welcomText = ["환영합니다.", "좋은하루 되세요!", "안녕하세요."];
 
   const showModalHandler = () => {
     setModalOpen(true);
@@ -33,32 +29,41 @@ const Main = () => {
       <div className="container">
         <div className="grid grid-flow-row gap-[26px] ml-[20px] mr-[20px] mb-[75px]">
           <div className="mt-[30px] h-[56px] bg-[#FFFFFF] rounded-[10px] drop-shadow-lg">
-                <p className="leading-[36px] p-[10px] font-[700] text-[20px] text-textNavy">
-                  {nickName}님 {welcomText[getRandom]}
-                </p>
+            <p className="leading-[36px] p-[10px] font-[700] text-[20px] text-textNavy">
+              {nickName}님 {welcomText[getRandom]}
+            </p>
           </div>
           <div className="flex cursor-pointer ">
-            <div 
+            <div
               onClick={showModalHandler}
               className="bg-white  flex gap-[6px] p-[10px] text-center items-center h-[40px] border border-solid border-[#E8E8E8] rounded-[39px] shadow-md"
             >
               <div className="shadow-sm">
-                <img src={desc} className="h-[15.5px] w-[13.54px]" alt="화살표모양, 오름차순정렬"/>
+                <img
+                  src={desc}
+                  className="h-[15.5px] w-[13.54px]"
+                  alt="화살표모양, 오름차순정렬"
+                />
               </div>
               <div>{sortList} 순</div>
             </div>
           </div>
           <div>
-              {/* <InfiniteScroll /> */}
+            {/* <InfiniteScroll /> */}
             <div className="flex flex-col gap-[30px]  rounded-[10px] ">
-              { schedules?.map((list) => { return (<MainScheduleCards key={list.eventId} schedules={list} />); })}
+              {schedules?.map((list) => {
+                return (
+                  <MainScheduleCards key={list.eventId} schedules={list} />
+                );
+              })}
             </div>
           </div>
         </div>
       </div>
       <div className="fixed bottom-0">
-        {modalOpen ? false : <BottomNavi />}
-        {modalOpen && (<SelectorSort setModalOpen={setModalOpen} setSortList={setSortList} /> )}
+        {/* {modalOpen ? false : <BottomNavi />} */}
+        <BottomNavi />
+        {/* {modalOpen && (<SelectorSort setModalOpen={setModalOpen} setSortList={setSortList} /> )} */}
       </div>
     </>
   );

src/components/mypage/Profile.jsx

@@ -23,8 +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");
+  const FeedbackForm =
+    "https://docs.google.com/forms/d/e/1FAIpQLSdOP_FEmMG5f0OtAER0ha4PR53XdXX6qVGLGMxYevd_ixD4QA/viewform";
 
   //페이지 렌더링시 팔로우 정보를 가져와야함
   useEffect(() => {
@@ -116,7 +116,9 @@ const Profile = () => {
           <img src={Vector} alt="화살표" className="h-[18px] w-[10px]" />
         </div>
         <div
-          onClick={moveToFeedbackForm}
+          onClick={() => {
+            window.open(FeedbackForm);
+          }}
           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]">