From d4dbdc6478057b66722583ba40bb4b39ac783f1d Mon Sep 17 00:00:00 2001
From: zPlus <zplus@peers.community>
Date: Mon, 23 Jul 2018 13:55:27 +0200
Subject: [PATCH] Fix pagination. 	modified:   freepost/__init__.py 
 modified:   freepost/database.py 	modified:  
 freepost/static/stylus/reset.styl 	modified:  
 freepost/templates/homepage.html 	new file:  
 freepost/templates/posts.html 	modified:   freepost/templates/search.html

---
 freepost/__init__.py              |  35 ++++++-----
 freepost/database.py              |  19 +++---
 freepost/static/stylus/reset.styl |   6 ++
 freepost/templates/homepage.html  |  90 ++-------------------------
 freepost/templates/posts.html     | 100 ++++++++++++++++++++++++++++++
 freepost/templates/search.html    |  87 +++++++-------------------
 6 files changed, 162 insertions(+), 175 deletions(-)
 create mode 100644 freepost/templates/posts.html

diff --git a/freepost/__init__.py b/freepost/__init__.py
index 060df8ce..6b15c499 100755
--- a/freepost/__init__.py
+++ b/freepost/__init__.py
@@ -127,11 +127,7 @@ def homepage ():
     else:
         posts = []
     
-    return template (
-        'homepage.html',
-        page_number=page,
-        posts=posts,
-        sorting=sort)
+    return template ('homepage.html', posts=posts, sort=sort)
 
 # TODO implement this
 @get ('/topic/<name>', name='topic')
@@ -161,9 +157,7 @@ def topic (name):
     return template (
         'homepage.html',
         topic=name,
-        page_number=page,
-        posts=posts,
-        sorting=sort)
+        posts=posts)
 
 @get ('/about', name='about')
 def about ():
@@ -789,17 +783,26 @@ def search ():
     # Get the search query
     query = request.query.get ('q')
     
-    # Results order
-    order = request.query.get ('order')
-    if order not in [ 'newest', 'points' ]:
-        order = 'newest'
+    # Get the offset
+    page = int (request.query.get ('page') or 0)
     
-    results = database.search (query, order=order)
+    if page < 0:
+        return "Page cannot be less than zero."
+    
+    # Page increment
+    if 'next' in request.query:
+        page += 1
+    if 'previous' in request.query:
+        page -= 1
+    
+    # Results order
+    sort = request.query.get ('sort')
+    if sort not in [ 'newest', 'points' ]:
+        sort = 'newest'
     
-    if not results:
-        results = []
+    posts = database.search (query, sort=sort, page=page) or []
     
-    return template ('search.html', results=results, query=query, order=order)
+    return template ('search.html', posts=posts)
 
 @get ('/rss')
 def rss_default ():
diff --git a/freepost/database.py b/freepost/database.py
index f81d8ea5..ed492177 100644
--- a/freepost/database.py
+++ b/freepost/database.py
@@ -589,22 +589,22 @@ def vote_comment (comment_id, user_id, vote):
     )
 
 # Search posts
-def search (query, page = 0, order = 'newest'):
+def search (query, sort='newest', page=0):
     if not query:
-        return None
+        return []
     
     # Remove multiple white spaces and replace with '|' (for query REGEXP)
     query = re.sub (' +', '|', query.strip ())
     
     if len (query) == 0:
-        return None
+        return []
     
     cursor = db.cursor (MySQLdb.cursors.DictCursor)
     
-    if order == 'newest':
-        order = 'P.created DESC'
-    if order == 'points':
-        order = 'P.vote DESC'
+    if sort == 'newest':
+        sort = 'P.created DESC'
+    if sort == 'points':
+        sort = 'P.vote DESC'
     
     cursor.execute (
         """
@@ -612,12 +612,13 @@ def search (query, page = 0, order = 'newest'):
         FROM post AS P
         JOIN user AS U ON P.userId = U.id
         WHERE P.title REGEXP %(query)s
-        ORDER BY {order}
+        ORDER BY {sort}
         LIMIT %(limit)s
         OFFSET %(offset)s
-        """.format (order=order),
+        """.format (sort=sort),
         {
             'query': query,
+            'sort': sort,
             'limit': settings['defaults']['search_results_per_page'],
             'offset': page * settings['defaults']['search_results_per_page']
         }
diff --git a/freepost/static/stylus/reset.styl b/freepost/static/stylus/reset.styl
index cafd0608..a195e69a 100755
--- a/freepost/static/stylus/reset.styl
+++ b/freepost/static/stylus/reset.styl
@@ -127,6 +127,12 @@ label
 textarea.form-control
     height 8rem
 
+.pagination
+    > .page_number
+        font-size .7rem
+        font-weight bold
+        margin    0 1rem
+
 /* When users vote, this <iframe/> is used as target, such that
  * the page is not reloaded
  */
diff --git a/freepost/templates/homepage.html b/freepost/templates/homepage.html
index b150470a..494610eb 100755
--- a/freepost/templates/homepage.html
+++ b/freepost/templates/homepage.html
@@ -1,94 +1,14 @@
-{% from 'vote.html' import vote %}
-
 {% extends 'layout.html' %}
 
 {# Set variables for base layour #}
-{% set active_page = sorting %}
+{% set active_page = sort %}
 {% set title = '' %}
 
 {% block content %}
-    <div class="posts">
-        
-        {# include 'banner.html' #}
-        
-        {% for post in posts %}
-            {% set topics = split_topics (post.topics) %}
-            
-            <div class="post">
-                {# Print the item position number #}
-                <div class="position">
-                    {{ page_number * settings ('defaults', 'items_per_page') + loop.index }}.
-                </div>
-                
-                <div class="info">
-                    <div class="title">
-                        <a href="{{ post.link if post.link and post.link|length > 0 else url ('post', hash_id=post.hashId) }}">
-                            {{ post.title }}
-                            
-                            {# Post content preview #}
-                            {% if post.text %}
-                                <img
-                                    alt=""
-                                    title="{{ post.text|md2txt }}"
-                                    src="{{ url ('static', filename='images/text.svg') }}"
-                                    class="text_preview" />
-                            {% endif %}
-                        </a>
-                        
-                        {# URL hostname #}
-                        {% if post.link %}
-                            <span class="netloc">
-                                {{ post.link|netloc }}
-                            </span>
-                        {% endif %}
-                    </div>
-                    
-                    <div class="topics">
-                        {% for topic in topics %}
-                            <a href="{{ url ('topic', name=topic) }}" class="topic">{{ topic }}</a>
-                        {% endfor %}
-                    </div>
-                    
-                    <div class="about">
-                        {{ vote ('post', post, user) }}
-                        
-                        <em class="username">
-                            <a href="{{ url ('post', hash_id=post.hashId) }}">
-                                <time title="{{ post.created|title }}" datetime="{{ post.created|datetime }}">
-                                    {{ post.created|ago }}
-                                </time>
-                            </a>
-                        </em>
-                        by
-                        <a href="{{ url ('user_public', username=post.username) }}">
-                            {{ post.username }}
-                        </a>
-                        —
-                        <a href="{{ url ('post', hash_id=post.hashId) }}#comments">
-                            {% if post.commentsCount > 0 %}
-                                {{ post.commentsCount }} comments
-                            {% else %}
-                                discuss
-                            {% endif %}
-                        </a>
-                    </div>
-                </div>
-            </div>
-            
-        {% endfor %}
-        
-        <div class="more">
-            {% if page_number > 0 %}
-                <a href="{{ request.urlparts.path if page_number == 1 else '?page=' ~ (page_number - 1) }}" class="button button_default1">
-                    Previous
-                </a>
-            {% endif %}
-            
-            <a href="?page={{ page_number + 1 }}{{ '&sort=' ~ request.query.sort }}" class="button button_default1">
-                Next
-            </a>
-        </div>
-    </div>
+    
+    {# include 'banner.html' #}
+    
+    {% include 'posts.html' %}
 
 
 {% endblock %}
diff --git a/freepost/templates/posts.html b/freepost/templates/posts.html
new file mode 100644
index 00000000..ffe58e84
--- /dev/null
+++ b/freepost/templates/posts.html
@@ -0,0 +1,100 @@
+{% from 'vote.html' import vote %}
+{% set page_number = request.query.page|int or 0 %}
+
+<div class="posts">
+    {% for post in posts %}
+        {% set topics = split_topics (post.topics) %}
+        
+        <div class="post">
+            {# Print the item position number #}
+            <div class="position">
+                {{ page_number * settings ('defaults', 'items_per_page') + loop.index }}.
+            </div>
+            
+            <div class="info">
+                <div class="title">
+                    <a href="{{ post.link if post.link and post.link|length > 0 else url ('post', hash_id=post.hashId) }}">
+                        {{ post.title }}
+                        
+                        {# Post content preview #}
+                        {% if post.text %}
+                            <img
+                                alt=""
+                                title="{{ post.text|md2txt }}"
+                                src="{{ url ('static', filename='images/text.svg') }}"
+                                class="text_preview" />
+                        {% endif %}
+                    </a>
+                    
+                    {# URL hostname #}
+                    {% if post.link %}
+                        <span class="netloc">
+                            {{ post.link|netloc }}
+                        </span>
+                    {% endif %}
+                </div>
+                
+                <div class="topics">
+                    {% for topic in topics %}
+                        <a href="{{ url ('topic', name=topic) }}" class="topic">{{ topic }}</a>
+                    {% endfor %}
+                </div>
+                
+                <div class="about">
+                    {{ vote ('post', post, user) }}
+                    
+                    <em class="username">
+                        <a href="{{ url ('post', hash_id=post.hashId) }}">
+                            <time title="{{ post.created|title }}" datetime="{{ post.created|datetime }}">
+                                {{ post.created|ago }}
+                            </time>
+                        </a>
+                    </em>
+                    by
+                    <a href="{{ url ('user_public', username=post.username) }}">
+                        {{ post.username }}
+                    </a>
+                    —
+                    <a href="{{ url ('post', hash_id=post.hashId) }}#comments">
+                        {% if post.commentsCount > 0 %}
+                            {{ post.commentsCount }} comments
+                        {% else %}
+                            discuss
+                        {% endif %}
+                    </a>
+                </div>
+            </div>
+        </div>
+        
+    {% endfor %}
+    
+    <form class="pagination">
+        {% for key, value in request.query.items () %}
+            <input type="hidden" name="{{ key }}" value="{{ value }}" />
+        {% endfor %}
+        
+        {% if page_number > 0 %}
+            <button type="submit"
+                    name="page"
+                    value="{{ page_number - 1 }}"
+                    class="button button_default1">
+                    Previous
+            </button>
+        {% endif %}
+        
+        {% if page_number > 0 %}
+            <span class="page_number">
+                PAGE: {{ page_number }}
+            </span>
+        {% endif %}
+        
+        {% if posts %}
+            <button type="submit"
+                    name="page"
+                    value="{{ page_number + 1 }}"
+                    class="button button_default1">
+                    Next
+            </button>
+        {% endif %}
+    </form>
+</div>
diff --git a/freepost/templates/search.html b/freepost/templates/search.html
index a849397b..a53f7d31 100755
--- a/freepost/templates/search.html
+++ b/freepost/templates/search.html
@@ -1,3 +1,5 @@
+{% from 'vote.html' import vote %}
+
 {% extends 'layout.html' %}
 
 {# Set variables for base layour #}
@@ -6,71 +8,26 @@
 
 {% block content %}
 
-<div class="search">
-    <form action="/search">
-        <p>
-            <input type="text" name="q" value="{{ query if query else '' }}" placeholder="Search..." required="required" autofocus />
-            <input type="submit" value="Search" />
-        </p>
-        <p>
-            Order by
-            <label>
-                <input type="radio" name="order" value="newest" {{ 'checked' if order == 'newest' }}>
-                Most recent
-            </label>
-            <label>
-                <input type="radio" name="order" value="points" {{ 'checked' if order == 'points' }}>
-                Points
-            </label>
-        </p>
-    </form>
-</div>
-
-<div class="posts">
-    
-    {% for post in results %}
-    
-        <div class="post">
-            <div class="title">
-                {% if post.link and post.link|length > 0 %}
-                    <a href="{{ post.link }}">
-                        {{ post.title }}
-                    </a>
-                {% else %}
-                    <a href="{{ url ('post', hash_id=post.hashId) }}">
-                        {{ post.title }}
-                    </a>
-                {% endif %}
-            </div>
-            
-            <div class="info">
-                <em>
-                    <a href="{{ url ('post', hash_id=post.hashId) }}">
-                        <time title="{{ post.created|title }}" datetime="{{ post.created|datetime }}">
-                            {{ post.created|ago }}
-                        </time>
-                    </a>
-                </em>
-                by
-                <a href="{{ url ('user_public', username=post.username) }}">
-                    {{ post.username }}
-                </a>
-                —
-                <a href="{{ url ('post', hash_id=post.hashId) }}#comments">
-                    {{ post.commentsCount if post.commentsCount else '' }} comments
-                </a>
-            </div>
-        </div>
-        
-    {% endfor %}
-    
-    {# Add once I'll have fulltext search
-    <div class="more">
-        <a href="?page={{ page + 1 }}" class="button button_default1">
-            More
-        </a>
+    <div class="search">
+        <form action="/search">
+            <p>
+                <input type="text" name="q" value="{{ request.query.q or '' }}" placeholder="Search..." required="required" />
+                <input type="submit" value="Search" />
+            </p>
+            <p>
+                Order by
+                <label>
+                    <input type="radio" name="sort" value="newest" {{ 'checked' if not request.query.sort or request.query.sort == 'newest' }}>
+                    Most recent
+                </label>
+                <label>
+                    <input type="radio" name="sort" value="points" {{ 'checked' if request.query.sort == 'points' }}>
+                    Points
+                </label>
+            </p>
+        </form>
     </div>
-    #}
-</div>
+    
+    {% include 'posts.html' %}
 
 {% endblock %}