Merge pull request #135 from Prakhar19999/testing

Blog App(change in User Profile)

Author: kmAyush

website/blog/views.py

@@ -106,7 +106,7 @@ def add_blog(request):
             for profile in profiles:
                 user = profile.user
                 current_site = get_current_site(request)
-                subject = 'New Activity in AskREC'
+                subject = 'New Activity on RECursion Blog'
                 message = render_to_string('blog/new_blog_entry_email.html', {
                     'user': user,
                     'domain': current_site.domain,
@@ -248,7 +248,7 @@ def update_blogs(request, id):
             for profile in profiles:
                 user = profile.user
                 current_site = get_current_site(request)
-                subject = 'New Activity in AskREC'
+                subject = 'New Activity on RECursion Blog'
                 message = render_to_string('blog/update_blog_email.html', {
                     'user': user,
                     'domain': current_site.domain,
@@ -309,7 +309,7 @@ def add_reply(request, id):
             for profile in profiles:
                 user = profile.user
                 current_site = get_current_site(request)
-                subject = 'New Activity in AskREC'
+                subject = 'New Activity on RECursion Blog'
                 message = render_to_string('blog/new_reply_entry_email.html', {
                     'user': user,
                     'domain': current_site.domain,
@@ -371,7 +371,7 @@ def update_reply(request, id):
                     for profile in profiles:
                         user = profile.user
                         current_site = get_current_site(request)
-                        subject = 'New Activity in AskREC'
+                        subject = 'New Activity on RECursion Blog'
                         message = render_to_string('blog/reply_update_email.html', {
                             'user': user,
                             'domain': current_site.domain,
@@ -421,7 +421,7 @@ def add_comment(request, id):
         for profile in profiles:
             user = profile.user
             current_site = get_current_site(request)
-            subject = 'New Activity in AskREC'
+            subject = 'New Activity on RECursion Blog'
             message = render_to_string('blog/new_commententry_email.html', {
                 'user': user,
                 'domain': current_site.domain,
@@ -473,7 +473,7 @@ def update_comment(request, id):
                     for profile in profiles:
                         user = profile.user
                         current_site = get_current_site(request)
-                        subject = 'New Activity in AskREC'
+                        subject = 'New Activity on RECursion Blog'
                         message = render_to_string('blog/updatecomment_email.html', {
                             'user': user,
                             'domain': current_site.domain,
@@ -536,7 +536,6 @@ def edit_postlike(request, id):
        else:
             postlike=PostLikes.objects.create(post=post,user=user,value=True)
             postlike.save()
-            ("postlike_created")
             count=PostLikes.objects.filter(post=post,value=True).count()-PostLikes.objects.filter(post=post,value=False).count()
             return HttpResponse(json.dumps({
                             'count':count,
@@ -555,7 +554,6 @@ def edit_postdislike(request, id):
             postlike = PostLikes.objects.get(post=post, user=user)
             if postlike.value == False:
                 postlike.delete()
-                ("postdislike_deleted")
                 count=PostLikes.objects.filter(post=post,value=True).count()-PostLikes.objects.filter(post=post,value=False).count()
                 return HttpResponse(json.dumps({
                                 'count':count,
@@ -565,7 +563,6 @@ def edit_postdislike(request, id):
                 postlike.delete()
                 postlike=PostLikes.objects.create(post=post,user=user,value=False)
                 postlike.save()
-                print("postdislike")
                 count=PostLikes.objects.filter(post=post,value=True).count()-PostLikes.objects.filter(post=post,value=False).count()
                 return HttpResponse(json.dumps({
                                 'count':count,
@@ -575,7 +572,6 @@ def edit_postdislike(request, id):
         else:
             postlike=PostLikes.objects.create(post=post,user=user,value=False)
             postlike.save()
-            print("postdislike_created")
             count=PostLikes.objects.filter(post=post,value=True).count()-PostLikes.objects.filter(post=post,value=False).count()
             return HttpResponse(json.dumps({
                             'count':count,
@@ -598,7 +594,6 @@ def like_votings(request, id):
             if like.value == True:
                 like.delete()
                 count=Likes.objects.filter(reply=reply,value=True).count()-Likes.objects.filter(reply=reply,value=False).count()
-                print("upvote_deleted")
                 return HttpResponse(json.dumps({
                             'count':count,
                             'Success':'upvote_deleted'
@@ -608,7 +603,6 @@ def like_votings(request, id):
                 l = Likes.objects.create(reply=reply, user=user,value=True)
                 l.save()
                 count=Likes.objects.filter(reply=reply,value=True).count()-Likes.objects.filter(reply=reply,value=False).count()
-                print("upvoted")
                 return HttpResponse(json.dumps({
                             'count':count,
                             'Success':'upvoted'
@@ -617,7 +611,6 @@ def like_votings(request, id):
             like = Likes.objects.create(reply=reply, user=user, value=True)
             like.save()
             count=Likes.objects.filter(reply=reply,value=True).count()-Likes.objects.filter(reply=reply,value=False).count()
-            print("upvote_created")
             return HttpResponse(json.dumps({
                     'count':count,
                     'Success':'upvote_created'
@@ -639,7 +632,6 @@ def dislike_votings(request, id):
             if like.value == False:
                 like.delete()
                 count=Likes.objects.filter(reply=reply,value=True).count()- Likes.objects.filter(reply=reply,value=False).count()
-                print("downvote_deleted")
                 return HttpResponse(json.dumps({
                                 'count':count,
                                 'Success':'downvote_deleted'
@@ -649,7 +641,6 @@ def dislike_votings(request, id):
                 l=Likes.objects.create(reply=reply, user=user, value=False)
                 l.save()
                 count=Likes.objects.filter(reply=reply,value=True).count()-Likes.objects.filter(reply=reply,value=False).count()
-                print("downvoted")
                 return HttpResponse(json.dumps({
                                 'count':count,
                                 'Success':'downvoted'
@@ -658,7 +649,6 @@ def dislike_votings(request, id):
             like = Likes.objects.create(reply=reply, user=user,value=False)
             like.save()
             count=Likes.objects.filter(reply=reply,value=True).count()-Likes.objects.filter(reply=reply,value=False).count()
-            print("downvote_created")
             return HttpResponse(json.dumps({
                     'count':count,
                     'Success':'downvote_created'
@@ -745,7 +735,7 @@ def add_comment_reply(request, id):
         for profile in profiles:
             user = profile.user
             current_site = get_current_site(request)
-            subject = 'New Activity in AskREC'
+            subject = 'New Activity on RECursion Blog'
             message = render_to_string('blog/new_reply_comment_entry_email.html', {
                 'user': user,
                 'domain': current_site.domain,
@@ -796,7 +786,7 @@ def update_comment_reply(request, id):
               for profile in profiles:
                   user = profile.user
                   current_site = get_current_site(request)
-                  subject = 'New Activity in AskREC'
+                  subject = 'New Activity on RECursion Blog'
                   message = render_to_string('blog/update_reply_comment_email.html', {
                       'user': user,
                       'domain': current_site.domain,

website/forum/templates/base.html

@@ -168,6 +168,7 @@ <h3>Contacts</h3>
                         <h3 class="ml-0">Links</h3>
                         <ul class="nav-list ml-1">
                             <li><a href="{% url 'forum:list_questions' %}">AskREC</a></li>
+                            <li><a href="{% url 'blog:list_blogs' %}">Blog</a></li>
                             <li><a href="{% url 'events:calender' %}">Events</a></li>
                             <li><a href="{% url 'getting_started:getting_started' %}">Get Started</a></li>
                             <li><a href="{% url 'forum:faculty'%}">Faculty Advisors</a></li>

website/user_profile/templates/profile/profile.html

@@ -84,20 +84,21 @@ <h5>Comments On Answers</h5>
                {% for act in activity %}
                {% if act.get_cname == "Post" %}
                <div class="jumbotron shadow-sm p-3 mb-1 bg-white rounded" style="background: white ;padding: 10px">
-                       <h5>Blogs Posted</h5>
-                       <a href="{% url 'blog:detail_blogs' act.id %}">Posted this Blog: {{ act.title }}</a><br>
+                       <h5>Post Shared</h5>
+                       <a href="{% url 'blog:detail_blogs' act.id %}">Shared this Post on RECursion Blog: {{ act.title }}</a><br>
                </div>
                {% elif act.get_cname == "Reply" %}
                <div class="jumbotron shadow-sm p-3 mb-1 bg-white rounded" style="background: white ;padding: 10px">
-                       <h5>Blogs Commented</h5>
-                       <a href="{% url 'blog:detail_blogs' act.post_id.id  %}">Commented on this Blog: {{ act.post_id.title }}</a><br>
+                       <h5>Commented on Post</h5>
+                       <a href="{% url 'blog:detail_blogs' act.post_id.id  %}">Commented on this Post on RECursion Blog: {{ act.post_id.title }}</a><br>
                </div>
                {% elif act.get_cname == "Comment_Reply" %}
                <div class="jumbotron shadow-sm p-3 mb-1 bg-white rounded" style="background: white ;padding: 10px">
-                       <h5>Replies on Comments</h5>
-                       <a href="{% url 'blog:detail_blogs' act.reply.post_id.id  %}">Replied to this Comment: {{ act.reply.post_id.title }}</a>
+                       <h5>Replied to a Comment on Post</h5>
+                       <a href="{% url 'blog:detail_blogs' act.reply.post_id.id  %}">Replied to a Comment on this Post on RECursion Blog: {{ act.reply.post_id.title }}</a>
                </div>
-               {% endif %}<br>
+               {% endif %}
+               <br>
                 {% endfor %}
             </ul>
             </div>

website/user_profile/views.py

@@ -37,11 +37,10 @@
 from blog.models import *
 
 def view_profile(request, id=None):
-    print(id)
     if id == None:
         id = request.user.id
     try:
-        user = get_object_or_404(User, pk=id)
+        user = get_object_or_404(User, pk=id) 
     except:
         print(request.user.id)
         return HttpResponse("User does not exist!")
@@ -65,12 +64,12 @@ def view_profile(request, id=None):
         required.append(question)
     for answer in answers:
         required.append(answer)
-    for comment in comments:
-        required.append(comment)
+    for comment_q in comments:
+        required.append(comment_q)
     for com_a in comments_ans:
         required.append(com_a)
 
-    for post in posts:
+    for post in posts:  
         required.append(post)
     for reply in replys:
         required.append(reply)