Fixed notifications and added posts to profile

bootcamp/news/urls.py

@@ -16,4 +16,5 @@
     url(
         r"^update-interactions/$", views.update_interactions, name="update_interactions"
     ),
+    url(r'^(?P<pk>[\w.@+-]+)/$', views.news, name='news'),
 ]

bootcamp/news/views.py

@@ -1,11 +1,7 @@
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import (
-    HttpResponse,
-    HttpResponseBadRequest,
-    JsonResponse,
-    HttpResponseForbidden,
-)
+from django.http import HttpResponse, HttpResponseBadRequest, JsonResponse, HttpResponseForbidden
+from django.shortcuts import get_object_or_404, render
 from django.template.loader import render_to_string
 from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
@@ -34,6 +30,11 @@ class NewsDeleteView(LoginRequiredMixin, AuthorRequiredMixin, DeleteView):
     success_url = reverse_lazy("news:list")
 
 
+def news(request, pk):
+    news = get_object_or_404(News, pk=pk)
+    return render(request, 'news/news_activity.html', {'news': news})
+
+
 @login_required
 @ajax_required
 @require_http_methods(["POST"])

bootcamp/static/css/bootcamp.css

@@ -1,7 +1,7 @@
 @import url(https://fonts.googleapis.com/css?family=Audiowide);
 
 body {
-  padding-top: 80px;
+    padding-top: 70px;
 }
 
 header .navbar-brand {

bootcamp/static/css/news.css

@@ -63,6 +63,10 @@ ul.stream li div.post div.interaction a {
   overflow-x: auto;
 }
 
+.suggestions-column {
+    margin-top: 78px;
+}
+
 .timestamp {
   font-size: 0.8em;
   color: grey;

bootcamp/templates/articles/article_list.html

@@ -12,15 +12,16 @@
 
     <!-- Page Content -->
     <nav aria-label="breadcrumb">
-      <ol class="breadcrumb">
-        <li class="breadcrumb-item"><a href="{% url 'news:list' %}">{% trans 'Home' %}</a></li>
-        {% if view.kwargs.tag %}
-          <li class="breadcrumb-item"><a href="{% url 'articles:list' %}">{% trans 'Articles' %}</a></li>
-          <li class="breadcrumb-item active"><a href="{% url 'articles:list' %}tag/{{ view.kwargs.tag }}">{{ view.kwargs.tag }}</a></li>
-        {% else %}
-          <li class="breadcrumb-item active"><a href="{% url 'articles:list' %}">{% trans 'Articles' %}</a></li>
-        {% endif %}
-      </ol>
+        <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href="{% url 'news:list' %}">{% trans 'Home' %}</a></li>
+            {% if view.kwargs.tag %}
+                <li class="breadcrumb-item"><a href="{% url 'articles:list' %}">{% trans 'Articles' %}</a></li>
+                <li class="breadcrumb-item active"><a
+                        href="{% url 'articles:list' %}tag/{{ view.kwargs.tag }}">{{ view.kwargs.tag }}</a></li>
+            {% else %}
+                <li class="breadcrumb-item active"><a href="{% url 'articles:list' %}">{% trans 'Articles' %}</a></li>
+            {% endif %}
+        </ol>
     </nav>
     <div class="row">
         <!-- Blog Entries Column -->
@@ -56,7 +57,8 @@ <h4 class="no-data">{% trans 'There is no published article yet' %}. <a
             {% if is_paginated %}
                 <ul class="pagination justify-content-center mb-4">
                     {% if page_obj.has_previous %}
-                        <li class="page-item"><a class="page-link" href="?page={{ page_obj.previous_page_number }}">&larr; {% trans 'Newer' %}</a>
+                        <li class="page-item"><a class="page-link"
+                                                 href="?page={{ page_obj.previous_page_number }}">&larr; {% trans 'Newer' %}</a>
                         </li>
                     {% else %}
                         <li class="page-item disabled"><a class="page-link" href="#"><span>&larr;</span></a></li>
@@ -97,23 +99,25 @@ <h4 class="no-data">{% trans 'There is no published article yet' %}. <a
                 </div>
             {% endif %}
             <!-- Cloud Tag Widget -->
-            <div class="card mb-4">
-              <h5 class="card-header">{% trans 'Cloud tag' %}</h5>
-              <div class="card-body">
-                {% for tag, tag_props in popular_tags %}
-                  {% if tag_props.slug == view.kwargs.tag %}
-                    <a href="{% url 'articles:list' %}">
-                      <span class="badge badge-success">{{ tag_props.count }} {{ tag }} <i class="fa fa-times" aria-hidden="true"></i></span>
-                    </a>
-                  {% else %}
-                    <a href="{% url 'articles:list' %}tag/{{ tag_props.slug }}">
-                      <span class="badge badge-info">{{ tag_props.count }} {{ tag }}</span>
-                    </a>
-                  {% endif %}
-                {% endfor %}
-              </div>
+            <div class="card my-4">
+                <h5 class="card-header">{% trans 'Cloud tag' %}</h5>
+                <div class="card-body">
+                    {% for tag, tag_props in popular_tags %}
+                        {% if tag_props.slug == view.kwargs.tag %}
+                            <a href="{% url 'articles:list' %}">
+                            <span class="badge badge-success">{{ tag_props.count }} {{ tag }} <i class="fa fa-times"
+                                                                                                 aria-hidden="true"></i></span>
+                            </a>
+                        {% else %}
+                            <a href="{% url 'articles:list' %}tag/{{ tag_props.slug }}">
+                                <span class="badge badge-info">{{ tag_props.count }} {{ tag }}</span>
+                            </a>
+                        {% endif %}
+                    {% endfor %}
+                </div>
             </div>
-          </div>
+        </div>
+
     </div>
     <!-- /.row -->
 

bootcamp/templates/messager/message_list.html

@@ -10,7 +10,7 @@
 {% block content %}
 
     <div class="page-header">
-        <h1>{{ request.user.get_profile_name|title }} {% trans 'Conversations' %}</h1>
+        <h1>{% trans 'Messenger' %}</h1>
     </div>
     <div class="row" style="margin-top: 1em">
         <div class="col-md-3 list-group users-list">

bootcamp/templates/news/news_activity.html

@@ -0,0 +1,22 @@
+{% extends 'base.html' %}
+{% load static i18n humanize %}
+{% load thumbnail %}
+
+{% block head %}
+    <link href="{% static 'css/news.css' %}?v=1" rel="stylesheet">
+{% endblock head %}
+
+{% block content %}
+    <div class="page-header">
+        <h1>News</h1>
+    </div>
+    <ul class="stream">
+        {% include 'news/news_single.html' with news=news %}
+    </ul>
+{% endblock content %}
+
+{% block modal %}
+    <script src="{% static 'js/jquery.waypoints.min.js' %}" type="text/javascript"></script>
+    <script src="{% static 'js/infinite.min.js' %}" type="text/javascript"></script>
+    <script src="{% static 'js/news.js' %}" type="text/javascript"></script>
+{% endblock modal %}

bootcamp/templates/news/news_list.html

@@ -11,7 +11,7 @@
 {% block content %}
     <!-- Container -->
     <div class="row">
-        <div class="col-md-6 offset-md-3">
+        <div class="col-md-7 offset-md-1">
             <div class="page-header">
                 <button type="button" class="btn btn-primary pull-right btn-compose" data-toggle="modal"
                         data-target="#newsFormModal">
@@ -49,7 +49,15 @@ <h5 class="card-header">{% trans 'Latest posts' %}</h5>
                     <!-- End News List -->
             </div>
         </div>
-    </div>
+        <div class="col-md-3 suggestions-column">
+            <!-- Ads and Recommendations Widget -->
+            <div class="card mb-4">
+                <h5 class="card-header">{% trans 'Suggestions For You' %}</h5>
+                <div class="card-body mb-4">
+                    <p>Extra content here</p>
+                </div>
+            </div>
+        </div>
     </div>
     <!-- End container -->
 

bootcamp/templates/news/news_single.html

@@ -3,20 +3,31 @@
 {% load thumbnail %}
 {% load urlize_target_blank %}
 
-<li class="infinite-item" news-id="{{ news.uuid_id }}">
+<li class="infinite-item" news-id="{{ news.uuid_id }}" csrf="{{ csrf_token }}">
     <div class="news-body">
         <div class="profile-picture">
-            <img src="{{ news.user.get_picture }}" class="user-image pull-left"
-                 style="width: 60px; border-radius: 50%;"
-                 alt="{% trans 'User Image' %}">
+            <a href="{% url 'users:detail' news.user.username %}">
+                <img src="{{ news.user.get_picture }}" class="user-image pull-left"
+                     style="width: 60px; border-radius: 50%;"
+                     alt="{% trans 'User Image' %}">
+            </a>
         </div>
         <div class="post">
-            {% if news.user == request.user %}
-                <a href="#">
-                    <i class="fa fa-times pull-right remove-news" aria-hidden="true"
-                       title="{% trans 'Click to remove this news' %}"></i>
-                </a>
-            {% endif %}
+            <i class="fa fa-gear pull-right" style="color: #6c757d" href="#" id="dotsDropdown" role="button"
+               data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            </i>
+            <div class="dropdown-menu" aria-labelledby="dotsDropdown">
+                {% if news.user == request.user %}
+                    <a class="dropdown-item remove-news" style="color: red" href="#">
+                        {% trans 'Delete' %}
+                    </a>
+                {% endif %}
+                {% if news.user != request.user %}
+                    <a class="dropdown-item remove-news" href="#">
+                        {% trans 'Report This' %}
+                    </a>
+                {% endif %}
+            </div>
             <h3>
                 <a href="{% url 'users:detail' news.user.username %}">{{ news.user.username }}</a>
                 <small class="timestamp">{{ news.timestamp|naturaltime }}</small>
@@ -54,6 +65,8 @@ <h5 class="card-title">{{ news.meta_title }}</h5>
                 <a href="#" class="comment"><i class="fa fa-comment-o" aria-hidden="true"></i>
                     <span class="comment-count">{{ news.count_thread }}</span>
                 </a>
+                <a href="#" class="share"><i class="fa fa-share" aria-hidden="true"></i>
+                </a>
             </div>
         </div>
     </div>

bootcamp/templates/search/search_results.html

@@ -5,6 +5,9 @@
 {% block title %} {% trans 'Search Results' %} {% endblock %}
 
 {% block head %}
+    <link href="{% static 'css/user_profile.css' %}?v=1" rel="stylesheet">
+    <link href="{% static 'css/news.css' %}?v=1" rel="stylesheet">
+
 {% endblock head %}
 
 {% block content %}

bootcamp/templates/users/user_activity.html

@@ -0,0 +1,7 @@
+<div class="infinite-container" style="margin-top: 20px">
+    <ul class="stream">
+        {% for news in user_activity %}
+            {% include 'news/news_single.html' with news=news %}
+        {% endfor %}
+    </ul>
+</div>

bootcamp/templates/users/user_detail.html

@@ -6,6 +6,8 @@
 
 {% block head %}
     <link href="{% static 'css/user_profile.css' %}?v=1" rel="stylesheet">
+    <link href="{% static 'css/news.css' %}?v=1" rel="stylesheet">
+
 {% endblock head %}
 
 {% block content %}
@@ -49,13 +51,13 @@
 
         <div class="row">
             <div class="col-md-2 user-profile">
-            <img src="{{ object.get_picture }}" class="user-image"
-                                         style="width: 150px; border-radius: 50%;"
-                                         alt="{% trans 'User Image' %}">
+                <img src="{{ object.get_picture }}" class="user-image"
+                     style="width: 150px; border-radius: 50%;"
+                     alt="{% trans 'User Image' %}">
             </div>
-            <div id="contact-info" class="vcard">
-                <h1 class="fn">
-                    {{ object.get_profile_name|title }}
+            <div id="contact-info" class="col-md-7 vcard">
+                <h1 class="page-header">
+                    {{ object.get_profile_name }}
                     {% if object.short_bio %}
                         <br/><small style="font-size: 50%">{{ object.short_bio }}</small>
                     {% endif %}
@@ -97,6 +99,20 @@ <h1 class="fn">
                        title="{% trans 'Facebook Profile' %}"><i
                             class="fa fa-facebook"></i> </a>
                 {% endif %}
+
+                <!-- Nav tabs -->
+                <ul class="nav nav-tabs">
+                    <li class="nav-item">
+                        <a class="nav-link active" data-toggle="tab" href="#user_activity">Activity</a>
+                    </li>
+                </ul>
+
+                <!-- Tab panes -->
+                <div class="tab-content">
+                    <div id="user_activity" class="container tab-pane active"><br>
+                        {% include 'users/user_activity.html' with user_activity=user_activity %}
+                    </div>
+                </div>
             </div>
 
         </div>

bootcamp/users/views.py

@@ -7,14 +7,21 @@
 from django.views.generic import DetailView, ListView, RedirectView, UpdateView
 from django.conf import settings as django_settings
 from .models import User
+from ..news.models import News
 
 
 class UserDetailView(LoginRequiredMixin, DetailView):
     model = User
+    paginate_by = 20
     # These next two lines tell the view to index lookups by username
     slug_field = "username"
     slug_url_kwarg = "username"
 
+    def get_context_data(self, *args, **kwargs):
+        context = super().get_context_data(*args, **kwargs)
+        context['user_activity'] = News.objects.filter(user=context['user'])
+        return context
+
 
 class UserRedirectView(LoginRequiredMixin, RedirectView):
     permanent = False
@@ -92,10 +99,10 @@ def upload_picture(request):
             im.thumbnail(new_size, Image.ANTIALIAS)
             im.save(filename)
 
-        return redirect("/users/picture/?upload_picture=uploaded")
+        return redirect("/picture/?upload_picture=uploaded")
 
     except Exception:
-        return redirect("/users/picture/")
+        return redirect("/picture/")
 
 
 @login_required
@@ -126,4 +133,4 @@ def save_uploaded_picture(request):
     except Exception:
         pass
 
-    return redirect("/users/picture/")
+    return redirect("/picture/")

config/urls.py

@@ -17,7 +17,6 @@
     # Django Admin, use {% url 'admin:index' %}
     url(settings.ADMIN_URL, admin.site.urls),
     # User management
-    url(r"^users/", include("bootcamp.users.urls", namespace="users")),
     url(r"^accounts/", include("allauth.urls")),
     # Third party apps here
     url(r"^comments/", include("django_comments.urls")),
@@ -33,6 +32,7 @@
     url(r"^messages/", include("bootcamp.messager.urls", namespace="messager")),
     url(r"^qa/", include("bootcamp.qa.urls", namespace="qa")),
     url(r"^search/", include("bootcamp.search.urls", namespace="search")),
+    url("", include("bootcamp.users.urls", namespace="users")),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 if settings.DEBUG: