add last updated at for leaderboard

axios-iiitl · Nov 9, 2019 · 9833238 · 9833238
1 parent ee7001d
commit 9833238
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 5 deletions.
diff --git a/leaderboard/leaderboard/settings.py b/leaderboard/leaderboard/settings.py
@@ -1,5 +1,4 @@
 import os
-from celery.schedules import crontab
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

diff --git a/leaderboard/submission/management/commands/sync_data.py b/leaderboard/submission/management/commands/sync_data.py
@@ -73,6 +73,8 @@ def get_all_merged_prs(self, repo):
                     page_no=page_no+1,
                 )
 
+                log.info('Getting data for %s', link)
+
                 response = requests.get(link)
                 if response.status_code == 200:
                     data = response.json()
@@ -81,8 +83,10 @@ def get_all_merged_prs(self, repo):
                         break
 
                     for pr in data:
-                        if pr['merged_at'] != 'null':
+                        if pr['merged_at'] != None:
                             final_data.append(pr)
+                else:
+                    log.info('%s response for %s:' % (response.status_code, link))
 
         except Exception:
             log.exception('Error while getting all merged PRs for repo %s', repo)

diff --git a/leaderboard/submission/migrations/0007_submission_created_at.py b/leaderboard/submission/migrations/0007_submission_created_at.py
@@ -0,0 +1,21 @@
+# Generated by Django 2.2.6 on 2019-11-08 16:16
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('submission', '0006_auto_20191103_0148'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='submission',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, default=datetime.datetime(2019, 11, 8, 16, 16, 12, 887676, tzinfo=utc)),
+            preserve_default=False,
+        ),
+    ]
diff --git a/leaderboard/submission/models.py b/leaderboard/submission/models.py
@@ -30,6 +30,7 @@ class Submission(models.Model):
         (50, 50),
     ))
     link = models.URLField('GitHub link')
+    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return f'Submission by {self.user}'
diff --git a/leaderboard/submission/views.py b/leaderboard/submission/views.py
@@ -60,3 +60,11 @@ def get_queryset(self):
             data = sorted(data, key=operator.itemgetter('total_points'), reverse=True)
 
         return data
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        obj = Submission.objects.all().order_by('-created_at').first()
+        if obj:
+            context['last_updated']: last_updated.created_at
+
+        return context
diff --git a/leaderboard/templates/submission/home.html b/leaderboard/templates/submission/home.html
@@ -3,7 +3,7 @@
 {% load static %}
 
 {% block content %}
-
+ 
     <div class="jumbotron jumbotron-fluid is-center bg-whitesmoke text-center">
         <div class="container">
             <h2 class="home-heading">Get Set FOSS - Leaderboard</h2>
@@ -16,6 +16,7 @@ <h2 class="home-heading">Get Set FOSS - Leaderboard</h2>
                         <a href="{% provider_login_url 'github' %}" class="btn-lg btn-dark github-btn">
                             <i class="fab fa-github"></i> Login with GitHub
                         </a>
+                        <p class="my-3"><a href="{% url 'leaderboard' %}" target="_blank">View Leaderboard</a></p>
                     {% else %}
                         <h3>Hello <strong>{{ request.user }}</strong></h3>
                     {% endif %}

diff --git a/leaderboard/templates/submission/leaderboard.html b/leaderboard/templates/submission/leaderboard.html
@@ -15,7 +15,10 @@ <h1>Get Set FOSS 2019<br/>Leaderboard</h1>
     </div>
 
     <div class="container">
-        <table class="table table-striped">
+        {% if last_updated %}
+            <span class="badge badge-info">Last Updated At: {{ last_updated }}</span>
+        {% endif %}
+        <table class="table table-striped my-3">
             <thead>
                 <tr>
                     <th scope="col">#</th>

diff --git a/leaderboard/templates/submission/navbar.html b/leaderboard/templates/submission/navbar.html
@@ -22,6 +22,9 @@
     	<ul class="navbar-nav ml-auto">
       		<li class="nav-item active">
         		<a class="nav-link" href="{% url 'dashboard' %}">Dashboard</a>
+      		</li>
+			<li class="nav-item">
+        		<a class="nav-link" href="{% url 'leaderboard' %}" target="_blank">Leaderboard</a>
       		</li>
       		<li class="nav-item">
         		<a class="nav-link" href="{% url 'account_logout' %}">Logout</a>

diff --git a/static_dir/css/main.css b/static_dir/css/main.css
@@ -23,7 +23,7 @@
 }
 
 .main-page-logo {
-    width:70%;
+    width: 50%;
 }
 
 .github-btn:hover {
@@ -37,6 +37,9 @@
     .jumbotron.jumbotron-fluid {
         width: 100%;
     }
+    .main-page-logo {
+        width: 70%;
+    }
 }
 
 .mx-r-3 {