diff --git a/src/assets/greeting.png b/src/assets/greeting.png new file mode 100644 index 0000000..a1d773f Binary files /dev/null and b/src/assets/greeting.png differ diff --git a/src/components/HomeCalendar.css b/src/components/HomeCalendar.css index 8f155c3..ddc9398 100644 --- a/src/components/HomeCalendar.css +++ b/src/components/HomeCalendar.css @@ -38,19 +38,19 @@ .react-calendar__navigation button:enabled:hover, .react-calendar__navigation button:enabled:focus { - background-color: #e6e6e6; + background-color: #48d982; } .react-calendar__month-view__weekdays { text-align: center; text-transform: uppercase; font: inherit; - font-size: 0.75em; - font-weight: 600; + font-size: 0.75rem; + font-weight: 500; } .react-calendar__month-view__weekdays__weekday { - margin-top: 2em; + margin: 1em 0; padding: 0.5em; font-size: 1.6em; } @@ -121,12 +121,11 @@ abbr { .react-calendar__tile:enabled:hover, .react-calendar__tile:enabled:focus { - background: #30a55f; - color: white; + background: #b4edcb; } .react-calendar__tile--now { - background: #30a55f; + background: #999; color: white; } @@ -136,7 +135,7 @@ abbr { } .react-calendar__tile--hasActive { - background: #30a55f; + background: #999; } .react-calendar__tile--hasActive:enabled:hover, diff --git a/src/components/JoinForm.jsx b/src/components/JoinForm.jsx new file mode 100644 index 0000000..fcccbca --- /dev/null +++ b/src/components/JoinForm.jsx @@ -0,0 +1,46 @@ +import FormInput from "./FormInput"; +// import { Link } from "react-router-dom"; + +export default function JoinForm() { + return ( +
+ + + + +
+ +
+
+ ); +} diff --git a/src/components/LoginForm.jsx b/src/components/LoginForm.jsx index dee1cb7..64963b2 100644 --- a/src/components/LoginForm.jsx +++ b/src/components/LoginForm.jsx @@ -1,3 +1,4 @@ +import { Link } from "react-router-dom"; import FormInput from "./FormInput"; export default function LoginForm() { @@ -24,9 +25,11 @@ export default function LoginForm() { -
- 비밀번호를 잃어버렸어요! - 회원가입 +
+ + 회원가입 + + 비밀번호를 잃어버렸어요!
); diff --git a/src/components/index.js b/src/components/index.js index 9199867..debfda1 100644 --- a/src/components/index.js +++ b/src/components/index.js @@ -5,3 +5,4 @@ export { default as ReservationView } from "./ReservationView"; export { default as MyPageForm } from "./MyPageForm"; export { default as ReservationForm } from "./ReservationForm"; export { default as LoginForm } from "./LoginForm"; +export { default as JoinForm } from "./JoinForm"; diff --git a/src/containers/SideNavBar.jsx b/src/containers/SideNavBar.jsx index 74f9949..6adec90 100644 --- a/src/containers/SideNavBar.jsx +++ b/src/containers/SideNavBar.jsx @@ -24,7 +24,9 @@ export default function SideNavBar() { })}
- 로그인 + + 로그인 + {/* 차후 로그인 되어있으면 로그아웃, 로그인 되어있지 않으면 로그인으로 conditional rendering */} ); diff --git a/src/main.jsx b/src/main.jsx index c97c09e..2b04af1 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -9,6 +9,7 @@ import { FormPage, LoginPage, FormSubmitPage, + JoinPage, } from "./pages"; import AppFrame from "./layouts/AppFrame.jsx"; @@ -25,6 +26,7 @@ const router = createBrowserRouter([ }, { path: "/form", element: }, { path: "/login", element: }, + { path: "/join", element: }, { path: "/complete", element: }, ]); diff --git a/src/pages/JoinPage.jsx b/src/pages/JoinPage.jsx new file mode 100644 index 0000000..bdd9f31 --- /dev/null +++ b/src/pages/JoinPage.jsx @@ -0,0 +1,35 @@ +import GreetingImg from "../assets/greeting.png"; +import { Link } from "react-router-dom"; +import { JoinForm } from "../components"; + +export default function JoinPage() { + return ( +
+
+ +
+ Greeting +
+
+ Welcome to +
+ TeamPu! +
+ +
+
+
+
+

Join

+

+ 팀프로젝트실 예약에 필요한 정보입니다. +
+ 정확하게 입력해 주세요. +

+
+ +
+
+
+ ); +} diff --git a/src/pages/LoginPage.jsx b/src/pages/LoginPage.jsx index 0753978..1ef5402 100644 --- a/src/pages/LoginPage.jsx +++ b/src/pages/LoginPage.jsx @@ -19,7 +19,7 @@ export default function LoginPage() { TeamPu

-

+

팀프로젝트실 야간 잔류 신청 시스템

Reservation diff --git a/src/pages/index.js b/src/pages/index.js index 32edca5..a9ede48 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -5,3 +5,4 @@ export { default as RulesPage } from "./RulesPage"; export { default as FormPage } from "./FormPage"; export { default as FormSubmitPage } from "./FormSubmitPage"; export { default as LoginPage } from "./LoginPage"; +export { default as JoinPage } from "./JoinPage"; diff --git a/tailwind.config.js b/tailwind.config.js index 564a599..4e26b60 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -12,7 +12,7 @@ export default { extend: { colors: { black: "#444444", - primary: { DEFAULT: "#30A55F", dark: "#26874d" }, + primary: { light: "#48d982", DEFAULT: "#30A55F", dark: "#26874d" }, secondary: { light: "#f4f4f4", DEFAULT: "#CCCCCC",