stef_buwalda/cal_counter
1
0
Fork 0
mirror of https://github.com/StefBuwalda/cal_counter.git synced 2025-10-30 11:19:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move food item routes to user blueprint

Browse Source 
Refactored food item related routes from app.py to application/user/routes.py under the user blueprint. Updated template and JS references to use the blueprint route names, improving code organization and modularity.
This commit is contained in:
Stef
2025-06-29 17:52:03 +02:00
parent a6f6cdf346
commit 1b79925b49
4 changed files with 54 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
app.py
View File

@@ -1,12 +1,12 @@
from flask import render_template, redirect, url_for, request, jsonify
from flask import render_template, redirect, url_for, request
from flask_login import (
login_required,
logout_user,
login_user,
current_user,
)
from forms import LoginForm, FoodItemForm
from models import User, FoodItem
from forms import LoginForm
from models import User
from application import db, app, login_manager
from application.admin.routes import admin_bp
from application.user.routes import user_bp
@@ -78,67 +78,6 @@ def scan():
return render_template("scan.html")
@app.route("/nutri/<int:barcode>", methods=["GET"])
@login_required
def nutri(barcode):
food = FoodItem.query.filter_by(barcode=barcode).first()
if food:
return jsonify(food.to_dict())
else:
return jsonify({})
@app.route("/food_item/<int:barcode>", methods=["GET"])
@login_required
def food_item(barcode):
food = FoodItem.query.filter_by(barcode=barcode).first()
if food:
return render_template("food_item.html", item=food)
else:
return render_template(
"add_food_item.html",
barcode=barcode,
form=FoodItemForm(barcode=barcode),
)
@app.route("/add_food_item", methods=["POST"])
@login_required
def add_food_item():
form = FoodItemForm()
if form.validate_on_submit():
print("[DEBUG] Valid form")
if FoodItem.query.filter_by(barcode=form.barcode.data).first() is None:
assert form.name.data is not None
assert form.energy.data is not None
assert form.protein.data is not None
assert form.carbs.data is not None
assert form.fat.data is not None
db.session.add(
FoodItem(
name=form.name.data,
owner_id=current_user.id,
energy=form.energy.data,
protein=form.protein.data,
carbs=form.carbs.data,
fat=form.fat.data,
barcode=form.barcode.data,
saturated_fat=form.saturated_fat.data,
sugar=form.sugar.data,
)
)
db.session.commit()
print("[DEBUG] New item added")
return redirect(url_for("food_item", barcode=form.barcode.data))
else:
print("[DEBUG] Invalid form")
if form.barcode.data:
return redirect(url_for("food_item", barcode=form.barcode.data))
else:
return redirect(url_for("scan"))
# Run
if __name__ == "__main__":