From 2359769b5084bf4f8abb1612f375a789dab6d32d Mon Sep 17 00:00:00 2001 From: Marek Baczynski Date: Sun, 22 Oct 2017 20:22:48 +0200 Subject: [PATCH] adding and removing oneself --- MealHistory.json | 2 +- kuk.py | 42 +++++++++++++++++++++++++----------------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/MealHistory.json b/MealHistory.json index cb18847..7d64082 100644 --- a/MealHistory.json +++ b/MealHistory.json @@ -1 +1 @@ -[{"mid": 1, "date": "8-10-2017", "accounted": "yes", "kuk": "Marek", "eaters": ["Davide", "Sven", "Wille"], "flavorText": ""}, {"mid": 2, "date": "today", "accounted": "yes", "kuk": "Davide", "eaters": ["Marek", "Sven", "Wille", "Ahmed"], "flavorText": ""}, {"mid": 3, "date": "such food", "accounted": "yes", "kuk": "Sven", "eaters": ["Marek", "Ahmed"], "flavorText": ""}] \ No newline at end of file +[{"mid": 1, "date": "8-10-2017", "accounted": "yes", "kuk": "Marek", "eaters": ["Davide", "Sven", "Wille"], "flavorText": ""}, {"mid": 2, "date": "today", "accounted": "yes", "kuk": "Davide", "eaters": ["Marek", "Sven", "Wille", "Ahmed"], "flavorText": ""}, {"mid": 3, "date": "such food", "accounted": "no", "kuk": "Sven", "eaters": ["Davide", "Ahmed"], "flavorText": ""}] \ No newline at end of file diff --git a/kuk.py b/kuk.py index c0e007d..68a6c24 100644 --- a/kuk.py +++ b/kuk.py @@ -2,7 +2,7 @@ import random import operator import json from flask import Flask, Response, redirect, url_for, request, session, abort, render_template -from flask_login import LoginManager, UserMixin, login_required, login_user, logout_user +from flask_login import LoginManager, UserMixin, login_required, login_user, logout_user, current_user app = Flask(__name__) #config @@ -17,7 +17,7 @@ try: except IOError: print "Config file not found! Loading defaults" config = {} - config['ip'] = '127.0.0.1' + config['ip'] = '0.0.0.0' config['port'] = 5000 config['debug'] = True config['mealHistoryFile'] = "MealHistory.json" @@ -188,6 +188,28 @@ def login(): ''') +# adding to meal +@app.route("/addme") +@login_required +def addme(): + meal = Meal.getCurrent() + if current_user.name not in meal.eaters: + meal.eaters.append(current_user.name) + return Response('

Have a nice meal!

') + else: + return Response('

only one meal per person!

') + +#anti-adding to meal +@app.route("/removeme") +@login_required +def removeme(): + meal = Meal.getCurrent() + if current_user.name in meal.eaters: + meal.eaters.remove(current_user.name) + return Response('

no food for you!

') + else: + return Response('

insert joke here

') + # somewhere to logout @app.route("/logout") @login_required @@ -205,18 +227,4 @@ def page_not_found(e): # callback to reload the user object @login_manager.user_loader def load_user(userid): - return Person.get(userid) - -if __name__ == '__main__': - try: - with open (configFileName, 'r') as configFile: - config = json.load(configFile) - except IOError: - print "Config file not found! Loading defaults" - config = {} - config['ip'] = '127.0.0.1' - config['port'] = 5000 - config['debug'] = True - config['mealHistoryFile'] = "MealHistory.json" - config['peopleFile'] = "People.json" - load() \ No newline at end of file + return Person.get(userid) \ No newline at end of file