From cbce07ea43b62533d972634e8f1d38ec16f45990 Mon Sep 17 00:00:00 2001 From: Vikash Kumar Patel Date: Fri, 26 Oct 2018 20:44:13 +0530 Subject: [PATCH 1/4] End Contest Button added --- db_conn.py | 4 ++-- requirements.txt | 2 -- templates/base-login.html | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/db_conn.py b/db_conn.py index 1ce3002..035730a 100755 --- a/db_conn.py +++ b/db_conn.py @@ -3,12 +3,12 @@ # ADD URI STRING HERE ################################# # set production False, if you want to contribute to this repo and make changes -production = True +production = False uri_string = "" ######################################################### client = pymongo.MongoClient(uri_string) - + db = client.db \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 9e92f6a..11ed73b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,9 +7,7 @@ itsdangerous==0.24 Jinja2==2.10 language-selector==0.1 MarkupSafe==1.0 -pygobject==3.20.0 pymongo==3.7.1 -python-apt==1.1.0b1+ubuntu0.16.4.2 requests==2.9.1 six==1.10.0 ssh-import-id==5.5 diff --git a/templates/base-login.html b/templates/base-login.html index ffed24c..5304f34 100755 --- a/templates/base-login.html +++ b/templates/base-login.html @@ -40,8 +40,8 @@
  • Current Leaderboard
    • -
  • - End Contest +
  • +
    • {% else %} From 22621be1c3efcc150ddf2204a9b4109d458ef3d7 Mon Sep 17 00:00:00 2001 From: Vikash Kumar Patel Date: Sat, 27 Oct 2018 03:29:47 +0530 Subject: [PATCH 2/4] End Contest Button added with pop-up --- db_conn.py | 3 +- static/css/popup.css | 68 +++++++++++++++++++++++++++++++++++++++ templates/base-login.html | 19 +++++++++-- 3 files changed, 86 insertions(+), 4 deletions(-) create mode 100644 static/css/popup.css diff --git a/db_conn.py b/db_conn.py index 035730a..ac95e11 100755 --- a/db_conn.py +++ b/db_conn.py @@ -7,8 +7,9 @@ uri_string = "" -######################################################### +######################################################### + client = pymongo.MongoClient(uri_string) db = client.db \ No newline at end of file diff --git a/static/css/popup.css b/static/css/popup.css new file mode 100644 index 0000000..2fb4f15 --- /dev/null +++ b/static/css/popup.css @@ -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; + } \ No newline at end of file diff --git a/templates/base-login.html b/templates/base-login.html index 5304f34..b34c70e 100755 --- a/templates/base-login.html +++ b/templates/base-login.html @@ -16,6 +16,7 @@ + @@ -41,7 +42,7 @@ Current Leaderboard
  • - +
    • {% else %} @@ -61,9 +62,21 @@ - +
    - {% block header %}{% endblock %}
    From a1418ceb665ff2fe65cc75bce6ef415670771dc3 Mon Sep 17 00:00:00 2001 From: Vikash Kumar Patel Date: Mon, 29 Oct 2018 22:59:30 +0530 Subject: [PATCH 3/4] changed production to true --- db_conn.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/db_conn.py b/db_conn.py index ac95e11..deb43e9 100755 --- a/db_conn.py +++ b/db_conn.py @@ -3,13 +3,13 @@ # ADD URI STRING HERE ################################# # set production False, if you want to contribute to this repo and make changes -production = False +production = True uri_string = "" ######################################################### - + client = pymongo.MongoClient(uri_string) - + db = client.db \ No newline at end of file From a7ae2b3cf301344c1ff4ea134685bafb1dbf7508 Mon Sep 17 00:00:00 2001 From: Vikash Kumar Patel Date: Mon, 29 Oct 2018 23:17:53 +0530 Subject: [PATCH 4/4] updated requirement.txt --- requirements.txt | 4 +++- templates/base-login.html | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 11ed73b..cc8653a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,10 +7,12 @@ itsdangerous==0.24 Jinja2==2.10 language-selector==0.1 MarkupSafe==1.0 +pygobject==3.20.0 pymongo==3.7.1 +python-apt==1.1.0b1+ubuntu0.16.4.2 requests==2.9.1 six==1.10.0 ssh-import-id==5.5 ufw==0.35 urllib3==1.13.1 -Werkzeug==0.14.1 +Werkzeug==0.14.1 \ No newline at end of file diff --git a/templates/base-login.html b/templates/base-login.html index b34c70e..35a7131 100755 --- a/templates/base-login.html +++ b/templates/base-login.html @@ -41,7 +41,7 @@
  • Current Leaderboard
    • -
  • +
    • {% else %}