diff --git a/frontend/src/back_button/Back_Button.jsx b/frontend/src/back_button/Back_Button.jsx deleted file mode 100644 index 9f3bfd7..0000000 --- a/frontend/src/back_button/Back_Button.jsx +++ /dev/null @@ -1,10 +0,0 @@ -// import "./back_button.css" - -// export function Back_Button(props){ - -// return - - - - -// } \ No newline at end of file diff --git a/frontend/src/back_button/back_button.css b/frontend/src/back_button/back_button.css deleted file mode 100644 index e69de29..0000000 diff --git a/frontend/src/back_button/index.js b/frontend/src/back_button/index.js deleted file mode 100644 index 9eb1ba7..0000000 --- a/frontend/src/back_button/index.js +++ /dev/null @@ -1 +0,0 @@ -export * from './Back_Button.jsx'; diff --git a/frontend/src/cardInfo/CardInfo.jsx b/frontend/src/cardInfo/CardInfo.jsx index e8e2e58..e1aaa98 100644 --- a/frontend/src/cardInfo/CardInfo.jsx +++ b/frontend/src/cardInfo/CardInfo.jsx @@ -24,7 +24,9 @@ export function CardInfo() { return (
- @@ -44,7 +46,9 @@ export function CardInfo() { {activeComponent === 'write' && }
-
); } + diff --git a/frontend/src/cardInfo/cardInfo.css b/frontend/src/cardInfo/cardInfo.css index 5b0f3a3..c489d71 100644 --- a/frontend/src/cardInfo/cardInfo.css +++ b/frontend/src/cardInfo/cardInfo.css @@ -40,10 +40,11 @@ border-radius: 20px; margin-bottom: 30px; } + #back_icon { position: absolute; - left: -5px; - top: -10px; + left: -1px; + top: 0px; width: 30px; height: 30px; } @@ -77,7 +78,7 @@ position: relative; border: 2px solid #276830; background-color: #d8e2dc; - height: 200px; + height: 25px; margin-top: 30px; margin-left: 20px; margin-bottom: 60px; @@ -87,9 +88,34 @@ width: 370px; } -button { +.write_button { + position: relative; + background-color: #276830; + color:#fff; + border-radius: 15px; + width: 70px; + height: 30px; + left: 0px; + top: -240px; +} +.review_button { + position: relative; + background-color: #276830; + color:#fff; + border-radius: 15px; + width: 70px; + height: 30px; + left: 150px; + top: -240px; +} + +.backbtn{ +background-color: #fff; position: relative; - width: 20px; - height: 20px; - left: -10px; + left: 10px; + top: 0px; + width: 30px; + height: 30px; + border-radius: 100%; + } diff --git a/frontend/src/header/Header.jsx b/frontend/src/header/Header.jsx index b15f3e2..8e264d1 100644 --- a/frontend/src/header/Header.jsx +++ b/frontend/src/header/Header.jsx @@ -3,16 +3,6 @@ import coffeeImage from './coffee.png'; import logo from './LogoWhite.png'; export function Header() { - // const [isPopupOpen, setPopupOpen] = useState(false); - - // const openPopup = () => { - // setPopupOpen(true); - // }; - - // const closePopup = () => { - // setPopupOpen(false); - // }; - return (
+
- {/* {isPopupOpen && ( -
-
- - × - -

로그인

-
-
-
    -
  • - - -
  • -
  • - - -
  • -
-
-
-
-
- )} */} -
+ ); } diff --git a/frontend/src/header/header.css b/frontend/src/header/header.css index 212e33c..3927d1d 100644 --- a/frontend/src/header/header.css +++ b/frontend/src/header/header.css @@ -62,6 +62,7 @@ header { cursor: pointer; color: #fff; font-size: 22px; + margin: 5px; border: none; font-family: 'Nanum Gothic', sans-serif; font-weight: 500; @@ -76,15 +77,15 @@ header { left: -15px; } -/* #loginPopup { - display: none; - position: fixed; + #loginPopup { + + position: relative; top: 50%; left: 50%; transform: translate(-50%, -50%); width: 300px; padding: 20px; - background: #fff; + background: #296d3a; border: 1px solid #ccc; box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); z-index: 1000; @@ -107,8 +108,7 @@ header { #loginForm input { padding: 8px; margin-bottom: 10px; -} */ - +} @import url('https://fonts.googleapis.com/css2?family=Gothic+A1&family=Nanum+Gothic&family=Nanum+Pen+Script&display=swap'); @import url('https://fonts.googleapis.com/css2?family=Gothic+A1&family=Nanum+Gothic&family=Nanum+Pen+Script&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap'); @import url('https://fonts.googleapis.com/css2?family=Gothic+A1&family=Nanum+Gothic&family=Nanum+Pen+Script&family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap'); diff --git a/frontend/src/review/Review.jsx b/frontend/src/review/Review.jsx index 0b39a16..9436b35 100644 --- a/frontend/src/review/Review.jsx +++ b/frontend/src/review/Review.jsx @@ -1,6 +1,24 @@ +import React,{ useState } from 'react'; +import { useNavigate } from 'react-router-dom'; import './review.css'; +import { Write } from '../write'; + export function Review() { + const movePage = useNavigate(); + const [activeComponent, setActiveComponent] = useState('review'); + + const goPage = () => { + movePage('/'); + }; + + const goReview = () => { + setActiveComponent('review'); + }; + + const goWrite = () => { + setActiveComponent('write'); + }; return (
평점
@@ -11,6 +29,12 @@ export function Review() {
멀티탭이 많아요
+ + {/* {activeComponent === 'write' && } + */} ); -} + + } diff --git a/frontend/src/review/review.css b/frontend/src/review/review.css index 1661575..9a0de7e 100644 --- a/frontend/src/review/review.css +++ b/frontend/src/review/review.css @@ -25,10 +25,11 @@ padding: 8px; top: 0px; margin: 5px; - width: 200px; + width: 270px; height: 20px; border-radius: 10px; font-weight: lighter; + border: 1px solid #7c987f; } #review-text { position: relative; diff --git a/frontend/src/write/Write.jsx b/frontend/src/write/Write.jsx index 3bc6586..2d7ed9d 100644 --- a/frontend/src/write/Write.jsx +++ b/frontend/src/write/Write.jsx @@ -1,16 +1,44 @@ -import "./write.css" +import React, { useState } from 'react'; +import { useNavigate } from 'react-router-dom'; +import './write.css'; +import { Review } from '../review'; export function Write() { - return ( + const navigate = useNavigate(); + const [activeComponent, setActiveComponent] = useState('review'); -
-
평점
-
+ const [reviewText, setReviewText] = useState(''); -
자리가 편해서 오래 공부하기 좋아요.
-
+ const handleSave = () => { + // Save the entered text (reviewText) as needed (e.g., to a database or state) + // For now, let's log it to the console + console.log('Saved review text:', reviewText); -
+ // Transition to the Review component + navigate('/review?text=' + encodeURIComponent(reviewText)); + + const goReview = () => { + setActiveComponent('review'); + }; + }; - ); -} \ No newline at end of file + return ( +
+
평점
+
+ +
+ {/* {activeComponent === 'review' && } + */} + +
+ ); +} diff --git a/frontend/src/write/write.css b/frontend/src/write/write.css index 1145a3b..3392ea2 100644 --- a/frontend/src/write/write.css +++ b/frontend/src/write/write.css @@ -1,25 +1,33 @@ .write-box { - background-color: #1d5712; - width: 300px; + width: 350px; height: 200px; padding: 20px; - border-radius: 10px; - margin-left: 50px; - padding-left: 60px; - margin-left: 20px; + margin-top: 10px; + position: relative; + padding: 10px; + top: -30px; + left: 20px; + background-color: #38702e81; + box-shadow: 5px 5px 3px rgba(0, 0, 0, 0.5); } .write { + position: relative; background-color: #ffffffeb; - width: 220px; - height: 170px; + width: 300px; + height: 140px; + left: 5%; margin: 5px; - border: 2px solid #333; + border: 1px solid #7c987f; border-radius: 10px; } #write-text { position: relative; + width: 300px; + height: 140px; text-align: center; - top: 40%; + font-size: 18px; + top: 0px; + border-radius: 10px; } #review-name { @@ -28,7 +36,19 @@ text-shadow: #000000; font-size: 23px; top: 0px; - left: -70px; + left: -100px; height: 30px; font-weight: bold; } +.save-button{ + + position: relative; + background-color: #276830; + color:#fff; + border-radius: 15px; + width: 70px; + height: 30px; + top: -2px; + left:0px; +} +