Merge pull request #124 from gnims-project/dev

Upload/Main Merge #100

Author: haruharuganda

src/components/main/Main.jsx

@@ -9,13 +9,12 @@ import SelectorSort from "../modal/SelectorSort";
 const Main = () => {
   const dispatch = useDispatch();
   const nickName = sessionStorage.getItem("nickname");
-  const getRandom = Math.floor(Math.random() * (4 + 0) + 0);
+  const getRandom = Math.floor(Math.random() * (3 + 0) + 0);
   const { schedules } = useSelector((state) => state.ScheduleSlice);
   const [sortList, setSortList] = useState("D-Day");
   const [modalOpen, setModalOpen] = useState(false);
   const welcomText = [
     "환영합니다.",
-    "오늘도 그님스가 응원할게요.",
     "좋은하루 되세요!",
     "안녕하세요.",
   ];

src/components/mypage/PageInfoCard.jsx

@@ -3,15 +3,15 @@ import React from "react";
 const PageInfoCard = ({ profileImg, nickname, children }) => {
   return (
     <div>
-      <div className="flex p-5 gap-[30px]  justify-items-center">
-        <div className="flex-none p-2 w-[86px] h-[86px] ">
+      <div className="h-full flex p-5 gap-[30px]  justify-items-center">
+        <div className="flex-[50%] cursor-pointer">
           <img
-            className="rounded-full"
+            className="rounded-full w-[86px] h-[86px] "
             src={profileImg}
             alt="사용자 프로필 사진"
           />
         </div>
-        <div className="pt-2 border-2 w-full">
+        <div className="pt-2 border-2 w-full ">
           <div className="text-[18px] pt-[12px] leading-[21px] w-[198px]">
             <span className="font-[600]">{nickname}</span>님{children}
           </div>

src/components/mypage/PastEvents.jsx

@@ -19,10 +19,10 @@ const PastEvents = () => {
 
   return (
     <div className="container container-md pr-[19px] pl-[21px]">
-      <div className="grid grid-flow-row gap-[24px]">
+      <div className="grid grid-flow-row gap-[24px] ">
         <div>
           <PageInfoCard profileImg={profileImg} nickname={nickname}>
-            의 멋진 일대기를<p>돌아볼까요?</p>
+            ,<p>멋진 일대기를 돌아볼까요?</p>
           </PageInfoCard>
         </div>
         <div className="grid grid-flow-row gap-[30px]">

src/components/mypage/ScheduleInvitation.jsx

@@ -33,9 +33,9 @@ const ScheduleInvitation = () => {
 
   return (
     <div>
-      <div className="flex p-5 gap-[30px] justify-items-center">
+      <div className="flex gap-[30px] ">
         <PageInfoCard profileImg={profileImage} nickname={nickname}>
-          에게 온 일정 초대를 한 번에 볼 수 있어요.
+          에게 <p>온 일정 초대를 한 번에 볼 수 있어요.</p>
         </PageInfoCard>
       </div>
       <div>

src/redux/modules/LoginSlice.jsx

@@ -57,9 +57,12 @@ export const __kakaologin = createAsyncThunk(
           if (res.data.message !== "non-member") {
             const accessToken = res.headers.get("Authorization");
             const nickname = res.data.data.nickname;
+            const userId = res.data.data.userId;
             console.log(nickname);
             sessionStorage.setItem("token", accessToken);
             sessionStorage.setItem("nickname", nickname);
+            sessionStorage.setItem("userId", userId);
+
             alert("그님스에 오신걸 환영합니다");
             return window.location.assign("/main");