Merge pull request #7 from StefBuwalda/development

Refactor add meal flow and remove v2 routes

app.py

@@ -11,8 +11,8 @@ 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
-from application.add_meal.routes import bp as add_meal_bp
 from application.auth.routes import bp as auth_bp
+from application.add_meal.routes import bp as add_meal_bp
 from typing import Optional
 
 # Config
@@ -29,8 +29,13 @@ def load_user(user_id: int):
 # Register blueprints
 app.register_blueprint(admin_bp)
 app.register_blueprint(user_bp)
-app.register_blueprint(add_meal_bp)
 app.register_blueprint(auth_bp)
+app.register_blueprint(add_meal_bp)
+
+
+# @app.errorhandler(404)
+# def page_not_found(e):
+#    return redirect("/")
 
 
 # Routes

application/add_meal/routes.py

@@ -6,14 +6,13 @@ from flask import (
     session,
     request,
     jsonify,
-    abort,
 )
 from flask_login import current_user
 from forms import FoodItemForm, FoodLogForm
 from application import db
 from models import FoodItem, FoodLog
 from sqlalchemy import and_, or_
-from datetime import datetime, timedelta, timezone
+from datetime import datetime
 from sqlalchemy.sql.elements import BinaryExpression
 from typing import cast
 
@@ -25,31 +24,34 @@ bp = Blueprint(
 )
 
 
+def date_present(func):
+    def check_date():
+        if "selected_date" not in session:
+            return redirect(url_for("user.daily_log"))
+
+
+def item_selected(func):
+    def check_item():
+        if check_item():
+            if "item_id" not in session:
+                return redirect(url_for("add_meal.find_item"))
+
+
 @bp.before_request
 def login_required():
     if not current_user.is_authenticated:
         return redirect(url_for("auth.login"))
 
 
-@bp.route("/select_meal/<int:meal_type>", methods=["GET"])
+@date_present
-def step1(meal_type: int):
+@bp.route("/find_item", methods=["GET"])
-    assert type(meal_type) is int
+def find_item():
-    assert 0 <= meal_type <= 3
+    return render_template("find_item.html")
-    session["meal_type"] = meal_type
-    return redirect(url_for("add_meal.step2"))
 
 
-@bp.route("/get_barcode", methods=["GET"])
+@date_present
-def step2():
+@bp.route("/select_item/<string:input>", methods=["GET"])
-    return render_template("scan_barcode.html")
+def select_item(input: str):
-
-
-@bp.route("/step3/<string:input>", methods=["GET"])
-def step3(input: str):
-    # check if meal_type cookie is set
-    if "meal_type" not in session:
-        return redirect("/")
-
     # Check if input is a barcode
     if input.isdigit():
         item = current_user.food_items.filter_by(barcode=input).first()
@@ -59,26 +61,28 @@ def step3(input: str):
 
     if item is None:
         # Does not exist, add item
-        return redirect(url_for("add_meal.step3_alt1", input=input))
+        return redirect(url_for("add_meal.add_new_item", input=input))
 
     # Track item to add and continue to next step
     session["item_id"] = item.id
     return redirect(url_for("add_meal.step4"))
 
 
-@bp.route("/step3_alt1/<string:input>", methods=["GET"])
+@date_present
-def step3_alt1(input: str):
+@bp.route("/add_new_item/<string:input>", methods=["GET"])
+def add_new_item(input: str):
     form = FoodItemForm()
 
     if input.isdigit():
         form.barcode.data = input
     else:
         form.name.data = input
-    return render_template("add_item.html", form=form)
+    return render_template("add_new_item.html", form=form)
 
 
-@bp.route("/step3_alt1/<string:input>", methods=["POST"])
+@date_present
-def step3_alt1_post(input: str):
+@bp.route("/add_new_item/<string:input>", methods=["POST"])
+def post_new_item(input: str):
     form = FoodItemForm()
 
     if form.validate_on_submit():
@@ -122,25 +126,20 @@ def step3_alt1_post(input: str):
             print(f"Item exists: {item.barcode} {item.name}")
 
         # Item added or already present, return to step 3.
-        return redirect(url_for("add_meal.step3", input=input))
+        return redirect(url_for("add_meal.select_item", input=input))
     else:
         print("[DEBUG] Form Invalid")
-        return redirect(url_for("add_meal.step3_alt1", input=input))
+        return redirect(url_for("add_meal.add_new_item", input=input))
 
 
+@date_present
+@item_selected
 @bp.route("/step4", methods=["GET", "POST"])
 def step4():
-    if "item_id" not in session:
-        return redirect(url_for("add_meal.step2"))
     form = FoodLogForm()
     item = db.session.get(FoodItem, session["item_id"])
-
+    if not item:
-    offset = session["offset"]
+        return redirect(url_for("add_meal.find_item"))
-    if offset is None or item is None:
-        abort(404)
-
-    today = datetime.now(timezone.utc).date()
-    day = today + timedelta(days=offset)
 
     if form.validate_on_submit():
         assert form.amount.data
@@ -149,29 +148,20 @@ def step4():
                 food_item_id=item.id,
                 user_id=current_user.id,
                 amount=form.amount.data,
-                part_of_day=session["meal_type"],
+                date_=datetime.strptime(
-                date_=day,
+                    session["selected_date"], "%Y-%m-%d"
+                ).date(),
             )
         )
         db.session.commit()
-        session.pop("meal_type")
         session.pop("item_id")
-        return redirect(url_for("user.daily_log", offset=offset))
+        session.pop("selected_date")
+        return redirect(url_for("user.daily_log"))
 
-    match session["meal_type"]:
+    return render_template("step4.html", item=item, form=form)
-        case 0:
-            tod = "Breakfast"
-        case 1:
-            tod = "Lunch"
-        case 2:
-            tod = "Dinner"
-        case 3:
-            tod = "Snack"
-        case _:
-            tod = "Unknown"
-    return render_template("step4.html", tod=tod, item=item, form=form)
 
 
+@date_present
 @bp.route("/query", methods=["GET"])
 def query():
     q = request.args.get("q", "").strip().lower()

application/add_meal/templates/find_item.html

@@ -0,0 +1,126 @@
+{% extends "base.html" %}
+
+{% block content %}
+<div class="container d-flex flex-column justify-content-start align-items-center py-4" style="min-height: 100vh;">
+    <div class="card shadow-sm w-100" style="max-width: 480px;">
+        <div class="card-body d-flex flex-column">
+            <h5 class="card-title text-center mb-4">Item Scanner</h5>
+            <video id="camera" autoplay class="w-100 mb-3" style="aspect-ratio: 4/3;" muted></video>
+
+            <div class="mb-3">
+                <label for="manualSearch" class="form-label">Or search manually</label>
+                <input type="text" class="form-control" id="manualSearch" placeholder="Enter item name">
+            </div>
+
+            <ul class="list-group mb-3" id="searchResults"></ul>
+
+            <button class="btn btn-primary w-100" id="createItemBtn">Create New Item</button>
+        </div>
+    </div>
+</div>
+{% endblock%}
+
+{% block scripts %}
+<script>
+    const baseURL = "{{url_for('add_meal.select_item', input='!')}}";
+    const baseURL2 = "{{url_for('add_meal.add_new_item', input='!')}}";
+</script>
+<script type="module">
+    // Import barcode scanner
+    import { BrowserMultiFormatReader } from 'https://cdn.jsdelivr.net/npm/@zxing/library@0.21.3/+esm';
+
+    // constants
+    const codeReader = new BrowserMultiFormatReader();
+    const videoElement = document.getElementById('camera');
+
+    // Start async camera thingymibob
+    document.addEventListener('DOMContentLoaded', async () => {
+        console.log('[DEBUG] Page loaded, starting barcode scan');
+
+        try {
+            await navigator.mediaDevices.getUserMedia({ video: true });
+        } catch (err) {
+            alert("No camera found or no camera permission");
+            console.error("Could not access the camera:", err);
+            return;
+        }
+
+        console.log('[DEBUG] Permission given and at least one device present');
+        const devices = await codeReader.listVideoInputDevices();
+        console.log('[DEBUG] Cameras found:', devices);
+
+        const rearCamera = devices.find(device => device.label.toLowerCase().includes('back'))
+            || devices.find(device => device.label.toLowerCase().includes('rear'))
+            || devices[0]; // fallback
+
+        const selectedDeviceId = rearCamera?.deviceId;
+        await codeReader.decodeFromVideoDevice(selectedDeviceId, videoElement, async (result, err) => {
+            if (result) {
+                // Result found, redirect to the URL
+                console.log(result)
+                const codeText = result.getText();
+                window.location.href = baseURL.replace("!", encodeURIComponent(codeText));
+            }
+        });
+    });
+</script>
+
+<script>
+    const searchInput = document.getElementById('manualSearch');
+    const resultsList = document.getElementById('searchResults');
+    const createBtn = document.getElementById('createItemBtn');
+
+    let controller; // keeps track of the current fetch
+
+    // TODO: Debounce input, wait for user to stop typing (f.e. 300ms) 
+    searchInput.addEventListener('input', () => {
+        const query = searchInput.value.toLowerCase();
+
+        // Check if there is enough input to fetch
+        if (query.length < 2) {
+            resultsList.innerHTML = '';
+            return;
+        }
+
+        if (controller) controller.abort(); // Abort previous fetch if still running
+        controller = new AbortController(); // new controller for this fetch
+        const signal = controller.signal;   // Signal to fetch to listen for aborts
+
+        fetch(`{{url_for("add_meal.query")}}?q=${encodeURIComponent(query)}`, { signal })
+            .then(response => response.json())
+            .then(data => {
+                resultsList.innerHTML = ''; // clear before appending
+                data.forEach(item => {
+                    // Create list item with button inside that changes the hidden form and submits it
+                    const li = document.createElement('li');
+                    li.className = 'list-group-item p-0';
+                    const btn = document.createElement('button');
+                    btn.className = 'list-group-item list-group-item-action m-0 border-0';
+                    btn.style.width = '100%'; // make it fill the li
+                    btn.textContent = item;
+
+                    btn.addEventListener('click', () => {
+                        window.location.href = baseURL.replace("!", encodeURIComponent(item));
+                    });
+
+                    li.appendChild(btn);
+                    resultsList.appendChild(li);
+                });
+            }).catch(err => {
+                if (err.name == 'AbortError') {
+                    console.log("Fetch aborted");
+                }
+                if (err.name !== 'AbortError') {
+                    console.error('Fetch error:', err);
+                }
+            });
+    });
+</script>
+<script>
+    createBtn.addEventListener('click', () => {
+        const newItem = searchInput.value.trim()
+        window.location.href = newItem ? baseURL2.replace("!", encodeURIComponent(newItem)) : baseURL2;
+    });
+</script>
+
+{% endblock %}

application/add_meal/templates/scan_barcode.html

@@ -1,134 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-<div class="container py-5">
-    <!-- Header -->
-    <div class="text-center mb-4">
-        <h1 class="fw-bold">Barcode Scanner</h1>
-        <p class="text-muted">Use your camera to scan barcodes</p>
-    </div>
-
-    <!-- Video preview -->
-    <div class="d-flex justify-content-center mb-4">
-        <video id="video" class="border rounded shadow-sm" style="width: 100%; max-width: 500px;" autoplay
-            muted></video>
-    </div>
-
-    <!-- Start/Stop buttons -->
-    <div class="d-flex justify-content-center gap-3 mb-4">
-        <button id="startButton" class="btn btn-primary px-4">Start Scanning</button>
-        <button id="stopButton" class="btn btn-danger px-4">Stop</button>
-    </div>
-
-    <!-- Search box and suggestions -->
-    <div class="d-flex justify-content-center mt-4">
-        <div class="w-100 position-relative" style="max-width: 500px;">
-            <!-- Input group (search + go button) -->
-            <div class="input-group">
-                <input type="text" id="search-box" class="form-control" placeholder="Search..." autocomplete="off">
-                <button id="go-button" class="btn btn-success">Go</button>
-            </div>
-
-            <!-- Suggestions -->
-            <ul id="suggestions" class="list-group position-absolute w-100 mt-1" style="z-index: 1000;"></ul>
-        </div>
-    </div>
-
-
-    <!-- Suggestions list -->
-    <div class="d-flex justify-content-center">
-        <ul id="suggestions" class="list-group position-absolute mt-1 w-100" style="max-width: 500px; z-index: 1000;">
-        </ul>
-    </div>
-</div>
-
-
-
-
-
-<script>
-    const searchBox = document.getElementById('search-box');
-    const suggestionsBox = document.getElementById('suggestions');
-    const goButton = document.getElementById('go-button');
-
-    searchBox.addEventListener('input', function () {
-        const query = searchBox.value;
-        if (query.length < 2) {
-            suggestionsBox.innerHTML = '';
-            return;
-        }
-
-        fetch(`{{url_for("add_meal.query")}}?q=${encodeURIComponent(query)}`)
-            .then(response => response.json())
-            .then(data => {
-                suggestionsBox.innerHTML = '';
-                data.forEach(item => {
-                    const li = document.createElement('li');
-                    li.textContent = item;
-
-                    // Apply Bootstrap classes
-                    li.classList.add('list-group-item', 'list-group-item-action', 'cursor-pointer');
-
-                    // Add click behavior
-                    li.addEventListener('click', () => {
-                        searchBox.value = item;
-                        suggestionsBox.innerHTML = '';
-                    });
-
-                    // Add to suggestions box
-                    suggestionsBox.appendChild(li);
-                });
-            });
-    });
-
-    // ✅ Redirect when the "Go" button is clicked
-    goButton.addEventListener('click', () => {
-        const value = searchBox.value.trim();
-        if (value) {
-            const baseURL = "{{url_for('add_meal.step3', input='!')}}";
-            window.location.href = baseURL.replace("!", encodeURIComponent(value));
-        }
-    });
-</script>
-
-<script type="module">
-    import { BrowserMultiFormatReader } from 'https://cdn.jsdelivr.net/npm/@zxing/library@0.21.3/+esm';
-
-    // constants
-    const codeReader = new BrowserMultiFormatReader();
-    const videoElement = document.getElementById('video');
-
-
-    // Start scanning for barcode
-    document.getElementById('startButton').addEventListener('click', async () => {
-        console.log('[DEBUG] Start button clicked')
-        try {
-            await navigator.mediaDevices.getUserMedia({ video: true });
-        } catch (err) {
-            alert("No camera found or no camera permission");
-            console.error("Could not access the camera:", err);
-            return;
-        }
-        console.log('[DEBUG] Permission given and at least one device present');
-        const devices = await codeReader.listVideoInputDevices();
-        console.log('[DEBUG] Cameras found:', devices);
-        const rearCamera = devices.find(device => device.label.toLowerCase().includes('back'))
-            || devices.find(device => device.label.toLowerCase().includes('rear'))
-            || devices[0]; // fallback
-
-        const selectedDeviceId = rearCamera?.deviceId;
-        await codeReader.decodeFromVideoDevice(selectedDeviceId, videoElement, async (result, err) => {
-            if (result) {
-                // Result found, this should post the barcode
-                const codeText = result.getText();
-                const baseURL = "{{url_for('add_meal.step3', input='!')}}";
-                window.location.href = baseURL.replace("!", encodeURIComponent(codeText));
-            }
-        })
-    })
-
-    document.getElementById('stopButton').addEventListener('click', () => {
-        codeReader.reset();
-    });
-</script>
-{% endblock %}

application/add_meal/templates/step4.html

@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
 {% block content %}
-<p>{{ tod }}</p>
 <p>{{ item.name }}</p>
 
 <form method="POST">

application/auth/routes.py

@@ -1,8 +1,8 @@
-from flask import Blueprint, request, render_template, redirect, url_for
+from flask import Blueprint, render_template, redirect, url_for
 from flask_login import current_user, login_user, logout_user
 from forms import LoginForm, ChangePasswordForm
 from models import User
-from application.utils import default_return
+from application.utils import default_return, is_valid_timezone
 from application import db
 
 bp = Blueprint(
@@ -19,12 +19,16 @@ def login():
 
     form = LoginForm()
     if form.validate_on_submit():
+        assert form.timezone.data
         user = User.query.filter_by(username=form.username.data).first()
         if user and user.check_password(password=form.password.data):
             # User found and password correct
-            next_page = request.args.get("next")  # Get next page if given
+            tz = form.timezone.data
+            if is_valid_timezone(tz):
+                user.set_timezone(tz)
+                db.session.commit()
             login_user(user)  # Log in the user
-            return default_return(next_page=next_page)
+            return default_return()
         else:
             pass
             # invalid user

application/auth/templates/login.html

@@ -3,7 +3,10 @@
 {% block content %}
 <div class="container d-flex justify-content-center align-items-center">
     <div class="card shadow-sm p-4" style="width: 100%; max-width: 400px;">
-        <h3 class="mb-4 text-center">Login</h3>
+        <h3 class="mb-1 text-center">Login</h3>
+        <p class="text-center text-muted small mb-4">
+            Your timezone will be saved to show times correctly.
+        </p>
         <form method="post">
             {{ form.hidden_tag() }}
 
@@ -27,10 +30,21 @@
                 {% endif %}
             </div>
 
+            {{ form.timezone(id="timezone") }}
+
             <div class="d-grid">
                 {{ form.submit(class="btn btn-primary btn-lg") }}
             </div>
         </form>
     </div>
 </div>
-{% endblock%}
+{% endblock %}
+
+{% block scripts %}
+<script>
+    document.addEventListener('DOMContentLoaded', () => {
+        const tzField = document.getElementById('timezone');
+        tzField.value = Intl.DateTimeFormat().resolvedOptions().timeZone;
+    });
+</script>
+{% endblock %}

application/templates/base.html

@@ -23,10 +23,7 @@
                 <div class="d-flex w-100">
                     <ul class="navbar-nav flex-grow-1">
                         <li class="nav-item">
-                            <a class="nav-link" href="{{ url_for('user.daily_log') }}">Daily Log</a>
+                            <a class="nav-link" href="{{ url_for('user.daily_log') }}">Daily Log (new)</a>
-                        </li>
-                        <li class="nav-item">
-                            <a class="nav-link" href="{{ url_for('user.daily_log2') }}">Daily Log (new)</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link" href="{{ url_for('user.dashboard') }}">Dashboard</a>
@@ -83,6 +80,9 @@
     </script>
 
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
+
+    {% block scripts %}
+    {% endblock %}
 </body>
 
 </html>

application/templates/login.html

@@ -1,36 +0,0 @@
-{% extends "base.html" %}
-
-{% block content %}
-<div class="container d-flex justify-content-center align-items-center">
-    <div class="card shadow-sm p-4" style="width: 100%; max-width: 400px;">
-        <h3 class="mb-4 text-center">Login</h3>
-        <form method="post" novalidate>
-            {{ form.hidden_tag() }}
-
-            <div class="mb-3">
-                {{ form.username.label(class="form-label") }}
-                {{ form.username(class="form-control", placeholder="Enter username") }}
-                {% if form.username.errors %}
-                <div class="text-danger small">
-                    {{ form.username.errors[0] }}
-                </div>
-                {% endif %}
-            </div>
-
-            <div class="mb-3">
-                {{ form.password.label(class="form-label") }}
-                {{ form.password(class="form-control", placeholder="Enter password") }}
-                {% if form.password.errors %}
-                <div class="text-danger small">
-                    {{ form.password.errors[0] }}
-                </div>
-                {% endif %}
-            </div>
-
-            <div class="d-grid">
-                {{ form.submit(class="btn btn-primary btn-lg") }}
-            </div>
-        </form>
-    </div>
-</div>
-{% endblock%}

application/user/routes.py

@@ -11,10 +11,10 @@ from flask_login import current_user
 from application import db
 from forms import FoodItemForm
 from models import FoodItem, FoodLog
-from datetime import datetime, timezone, timedelta
+from datetime import datetime
-from application.utils import login_required
+from application.utils import login_required, macro_arr_to_json
-from typing import cast
 from numpy import array
+from zoneinfo import ZoneInfo
 
 user_bp = Blueprint(
     "user",
@@ -22,58 +22,6 @@ user_bp = Blueprint(
     template_folder="templates",
 )
 
-
-def macro_arr_to_json(data: list[float]):
-    assert len(data) == 4
-    cal = data[0]
-    pro = data[3]
-    car = data[2]
-    fat = data[1]
-    macros = [
-        {
-            "name": "Calories",
-            "current": cal,
-            "target": 2000,
-            "bar_width": 100 - abs(cal / 20 - 100),
-            "bar_width_overflow": max(0, cal / 20 - 100),
-            "unit": " kcal",
-            "color": "bg-calories",
-            "overflow_color": "bg-calories-dark",
-        },
-        {
-            "name": "Protein",
-            "current": pro,
-            "target": 150,
-            "bar_width": 100 - abs(pro / 1.5 - 100),
-            "bar_width_overflow": max(0, pro / 1.5 - 100),
-            "unit": "g",
-            "color": "bg-protein",
-            "overflow_color": "bg-protein-dark",
-        },
-        {
-            "name": "Carbs",
-            "current": car,
-            "target": 250,
-            "bar_width": 100 - abs(car / 2.5 - 100),
-            "bar_width_overflow": max(0, car / 2.5 - 100),
-            "unit": "g",
-            "color": "bg-carbs",
-            "overflow_color": "bg-carbs-dark",
-        },
-        {
-            "name": "Fat",
-            "current": fat,
-            "target": 70,
-            "bar_width": 100 - abs(fat / 0.7 - 100),
-            "bar_width_overflow": max(0, fat / 0.7 - 100),
-            "unit": "g",
-            "color": "bg-fat",
-            "overflow_color": "bg-fat-dark",
-        },
-    ]
-    return macros
-
-
 user_bp.before_request(login_required)
 
 
@@ -83,6 +31,35 @@ def dashboard():
     return render_template("dashboard.html", items=items)
 
 
+@user_bp.route("/daily_log", methods=["GET"])
+def daily_log():
+    # Get today's date according to user's timezone
+    today = datetime.now(ZoneInfo(current_user.timezone)).date()
+
+    # Save date in session
+    session["selected_date"] = today.isoformat()
+
+    # Get logs from today
+    logs_today = current_user.food_logs.filter_by(
+        date_=today.isoformat()
+    ).all()
+
+    # calculate macros
+    macros = array((0.0, 0.0, 0.0, 0.0))
+    for log in logs_today:
+        macros += array(log.food_item.macros()) / 100 * log.amount
+    macros = macro_arr_to_json(macros.tolist())
+
+    # Render HTML
+    return render_template(
+        "daily_log.html",
+        macros=macros,
+        logs=logs_today,
+        today=today.strftime("%d/%m/%Y"),
+        min=min,
+    )
+
+
 @user_bp.route("/delete_food_item/<int:id>", methods=["POST"])
 def delete_food_item(id: int):
     item = FoodItem.query.get(id)
@@ -119,52 +96,6 @@ def edit_food_item(id: int):
     return redirect(url_for("user.dashboard"))
 
 
-@user_bp.route("/", methods=["GET"])
-@user_bp.route("/<offset>", methods=["GET"])
-def daily_log(offset: int = 0):
-    try:
-        offset = int(offset)
-    except ValueError:
-        abort(400)  # or handle invalid input
-    today = datetime.now(timezone.utc).date()
-    day = today + timedelta(days=offset)
-    session["offset"] = offset
-    logs_today = current_user.food_logs.filter_by(date_=day).all()
-    logs = [[], [], [], []]
-    calories: float = 0
-    protein: float = 0
-    carbs: float = 0
-    fat: float = 0
-    for log in logs_today:
-        logs[log.part_of_day].append(log)
-        calories += log.amount * log.food_item.energy_100 / 100
-        protein += log.amount * log.food_item.protein_100 / 100
-        carbs += log.amount * log.food_item.carbs_100 / 100
-        fat += log.amount * log.food_item.fat_100 / 100
-    return render_template(
-        "daily_log.html",
-        date=(day.strftime("%d/%m/%y")),
-        logs=logs,
-        calories=calories,
-        protein=protein,
-        carbs=carbs,
-        fat=fat,
-        offset=offset,
-    )
-
-
-@user_bp.route("/daily_log2", methods=["GET"])
-def daily_log2():
-    today = datetime.now(timezone.utc).date()
-    logs_today = current_user.food_logs.filter_by(date_=today).all()
-    macros = array((0.0, 0.0, 0.0, 0.0))
-    for log in logs_today:
-        item = cast(FoodItem, log.food_item)
-        macros += array(item.macros()) / 100 * log.amount
-    macros = macro_arr_to_json(macros.tolist())
-    return render_template("daily_log2.html", macros=macros, logs=logs_today)
-
-
 @user_bp.route("/remove_log/<int:id>", methods=["POST"])
 def remove_log(id: int):
     log = db.session.get(FoodLog, id)
@@ -175,6 +106,4 @@ def remove_log(id: int):
     # Delete log
     db.session.delete(log)
     db.session.commit()
-    if "offset" in session:
-        return redirect(url_for("user.daily_log", offset=session["offset"]))
     return redirect(url_for("user.daily_log"))

application/user/templates/daily_log.html

@@ -1,211 +1,65 @@
-{% extends "base.html" %}
+{% extends 'base.html' %}
 
-{% block title %}
+{% block title %}Daily Calorie Dashboard{% endblock %}
-Food Nutritional Info
-{% endblock %}
 
 {% block content %}
+<div class="container my-4">
+    <h2 class="mb-3">Daily Calorie Dashboard ({{ today }})</h2>
 
-<!-- Daily Overview Section -->
+    <!-- Macro Summary -->
-<div class="container">
+    <div class="card p-3 mb-3">
-
+        <h5>Macros</h5>
-    <div class="mb-4 p-3 border rounded d-flex align-items-center justify-content-between">
+        {% for macro in macros %}
-        <!-- Previous Day Button -->
+        <div class="mb-2">
-        <form method="get" action="{{url_for('user.daily_log', offset=offset - 1)}}" class="m-0">
+            <span class="macro-text">{{ macro.name }}: {{ macro.current }} / {{ macro.target }}</span>
-            <button type="submit" class="btn btn-outline-primary d-flex align-items-center justify-content-center"
+            <div class="progress rounded" style="height: 24px;">
-                style="width: 40px; height: 40px;">
+                <div class="progress-bar bg-danger macro-bar" role="progressbar"
-                &laquo;
+                    style="width: {{ macro.bar_width_overflow }}%">
-            </button>
+                    {{ (macro.current - macro.target) }}{{ macro.unit }}
-        </form>
-
-        <!-- Main Content -->
-        <div class="flex-grow-1 text-center">
-            <h2>Daily Overview ({{date}})</h2>
-
-            <!-- Row 1 -->
-            <div class="row justify-content-center text-center mb-2">
-                <div class="col-auto">
-                    <strong>Calories:</strong> {{ '%.0f' % calories }} kcal
                 </div>
-                <div class="col-auto">
+                <div class="progress-bar bg-success macro-bar" role="progressbar" style="width: {{ macro.bar_width }}%">
-                    <strong>Protein:</strong> {{ '%.1f' % protein }} g
+                    {{ min(macro.current, macro.target) }}{{ macro.unit }}
                 </div>
             </div>
+        </div>
+        {% endfor %}
+    </div>
 
-            <!-- Row 2 -->
+    <!-- Items List -->
-            <div class="row justify-content-center text-center">
+    <div class="card p-3">
-                <div class="col-auto">
+        <h5>Items Eaten Today</h5>
-                    <strong>Carbs:</strong> {{ '%.1f' % carbs }} g
+        <div class="list-group list-group-flush">
-                </div>
+            {% for log in logs %}
-                <div class="col-auto">
+            <div class="list-group-item item-row d-flex justify-content-between align-items-center">
-                    <strong>Fat:</strong> {{ '%.1f' % fat }} g
+                <span>({{ log.amount }}g) {{ log.food_item.name }}</span>
-                </div>
+                <span>{{ log.food_item.energy_100 * log.amount / 100 }} kcal</span>
-            </div>
-        </div>
-
-        <!-- Next Day Button -->
-        <form method="get" action="{{url_for('user.daily_log', offset=offset + 1)}}" class="m-0">
-            <button type="submit" class="btn btn-outline-primary d-flex align-items-center justify-content-center"
-                style="width: 40px; height: 40px;">
-                &raquo;
-            </button>
-        </form>
-    </div>
-
-
-
-
-    <div class="p-3 border rounded">
-        <div class="text-center">
-            <h2>Eaten today</h2>
-        </div>
-        <div class="p-3 mb-2 border rounded">
-            <!-- Header row (centered vertically for consistency) -->
-            <div class="row align-items-center mb-2">
-                <div class="col">
-                    <h4 class="mb-0">Breakfast</h4>
-                </div>
-                <div class="col-auto text-end" style="min-width: 80px;">
-                    <h4 class="mb-0">Amount</h4>
-                </div>
-                <div class="col-auto text-end" style="min-width: 80px;">
-                    <a href="{{ url_for('add_meal.step1', meal_type=0) }}"
-                        class="btn btn-sm btn-primary px-3 py-1">Add</a>
-                </div>
-            </div>
-
-            <!-- Data rows -->
-            <div>
-                {% for log in logs[0] %}
-                <div class="row mb-2">
-                    <div class="col text-wrap">
-                        {{ log.food_item.name }}
-                    </div>
-                    <div class="col-auto text-end align-self-start" style="min-width: 80px;">
-                        {{ "{:g}".format(log.amount) }}
-                    </div>
-                    <div class="col-auto text-end align-self-start" style="min-width: 80px;">
-                        <form method="POST" action="{{url_for('user.remove_log', id=log.id)}}" class="d-inline">
-                            <button type="submit" class="btn btn-sm btn-danger px-3 py-1"
-                                title="Delete">&times;</button>
-                        </form>
-                    </div>
             </div>
             {% endfor %}
         </div>
     </div>
 
 
+</div>
 
+<!-- Bottom Navigation Buttons -->
+<div class="container-fluid fixed-bottom py-2">
+    <div class="d-flex p-3">
+        <!-- Left Button -->
+        <a href="" class="btn card flex-fill me-2 rounded-pill">
+            ‹ Previous
+        </a>
 
-        <div class="p-3 mb-2 border rounded">
+        <!-- Center Button (highlighted) -->
-            <!-- Header row (centered vertically for consistency) -->
+        <a id="set_link_date" href="{{ url_for('add_meal.find_item') }}"
-            <div class="row align-items-center mb-2">
+            class="btn btn-success flex-fill mx-2 fw-bold rounded-pill">
-                <div class="col">
+            ＋ Add Item
-                    <h4 class="mb-0">Lunch</h4>
+        </a>
-                </div>
-                <div class="col-auto text-end" style="min-width: 80px;">
-                    <h4 class="mb-0">Amount</h4>
-                </div>
-                <div class="col-auto text-end" style="min-width: 80px;">
-                    <a href="{{ url_for('add_meal.step1', meal_type=1) }}"
-                        class="btn btn-sm btn-primary px-3 py-1">Add</a>
-                </div>
-            </div>
 
-            <!-- Data rows -->
+        <!-- Right Button -->
-            <div>
+        <a href="" class="btn card flex-fill ms-2 rounded-pill">
-                {% for log in logs[1] %}
+            Next ›
-                <div class="row mb-2">
+        </a>
-                    <div class="col text-wrap">
-                        {{ log.food_item.name }}
-                    </div>
-                    <div class="col-auto text-end align-self-start" style="min-width: 80px;">
-                        {{ "{:g}".format(log.amount) }}
-                    </div>
-                    <div class="col-auto text-end align-self-start" style="min-width: 80px;">
-                        <form method="POST" action="{{url_for('user.remove_log', id=log.id)}}" class="d-inline">
-                            <button type="submit" class="btn btn-sm btn-danger px-3 py-1"
-                                title="Delete">&times;</button>
-                        </form>
-                    </div>
-                </div>
-                {% endfor %}
-            </div>
     </div>
+</div>
 
-        <div class="p-3 mb-2 border rounded">
+{% endblock %}
-            <!-- Header row (centered vertically for consistency) -->
-            <div class="row align-items-center mb-2">
-                <div class="col">
-                    <h4 class="mb-0">Dinner</h4>
-                </div>
-                <div class="col-auto text-end" style="min-width: 80px;">
-                    <h4 class="mb-0">Amount</h4>
-                </div>
-                <div class="col-auto text-end" style="min-width: 80px;">
-                    <a href="{{ url_for('add_meal.step1', meal_type=2) }}"
-                        class="btn btn-sm btn-primary px-3 py-1">Add</a>
-                </div>
-            </div>
-
-            <!-- Data rows -->
-            <div>
-                {% for log in logs[2] %}
-                <div class="row mb-2">
-                    <div class="col text-wrap">
-                        {{ log.food_item.name }}
-                    </div>
-                    <div class="col-auto text-end align-self-start" style="min-width: 80px;">
-                        {{ "{:g}".format(log.amount) }}
-                    </div>
-                    <div class="col-auto text-end align-self-start" style="min-width: 80px;">
-                        <form method="POST" action="{{url_for('user.remove_log', id=log.id)}}" class="d-inline">
-                            <button type="submit" class="btn btn-sm btn-danger px-3 py-1"
-                                title="Delete">&times;</button>
-                        </form>
-                    </div>
-                </div>
-                {% endfor %}
-            </div>
-        </div>
-
-        <div class="p-3 mb-2 border rounded">
-            <!-- Header row (centered vertically for consistency) -->
-            <div class="row align-items-center mb-2">
-                <div class="col">
-                    <h4 class="mb-0">Snacks</h4>
-                </div>
-                <div class="col-auto text-end" style="min-width: 80px;">
-                    <h4 class="mb-0">Amount</h4>
-                </div>
-                <div class="col-auto text-end" style="min-width: 80px;">
-                    <a href="{{ url_for('add_meal.step1', meal_type=3) }}"
-                        class="btn btn-sm btn-primary px-3 py-1">Add</a>
-                </div>
-            </div>
-
-            <!-- Data rows -->
-            <div>
-                {% for log in logs[3] %}
-                <div class="row mb-2">
-                    <div class="col text-wrap">
-                        {{ log.food_item.name }}
-                    </div>
-                    <div class="col-auto text-end align-self-start" style="min-width: 80px;">
-                        {{ "{:g}".format(log.amount) }}
-                    </div>
-                    <div class="col-auto text-end align-self-start" style="min-width: 80px;">
-                        <form method="POST" action="{{url_for('user.remove_log', id=log.id)}}" class="d-inline"
-                            onsubmit="return confirm('Are you sure you want to delete this item?');">
-                            <button type="submit" class="btn btn-sm btn-danger px-3 py-1"
-                                title="Delete">&times;</button>
-                        </form>
-                    </div>
-                </div>
-                {% endfor %}
-            </div>
-        </div>
-    </div>
-
-    {% endblock%}

application/user/templates/daily_log2.html

@@ -1,67 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %}Daily Calorie Dashboard{% endblock %}
-
-{% block content %}
-<link rel="stylesheet" href="{{ url_for('static', filename='css/macros.css') }}">
-
-<div class="container my-4">
-    <h2 class="mb-3">Daily Calorie Dashboard</h2>
-
-    <!-- Macro Summary -->
-    <div class="card p-3 mb-3">
-        <h5>Macros</h5>
-        {% for macro in macros %}
-        <div class="mb-2">
-            <span class="macro-text">{{ macro.name }}: {{ macro.current }} / {{ macro.target }}</span>
-            <div class="progress rounded" style="height: 24px;">
-                <div class="progress-bar bg-danger macro-bar" role="progressbar"
-                    style="width: {{ macro.bar_width_overflow }}%">
-                    {{ macro.current - macro.target }}{{ macro.unit }}
-                </div>
-                <div class="progress-bar bg-success macro-bar" role="progressbar" style="width: {{ macro.bar_width }}%">
-                    {{ macro.current }}{{ macro.unit }}
-                </div>
-            </div>
-        </div>
-        {% endfor %}
-    </div>
-
-    <!-- Items List -->
-    <div class="card p-3">
-        <h5>Items Eaten Today</h5>
-        <div class="list-group list-group-flush">
-            {% for log in logs %}
-            <div class="list-group-item item-row d-flex justify-content-between align-items-center bg-dark text-light">
-                <span>({{ log.amount }}g) {{ log.food_item.name }}</span>
-                <span>{{ log.food_item.energy_100 }} kcal</span>
-            </div>
-            {% endfor %}
-        </div>
-    </div>
-
-
-</div>
-
-<!-- Bottom Navigation Buttons -->
-<div class="container-fluid fixed-bottom py-2">
-    <div class="d-flex p-3">
-        <!-- Left Button -->
-        <a href="" class="btn btn-outline-light flex-fill me-2 rounded-pill">
-            ‹ Previous
-        </a>
-
-        <!-- Center Button (highlighted) -->
-        <a href="{{ url_for('add_meal.step1', meal_type=0) }}"
-            class="btn btn-success flex-fill mx-2 fw-bold rounded-pill">
-            ＋ Add Item
-        </a>
-
-        <!-- Right Button -->
-        <a href="" class="btn btn-outline-light flex-fill ms-2 rounded-pill">
-            Next ›
-        </a>
-    </div>
-</div>
-
-{% endblock %}

application/utils.py

@@ -1,6 +1,7 @@
 from flask_login import current_user
 from flask import redirect, url_for, flash
 from typing import Optional
+from zoneinfo import ZoneInfo
 
 
 def login_required():
@@ -19,3 +20,63 @@ def default_return(next_page: Optional[str] = None):
     if current_user.is_admin:
         return redirect(url_for("admin.food_items"))
     return redirect(url_for("dashboard"))
+
+
+def is_valid_timezone(tz: str) -> bool:
+    try:
+        ZoneInfo(tz)
+    except Exception:
+        print(Exception)
+        return False
+    return True
+
+
+def macro_arr_to_json(data: list[float]):
+    assert len(data) == 4
+    cal = data[0]
+    pro = data[3]
+    car = data[2]
+    fat = data[1]
+    macros = [
+        {
+            "name": "Calories",
+            "current": cal,
+            "target": 2000,
+            "bar_width": 100 - abs(cal / 20 - 100),
+            "bar_width_overflow": max(0, cal / 20 - 100),
+            "unit": " kcal",
+            "color": "bg-calories",
+            "overflow_color": "bg-calories-dark",
+        },
+        {
+            "name": "Protein",
+            "current": pro,
+            "target": 150,
+            "bar_width": 100 - abs(pro / 1.5 - 100),
+            "bar_width_overflow": max(0, pro / 1.5 - 100),
+            "unit": "g",
+            "color": "bg-protein",
+            "overflow_color": "bg-protein-dark",
+        },
+        {
+            "name": "Carbs",
+            "current": car,
+            "target": 250,
+            "bar_width": 100 - abs(car / 2.5 - 100),
+            "bar_width_overflow": max(0, car / 2.5 - 100),
+            "unit": "g",
+            "color": "bg-carbs",
+            "overflow_color": "bg-carbs-dark",
+        },
+        {
+            "name": "Fat",
+            "current": fat,
+            "target": 70,
+            "bar_width": 100 - abs(fat / 0.7 - 100),
+            "bar_width_overflow": max(0, fat / 0.7 - 100),
+            "unit": "g",
+            "color": "bg-fat",
+            "overflow_color": "bg-fat-dark",
+        },
+    ]
+    return macros

forms.py

@@ -4,13 +4,20 @@ from wtforms import (
     PasswordField,
     SubmitField,
     FloatField,
+    HiddenField,
 )
 from wtforms.validators import DataRequired, InputRequired, Optional
 
 
+class SelectDateForm(FlaskForm):
+    date = HiddenField(validators=[DataRequired()])
+    submit = SubmitField("＋ Add Item")
+
+
 class LoginForm(FlaskForm):
     username = StringField("Username", validators=[DataRequired()])
     password = PasswordField("Password", validators=[DataRequired()])
+    timezone = HiddenField("Timezone", validators=[DataRequired()])
     submit = SubmitField("Log in")
 
 

migrations/versions/65eaeafb0904_.py

@@ -0,0 +1,32 @@
+"""empty message
+
+Revision ID: 65eaeafb0904
+Revises: 9eb23abd5294
+Create Date: 2025-08-14 12:28:56.157288
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '65eaeafb0904'
+down_revision = '9eb23abd5294'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('food_log', schema=None) as batch_op:
+        batch_op.drop_column('part_of_day')
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('food_log', schema=None) as batch_op:
+        batch_op.add_column(sa.Column('part_of_day', sa.INTEGER(), nullable=False))
+
+    # ### end Alembic commands ###

migrations/versions/9eb23abd5294_.py

@@ -0,0 +1,40 @@
+"""empty message
+
+Revision ID: 9eb23abd5294
+Revises: 101002a6ef17
+Create Date: 2025-08-14 05:40:27.342711
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = "9eb23abd5294"
+down_revision = "101002a6ef17"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("user", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "timezone",
+                sa.String(length=64),
+                nullable=False,
+                server_default="UTC",
+            )
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("user", schema=None) as batch_op:
+        batch_op.drop_column("timezone")
+
+    # ### end Alembic commands ###

models.py

@@ -4,6 +4,7 @@ from application import db
 from typing import Optional
 from forms import FoodItemForm
 from datetime import datetime, timezone, date
+from application.utils import is_valid_timezone
 
 
 class User(UserMixin, db.Model):
@@ -11,6 +12,7 @@ class User(UserMixin, db.Model):
     id = db.Column(db.Integer, primary_key=True)
     username = db.Column(db.String(150), unique=True, nullable=False)
     password = db.Column(db.String, nullable=False)
+    timezone = db.Column(db.String(64), nullable=False, default="UTC")
     is_admin = db.Column(db.Boolean, nullable=False, default=False)
     must_change_password = db.Column(db.Boolean, nullable=False, default=False)
 
@@ -39,6 +41,10 @@ class User(UserMixin, db.Model):
     def set_pw_change(self, change: bool) -> None:
         self.must_change_password = change
 
+    def set_timezone(self, tz: str) -> None:
+        if is_valid_timezone(tz):
+            self.timezone = tz
+
 
 class Unit(db.Model):
     __tablename__ = "unit"
@@ -128,7 +134,6 @@ class FoodLog(db.Model):
     food_item_id = db.Column(
         db.Integer, db.ForeignKey("food_item.id"), nullable=False
     )
-    part_of_day = db.Column(db.Integer, nullable=False)
     user_id = db.Column(db.Integer, db.ForeignKey("user.id"), nullable=False)
     amount = db.Column(db.Float, nullable=False)
 
@@ -137,7 +142,6 @@ class FoodLog(db.Model):
         food_item_id: int,
         user_id: int,
         amount: float,
-        part_of_day: int,
         date_: Optional[date] = None,
     ):
         super().__init__()
@@ -146,4 +150,3 @@ class FoodLog(db.Model):
         self.amount = amount
         if date_ is not None:
             self.date_ = date_
-        self.part_of_day = part_of_day

requirements.txt

@@ -1,4 +1,4 @@
-alembic==1.16.1
+alembic==1.16.4
 blinker==1.9.0
 click==8.2.1
 colorama==0.4.6
@@ -7,12 +7,13 @@ Flask-Login==0.6.3
 Flask-Migrate==4.1.0
 Flask-SQLAlchemy==3.1.1
 Flask-WTF==1.2.2
-greenlet==3.2.2
+greenlet==3.2.4
 itsdangerous==2.2.0
 Jinja2==3.1.6
 Mako==1.3.10
 MarkupSafe==3.0.2
-SQLAlchemy==2.0.41
+numpy==2.3.2
-typing_extensions==4.13.2
+SQLAlchemy==2.0.43
+typing_extensions==4.14.1
 Werkzeug==3.1.3
 WTForms==3.2.1

seed.py

@@ -22,10 +22,10 @@ with app.app_context():
     )
 
     FoodLog.query.delete()
-    db.session.add(FoodLog(1, 1, 200, 0))
+    db.session.add(FoodLog(1, 1, 200))
-    db.session.add(FoodLog(1, 1, 200, 1))
+    db.session.add(FoodLog(1, 1, 200))
-    db.session.add(FoodLog(1, 1, 200, 2))
+    db.session.add(FoodLog(1, 1, 200))
-    db.session.add(FoodLog(1, 1, 200, 3))
+    db.session.add(FoodLog(1, 1, 200))
-    db.session.add(FoodLog(1, 1, 100, 1))
+    db.session.add(FoodLog(1, 1, 100))
 
     db.session.commit()