From d578133bd1d539e229f25efedbec1efb85245686 Mon Sep 17 00:00:00 2001 From: Miguel Grinberg Date: Tue, 18 Jul 2017 07:55:26 -0700 Subject: [PATCH] Chapter 10: User profiles (10a) --- app/auth/views.py | 13 +++---- app/main/views.py | 9 ++++- app/models.py | 10 ++++++ app/templates/base.html | 3 ++ app/templates/user.html | 22 ++++++++++++ .../versions/d66f086b258_user_information.py | 34 +++++++++++++++++++ tests/test_user_model.py | 19 +++++++++++ 7 files changed, 103 insertions(+), 7 deletions(-) create mode 100644 app/templates/user.html create mode 100644 migrations/versions/d66f086b258_user_information.py diff --git a/app/auth/views.py b/app/auth/views.py index f4a8aa487..7ddd75ea2 100644 --- a/app/auth/views.py +++ b/app/auth/views.py @@ -11,12 +11,13 @@ @auth.before_app_request def before_request(): - if current_user.is_authenticated \ - and not current_user.confirmed \ - and request.endpoint \ - and request.blueprint != 'auth' \ - and request.endpoint != 'static': - return redirect(url_for('auth.unconfirmed')) + if current_user.is_authenticated: + current_user.ping() + if not current_user.confirmed \ + and request.endpoint \ + and request.blueprint != 'auth' \ + and request.endpoint != 'static': + return redirect(url_for('auth.unconfirmed')) @auth.route('/unconfirmed') diff --git a/app/main/views.py b/app/main/views.py index c8520dea6..607def452 100644 --- a/app/main/views.py +++ b/app/main/views.py @@ -1,7 +1,14 @@ -from flask import render_template +from flask import render_template, abort from . import main +from ..models import User @main.route('/') def index(): return render_template('index.html') + + +@main.route('/user/') +def user(username): + user = User.query.filter_by(username=username).first_or_404() + return render_template('user.html', user=user) diff --git a/app/models.py b/app/models.py index c00a213eb..58b719286 100644 --- a/app/models.py +++ b/app/models.py @@ -1,3 +1,4 @@ +from datetime import datetime from werkzeug.security import generate_password_hash, check_password_hash from itsdangerous import TimedJSONWebSignatureSerializer as Serializer from flask import current_app @@ -74,6 +75,11 @@ class User(UserMixin, db.Model): role_id = db.Column(db.Integer, db.ForeignKey('roles.id')) password_hash = db.Column(db.String(128)) confirmed = db.Column(db.Boolean, default=False) + name = db.Column(db.String(64)) + location = db.Column(db.String(64)) + about_me = db.Column(db.Text()) + member_since = db.Column(db.DateTime(), default=datetime.utcnow) + last_seen = db.Column(db.DateTime(), default=datetime.utcnow) def __init__(self, **kwargs): super(User, self).__init__(**kwargs) @@ -156,6 +162,10 @@ def can(self, perm): def is_administrator(self): return self.can(Permission.ADMIN) + def ping(self): + self.last_seen = datetime.utcnow() + db.session.add(self) + def __repr__(self): return '' % self.username diff --git a/app/templates/base.html b/app/templates/base.html index 1ab3e54cd..3d32dabc6 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -23,6 +23,9 @@
  • Home
    • + {% if current_user.is_authenticated %} +
  • Profile
    • + {% endif %}
    {% if current_user.is_authenticated %} diff --git a/app/templates/user.html b/app/templates/user.html new file mode 100644 index 000000000..fbe2b216c --- /dev/null +++ b/app/templates/user.html @@ -0,0 +1,22 @@ +{% extends "base.html" %} + +{% block title %}Flasky - {{ user.username }}{% endblock %} + +{% block page_content %} +
    +

    {{ user.username }}

    + {% if user.name or user.location %} +

    + {% if user.name %}{{ user.name }}{% endif %} + {% if user.location %} + from {{ user.location }} + {% endif %} +

    + {% endif %} + {% if current_user.is_administrator() %} +

    {{ user.email }}

    + {% endif %} + {% if user.about_me %}

    {{ user.about_me }}

    {% endif %} +

    Member since {{ moment(user.member_since).format('L') }}. Last seen {{ moment(user.last_seen).fromNow() }}.

    +
    +{% endblock %} \ No newline at end of file diff --git a/migrations/versions/d66f086b258_user_information.py b/migrations/versions/d66f086b258_user_information.py new file mode 100644 index 000000000..6ff6c05e0 --- /dev/null +++ b/migrations/versions/d66f086b258_user_information.py @@ -0,0 +1,34 @@ +"""user information + +Revision ID: d66f086b258 +Revises: 56ed7d33de8d +Create Date: 2013-12-29 23:50:49.566954 + +""" + +# revision identifiers, used by Alembic. +revision = 'd66f086b258' +down_revision = '56ed7d33de8d' + +from alembic import op +import sqlalchemy as sa + + +def upgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.add_column('users', sa.Column('about_me', sa.Text(), nullable=True)) + op.add_column('users', sa.Column('last_seen', sa.DateTime(), nullable=True)) + op.add_column('users', sa.Column('location', sa.String(length=64), nullable=True)) + op.add_column('users', sa.Column('member_since', sa.DateTime(), nullable=True)) + op.add_column('users', sa.Column('name', sa.String(length=64), nullable=True)) + ### end Alembic commands ### + + +def downgrade(): + ### commands auto generated by Alembic - please adjust! ### + op.drop_column('users', 'name') + op.drop_column('users', 'member_since') + op.drop_column('users', 'location') + op.drop_column('users', 'last_seen') + op.drop_column('users', 'about_me') + ### end Alembic commands ### diff --git a/tests/test_user_model.py b/tests/test_user_model.py index 89aa5c9a4..5b566538e 100644 --- a/tests/test_user_model.py +++ b/tests/test_user_model.py @@ -1,5 +1,6 @@ import unittest import time +from datetime import datetime from app import create_app, db from app.models import User, AnonymousUser, Role, Permission @@ -137,3 +138,21 @@ def test_anonymous_user(self): self.assertFalse(u.can(Permission.WRITE)) self.assertFalse(u.can(Permission.MODERATE)) self.assertFalse(u.can(Permission.ADMIN)) + + def test_timestamps(self): + u = User(password='cat') + db.session.add(u) + db.session.commit() + self.assertTrue( + (datetime.utcnow() - u.member_since).total_seconds() < 3) + self.assertTrue( + (datetime.utcnow() - u.last_seen).total_seconds() < 3) + + def test_ping(self): + u = User(password='cat') + db.session.add(u) + db.session.commit() + time.sleep(2) + last_seen_before = u.last_seen + u.ping() + self.assertTrue(u.last_seen > last_seen_before)