diff --git a/src/main/resources/templates/about.ftl b/src/main/resources/templates/about.ftl
index c7f07f0e5787a522646279327bc304a46df16de6..30ba723270581950f0f9abc3d6529a360aada86c 100644
--- a/src/main/resources/templates/about.ftl
+++ b/src/main/resources/templates/about.ftl
@@ -1,10 +1,10 @@
<html>
<head>
- <#import "header.ftl" as header>
+ <#import "helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
</head>
<body class="budgetmaster-blue-light">
- <#import "navbar.ftl" as navbar>
+ <#import "helpers/navbar.ftl" as navbar>
<@navbar.navbar "about"/>
<main>
@@ -45,7 +45,7 @@
</main>
<!-- Scripts-->
- <#import "scripts.ftl" as scripts>
+ <#import "helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/accounts/accounts.ftl b/src/main/resources/templates/accounts/accounts.ftl
index b310765f40bdd7dd67decd59ce7b5964d958a06b..c9fa22cad49f2b63b007802e38a7b9a4305902ca 100644
--- a/src/main/resources/templates/accounts/accounts.ftl
+++ b/src/main/resources/templates/accounts/accounts.ftl
@@ -1,11 +1,11 @@
<html>
<head>
- <#import "../header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
- <#import "../navbar.ftl" as navbar>
+ <#import "../helpers/navbar.ftl" as navbar>
<@navbar.navbar "accounts"/>
<main>
@@ -67,7 +67,7 @@
</#if>
<!-- Scripts-->
- <#import "../scripts.ftl" as scripts>
+ <#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
<script src="<@s.url '/js/accounts.js'/>"></script>
</body>
diff --git a/src/main/resources/templates/accounts/newAccount.ftl b/src/main/resources/templates/accounts/newAccount.ftl
index 6243389ddce1887a53902c5044c02c4ff8669e23..7b030943bef86d7cd493df51afe9930af1d91704 100644
--- a/src/main/resources/templates/accounts/newAccount.ftl
+++ b/src/main/resources/templates/accounts/newAccount.ftl
@@ -1,11 +1,11 @@
<html>
<head>
- <#import "../header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
- <#import "../navbar.ftl" as navbar>
+ <#import "../helpers/navbar.ftl" as navbar>
<@navbar.navbar "accounts"/>
<main>
@@ -16,7 +16,7 @@
</div>
</div>
<div class="container">
- <#import "../validation.ftl" as validation>
+ <#import "../helpers/validation.ftl" as validation>
<form name="NewAccount" action="<@s.url '/accounts/newAccount'/>" method="post">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
<input type="hidden" name="ID" value="<#if account.getID()??>${account.getID()?c}</#if>">
@@ -63,7 +63,7 @@
</main>
<!-- Scripts-->
- <#import "../scripts.ftl" as scripts>
+ <#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/categories/categories.ftl b/src/main/resources/templates/categories/categories.ftl
index 51100be2361ed6fe975eb5dede177d069955196b..70076c7858677b123969c1bfbb43851596ebb5ce 100644
--- a/src/main/resources/templates/categories/categories.ftl
+++ b/src/main/resources/templates/categories/categories.ftl
@@ -1,12 +1,12 @@
<html>
<head>
- <#import "../header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
<@header.style "categories"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
- <#import "../navbar.ftl" as navbar>
+ <#import "../helpers/navbar.ftl" as navbar>
<@navbar.navbar "categories"/>
<#import "categoriesFunctions.ftl" as categoriesFunctions>
@@ -65,7 +65,7 @@
</main>
<!-- Scripts-->
- <#import "../scripts.ftl" as scripts>
+ <#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
<script src="<@s.url '/js/categories.js'/>"></script>
</body>
diff --git a/src/main/resources/templates/categories/newCategory.ftl b/src/main/resources/templates/categories/newCategory.ftl
index 20704eb6a7a17331ae28d63097cef361654ddf78..afc5b4f4477db5479ae767cd689b7a8f126642c1 100644
--- a/src/main/resources/templates/categories/newCategory.ftl
+++ b/src/main/resources/templates/categories/newCategory.ftl
@@ -1,13 +1,13 @@
<html>
<head>
- <#import "../header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
<@header.style "spectrum"/>
<@header.style "categories"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
- <#import "../navbar.ftl" as navbar>
+ <#import "../helpers/navbar.ftl" as navbar>
<@navbar.navbar "categories"/>
<#import "categoriesFunctions.ftl" as categoriesFunctions>
@@ -20,7 +20,7 @@
</div>
</div>
<div class="container">
- <#import "../validation.ftl" as validation>
+ <#import "../helpers/validation.ftl" as validation>
<form name="NewCategory" action="<@s.url '/categories/newCategory'/>" method="post">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
<input type="hidden" name="ID" value="<#if category.getID()??>${category.getID()?c}</#if>">
@@ -95,7 +95,7 @@
</main>
<!-- Scripts-->
- <#import "../scripts.ftl" as scripts>
+ <#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
<script src="<@s.url '/js/spectrum.js'/>"></script>
<script src="<@s.url '/js/categories.js'/>"></script>
diff --git a/src/main/resources/templates/error/403.ftl b/src/main/resources/templates/error/403.ftl
index 2524ea66ac41df28f13d7787a507199fae03c62e..16b4bc82f65694e8bb0be211482e56ff0f1f217d 100644
--- a/src/main/resources/templates/error/403.ftl
+++ b/src/main/resources/templates/error/403.ftl
@@ -1,6 +1,6 @@
<html>
<head>
- <#import "../header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster - 403"/>
<@header.style "login"/>
<#import "/spring.ftl" as s>
diff --git a/src/main/resources/templates/error/404.ftl b/src/main/resources/templates/error/404.ftl
index 2df2e4dc7941bd0281591c325e6ebda857d2a60e..ac3f84a12d3eb67ca00a1e9295ef09001e224478 100644
--- a/src/main/resources/templates/error/404.ftl
+++ b/src/main/resources/templates/error/404.ftl
@@ -1,6 +1,6 @@
<html>
<head>
- <#import "../header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster - 404"/>
<@header.style "login"/>
<#import "/spring.ftl" as s>
diff --git a/src/main/resources/templates/error/418.ftl b/src/main/resources/templates/error/418.ftl
index 98348de917609a91ef0c7ba722d5b3161bb79420..df734f8f132ea6156fd24174ed7b6ab439946134 100644
--- a/src/main/resources/templates/error/418.ftl
+++ b/src/main/resources/templates/error/418.ftl
@@ -1,6 +1,6 @@
<html>
<head>
- <#import "../header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster - 418"/>
<@header.style "login"/>
<#import "/spring.ftl" as s>
@@ -32,7 +32,7 @@
</main>
<!-- Scripts-->
- <#import "../scripts.ftl" as scripts>
+ <#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/error/500.ftl b/src/main/resources/templates/error/500.ftl
index 87e94e37b59f172e5f9221a4fa5d55b2ef7081f2..41b417ad70c038071efffbb0da36f29f90549f90 100644
--- a/src/main/resources/templates/error/500.ftl
+++ b/src/main/resources/templates/error/500.ftl
@@ -1,6 +1,6 @@
<html>
<head>
- <#import "../header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster - 500"/>
<@header.style "login"/>
<#import "/spring.ftl" as s>
@@ -30,7 +30,7 @@
</main>
<!-- Scripts-->
- <#import "../scripts.ftl" as scripts>
+ <#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/datePicker.ftl b/src/main/resources/templates/helpers/datePicker.ftl
similarity index 100%
rename from src/main/resources/templates/datePicker.ftl
rename to src/main/resources/templates/helpers/datePicker.ftl
diff --git a/src/main/resources/templates/header.ftl b/src/main/resources/templates/helpers/header.ftl
similarity index 100%
rename from src/main/resources/templates/header.ftl
rename to src/main/resources/templates/helpers/header.ftl
diff --git a/src/main/resources/templates/navbar.ftl b/src/main/resources/templates/helpers/navbar.ftl
similarity index 100%
rename from src/main/resources/templates/navbar.ftl
rename to src/main/resources/templates/helpers/navbar.ftl
diff --git a/src/main/resources/templates/notification.ftl b/src/main/resources/templates/helpers/notification.ftl
similarity index 100%
rename from src/main/resources/templates/notification.ftl
rename to src/main/resources/templates/helpers/notification.ftl
diff --git a/src/main/resources/templates/scripts.ftl b/src/main/resources/templates/helpers/scripts.ftl
similarity index 100%
rename from src/main/resources/templates/scripts.ftl
rename to src/main/resources/templates/helpers/scripts.ftl
diff --git a/src/main/resources/templates/validation.ftl b/src/main/resources/templates/helpers/validation.ftl
similarity index 100%
rename from src/main/resources/templates/validation.ftl
rename to src/main/resources/templates/helpers/validation.ftl
diff --git a/src/main/resources/templates/index.ftl b/src/main/resources/templates/index.ftl
index e17d5c934553db805ae1f3d5650283c26ded24a9..9801f7ac9870bf508fa2ddfed780ea5641837c78 100644
--- a/src/main/resources/templates/index.ftl
+++ b/src/main/resources/templates/index.ftl
@@ -1,11 +1,11 @@
<html>
<head>
- <#import "header.ftl" as header>
+ <#import "helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
- <#import "navbar.ftl" as navbar>
+ <#import "helpers/navbar.ftl" as navbar>
<@navbar.navbar "home"/>
<main>
@@ -82,7 +82,7 @@
</main>
<!-- Scripts-->
- <#import "scripts.ftl" as scripts>
+ <#import "helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/login.ftl b/src/main/resources/templates/login.ftl
index 3b775de690603cd27f4b28116a0d26c5c7d559ad..aed68a908f176c450f07f6c7531a6c1921741d33 100644
--- a/src/main/resources/templates/login.ftl
+++ b/src/main/resources/templates/login.ftl
@@ -1,6 +1,6 @@
<html>
<head>
- <#import "header.ftl" as header>
+ <#import "helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
<@header.style "login"/>
<#import "/spring.ftl" as s>
@@ -66,7 +66,7 @@
</main>
<!-- Scripts-->
- <#import "scripts.ftl" as scripts>
+ <#import "helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/comingSoon.ftl b/src/main/resources/templates/placeholder/comingSoon.ftl
similarity index 78%
rename from src/main/resources/templates/comingSoon.ftl
rename to src/main/resources/templates/placeholder/comingSoon.ftl
index 755e964d7032f7fe2420cb8066c86d294f6452e7..33ea19ef63e983d75db37ddc3e1d74840b03e6b3 100644
--- a/src/main/resources/templates/comingSoon.ftl
+++ b/src/main/resources/templates/placeholder/comingSoon.ftl
@@ -1,10 +1,10 @@
<html>
<head>
- <#import "header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
</head>
<body class="budgetmaster-blue-light">
- <#import "navbar.ftl" as navbar>
+ <#import "../helpers/navbar.ftl" as navbar>
<@navbar.navbar active/>
<main>
@@ -18,7 +18,7 @@
</main>
<!-- Scripts-->
- <#import "scripts.ftl" as scripts>
+ <#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/emptyPage.ftl b/src/main/resources/templates/placeholder/emptyPage.ftl
similarity index 58%
rename from src/main/resources/templates/emptyPage.ftl
rename to src/main/resources/templates/placeholder/emptyPage.ftl
index 850fa15148c40b4581ad99234a10c8d4f3e9ea24..ddb86743687a1bf516d56ae468a21ba55cf1c47a 100644
--- a/src/main/resources/templates/emptyPage.ftl
+++ b/src/main/resources/templates/placeholder/emptyPage.ftl
@@ -1,14 +1,14 @@
<html>
<head>
- <#import "header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
</head>
<body class="budgetmaster-blue-light">
- <#import "navbar.ftl" as navbar>
+ <#import "../helpers/navbar.ftl" as navbar>
<@navbar.navbar active/>
<!-- Scripts-->
- <#import "scripts.ftl" as scripts>
+ <#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/reports/reports.ftl b/src/main/resources/templates/reports/reports.ftl
index 3463468803377a674abd138405ce7ebb5ea18993..f169c957ea6cd1b59acfd13345b517807fb6b7b4 100644
--- a/src/main/resources/templates/reports/reports.ftl
+++ b/src/main/resources/templates/reports/reports.ftl
@@ -1,16 +1,16 @@
<html>
<head>
- <#import "../header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
- <#import "../navbar.ftl" as navbar>
+ <#import "../helpers/navbar.ftl" as navbar>
<@navbar.navbar "reports"/>
<main>
<div class="card main-card background-color">
- <#import "../datePicker.ftl" as datePicker>
+ <#import "../helpers/datePicker.ftl" as datePicker>
<@datePicker.datePicker currentDate springMacroRequestContext.getRequestUri()/>
<div class="container">
<div class="row">
@@ -28,7 +28,7 @@
</main>
<!-- Scripts-->
- <#import "../scripts.ftl" as scripts>
+ <#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
<script src="<@s.url '/js/datePicker.js'/>"></script>
<script>document.cookie = "currentDate=${helpers.getDateString(currentDate)}";</script>
diff --git a/src/main/resources/templates/import.ftl b/src/main/resources/templates/settings/import.ftl
similarity index 94%
rename from src/main/resources/templates/import.ftl
rename to src/main/resources/templates/settings/import.ftl
index 602e7b24023fcbae66b31eac5639a0bc67edebe0..991b282ecf93fb359d734729f6dca51337922b5a 100644
--- a/src/main/resources/templates/import.ftl
+++ b/src/main/resources/templates/settings/import.ftl
@@ -1,11 +1,11 @@
<html>
<head>
- <#import "header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
- <#import "navbar.ftl" as navbar>
+ <#import "../helpers/navbar.ftl" as navbar>
<@navbar.navbar "settings"/>
<main>
@@ -17,7 +17,7 @@
</div>
</div>
<div class="container">
- <#import "validation.ftl" as validation>
+ <#import "../helpers/validation.ftl" as validation>
<form name="Import" action="<@s.url '/settings/database/import'/>" method="post" onsubmit="return validateForm()">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
@@ -70,7 +70,7 @@
</main>
<!-- Scripts-->
- <#import "scripts.ftl" as scripts>
+ <#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
<script src="<@s.url '/js/import.js'/>"></script>
</body>
diff --git a/src/main/resources/templates/settings.ftl b/src/main/resources/templates/settings/settings.ftl
similarity index 98%
rename from src/main/resources/templates/settings.ftl
rename to src/main/resources/templates/settings/settings.ftl
index 655d4da738ec672d7ba0c30725e02e40041723a2..15b31ee9ee4e455f9ff6745cd7e027c5cc18f5fd 100644
--- a/src/main/resources/templates/settings.ftl
+++ b/src/main/resources/templates/settings/settings.ftl
@@ -1,11 +1,11 @@
<html>
<head>
- <#import "header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
- <#import "navbar.ftl" as navbar>
+ <#import "../helpers/navbar.ftl" as navbar>
<@navbar.navbar "settings"/>
<main>
@@ -16,7 +16,7 @@
</div>
</div>
<div class="container">
- <#import "validation.ftl" as validation>
+ <#import "../helpers/validation.ftl" as validation>
<form name="Settings" action="<@s.url '/settings/save'/>" method="post">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
<input type="hidden" name="ID" value="${settings.getID()?c}">
@@ -257,7 +257,7 @@
</#if>
<!-- Scripts-->
- <#import "scripts.ftl" as scripts>
+ <#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
<script src="<@s.url '/js/spectrum.js'/>"></script>
<script src="<@s.url '/js/settings.js'/>"></script>
diff --git a/src/main/resources/templates/transactions/newTransaction.ftl b/src/main/resources/templates/transactions/newTransaction.ftl
index e928ac176d8a77d11d65d5d93b3b25b7e94e90a4..2b8a49b7516cb64635439a2f9ab60f6cd5754b62 100644
--- a/src/main/resources/templates/transactions/newTransaction.ftl
+++ b/src/main/resources/templates/transactions/newTransaction.ftl
@@ -1,6 +1,6 @@
<html>
<head>
- <#import "../header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
<@header.style "transactions"/>
<@header.style "datepicker"/>
@@ -8,7 +8,7 @@
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
- <#import "../navbar.ftl" as navbar>
+ <#import "../helpers/navbar.ftl" as navbar>
<@navbar.navbar "transactions"/>
<#import "../categories/categoriesFunctions.ftl" as categoriesFunctions>
@@ -21,7 +21,7 @@
</div>
</div>
<div class="container">
- <#import "../validation.ftl" as validation>
+ <#import "../helpers/validation.ftl" as validation>
<form name="NewTransaction" action="<@s.url '/transactions/newTransaction'/>" method="post" onsubmit="return validateForm()">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
<input type="hidden" name="ID" value="<#if transaction.getID()??>${transaction.getID()?c}</#if>">
@@ -344,7 +344,7 @@
</main>
<!-- Pass localization to JS -->
- <#import "../datePicker.ftl" as datePicker>
+ <#import "../helpers/datePicker.ftl" as datePicker>
<@datePicker.datePickerLocalization/>
<script>
startDate = "${startDate}".split(".");
@@ -377,7 +377,7 @@
</script>
<!-- Scripts-->
- <#import "../scripts.ftl" as scripts>
+ <#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
<script src="<@s.url '/js/spectrum.js'/>"></script>
<script src="<@s.url '/js/transactions.js'/>"></script>
diff --git a/src/main/resources/templates/transactions/transactions.ftl b/src/main/resources/templates/transactions/transactions.ftl
index 5a87a362b759565e32a033f0cd42865954bb8af6..e0d814adea52ed8d91c9c2925e56a43fa8cca355 100644
--- a/src/main/resources/templates/transactions/transactions.ftl
+++ b/src/main/resources/templates/transactions/transactions.ftl
@@ -1,17 +1,17 @@
<html>
<head>
- <#import "../header.ftl" as header>
+ <#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
<@header.style "categories"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
- <#import "../navbar.ftl" as navbar>
+ <#import "../helpers/navbar.ftl" as navbar>
<@navbar.navbar "transactions"/>
<main>
<div class="card main-card background-color">
- <#import "../datePicker.ftl" as datePicker>
+ <#import "../helpers/datePicker.ftl" as datePicker>
<@datePicker.datePicker currentDate springMacroRequestContext.getRequestUri()/>
<div class="container">
<div class="row">
@@ -111,7 +111,7 @@
</main>
<!-- Scripts-->
- <#import "../scripts.ftl" as scripts>
+ <#import "../helpers/scripts.ftl" as scripts>
<@scripts.scripts/>
<script src="<@s.url '/js/transactions.js'/>"></script>
<script src="<@s.url '/js/datePicker.js'/>"></script>