commit 2f3e04fac63163a47d10b3eb549ba248f65ea1c0 parent 43cad8b776692bf46ef4140772871d29e59ea233 Author: Friedel Schön <[email protected]> Date: Thu, 7 Apr 2022 12:55:19 +0200 renaming stuff + add calendar Diffstat:
33 files changed, 448 insertions(+), 336 deletions(-)
diff --git a/flaskblog/__init__.py b/flaskblog/__init__.py @@ -1,15 +0,0 @@ -from flask import Flask -from flask_bcrypt import Bcrypt -from flask_login import LoginManager -from flask_sqlalchemy import SQLAlchemy - -app = Flask(__name__) -app.config['SECRET_KEY'] = '5791628bb0b13ce0c676dfde280ba245' -app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///site.db' -db = SQLAlchemy(app) -bcrypt = Bcrypt(app) -login_manager = LoginManager(app) -login_manager.login_view = 'login' -login_manager.login_message_category = 'info' - -from flaskblog import routes diff --git a/flaskblog/routes.py b/flaskblog/routes.py @@ -1,155 +0,0 @@ -import os -import secrets - -from flask import abort, flash, redirect, render_template, request, url_for -from flask_login import current_user, login_required, login_user, logout_user -from PIL import Image - -from . import app, bcrypt, db -from .forms import LoginForm, PostForm, RegistrationForm, UpdateAccountForm -from .models import Classes, Language, User - - [email protected]("/") -def index(): - page = request.args.get('page', 1, type=int) - languages = Language.query.all() - return render_template('index.html', languages=languages) - - [email protected]("/about") -def about(): - return render_template('about.html', title='About') - - [email protected]("/register", methods=['GET', 'POST']) -def register(): - if current_user.is_authenticated: - return redirect('/') - form = RegistrationForm() - if form.validate_on_submit(): - hashed_password = bcrypt.generate_password_hash(form.password.data).decode('utf-8') - user = User(username=form.username.data, email=form.email.data, password=hashed_password) - db.session.add(user) - db.session.commit() - flash('Your account has been created! You are now able to log in', 'success') - return redirect(url_for('login')) - return render_template('register.html', title='Register', form=form) - - [email protected]("/login", methods=['GET', 'POST']) -def login(): - if current_user.is_authenticated: - return redirect('/') - form = LoginForm() - if form.validate_on_submit(): - user = User.query.filter_by(email=form.email.data).first() - if user and bcrypt.check_password_hash(user.password, form.password.data): - login_user(user, remember=form.remember.data) - next_page = request.args.get('next') - return redirect(next_page) if next_page else redirect('/') - else: - flash('Login Unsuccessful. Please check email and password', 'danger') - return render_template('login.html', title='Login', form=form) - - [email protected]("/logout") -def logout(): - logout_user() - return redirect('/') - - -def save_picture(form_picture): - random_hex = secrets.token_hex(8) - _, f_ext = os.path.splitext(form_picture.filename) - picture_fn = random_hex + f_ext - picturepath = os.path.join(app.root_path, 'static/profile_pics', picture_fn) - - output_size = (125, 125) - i = Image.open(form_picture) - i.thumbnail(output_size) - i.save(picturepath) - - return picture_fn - - [email protected]("/account", methods=['GET', 'POST']) -@login_required -def account(): - form = UpdateAccountForm() - if form.validate_on_submit(): - if form.picture.data: - picture_file = save_picture(form.picture.data) - current_user.image_file = picture_file - current_user.username = form.username.data - current_user.email = form.email.data - db.session.commit() - flash('Your account has been updated!', 'success') - return redirect(url_for('account')) - elif request.method == 'GET': - form.username.data = current_user.username - form.email.data = current_user.email - image_file = url_for('static', filename='profile_pics/' + current_user.image_file) - return render_template('account.html', title='Account', image_file=image_file, form=form) - - [email protected]("/post/new", methods=['GET', 'POST']) -@login_required -def new_post(): - form = PostForm() - if form.validate_on_submit(): - #post = Post(title=form.title.data, content=form.content.data, author=current_user) - db.session.add(post) - db.session.commit() - flash('Your post has been created!', 'success') - return redirect('/') - return render_template('create_post.html', title='New Post', - form=form, legend='New Post') - - [email protected]("/post/<int:post_id>") -def post(post_id): - #post = Post.query.get_or_404(post_id) - return render_template('post.html', title=post.title, post=post) - - [email protected]("/post/<int:post_id>/update", methods=['GET', 'POST']) -@login_required -def update_post(post_id): - #post = Post.query.get_or_404(post_id) - if post.author != current_user: - abort(403) - form = PostForm() - if form.validate_on_submit(): - post.title = form.title.data - post.content = form.content.data - db.session.commit() - flash('Your post has been updated!', 'success') - return redirect(url_for('post', post_id=post.id)) - elif request.method == 'GET': - form.title.data = post.title - form.content.data = post.content - return render_template('create_post.html', title='Update Post', - form=form, legend='Update Post') - - [email protected]("/post/<int:post_id>/delete", methods=['POST']) -@login_required -def delete_post(post_id): - #post = Post.query.get_or_404(post_id) - if post.author != current_user: - abort(403) - db.session.delete(post) - db.session.commit() - flash('Your post has been deleted!', 'success') - return redirect('/') - - [email protected]("/user/<string:username>") -def user_posts(username): - page = request.args.get('page', 1, type=int) - user = User.query.filter_by(username=username).first_or_404() - # posts = Post.query.filter_by(author=user)\ - # .order_by(Post.date_posted.desc())\ - # .paginate(page=page, per_page=5) - # return render_template('user_post.html', posts=posts, user=user) diff --git a/flaskblog/site.db b/flaskblog/site.db Binary files differ. diff --git a/flaskblog/static/main.css b/flaskblog/static/main.css @@ -1,80 +0,0 @@ -body { - background: #fafafa; - color: #333333; - margin-top: 5rem; -} - -h1, h2, h3, h4, h5, h6 { - color: #444444; -} - -.bg-steel { - background-color: #5f788a; -} - -.site-header .navbar-nav .nav-link { - color: #cbd5db; -} - -.site-header .navbar-nav .nav-link:hover { - color: #ffffff; -} - -.site-header .navbar-nav .nav-link.active { - font-weight: 500; -} - -.content-section { - background: #ffffff; - padding: 10px 20px; - border: 1px solid #dddddd; - border-radius: 3px; - margin-bottom: 20px; -} - -.article-title { - color: #444444; -} - -a.article-title:hover { - color: #428bca; - text-decoration: none; -} - -.article-content { - white-space: pre-line; -} - -.article-img { - height: 65px; - width: 65px; - margin-right: 16px; -} - -.article-metadata { - padding-bottom: 1px; - margin-bottom: 4px; - border-bottom: 1px solid #e3e3e3 -} - -.article-metadata a:hover { - color: #333; - text-decoration: none; -} - -.article-svg { - width: 25px; - height: 25px; - vertical-align: middle; -} - -.account-img { - height: 125px; - width: 125px; - margin-right: 20px; - margin-bottom: 16px; -} - -.account-heading { - font-size: 2.5rem; -} diff --git a/flaskblog/templates/layout.html b/flaskblog/templates/layout.html @@ -1,84 +0,0 @@ -<!DOCTYPE html> -<html> -<head> - <!-- Required meta tags --> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> - - <!-- Bootstrap CSS --> - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous"> - - <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='main.css') }}"> - - {% if title %} - <title>Flask Blog - {{ title }}</title> - {% else %} - <title>Flask Blog</title> - {% endif %} -</head> -<body> - <header class="site-header"> - <nav class="navbar navbar-expand-md navbar-dark bg-steel fixed-top"> - <div class="container"> - <a class="navbar-brand mr-4" href="/">Flask Blog</a> - <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggle" aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation"> - <span class="navbar-toggler-icon"></span> - </button> - <div class="collapse navbar-collapse" id="navbarToggle"> - <div class="navbar-nav mr-auto"> - <a class="nav-item nav-link" href="{{ '/' }}">Home</a> - <a class="nav-item nav-link" href="{{ '/' }}">About</a> - </div> - <!-- Navbar Right Side --> - <div class="navbar-nav"> - {% if current_user.is_authenticated %} - <a class="nav-item nav-link" href="{{ url_for('new_post') }}">New Post</a> - <a class="nav-item nav-link" href="{{ url_for('account') }}">Account</a> - <a class="nav-item nav-link" href="{{ url_for('logout') }}">Logout</a> - {% else %} - <a class="nav-item nav-link" href="{{ url_for('login') }}">Login</a> - <a class="nav-item nav-link" href="{{ url_for('register') }}">Register</a> - {% endif %} - </div> - </div> - </div> - </nav> - </header> - <main role="main" class="container"> - <div class="row"> - <div class="col-md-8"> - {% with messages = get_flashed_messages(with_categories=true) %} - {% if messages %} - {% for category, message in messages %} - <div class="alert alert-{{ category }}"> - {{ message }} - </div> - {% endfor %} - {% endif %} - {% endwith %} - {% block content %}{% endblock %} - </div> - <div class="col-md-4"> - <div class="content-section"> - <h3>Our Sidebar</h3> - <p class='text-muted'>You can put any information here you'd like. - <ul class="list-group"> - <li class="list-group-item list-group-item-light">Latest Posts</li> - <li class="list-group-item list-group-item-light">Announcements</li> - <li class="list-group-item list-group-item-light">Calendars</li> - <li class="list-group-item list-group-item-light">etc</li> - </ul> - </p> - </div> - </div> - </div> - </main> - - - <!-- Optional JavaScript --> - <!-- jQuery first, then Popper.js, then Bootstrap JS --> - <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script> - <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script> - <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script> -</body> -</html> diff --git a/insert.py b/insert.py @@ -1,4 +1,4 @@ -from flaskblog import bcrypt, db, models +from pgmles import bcrypt, db, models db.session.add(models.User(type='admin', username='admin', email='[email protected]', password=bcrypt.generate_password_hash('password').decode('utf-8'))) diff --git a/pgmles/__init__.py b/pgmles/__init__.py @@ -0,0 +1,20 @@ +from typing import cast + +from flask import Flask +from flask_bcrypt import Bcrypt +from flask_login import LoginManager +from flask_sqlalchemy import SQLAlchemy + +from .flaskcalendar import Calendar + +app = Flask(__name__) +app.config['SECRET_KEY'] = '5791628bb0b13ce0c676dfde280ba245' +app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///site.db' +db = SQLAlchemy(app) +bcrypt = Bcrypt(app) +login_manager = LoginManager(app) +login_manager.login_view = cast(None, 'login') +login_manager.login_message_category = 'info' +calendar = Calendar() + +from pgmles import routes diff --git a/pgmles/flaskcalendar.py b/pgmles/flaskcalendar.py @@ -0,0 +1,21 @@ +import random +from calendar import Calendar as Month +from datetime import datetime + +lessons = ['Python van Cr', 'C van Hg', 'Python van Kr', + None, None, None, None, None, None] + + +class Calendar: + weekdays = list(enumerate(['Ma', 'Di', 'Wo', 'Do', 'Vr', 'Za', 'Zo'])) + rows = [] + + def __init__(self): + today = datetime.today() + + m = Month() + for days in m.monthdayscalendar(today.year, today.month): + self.rows.append([(i, d, (random.choice(lessons) if d != 0 and i != 6 else None)) + for i, d in enumerate(days)]) + + print(self.rows) diff --git a/flaskblog/forms.py b/pgmles/forms.py diff --git a/flaskblog/models.py b/pgmles/models.py diff --git a/pgmles/routes.py b/pgmles/routes.py @@ -0,0 +1,159 @@ +import os +import secrets + +from flask import abort, flash, redirect, render_template, request, url_for +from flask_login import current_user, login_required, login_user, logout_user +from PIL import Image + +from . import app, bcrypt, calendar, db +from .forms import LoginForm, PostForm, RegistrationForm, UpdateAccountForm +from .models import Classes, Language, User + + [email protected]("/") +def index(): + page = request.args.get('page', 1, type=int) + languages = Language.query.all() + return render_template('index.html', calendar=calendar, languages=languages) + + [email protected]("/about") +def about(): + return render_template('about.html', calendar=calendar, title='About') + + [email protected]("/register", methods=['GET', 'POST']) +def register(): + if current_user.is_authenticated: + return redirect('/') + form = RegistrationForm() + if form.validate_on_submit(): + hashed_password = bcrypt.generate_password_hash( + form.password.data).decode('utf-8') + user = User(username=form.username.data, + email=form.email.data, password=hashed_password) + db.session.add(user) + db.session.commit() + flash('Your account has been created! You are now able to log in', 'success') + return redirect(url_for('login')) + return render_template('register.html', calendar=calendar, title='Register', form=form) + + [email protected]("/login", methods=['GET', 'POST']) +def login(): + if current_user.is_authenticated: + return redirect('/') + form = LoginForm() + if form.validate_on_submit(): + user = User.query.filter_by(email=form.email.data).first() + if user and bcrypt.check_password_hash(user.password, form.password.data): + login_user(user, remember=form.remember.data) + next_page = request.args.get('next') + return redirect(next_page) if next_page else redirect('/') + else: + flash('Login Unsuccessful. Please check email and password', 'danger') + return render_template('login.html', calendar=calendar, title='Login', form=form) + + [email protected]("/logout") +def logout(): + logout_user() + return redirect('/') + + +def save_picture(form_picture): + random_hex = secrets.token_hex(8) + _, f_ext = os.path.splitext(form_picture.filename) + picture_fn = random_hex + f_ext + picturepath = os.path.join( + app.root_path, 'static/profile_pics', picture_fn) + + output_size = (125, 125) + i = Image.open(form_picture) + i.thumbnail(output_size) + i.save(picturepath) + + return picture_fn + + [email protected]("/account", methods=['GET', 'POST']) +@login_required +def account(): + form = UpdateAccountForm() + if form.validate_on_submit(): + if form.picture.data: + picture_file = save_picture(form.picture.data) + current_user.image_file = picture_file + current_user.username = form.username.data + current_user.email = form.email.data + db.session.commit() + flash('Your account has been updated!', 'success') + return redirect(url_for('account')) + elif request.method == 'GET': + form.username.data = current_user.username + form.email.data = current_user.email + image_file = url_for( + 'static', filename='profile_pics/' + current_user.image_file) + return render_template('account.html', calendar=calendar, title='Account', image_file=image_file, form=form) + + [email protected]("/post/new", methods=['GET', 'POST']) +@login_required +def new_post(): + form = PostForm() + if form.validate_on_submit(): + #post = Post(title=form.title.data, content=form.content.data, author=current_user) + db.session.add(post) + db.session.commit() + flash('Your post has been created!', 'success') + return redirect('/') + return render_template('create_post.html', calendar=calendar, title='New Post', + form=form, legend='New Post') + + [email protected]("/post/<int:post_id>") +def post(post_id): + #post = Post.query.get_or_404(post_id) + return render_template('post.html', calendar=calendar, title=post.title, post=post) + + [email protected]("/post/<int:post_id>/update", methods=['GET', 'POST']) +@login_required +def update_post(post_id): + #post = Post.query.get_or_404(post_id) + if post.author != current_user: + abort(403) + form = PostForm() + if form.validate_on_submit(): + post.title = form.title.data + post.content = form.content.data + db.session.commit() + flash('Your post has been updated!', 'success') + return redirect(url_for('post', post_id=post.id)) + elif request.method == 'GET': + form.title.data = post.title + form.content.data = post.content + return render_template('create_post.html', calendar=calendar, title='Update Post', + form=form, legend='Update Post') + + [email protected]("/post/<int:post_id>/delete", methods=['POST']) +@login_required +def delete_post(post_id): + #post = Post.query.get_or_404(post_id) + if post.author != current_user: + abort(403) + db.session.delete(post) + db.session.commit() + flash('Your post has been deleted!', 'success') + return redirect('/') + + [email protected]("/user/<string:username>") +def user_posts(username): + page = request.args.get('page', 1, type=int) + user = User.query.filter_by(username=username).first_or_404() + # posts = Post.query.filter_by(author=user)\ + # .order_by(Post.date_posted.desc())\ + # .paginate(page=page, per_page=5) + # return render_template('user_post.html', posts=posts, user=user) diff --git a/pgmles/site.db b/pgmles/site.db Binary files differ. diff --git a/pgmles/static/main.css b/pgmles/static/main.css @@ -0,0 +1,144 @@ +body { + background: #fafafa; + color: #333333; + margin-top: 5rem; +} + +h1, h2, h3, h4, h5, h6 { + color: #444444; +} + +.bg-steel { + background-color: #5f788a; +} + +.site-header .navbar-nav .nav-link { + color: #cbd5db; +} + +.site-header .navbar-nav .nav-link:hover { + color: #ffffff; +} + +.site-header .navbar-nav .nav-link.active { + font-weight: 500; +} + +.content-section { + background: #ffffff; + padding: 10px 20px; + border: 1px solid #dddddd; + border-radius: 3px; + margin-bottom: 20px; +} + +.article-title { + color: #444444; +} + +a.article-title:hover { + color: #428bca; + text-decoration: none; +} + +.article-content { + white-space: pre-line; +} + +.article-img { + height: 65px; + width: 65px; + margin-right: 16px; +} + +.article-metadata { + padding-bottom: 1px; + margin-bottom: 4px; + border-bottom: 1px solid #e3e3e3 +} + +.article-metadata a:hover { + color: #333; + text-decoration: none; +} + +.article-svg { + width: 25px; + height: 25px; + vertical-align: middle; +} + +.account-img { + height: 125px; + width: 125px; + margin-right: 20px; + margin-bottom: 16px; +} + +.account-heading { + font-size: 2.5rem; +} + +.calendar { + background-color: #fafafa; + width: 100%; + color: #818182; + border: #dddddd solid 1px; +} + +.calendar .weekend { + background-color: #eee; +} + +.calendar th { + border-bottom: #ddd solid 1px; +} + +.calendar th, td { + /*border: #333 solid 1px;*/ + text-align: center; + width: 100px; + position: relative; +} + +.calendar .lesson { + background: rgb(84, 230, 84); + border: #444 solid 1px; + color: #444 +} + +.calendar td .hover-day { + visibility: hidden; + background-color: #444; + color: #eee; + text-align: center; + border-radius: 6px; + padding: 5px 0; + + width: 120px; + bottom: 100%; + left: 50%; + margin-left: -60px; /* Use half of the width (120/2 = 60), to center the tooltip */ + padding: 5px 0; + + + /* Position the tooltip */ + position: absolute; + z-index: 1; +} + +.calendar td .hover-day::after { + content: ""; + position: absolute; + top: 100%; + left: 50%; + margin-left: -5px; + border-width: 5px; + border-style: solid; + border-color: #444 transparent transparent transparent; +} + + +.calendar td:hover .hover-day { + visibility: visible; +} +\ No newline at end of file diff --git a/flaskblog/static/profile_pics/2e32b4c96a8d8f10.jpg b/pgmles/static/profile_pics/2e32b4c96a8d8f10.jpg Binary files differ. diff --git a/flaskblog/static/profile_pics/4895353c1045b870.jpg b/pgmles/static/profile_pics/4895353c1045b870.jpg Binary files differ. diff --git a/flaskblog/static/profile_pics/4c4083a8362b3c0a.jpg b/pgmles/static/profile_pics/4c4083a8362b3c0a.jpg Binary files differ. diff --git a/flaskblog/static/profile_pics/53998538edf2342c.png b/pgmles/static/profile_pics/53998538edf2342c.png Binary files differ. diff --git a/flaskblog/static/profile_pics/6809465dffb2e5ba.jpg b/pgmles/static/profile_pics/6809465dffb2e5ba.jpg Binary files differ. diff --git a/flaskblog/static/profile_pics/7798432669b8b3ac.jpg b/pgmles/static/profile_pics/7798432669b8b3ac.jpg Binary files differ. diff --git a/flaskblog/static/profile_pics/85ed1b444539873d.png b/pgmles/static/profile_pics/85ed1b444539873d.png Binary files differ. diff --git a/flaskblog/static/profile_pics/b6e1c53325f88b74.png b/pgmles/static/profile_pics/b6e1c53325f88b74.png Binary files differ. diff --git a/flaskblog/static/profile_pics/default.jpg b/pgmles/static/profile_pics/default.jpg Binary files differ. diff --git a/flaskblog/templates/about.html b/pgmles/templates/about.html diff --git a/flaskblog/templates/account.html b/pgmles/templates/account.html diff --git a/flaskblog/templates/create_post.html b/pgmles/templates/create_post.html diff --git a/flaskblog/templates/home1.html b/pgmles/templates/home1.html diff --git a/flaskblog/templates/index.html b/pgmles/templates/index.html diff --git a/pgmles/templates/layout.html b/pgmles/templates/layout.html @@ -0,0 +1,101 @@ +<!DOCTYPE html> +<html> +<head> + <!-- Required meta tags --> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> + + <!-- Bootstrap CSS --> + <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous"> + + <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='main.css') }}"> + + {% if title %} + <title>Flask Blog - {{ title }}</title> + {% else %} + <title>Flask Blog</title> + {% endif %} +</head> +<body> + <header class="site-header"> + <nav class="navbar navbar-expand-md navbar-dark bg-steel fixed-top"> + <div class="container"> + <a class="navbar-brand mr-4" href="/">Flask Blog</a> + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarToggle" aria-controls="navbarToggle" aria-expanded="false" aria-label="Toggle navigation"> + <span class="navbar-toggler-icon"></span> + </button> + <div class="collapse navbar-collapse" id="navbarToggle"> + <div class="navbar-nav mr-auto"> + <a class="nav-item nav-link" href="{{ '/' }}">Home</a> + <a class="nav-item nav-link" href="{{ '/' }}">About</a> + </div> + <!-- Navbar Right Side --> + <div class="navbar-nav"> + {% if current_user.is_authenticated %} + <a class="nav-item nav-link" href="{{ url_for('new_post') }}">New Post</a> + <a class="nav-item nav-link" href="{{ url_for('account') }}">Account</a> + <a class="nav-item nav-link" href="{{ url_for('logout') }}">Logout</a> + {% else %} + <a class="nav-item nav-link" href="{{ url_for('login') }}">Login</a> + <a class="nav-item nav-link" href="{{ url_for('register') }}">Register</a> + {% endif %} + </div> + </div> + </div> + </nav> + </header> + <main role="main" class="container"> + <div class="row"> + <div class="col-md-8"> + {% with messages = get_flashed_messages(with_categories=true) %} + {% if messages %} + {% for category, message in messages %} + <div class="alert alert-{{ category }}"> + {{ message }} + </div> + {% endfor %} + {% endif %} + {% endwith %} + {% block content %}{% endblock %} + </div> + <div class="col-md-4"> + <div class="content-section"> + <h3>Our Sidebar</h3> + <p class='text-muted'>You can put any information here you'd like. + <ul class="list-group"> + <li class="list-group-item list-group-item-light">Latest Posts</li> + <li class="list-group-item list-group-item-light">Announcements</li> + <li class="list-group-item list-group-item-light">Calendars</li> + <li class="list-group-item list-group-item-light">etc</li> + </ul> + </p> + <table class='calendar'> + <tr> + {% for d, day in calendar.weekdays %} + <th class="{{ 'weekend' if d >= 5 }}">{{ day }}</th> + {% endfor %} + </tr> + {% for row in calendar.rows %} + <tr> + {% for d, day, lesson in row %} + <td class="{{ 'weekend' if d >= 5 }} {{ 'lesson' if lesson }}"> + {{ day if day }} + {% if lesson %}<span class='hover-day'>{{ lesson }}</span>{% endif %} + </td> + {% endfor %} + </tr> + {% endfor %} + </table> + </div> + </div> + </div> + </main> + + + <!-- Optional JavaScript --> + <!-- jQuery first, then Popper.js, then Bootstrap JS --> + <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script> + <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script> +</body> +</html> diff --git a/flaskblog/templates/login.html b/pgmles/templates/login.html diff --git a/flaskblog/templates/post.html b/pgmles/templates/post.html diff --git a/flaskblog/templates/register.html b/pgmles/templates/register.html diff --git a/flaskblog/templates/user_post.html b/pgmles/templates/user_post.html diff --git a/run.py b/run.py @@ -1,4 +1,4 @@ -from flaskblog import app +from pgmles import app if __name__ == '__main__': app.run(debug=True)