#724 - added new navbar entry for csv import

deadlocker8 · Jan 8, 2023 · 8467583 · 8467583
1 parent 478f3c9
commit 8467583
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 5 deletions.
diff --git a/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/EntityType.java b/BudgetMasterServer/src/main/java/de/deadlocker8/budgetmaster/services/EntityType.java
@@ -20,7 +20,8 @@ public enum EntityType implements LocalizedEnum
 	TEMPLATE_GROUP("folder", "background-orange-dark", ImportRequired.OPTIONAL, "template groups", "template group"),
 	ICON("icon", "background-grey", ImportRequired.NONE, "icons", "icon"),
 	TRANSACTION_NAME_KEYWORD("transaction_name_keyword", "background-grey", ImportRequired.NONE, "keywords", "keyword"),
-	RECURRING_TRANSACTIONS("repeat", "background-orange-dark", ImportRequired.NONE, "recurring", "recurring");
+	RECURRING_TRANSACTIONS("repeat", "background-orange-dark", ImportRequired.NONE, "recurring", "recurring"),
+	TRANSACTION_IMPORT("fas fa-file-csv", "background-orange-dark", ImportRequired.NONE, "transactionImport", "transactionImport");
 
 	public enum ImportRequired
 	{

diff --git a/BudgetMasterServer/src/main/resources/languages/base_de.properties b/BudgetMasterServer/src/main/resources/languages/base_de.properties
@@ -239,6 +239,7 @@ menu.home=Startseite
 menu.transactions=Buchungen
 menu.transactions.templates=Vorlagen
 menu.transactions.recurring=Wiederholende Buchungen
+menu.transactions.import=Import aus Bank CSV
 menu.template.groups=Vorlagengruppen
 menu.categories=Kategorien
 menu.charts=Diagramme

diff --git a/BudgetMasterServer/src/main/resources/languages/base_en.properties b/BudgetMasterServer/src/main/resources/languages/base_en.properties
@@ -240,6 +240,7 @@ menu.home=Home
 menu.transactions=Transactions
 menu.transactions.templates=Templates
 menu.transactions.recurring=Recurring Transactions
+menu.transactions.import=Import from bank CSV
 menu.template.groups=Template Groups
 menu.categories=Categories
 menu.charts=Charts

diff --git a/BudgetMasterServer/src/main/resources/static/css/navbar.css b/BudgetMasterServer/src/main/resources/static/css/navbar.css
@@ -29,6 +29,14 @@ ul.sidenav.sidenav-fixed > li:last-child {
     font-weight: 600;
 }
 
+.sidenav li i {
+    font-size: 24px;
+}
+
+.sidenav li .fontawesome-icon{
+    font-size: 20px;
+}
+
 .searchWrapper {
     background-color: #FFFFFF;
     box-shadow: none;
@@ -44,7 +52,12 @@ ul.sidenav.sidenav-fixed > li:last-child {
 }
 
 .sidenav .sub-menu-entry i {
-    margin-left: 2rem !important;
+    margin-left: 32px !important;
+}
+
+.sidenav .sub-menu-entry .fontawesome-icon-additional-margin-left {
+    margin-left: 36px !important;
+    margin-right: 28px;
 }
 
 .sidenav .sub-menu {

diff --git a/BudgetMasterServer/src/main/resources/templates/helpers/navbar.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/navbar.ftl
@@ -127,9 +127,9 @@
 
 <#macro itemWithFontawesomeIcon ID link text icon activeColor activeID>
     <#if activeID == ID>
-        <li class="active"><a href="<@s.url '${link}'/>" class="waves-effect no-padding"><div class="stripe ${activeColor}"></div><i class="${icon}"></i>${text}</a></li>
+        <li class="active"><a href="<@s.url '${link}'/>" class="waves-effect no-padding"><div class="stripe ${activeColor}"></div><i class="${icon} fontawesome-icon"></i>${text}</a></li>
     <#else>
-        <li><a href="<@s.url '${link}'/>" class="waves-effect"><i class="${icon}"></i>${text}</a></li>
+        <li><a href="<@s.url '${link}'/>" class="waves-effect"><i class="${icon} fontawesome-icon"></i>${text}</a></li>
     </#if>
 </#macro>
 
@@ -146,10 +146,11 @@
 </#macro>
 
 <#macro transactionsMenu link text icon activeColor activeID>
-    <#if activeID == "transactions" || activeID == "templates" || activeID == "recurring">
+    <#if activeID == "transactions" || activeID == "templates" || activeID == "recurring" || activeID == "importCSV">
         <li class="sub-menu <#if activeID == "transactions">active</#if>"><a href="<@s.url '${link}'/>" class="waves-effect no-padding"><div class="stripe ${activeColor}"></div><i class="material-icons">${icon}</i>${text}</a></li>
         <li class="sub-menu sub-menu-entry <#if activeID == "templates">active</#if>"><a href="<@s.url '/templates'/>" class="waves-effect no-padding"><div class="stripe ${activeColor}"></div><i class="material-icons">${entityType.TEMPLATE.getIcon()}</i>${locale.getString("menu.transactions.templates")}</a></li>
         <li class="sub-menu sub-menu-entry <#if activeID == "recurring">active</#if>"><a href="<@s.url '/transactions/recurringOverview'/>" class="waves-effect no-padding"><div class="stripe ${activeColor}"></div><i class="material-icons">${entityType.RECURRING_TRANSACTIONS.getIcon()}</i>${locale.getString("menu.transactions.recurring")}</a></li>
+        <li class="sub-menu sub-menu-entry <#if activeID == "importCSV">active</#if>"><a href="<@s.url '/transactions/recurringOverview'/>" class="waves-effect no-padding"><div class="stripe ${activeColor}"></div><i class="${entityType.TRANSACTION_IMPORT.getIcon()} fontawesome-icon fontawesome-icon-additional-margin-left"></i>${locale.getString("menu.transactions.import")}</a></li>
     <#else>
         <li><a href="<@s.url '${link}'/>" class="waves-effect"><i class="material-icons">${icon}</i>${text}</a></li>
     </#if>