leaderboard added

config/settings/base.py

@@ -63,6 +63,9 @@
     # "django.contrib.humanize", # Handy template tags
     "django.contrib.admin",
     "django.forms",
+    # apps
+    "phone_field",
+    "six",
 ]
 THIRD_PARTY_APPS = [
     "crispy_forms",

config/urls.py

@@ -15,6 +15,7 @@
     path("accounts/", include("allauth.urls")),
     # Your stuff: custom urls includes go here
     path("", include("djafforum.urls", namespace="myforum")),
+    # path("leaderboard/", include("leaderboard.urls")),
     path("ckeditor/", include('ckeditor_uploader.urls')),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 # API URLS

djafforum/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.2.10 on 2020-03-27 19:10
+# Generated by Django 2.2.4 on 2020-04-06 09:04
 
 import ckeditor_uploader.fields
 import djafforum.models
@@ -12,8 +12,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('contenttypes', '0002_remove_content_type_name'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [

django_homepage/contrib/sites/migrations/0001_initial.py

@@ -1,42 +1,32 @@
+# Generated by Django 2.2.4 on 2020-04-06 09:04
+
 import django.contrib.sites.models
-from django.contrib.sites.models import _simple_domain_name_validator
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
-    dependencies = []
+    initial = True
+
+    dependencies = [
+    ]
 
     operations = [
         migrations.CreateModel(
-            name="Site",
+            name='Site',
             fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        verbose_name="ID",
-                        serialize=False,
-                        auto_created=True,
-                        primary_key=True,
-                    ),
-                ),
-                (
-                    "domain",
-                    models.CharField(
-                        max_length=100,
-                        verbose_name="domain name",
-                        validators=[_simple_domain_name_validator],
-                    ),
-                ),
-                ("name", models.CharField(max_length=50, verbose_name="display name")),
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('domain', models.CharField(max_length=100, unique=True, validators=[django.contrib.sites.models._simple_domain_name_validator], verbose_name='domain name')),
+                ('name', models.CharField(max_length=50, verbose_name='display name')),
             ],
             options={
-                "ordering": ("domain",),
-                "db_table": "django_site",
-                "verbose_name": "site",
-                "verbose_name_plural": "sites",
+                'verbose_name': 'site',
+                'verbose_name_plural': 'sites',
+                'db_table': 'django_site',
+                'ordering': ('domain',),
             },
-            bases=(models.Model,),
-            managers=[("objects", django.contrib.sites.models.SiteManager())],
-        )
+            managers=[
+                ('objects', django.contrib.sites.models.SiteManager()),
+            ],
+        ),
     ]

django_homepage/templates/auth/user_detail.html

@@ -1,4 +1,3 @@
-
 {% extends 'base.html' %}
 {% load forum_tags %}
 {% load thumbnail %}
@@ -32,7 +31,7 @@ <h3 class="create_topic_heading">User Profile</h3>
                       <div class="profile_right">
                         <div class="user_name_email_contact">
                           <span class="title"><b>Name : </b> {{user_profile.username}} </span>
-                          <span class="email"><b>email : </b>{{user_profile.email}}</span>
+                          <span class="email"><b>email :  </b>{{user_profile.email}}</span>
                           <!--<span class="contact"><b>Contact : </b>+91 99892273555</span>-->
                         </div>
                         <div class="categories">
@@ -128,7 +127,6 @@ <h3 class="create_topic_heading">User Profile</h3>
                         {% else %}
                         No Topics Available Now
                         {% endif %}
-
                         </div>
                       </div>
                       <div role="tabpanel" class="tab-pane" id="Favourites1">

django_homepage/templates/forum/profile.html

@@ -11,11 +11,12 @@
             <div class="panel panel-default">
               <div class="panel-body">
                 <div class="view_topic_container">
-                  <h3 class="create_topic_heading">User Profile</h3>
+                  <h4 class="create_topic_heading">User Profile</h4>
+                  <a href="{% url 'leaderboard:index' %}"><span class="glyphicon-briefcase"></span></a>
                   <div class="user_profile_container">
                     <div class="profile_container">
                       <div class="profile_left">
-                        <img src="{% if request.user|user_profile_pic %}{% thumbnail request.user|user_profile_pic "100x100" upscale=True padding=True %}{% else %}//d2pt99vxm3n8bc.cloudfront.net/static/dummy.jpg{% endif %}">
+                        <img src="{% if request.user|user_profile_pic %}{% thumbnail request.user|user_profile_pic "101x100" upscale=True padding=True %}{% else %}//d2pt99vxm3n8bc.cloudfront.net/static/dummy.jpg{% endif %}">
                         {% ifequal request.user.id|slugify user_profile.user.id|slugify %}
                         <span class="new_logo file_upload"><a href="#"><i class="fa fa-camera" aria-hidden="true"></i></a></span>
                         <form name="profilepicform" id="profilepicform"><input type="file" id='file_input' name="profile_pic" id="profile_pic" style="display: none;" onchange="javascript: submitform()"><input type="submit" id='submit' name="submit" style="display: none;">
@@ -250,4 +251,4 @@ <h4 class="inner_page_heading">Suggested Topics</h4>
     }, 'json');
 });
 </script>
-{% endblock %}
+{% endblock %}