kate/Tweeder
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Search bar for hashtags in navigation bar

Browse source
This commit is contained in:
Socks 2018-04-05 04:17:09 +01:00
parent b33e43cb00
commit 168a7b62b3
2 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Tweeder.py
View file

@ -323,14 +323,19 @@ def messaging(user):
return redirect(request.referrer) return redirect(request.referrer)
@app.route('/tag', methods=['POST'])
@app.route('/tag/<tagname>', methods=['GET']) @app.route('/tag/<tagname>', methods=['GET'])
def findtag(tagname): def findtag(tagname=None):
logged_in = session['username'] if ('username' in session.keys()) else False logged_in = session['username'] if ('username' in session.keys()) else False
if request.method == 'GET':
return render_template('timeline.html', return render_template('timeline.html',
title=str("#" + tagname), title=str("#" + tagname),
logged_in=logged_in, logged_in=logged_in,
posts=timeline.find_posts_by_hashtag(tagname), posts=timeline.find_posts_by_hashtag(tagname),
theme=accounts.get_theme(logged_in)) theme=accounts.get_theme(logged_in))
elif request.method == 'POST':
return redirect('/tag/'+request.form['tagname'])
@app.route('/pin/<post_id>', methods=['GET']) @app.route('/pin/<post_id>', methods=['GET'])

16
templates/layout.html
View file

@ -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 %} {% 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> </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"> <ul class="nav navbar-nav navbar-right">
{% 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 {% 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> <li class="nav-item"><a href="/logout" class="nav-link"><i class="far fa-sign-out"></i> Log out</a></li>
</ul>
{% else %} {% else %}
<ul class="nav navbar-nav navbar-right">
<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="/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> <li class="nav-item"><a href="/register" class="nav-link"><i class="far fa-user-plus"></i> Sign up</a></li>
</ul>
{% endif %} {% endif %}
</div> </div>