Merge pull request #60 from LikeLionHGU/hwan_#57/로그인확인오류수정

Hwan #57/로그인확인오류수정
LikeLionHGU · Jun 8, 2024 · 1670815 · 1670815
2 parents 3194e03 + 623c554
commit 1670815
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 19 deletions.
diff --git a/src/components/header/header.jsx b/src/components/header/header.jsx
@@ -45,11 +45,13 @@ const Title = styled.div`
   font-family: Dream5;
 `;
 
-const ReturnBtn = styled.button`
+const ReturnBtn = styled.a`
   border: 1px solid #410a0a;
   border-radius: 30px;
   margin-top: 4px;
 
+  text-decoration: none;
+
   background-color: white;
   width: 79px;
   height: 32px;
@@ -93,11 +95,17 @@ export default function Header({ isHeader }) {
   function getButton(isHeader) {
     switch (isHeader) {
       case "test":
-        return <ReturnBtn>처음으로</ReturnBtn>;
+        return (
+          <ReturnBtn href="/test" onClick={() => window.location.reload()}>
+            처음으로
+          </ReturnBtn>
+        );
       case "ramentest":
         return (
           // <Link to="/test">
-          <ReturnBtn>처음으로</ReturnBtn>
+          <ReturnBtn href="/test" onClick={() => window.location.reload()}>
+            처음으로
+          </ReturnBtn>
           // </Link>
         );
       case "main":

diff --git a/src/components/review/completeReview.jsx b/src/components/review/completeReview.jsx
@@ -50,14 +50,10 @@ export default function CompleteReview() {
       <SidebarContainer>
         <Character src={CharacterLogo} alt="캐릭터 로고" />
         <CheckBtn
-          onClick={
-            (() => {
-              setReviewUiState(false);
-            },
-            () => {
-              setCompleteReview(false);
-            })
-          }
+          onClick={() => {
+            setCompleteReview(false);
+            setReviewUiState(false);
+          }}
         >
           확인
         </CheckBtn>

diff --git a/src/components/review/mapLogo.jsx b/src/components/review/mapLogo.jsx
@@ -1,5 +1,6 @@
 import styled from "styled-components";
 import CharacterLogo from "../../imgs/characterLogo.svg";
+import { useNavigate } from "react-router-dom";
 
 const Sidebar = styled.div`
   position: absolute;
@@ -13,12 +14,21 @@ const Character = styled.img`
   height: 48px;
   margin-top: 10px;
   margin-right: 14px;
+
+  &:hover {
+    cursor: pointer;
+  }
 `;
 
 export default function MapLogo() {
+  const navigate = useNavigate();
+
+  function toMain() {
+    navigate("/");
+  }
   return (
     <Sidebar>
-      <Character src={CharacterLogo} alt="캐릭터 로고" />
+      <Character onClick={toMain} src={CharacterLogo} alt="캐릭터 로고" />
     </Sidebar>
   );
 }
diff --git a/src/components/review/onLogin.jsx b/src/components/review/onLogin.jsx
@@ -220,12 +220,10 @@ export default function OnLogin() {
             취소
           </CancelReview>
           <SubmitReview
-            onClick={
-              (handleSubmit,
-              () => {
-                setCompleteReview(true);
-              })
-            }
+            onClick={(e) => {
+              handleSubmit(e);
+              setCompleteReview(true);
+            }}
           >
             등록
           </SubmitReview>

diff --git a/src/components/review/reviewList.jsx b/src/components/review/reviewList.jsx
@@ -331,7 +331,13 @@ export default function ReviewList() {
                 <ReviewBox key={index}>
                   <UserInfo>
                     <UserChar>
-                      {<img src={review.reviewUserImage} alt="Character" />}
+                      {
+                        <img
+                          src={review.reviewUserImage}
+                          style={{ width: "48px", height: "48px" }}
+                          alt="Character"
+                        />
+                      }
                     </UserChar>
                     <UserBox>
                       <UserName>{review.reviewerName}</UserName>