From 5726e2efd7e4e5c5be7cb0c6ae2774068cb7f1e9 Mon Sep 17 00:00:00 2001
From: jarvisdev <bavishimilanchamp@gmail.com>
Date: Sat, 27 Oct 2018 18:32:39 +0530
Subject: [PATCH 1/4] syncing fork

---
 Projects/templates/Projects/home.html | 1 +
 Projects/views.py                     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Projects/templates/Projects/home.html b/Projects/templates/Projects/home.html
index 7a6598b..d145366 100644
--- a/Projects/templates/Projects/home.html
+++ b/Projects/templates/Projects/home.html
@@ -28,6 +28,7 @@
 {% block body_content %} 
 
 {% include 'Projects/navbar.html' %}
+
 <section class="container issues-container">
   <article class="card single-issue" csrf="{{ csrf_token }}">
     <div class="card-body">
diff --git a/Projects/views.py b/Projects/views.py
index f0c0f77..72946f1 100644
--- a/Projects/views.py
+++ b/Projects/views.py
@@ -11,6 +11,7 @@
 import json
 from .models import Issues, Prs
 import time
+from django.db.models import Q
 
 def vote(request):
     if request.user.is_authenticated:
@@ -82,7 +83,6 @@ def home(request):
                 issues = Issues.objects.all().order_by('points')
             else:
                 issues = Issues.objects.all().order_by('-pk')
-
         paginator = Paginator(issues, 15)  # Show 15 issues per page
         page = request.GET.get('page', 1)
         
@@ -94,7 +94,7 @@ def home(request):
         except EmptyPage:
             issues = paginator.get_page(paginator.num_pages)
             issues = Issues.objects.none()
-        return render(request, 'Projects/home.html', {'issues': issues, 'val':val}) #this dic will have value of
+        return render(request, 'Projects/home.html', {'issues': issues}) #this dic will have value of
 																					#all filter attributes or you can also send a list of all such attrs
 
 def leaderboard(request):

From a8ba98fd8773a356a5170e72e759830cdac1db66 Mon Sep 17 00:00:00 2001
From: jarvisdev <bavishimilanchamp@gmail.com>
Date: Sat, 27 Oct 2018 19:26:18 +0530
Subject: [PATCH 2/4] reloading prevented while changing label

---
 Projects/templates/Projects/home.html | 309 +++++++++++++-------------
 1 file changed, 160 insertions(+), 149 deletions(-)

diff --git a/Projects/templates/Projects/home.html b/Projects/templates/Projects/home.html
index 79a13a0..78caa1a 100644
--- a/Projects/templates/Projects/home.html
+++ b/Projects/templates/Projects/home.html
@@ -69,9 +69,9 @@ <h4>{{forloop.counter0|add:issues.start_index}}. Issue -
                 {{issue.title_issue}}
               </a>
               {% if issue.label == 1 %}
-                <small class="open pull-right change-label" title="Click to change the label status">OPEN</small>
+                <span class="open pull-right change-label badge badge-success" title="Click to change the label status">OPEN</span>
               {% elif issue.label == 0 %}
-                 <small class="closed pull-right change-label" title="Click to change the label status">CLOSED</small>
+                 <span class="closed pull-right change-label badge badge-danger" title="Click to change the label status">CLOSED</span>
               {% endif %}
             <h4>
     
@@ -152,172 +152,183 @@ <h4>
 
 
 {% block js_extra %}
-<script type="text/javascript">
-    $(document).ready(function(){
-        $(".process").hide();
-        $(".request").click(function(e){
-            e.preventDefault();
-            {% if not request.user.is_authenticated %}
-                alert("You need to login first before requesting verification.");
-                window.location.href = 'signin';
-            {% else %}
-                var issue = $(this).closest(".single-issue");
-                var pr_link = $("input[name='pr_link']", issue).val();
-                console.log(pr_link);
-                var issue_id = $(".issue-info", issue).attr('issue-id');
-                var csrf = $(".single-issue").attr('csrf');
-                // $(".process",this).show();
-                if(pr_link != ""){
+    <script>
+        $(document).ready(function () {
+                $(".process").hide();
+                $(".request").click(function (e) {
+                    e.preventDefault();
+                    {% if not request.user.is_authenticated %}
+                    alert("You need to login first before requesting verification.");
+                    window.location.href = 'signin';
+                    {% else %}
+                    var issue = $(this).closest(".single-issue");
+                    var pr_link = $("input[name='pr_link']", issue).val();
+                    console.log(pr_link);
+                    var issue_id = $(".issue-info", issue).attr('issue-id');
+                    var csrf = $(".single-issue").attr('csrf');
+                    // $(".process",this).show();
+                    if (pr_link != "") {
+                        $.ajax({
+                            url: 'request_pr',
+                            data: {
+                                'pr_link': pr_link,
+                                'issue_id': issue_id,
+                                'csrfmiddlewaretoken': csrf,
+                            },
+                            type: 'post',
+                            cache: false,
+                            beforeSend: function () {
+                                // $(".request").html('<i class="fa fa-spinner fa-spin fa-1x"></i>');
+                                $(".process", this).show();
+                            },
+                            success: function (data) {
+                                if (data) {
+                                    alert(data);
+                                    // document.location.reload();
+                                }
+                            },
+                            afterSend: function () {
+                                // $(".request").html(' request for verification ');
+                                $(".process", this).hide();
+                            },
+                        });
+                    } else {
+                        alert("First put your PR link with the corresponding issue.");
+                    }
+                    {% endif %}
+                });
+
+                $('.delete').click(function (e) {
+                    e.preventDefault();
+                    var issue = $(this).closest('.single-issue');
+                    var issue_id = $(".issue-info", issue).attr('issue-id');
+                    var csrf = $(".single-issue").attr('csrf');
                     $.ajax({
-                        url:'request_pr',
-                        data:{
-                            'pr_link':pr_link,
+                        url: 'remove_issue',
+                        data: {
                             'issue_id': issue_id,
-                            'csrfmiddlewaretoken':csrf,
+                            'csrfmiddlewaretoken': csrf,
                         },
-                        type:'post',
-                        cache:false,
-                        beforeSend: function(){
-                            // $(".request").html('<i class="fa fa-spinner fa-spin fa-1x"></i>');
-                            $(".process",this).show();
+                        type: 'post',
+                        cache: false,
+                        beforeSend: function () {
+                            // alert("Requesting server ...")
                         },
-                        success: function(data){
-                            if(data){
+                        success: function (data) {
+                            if (data) {
                                 alert(data);
                                 // document.location.reload();
                             }
+                        }
+                    });
+                });
+
+                $('.change-label').click(function (e) {
+                    e.preventDefault();
+                    var issue = $(this).closest('.single-issue');
+                    var issue_id = $(".issue-info", issue).attr('issue-id');
+                    var csrf = $(".single-issue").attr('csrf');
+                    $.ajax({
+                        url: 'change_label',
+                        data: {
+                            'issue_id': issue_id,
+                            'csrfmiddlewaretoken': csrf,
                         },
-                        afterSend: function(){
-                            // $(".request").html(' request for verification ');
-                            $(".process",this).hide();
+                        type: 'post',
+                        cache: false,
+                        beforeSend: function () {
+                            // alert("Requesting server ...")
                         },
-                    });
-                }else{
-                    alert("First put your PR link with the corresponding issue.");
-                }
-            {% endif %}
-        });
+                        success: function (data) {
+                            if (data) {
+                                alert(data);
+                                //console.log(issue)
+                                var status = $(".pull-right",issue).html();
+                                console.log(status)
+                                if(status=="OPEN")
+                                {
+                                    $(".pull-right", issue).html("CLOSED");
+                                    $(".pull-right", issue).attr("class","closed pull-right change-label badge badge-danger");
+                                }
+                                else
+                                {
+                                    $(".pull-right", issue).html("OPEN");
+                                    $(".pull-right", issue).attr("class", "open pull-right change-label badge badge-success");
+                                }
+                            }
 
-        $('.delete').click(function(e){
-            e.preventDefault();
-            var issue = $(this).closest('.single-issue');
-            var issue_id = $(".issue-info", issue).attr('issue-id');
-            var csrf = $(".single-issue").attr('csrf');
-            $.ajax({
-                url:'remove_issue',
-                data:{
-                    'issue_id': issue_id,
-                    'csrfmiddlewaretoken': csrf,
-                },
-                type:'post',
-                cache:false,
-                beforeSend:function(){
-                   // alert("Requesting server ...")
-                },
-                success:function(data){
-                    if(data){
-                        alert(data);
-                        // document.location.reload();
+                        }
+                    });
+                });
+
+                var infiniteScroll = new Waypoint.Infinite({
+                    element: $('.issues-container')[0],
+                    items: '.issue-list-item',
+                    //loadingClass: 'more-issues-loading',
+                    more: '.more-issues-link',
+                    onBeforePageLoad: function () {
+                        $('.more-issues-loading').show();
+                    },
+                    onAfterPageLoad: function () {
+                        $('.more-issues-loading').hide();
                     }
-                }
-            });
-        });
+                });
 
-        $('.change-label').click(function (e) {
-            e.preventDefault();
-            var issue = $(this).closest('.single-issue');
-            var issue_id = $(".issue-info", issue).attr('issue-id');
-            var csrf = $(".single-issue").attr('csrf');
-            $.ajax({
-                url: 'change_label',
-                data: {
-                    'issue_id': issue_id,
-                    'csrfmiddlewaretoken': csrf,
-                },
-                type: 'post',
-                cache: false,
-                beforeSend: function () {
-                    // alert("Requesting server ...")
-                },
-                success: function (data) {
-                    if (data) {
-                        alert(data);
-                        document.location.reload();
-                    }
+                $('.upVote').click(function (e) {
+                    e.preventDefault();
+                    var that = this
+                    var next = $(this).next('.btn')//Since The downvote button is after upvote
+                    var type = $(this).attr('voting_type');
+                    var issue = $(this).closest('.single-issue');
+                    var issue_id = $(".issue-info", issue).attr('issue-id');
+                    console.log(type);
 
-                }
-            });
-        });        
+                    $.ajax({
+                        url: 'vote',
+                        data: {
+                            'issue_id': issue_id,
+                            'type': type,
+                        },
+                        dataType: 'json',
+                        type: 'get',
+                        cache: false,
+                        success: function (data) {
+                            // $('.upV').html(data.upvotes_count);
+                            $(that).html('<i class="fa fa-2x fa-thumbs-up"></i> &nbsp;' + data.upvotes_count);
+                            $(next).html('<i class="fa fa-2x fa-thumbs-down"></i> &nbsp;' + data.downvotes_count);
+                        }
+                    });
+                });
 
-        var infiniteScroll = new Waypoint.Infinite({
-          element: $('.issues-container')[0],
-          items: '.issue-list-item',
-          //loadingClass: 'more-issues-loading',
-          more: '.more-issues-link',
-          onBeforePageLoad: function(){
-              $('.more-issues-loading').show();
-          },
-          onAfterPageLoad: function(){
-              $('.more-issues-loading').hide();
-          }
-        });
+                $('.downVote').click(function (e) {
+                    e.preventDefault();
+                    var that = this;
+                    var prev = $(this).prev('.btn')//Since The upvote button is before downvote
+                    var type = $(this).attr('voting_type');
+                    var issue = $(this).closest('.single-issue');
+                    var issue_id = $(".issue-info", issue).attr('issue-id');
+                    console.log(type);
 
-        $('.upVote').click(function(e){
-          e.preventDefault();
-            var that =this
-            var next = $(this).next('.btn')//Since The downvote button is after upvote
-            var type = $(this).attr('voting_type');
-            var issue = $(this).closest('.single-issue');
-            var issue_id = $(".issue-info", issue).attr('issue-id');
-            console.log(type);
+                    $.ajax({
+                        url: 'vote',
+                        data: {
+                            'issue_id': issue_id,
+                            'type': type,
+                        },
+                        dataType: 'json',
+                        type: 'get',
+                        cache: false,
+                        success: function (data) {
 
-            $.ajax({
-                url:'vote',
-                data:{
-                    'issue_id': issue_id,
-                     'type': type,
-                },
-                dataType:'json',
-                type:'get',
-                cache:false,
-                success:function(data){
-                    // $('.upV').html(data.upvotes_count);
-                    $(that).html('<i class="fa fa-2x fa-thumbs-up"></i> &nbsp;'+data.upvotes_count);
-                    $(next).html('<i class="fa fa-2x fa-thumbs-down"></i> &nbsp;'+data.downvotes_count);
-                }
-            });
-        });
+                            $(that).html('<i class="fa fa-2x fa-thumbs-down"></i> &nbsp;' + data.downvotes_count);
+                            $(prev).html('<i class="fa fa-2x fa-thumbs-up"></i> &nbsp;' + data.upvotes_count);
 
-        $('.downVote').click(function(e){
-          e.preventDefault();
-            var that = this;
-            var prev = $(this).prev('.btn')//Since The upvote button is before downvote
-            var type = $(this).attr('voting_type');
-            var issue = $(this).closest('.single-issue');
-            var issue_id = $(".issue-info", issue).attr('issue-id');
-            console.log(type);
+                        }
+                    });
 
-            $.ajax({
-                url:'vote',
-                data:{
-                    'issue_id': issue_id,
-                     'type': type,
-                },
-                dataType:'json',
-                type:'get',
-                cache:false,
-                success:function(data){
 
-                    $(that).html('<i class="fa fa-2x fa-thumbs-down"></i> &nbsp;'+data.downvotes_count);
-                    $(prev).html('<i class="fa fa-2x fa-thumbs-up"></i> &nbsp;'+data.upvotes_count);
+                });
 
-                }
             });
-
-
-        });
-
-    });
-</script>
-
+    </script>
 {% endblock js_extra %}

From 7ce9b8df6968f3d7fe0798b556e8cdca7814bb93 Mon Sep 17 00:00:00 2001
From: jarvisdev <bavishimilanchamp@gmail.com>
Date: Sat, 27 Oct 2018 19:34:58 +0530
Subject: [PATCH 3/4] updated master

---
 Projects/static/Projects/js/profile.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Projects/static/Projects/js/profile.js b/Projects/static/Projects/js/profile.js
index d648224..0efb326 100644
--- a/Projects/static/Projects/js/profile.js
+++ b/Projects/static/Projects/js/profile.js
@@ -65,7 +65,6 @@ $(document).ready(function() {
       success: function(data) {
         if (data) {
           alert(data);
-          document.location.reload();
         }
       }
     });

From e07a35966f1b027526cd753da632971ef129764f Mon Sep 17 00:00:00 2001
From: jarvisdev <bavishimilanchamp@gmail.com>
Date: Sat, 27 Oct 2018 19:43:24 +0530
Subject: [PATCH 4/4] preventing reload when deleting a PR

---
 ContriHub/settings.py                  | 40 +++++++++++++-------------
 Projects/static/Projects/js/profile.js |  1 +
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/ContriHub/settings.py b/ContriHub/settings.py
index ab2c66a..ed8dd11 100644
--- a/ContriHub/settings.py
+++ b/ContriHub/settings.py
@@ -122,12 +122,12 @@
 else: 
     #this is for local you need not to make any changes here, 
     # it'll work unless you are sure about how to setup postgres/mysql etc    
-    DATABASES = {
-        'default': {
-            'ENGINE': 'django.db.backends.sqlite3',
-            'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-        }
-    }
+    # DATABASES = {
+    #     'default': {
+    #         'ENGINE': 'django.db.backends.sqlite3',
+    #         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    #     }
+    # }
     #An example how you can setup postgres sql in local, create a postgres db and provide relevant details in this format
     # DB_PASS = os.environ.get('CONTRIHUB_PASS', "")
     # DATABASES = {
@@ -140,20 +140,20 @@
     #         'PORT': '',
     #     }
     # }
-    # DATABASES = {
-    #     'default': {
-    #         'ENGINE': 'django.db.backends.mysql',
-    #         'OPTIONS': {
-    #             # 'read_default_file': '/path/to/my.cnf',
-    #         },
-    #         # 'NAME': os.path.join(BASE_DIR, 'testdb'),
-    #         'NAME': 'contrihub_db',
-    #         'USER': 'user',
-    #         'PASSWORD': '1234',
-    #         'HOST': '127.0.0.1',
-    #         'PORT': '',
-    #     }
-    # }
+    DATABASES = {
+        'default': {
+            'ENGINE': 'django.db.backends.mysql',
+            'OPTIONS': {
+                # 'read_default_file': '/path/to/my.cnf',
+            },
+            # 'NAME': os.path.join(BASE_DIR, 'testdb'),
+            'NAME': 'contrihub_db',
+            'USER': 'user',
+            'PASSWORD': '1234',
+            'HOST': '127.0.0.1',
+            'PORT': '',
+        }
+    }
 
 
 # Password validation
diff --git a/Projects/static/Projects/js/profile.js b/Projects/static/Projects/js/profile.js
index 0efb326..5e7edae 100644
--- a/Projects/static/Projects/js/profile.js
+++ b/Projects/static/Projects/js/profile.js
@@ -65,6 +65,7 @@ $(document).ready(function() {
       success: function(data) {
         if (data) {
           alert(data);
+          pr.hide();
         }
       }
     });