From 2112dfd8d9b2dd1fb950e6d43c983f6e7cf2babe Mon Sep 17 00:00:00 2001 From: ydb5755 Date: Mon, 7 Oct 2024 14:31:46 +0300 Subject: [PATCH] split templates into base and add url's --- app/routes.py | 18 +++++-- app/static/index.js | 1 + app/templates/base.html | 50 +++++++++++++++++ app/templates/budget_categories.html | 44 +++++++++++++++ app/templates/index.html | 81 +++------------------------- app/templates/vendors.html | 36 +++++++++++++ 6 files changed, 152 insertions(+), 78 deletions(-) create mode 100644 app/templates/base.html create mode 100644 app/templates/budget_categories.html create mode 100644 app/templates/vendors.html diff --git a/app/routes.py b/app/routes.py index b6db82f..f352ac2 100644 --- a/app/routes.py +++ b/app/routes.py @@ -17,6 +17,20 @@ def get_uploads_path() -> str: break return path +@app.route('/budget_categories') +def budget_categories(): + budget_categories = db.session.execute(select(BudgetCategory)).all() + return render_template('budget_categories.html', + budget_categories=budget_categories) + + +@app.route('/vendors') +def vendors(): + vendors = db.session.execute(select(Vendor)).all() + return render_template('vendors.html', + vendors=vendors) + + @app.route('/') def home(): # Get the current date @@ -38,13 +52,9 @@ def home(): dt_object = datetime.datetime.fromtimestamp(li[0].date) date_string = dt_object.strftime('%Y-%m-%d') li[0].date = date_string - vendors = db.session.execute(select(Vendor)).all() - budget_categories = db.session.execute(select(BudgetCategory)).all() files = os.listdir(get_uploads_path()) return render_template('index.html', files=files, - vendors=vendors, - budget_categories=budget_categories, all_line_items=all_line_items) @app.route('/upload_file/') diff --git a/app/static/index.js b/app/static/index.js index cfc963f..e259939 100644 --- a/app/static/index.js +++ b/app/static/index.js @@ -36,6 +36,7 @@ function startEditMode(id){ inputElem.value = placeholderText; inputElem.id = `vendor-input-${id}` vendor.appendChild(inputElem); + inputElem.focus() } document.addEventListener("DOMContentLoaded", (event) => { diff --git a/app/templates/base.html b/app/templates/base.html new file mode 100644 index 0000000..cbc3fe4 --- /dev/null +++ b/app/templates/base.html @@ -0,0 +1,50 @@ + + + + + + {% block title %}{% endblock title %} + + {% block stylesheet %}{% endblock stylesheet %} + + + + + {% block content %}{% endblock content %} + + + + + + + + + \ No newline at end of file diff --git a/app/templates/budget_categories.html b/app/templates/budget_categories.html new file mode 100644 index 0000000..39f4abb --- /dev/null +++ b/app/templates/budget_categories.html @@ -0,0 +1,44 @@ +{% extends 'base.html' %} +{% block title %}Budget Categories{% endblock title %} + +{% block content %} +
+
+
+
+ Budget Categories +
+
+ +
+
+ + +
+ +
+
+ + + + + + + + + + {% for bc in budget_categories %} + + + + + + {% endfor %} + +
IDNameDelete
{{bc[0].id}}{{bc[0].name}}
+
+
+
+
+
+{% endblock content %} \ No newline at end of file diff --git a/app/templates/index.html b/app/templates/index.html index 8003774..192d61e 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -1,12 +1,8 @@ - - - - - - Budgeting - - - +{% extends 'base.html' %} +{% block title %}Homepage{% endblock title %} + +{% block content %} +
{% if files %}
@@ -80,69 +76,6 @@
-
-
- Budget Categories -
-
- -
-
- - -
- -
-
- - - - - - - - - - {% for bc in budget_categories %} - - - - - - {% endfor %} - -
IDNameDelete
{{bc[0].id}}{{bc[0].name}}
-
-
-
-
-
- Vendors -
-
-
- - - - - - - - - {% for vendor in vendors %} - - - - - {% endfor %} - -
IDName
{{vendor[0].id}}{{vendor[0].name}}
-
-
-
- - - - - +
+{% endblock content %} diff --git a/app/templates/vendors.html b/app/templates/vendors.html new file mode 100644 index 0000000..5ffaa99 --- /dev/null +++ b/app/templates/vendors.html @@ -0,0 +1,36 @@ +{% extends 'base.html' %} +{% block title %}Budget Categories{% endblock title %} + +{% block content %} +
+
+
+
+
+ Vendors +
+
+
+ + + + + + + + + {% for vendor in vendors %} + + + + + {% endfor %} + +
IDName
{{vendor[0].id}}{{vendor[0].name}}
+
+
+
+
+
+
+{% endblock content %} \ No newline at end of file