diff --git a/app.py b/app.py index 5163cfe..8b03b48 100644 --- a/app.py +++ b/app.py @@ -223,23 +223,7 @@ def delete_topset(person_id, workout_id, topset_id): def create_person(): name = request.form.get("name") new_person_id = db.create_person(name) - return f""" - - - { name } - - - - Edit - - - Remove - - - - """, 200, {"HX-Trigger": "updatedPeople"} + return render_template('partials/person.html', person_id=new_person_id, name=name), 200, {"HX-Trigger": "updatedPeople"} @ app.route("/person//delete", methods=['DELETE']) @@ -251,144 +235,46 @@ def delete_person(person_id): @ app.route("/person//edit_form", methods=['GET']) def get_person_edit_form(person_id): person = db.get_person(person_id) - return f""" - - - - - - - Update - - - Cancel - - - - """ + return render_template('partials/person.html', person_id=person_id, name=person['PersonName'], is_edit=True) @ app.route("/person//name", methods=['PUT']) def update_person_name(person_id): new_name = request.form.get("name") db.update_person_name(person_id, new_name) - return f""" - - - {new_name} - - - - Edit - - - Remove - - - - """, 200, {"HX-Trigger": "updatedPeople"} + return render_template('partials/person.html', person_id=person_id, name=new_name), 200, {"HX-Trigger": "updatedPeople"} @ app.route("/person//name", methods=['GET']) def get_person_name(person_id): person = db.get_person(person_id) - return f""" - - - {person['PersonName']} - - - - Edit - - - Remove - - - - """ + return render_template('partials/person.html', person_id=person_id, name=person['PersonName']) @ app.route("/exercise", methods=['POST']) def create_exercise(): name = request.form.get("name") new_exercise_id = db.create_exercise(name) - return f""" - - - {name} - - - - Edit - - - Remove - - - - """ + return render_template('partials/exercise.html', exercise_id=new_exercise_id, name=name) @ app.route("/exercise/", methods=['GET']) def get_exercise(exercise_id): exercise = db.get_exercise(exercise_id) - return f""" - - - {exercise['Name']} - - - - Edit - - - Remove - - - - """ + return render_template('partials/exercise.html', exercise_id=exercise_id, name=exercise['Name']) @ app.route("/exercise//edit_form", methods=['GET']) def get_exercise_edit_form(exercise_id): exercise = db.get_exercise(exercise_id) - return f""" - - - - - - - Update - - - Cancel - - - - """ + return render_template('partials/exercise.html', exercise_id=exercise_id, name=exercise['Name'], is_edit=True) @ app.route("/exercise//update", methods=['PUT']) def update_exercise(exercise_id): new_name = request.form.get('name') db.update_exercise(exercise_id, new_name) - return f""" - - - {new_name} - - - - Edit - - - Remove - - - - """ + return render_template('partials/exercise.html', exercise_id=exercise_id, name=new_name) @ app.route("/exercise//delete", methods=['DELETE']) diff --git a/templates/partials/exercise.html b/templates/partials/exercise.html new file mode 100644 index 0000000..4b2e5db --- /dev/null +++ b/templates/partials/exercise.html @@ -0,0 +1,33 @@ + + + {% if is_edit|default(false, true) == false %} + {{ name }} + {% else %} + + {% endif %} + + + {% if is_edit|default(false, true) == false %} + + Edit + + + Remove + + {% else %} + + Update + + + Cancel + + {% endif %} + + + \ No newline at end of file diff --git a/templates/partials/person.html b/templates/partials/person.html new file mode 100644 index 0000000..f484303 --- /dev/null +++ b/templates/partials/person.html @@ -0,0 +1,33 @@ + + + {% if is_edit|default(false, true) == false %} + {{ name }} + {% else %} + + {% endif %} + + + {% if is_edit|default(false, true) == false %} + + Edit + + + Remove + + {% else %} + + Update + + + Cancel + + {% endif %} + + + \ No newline at end of file diff --git a/templates/settings.html b/templates/settings.html index 1e7fc42..acfaf4b 100644 --- a/templates/settings.html +++ b/templates/settings.html @@ -29,21 +29,8 @@ {% for p in people %} - - - {{ p['Name'] }} - - - - Edit - - - Remove - - - + {{ render_partial('partials/person.html', person_id=p['PersonId'], + name=p['Name'])}} {% endfor %} @@ -107,21 +94,8 @@ {% for e in exercises %} - - - {{ e['Name'] }} - - - - Edit - - - Remove - - - + {{ render_partial('partials/exercise.html', exercise_id=e['ExerciseId'], + name=e['Name'])}} {% endfor %}