monopyly 1.4.2__tar.gz → 1.4.3__tar.gz

{monopyly-1.4.2 → monopyly-1.4.3}/.gitignore

@@ -69,8 +69,9 @@ target/
 # Mac custom attributes file
 .DS_Store
 
-# Virtual environment
+# Virtual environments
 monopyly-env/
+monopyly-production-env/
 
 # Hatch-generated version file
 monopyly/_version.py

{monopyly-1.4.2 → monopyly-1.4.3}/PKG-INFO

@@ -1,9 +1,9 @@
 Metadata-Version: 2.1
 Name: monopyly
-Version: 1.4.2
+Version: 1.4.3
 Summary: A homemade personal finance manager.
 Project-URL: Download, https://pypi.org/project/monopyly
-Project-URL: Homepage, https://github.com/mitchnegus/monopyly
+Project-URL: Homepage, http://monopyly.com
 Project-URL: Repository, https://github.com/mitchnegus/monopyly
 Project-URL: Changelog, https://github.com/mitchnegus/monopyly/blob/main/CHANGELOG.md
 Author-email: Mitch Negus <mitchnegus57@gmail.com>
@@ -22,7 +22,7 @@ Classifier: Programming Language :: Python
 Classifier: Topic :: Office/Business :: Financial
 Classifier: Topic :: Office/Business :: Financial :: Accounting
 Classifier: Topic :: Office/Business :: Financial :: Spreadsheet
-Requires-Python: <3.11,>=3.9
+Requires-Python: <3.11,>=3.10
 Requires-Dist: authanor>=1.0.2
 Requires-Dist: flask-wtf
 Requires-Dist: flask>=2.2.2

{monopyly-1.4.2 → monopyly-1.4.3}/monopyly/__init__.py

@@ -1,8 +1,6 @@
 """
 Run a development server for the Monopyly app.
 """
-import warnings
-
 from flask import Flask
 
 from monopyly.config import DevelopmentConfig, ProductionConfig

{monopyly-1.4.2 → monopyly-1.4.3}/monopyly/_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '1.4.2'
-__version_tuple__ = version_tuple = (1, 4, 2)
+__version__ = version = '1.4.3'
+__version_tuple__ = version_tuple = (1, 4, 3)

{monopyly-1.4.2 → monopyly-1.4.3}/monopyly/auth/routes.py

@@ -26,7 +26,9 @@ def register():
         # Get username and passwords from the form
         username, password = get_username_and_password(request.form)
         # Check for errors in the accessed information
-        if not username:
+        if not current_app.config["REGISTRATION"]:
+            error = "The app is not currently accepting new registrations."
+        elif not username:
             error = "Username is required."
         elif not password:
             error = "Password is required."

{monopyly-1.4.2 → monopyly-1.4.3}/monopyly/cli/run.py

@@ -12,6 +12,7 @@ from pathlib import Path
 from threading import Event
 
 from flask import current_app
+from rich.console import Console
 
 from .apps import DevelopmentApplication, LocalApplication, ProductionApplication
 
@@ -47,11 +48,14 @@ def parse_arguments():
     parser.add_argument(
         "--browser",
         action="store_true",
-        help="a flag indicating if a new browswer window should be opened",
+        help=(
+            "a flag indicating if a new browser window should be opened (development "
+            "and local modes only)"
+        ),
     )
     parser.add_argument(
         "mode",
-        help="the runtime mode for the app; defaults to `development`",
+        help="the runtime mode for the app",
         choices=["development", "local", "production"],
     )
     return parser.parse_args()
@@ -65,6 +69,7 @@ class Launcher:
         "local": LocalApplication,
         "production": ProductionApplication,
     }
+    _console = Console()
     _exit = Event()
     command = ["flask"]
 
@@ -77,15 +82,20 @@ class Launcher:
     def initialize_database(self):
         """Run the database initializer."""
         instruction = self.command + ["init-db"]
+        self._console.print("[deep_sky_blue1]Initializing the database...")
         subprocess.run(instruction)
+        print("\n")
 
     def backup_database(self):
         """Back up the app database."""
+        self._console.print("[deep_sky_blue1]Backing up the database...")
         instruction = self.command + ["back-up-db"]
         subprocess.run(instruction)
+        print("\n")
 
     def launch(self):
         """Launch the Monopyly application."""
+        self._console.print("[deep_sky_blue1]Running the Monopyly application...\n")
         self.app.run()
 
     def open_browser(self, delay=0):

{monopyly-1.4.2 → monopyly-1.4.3}/monopyly/config/default_settings.py

@@ -10,6 +10,7 @@ class Config:
     """A base configuration object with some default settings."""
 
     config_filepaths = [DEFAULT_CONFIG_PATH]
+    REGISTRATION = True
 
     def __init__(self, db_path=None):
         # Read parameters from the configuration files in order of specificity

{monopyly-1.4.2 → monopyly-1.4.3}/monopyly/config/settings.py

@@ -1,5 +1,4 @@
 """A module containing objects with various configuration settings."""
-import json
 import warnings
 from pathlib import Path
 

{monopyly-1.4.2 → monopyly-1.4.3}/monopyly/static/css/style.css

@@ -252,9 +252,9 @@ aside.sidebar {
 
 .screenshot {
   width: 100%; /* override the markdown default */
-	margin: 20px 0;
+  margin: 20px 0;
   border: 1px solid #f3f3f3;
-	box-shadow: 3px 3px 5px #bbbbbb;
+  box-shadow: 3px 3px 5px #bbbbbb;
 }
 
 .grouping {
@@ -1208,6 +1208,7 @@ form .autocomplete-box .item.active {
 .transactions-table .expanded .setting .date {
   display: flex;
   flex-direction: column;
+  justify-content: center;
   align-items: center;
   flex: 2;
   padding-top: 3px;

{monopyly-1.4.2 → monopyly-1.4.3}/monopyly/static/js/define-filter.js

@@ -11,7 +11,7 @@
 
 	// Identify the card filters
 	const $filterContainer = $('#card-filter');
-	
+
 	// Label inactive cards when they are hovered over
 	const inactiveCardFilters = $filterContainer.find('.inactive.card');
 	let defaultText;
@@ -31,7 +31,7 @@
 			$this.text(defaultText);
 		}
 	);
-	
+
 	// Change the filter status on click
 	const $filters = $filterContainer.find('.card');
 	$filters.on('click', function() {

monopyly-1.4.3/monopyly/static/js/expand-transaction.js

@@ -0,0 +1,18 @@
+/*
+ * Expand a transaction in a table when the plus icon is clicked.
+ *
+ * Expands a row in the transaction table when the plus icon offering
+ * more information is clicked. The expanded row shows transactions in
+ * more detail (and a larger font) than the rest of the transaction
+ * table. For both credit card and bank transactions, this expanded row
+ * shows subtransaction information.
+ */
+
+import {
+  TransactionToggleManager, displaySubtransactions
+} from './modules/expand-transaction.js';
+
+
+(function() {
+  const toggleManager = new TransactionToggleManager(displaySubtransactions)
+})();

monopyly-1.4.3/monopyly/static/js/modules/expand-transaction.js

@@ -0,0 +1,128 @@
+/*
+ * Expand a transaction when the plus icon is clicked.
+ *
+ * Expands a row in the transaction table when the plus icon offering
+ * more information is clicked. The expanded row shows transactions in
+ * more detail (and a larger font) than the rest of the transaction
+ * table. A user can exit the expanded view by clicking the 'x' icon
+ * button that is shown in the expanded view. The 'toggleTransactionRow'
+ * function takes an optional callback function which is executed after
+ * the row is expanded. The callback function receives the selected
+ * '.transaction' element as its only argument.
+ */
+
+import {
+  replaceDisplayContentsAjaxRequest
+} from './update-display-ajax.js';
+
+
+class TransactionToggleManager {
+  /**
+   * Create the object to toggle transactions.
+   *
+   * @param {function} callback - A callback function to execute when toggling
+   *     a button to get more info.
+   */
+  constructor(callback = null) {
+    // Identify the plus/minus icons
+    this.$iconsMoreInfoButtons = $('.transaction .more.button');
+    this.$iconsLessInfoButtons = $('.transaction .less.button');
+    this.#registerClickExpand(callback);
+    this.#registerClickCollapse();
+  }
+
+  getButtonTransaction(button) {
+    return $(button).closest('.transaction');
+  }
+
+  #registerClickExpand(callback) {
+    const self = this;
+    this.$iconsMoreInfoButtons.on('click', function() {
+      const $transaction = self.getButtonTransaction(this);
+      const toggler = new TransactionToggler($transaction);
+      toggler.expand(callback);
+    });
+  }
+
+  #registerClickCollapse() {
+    const self = this;
+    this.$iconsLessInfoButtons.on('click', function() {
+      const $transaction = self.getButtonTransaction(this);
+      const toggler = new TransactionToggler($transaction);
+      toggler.collapse();
+    });
+  }
+}
+
+
+class TransactionToggler {
+
+  /**
+   * Create the handler.
+   *
+   * @param {Object} $transaction - The transaction to be toggled.
+   */
+  constructor($transaction) {
+    // Set timing variables
+    this.fadeTime = 200;
+    this.slideTime = 250;
+    // Identify elements of the row
+    this.$transaction = $transaction;
+    this.$extendedRow = $transaction.find('.expanded');
+    this.$condensedRow = $transaction.find('.condensed');
+  }
+
+  /**
+   * Expand the transaction
+   *
+   * @param {function} callback - A callback function to execute when expanding
+   *     the transaction information. The callback function takes one argument,
+   *     the JQuery object representing the transaction.
+   */
+  expand(callback = null) {
+    // Execute the callback function, if given
+    if (callback != null) {
+      callback(this.$transaction);
+    }
+    this.#toggleTransaction(this.$condensedRow, this.$extendedRow);
+    this.$transaction.addClass('selected');
+  }
+
+  collapse($transaction) {
+    this.#toggleTransaction(this.$extendedRow, this.$condensedRow);
+    this.$transaction.removeClass('selected');
+  }
+
+  #toggleTransaction($collapser, $expander) {
+    this.#hideSummaryRow($collapser);
+    this.#showSummaryRow($expander)
+  }
+
+  #hideSummaryRow($row) {
+    const self = this;
+    $row.fadeTo(self.fadeTime, 0, function() {
+      $(this).slideUp(self.slideTime);
+    });
+  }
+
+  #showSummaryRow($row) {
+    const self = this;
+    $row.delay(self.fadeTime).slideDown(self.slideTime, function() {
+      $(this).fadeTo(self.fadeTime, 1);
+    });
+  }
+}
+
+
+function displaySubtransactions($transaction) {
+
+    // Execute an AJAX request to get transaction/subtransaction information
+    const endpoint = EXPAND_TRANSACTION_ENDPOINT;
+    const rawData = $transaction.data("transaction-id");
+    const $container = $transaction.find('.subtransaction-container');
+    replaceDisplayContentsAjaxRequest(endpoint, rawData, $container);
+
+}
+
+
+export { TransactionToggleManager, displaySubtransactions };

{monopyly-1.4.2 → monopyly-1.4.3}/monopyly/static/js/modules/update-display-ajax.js

@@ -11,14 +11,21 @@
 import { executeAjaxRequest } from './ajax.js';
 
 
-function replaceDisplayContentsAjaxRequest(endpoint, rawData, $display) {
-
-	// The action is to replace the display's contents
-	function action(response) {
-		$display.html(response);
-	}
-	// Assign the response to the display object
-	executeAjaxRequest(endpoint, rawData, action);
+function replaceDisplayContentsAjaxRequest(
+  endpoint, rawData, $display, callback = null
+) {
+
+  // The action is to replace the display's contents
+  function action(response) {
+    $display.html(response);
+    // Execute the callback function, if given
+    if (callback != null) {
+      callback();
+    }
+  }
+
+  // Assign the response to the display object
+  executeAjaxRequest(endpoint, rawData, action);
 
 }
 

monopyly-1.4.3/monopyly/static/js/update-transactions-display.js

@@ -0,0 +1,73 @@
+/*
+ * Update the table of credit card transactions.
+ *
+ * Update the credit card transaction table. The table update issues an
+ * Ajax request to the server to query the database based on the user's
+ * selection. The Ajax request is defined in its own function.
+ *
+ * Updates can be triggered by the following actions:
+ *  - Changing the card filters: a user can click on any of the card
+ *    filters to show or hide transactions from that card.
+ *  - Sorting the table by transaction date: a user can click on the
+ *    'Date' column header to sort the transaction date in ascending
+ *    or descending order.
+ */
+
+import {
+  TransactionToggleManager, displaySubtransactions
+} from './modules/expand-transaction.js';
+import {
+  replaceDisplayContentsAjaxRequest
+} from './modules/update-display-ajax.js';
+
+
+(function() {
+
+  // Identify the card filters
+  const $filterContainer = $('#card-filter');
+  // Identify the transactions container
+  const $container = $('.transactions-container');
+
+  // Send the Ajax request on click
+  const $filters = $filterContainer.find('.card');
+  $filters.on('click', function() {
+    updateTable();
+  });
+
+  // Change the table ordering and send the Ajax request on click
+  $container.on('click', '.transactions-table .sort-button', function() {
+    // Identify the table sorters
+    const $sorters = $('.transactions-table .sort-button');
+    // Swap the sorter icons
+    $sorters.toggleClass('selected');
+    // Update the table
+    updateTable();
+  });
+
+  function updateTable() {
+    // Determine the selected credit cards to use from the filters
+    const $selectedFilters = $filterContainer.find('.card.selected');
+    const cardIDs = [];
+    $selectedFilters.each(function() {cardIDs.push(this.dataset.cardId);});
+    // Determine the table ordering (ascending/descending transaction date)
+    const $sorter = $('.transactions-table .sort-button.selected');
+    let sortOrder
+    if ($sorter.hasClass('asc')) {
+      sortOrder = 'asc';
+    } else {
+      sortOrder = 'desc';
+    }
+    // Update the table with the filters and ordering
+    const endpoint = FILTER_ENDPOINT;
+    const rawData = {
+      'card_ids': cardIDs,
+      'sort_order': sortOrder,
+    };
+
+    function callback() {
+      const toggleManager = new TransactionToggleManager(displaySubtransactions)
+    }
+    replaceDisplayContentsAjaxRequest(endpoint, rawData, $container, callback)
+  }
+
+})();

{monopyly-1.4.2 → monopyly-1.4.3}/pyproject.toml

@@ -9,7 +9,7 @@ authors = [
 ]
 description = 'A homemade personal finance manager.'
 license = { text = 'GNU GPLv3' }
-requires-python = '>=3.9,<3.11'
+requires-python = '>=3.10,<3.11'
 dependencies = [
   'authanor>=1.0.2',
   'flask>=2.2.2',
@@ -44,7 +44,7 @@ monopyly = 'monopyly.cli.run:main'
 
 [project.urls]
 Download = 'https://pypi.org/project/monopyly'
-Homepage = 'https://github.com/mitchnegus/monopyly'
+Homepage = 'http://monopyly.com'
 Repository = 'https://github.com/mitchnegus/monopyly'
 Changelog = 'https://github.com/mitchnegus/monopyly/blob/main/CHANGELOG.md'
 

monopyly-1.4.2/monopyly/static/js/expand-transaction.js

@@ -1,32 +0,0 @@
-/*
- * Expand a transaction in a table when the plus icon is clicked.
- *
- * Expands a row in the transaction table when the plus icon offering
- * more information is clicked. The expanded row shows transactions in
- * more detail (and a larger font) than the rest of the transaction
- * table. For both credit card and bank transactions, this expanded row
- * shows subtransaction information.
- */
-
-import {
-  replaceDisplayContentsAjaxRequest
-} from './modules/update-display-ajax.js';
-import { toggleTransactionRow } from './modules/expand-transaction.js';
-
-
-function displaySubtransactions($transaction) {
-
-    // Execute an AJAX request to get transaction/subtransaction information
-    const endpoint = EXPAND_TRANSACTION_ENDPOINT;
-    const rawData = $transaction.data("transaction-id");
-    const $container = $transaction.find('.subtransaction-container');
-    replaceDisplayContentsAjaxRequest(endpoint, rawData, $container);
-
-}
-
-
-(function() {
-
-  toggleTransactionRow(displaySubtransactions);
-
-})();

monopyly-1.4.2/monopyly/static/js/modules/expand-transaction.js

@@ -1,63 +0,0 @@
-/*
- * Expand a transaction when the plus icon is clicked.
- *
- * Expands a row in the transaction table when the plus icon offering
- * more information is clicked. The expanded row shows transactions in
- * more detail (and a larger font) than the rest of the transaction
- * table. A user can exit the expanded view by clicking the 'x' icon
- * button that is shown in the expanded view. The 'toggleTransactionRow'
- * function takes an optional callback function which is executed after
- * the row is expanded. The callback function receives the selected
- * '.transaction' element as its only argument.
- */
-
-
-function toggleTransactionRow(callback = null) {
-
-  // Identify the plus/minus icons
-  const $iconsMoreInfo = $('.transaction .more.button');
-  const $iconsLessInfo = $('.transaction .less.button');
-  // Set timing variables
-  const fadeTime = 200;
-  const slideTime = 250;
-
-  $iconsMoreInfo.on('click', function() {
-    // Get the transaction object
-    const $transaction = $(this).closest('.transaction');
-    // Hide the condensed transaction summary
-    const $condensedRow = $transaction.find('.condensed');
-    $condensedRow.fadeTo(fadeTime, 0, function() {
-      $(this).slideUp(slideTime);
-    });
-    // Execute the callback function, if given
-    if (callback != null) {
-      callback($transaction);
-    }
-    $transaction.addClass('selected');
-    // Show the expanded transaction summary
-    const $expandedRow = $transaction.find('.expanded');
-    $expandedRow.delay(fadeTime).slideDown(slideTime, function() {
-      $(this).fadeTo(fadeTime, 1);
-    });
-  });
-
-  $iconsLessInfo.on('click', function() {
-    // Get the transaction object
-    const $transaction = $(this).closest('.transaction');
-    $transaction.removeClass('selected');
-    // Hide the expanded transaction summary
-    const $expandedRow = $transaction.find('.expanded');
-    $expandedRow.fadeTo(fadeTime, 0, function() {
-      $(this).slideUp(slideTime);
-    })
-    // Show the condensed transaction summary
-    const $condensedRow = $transaction.find('.condensed');
-    $condensedRow.slideDown(slideTime, function() {
-      $(this).fadeTo(fadeTime, 1);
-    });
-  });
-
-}
-
-
-export { toggleTransactionRow };

monopyly-1.4.2/monopyly/static/js/update-transactions-display.js

@@ -1,66 +0,0 @@
-/*
- * Update the table of credit card transactions.
- *
- * Update the credit card transaction table. The table update issues an
- * Ajax request to the server to query the database based on the user's
- * selection. The Ajax request is defined in its own function.
- *
- * Updates can be triggered by the following actions:
- * 	- Changing the card filters: a user can click on any of the card
- * 	  filters to show or hide transactions from that card.
- * 	- Sorting the table by transaction date: a user can click on the
- * 	  'Date' column header to sort the transaction date in ascending
- * 	  or descending order.
- */
-
-import {
-	replaceDisplayContentsAjaxRequest
-} from './modules/update-display-ajax.js';
-
-
-(function() {
-
-	// Identify the card filters
-	const $filterContainer = $('#card-filter');
-	// Identify the transactions container
-	const $container = $('.transactions-container');
-
-	// Send the Ajax request on click
-	const $filters = $filterContainer.find('.card');
-	$filters.on('click', function() {
-		updateTable();
-	});
-
-	// Change the table ordering and send the Ajax request on click
-	$container.on('click', '.transactions-table .sort-button', function() {
-		// Identify the table sorters
-		const $sorters = $('.transactions-table .sort-button');
-		// Swap the sorter icons
-		$sorters.toggleClass('selected');
-		// Update the table
-		updateTable();
-	});
-
-	function updateTable() {
-		// Determine the selected credit cards to use from the filters
-		const $selectedFilters = $filterContainer.find('.card.selected');
-		const cardIDs = [];
-		$selectedFilters.each(function() {cardIDs.push(this.dataset.cardId);});
-		// Determine the table ordering (ascending/descending transaction date)
-		const $sorter = $('.transactions-table .sort-button.selected');
-		let sortOrder
-		if ($sorter.hasClass('asc')) {
-			sortOrder = 'asc';
-		} else {
-			sortOrder = 'desc';
-		}
-		// Update the table with the filters and ordering
-		const endpoint = FILTER_ENDPOINT;
-		const rawData = {
-			'card_ids': cardIDs,
-			'sort_order': sortOrder,
-		};
-		replaceDisplayContentsAjaxRequest(endpoint, rawData, $container);
-	}
-
-})();