diff --git a/routes.py b/routes.py index c6e6785..ed234c7 100644 --- a/routes.py +++ b/routes.py @@ -1,65 +1,67 @@ from flask import Blueprint, render_template -from flask_login import login_required, current_user +from flask_login import login_required + +from .models import User blueprint = Blueprint('main', __name__) -@blueprint.route('/profile') -@login_required -def profile(): - return render_template('layouts/profile.html', name=current_user.name) - - @blueprint.route('/') def index(): # put application's code here - return render_template('layouts/index.html', user=user) + return render_template('layouts/index.html') @blueprint.route('/about') def about(): - return render_template('pages/about.html', user=user) + return render_template('pages/about.html') @blueprint.route('/users') def browse(): - return render_template('pages/browse.html', user=user) + return render_template('pages/browse.html') @blueprint.route('/feed') def feed(): - return render_template('pages/feed.html', user=user) + return render_template('pages/feed.html') @blueprint.route('/messages') def messages(): - return render_template('pages/messages.html', user=user) + return render_template('pages/messages.html') @blueprint.route('/search') def search(): - return render_template('pages/search.html', user=user) + return render_template('pages/search.html') -@blueprint.route('/user/') +@blueprint.route('/user//') def user(username: str): + user = User.query.filter_by(username=username).first_or_404() return render_template('pages/user.html', user=user) +@blueprint.route('/user//edit') +@login_required +def profile(): + return render_template('layouts/user_edit.html') + @blueprint.route('/blogs') def blogs(): - return render_template('pages/blogs.html', user=user) + return render_template('pages/blogs.html') @blueprint.route('/groups') def groups(): - return render_template('pages/groups.html', user=user) + return render_template('pages/groups.html') @blueprint.route('/login', methods=['GET']) def login(): - return render_template('pages/login.html', user=user) + return render_template('pages/login.html') @blueprint.route('/signup', methods=['GET']) def signup(): - return render_template('pages/signup.html', user=user) + return render_template('pages/signup.html') diff --git a/static/styles.css b/static/styles.css index 0a964dd..7a3e4eb 100644 --- a/static/styles.css +++ b/static/styles.css @@ -171,6 +171,7 @@ form button { .profile-lower .profile-bio { margin: 0.5em 1em; white-space: normal; + font-size: 0.9em; } /*# sourceMappingURL=styles.css.map */ diff --git a/static/styles.css.map b/static/styles.css.map index 8023b89..6fb5324 100644 --- a/static/styles.css.map +++ b/static/styles.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["styles.scss"],"names":[],"mappings":"AAAA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EAOE;;AALA;EAEE;;;AAON;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;;AAKN;EACE;EACA;EACA;EACA;;AAEA;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAIA;EACE;EACA;;AAEA;EACE;;AAEA;EACE;;;AAMR;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAIA;EACE;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAEA;EACE;;AAIJ;EACE;EACA;EACA;;;AAIF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAEA;EACE;;AAGF;EACE;EACA;;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AAIJ;EACE;;;AAGJ;EACE;EACA;;AAEA;EACE;EACA","file":"styles.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["styles.scss"],"names":[],"mappings":"AAAA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EAOE;;AALA;EAEE;;;AAON;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;;AAKN;EACE;EACA;EACA;EACA;;AAEA;EACE;;;AAIJ;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAIA;EACE;EACA;;AAEA;EACE;;AAEA;EACE;;;AAMR;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAIA;EACE;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAEA;EACE;;AAIJ;EACE;EACA;EACA;;;AAIF;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;;AAEA;EACE;;AAGF;EACE;EACA;;;AAKN;EACE;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;EACA;EACA;EACA;;;AAIJ;EACE;;;AAGJ;EACE;EACA;;AAEA;EACE;EACA;EACA","file":"styles.css"} \ No newline at end of file diff --git a/static/styles.scss b/static/styles.scss index be0b38c..64cec79 100644 --- a/static/styles.scss +++ b/static/styles.scss @@ -195,5 +195,6 @@ form { .profile-bio { margin: 0.5em 1em; white-space: normal; + font-size: 0.9em; } } diff --git a/templates/pages/user.html b/templates/pages/user.html index ff07d04..d941963 100644 --- a/templates/pages/user.html +++ b/templates/pages/user.html @@ -13,11 +13,11 @@ Registered 33 days ago
67 likes
14 posts
-

+ About me:
This user hasn't written a bio yet.