Skip to content

Updated schedule and recent merges #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open

Updated schedule and recent merges #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
425fe56
feat: added prizes section
indraasura Dec 2, 2019
81fe531
fixed conflict in prizes
indraasura Dec 9, 2019
ec2f63b
Merge https://github.com/isohack/hackathon-webapp
indraasura Dec 9, 2019
c2bf7dc
Merge https://github.com/isohack/hackathon-webapp
indraasura Dec 10, 2019
cc61311
feat: revamped faq section
indraasura Dec 10, 2019
c748aac
merge:
indraasura Dec 17, 2019
ab73057
fix : modified FAQ section
indraasura Dec 17, 2019
5f71566
recent merge
indraasura Dec 18, 2019
4d511d3
fix: fixed sponsors
indraasura Dec 18, 2019
c286246
fix: fixed build issues in sponsor
indraasura Dec 19, 2019
316b8ad
final fix of sponsor prototype
indraasura Dec 19, 2019
a1a0e16
fix: revamped schedule
indraasura Dec 19, 2019
b06306c
recent merge
indraasura Dec 19, 2019
ee18aed
fix: updated schedule images
indraasura Dec 20, 2019
25e1032
recent merges
indraasura Dec 20, 2019
ebe32d1
Merge https://github.com/isohack/hackathon-webapp
indraasura Dec 21, 2019
22a0cd7
update: updated schedule
indraasura Dec 21, 2019
600ba75
Update: Updated Schedule (#87)
indraasura Dec 21, 2019
5f4d38d
Frontend: Footer Changed (#86) (#88)
shashank-sharma Dec 21, 2019
e8d25be
Frontend: Theme section added (#89)
shashank-sharma Dec 21, 2019
bf93a15
Merge https://github.com/isohack/hackathon-webapp
indraasura Dec 22, 2019
74b8614
updated faq prototype
indraasura Dec 22, 2019
f016bdc
merged recent changes and feat: updated schedule
indraasura Feb 12, 2020
1f7a7ae
fix: changed schedule
indraasura Feb 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions src/components/Footer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@



.footer{
padding-top: 6%;
padding-bottom: 3%;
}

.footer-row{
width: 35%;
margin: auto;
text-align: center;
margin-bottom: 3%;
}

.footer-title{
font-weight: 600;
font-size: 24px;
font-family: circularStdBook;
}

.footer-info{
font-family: circularStdBook;
font-size: 20px;
color: #575757;
line-height: 140%;
}

.footer-social-links{
font-family: circularStdBook;
font-size: 20px;
color: black;
}

.footer-logo-img{
width: 40%;
}



@media screen and (max-width: 992px){
.footer-row{
width: 50%;
}

.footer-info, .footer-social-links{
font-size: 16px;
}

.footer-logo-img{
width: 60%;
}
}


@media screen and (max-width: 768px){
.footer{
padding-top: 15%;
padding-bottom: 10%;
}

.footer-row{
width: 80%;
margin-bottom: 5%;
}

.footer-title{
font-size: 18px;
}

.footer-info, .footer-social-links{
font-size: 14px;
}

.footer-logo-img{
width: 50%;
}
}

9 changes: 4 additions & 5 deletions src/components/faq.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ class Faq extends Component {
render() {
return (
<>

<div className="faqBackground">
<div className="row">
<h1
Expand Down Expand Up @@ -46,8 +47,7 @@ class Faq extends Component {
that you will feel comfortable during the intense hacking
and if you are going to sleep on the venue, please bring a
blanket or a sleeping bag. Above all, bring your energy
and your brain!
</span>
and your brain!</span>
</div>
</li>
<li style={{ fontSize: "20px" }}>
Expand Down Expand Up @@ -121,8 +121,7 @@ class Faq extends Component {
a programmer, we will have mentors and volunteers to guide
you throughout the hackathon and hear out your doubts and
navigate you through the problems you and your team are
facing.
</span>
facing.</span>
</div>
</li>
<li style={{ fontSize: "20px" }}>
Expand Down Expand Up @@ -160,7 +159,7 @@ class Faq extends Component {
</li>
</ul>
</div>
</div>
</div> */}
</div>
</>
);
Expand Down
158 changes: 92 additions & 66 deletions src/components/schedule.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,19 +36,19 @@ class Schedule extends Component {
<div className={"row center white-text schedule-body"}>
<div className={"col s3 m3 l3"}>
<a className="btn-floating btn-large pulse modal-trigger red" href="#modal2"><i className="material-icons">cloud</i></a>
<p>28th of December, 2019</p>
<p>10th of Feburary, 2020</p>
</div>
<div className={"col s3 m3 l3"}>
<a className="btn-floating btn-large modal-trigger" href="#modal3"><i className="material-icons">cloud</i></a>
<p>10th of Feburary, 2020</p>
<p>22nd of February, 2020</p>
</div>
<div className={"col s3 m3 l3"}>
<a className="btn-floating btn-large modal-trigger" href="#modal4"><i className="material-icons">cloud</i></a>
<p>22nd of February, 2020</p>
<p>23rd of February, 2020</p>
</div>
<div className={"col s3 m3 l3"}>
<a className="btn-floating btn-large modal-trigger" href="#modal1"><i className="material-icons">cloud</i></a>
<p>23nd of Feburary, 2020</p>
<p>24th of Feburary, 2020</p>
</div>
</div>
{/*<img className="bonfire" src={this.state.Bonfire} alt="bonfire"/>*/}
Expand All @@ -73,7 +73,7 @@ class Schedule extends Component {

<div id="modal1" className="modal bottom-sheet">
<div className="modal-content">
<h4 className="center">23/2/2020</h4>
<h4 className="center">24/2/2020</h4>
<table className="centered highlight responsive-table">
<thead>
<tr>
Expand All @@ -85,29 +85,34 @@ class Schedule extends Component {

<tbody>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Breakfast</td>
<td>1:00</td>
<td></td>
<td>Final Mentor Round</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Lunch</td>
<td>2:00</td>
<td>2:30</td>
<td>Midnight Snacks</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Presentations Begin</td>
<td>5:00</td>
<td></td>
<td>Hackathon Ends</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Winners Announcement</td>
<td>6:00</td>
<td>10:00</td>
<td>Presentation Rounds</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Goodbye with warm memories</td>
<td>10:00</td>
<td>10:30</td>
<td>Breakfast</td>
</tr>
<tr>
<td>10:30</td>
<td>11:00</td>
<td>Prize Distribution Ceremony and goodbye with warm memories</td>
</tr>
</tbody>
</table>
Expand All @@ -120,8 +125,8 @@ class Schedule extends Component {

<div id="modal2" className="modal bottom-sheet">
<div className="modal-content">
<h4 className="header center">28/12/2019 to 7/2/2020</h4>
<h5 className="center">Registration starts and ends</h5>
<h4 className="header center">10/2/2020</h4>
<h5 className="center">Shortlisted teams announced and RSVP mails sent</h5>

</div>
<div className="modal-footer">
Expand All @@ -132,8 +137,44 @@ class Schedule extends Component {

<div id="modal3" className="modal bottom-sheet">
<div className="modal-content">
<h4 className="header center">10/2/2020</h4>
<h5 className="center">Shortlisted teams annonuced and RSVP sent to shortlisted teams</h5>
<h4 className="header center">22/2/2020</h4>
<table className="centered highlight responsive-table">
<thead>
<tr>
<th>Start Time</th>
<th>End Time</th>
<th>Event</th>
</tr>
</thead>

<tbody>
<tr>
<td>15:00</td>
<td>17:00</td>
<td>Checkin and registration of participants</td>
</tr>
<tr>
<td>17:00</td>
<td>19:00</td>
<td>Isohack inaugration with keynote sessions from mentors</td>
</tr>
<tr>
<td>19:00</td>
<td>20:00</td>
<td>Dinner</td>
</tr>
<tr>
<td>20:00</td>
<td>20:30</td>
<td>Release of Problem Statements</td>
</tr>
<tr>
<td>20:30</td>
<td></td>
<td>Hackathon begins</td>
</tr>
</tbody>
</table>
</div>
<div className="modal-footer">
<a href="#!" className="modal-close waves-effect waves-green btn-flat">Close</a>
Expand All @@ -143,7 +184,7 @@ class Schedule extends Component {

<div id="modal4" className="modal bottom-sheet">
<div className="modal-content">
<h4 className="center">22/2/20</h4>
<h4 className="center">23/2/20</h4>
<table className="centered highlight responsive-table">
<thead>
<tr>
Expand All @@ -155,65 +196,50 @@ class Schedule extends Component {

<tbody>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Checkin and registration of participants</td>
<td>2:00</td>
<td>2:30</td>
<td>Midnight Snacks</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Opening ceremony</td>
<td>4:00</td>
<td></td>
<td>Mentor Round - 1</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Keynote session</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Dinner</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Workshop A</td>
<td>9:00</td>
<td>9:30</td>
<td>Breakfast</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Release of Problem Statements</td>
<td>12:00</td>
<td></td>
<td>Mentor Round - 2</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Hackathon begins</td>
<td>13:30</td>
<td>14:30</td>
<td>Lunch</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Snacks Break</td>
<td>15:00</td>
<td>15:30</td>
<td>Keynote session by Sameer Khan</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Breakfast</td>
<td>17:30</td>
<td>18:00</td>
<td>High Tea</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Lunch</td>
<td>20:00</td>
<td></td>
<td>Mentor Round - 3</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>21:00</td>
<td>22:00</td>
<td>Dinner</td>
</tr>
<tr>
<td>__:__</td>
<td>__:__</td>
<td>Midnight Snacks Break</td>
</tr>
</tbody>
</table>
</div>
Expand Down
15 changes: 15 additions & 0 deletions src/components/theme.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
.theme-body {
}

.theme-body-background {
background-color: black;
}

.theme-header {
color: white;
font-weight: 800;
}

.theme-image {
width: 100%;
}
Binary file added src/img/themes.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.