diff --git a/crescendo-web/src/App.js b/crescendo-web/src/App.js index a4a54ff..01e05b6 100644 --- a/crescendo-web/src/App.js +++ b/crescendo-web/src/App.js @@ -1,11 +1,20 @@ import React, { useState, useEffect } from "react"; import "./App.css"; -import { BrowserRouter as Router, Route, Routes, Link } from "react-router-dom"; +import { + BrowserRouter as Router, + Route, + Routes, + Link, + useLocation, +} from "react-router-dom"; import SignUp1 from "./SignUp1"; import SignUp2 from "./SignUp2"; +import SignUp3 from "./SignUp3"; +import Login from "./Login"; const App = () => { const [isMobile, setIsMobile] = useState(window.innerWidth <= 768); + const location = useLocation(); useEffect(() => { const handleResize = () => { @@ -24,29 +33,43 @@ const App = () => { return null; } + // 현재 경로에 따라 콘텐츠를 표시할지 결정. 빈 배열로 설정하면 모든 경로에서 콘텐츠가 표시되지 않음 + const showContent = ["/"].includes(location.pathname); + return ( - -
-
- flower - - - - - - - } /> - } /> - -
-
+ <> + {showContent && ( +
+
+ flower + + + + + + + +
+ )} + + + } /> + } /> + } /> + } /> + + ); }; -export default App; +const AppWrapper = () => ( + + + +); + +export default AppWrapper; diff --git a/crescendo-web/src/Login.js b/crescendo-web/src/Login.js new file mode 100644 index 0000000..83747a1 --- /dev/null +++ b/crescendo-web/src/Login.js @@ -0,0 +1,50 @@ +import React from "react"; +import { useNavigate } from "react-router-dom"; +//import "./SignUp1.css"; + +function Header() { + return ( +
+
+
+

+ 로그인을 위해 +
+ 아이디와 비밀번호를 +
+ 정확하게 입력해주세요! +

+ +
+ +
+
+ ); +} + +function Button() { + const navigate = useNavigate(); + + return ( +
+ navigate(-1)} + /> + + +
+ ); +} + +function SignUp2() { + return ( +
+
+
+ ); +} + +export default SignUp2; diff --git a/crescendo-web/src/SignUp1.css b/crescendo-web/src/SignUp1.css index a031905..cb30c6f 100644 --- a/crescendo-web/src/SignUp1.css +++ b/crescendo-web/src/SignUp1.css @@ -40,10 +40,11 @@ body { display: flex; justify-content: center; align-items: center; - background-size: cover; + background-size: contain; + background-position: center; /* Center the image */ + background-repeat: no-repeat; background-image: url("./image/goBack.png"); border: none; - border-radius: 50%; /* 원형 버튼 */ cursor: pointer; } @@ -56,8 +57,8 @@ body { display: flex; justify-content: center; align-items: center; - background-color: #895d3c; /* 배경색 (원하는 색상으로 변경 가능) */ - color: white; + background-size: cover; + background-image: url("./image/help.png"); border: none; border-radius: 50%; /* 원형 버튼 */ cursor: pointer; @@ -78,7 +79,18 @@ h1 { padding: 0; } -input#inputId { +#inputId { + border: none; + border-bottom: 2px solid #895d3c; + margin-top: 6rem; + padding: 0.5rem; + font-size: 16px; + background-color: #f8f4f3; + color: #eaddd8; + outline: none; +} + +#inputPwd { border: none; border-bottom: 2px solid #895d3c; margin-top: 6rem; @@ -88,3 +100,14 @@ input#inputId { color: #eaddd8; outline: none; } + +#inputRePwd { + border: none; + border-bottom: 2px solid #895d3c; + margin-top: 1rem; + padding: 0.5rem; + font-size: 16px; + background-color: #f8f4f3; + color: #eaddd8; + outline: none; +} diff --git a/crescendo-web/src/SignUp2.js b/crescendo-web/src/SignUp2.js index 66c6ffa..6438d38 100644 --- a/crescendo-web/src/SignUp2.js +++ b/crescendo-web/src/SignUp2.js @@ -13,13 +13,9 @@ function Header() { 비밀번호를 작성해주세요
정확한 확인을 위해 인증도 진행해 주세요
- +
- + ); @@ -30,14 +26,9 @@ function Button() { return (
- navigate(-1)} - /> - - + navigate(-1)} /> + navigate("/signup3")} /> +
); } diff --git a/crescendo-web/src/SignUp3.js b/crescendo-web/src/SignUp3.js new file mode 100644 index 0000000..1e3439d --- /dev/null +++ b/crescendo-web/src/SignUp3.js @@ -0,0 +1,39 @@ +import React from "react"; +import { useNavigate } from "react-router-dom"; +//import "./SignUp1.css"; + +function Header() { + return ( +
+
+ check +
+

flower님, 반가워요!

+

해바라기를 시작해볼까요?

+
+
+ ); +} + +function Button() { + const navigate = useNavigate(); + + return ( +
+ navigate(-1)} /> + navigate("/app")} /> + +
+ ); +} + +function SignUp3() { + return ( +
+
+
+ ); +} + +export default SignUp3;