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

monopyly/templates/common/tag_tree.html

@@ -0,0 +1,25 @@
+{% for tag in tags_hierarchy recursive %}
+  <li class="tag-container">
+    <div class="tag-area">
+      <div class="tag">{{ tag.tag_name }}</div>
+      <div class="buttons">
+        <img class="new-tag button" src="{{ url_for('static', filename='img/icons/plus-thick.png') }}" />
+        {% if tag.user_id != 0 %}
+          <a class="action button delete">
+        {% endif %}
+        </a>
+      </div>
+    </div>
+
+    <ul class="tags subtags">
+      {{ loop(tags_hierarchy[tag]) }}
+    </ul>
+
+  </li>
+
+  {% if loop.last %}
+    <input class="new-tag" type="text" />
+  {% endif %}
+{% else %}
+  <input class="new-tag" type="text" />
+{% endfor %}

monopyly/templates/{credit → common}/tags_page.html

@@ -1,6 +1,18 @@
 {% extends 'layout.html' %}
 
 
+{% block javascript %}
+
+  <script>
+    const ADD_TAG_ENDPOINT = "{{ url_for('banking.add_tag') }}";
+    const REMOVE_TAG_ENDPOINT = "{{ url_for('banking.delete_tag') }}";
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/bind-tag-actions.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block header %}
 
   <h1>
@@ -20,22 +32,14 @@
 
     <div id="tags-container" class="tag-container">
 
-      {% include 'credit/tag_tree/tag_tree.html' %}
+      <ul class="tags">
+        {% include 'common/tag_tree.html' %}
+      </ul>
+
+      <img class="root new-tag button" src="{{ url_for('static', filename='img/icons/plus-thick.png') }}" />
 
     </div>
 
   </div>
 
 {% endblock %}
-
-
-{% block javascript %}
-
-  <script>
-    const ADD_TAG_ENDPOINT = "{{ url_for('credit.add_tag') }}";
-    const REMOVE_TAG_ENDPOINT = "{{ url_for('credit.delete_tag') }}";
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/bind-tag-actions.js') }}">
-  </script>
-
-{% endblock %}

monopyly/templates/common/transactions_table/linked_bank_transaction.html

@@ -4,9 +4,9 @@
 
 <div class="description-header">
   <div class="account">
-    {{ transaction.account.bank.bank_name }} ({{ transaction.account.last_four_digits }})
+    {{ transaction.account_view.bank.bank_name }} ({{ transaction.account_view.last_four_digits }})
     <div class="account-type">
-      {{ transaction.account.account_type.type_common_name }}
+      {{ transaction.account_view.account_type_view.type_common_name }}
     </div>
   </div>
   <div class="total">

monopyly/templates/common/transactions_table/table.html

@@ -0,0 +1,6 @@
+<div class="transactions-table">
+
+  {% include field_title_template %}
+  {% include transactions_template %}
+
+</div>

monopyly/templates/common/transactions_table/transactions.html

@@ -1,18 +1,12 @@
-<div class="transactions-table">
+{% for transaction in transactions %}
 
-  {% include field_title_template %}
+  {% if transaction.transaction_date > date_today %}
+    {% set future = ' future' %}
+  {% endif %}
 
-  {% for transaction in transactions %}
+  <div id="transaction-{{ transaction.id }}" class="transaction{{ future }} row" data-transaction-id="{{ transaction.id }}">
+    {% include 'common/transactions_table/transaction_condensed.html' %}
+    {% include 'common/transactions_table/transaction_expanded.html' %}
+  </div>
 
-    {% if transaction.transaction_date > date_today %}
-      {% set future = ' future' %}
-    {% endif %}
-
-    <div id="transaction-{{ transaction.id }}" class="transaction{{ future }} row" data-transaction-id="{{ transaction.id }}">
-      {% include 'common/transactions_table/transaction_condensed.html' %}
-      {% include 'common/transactions_table/transaction_expanded.html' %}
-    </div>
-
-  {% endfor %}
-
-</div>
+{% endfor %}

monopyly/templates/core/index.html

@@ -1,5 +1,17 @@
 {% extends "layout.html" %}
 
+
+{% block javascript %}
+
+  <script>
+    const HIDE_HOMEPAGE_BLOCK_ENDPOINT = "{{ url_for('core.hide_homepage_block') }}";
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/hide-homepage-block.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block content %}
 
   {% if session["show_homepage_block"] %}
@@ -17,134 +29,145 @@
   {% if g.user %}
     <div id="homepage-panels">
 
-      <div id="banking" class="panel">
-
-        <h2>Bank Accounts</h2>
-
-        <ul class="category">
-          <h4>Profile</h4>
-          <li>
-            <a href="{{ url_for('banking.load_accounts') }}">
-              Manage accounts
-            </a>
-          </li>
-          <li>
-            <a href="{{ url_for('banking.add_account') }}">
-              Add a new account
-            </a>
-          </li>
-          <li>
-            <a href="{{ url_for('credit.load_tags') }}">
-              Manage transaction tags
-            </a>
-          </li>
-        </ul>
-
-        <h3>Banks</h3>
-
-        {% for bank in bank_accounts %}
-          <ul class="category">
+      <div class="panel-column">
+
+        <div id="banking" class="panel">
 
-            <h4>{{ bank.bank_name }}</h4>
+          <h2>Bank Accounts</h2>
+
+          <ul class="category">
+            <h4>Profile</h4>
             <li>
-              <a href="{{ url_for('banking.load_account_summaries', bank_id=bank.id) }}">
-                See account summaries
+              <a href="{{ url_for('banking.load_accounts') }}">
+                Manage accounts
               </a>
-              <ul>
-                {% for account in bank_accounts[bank]|sort(attribute='account_type.type_common_name,last_four_digits') %}
-                  <li>
-                    <a href="{{ url_for('banking.load_account_details', account_id=account.id) }}">
-                      {{ account.account_type.type_common_name }} {{ account.last_four_digits }}
-                    </a>
-                  </li>
-                {% endfor %}
-              </ul>
             </li>
             <li>
-              <a href="{{ url_for('banking.add_transaction', bank_id=bank.id) }}">
-                Create a new transaction
+              <a href="{{ url_for('banking.add_account') }}">
+                Add a new account
+              </a>
+            </li>
+            <li>
+              <a href="{{ url_for('banking.load_tags') }}">
+                Manage transaction tags
               </a>
             </li>
-
           </ul>
-        {% endfor %}
 
-      </div>
+          <h3>Banks</h3>
 
-      <div id="credit" class="panel">
-
-        <h2>Credit Cards</h2>
-
-        <ul class="category">
-          <h4>Profile</h4>
-          <li>
-            <a href="{{ url_for('credit.load_cards') }}">
-              Manage cards
-            </a>
-          </li>
-          <li>
-            <a href="{{ url_for('credit.add_card') }}">
-              Add a new card
-            </a>
-          </li>
-          <li>
-            <a href="{{ url_for('credit.load_tags') }}">
-              Manage transaction tags
-            </a>
-          </li>
-        </ul>
-
-        <ul class="category">
-          <h4>History</h4>
-          <li>
-            <a href="{{ url_for('credit.load_statements') }}">
-              See statement history
-            </a>
-          </li>
-          <li>
-            <a href="{{ url_for('credit.load_transactions') }}">
-              See transaction history
-            </a>
-          </li>
-          <li>
-            <a href="{{ url_for('credit.add_transaction') }}">
-              Create a new transaction
-            </a>
-          </li>
-        </ul>
-
-        <h3>Cards</h3>
-
-        {% for card in cards %}
-          <ul class="category">
+          {% for bank in bank_accounts %}
+            <ul class="category">
 
-            <h4>{{ card.account.bank.bank_name }} {{ card.last_four_digits }}</h4>
-            {% if card.last_statement_id %}
+              <h4>{{ bank.bank_name }}</h4>
               <li>
-                <a href="{{ url_for('credit.load_statement_details', statement_id=card.last_statement_id) }}">
-                  See most recent statement
+                <a href="{{ url_for('banking.load_account_summaries', bank_id=bank.id) }}">
+                  See account summaries
                 </a>
+                <ul>
+                  {% for account in bank_accounts[bank]|sort(attribute='account_type_view.type_common_name,last_four_digits') %}
+                    <li>
+                      <a href="{{ url_for('banking.load_account_details', account_id=account.id) }}">
+                        {{ account.account_type_view.type_common_name }} {{ account.last_four_digits }}
+                      </a>
+                    </li>
+                  {% endfor %}
+                </ul>
               </li>
-            {% endif %}
+              <li>
+                <a href="{{ url_for('banking.add_transaction', bank_id=bank.id) }}">
+                  Create a new transaction
+                </a>
+              </li>
+
+            </ul>
+          {% endfor %}
+
+        </div>
+
+      </div>
+
+      <div class="panel-column">
+
+        <div id="credit" class="panel">
+
+          <h2>Credit Cards</h2>
+
+          <ul class="category">
+            <h4>Profile</h4>
             <li>
-              <a href="{{ url_for('credit.load_transactions', card_id=card.id) }}">
+              <a href="{{ url_for('credit.load_cards') }}">
+                Manage cards
+              </a>
+            </li>
+            <li>
+              <a href="{{ url_for('credit.add_card') }}">
+                Add a new card
+              </a>
+            </li>
+            <li>
+              <a href="{{ url_for('banking.load_tags') }}">
+                Manage transaction tags
+              </a>
+            </li>
+          </ul>
+
+          <ul class="category">
+            <h4>History</h4>
+            <li>
+              <a href="{{ url_for('credit.load_statements') }}">
+                See statement history
+              </a>
+            </li>
+            <li>
+              <a href="{{ url_for('credit.load_transactions') }}">
                 See transaction history
               </a>
             </li>
             <li>
-              <a href="{{ url_for('credit.add_transaction', card_id=card.id) }}">
+              <a href="{{ url_for('credit.add_transaction') }}">
                 Create a new transaction
               </a>
             </li>
-
           </ul>
-        {% endfor %}
 
+          <h3>Cards</h3>
+
+          {% for card in cards %}
+            <ul class="category">
+
+              <h4>{{ card.account.bank.bank_name }} {{ card.last_four_digits }}</h4>
+              {% if card.last_statement_id %}
+                <li>
+                  <a href="{{ url_for('credit.load_statement_details', statement_id=card.last_statement_id) }}">
+                    See most recent statement
+                  </a>
+                </li>
+              {% endif %}
+              <li>
+                <a href="{{ url_for('credit.load_transactions', card_id=card.id) }}">
+                  See transaction history
+                </a>
+              </li>
+              <li>
+                <a href="{{ url_for('credit.add_transaction', card_id=card.id) }}">
+                  Create a new transaction
+                </a>
+              </li>
+
+            </ul>
+          {% endfor %}
+
+        </div>
 
       </div>
 
-      <div id="investments" class="panel">
-        <h2>Coming soon!</h2>
+      <div class="panel-column">
+
+        <div id="investments" class="panel">
+          <h2>Coming soon!</h2>
+        </div>
+
       </div>
 
     </div>
@@ -159,11 +182,3 @@
   {% endif %}
 
 {% endblock %}
-
-{% block javascript %}
-  <script>
-    const HIDE_HOMEPAGE_BLOCK_ENDPOINT = "{{ url_for('core.hide_homepage_block') }}";
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/hide-homepage-block.js') }}">
-  </script>
-{% endblock %}

monopyly/templates/core/profile.html

@@ -1,13 +1,28 @@
 {% extends "layout.html" %}
 
-{% block title %}
-  Profile
+
+{% block javascript %}
+
+  <script>
+    const UPDATE_BANK_NAME_ENDPOINTS = {
+      {% for bank in banks %}
+        {{ bank.id }}: "{{ url_for('banking.update_bank_name', bank_id=bank.id) }}",
+      {% endfor %}
+    };
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/expand-bank.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/update-bank-name.js') }}">
+  </script>
+
 {% endblock %}
 
+
 {% block header %}
-  <h1>Profile</h1>
+  <h1>{% block title %}Profile{% endblock %}</h1>
 {% endblock %}
 
+
 {% block content %}
 
   <div id="profile">
@@ -67,7 +82,7 @@
 
         <h2>Transactions</h2>
 
-        <a href="{{ url_for('credit.load_tags') }}">Manage transaction tags</a>
+        <a href="{{ url_for('banking.load_tags') }}">Manage transaction tags</a>
 
       </div>
 
@@ -76,19 +91,3 @@
   </div>
 
 {% endblock %}
-
-
-{% block javascript %}
-  <script>
-
-    const UPDATE_BANK_NAME_ENDPOINTS = {
-      {% for bank in banks %}
-        {{ bank.id }}: "{{ url_for('banking.update_bank_name', bank_id=bank.id) }}",
-      {% endfor %}
-    };
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/expand-bank.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/update-bank-name.js') }}">
-  </script>
-{% endblock %}

monopyly/templates/credit/account_page.html

@@ -1,6 +1,23 @@
 {% extends 'layout.html' %}
 
 
+{% block javascript %}
+
+  <script>
+    const UPDATE_CARD_STATUS_ENDPOINT = "{{ url_for('credit.update_card_status') }}";
+    const UPDATE_ACCOUNT_STATEMENT_ISSUE_DAY_ENDPOINT = "{{ url_for('credit.update_account_statement_issue_day', account_id=account.id) }}";
+    const UPDATE_ACCOUNT_STATEMENT_DUE_DAY_ENDPOINT = "{{ url_for('credit.update_account_statement_due_day', account_id=account.id) }}";
+  </script>
+  <script src="{{ url_for('static', filename='js/flip-card.js') }}" defer>
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/update-card-status.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/update-account-statement-parameters.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block header %}
 
   <h1>
@@ -100,20 +117,3 @@
     </div>
 
 {% endblock %}
-
-
-{% block javascript %}
-
-  <script>
-    const UPDATE_CARD_STATUS_ENDPOINT = "{{ url_for('credit.update_card_status') }}";
-    const UPDATE_ACCOUNT_STATEMENT_ISSUE_DAY_ENDPOINT = "{{ url_for('credit.update_account_statement_issue_day', account_id=account.id) }}";
-    const UPDATE_ACCOUNT_STATEMENT_DUE_DAY_ENDPOINT = "{{ url_for('credit.update_account_statement_due_day', account_id=account.id) }}";
-  </script>
-  <script src="{{ url_for('static', filename='js/flip-card.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/update-card-status.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/update-account-statement-parameters.js') }}">
-  </script>
-
-{% endblock %}

monopyly/templates/credit/card_form/card_form_page_new.html

@@ -1,6 +1,14 @@
 {% extends "common/form_page.html" %}
 
 
+{% block javascript %}
+
+  <script type="module" src="{{ url_for('static', filename='js/display-new-credit-account-inputs.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block title %}
   New Card
 {% endblock %}
@@ -17,8 +25,3 @@
   {% endif %}
 
 {% endblock %}
-
-{% block javascript %}
-  <script type="module" src="{{ url_for('static', filename='js/display-new-credit-account-inputs.js') }}">
-  </script>
-{% endblock %}

monopyly/templates/credit/statement_page.html

@@ -1,6 +1,49 @@
 {% extends 'layout.html' %}
 
 
+{% block javascript %}
+
+  <script>
+    const CREDIT_ACTIVITY_RECONCILIATION_ENDPOINT = "{{ url_for('credit.reconcile_activity', statement_id=statement.id) }}";
+    const UPDATE_STATEMENT_DUE_DATE_ENDPOINT = "{{ url_for('credit.update_statement_due_date', statement_id=statement.id) }}";
+    const MAKE_PAYMENT_ENDPOINT = "{{ url_for('credit.pay_credit_card', card_id=statement.card_id, statement_id=statement.id) }}";
+    const EXPAND_TRANSACTION_ENDPOINT = "{{ url_for('credit.expand_transaction') }}";
+    const LINKED_TRANSACTION_ENDPOINT = "{{ url_for('credit.show_linked_transaction') }}";
+  </script>
+  <script>
+    const CATEGORY_CHART_DATA = {
+      labels: [
+        {% for label in chart_data['labels'] %}
+          {% if label == '' %}
+            "Other",
+          {% else %}
+            "{{ label }}",
+          {% endif %}
+        {% endfor %}
+      ],
+      series: [
+        {% for subtotal in chart_data['subtotals'] %}
+          {{ subtotal }},
+        {% endfor %}
+      ],
+    };
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/show-credit-activity-loader.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/update-statement-parameters.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/make-payment.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/expand-transaction.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/show-linked-transaction.js') }}">
+  </script>
+  <script type="module" src="{{ url_for('static', filename='js/create-category-chart.js') }}">
+  </script>
+
+{% endblock %}
+
+
 {% block header %}
 
   <h1>
@@ -23,8 +66,8 @@
       </div>
 
       <div id="statement-transactions-container" class="transactions-container">
-        {% with transactions = statement_transactions, full_view = False %}
-          {% include 'credit/transactions_table/transactions.html' %}
+        {% with full_view = False %}
+          {% include 'credit/transactions_table/table.html' %}
         {% endwith %}
       </div>
 
@@ -58,47 +101,3 @@
     </div>
 
 {% endblock %}
-
-
-{% block javascript %}
-
-  <script>
-    const CREDIT_ACTIVITY_RECONCILIATION_ENDPOINT = "{{ url_for('credit.reconcile_activity', statement_id=statement.id) }}";
-    const UPDATE_STATEMENT_DUE_DATE_ENDPOINT = "{{ url_for('credit.update_statement_due_date', statement_id=statement.id) }}";
-    const MAKE_PAYMENT_ENDPOINT = "{{ url_for('credit.pay_credit_card', card_id=statement.card_id, statement_id=statement.id) }}";
-    const EXPAND_TRANSACTION_ENDPOINT = "{{ url_for('credit.expand_transaction') }}";
-    const LINKED_TRANSACTION_ENDPOINT = "{{ url_for('credit.show_linked_transaction') }}";
-  </script>
-  <script>
-    const CATEGORY_CHART_DATA = {
-      labels: [
-        {% for label in chart_data['labels'] %}
-          {% if label == '' %}
-            "Other",
-          {% else %}
-            "{{ label }}",
-          {% endif %}
-        {% endfor %}
-      ],
-      series: [
-        {% for subtotal in chart_data['subtotals'] %}
-          {{ subtotal }},
-        {% endfor %}
-      ],
-    };
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/show-credit-activity-loader.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/update-statement-parameters.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/make-payment.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/expand-transaction.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/show-linked-transaction.js') }}">
-  </script>
-  <script type="module" src="{{ url_for('static', filename='js/create-category-chart.js') }}">
-  </script>
-
-{% endblock %}
-