diff --git a/app.py b/app.py index 5ca7827..3a00546 100644 --- a/app.py +++ b/app.py @@ -180,55 +180,56 @@ def text_form(): check_for_new_user(session) if request.method == 'POST': - session["text1"] = { - "string": request.form["string1"], - "size": int(request.form["size1"]), - "pos": int(request.form["pos1"]), - "bold": "bold1" in request.form, - } - session["text2"] = { - "string": request.form["string2"], - "size": int(request.form["size2"]), - "pos": int(request.form["pos2"]), - "bold": "bold2" in request.form, - } + print(request.form) + #session["text1"] = { + # "string": request.form["string1"], + # "size": int(request.form["size1"]), + # "pos": int(request.form["pos1"]), + # "bold": "bold1" in request.form, + #} + #session["text2"] = { + # "string": request.form["string2"], + # "size": int(request.form["size2"]), + # "pos": int(request.form["pos2"]), + # "bold": "bold2" in request.form, + #} - # Clear previously saved font - for font in session["fonts"]: - session["fonts"][font]["selected"] = False + ## Clear previously saved font + #for font in session["fonts"]: + # session["fonts"][font]["selected"] = False - # If an invalid font has been submitted, just default to the first one - chosen_font = request.form["font"] - if chosen_font in session["fonts"]: - session["fonts"][chosen_font]["selected"] = True - else: - first_font = next(iter(session["fonts"])) - session["fonts"][first_font]["selected"] = True + ## If an invalid font has been submitted, just default to the first one + #chosen_font = request.form["font"] + #if chosen_font in session["fonts"]: + # session["fonts"][chosen_font]["selected"] = True + #else: + # first_font = next(iter(session["fonts"])) + # session["fonts"][first_font]["selected"] = True - # Select the first font that has been marked as selected - chosen_font = None - for font in session["fonts"]: - f = session["fonts"][font] - if f["selected"]: - chosen_font = f + ## Select the first font that has been marked as selected + #chosen_font = None + #for font in session["fonts"]: + # f = session["fonts"][font] + # if f["selected"]: + # chosen_font = f - # If the font is still None, something has gone wrong - if chosen_font is None: - return + ## If the font is still None, something has gone wrong + #if chosen_font is None: + # return - message, status, img = gen_image(label_width, session["text1"], session["text2"], chosen_font) + #message, status, img = gen_image(label_width, session["text1"], session["text2"], chosen_font) - if status == "Error": - session["text image path"] = None - return render_text_template(message, "red") + #if status == "Error": + # session["text image path"] = None + # return render_text_template(message, "red") - get_folder_path(session) + #get_folder_path(session) - session["text image path"] = text_image_filename - img.save(get_file_path(session, session["text image path"])) + #session["text image path"] = text_image_filename + #img.save(get_file_path(session, session["text image path"])) - print() - print(session["text image path"]) + #print() + #print(session["text image path"]) return render_text_template(scrollDown = True) diff --git a/templates/text.html b/templates/text.html index 7a985a7..14270bb 100644 --- a/templates/text.html +++ b/templates/text.html @@ -3,6 +3,7 @@ {% block head %} LabelPrinter Label generator + {% endblock %} {% block content %} @@ -17,32 +18,9 @@ -
-

Top text

- Text:
-
- Size:
- Y position:
- {% if text1["bold"]%} - Bold: - {% else %} - Bold: - {% endif %} + +
-

Bottom text

- Text:
-
- Size:
- Y position:
- {% if text2["bold"]%} - Bold: - {% else %} - Bold: - {% endif %}

Font

@@ -75,6 +53,85 @@
{% endif %} + {% endblock %}