Search added

5 files changed, 136 insertions, 7 deletions

diff --git a/blog/views.py b/blog/views.py
index 18bf0424..a1e1455b 100644
--- a/blog/views.py
+++ b/blog/views.py
@@ -7,6 +7,8 @@ from datetime import datetime
 from random import choice
 from string import ascii_letters, digits
 
+from datetime import timedelta
+from django.utils import timezone
 import requests
 from bs4 import BeautifulSoup
 from django.contrib import messages
@@ -437,19 +439,70 @@ def search(request):
         'users': User,
         'comments': Comment,
     }
+    now = timezone.now()
 
     if query:
         search_results = SearchQuerySet().filter(content=query)
         if search_in:
             search_results = search_results.models(*[search_model_map[model] for model in search_in])
 
-        search_results = [result.object for result in search_results]
+        # search_results = [result.object for result in search_results]
+        posts = [result.object for result in search_results if isinstance(result.object, Post)]
+        users = [result.object for result in search_results if isinstance(result.object, User)]
+        comments = [result.object for result in search_results if isinstance(result.object, Comment)]
+
+        # match-case sort_by
+        if sort_by == 'relevance' and order == 'ascending':
+            posts = sorted(posts, key=lambda post: post.views)
+            users = sorted(users, key=lambda user: user.username)
+            comments = sorted(comments, key=lambda comment: comment.id)
+        elif sort_by == 'relevance' and order == 'descending':
+            posts = sorted(posts, key=lambda post: post.views, reverse=True)
+            users = sorted(users, key=lambda user: user.username, reverse=True)
+            comments = sorted(comments, key=lambda comment: comment.id, reverse=True)
+        elif sort_by == 'date' and order == 'ascending':
+            posts = sorted(posts, key=lambda post: post.date)
+            users = sorted(users, key=lambda user: user.date_joined)
+            comments = sorted(comments, key=lambda comment: comment.created_at)
+        elif sort_by == 'date' and order == 'descending':
+            posts = sorted(posts, key=lambda post: post.date, reverse=True)
+            users = sorted(users, key=lambda user: user.date_joined, reverse=True)
+            comments = sorted(comments, key=lambda comment: comment.created_at, reverse=True)
+
+        # filter by date_range
+        if date_range == 'past_day':
+            posts = [post for post in posts if post.date >= now - timedelta(days=1)]
+            users = [user for user in users if user.date_joined >= now - timedelta(days=1)]
+            comments = [comment for comment in comments if comment.created_at >= now - timedelta(days=1)]
+        elif date_range == 'past_week':
+            posts = [post for post in posts if post.date >= now - timedelta(days=7)]
+            users = [user for user in users if user.date_joined >= now - timedelta(days=7)]
+            comments = [comment for comment in comments if comment.created_at >= now - timedelta(days=7)]
+        elif date_range == 'past_month':
+            posts = [post for post in posts if post.date >= now - timedelta(days=30)]
+            users = [user for user in users if user.date_joined >= now - timedelta(days=30)]
+            comments = [comment for comment in comments if comment.created_at >= now - timedelta(days=30)]
+        elif date_range == 'past_year':
+            posts = [post for post in posts if post.date >= now - timedelta(days=365)]
+            users = [user for user in users if user.date_joined >= now - timedelta(days=365)]
+            comments = [comment for comment in comments if comment.created_at >= now - timedelta(days=365)]
+        elif date_range == 'any':
+            # no need to filter
+            pass
+            
+        search_results = len(posts) + len(users) + len(comments)
     else:
-        search_results = None
+        search_results = 0
+
+    # attach user profiles
+    for user in users:
+        user.profile = UserProfile.objects.get(user=user)
 
-    print(search_results)
+    # parse comments
+    for comment in comments:
+        comment.body = comment_processor(comment.body)
 
-    return render(request, 'blog/search.html', {'title': f"Search results for '{query}'", 'query': query, 'search_results': search_results, 'search_in': search_in, 'sort_by': sort_by, 'order': order, 'date_range': date_range})
+    return render(request, 'blog/search.html', {'title': f"Search results for '{query}'", 'query': query, 'search_results': search_results, 'search_in': search_in, 'sort_by': sort_by, 'order': order, 'date_range': date_range, 'posts': posts, 'users': users, 'comments': comments})
 
 def articles(request, date=None, cg=None):
     type = 'articles'
diff --git a/templates/blog/partials/search/comment_list.html b/templates/blog/partials/search/comment_list.html
new file mode 100644
index 00000000..d45896bb
--- /dev/null
+++ b/templates/blog/partials/search/comment_list.html
@@ -0,0 +1,9 @@
+{% load static %}
+<ul style="list-style: none; padding: 0px; margin: 0px;">
+{% for comment in comments  %}
+    <li style="background: #1c1c1c;padding: 10px; margin-bottom: 10px;border-radius: 8px;">
+        <p><a class="notranslate" {% if comment.user%}href="{% url 'blog:user_activity' comment.user.username %}"{% endif %}>{% if comment.user %}{{ comment.user.username }}{% else %}{{ comment.anonymous_user.name }}{% endif %}</a> commented on <a href="{% url 'blog:post' comment.post.slug %}#comment-{{ comment.id }}">{{ comment.post.title }}</a> on <em>{{ comment.created_at | date:"M d, Y" }}</em>:
+            <blockquote style="background: none; margin-top: 15px; padding: 0px 20px; margin-left: 20px;">{{ comment.body|safe }}</blockquote></p>
+    </li>
+{% endfor %}
+</ul>
diff --git a/templates/blog/partials/search/post_list.html b/templates/blog/partials/search/post_list.html
new file mode 100644
index 00000000..811c417e
--- /dev/null
+++ b/templates/blog/partials/search/post_list.html
@@ -0,0 +1,23 @@
+{% load tz %}
+{% load static %}
+{% for post in posts %}
+    {% comment %} This is the plain small version for search list {% endcomment %}
+    <h1 style="font-size: 16px; margin: 0 0 4px 0;">
+        <a style="color: #f4ebff;" href="{% url 'blog:post' post.slug %}">{{ post.title }}</a>
+    </h1>
+    <p>Posted by <a href="{% url 'blog:user_activity' post.author %}">{{ post.author.first_name }} {{ post.author.last_name }}</a> in <a href="{% url 'blog:categories' %}/{{ post.category.slug }}">{{ post.category }}</a> on {% localtime on %}{{ post.date | date:"M d, Y" }}{% endlocaltime %}</p>
+    <img style="width: 150px; height: auto; float: left; margin: 0 8px 8px 0;" src="{% url 'ignis:post_image' '150' post.id %}.gif">
+    <div style="margin: -4px 0 8px 0;">
+        {{ post.body|truncatewords:150|safe }}
+    </div>
+    <div style="clear: both; border-top: 1px dashed #fff;"></div>
+    <p><b>Tags:</b> 
+        {% for tag in post.tags.all %}
+            <a class="tag" href="{% url 'blog:tag_posts' tag.slug %}">{{ tag.name }}</a>
+        {% endfor %}
+    </p>
+    <p>
+        <a href="{% url 'blog:post' post.slug %}">Read complete post...</a>
+    </p>
+    <br>
+{% endfor %}
\ No newline at end of file
diff --git a/templates/blog/partials/search/user_list.html b/templates/blog/partials/search/user_list.html
new file mode 100644
index 00000000..3493508c
--- /dev/null
+++ b/templates/blog/partials/search/user_list.html
@@ -0,0 +1,13 @@
+{% load static %}
+{% for user in users  %}
+<div class="user_info" style="border: 1px solid #ccc; padding: 10px; margin-bottom: 10px;">
+    <img src="{% static 'images/avatars/' %}{{ user.profile.avatar_url }}.gif" alt="Profile Picture" style="width: 50px; border-radius: 50%; float: left; margin-right: 10px; margin-top: 5px;">
+    <div>
+        <p><a href="{% url 'blog:user_activity' user.username %}">@{{ user.username }}</a> {% if user.first_name %}| <a href="{% url 'blog:user_activity' user.username %}">{{ user.first_name }}{% endif %} {% if user.last_name %}{{ user.last_name }}{% endif %}</a></p>
+        {% if user.profile.bio %}
+            <p><b>Bio:</b> {{ user.profile.bio }}</p>
+        {% endif %}
+    </div>
+    <div style="clear: both;"></div>
+</div>
+{% endfor %}
\ No newline at end of file
diff --git a/templates/blog/search.html b/templates/blog/search.html
index a709ccb0..d5bf9812 100644
--- a/templates/blog/search.html
+++ b/templates/blog/search.html
@@ -14,7 +14,7 @@
                     <h2 class="mtsbitem">Sort By</h2>
                     <input type="radio" name="sort_by" value="relevance" {% if sort_by == 'relevance' %}checked{% endif %} style="margin: 5px 10px 5px 0px; vertical-align: middle;"/><label for="sort_by" style="vertical-align: middle;">Relevance</label><br>
                     <input type="radio" name="sort_by" value="date" {% if sort_by == 'date' %}checked{% endif %} style="margin: 5px 10px 5px 0px; vertical-align: middle;"/><label for="sort_by" style="vertical-align: middle;">Date</label><br>
-                    <input type="radio" name="sort_by" value="popularity" {% if sort_by == 'popularity' %}checked{% endif %} style="margin: 5px 10px 5px 0px; vertical-align: middle;"/><label for="sort_by" style="vertical-align: middle;">Popularity</label><br>
+                    {% comment %} <input type="radio" name="sort_by" value="popularity" {% if sort_by == 'popularity' %}checked{% endif %} style="margin: 5px 10px 5px 0px; vertical-align: middle;"/><label for="sort_by" style="vertical-align: middle;">Popularity</label><br> {% endcomment %}
                     <h2 class="mtsbitem">Order</h2>
                     <input type="radio" name="order" value="ascending" {% if order == 'ascending' %}checked{% endif %} style="margin: 5px 10px 5px 0px; vertical-align: middle;"/><label for="order" style="vertical-align: middle;">Ascending</label><br>
                     <input type="radio" name="order" value="descending" {% if order == 'descending' %}checked{% endif %} style="margin: 5px 10px 5px 0px; vertical-align: middle;"/><label for="order" style="vertical-align: middle;">Descending</label><br>
@@ -29,9 +29,40 @@
             </td>
             <td id="search_results" style="width: 530px; vertical-align: top; padding-left: 20px;">
                 <h2>Search Results</h2>
-                <p>Sorry, this feature is under construction, and will be available soon.</p>
-                <p>In case, you were curious, your query returned {{ search_results|length }} results.</p>
+                <p style="margin-bottom: 20px;">Your search for "<strong>{{ request.GET.q }}</strong>" returned {{ search_results }} Result{% if search_results != 1 %}s{% endif %}.</p>
+
+                {% if 'posts' in search_in %}
+                    <h2 style="background: #311b4f; margin: 0 0 10px 0; border: dotted 1px white; padding: 5px;">Posts</h2>
+                    {% if posts|length != 0 %}
+                        {% include 'blog/partials/search/post_list.html' %}
+                    {% else %}
+                        <p>No posts found.</p>
+                    {% endif %}
+
+                {% endif %}
+
+                {% if 'users' in search_in %}
+                    <h2 style="background: #311b4f; margin: 0 0 10px 0; border: dotted 1px white; padding: 5px;">Users</h2>
+                    {% if users|length != 0 %}
+                        {% include 'blog/partials/search/user_list.html' %}
+                    {% else %}
+                        <p>No users found.</p>
+                    {% endif %}
+                {% endif %}
+
+                {% if 'comments' in search_in %}
+                    <h2 style="background: #311b4f; margin: 0 0 10px 0; border: dotted 1px white; padding: 5px;">Comments</h2>
+                    {% if comments|length != 0 %}
+                        {% include 'blog/partials/search/comment_list.html' %}
+                    {% else %}
+                        <p>No comments found.</p>
+                    {% endif %}
+                {% endif %}
+
             </td>
         </tr>
     </table>
 {% endblock %}
+{% block scripts %}
+{% include 'blog/partials/mathjax.html' %}
+{% endblock %}
\ No newline at end of file