monopyly 1.5.0__py3-none-any.whl → 1.5.2__py3-none-any.whl

monopyly/static/css/style.css

@@ -11,6 +11,10 @@
   --masthead-height: 50px;
   --masthead-color: #2b2b2b;
   --border-gray: #dddddd;
+  --button-background-base: #fbfbfb;
+  --button-background: linear-gradient(#fbfbfb, #efefef);
+  --button-block-background-base: #eeeeee;
+  --button-block-background: linear-gradient(#eeeeee, #e6e6e6);
 }
 
 html {
@@ -386,6 +390,35 @@ aside.sidebar {
 }
 
 
+/*
+ * Provide styles for flashed messages
+ */
+.flash.success,
+.flash.warning,
+.flash.error {
+  margin: 20px 0;
+  padding: 10px 20px;
+  border-radius: 10px;
+  box-shadow: 1px 1px 4px #ddd;
+  font-size: 0.9em;
+}
+
+.flash.success {
+  border: 1px solid #6fda6f;
+  background: linear-gradient(45deg, #e6efe1, #f5fef1);
+}
+
+.flash.warning {
+  border: 1px solid #dac96f;
+  background: linear-gradient(45deg, #efede1, #fefbf1);
+}
+
+.flash.error {
+  border: 1px solid #da6f6f;
+  background: linear-gradient(45deg, #f3e8e8, #fef1f1);
+}
+
+
 /*
  * Provide styles for error pages
  */
@@ -459,8 +492,8 @@ aside.sidebar {
   border: 1px solid var(--border-gray);
   border-radius: 10px;
   box-shadow: 1px 1px 3px #bbbbbb;
-  background-color: #eeeeee;
-  background-image: linear-gradient(#eeeeee, #e6e6e6);
+  background-color: var(--button-block-background-base);
+  background-image: var(--button-block-background);
   color: inherit;
 }
 
@@ -546,15 +579,16 @@ aside.sidebar {
   left: 0;
   height: 100%;
   width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
   background-color: rgba(0, 0, 0, 0.75);
   z-index: 50;  /* in front of content, but behind the header */
 }
 
 .modal {
-  position: relative;
-  top: 0%;
-  left: 50%;
-  transform: translate(-50%, 15%);
+  min-width: 200px;
 }
 
 .modal-box {
@@ -638,8 +672,8 @@ form input.button {
   align-items: center;
   margin-top: 20px;
   padding: 10px;
-  background-color: #fbfbfb;
-  background-image: linear-gradient(#fbfbfb, #efefef);
+  background-color: var(--button-background-base);
+  background-image: var(--button-background);
   color: #333333;
   font-weight:bold;
   text-align: center;
@@ -2564,6 +2598,21 @@ form .autocomplete-box .item.active {
 }
 
 
+/*
+ * Customization for the 'Registration' page
+ */
+.no-registration-notice {
+  width: 60%;
+  margin: 25px auto;
+  padding: 10px;
+  border: 1px solid var(--moneytree-leaves);
+  border-radius: 10px;
+  box-shadow: 0 0 10px var(--moneytree-leaves);
+  background-color: #f5f5f5;
+  text-align: center;
+}
+
+
 /*
  * Customization for the 'Profile' page
  */
@@ -3532,7 +3581,6 @@ form#pay #make-payment[type="submit"] #prompt {
 #statement-reconciliation.modal {
   width: 50%;
   min-width: 300px;
-  transform: translate(-50%, 100%);
 }
 
 #statement-reconciliation.modal .modal-box {
@@ -3604,13 +3652,145 @@ form#credit-transaction .merchant-field {
 /*
  * Customization for the transaction submission page
  */
-#receipt {
-  width: 31%;
+#submission {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 50%;
   margin: auto;
 }
+@media screen and (max-width: 600px) {
+  /* Mobile layout */
+  #submission {
+    width: 90%;
+  }
+}
+
+#submission-title {
+  text-align: center;
+}
+
+#receipt {
+  width: 60%;
+  min-width: 250px;
+  max-width: 300px;
+  margin: 40px auto;
+  padding: 10px 20px 30px;
+  box-shadow: 2px 2px 6px #bbbbbb;
+  background-color: #fafafa;
+  font-family: monospace;
+}
+@media screen and (max-width: 600px) {
+  /* Mobile layout */
+  #receipt {
+    margin: 10px auto 30px;
+  }
+}
 
 #receipt-title {
+  margin-bottom: 20px;
   text-align: center;
+  color: var(--silver-dollar);
+  font-size: 10pt;
+  font-weight: 400;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  letter-spacing: 2px;
+  text-transform: uppercase;
+}
+
+#receipt .receipt-item {
+  display: flex;
+  margin: 15px 0;
+}
+
+#receipt .receipt-item .receipt-key {
+  font-weight: bold;
+}
+
+#receipt #receipt-header {
+  margin-bottom: 40px;
+}
+
+#receipt #receipt-header #receipt-merchant {
+  font-size: 14pt;
+  justify-content: center;
+}
+
+#receipt #receipt-header #receipt-date {
+  font-size: 10pt;
+  font-weight: normal;
+  justify-content: center;
+}
+
+#receipt .receipt-subtransaction {
+  display: flex;
+  gap: 10px 20px;
+  margin: 10px 0;
+}
+
+#receipt .receipt-subtransaction .note,
+#receipt #receipt-total .total {
+  flex: 4;
+}
+
+#receipt .receipt-subtransaction .amount,
+#receipt #receipt-total .amount {
+  flex: 1;
+  text-align: right;
+}
+
+#receipt #receipt-card {
+  margin-top: 40px;
+}
+
+#receipt #receipt-card .receipt-item {
+  flex-direction: column;
+}
+
+#receipt #receipt-card .receipt-item .receipt-key {
+  margin-bottom: 5px;
+}
+
+#receipt #receipt-card .receipt-item .receipt-value {
+  margin-left: 0;
+}
+
+#submission-actions {
+  display: flex;
+  flex-direction: column;
+  gap: 3px;
+  align-items: center;
+  width: 100%;
+  max-width: 400px;
+}
+@media screen and (max-width: 600px) {
+  /* Mobile layout */
+  #submission-actions {
+    gap: 5px;
+  }
+}
+
+#submission-actions .submission.button {
+  width: 100%;
+  padding: 3px 10px;
+  border: 1px solid var(--border-gray);
+  border-radius: 5px;
+  background-color: var(--button-background-base);
+  background-image: var(--button-background);;
+  font-size: 12pt;
+  text-decoration: none;
+  box-sizing: border-box;
+}
+@media screen and (max-width: 600px) {
+  /* Mobile layout */
+  #submission-actions .submission.button {
+    padding: 10px;
+    font-size: 10pt;
+  }
+}
+
+#submission-actions .submission.button:hover {
+  filter: brightness(0.98);
 }
 
 

monopyly/static/js/create-balance-chart.js

@@ -50,7 +50,7 @@ function createBalanceChart(data) {
   const yLimit = Math.ceil(1.25*maxBalance/magnitudeOrder)*magnitudeOrder;
 
   let smoothLine = true;
-  if (timestamps.length > 50) {
+  if (timestamps.length > 100) {
     smoothLine = false;
   }
 

monopyly/templates/auth/change_password.html

@@ -0,0 +1,21 @@
+{% extends 'layout.html' %}
+
+{% block header %}
+  <h1>{% block title %}Change Password{% endblock %}</h1>
+{% endblock %}
+
+{% block content %}
+
+  <form id="change-password" method="post">
+    <p class="instructions">
+      Use this form to change the password for user: <b>{{ g.user.username }}</b>
+    </p>
+
+    <label for="password">Current Password</label>
+    <input type="password" name="current-password" id="current-password" required>
+    <label for="new-password">New Password</label>
+    <input type="password" name="new-password" id="new-password" required>
+    <input class="button" type="submit" value="Update" />
+  </form>
+
+{% endblock %}

monopyly/templates/auth/login.html

@@ -5,11 +5,13 @@
 {% endblock %}
 
 {% block content %}
-  <form method="post">
+
+  <form id="log-in" method="post">
     <label for="username">Username</label>
     <input name="username" id="username" required>
     <label for="password">Password</label>
     <input type="password" name="password" id="password" required>
     <input class="button" type="submit" value="Log In" />
   </form>
+
 {% endblock %}

monopyly/templates/auth/register.html

@@ -5,11 +5,21 @@
 {% endblock %}
 
 {% block content %}
-  <form method="post">
-    <label for="username">Username</label>
-    <input name="username" id="username" required>
-    <label for="password">Password</label>
-    <input type="password" name="password" id="password" required>
-    <input class="button" type="submit" value="Register" />
-  </form>
+
+  {% if not config['REGISTRATION'] %}
+    <div class="no-registration-notice">
+      <b>Notice:</b> The app is not currently accepting new registrations.
+    </div>
+  {% endif %}
+
+  {% with input_status = 'required' if config['REGISTRATION'] else 'disabled' %}
+    <form id="register" method="post">
+      <label for="username">Username</label>
+      <input name="username" id="username" {{ input_status }}>
+      <label for="password">Password</label>
+      <input type="password" name="password" id="password" {{ input_status }}>
+      <input class="button" type="submit" value="Register" />
+    </form>
+  {% endwith %}
+
 {% endblock %}

monopyly/templates/core/profile.html

@@ -25,8 +25,8 @@
         <div class=user-settings">
 
           <div class="password">
-            <a style="color: gray;" href="{{ url_for('core.change_password') }}">
-              Change password (coming soon)
+            <a style="color: gray;" href="{{ url_for('auth.change_password') }}">
+              Change password
             </a>
           </div>
 

monopyly/templates/credit/statement_reconciliation/statement_reconciliation_inquiry.html

@@ -8,7 +8,7 @@
       </div>
 
       <p class="instructions">
-        Load a CSV file containing credit activity for comparison against this statement. The CSV file must be located in the <code>Downloads</code> directory on the machine running the Monopyly app.
+        Load a CSV file containing credit activity for comparison against this statement.
       </p>
 
       <form action="{{ url_for('credit.load_statement_reconciliation_details', statement_id=statement_id) }}" method="post" enctype="multipart/form-data">

monopyly/templates/credit/transaction_submission_page.html

@@ -12,83 +12,76 @@
 
 {% block content %}
 
-  <div id="receipt">
+  <div id="submission">
 
-    <p id="receipt-title">
+    <p id="submission-title">
       The transaction was saved successfully.
     </p>
-    <br>
 
-    <p>
-      <b>Card:</b>
-      {{ transaction.statement.card.account.bank.bank_name }} ****-{{ transaction.statement.card.last_four_digits }}
-    </p>
-
-    <p>
-      <b>Date: </b>
-      {{ transaction.transaction_date }}
-    </p>
-
-    <p>
-      <b>Merchant: </b>
-      {{ transaction.merchant }}
-    </p>
-
-    {% if subtransactions|length > 1 %}
-      <p>
-        <b>Total: </b>
-        ${{ transaction.total|currency }}
-      </p>
-    {% endif %}
-
-    {% for subtransaction in subtransactions %}
-
-      <p>
-        <b>Amount: </b>
-        ${{ subtransaction['subtotal']|currency }}
-      </p>
-
-      <p>
-        <b>Note: </b>
-        {{ subtransaction['note'] }}
-      </p>
-
-    {% endfor %}
-
-    <p>
-      <b>Statement Date: </b>
-      {{ transaction.statement.issue_date }}
-    </p>
+    <div id="receipt">
+
+      <div id="receipt-header">
+        <h2 id="receipt-title">Transaction Submission</h2>
+        <h3 id="receipt-merchant" class="receipt-item">{{ transaction.merchant }}</h3>
+        <h4 id="receipt-date" class="receipt-item">{{ transaction.transaction_date }}</h4>
+      </div>
+
+      {% for subtransaction in subtransactions %}
+        <div class="receipt-subtransaction">
+          <div class="note">{{ subtransaction['note'] }}</div>
+          <div class="amount">${{ subtransaction['subtotal']|currency }}</div>
+        </div>
+      {% endfor %}
+
+      {% if subtransactions|length > 1 %}
+        <div id="receipt-total" class="receipt-item">
+          <div class="total receipt-key">Total:</div>
+          <div class="amount">${{ transaction.total|currency }}</div>
+        </div>
+      {% endif %}
+
+      <div id="receipt-card">
+        <div class="receipt-item">
+          <div class="receipt-key">Card:</div>
+          <div class="receipt-value">{{ transaction.statement.card.account.bank.bank_name }} ****-{{ transaction.statement.card.last_four_digits }}</div>
+        </div>
+        <div class="receipt-item">
+          <div class="receipt-key">Statement Date:</div>
+          <div class="receipt-value">{{ transaction.statement.issue_date }}</div>
+        </div>
+      </div>
+
+
+    </div>
 
     {% if g.user %}
-      <br>
-      <a href="{{ url_for('credit.load_statement_details', statement_id=transaction.statement_id) }}">
-        See the statement for this transaction
-      </a>
-      <br>
-      <a href="{{ url_for('credit.load_transactions') }}">
-        See transaction history
-      </a>
-      <br>
-      <a href="{{ url_for('credit.update_transaction', transaction_id=transaction.id) }}">
-        Update this transaction
-      </a>
-      <br>
-      <a href="{{ url_for('credit.add_transaction') }}">
-        Create a new transaction
-      </a>
-      <br>
-      <a href="{{ url_for('credit.add_transaction', card_id=transaction.statement.card_id, statement_id=transaction.statement_id) }}">
-        Create a new transaction on this statement
-      </a>
-      {% with reconciliation_info = session.get('reconciliation_info', None) %}
-        {% if reconciliation_info %}
-          <br>
-          <a href="{{ url_for('credit.load_statement_reconciliation_details', statement_id=reconciliation_info[0]) }}">
-            Return to the in-progress statement reconciliation
-          </a>
-        {% endif %}
-      {% endwith %}
+      <div id="submission-actions">
+        <a class="submission button" href="{{ url_for('credit.update_transaction', transaction_id=transaction.id) }}">
+          Update this transaction
+        </a>
+        <a class="submission button" href="{{ url_for('credit.add_transaction') }}">
+          Create a new transaction
+        </a>
+        <a class="submission button" href="{{ url_for('credit.add_transaction', card_id=transaction.statement.card_id, statement_id=transaction.statement_id) }}">
+          Create a new transaction on this statement
+        </a>
+        <a class="submission button" href="{{ url_for('credit.load_statement_details', statement_id=transaction.statement_id) }}">
+          See the statement for this transaction
+        </a>
+        <a class="submission button" href="{{ url_for('credit.load_statements') }}">
+          See statement history
+        </a>
+        <a class="submission button" href="{{ url_for('credit.load_transactions') }}">
+          See transaction history
+        </a>
+        {% with reconciliation_info = session.get('reconciliation_info', None) %}
+          {% if reconciliation_info %}
+            <a class="submission button" href="{{ url_for('credit.load_statement_reconciliation_details', statement_id=reconciliation_info[0]) }}">
+              Return to the in-progress statement reconciliation
+            </a>
+          {% endif %}
+        {% endwith %}
+      </div>
     {% endif %}
 
   </div>

monopyly/templates/credit/transactions_table/condensed_row_content.html

@@ -23,4 +23,3 @@
     -<span class="digits">{{ transaction.statement.card.last_four_digits }}</span>
   </div>
 {% endif %}
-

monopyly/templates/layout.html

@@ -91,8 +91,8 @@
           {% block header %}{% endblock %}
         </header>
 
-        {% for message in get_flashed_messages() %}
-          <div class="flash">{{ message }}</div>
+        {% for category, message in get_flashed_messages(with_categories=True) %}
+          <div class="flash {{ category }}">{{ message }}</div>
         {% endfor %}
 
         {% block content %}{% endblock %}

{monopyly-1.5.0.dist-info → monopyly-1.5.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: monopyly
-Version: 1.5.0
+Version: 1.5.2
 Summary: A homemade personal finance manager.
 Project-URL: Download, https://pypi.org/project/monopyly
 Project-URL: Homepage, http://monopyly.com
@@ -23,16 +23,15 @@ Classifier: Topic :: Office/Business :: Financial
 Classifier: Topic :: Office/Business :: Financial :: Accounting
 Classifier: Topic :: Office/Business :: Financial :: Spreadsheet
 Requires-Python: <3.11,>=3.10
-Requires-Dist: authanor==1.1.0
-Requires-Dist: flask-wtf==1.2.1
-Requires-Dist: flask==3.0.3
-Requires-Dist: fuisce==1.0.2
-Requires-Dist: gunicorn==22.0.0
-Requires-Dist: markdown==3.6
-Requires-Dist: nltk==3.8.1
+Requires-Dist: dry-foundation==1.3.0
+Requires-Dist: flask-wtf==1.2.2
+Requires-Dist: flask==3.1.2
+Requires-Dist: gunicorn==23.0.0
+Requires-Dist: markdown==3.9
+Requires-Dist: nltk==3.9.1
 Requires-Dist: python-dateutil==2.9.0
-Requires-Dist: rich==13.7.1
-Requires-Dist: sqlalchemy==2.0.29
+Requires-Dist: rich==14.1.0
+Requires-Dist: sqlalchemy==2.0.43
 Description-Content-Type: text/markdown
 
 <div id="header">
@@ -64,10 +63,10 @@ The package requires a recent version of Python (3.10+).
 
 ## Getting started
 
-Once the package is properly installed, run the app in local mode from the command line (the default options should be sensible, but you may customize the host and port if necessary):
+Once the package is properly installed, launch the app in local mode from the command line (the default options should be sensible, but you may customize the host and port if necessary):
 
 ```
-$ monopyly local --browser [--host HOST] [--port PORT]
+$ monopyly launch local --browser [--host HOST] [--port PORT]
 ```
 
 Local mode indicates that the app is just going to be run using a locally hosted server, accessible to just your machine.