Skip to content

GitLab

Commit cff2fffd authored by Lee Jin Ju's avatar Lee Jin Ju
Browse files

홈 수정중

parent 48925fcb
Show whitespace changes
Inline Side-by-side
server/client/src/Pages/Home.js deleted 100644 → 0
View file @ 48925fcb
import React, { } from 'react';
function Home() {
return (
<div>
<h2>asdkj;alsdkj</h2>
</div>
)
}
export default Home
server/client/src/Pages/HomePage.js
View file @ cff2fffd
...@@ -14,6 +14,12 @@ const Schedule = styled.div` ...@@ -14,6 +14,12 @@ const Schedule = styled.div`
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
} }
& .cd-schedule__timeline {
> ul {
line-height: 1em;
}
} }
& .cd-schedule__group { & .cd-schedule__group {
...@@ -34,27 +40,40 @@ function Home() { ...@@ -34,27 +40,40 @@ function Home() {
<div> <div>
<Menu /> <Menu />
<div className="container"> <div className="container">
<Schedule className="row cd-schedule cd-schedule--loading margin-top-lg margin-bottom-lg js-cd-schedule">
<div className="col-1 cd-schedule__timeline"> <h2>대관 현황</h2>
<p>
<strong>대관 가능 시간</strong>
<ul> <ul>
<li><span>09:00</span></li> <li>평일: 9시 - 22시/ 예약가능 시간 이후 폐쇄</li>
<li><span>10:00</span></li> <li>주말: 이용 불가</li>
<li><span>11:00</span></li>
<li><span>12:00</span></li>
<li><span>13:00</span></li>
<li><span>14:00</span></li>
<li><span>15:00</span></li>
<li><span>16:00</span></li>
<li><span>17:00</span></li>
<li><span>18:00</span></li>
<li><span>19:00</span></li>
<li><span>20:00</span></li>
<li><span>21:00</span></li>
<li><span>22:00</span></li>
</ul> </ul>
</div> </p>
<div className="col-6 cd-schedule__events">
<ul className="nav nav-tabs float-right" id="myTab" role="tablist">
<li className="nav-item">
<a className="nav-link active" id="7-tab" data-toggle="tab" href="#7"> 7-223 </a>
</li>
<li className="nav-item">
<a className="nav-link" id="9-tab" data-toggle="tab" href="#9"> 9-116 </a>
</li>
<li className="nav-item">
<a className="nav-link" id="25-tab" data-toggle="tab" href="#25"> 25-307 </a>
</li>
</ul>
<div className="tab-content" id="myTabContent">
<div className="tab-pane fade show active" id="7" role="tabpanel" aria-labelledby="7-tab">123</div>
<div className="tab-pane fade" id="9" role="tabpanel" aria-labelledby="9-tab">...</div>
<div className="tab-pane fade" id="25" role="tabpanel" aria-labelledby="252-tab">...</div>
<Schedule className="row cd-schedule cd-schedule--loading margin-top-lg margin-bottom-lg js-cd-schedule">
<div className="col-12 cd-schedule__events">
<ul> <ul>
<li className="cd-schedule__group">
<div className="cd-schedule__top-info"><span> 시간\요일</span></div>
</li>
<li className="cd-schedule__group"> <li className="cd-schedule__group">
<div className="cd-schedule__top-info"><span>월</span></div> <div className="cd-schedule__top-info"><span>월</span></div>
<ul> <ul>
...@@ -132,6 +151,26 @@ function Home() { ...@@ -132,6 +151,26 @@ function Home() {
</li> </li>
</ul> </ul>
</div> </div>
<div className="col-12 cd-schedule__timeline">
<ul>
<li><span>09:00</span></li>
<li><span>10:00</span></li>
<li><span>11:00</span></li>
<li><span>12:00</span></li>
<li><span>13:00</span></li>
<li><span>14:00</span></li>
<li><span>15:00</span></li>
<li><span>16:00</span></li>
<li><span>17:00</span></li>
<li><span>18:00</span></li>
<li><span>19:00</span></li>
<li><span>20:00</span></li>
<li><span>21:00</span></li>
<li><span>22:00</span></li>
</ul>
</div>
{/* <div class="cd-schedule-modal"> {/* <div class="cd-schedule-modal">
<header class="cd-schedule-modal__header"> <header class="cd-schedule-modal__header">
<div class="cd-schedule-modal__content"> <div class="cd-schedule-modal__content">
...@@ -152,7 +191,8 @@ function Home() { ...@@ -152,7 +191,8 @@ function Home() {
</Schedule> </Schedule>
</div> </div>
</div> </div>
</div>
) )
} }
export default Home export default Home;
\ No newline at end of file \ No newline at end of file
server/client/src/Pages/Login.js deleted 100644 → 0
View file @ 48925fcb
import React, { } from 'react';
import styled from 'styled-components';
import { Link } from 'react-router-dom';
const Log = styled.div`
background-color: #981e1e;
`
const Logo = styled.div`
background-color: #E76A6A;
`
function Login() {
return (
<div className="container-fluid">
<div className="row">
<Logo className="col-md-5 col-12">
<h2>고려대학교</h2>
<h4>대관 시스템</h4>
</Logo>
<Log className="col-md-7 col-12">
<form encType='multipart/form-data' className="mt-4" style={{ height: "100%" }}>
<div className="form-group">
<label for="title_input">학번</label>
<input className="form-control" id="title_input" name="title" type="text" required />
</div>
<div className="form-group">
<label for="author_input">비밀번호</label>
<input className="form-control" id="author_input" name="author" type="text" required />
</div>
<div className="form-group">
<Link to="/home">
<button className="btn" type="submit">로그인</button>
</Link>
</div>
</form>
</Log>
</div>
</div>
)
}
export default Login
server/client/src/Pages/LoginPage.js
View file @ cff2fffd
...@@ -5,10 +5,10 @@ import { Formik } from 'formik'; ...@@ -5,10 +5,10 @@ import { Formik } from 'formik';
import * as Yup from 'yup'; import * as Yup from 'yup';
const Log = styled.div` const Log = styled.div`
background-color: #981e1e; background-color: #7B031D;
` `
const Logo = styled.div` const Logo = styled.div`
background-color: #E76A6A; background-color: rgb(239, 218, 200);
` `
function Login() { function Login() {
...@@ -104,4 +104,4 @@ function Login() { ...@@ -104,4 +104,4 @@ function Login() {
) )
} }
export default Login export default Login;
\ No newline at end of file \ No newline at end of file
server/client/src/Pages/NoticePage.js
View file @ cff2fffd
...@@ -11,4 +11,4 @@ function Notice() { ...@@ -11,4 +11,4 @@ function Notice() {
) )
} }
export default Notice export default Notice;
\ No newline at end of file \ 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