Yanolza-Miniproject · 2YH02 · Nov 28, 2023 · Nov 28, 2023 · Nov 28, 2023 · Nov 28, 2023
diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>Hey놀자</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/public/vite.svg b/public/vite.svg
diff --git a/src/assets/svg/logo.svg b/src/assets/svg/logo.svg
diff --git a/src/components/Category/CategoryBanner/index.test.tsx b/src/components/Category/CategoryBanner/index.test.tsx
@@ -8,7 +8,7 @@ describe("CategoryBanner", () => {
     const wrapper = createRecoilWrapper();
     const onChange = jest.fn();
 
-    const firstText = "거기어때?";
+    const firstText = "Hey 놀자!";
     const secondText = "지금 둘러보세요.";
 
     render(
@@ -30,7 +30,7 @@ describe("CategoryBanner", () => {
     const onChange = jest.fn();
     const user = userEvent;
 
-    const firstText = "거기어때?";
+    const firstText = "Hey 놀자!";
     const secondText = "지금 둘러보세요.";
 
     render(

diff --git a/src/components/Common/Common.styles.ts b/src/components/Common/Common.styles.ts
@@ -193,13 +193,13 @@ export const SidebarWrapper = styled.div`
 
 export const NavButton = styled.button`
   display: block;
-
   padding: 0.5rem;
 
   outline: none;
   appearance: none;
   border: none;
-  background-color: #e6e6e6;
+  border-radius:20rem;
+  background-color: #fff;
 
   color: white;
   box-shadow: 0 2px 5px rgba(0, 0, 0, 0.2);
@@ -229,13 +229,4 @@ export const NavButton = styled.button`
   font-weight: 600;
   text-align: center;
   color: black;
-`;
-
-export const RecentlyViewedItem = styled.div`
-  padding: 1rem;
-
-  width: 4rem;
-  height: 6rem;
-
-  font-size: 0.8rem;
-`;
+`;
diff --git a/src/components/Common/Header.tsx b/src/components/Common/Header.tsx
@@ -1,5 +1,5 @@
 import * as Styled from "./Common.styles";
-import Logo from "../../assets/image/logo.png";
+import Logo from "../../assets/svg/logo.svg";
 import SearchIcon from "../../assets/svg/search-icon.svg";
 import CartIcon from "../../assets/svg/cart-icon.svg";
 import UserIcon from "../../assets/svg/user-icon.svg";
@@ -15,7 +15,7 @@ const Header = () => {
   return (
     <Styled.headerContainer>
       <a href="/">
-        <img src={Logo} alt="logo" style={{ width: "8em", height: "1.5em" }} />
+        <img src={Logo} alt="logo" />
       </a>{" "}
       <Styled.headerWrapper>
         <button onClick={handleLogin}>

diff --git a/src/components/Common/Sidebar.tsx b/src/components/Common/Sidebar.tsx
@@ -12,7 +12,6 @@ function Sidebar() {
   return (
     <Styled.SidebarContainer>
       <Styled.SidebarWrapper>
-        <Styled.RecentlyViewedItem>방금 본 숙소</Styled.RecentlyViewedItem>
         <Styled.NavButton onClick={scrollToTop}>
           <img src={ScrollToTopIcon} onClick={scrollToTop} />
           TOP

diff --git a/src/components/MyPage/MyOrder/MyOrderList/index.tsx b/src/components/MyPage/MyOrder/MyOrderList/index.tsx
@@ -2,12 +2,15 @@ import * as Styled from "./MyOrderList.styles";
 import { useGetMyOrder } from "../../../../hooks/usePayment";
 import MyOrderItemWrapper from "../MyOrderItemWrapper";
 import { MyOrderListProps } from "./MyOrderList.type";
+import Sidebar from "../../../Common/Sidebar";
 
 const MyOrderList = () => {
   const { data } = useGetMyOrder(); // 결제 이력 데이터 요청
   console.log(data?.data.data);
 
   return (
+    <>
+    <Sidebar />
     <Styled.MyOrderList>
       {data?.data.data.length > 0? (
         data?.data.data
@@ -31,6 +34,7 @@ const MyOrderList = () => {
         <div>아직 결제 완료한 숙소가 없어요!</div>
       )}
     </Styled.MyOrderList>
+    </>
   );
 };
 

diff --git a/src/hooks/usePayment.ts b/src/hooks/usePayment.ts
@@ -5,7 +5,6 @@ import { useMutation, useQuery } from "@tanstack/react-query";
 export const usePayment = (orderId: number) => {
   return useMutation({
     mutationFn: (data: { payment_type: string }) => {
-      console.log(data);
       return axios.post(`/api/v1/payments/${orderId}`, { data });
     },
   });

diff --git a/src/pages/Category/index.tsx b/src/pages/Category/index.tsx
@@ -19,7 +19,7 @@ const Category = () => {
   return (
     <Styled.CategoryContainer>
       <CategoryBanner
-        firstText="거기어때?"
+        firstText="Hey 놀자!"
         secondText="지금 둘러보세요."
         searchFn={handleClickSearch}
       />

diff --git a/src/pages/Main/index.tsx b/src/pages/Main/index.tsx
@@ -25,7 +25,7 @@ const Main = () => {
       <Sidebar />
       <Styled.Container>
         <Styled.Banner>
-          거기어때?
+          Hey 놀자!
           <br /> 지금 둘러보세요. 👀
         </Styled.Banner>