Skip to content

End Contest Button added #10

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
vikasnitd wants to merge 4 commits into
base: b1
Choose a base branch
from
Open

End Contest Button added #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cbce07e
End Contest Button added
vikasnitd Oct 26, 2018
22621be
End Contest Button added with pop-up
vikasnitd Oct 26, 2018
a1418ce
changed production to true
vikasnitd Oct 29, 2018
a7ae2b3
updated requirement.txt
vikasnitd Oct 29, 2018
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
1 change: 1 addition & 0 deletions db_conn.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

uri_string = ""


#########################################################

client = pymongo.MongoClient(uri_string)
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ six==1.10.0
ssh-import-id==5.5
ufw==0.35
urllib3==1.13.1
Werkzeug==0.14.1
Werkzeug==0.14.1
68 changes: 68 additions & 0 deletions static/css/popup.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
.modal-confirm {
color: #636363;
width: 400px;
}
.modal-confirm .modal-content {
padding: 20px;
border-radius: 5px;
border: none;
text-align: center;
font-size: 14px;
}
.modal-confirm .modal-header {
border-bottom: none;
position: relative;
}
.modal-confirm h4 {
text-align: center;
font-size: 26px;
margin: 30px 0 -10px;
}
.modal-confirm .close {
position: absolute;
top: -5px;
right: -2px;
}
.modal-confirm .modal-body {
color: #999;
}
.modal-confirm .modal-footer {
border: none;
text-align: center;
border-radius: 5px;
font-size: 13px;
padding: 10px 15px 25px;
}
.modal-confirm .modal-footer a {
color: #999;
}
.modal-confirm .btn {
color: #fff;
border-radius: 4px;
background: #60c7c1;
text-decoration: none;
transition: all 0.4s;
line-height: normal;
min-width: 120px;
border: none;
min-height: 40px;
border-radius: 3px;
margin: 0 5px;
outline: none !important;
}
.modal-confirm .btn-info {
background: #c1c1c1;
}
.modal-confirm .btn-info:hover, .modal-confirm .btn-info:focus {
background: #a8a8a8;
}
.modal-confirm .btn-danger {
background: #f15e5e;
}
.modal-confirm .btn-danger:hover, .modal-confirm .btn-danger:focus {
background: #ee3535;
}
.trigger-btn {
display: inline-block;
margin: 100px auto;
}
19 changes: 16 additions & 3 deletions templates/base-login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<script language="javascript" src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.6.1/addons/p5.sound.js"></script>
<!-- <script language="javascript" type="text/javascript" src="sketch.js"></script> -->
<link rel="icon" type="image/png" href="/static/images/cvc-icon.ico">
<link rel="stylesheet" href="/static/css/popup.css">
</head>

<body>
Expand All @@ -41,7 +42,7 @@
<a class="nav-link" href="/standings">Current Leaderboard</a>
</li>
<li class="nav-item">
<a class="nav-link" href="/end_contest"><b><em>End Contest</em></b></a>
<button type="button" class="btn btn-danger" href="#myModal" data-toggle = "modal" ><b><em>End Contest</em></b></button>
</li>
{% else %}

Expand All @@ -61,9 +62,21 @@
</ul>
</div>
</nav>

<div id="myModal" class="modal fade">
<div class="modal-dialog modal-confirm">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Are you sure about ending contest here?</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-footer">
<button type="button"class="btn btn-info" data-dismiss="modal">Cancel</button>&emsp;&emsp;&emsp;&emsp;&emsp;
<button type="button" class="btn btn-danger" onclick="location.href='/end_contest'">Confirm!!</button>
</div>
</div>
</div>
</div>
<div class="jumbotron">

{% block header %}{% endblock %}

<hr class="my-4">
Expand Down