Skip to content

GitLab

Commit 6da1d58d authored by Jiwon Yoon's avatar Jiwon Yoon
Browse files

Merge remote-tracking branch 'origin/gyumin'

parents 2e0bfd68 31b256d3
Hide whitespace changes
Inline Side-by-side
client/src/App.js
View file @ 6da1d58d
...@@ -13,17 +13,19 @@ import AdminPage from "./pages/AdminPage/AdminPage"; ...@@ -13,17 +13,19 @@ import AdminPage from "./pages/AdminPage/AdminPage";
function App() { function App() {
return ( return (
<div className="" style={{ backgroundColor: "black" }}> <div className="" style={{ backgroundColor: "black" }}>
<SubNav /> <SubNav />
<Header /> <Header />
<MainNav /> <MainNav />
<Router> <Router>
<Switch> <Switch>
<Route exact path="/" component={HomePage} /> <Route exact path="/" component={HomePage} />
<Route path="/movie" component={MovieListPage} /> <Route path="/login" component={LoginPage} />
</Switch> <Route path="/signup" component={SignupPage} />
</Router> <Route path="/movie" component={MovieListPage} />
</div> </Switch>
</Router>
</div>
); );
} }
......
client/src/components/Login/Login.js 0 → 100644
View file @ 6da1d58d
import { useState } from "react";
import styles from "./login.module.scss";
const Login = () => {
const [state, setState] = useState(true)
return (
<div className={`d-flex flex-column col-md-5 col-10`}>
{/* nav-tabs */}
<ul className="nav nav-fill nav-tabs w-100" id="loginTab" role="tablist">
<li className="nav-item fs-10" role="presentation">
<button className={`nav-link active px-2 bg-black ${styles.fontSize}`} style={{ color: state ? "black" : "yellow", background: state ? "#FEDC00" : "black"}} id="login-tab" data-bs-toggle="tab" data-bs-target="#login" type="button" role="tab" aria-controls="login" aria-selected="true" onClick={() => setState(true)}>로그인</button>
</li>
<li className="nav-item" role="presentation">
<button className={`nav-link px-2 bg-black ${styles.fontSize}`}
id="guest-tab" data-bs-toggle="tab" data-bs-target="#guest" type="button" role="tab" aria-controls="guest" aria-selected="false" onClick={() => setState(false)} style={{ color: state ? "yellow" : "black" }}>비회원 예매 확인</button>
</li>
</ul>
<div className="tab-content w-100" id="myTabContent">
{/* 로그인 */}
<div className="tab-pane fade show active" id="login" role="tabpanel" aria-labelledby="login-tab">
<div className="d-flex flex-column ">
<input className={styles.input} type="text" name="id" id="id" placeholder="ID" />
<input className={styles.input} type="text" name="password" id="password" placeholder="Password" minlength="8" required />
<input className="bg-ButterYellow text-dark border-0 rounded-2 mt-2" type="submit" value="Login" />
<span><a href="./signup" className={styles.intoSignupPage}>회원이 아니십니까?</a></span>
</div>
</div>
{/* 비회원예매 학인 */}
<div className="tab-pane fade" id="guest" role="tabpanel" aria-labelledby="guest-tab">
<div className="d-flex flex-column">
<input type="text" name="id" id="id" placeholder="ID" />
<input type="text" name="password" id="password" placeholder="Password" minlength="8" required />
<p>
※ 비회원 정보 오 입력 시 예매 내역 확인/취소 및 티켓 발권이 어려울 수 있으니 다시 한번 확인해 주시기 바랍니다.
</p>
<div class="guestLoginBtn">
<input class="guestLoginBtn" type="submit" value="비회원 예매 확인" />
</div>
</div>
</div>
</div>
</div>
)
}
export default Login
\ No newline at end of file
client/src/components/Login/index.js 0 → 100644
View file @ 6da1d58d
export { default } from './Login'
\ No newline at end of file
client/src/components/Login/login.module.scss 0 → 100644
View file @ 6da1d58d
.intoSignupPage{
font-size: 8px;
text-decoration: none;
color: white;
}
.intoSignupPage:hover {
text-decoration: none;
color: #FEDC00;
}
.input {
margin: 0.5rem 0 0 0;
color:white;
border-radius: 3px;
}
.fontSize{
font-size: 5px;
}
\ No newline at end of file
client/src/components/Signup/Signup.js 0 → 100644
View file @ 6da1d58d
import styles from "./signup.module.scss";
const Signup = () => {
return (
<div className={`d-flex ${styles.signup} col-md-8 col-12 align-items-center`}>
<table>
<colgroup>
<col class="col1" />
<col />
</colgroup>
<tbody>
<tr>
<th>
<label for="guestName">이름</label>
</th>
<td><input type="text" placeholder="이름" /></td>
</tr>
<tr>
<th>
<label for="guestBirthday">생년월일</label>
</th>
<td><input type="text" placeholder="생년월일(6자리)" /></td>
</tr>
<tr>
<th>
<label for="guestMbnum">휴대폰 번호</label>
</th>
<td><input type="text" placeholder="'-'없이 입력" /></td>
</tr>
<tr>
<th>
<label for="guestPassword">비밀번호</label>
</th>
<td><input type="password" placeholder="숫자 4자리" /></td>
</tr>
<tr>
</tr>
</tbody>
</table>
<p>
※ 비회원 정보 오 입력 시 예매 내역 확인/취소 및 티켓 발권이 어려울 수 있으니 다시 한번 확인해 주시기 바랍니다.
</p>
<div class="guestLoginBtn">
<input class="guestLoginBtn" type="submit" value="비회원 예매 확인" />
</div>
</div>
)
}
export default Signup
\ No newline at end of file
client/src/components/Signup/index.js 0 → 100644
View file @ 6da1d58d
export { default } from './Signup'
\ No newline at end of file
client/src/pages/LoginPage.js
View file @ 6da1d58d
import Login from "../components/Login/Login";
const LoginPage = () => { const LoginPage = () => {
return ( return (
<div> <div className="d-flex justify-content-center bg-dark">
<Login />
</div> </div>
) )
} }
......
client/src/pages/SignupPage.js
View file @ 6da1d58d
import Signup from '../components/Signup'
const SignupPage = () => { const SignupPage = () => {
return ( return (
<div> <div>
<Signup/>
</div> </div>
) )
} }
......
client/src/scss/custom.scss
View file @ 6da1d58d
...@@ -34,6 +34,13 @@ $theme-colors: map-merge($theme-colors, $custom-colors); ...@@ -34,6 +34,13 @@ $theme-colors: map-merge($theme-colors, $custom-colors);
justify-content: center; justify-content: center;
} }
@font-face {
font-family: 'HangeulNuri-Bold';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_three@1.0/HangeulNuri-Bold.woff') format('woff');
font-weight: normal;
font-style: normal;
}
@media (max-width: 767px) { @media (max-width: 767px) {
.carousel-inner .carousel-item > div { .carousel-inner .carousel-item > div {
display: none; display: none;
...@@ -60,4 +67,8 @@ $theme-colors: map-merge($theme-colors, $custom-colors); ...@@ -60,4 +67,8 @@ $theme-colors: map-merge($theme-colors, $custom-colors);
.carousel-inner .carousel-item-end, .carousel-inner .carousel-item-end,
.carousel-inner .carousel-item-start { .carousel-inner .carousel-item-start {
transform: translateX(0); transform: translateX(0);
} }
\ No newline at end of file
// .nav-link{
// color: yellow;
// }
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment