Basic profile page.

Michael Zhang · Michael Zhang · commit ccec004e866b · 2016-08-31T23:48:29.000-05:00
diff --git a/migrations/versions/d25be15cb75d_.py b/migrations/versions/d25be15cb75d_.py
@@ -0,0 +1,26 @@
+"""empty message
+
+Revision ID: d25be15cb75d
+Revises: 8a9998406bc7
+Create Date: 2016-09-01 04:30:13.101046
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'd25be15cb75d'
+down_revision = '8a9998406bc7'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+### commands auto generated by Alembic - please adjust! ###
+    op.add_column('users', sa.Column('joined', sa.DateTime(), nullable=True))
+    ### end Alembic commands ###
+
+
+def downgrade():
+### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('users', 'joined')
+    ### end Alembic commands ###
diff --git a/models.py b/models.py
@@ -21,6 +21,7 @@ class User(db.Model):
     email = db.Column(db.Unicode(length=128), unique=True)
     _password = db.Column('password', db.String(length=60))  # password hash
     admin = db.Column(db.Boolean, default=False)
+    joined = db.Column(db.DateTime, default=datetime.utcnow)
 
     def __eq__(self, other):
         if isinstance(other, User):
diff --git a/static/images/user.jpg b/static/images/user.jpg
diff --git a/static/js/livestamp.js b/static/js/livestamp.js
diff --git a/templates/layout.html b/templates/layout.html
@@ -13,9 +13,7 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
             integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
             crossorigin="anonymous"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-timeago/1.5.2/jquery.timeago.min.js"
-            integrity="sha384-MPCI/e9mKGaS5YksJEmlTIIonpSyYnitbS7p4y7v5WAJ3VPkNcRbnFzu4wWIhf7Z"
-            crossorigin="anonymous"></script>
+    <script src="/js/livestamp.js"></script>
 </head>
 <body>
 <nav role="navigation" class="navbar navbar-default">
diff --git a/templates/users/profile.html b/templates/users/profile.html
@@ -1,18 +1,57 @@
 {% extends "layout.html" %}
 
 {% block title %}
-    Home
+    {{ user.username }}
 {% endblock %}
 
 {% block content %}
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h4 class="panel-title">
-                {{ user.username }}
-            </h4>
+    <div class="row">
+        <div class="col-sm-3 col-xs-12">
+            <div class="panel panel-default">
+                <div class="panel-body">
+                    <div style="width:100%;max-width:100%;">
+                        <img src="/avatar/{{ user.id }}?{{ timestamp }}" id="avatar" style="width:100%;max-height:256px;"/>
+                    </div>
+                    <h2 style="margin:0px;font-weight:bold;font-size:2em;">{{ user.name }}</h2>
+                    <small style="display:block;font-size:1.5em;color:#999;">@{{ user.username }}</small>
+                    <hr>
+                    <div ng-show="user['show_email']==true">
+                        <i class="fa fa-fw fa-envelope"></i>
+                        <a style="color:#666;" href="mailto:{{ user.email }}">
+                            <span id="email">{{ user.email }}</span>
+                        </a>
+                    </div>
+                    <div>
+                        <i class="fa fa-fw fa-clock-o"></i>
+                        Joined
+                        <time data-livestamp="{{ user.joined.strftime('%s') }}"></time>
+                    </div>
+                </div>
+            </div>
         </div>
-        <div class="panel-body">
-            Hi. This is {% if user == current_user %} your {% else %} a {% endif %} profile. There's nothing here, tho.
+        <div class="col-sm-9 col-xs-12">
+            <ul class="nav nav-tabs" role="tablist">
+                <li role="presentation" class="active"><a href="#profile" aria-controls="profile" role="tab" data-toggle="tab">Profile</a></li>
+                <li role="presentation"><a href="#activity" aria-controls="activity" role="tab" data-toggle="tab">Activity</a></li>
+                <a href="/settings" class="btn btn-primary" style="float:right;" ng-show="user['me']==true"><i class="fa fa-fw fa-pencil"></i> Edit Profile</a>
+            </ul>
+            <div class="tab-content">
+                <div role="tabpanel" class="tab-pane active" id="profile">
+                    <div class="page-header">
+                        <h1>{{ user.username }}</h1>
+                    </div>
+                    <div class="panel panel-default">
+                        <table class="table">
+                        </table>
+                    </div>
+                </div>
+                <div role="tabpanel" class="tab-pane" id="activity">
+                    <div class="panel panel-default">
+                        <table class="table">
+                        </table>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 {% endblock %}
diff --git a/views/users.py b/views/users.py
@@ -1,4 +1,4 @@
-from flask import Blueprint, render_template, redirect, url_for
+from flask import Blueprint, render_template, redirect, url_for, send_file
 from flask_login import current_user, login_required, login_user, logout_user
 
 from forms import LoginForm, RegisterForm
@@ -39,6 +39,12 @@ def logout():
     return redirect(url_for('base.index'))
 
 
+@blueprint.route('/avatar/<int:user_id>')
+def user_avatar(user_id):
+    user = User.query.get_or_404(user_id)
+    return send_file('static/images/user.jpg')
+
+
 @blueprint.route('/profile', methods=['GET'])
 @login_required
 def profile():
