jeena/woodwind
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

report non-fatal login errors

Browse source
This commit is contained in:
Kyle Mahan 2015-02-02 09:05:54 -08:00
parent 4a59ca58c7
commit 0dac28a62b
2 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

34
woodwind/templates/feed.jinja2
View file

@ -37,24 +37,26 @@
<footer> <footer>
<a href="{{ entry.permalink }}">{{ entry.published }}</a> <a href="{{ entry.permalink }}">{{ entry.published }}</a>
<form class="like-form" action="{{ current_user.micropub_endpoint }}" method="POST" style="display:inline"> {% if current_user.micropub_endpoint %}
<input type="hidden" name="access_token" value="{{current_user.access_token}}"/> <form class="like-form" action="{{ current_user.micropub_endpoint }}" method="POST" style="display:inline">
<input type="hidden" name="h" value="entry"/> <input type="hidden" name="access_token" value="{{current_user.access_token}}"/>
<input type="hidden" name="like-of" value="{{ entry.permalink }}"/> <input type="hidden" name="h" value="entry"/>
<button type="submit" class="like-button">Like</button> <input type="hidden" name="like-of" value="{{ entry.permalink }}"/>
<span class="submit-response"></span> <button type="submit" class="like-button">Like</button>
</form> <span class="submit-response"></span>
</form>
<button class="show-reply-form">Reply</button> <button class="show-reply-form">Reply</button>
<form class="reply-form" action="{{ current_user.micropub_endpoint }}" method="POST"> <form class="reply-form" action="{{ current_user.micropub_endpoint }}" method="POST">
<input type="hidden" name="access_token" value="{{current_user.access_token}}"/> <input type="hidden" name="access_token" value="{{current_user.access_token}}"/>
<input type="hidden" name="h" value="entry"/> <input type="hidden" name="h" value="entry"/>
<input type="hidden" name="in-reply-to" value="{{ entry.permalink }}"/> <input type="hidden" name="in-reply-to" value="{{ entry.permalink }}"/>
<textarea name="content"></textarea> <textarea name="content"></textarea>
<button type="submit" class="reply-button">Reply</button> <button type="submit" class="reply-button">Reply</button>
<span class="submit-response"></span> <span class="submit-response"></span>
</form> </form>
{% endif %}
</footer> </footer>
</article> </article>

13
woodwind/views.py
View file

@ -16,15 +16,15 @@ views = flask.Blueprint('views', __name__)
@views.route('/') @views.route('/')
def index(): def index():
page = int(flask.request.args.get('page', 1)) page = int(flask.request.args.get('page', 1))
entries = []
if flask_login.current_user.is_authenticated(): if flask_login.current_user.is_authenticated():
per_page = flask.current_app.config.get('PER_PAGE', 30) per_page = flask.current_app.config.get('PER_PAGE', 30)
offset = (page - 1) * per_page offset = (page - 1) * per_page
feed_ids = set(f.id for f in flask_login.current_user.feeds) feed_ids = set(f.id for f in flask_login.current_user.feeds)
entries = Entry.query.filter(Entry.feed_id.in_(feed_ids))\ if feed_ids:
.order_by(Entry.published.desc())\ entries = Entry.query.filter(Entry.feed_id.in_(feed_ids))\
.offset(offset).limit(per_page).all() .order_by(Entry.published.desc())\
else: .offset(offset).limit(per_page).all()
entries = []
return flask.render_template('feed.jinja2', entries=entries, page=page) return flask.render_template('feed.jinja2', entries=entries, page=page)
@ -92,6 +92,9 @@ def login_callback(resp):
flask.flash('Login error: ' + resp.error) flask.flash('Login error: ' + resp.error)
return flask.redirect(flask.url_for('.login')) return flask.redirect(flask.url_for('.login'))
if resp.error:
flask.flash('Warning: ' + resp.error)
domain = urllib.parse.urlparse(resp.me).netloc domain = urllib.parse.urlparse(resp.me).netloc
user = load_user(domain) user = load_user(domain)
if not user: if not user: