From f91d5ba980e0e2bf693c5af22ba86fb11e28eccd Mon Sep 17 00:00:00 2001
From: Marc Pervaz Boocha <mboocha@sudomsg.xyz>
Date: Sun, 30 Jul 2023 19:22:23 +0530
Subject: Fixed a set of bugs

Signed-off-by: Marc Pervaz Boocha <mboocha@sudomsg.xyz>
---
 src/expense/templates/auth/delete.html      | 4 +---
 src/expense/templates/auth/login.html       | 4 +---
 src/expense/templates/auth/register.html    | 4 +---
 src/expense/templates/base.html             | 4 ++--
 src/expense/templates/macros.html           | 2 +-
 src/expense/templates/tracker/cat.html      | 2 +-
 src/expense/templates/tracker/category.html | 3 ++-
 src/expense/templates/tracker/create.html   | 4 +---
 src/expense/templates/tracker/details.html  | 4 +---
 src/expense/templates/tracker/index.html    | 4 +---
 src/expense/templates/tracker/trans.html    | 3 ++-
 11 files changed, 14 insertions(+), 24 deletions(-)

(limited to 'src/expense/templates')
diff --git a/src/expense/templates/auth/delete.html b/src/expense/templates/auth/delete.html
index 6a2822e..6960907 100644
--- a/src/expense/templates/auth/delete.html
+++ b/src/expense/templates/auth/delete.html
@@ -1,9 +1,7 @@
 {% from 'macros.html' import label_field %}
 {% extends 'base.html' %}
 
-{% block header %}
-<h2>{% block title %}Delete the Account. This is non reversable{% endblock %}</h2>
-{% endblock %}
+{% block title %}Delete the Account. This is non reversable{% endblock %}
 
 {% block content %}
 <form method="post">
diff --git a/src/expense/templates/auth/login.html b/src/expense/templates/auth/login.html
index f223c3c..1734c77 100644
--- a/src/expense/templates/auth/login.html
+++ b/src/expense/templates/auth/login.html
@@ -1,9 +1,7 @@
 {% from 'macros.html' import label_field %}
 {% extends 'base.html' %}
 
-{% block header %}
-<h2>{% block title %}Log In{% endblock %}</h2>
-{% endblock %}
+{% block title %}Log In{% endblock %}
 
 {% block content %}
 <form method="post">
diff --git a/src/expense/templates/auth/register.html b/src/expense/templates/auth/register.html
index c08bc55..1d2c4fe 100644
--- a/src/expense/templates/auth/register.html
+++ b/src/expense/templates/auth/register.html
@@ -1,9 +1,7 @@
 {% from 'macros.html' import label_field %}
 {% extends 'base.html' %}
 
-{% block header %}
-<h1>{% block title %}Register{% endblock %}</h1>
-{% endblock %}
+{% block title %}Register{% endblock %}
 
 {% block content %}
 <form method="post">
diff --git a/src/expense/templates/base.html b/src/expense/templates/base.html
index d9c6759..3d3841d 100644
--- a/src/expense/templates/base.html
+++ b/src/expense/templates/base.html
@@ -4,7 +4,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>{% block title %}{% endblock %} - Expense</title>
+  <title>{% block title %}{% endblock %} Expense</title>
   <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
   <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/4.3.0/chart.umd.js"
     integrity="sha512-CMF3tQtjOoOJoOKlsS7/2loJlkyctwzSoDK/S40iAB+MqWSaf50uObGQSk5Ny/gfRhRCjNLvoxuCvdnERU4WGg=="
@@ -40,7 +40,7 @@
   </header>
   <main>
     <header>
-      {% block header %}{% endblock %}
+      {% block header %}<h2>{{ self.title() }}</h2>{% endblock %}
     </header>
     {% for message in get_flashed_messages() %}
     <div class="flash">{{ message }}</div>
diff --git a/src/expense/templates/macros.html b/src/expense/templates/macros.html
index 2d83155..66529bc 100644
--- a/src/expense/templates/macros.html
+++ b/src/expense/templates/macros.html
@@ -23,7 +23,7 @@
           <td><a href="{{ url_for("tracker.trans", id=row.id ) }}">Edit</a></td>
           <td><time datetime="{{ row.date.strftime("%Y-%m-%d") }}">{{ row.date.strftime("%d/%m/%Y") }}<time></td>
           <td><a href="{{ url_for("tracker.cat", id=row.category.id ) }}">{{ row.category.name }}</a></td>
-          <td>{{ row.description }}</td>
+          <td style="white-space: pre-wrap;min-width: 30rem;">{{ row.description }}</td>
           <td>{{ "%.2f"|format(row.amount) }}</td>
       </tr>
     {% endfor %}
diff --git a/src/expense/templates/tracker/cat.html b/src/expense/templates/tracker/cat.html
index ee35193..5cafa94 100644
--- a/src/expense/templates/tracker/cat.html
+++ b/src/expense/templates/tracker/cat.html
@@ -1,8 +1,8 @@
 {% from 'macros.html' import expense_table %}
 {% extends 'base.html' %}
 
+{% block title %}{{ category.name }}{% endblock %}
 
 {% block content %}
-<h2>{{ category.name }}</h2>
 {{ expense_table(table, total[0]) }}
 {% endblock %}
\ No newline at end of file
diff --git a/src/expense/templates/tracker/category.html b/src/expense/templates/tracker/category.html
index 50c4a11..8d4b98e 100644
--- a/src/expense/templates/tracker/category.html
+++ b/src/expense/templates/tracker/category.html
@@ -1,8 +1,9 @@
 {% from 'macros.html' import label_field %}
 {% extends 'base.html' %}
 
+{% block title %}Manage Category{% endblock %}
+
 {% block content %}
-<h2>Manage Categories</h2>
 <form method="post">
   <div>
   {{ form.hidden_tag() }}
diff --git a/src/expense/templates/tracker/create.html b/src/expense/templates/tracker/create.html
index e010455..0bc402f 100644
--- a/src/expense/templates/tracker/create.html
+++ b/src/expense/templates/tracker/create.html
@@ -1,9 +1,7 @@
 {% from 'macros.html' import label_field %}
 {% extends 'base.html' %}
 
-{% block header %}
-<h2>Create New Entry</h2>
-{% endblock %}
+{% block title %}Create New Entry{% endblock %}
 
 {% block content %}
 <form method="post">
diff --git a/src/expense/templates/tracker/details.html b/src/expense/templates/tracker/details.html
index fa7eb1e..f008bd1 100644
--- a/src/expense/templates/tracker/details.html
+++ b/src/expense/templates/tracker/details.html
@@ -1,9 +1,7 @@
 {% from 'macros.html' import expense_table %}
 {% extends 'base.html' %}
 
-{% block header %}
-  <h2>Details</h2>
-{% endblock%}
+{% block title %}Details{% endblock%}
 
 {% block content %}
   {{ expense_table(current_user.expenses, total[0]) }}
diff --git a/src/expense/templates/tracker/index.html b/src/expense/templates/tracker/index.html
index ce7bc92..db11f31 100644
--- a/src/expense/templates/tracker/index.html
+++ b/src/expense/templates/tracker/index.html
@@ -1,9 +1,7 @@
 {% from 'macros.html' import expense_table %}
 {% extends 'base.html' %}
 
-{% block header %}
-<h2>Summary</h2>
-{% endblock %}
+{% block title %}Summary{% endblock %}
 
 {% block content %}
 <script src="{{ url_for('static', filename='script.js') }}" type="module"></script>
diff --git a/src/expense/templates/tracker/trans.html b/src/expense/templates/tracker/trans.html
index 449aa99..c890e8c 100644
--- a/src/expense/templates/tracker/trans.html
+++ b/src/expense/templates/tracker/trans.html
@@ -1,9 +1,10 @@
 {% from 'macros.html' import label_field %}
 {% extends 'base.html' %}
 
+{% block title %}Edit Entry{% endblock %}
+
 {% block content %}
 <form method="post">
-  <h2>Edit Entry</h2>
   {{ form.hidden_tag() }}
   {{ label_field(form.date) }}
   {{ label_field(form.category) }}
-- 
cgit v1.2.3-70-g09d2

