Improve the application for better user experience.

programmingwithmohammed · programmingwithmohammed · commit dfc37e305075 · 2022-02-22T12:34:06.000Z
diff --git a/db.sqlite3 b/db.sqlite3
diff --git a/templates/base.html b/templates/base.html
@@ -1,10 +1,18 @@
 <!DOCTYPE html>
+<html lang="en">
 {% load static %}
 <html>
    <head>
       <meta charset="utf-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1">
+
       <title>{% block title %}Web Chat Boards{% endblock %}</title>
+
+      <meta name="description" content="A django Basic to Advanced Tutorial projects.">
+      <meta name="Mohammed" content="django tutorial">
+
       <link rel="stylesheet" href="{% static 'css/bootstrap.min.css' %}">
+
       {% block stylesheet %}{% endblock %}
    </head>
    <body>
diff --git a/templates/chat_board_topics.html b/templates/chat_board_topics.html
@@ -18,7 +18,7 @@
   <a href="{% url 'new_board_topic' chat_board.pk %}" class="btn btn-primary">New topic</a>
 </div>
 
-<table class="table mb-4">
+<table class="table table-striped mb-4">
     <thead class="thead-inverse">
       <tr>
         <th>Topic</th>
@@ -30,13 +30,29 @@
     </thead>
     <tbody>
       {% for topic in topics %}
+          {% url 'topic_posts' chat_board.pk topic.pk as topic_url %}
         <tr>
-          <td><a href="{% url 'topic_posts' chat_board.pk topic.pk %}">{{ topic.subject }}</td>
-          <td>{{ topic.boardStarter.username }}</td>
-          <td>{{ topic.replies }}</td>
-          <td>{{ topic.views }}</td>
-          <td>{{ topic.lastUpdate|naturaltime }}</td>
+            <td>
+                <p class="mb-0">
+                    <a href="{{ topic_url }}">{{ topic.subject }}</a>
+                </p>
+                <small class="text-muted">
+                    Pages:
+                    {% for i in topic.get_page_range %}
+                        <a href="{{ topic_url }}?page={{ i }}">{{ i }}</a>
+                    {% endfor %}
+                    {% if topic.has_many_pages %}
+                    ... <a href="{{ topic_url }}?page={{ topic.get_page_count }}">Last Page</a>
+                    {% endif %}
+                </small>
+            </td>
+            <td>{{ topic.boardStarter.username }}</td>
+            <td>{{ topic.replies }}</td>
+            <td>{{ topic.views }}</td>
+            <td>{{ topic.lastUpdate|naturaltime }}</td>
         </tr>
+
+
       {% endfor %}
     </tbody>
   </table>
diff --git a/templates/includes/pagination.html b/templates/includes/pagination.html
@@ -1,6 +1,16 @@
 {% if is_paginated %}
   <nav aria-label="Topics pagination" class="mb-4">
     <ul class="pagination">
+      {% if page_obj.number > 1 %}
+        <li class="page-item">
+          <a class="page-link" href="?page=1">First</a>
+        </li>
+      {% else %}
+        <li class="page-item disabled">
+          <span class="page-link">First</span>
+        </li>
+      {% endif %}
+
       {% if page_obj.has_previous %}
         <li class="page-item">
           <a class="page-link" href="?page={{ page_obj.previous_page_number }}">Previous</a>
@@ -19,7 +29,7 @@
               <span class="sr-only">(current)</span>
             </span>
           </li>
-        {% else %}
+        {% elif page_num > page_obj.number|add:'-3' and page_num < page_obj.number|add:'3' %}
           <li class="page-item">
             <a class="page-link" href="?page={{ page_num }}">{{ page_num }}</a>
           </li>
@@ -35,6 +45,16 @@
           <span class="page-link">Next</span>
         </li>
       {% endif %}
+
+      {% if page_obj.number != paginator.num_pages %}
+        <li class="page-item">
+          <a class="page-link" href="?page={{ paginator.num_pages }}">Last</a>
+        </li>
+      {% else %}
+        <li class="page-item disabled">
+          <span class="page-link">Last</span>
+        </li>
+      {% endif %}
     </ul>
   </nav>
 {% endif %}
diff --git a/templates/reply_topic.html b/templates/reply_topic.html
@@ -32,7 +32,7 @@
     <button type="submit" class="btn btn-success">Post a reply</button>
   </form>
 
-  {% for post in topic.posts.all %}
+  {% for post in topic.get_last_five_posts %}
     <div class="card mb-2">
       <div class="card-body p-3">
         <div class="row mb-3">
diff --git a/templates/topic_posts.html b/templates/topic_posts.html
@@ -30,7 +30,7 @@
 
 
   {% for post in posts %}
-  <div class="card mb-2 {% if forloop.first %} border-dark{% endif %}">
+  <div id="{{ post.pk }}" class="card {% if forloop.last %}mb-4{% else %}mb-2{% endif %} {% if forloop.first %} border-dark{% endif %}">
       {% if forloop.first %}
           <div class="card-header text-white bg-dark py-2 px-3">{{ topic.subject}}</div>
       {% endif %}
diff --git a/webchat/__pycache__/models.cpython-39.pyc b/webchat/__pycache__/models.cpython-39.pyc
diff --git a/webchat/__pycache__/views.cpython-39.pyc b/webchat/__pycache__/views.cpython-39.pyc
diff --git a/webchat/models.py b/webchat/models.py
@@ -4,6 +4,7 @@
 from django.utils.text import Truncator
 from markdown import markdown
 from django.utils.html import mark_safe
+import math
 
 class ChatBoard(models.Model):
     name = models.CharField(max_length = 35, unique = True)
@@ -30,6 +31,27 @@ class ChatTopic(models.Model):
     def __str__(self):
         return self.subject
 
+    def get_page_count(self):
+        count = self.posts.count()
+        pages = count / 15
+        return math.ceil(pages)
+
+    def has_many_pages(self, count = None):
+        if count is None:
+            count = self.get_page_count()
+        return count > 6
+
+    def get_page_range(self):
+        count = self.get_page_count()
+        if self.has_many_pages(count):
+            return range(1,5)
+        return range(1, count + 1)
+
+    def get_last_five_posts(self):
+        return self.posts.order_by('createdAt')[:5]
+
+
+
 class Post(models.Model):
     message = models.TextField(max_length = 5000)
     topic = models.ForeignKey(ChatTopic, related_name = 'posts',on_delete=models.CASCADE)
diff --git a/webchat/views.py b/webchat/views.py
@@ -18,6 +18,7 @@
 from django.core.paginator import PageNotAnInteger
 from django.views.generic import ListView
 from django.urls import reverse_lazy
+from django.urls import reverse
 
 
 #function based view home- FBC
@@ -57,7 +58,7 @@ class TopicListView(ListView):
     model = ChatTopic
     context_object_name = 'topics'
     template_name = 'chat_board_topics.html'
-    paginate_by = 20
+    paginate_by = 10
 
     def get_context_data(self, **kwargs):
         kwargs['chat_board'] = self.chat_board
@@ -108,8 +109,13 @@ class PostListView(ListView):
     paginate_by = 3
 
     def get_context_data(self, **kwargs):
-        self.topic.views += 1
-        self.topic.save()
+
+        session_key = 'viewd_topic_{}'.format(self.topic.pk)
+        if not self.request.session.get(session_key, False):
+            self.topic.views += 1
+            self.topic.save()
+            self.request.session[session_key] = True
+
         kwargs['topic'] = self.topic
         return super().get_context_data(**kwargs)
 
@@ -128,7 +134,18 @@ def reply_topic(request, pk, topic_pk):
             post.topic = topic
             post.createdBy = request.user
             post.save()
-            return redirect('topic_posts', pk=pk, topic_pk=topic_pk)
+
+            topic.lastUpdate = timezone.now()
+            topic.save()
+
+            topic_url = reverse('topic_posts', kwargs={'pk':pk, 'topic_pk':topic_pk})
+            topic_post_url = '{url}?page={page}#{id}'.format(
+                url=topic_url,
+                id=post.pk,
+                page=topic.get_page_count()
+                )
+
+            return redirect(topic_post_url)
     else:
         form = PostForm()
     return render(request,'reply_topic.html', {'topic':topic, 'form':form})
