From 168a7b62b31134b90293a164c76e783279e20cf2 Mon Sep 17 00:00:00 2001
From: Socks <me@sockspls.com>
Date: Thu, 5 Apr 2018 04:17:09 +0100
Subject: [PATCH] Search bar for hashtags in navigation bar

---
 Tweeder.py            | 17 +++++++++++------
 templates/layout.html | 20 ++++++++++++++------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/Tweeder.py b/Tweeder.py
index b7cbe56..7a8f10f 100644
--- a/Tweeder.py
+++ b/Tweeder.py
@@ -323,14 +323,19 @@ def messaging(user):
         return redirect(request.referrer)
 
 
+@app.route('/tag', methods=['POST'])
 @app.route('/tag/<tagname>', methods=['GET'])
-def findtag(tagname):
+def findtag(tagname=None):
     logged_in = session['username'] if ('username' in session.keys()) else False
-    return render_template('timeline.html',
-                           title=str("#" + tagname),
-                           logged_in=logged_in,
-                           posts=timeline.find_posts_by_hashtag(tagname),
-                           theme=accounts.get_theme(logged_in))
+
+    if request.method == 'GET':
+        return render_template('timeline.html',
+                               title=str("#" + tagname),
+                               logged_in=logged_in,
+                               posts=timeline.find_posts_by_hashtag(tagname),
+                               theme=accounts.get_theme(logged_in))
+    elif request.method == 'POST':
+        return redirect('/tag/'+request.form['tagname'])
 
 
 @app.route('/pin/<post_id>', methods=['GET'])
diff --git a/templates/layout.html b/templates/layout.html
index 545a6b0..345bae2 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -32,16 +32,24 @@
                     {% if logged_in %}<li class="nav-item"><a href="#" data-toggle="modal" data-target="#newPost" class="nav-link"><i class="fas fa-pencil"></i> New Post</a></li>{% endif %}
                 </ul>
 
-                {% if logged_in %}
+                    <form class="navbar-form navbar-right" action="/tag" method="POST">
+                        <div class="col-auto">
+                            <label class="sr-only" for="inlineFormInputGroup">Search Hashtag</label>
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <div class="input-group-text">#</div>
+                                </div>
+                                <input type="text" class="form-control" name='tagname' id="inlineFormInputGroup" placeholder="socks">
+                            </div>
+                        </div>
+                    </form>
                     <ul class="nav navbar-nav navbar-right">
-                <li class="nav-item {% block nav_settings %}{% endblock %}"><a href="/settings" class="nav-link"><i class="far fa-cog"></i> Settings</a></li>
+                    {% if logged_in %}
+                        <li class="nav-item {% block nav_settings %}{% endblock %}"><a href="/settings" class="nav-link"><i class="far fa-cog"></i> Settings</a></li>
                         <li class="nav-item"><a href="/logout" class="nav-link"><i class="far fa-sign-out"></i> Log out</a></li>
-                    </ul>
-                {% else %}
-                    <ul class="nav navbar-nav navbar-right">
+                    {% else %}
                         <li class="nav-item"><a href="/login" class="nav-link"><i class="far fa-sign-in"></i> Log in</a></li>
                         <li class="nav-item"><a href="/register" class="nav-link"><i class="far fa-user-plus"></i> Sign up</a></li>
-                    </ul>
                 {% endif %}
             </div>