Skip to content

GitLab

Commit 18fd1a9b authored by Kim, Subin's avatar Kim, Subin
Browse files

Merge remote-tracking branch 'origin/hijinju' into kimpen

parents d7beab5d 4380ffe4
Hide whitespace changes
Inline Side-by-side
server/client/package.json
View file @ 18fd1a9b
......@@ -24,9 +24,9 @@
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
"eject": "react-scripts eject",
"proxy": "http://localhost:3030"
},
"proxy": "http://localhost:3030",
"eslintConfig": {
"extends": "react-app"
},
......
server/client/src/Pages/HomePage.js
View file @ 18fd1a9b
......@@ -20,27 +20,6 @@ const Schedule = styled.div`
& ul {
list-style-type: none;
}
& .cd-schedule__events {
width: 100%;
> ul {
display: flex;
flex-wrap: nowrap;
}
}
& .cd-schedule__group {
flex-basis: 0;
flex-grow: 1;
}
& .cd-schedule__event {
position: absolute;
z-index: 3;
width: calc(100% + 2px); // top position and height will be set using js
left: -1px;
}
`
function Home() {
......@@ -53,6 +32,7 @@ function Home() {
function Dateform() {
let today = moment();
let weeks = [];
let dates = { start: null, end: null };
for (let i = 0; i < 6; i++) {
if (i !== 0) {
......@@ -81,122 +61,6 @@ function Home() {
))}
</div>
</Drop>
<Schedule className="row cd-schedule cd-schedule--loading margin-top-lg margin-bottom-lg js-cd-schedule">
<div className="col-1 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 className="col-6 cd-schedule__events">
<ul>
<li className="cd-schedule__group">
<div className="cd-schedule__top-info"><span>월</span></div>
<ul>
<li className="cd-schedule__event">
<a data-start="10:00" data-end="12:00" data-content="event-abs-circuit" data-event="event-1" href="#0">
<em className="cd-schedule__name">확률론</em>
</a>
</li>
<li className="cd-schedule__event">
<a data-start="17:00" data-end="18:00" data-content="event-abs-circuit" data-event="event-1" href="#0">
<em className="cd-schedule__name">수치해석학</em>
</a>
</li>
</ul>
</li>
<li className="cd-schedule__group">
<div className="cd-schedule__top-info"><span>화</span></div>
<ul>
<li className="cd-schedule__event">
<a data-start="11:00" data-end="12:00" data-content="event-abs-circuit" data-event="event-1" href="#0">
<em className="cd-schedule__name">해석학</em>
</a>
</li>
<li className="cd-schedule__event">
<a data-start="16:00" data-end="18:00" data-content="event-abs-circuit" data-event="event-1" href="#0">
<em className="cd-schedule__name">수치해석학</em>
</a>
</li>
</ul>
</li>
<li className="cd-schedule__group">
<div className="cd-schedule__top-info"><span>수</span></div>
<ul>
<li className="cd-schedule__event">
<a data-start="9:00" data-end="10:00" data-content="event-abs-circuit" data-event="event-1" href="#0">
<em className="cd-schedule__name">산업수학</em>
</a>
</li>
<li className="cd-schedule__event">
<a data-start="18:00" data-end="19:00" data-content="event-abs-circuit" data-event="event-1" href="#0">
<em className="cd-schedule__name">해석학</em>
</a>
</li>
</ul>
</li>
<li className="cd-schedule__group">
<div className="cd-schedule__top-info"><span>목</span></div>
<ul>
<li className="cd-schedule__event">
<a data-start="9:00" data-end="11:00" data-content="event-abs-circuit" data-event="event-1" href="#0">
<em className="cd-schedule__name">해석학</em>
</a>
</li>
<li className="cd-schedule__event">
<a data-start="11:00" data-end="12:00" data-content="event-abs-circuit" data-event="event-1" href="#0">
<em className="cd-schedule__name">확률론</em>
</a>
</li>
<li className="cd-schedule__event">
<a data-start="16:00" data-end="17:00" data-content="event-abs-circuit" data-event="event-1" href="#0">
<em className="cd-schedule__name">수치해석학</em>
</a>
</li>
</ul>
</li>
<li className="cd-schedule__group">
<div className="cd-schedule__top-info"><span>금</span></div>
<ul>
<li className="cd-schedule__event">
<a data-start="13:00" data-end="15:00" data-content="event-abs-circuit" data-event="event-1" href="#0">
<em className="cd-schedule__name">산업수학</em>
</a>
</li>
</ul>
</li>
</ul>
</div>
{/* <div class="cd-schedule-modal">
<header class="cd-schedule-modal__header">
<div class="cd-schedule-modal__content">
<span class="cd-schedule-modal__date"></span>
<h3 class="cd-schedule-modal__name"></h3>
</div>
<div class="cd-schedule-modal__header-bg"></div>
</header>
<div class="cd-schedule-modal__body">
<div class="cd-schedule-modal__event-info"></div>
<div class="cd-schedule-modal__body-bg"></div>
</div>
<a href="#0" class="cd-schedule-modal__close text-replace">Close</a>
</div> */}
</Schedule>
</div>
</div>
)
......
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