This is an About page for FoodBot. Don't I look good? Oh stop, you're making me blush.
{% endblock %} \ No newline at end of file diff --git a/app/templates/errors/401.html b/app/templates/errors/401.html new file mode 100644 index 0000000..59d7815 --- /dev/null +++ b/app/templates/errors/401.html @@ -0,0 +1,9 @@ +{% extends "layout.html" -%} + +{% block container %} + +{% endblock %} \ No newline at end of file diff --git a/app/templates/errors/404.html b/app/templates/errors/404.html new file mode 100644 index 0000000..534a1e1 --- /dev/null +++ b/app/templates/errors/404.html @@ -0,0 +1,9 @@ +{% extends "layout.html" -%} + +{% block container %} + +{% endblock %} \ No newline at end of file diff --git a/app/templates/home.html b/app/templates/home.html index 91b872c..f2bd54d 100644 --- a/app/templates/home.html +++ b/app/templates/home.html @@ -1,5 +1,6 @@ -{% extends "layout.html" %} -{% block content %} +{% extends "layout.html" -%} +{% set active_page = "home" -%} +{% block container %}Forgot your password? Click here to reset it.
-TOP 4
{% endblock %} \ No newline at end of file diff --git a/app/utils.py b/app/utils.py new file mode 100644 index 0000000..60150bf --- /dev/null +++ b/app/utils.py @@ -0,0 +1,17 @@ +from flask import render_template + +from app import app +__author__ = 'feliciaan' + +@app.template_filter('euro') +def euro(value): + result = '€' + str(value/100) + return result + +@app.errorhandler(404) +def handle404(e): + return render_template('errors/404.html'), 404 + +@app.errorhandler(401) +def handle401(e): + return render_template('errors/401.html'), 401 \ No newline at end of file diff --git a/app/views.py b/app/views/__init__.py similarity index 56% rename from app/views.py rename to app/views/__init__.py index d9401f0..f68989f 100644 --- a/app/views.py +++ b/app/views/__init__.py @@ -1,11 +1,20 @@ -from flask import url_for, render_template +__author__ = 'feliciaan' -from app import app +from flask import url_for, render_template, abort, redirect, request +from flask.ext.login import current_user, login_required +from datetime import datetime +from app import app, db +from models import Order, OrderItem +# import views +import views.order @app.route('/') def home(): + if not current_user.is_anonymous(): + orders = Order.query.filter((Order.stoptime > datetime.now()) | (Order.stoptime == None)).all() + return render_template('home_loggedin.html', orders=orders) return render_template('home.html') @@ -15,23 +24,25 @@ def about(): @app.route('/stats/') +@login_required def stats(): return render_template('stats.html') if app.debug: # add route information @app.route('/routes') - def list_routes(self): + @login_required + def list_routes(): import urllib output = [] for rule in app.url_map.iter_rules(): options = {} for arg in rule.arguments: options[arg] = "[{0}]".format(arg) - + print(rule.endpoint) methods = ','.join(rule.methods) url = url_for(rule.endpoint, **options) - line = urllib.unquote( + line = urllib.parse.unquote( "{:50s} {:20s} {}".format(rule.endpoint, methods, url)) output.append(line) diff --git a/app/views/order.py b/app/views/order.py new file mode 100644 index 0000000..e3f094c --- /dev/null +++ b/app/views/order.py @@ -0,0 +1,61 @@ +__author__ = 'feliciaan' +from flask import url_for, render_template, abort, redirect +from flask.ext.login import current_user, login_required +from datetime import datetime + +from app import app, db +from models import Order, OrderItem +from forms import OrderItemForm, OrderForm + + +@app.route('/order/