Skip to content

Commit

Permalink
Fix UI-of-student-tt (#31)
Browse files Browse the repository at this point in the history 
* Change Colours

* fix table, fix timing

* Add button
  • Loading branch information
@asquare14
asquare14 authored May 20, 2020
1 parent 39b57a3 commit 6d5e240
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 53 deletions.
24 changes: 0 additions & 24 deletions schedule.ics
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,4 @@
BEGIN:VCALENDAR
VERSION:2.0
PRODID:ics.py - http://git.io/lLljaA
BEGIN:VEVENT
DTEND:20200526T110000Z
DTSTART:20200526T093000Z
SUMMARY:A204
UID:[email protected]
END:VEVENT
BEGIN:VEVENT
DTEND:20200521T153000Z
DTSTART:20200521T140000Z
SUMMARY:A204
UID:[email protected]
END:VEVENT
BEGIN:VEVENT
DTEND:20200520T153000Z
DTSTART:20200520T140000Z
SUMMARY:A204
UID:[email protected]
END:VEVENT
BEGIN:VEVENT
DTEND:20200522T153000Z
DTSTART:20200522T140000Z
SUMMARY:A204
UID:[email protected]
END:VEVENT
END:VCALENDAR
45 changes: 38 additions & 7 deletions static/css/main.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
:root {
--main-color: #ec3654;
--main-color: #015483;
--bg-color: #fff;
--text-color: #2e2e2e;
--search-color: #2e2e2e;
Expand Down Expand Up @@ -66,7 +66,7 @@ body {
}

.table tr:nth-child(2n) td.table-clash {
background: #00008B;
background: red;
}

.table tr th:nth-child(1) {
Expand All @@ -80,7 +80,7 @@ body {
footer {
display: flex;
flex-grow: 1;
padding: 1rem 4rem;
padding: 1rem 2rem;
color: var(--text-color);
}

Expand Down Expand Up @@ -152,14 +152,18 @@ nav {
justify-content: flex-end;
align-items: center;
padding: 1rem;
color: #fff;
background: var(--main-color);
color: #015483;
background:#D3D3D3;
}

nav .logo {
margin-right: auto;
}

nav .logo-text {
margin-right: auto;
}

nav a svg {
text-decoration: none;
color: #fff;
Expand Down Expand Up @@ -293,7 +297,7 @@ ul.ui-autocomplete {

li.course.active {
border: 0px;
background-color: var(--main-color);
background-color: #015483;
color: #fff;
}

Expand Down Expand Up @@ -385,4 +389,31 @@ li.course.active {
.card, .courses, .timetable {
-webkit-transition: .4s;
transition: .4s;
}
}

.button {
display: inline-block;
border-radius: 4px;
background-color: #008CBA;
border: none;
color: #FFFFFF;
text-align: center;
font-size: 12px;
padding: 15px;
width: 50px;
transition: all 0.5s;
cursor: pointer;
margin: 5px;
}

.button2 {
background-color: white;
color: black;
border: 2px solid #008CBA;
}

.button2:hover {
background-color: #008CBA;
color: white;
}

Binary file added static/iiitb_logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added static/iiitb_white.jpeg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 27 additions & 22 deletions templates/home.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,30 @@

<nav>
<div class="logo">
<h1>Time Table Visualizer</h1>
<img src="{{ url_for('static', filename='iiitb_logo.png') }}" alt="IIIT-B">
</div>
<div class="logo">
<a href="/"><h2>Home</h2></a>
</div>
<div class="logo">
<a href="/professor"><h2>Faculty</h2> </a>
</div>
<a href="/professor"> <h4>Faculty Timetable</h4> </a>
</nav>

<div class="timetable">
<table class="table " id="timet">
<thead>
<tr>
<th scope="col"></th>
<th scope="col">8:00 <br /> 8:55</th>
<th scope="col">9:00 <br /> 9:55</th>
<th scope="col">10:00 <br /> 10:55</th>
<th scope="col">11:00 <br /> 11:55</th>
<th scope="col">12:00 <br /> 12:55</th>
<th scope="col">14:00 <br /> 14:55</th>
<th scope="col">9:15 <br /> 10:45</th>
<th scope="col">11:00 <br /> 12:30</th>
<th scope="col">1:45 <br /> 3:15</th>
<th scope="col">3:30 <br /> 5:00</th>
<th scope="col">5:30 <br /> 7:00</th>
<!-- <th scope="col">14:00 <br /> 14:55</th>
<th scope="col">15:00 <br /> 15:55</th>
<th scope="col">16:00 <br /> 16:55</th>
<th scope="col">17:00 <br /> 17:55</th>
<th scope="col">17:00 <br /> 17:55</th> -->
</tr>
</thead>
<tbody>
Expand All @@ -70,10 +75,10 @@ <h1>Time Table Visualizer</h1>
<td id="02"></td>
<td id="03"></td>
<td id="04"></td>
<td id="05"></td>
<!-- <td id="05"></td>
<td id="06"></td>
<td id="07"></td>
<td id="08"></td>
<td id="08"></td> -->
</tr>
<tr>
<th scope="row">Tuesday</th>
Expand All @@ -82,10 +87,10 @@ <h1>Time Table Visualizer</h1>
<td id="12"></td>
<td id="13"></td>
<td id="14"></td>
<td id="15"></td>
<!-- <td id="15"></td>
<td id="16"></td>
<td id="17"></td>
<td id="18"></td>
<td id="18"></td> -->
</tr>
<tr>
<th scope="row">Wednesday</th>
Expand All @@ -94,10 +99,10 @@ <h1>Time Table Visualizer</h1>
<td id="22"></td>
<td id="23"></td>
<td id="24"></td>
<td id="25"></td>
<!-- <td id="25"></td>
<td id="26"></td>
<td id="27"></td>
<td id="28"></td>
<td id="28"></td> -->
</tr>
<tr>
<th scope="row">Thursday</th>
Expand All @@ -106,10 +111,10 @@ <h1>Time Table Visualizer</h1>
<td id="32"></td>
<td id="33"></td>
<td id="34"></td>
<td id="35"></td>
<!-- <td id="35"></td>
<td id="36"></td>
<td id="37"></td>
<td id="38"></td>
<td id="38"></td> -->
</tr>
<tr>
<th scope="row">Friday</th>
Expand All @@ -118,10 +123,10 @@ <h1>Time Table Visualizer</h1>
<td id="42"></td>
<td id="43"></td>
<td id="44"></td>
<td id="45"></td>
<!-- <td id="45"></td>
<td id="46"></td>
<td id="47"></td>
<td id="48"></td>
<td id="48"></td> -->
</tr>
</tbody>
</table>
Expand All @@ -130,10 +135,11 @@ <h1>Time Table Visualizer</h1>
<footer>
<div class="row">
<i class="info">Click on a slot to mark it as occupied</i>
</br></br>
<button class="button2" onclick="clearTT()"><span>Clear</span></button>
<button class="button2" onclick="addToCalendar()"><span>Download ICS</span></button>
</div>
<div id="details-div"></div>
<button onclick="clearTT()">Clear Visualizer</button>
<button onclick="addToCalendar()">Download ICS</button>
</footer>


Expand All @@ -148,5 +154,4 @@ <h1>Courses</h1>

</body>
<script src="{{ url_for('static', filename='mainScript.js') }}"></script>

</html>

0 comments on commit 6d5e240

Please sign in to comment.