From 14ebf71f2fb9eb4b7858e4c2f4fabe67b10f03b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannnes=20B=C3=BCrst?= Date: Wed, 18 Mar 2020 11:35:27 +0100 Subject: [PATCH] first blueprints --- .gitignore | 14 ++++ .idea/.gitignore | 4 +- .idea/dataSources.xml | 11 +++ .idea/sqldialects.xml | 8 ++ calender/__init__.py | 42 +++++++++++ calender/auth.py | 95 ++++++++++++++++++++++++ calender/calender.py | 99 +++++++++++++++++++++++++ calender/db.py | 41 ++++++++++ calender/schema.sql | 17 +++++ calender/static/style.css | 26 +++++++ calender/templates/auth/login.html | 15 ++++ calender/templates/auth/register.html | 15 ++++ calender/templates/base.html | 24 ++++++ calender/templates/calender/create.html | 15 ++++ calender/templates/calender/index.html | 28 +++++++ calender/templates/calender/update.html | 19 +++++ 16 files changed, 472 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 .idea/dataSources.xml create mode 100644 .idea/sqldialects.xml create mode 100644 calender/__init__.py create mode 100644 calender/auth.py create mode 100644 calender/calender.py create mode 100644 calender/db.py create mode 100644 calender/schema.sql create mode 100644 calender/static/style.css create mode 100644 calender/templates/auth/login.html create mode 100644 calender/templates/auth/register.html create mode 100644 calender/templates/base.html create mode 100644 calender/templates/calender/create.html create mode 100644 calender/templates/calender/index.html create mode 100644 calender/templates/calender/update.html diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..148ff97 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +venv/ + +*.pyc +__pycache__/ + +instance/ + +.pytest_cache/ +.coverage +htmlcov/ + +dist/ +build/ +*.egg-info/ \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore index 5c98b42..ed3f801 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -1,2 +1,4 @@ # Default ignored files -/workspace.xml \ No newline at end of file +/workspace.xml +# Datasource local storage ignored files +/dataSources.local.xml \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..668553f --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,11 @@ + + + + + mysql.8 + true + com.mysql.cj.jdbc.Driver + jdbc:mysql://localhost:3306 + + + \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml new file mode 100644 index 0000000..622a3bf --- /dev/null +++ b/.idea/sqldialects.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/calender/__init__.py b/calender/__init__.py new file mode 100644 index 0000000..af336ac --- /dev/null +++ b/calender/__init__.py @@ -0,0 +1,42 @@ +import os + +from flask import Flask + + +def create_app(test_config=None): + # create and configure the app + app = Flask(__name__, instance_relative_config=True) + app.config.from_mapping( + SECRET_KEY='dev', + DATABASE=os.path.join(app.instance_path, 'calender.sqlite'), + ) + + if test_config is None: + # load the instance config, if it exists, when not testing + app.config.from_pyfile('config.py', silent=True) + else: + # load the test config if passed in + app.config.from_mapping(test_config) + + # ensure the instance folder exists + try: + os.makedirs(app.instance_path) + except OSError: + pass + + # a simple page that says hello + @app.route('/hello') + def hello(): + return 'Hello, World!' + + from . import db + db.init_app(app) + + from . import auth + app.register_blueprint(auth.bp) + + from . import calender + app.register_blueprint(calender.bp) + app.add_url_rule('/', endpoint='index') + + return app \ No newline at end of file diff --git a/calender/auth.py b/calender/auth.py new file mode 100644 index 0000000..13b3c4f --- /dev/null +++ b/calender/auth.py @@ -0,0 +1,95 @@ +import functools + +from flask import ( + Blueprint, flash, redirect, render_template, request, session, url_for, + g) +from werkzeug.security import check_password_hash, generate_password_hash + +from calender.db import get_db + +bp = Blueprint('auth', __name__, url_prefix='/auth') + + +@bp.route('/register', methods=('GET', 'POST')) +def register(): + if request.method == 'POST': + username = request.form['username'] + password = request.form['password'] + db = get_db() + error = None + + if not username: + error = 'Username is required.' + elif not password: + error = 'Password is required.' + elif db.execute( + 'SELECT id FROM user WHERE username = ?', (username,) + ).fetchone() is not None: + error = 'User {} is already registered.'.format(username) + + if error is None: + db.execute( + 'INSERT INTO user (username, password) VALUES (?, ?)', + (username, generate_password_hash(password)) + ) + db.commit() + return redirect(url_for('auth.login')) + + flash(error) + + return render_template('auth/register.html') + + +@bp.route('/login', methods=('GET', 'POST')) +def login(): + if request.method == 'POST': + username = request.form['username'] + password = request.form['password'] + db = get_db() + error = None + user = db.execute( + 'SELECT * FROM user WHERE username = ?', (username,) + ).fetchone() + + if user is None: + error = 'Incorrect username.' + elif not check_password_hash(user['password'], password): + error = 'Incorrect password.' + + if error is None: + session.clear() + session['user_id'] = user['id'] + return redirect(url_for('index')) + + flash(error) + + return render_template('auth/login.html') + + +@bp.before_app_request +def load_logged_in_user(): + user_id = session.get('user_id') + + if user_id is None: + g.user = None + else: + g.user = get_db().execute( + 'SELECT * FROM user WHERE id = ?', (user_id,) + ).fetchone() + + +@bp.route('/logout') +def logout(): + session.clear() + return redirect(url_for('index')) + + +def login_required(view): + @functools.wraps(view) + def wrapped_view(**kwargs): + if g.user is None: + return redirect(url_for('auth.login')) + + return view(**kwargs) + + return wrapped_view diff --git a/calender/calender.py b/calender/calender.py new file mode 100644 index 0000000..3fffce3 --- /dev/null +++ b/calender/calender.py @@ -0,0 +1,99 @@ +from flask import ( + Blueprint, render_template, + flash, request, url_for, redirect, abort, g) + +from calender.auth import login_required +from calender.db import get_db + +bp = Blueprint('calender', __name__) + + +@bp.route('/') +def index(): + db = get_db() + posts = db.execute( + 'SELECT p.id, title, body, created, author_id, username' + ' FROM post p JOIN user u ON p.author_id = u.id' + ' ORDER BY created DESC' + ).fetchall() + return render_template('calender/index.html', posts=posts) + + +@bp.route('/create', methods=('GET', 'POST')) +@login_required +def create(): + if request.method == 'POST': + title = request.form['title'] + body = request.form['body'] + error = None + + if not title: + error = 'Title is required.' + + if error is not None: + flash(error) + else: + db = get_db() + db.execute( + 'INSERT INTO post (title, body, author_id)' + ' VALUES (?, ?, ?)', + (title, body, g.user['id']) + ) + db.commit() + return redirect(url_for('calender.index')) + + return render_template('calender/create.html') + + +def get_post(id, check_author=True): + post = get_db().execute( + 'SELECT p.id, title, body, created, author_id, username' + ' FROM post p JOIN user u ON p.author_id = u.id' + ' WHERE p.id = ?', + (id,) + ).fetchone() + + if post is None: + abort(404, "Post id {0} doesn't exist.".format(id)) + + if check_author and post['author_id'] != g.user['id']: + abort(403) + + return post + + +@bp.route('//update', methods=('GET', 'POST')) +@login_required +def update(id): + post = get_post(id) + + if request.method == 'POST': + title = request.form['title'] + body = request.form['body'] + error = None + + if not title: + error = 'Title is required.' + + if error is not None: + flash(error) + else: + db = get_db() + db.execute( + 'UPDATE post SET title = ?, body = ?' + ' WHERE id = ?', + (title, body, id) + ) + db.commit() + return redirect(url_for('calender.index')) + + return render_template('calender/update.html', post=post) + +@bp.route('//delete', methods=('POST',)) +@login_required +def delete(id): + get_post(id) + db = get_db() + db.execute('DELETE FROM post WHERE id = ?', (id,)) + db.commit() + return redirect(url_for('calender.index')) diff --git a/calender/db.py b/calender/db.py new file mode 100644 index 0000000..44bab9e --- /dev/null +++ b/calender/db.py @@ -0,0 +1,41 @@ +import sqlite3 + +import click +from flask import current_app, g +from flask.cli import with_appcontext + + +def get_db(): + if 'db' not in g: + g.db = sqlite3.connect( + current_app.config['DATABASE'], + detect_types=sqlite3.PARSE_DECLTYPES + ) + g.db.row_factory = sqlite3.Row + + return g.db + + +def close_db(e=None): + db = g.pop('db', None) + + if db is not None: + db.close() + +def init_db(): + db = get_db() + + with current_app.open_resource('schema.sql') as f: + db.executescript(f.read().decode('utf8')) + + +@click.command('init-db') +@with_appcontext +def init_db_command(): + """Clear the existing data and create new tables.""" + init_db() + click.echo('Initialized the database.') + +def init_app(app): + app.teardown_appcontext(close_db) + app.cli.add_command(init_db_command) diff --git a/calender/schema.sql b/calender/schema.sql new file mode 100644 index 0000000..efbd3db --- /dev/null +++ b/calender/schema.sql @@ -0,0 +1,17 @@ +DROP TABLE IF EXISTS user; +DROP TABLE IF EXISTS post; + +CREATE TABLE user ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + username TEXT UNIQUE NOT NULL, + password TEXT NOT NULL +); + +CREATE TABLE post ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + author_id INTEGER NOT NULL, + created TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + title TEXT NOT NULL, + body TEXT NOT NULL, + FOREIGN KEY (author_id) REFERENCES user (id) +); \ No newline at end of file diff --git a/calender/static/style.css b/calender/static/style.css new file mode 100644 index 0000000..93623a4 --- /dev/null +++ b/calender/static/style.css @@ -0,0 +1,26 @@ +html { font-family: sans-serif; background: #eee; padding: 1rem; } +body { max-width: 960px; margin: 0 auto; background: white; } +h1 { font-family: serif; color: #377ba8; margin: 1rem 0; } +a { color: #377ba8; } +hr { border: none; border-top: 1px solid lightgray; } +nav { background: lightgray; display: flex; align-items: center; padding: 0 0.5rem; } +nav h1 { flex: auto; margin: 0; } +nav h1 a { text-decoration: none; padding: 0.25rem 0.5rem; } +nav ul { display: flex; list-style: none; margin: 0; padding: 0; } +nav ul li a, nav ul li span, header .action { display: block; padding: 0.5rem; } +.content { padding: 0 1rem 1rem; } +.content > header { border-bottom: 1px solid lightgray; display: flex; align-items: flex-end; } +.content > header h1 { flex: auto; margin: 1rem 0 0.25rem 0; } +.flash { margin: 1em 0; padding: 1em; background: #cae6f6; border: 1px solid #377ba8; } +.post > header { display: flex; align-items: flex-end; font-size: 0.85em; } +.post > header > div:first-of-type { flex: auto; } +.post > header h1 { font-size: 1.5em; margin-bottom: 0; } +.post .about { color: slategray; font-style: italic; } +.post .body { white-space: pre-line; } +.content:last-child { margin-bottom: 0; } +.content form { margin: 1em 0; display: flex; flex-direction: column; } +.content label { font-weight: bold; margin-bottom: 0.5em; } +.content input, .content textarea { margin-bottom: 1em; } +.content textarea { min-height: 12em; resize: vertical; } +input.danger { color: #cc2f2e; } +input[type=submit] { align-self: start; min-width: 10em; } \ No newline at end of file diff --git a/calender/templates/auth/login.html b/calender/templates/auth/login.html new file mode 100644 index 0000000..b7dd5dc --- /dev/null +++ b/calender/templates/auth/login.html @@ -0,0 +1,15 @@ +{% extends 'base.html' %} + +{% block header %} +

{% block title %}Log In{% endblock %}

+{% endblock %} + +{% block content %} +
+ + + + + +
+{% endblock %} \ No newline at end of file diff --git a/calender/templates/auth/register.html b/calender/templates/auth/register.html new file mode 100644 index 0000000..a3c73cc --- /dev/null +++ b/calender/templates/auth/register.html @@ -0,0 +1,15 @@ +{% extends 'base.html' %} + +{% block header %} +

{% block title %}Register{% endblock %}

+{% endblock %} + +{% block content %} +
+ + + + + +
+{% endblock %} \ No newline at end of file diff --git a/calender/templates/base.html b/calender/templates/base.html new file mode 100644 index 0000000..4017c06 --- /dev/null +++ b/calender/templates/base.html @@ -0,0 +1,24 @@ + +{% block title %}{% endblock %} - Flaskr + + +
+
+ {% block header %}{% endblock %} +
+ {% for message in get_flashed_messages() %} +
{{ message }}
+ {% endfor %} + {% block content %}{% endblock %} +
\ No newline at end of file diff --git a/calender/templates/calender/create.html b/calender/templates/calender/create.html new file mode 100644 index 0000000..ad402e0 --- /dev/null +++ b/calender/templates/calender/create.html @@ -0,0 +1,15 @@ +{% extends 'base.html' %} + +{% block header %} +

{% block title %}New Post{% endblock %}

+{% endblock %} + +{% block content %} +
+ + + + + +
+{% endblock %} \ No newline at end of file diff --git a/calender/templates/calender/index.html b/calender/templates/calender/index.html new file mode 100644 index 0000000..c1bfc10 --- /dev/null +++ b/calender/templates/calender/index.html @@ -0,0 +1,28 @@ +{% extends 'base.html' %} + +{% block header %} +

{% block title %}Posts{% endblock %}

+ {% if g.user %} + New + {% endif %} +{% endblock %} + +{% block content %} + {% for post in posts %} +
+
+
+

{{ post['title'] }}

+
by {{ post['username'] }} on {{ post['created'].strftime('%Y-%m-%d') }}
+
+ {% if g.user['id'] == post['author_id'] %} + Edit + {% endif %} +
+

{{ post['body'] }}

+
+ {% if not loop.last %} +
+ {% endif %} + {% endfor %} +{% endblock %} \ No newline at end of file diff --git a/calender/templates/calender/update.html b/calender/templates/calender/update.html new file mode 100644 index 0000000..6ae4f46 --- /dev/null +++ b/calender/templates/calender/update.html @@ -0,0 +1,19 @@ +{% extends 'base.html' %} +{% block header %} +

{% block title %}Edit "{{ post['title'] }}"{% endblock %}

+{% endblock %} + +{% block content %} +
+ + + + + +
+
+
+ +
+{% endblock %} \ No newline at end of file