diff --git a/BudgetMasterServer/pom.xml b/BudgetMasterServer/pom.xml index 01aeedb12bc5c326e391d6d4762891899afa3e29..1aa84f901f3a5b21072d7f52dc5d88eee2101681 100644 --- a/BudgetMasterServer/pom.xml +++ b/BudgetMasterServer/pom.xml @@ -26,7 +26,7 @@ <properties> <jlibs.version>3.2.0</jlibs.version> <versionizer.version>3.0.1</versionizer.version> - <webjars-locator.version>0.52</webjars-locator.version> + <webjars-locator.version>1.1.0</webjars-locator.version> <jquery.version>3.7.1</jquery.version> <materializecss.version>1.0.0</materializecss.version> <fontawesome.version>6.7.2</fontawesome.version> @@ -149,7 +149,7 @@ <!--Webjars--> <dependency> <groupId>org.webjars</groupId> - <artifactId>webjars-locator</artifactId> + <artifactId>webjars-locator-lite</artifactId> <version>${webjars-locator.version}</version> </dependency> <dependency> diff --git a/BudgetMasterServer/src/main/resources/templates/accounts/newAccount.ftl b/BudgetMasterServer/src/main/resources/templates/accounts/newAccount.ftl index a87d15f030519135a71d3c1bbe5cf2ccccf3077e..12abf4e3a7bf6d446d32cb9496bfdce0271d7fff 100644 --- a/BudgetMasterServer/src/main/resources/templates/accounts/newAccount.ftl +++ b/BudgetMasterServer/src/main/resources/templates/accounts/newAccount.ftl @@ -138,7 +138,7 @@ <!-- Scripts--> <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> - <script src="<@s.url '/webjars/vanilla-picker/2.12.3/dist/vanilla-picker.min.js'/>"></script> + <script src="<@s.url '/webjars/vanilla-picker/dist/vanilla-picker.min.js'/>"></script> <script src="<@s.url '/js/accounts.js'/>"></script> <script src="<@s.url '/js/iconSelect.js'/>"></script> <script src="<@s.url '/js/fontColorPicker.js'/>"></script> diff --git a/BudgetMasterServer/src/main/resources/templates/categories/newCategory.ftl b/BudgetMasterServer/src/main/resources/templates/categories/newCategory.ftl index b14d5ba7ed919ebb586302e5181afe8fa2fd613a..e9384cfee7fe4cc62b292b584e6476bc45b48558 100644 --- a/BudgetMasterServer/src/main/resources/templates/categories/newCategory.ftl +++ b/BudgetMasterServer/src/main/resources/templates/categories/newCategory.ftl @@ -118,7 +118,7 @@ <!-- Scripts--> <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> - <script src="<@s.url '/webjars/vanilla-picker/2.12.3/dist/vanilla-picker.min.js'/>"></script> + <script src="<@s.url '/webjars/vanilla-picker/dist/vanilla-picker.min.js'/>"></script> <script src="<@s.url '/js/categories.js'/>"></script> <script src="<@s.url '/js/iconSelect.js'/>"></script> <script src="<@s.url '/js/fontColorPicker.js'/>"></script> diff --git a/BudgetMasterServer/src/main/resources/templates/charts/newChart.ftl b/BudgetMasterServer/src/main/resources/templates/charts/newChart.ftl index 9480cd8ad94307bbeb00da7ec9921be2df4bd940..c10aab2ade26c613b2278345a48877857779ea79 100644 --- a/BudgetMasterServer/src/main/resources/templates/charts/newChart.ftl +++ b/BudgetMasterServer/src/main/resources/templates/charts/newChart.ftl @@ -11,7 +11,7 @@ <@header.header "BudgetMaster - ${title}"/> <#import "/spring.ftl" as s> - <link rel="stylesheet" href="<@s.url "/webjars/codemirror/5.62.2/lib/codemirror.css"/>"> + <link rel="stylesheet" href="<@s.url "/webjars/codemirror/lib/codemirror.css"/>"> <@header.style "charts"/> </head> <@header.body> @@ -102,8 +102,8 @@ <!-- Scripts--> <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> - <script src="<@s.url '/webjars/codemirror/5.62.2/lib/codemirror.js'/>"></script> - <script src="<@s.url '/webjars/codemirror/5.62.2/mode/javascript/javascript.js'/>"></script> + <script src="<@s.url '/webjars/codemirror/lib/codemirror.js'/>"></script> + <script src="<@s.url '/webjars/codemirror/mode/javascript/javascript.js'/>"></script> <script src="<@s.url '/js/charts.js'/>"></script> </@header.body> </html> \ No newline at end of file diff --git a/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl index f18097b11ecc9632121ec2d5e4c62e08237684e3..c64bba42399db05506fde28d4f068ff04e0b6253 100644 --- a/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl +++ b/BudgetMasterServer/src/main/resources/templates/helpers/header.ftl @@ -21,9 +21,9 @@ <#import "/spring.ftl" as s> <title>${title}</title> <meta charset="UTF-8"/> - <link rel="stylesheet" href="<@s.url '/webjars/font-awesome/6.5.2/css/all.min.css'/>"> + <link rel="stylesheet" href="<@s.url '/webjars/font-awesome/css/all.min.css'/>"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> - <link rel="stylesheet" href="<@s.url "/webjars/materializecss/1.0.0/css/materialize.min.css"/>"> + <link rel="stylesheet" href="<@s.url "/webjars/materializecss/css/materialize.min.css"/>"> <@style "colors"/> <@style "style"/> <@style "navbar"/> diff --git a/BudgetMasterServer/src/main/resources/templates/helpers/scripts.ftl b/BudgetMasterServer/src/main/resources/templates/helpers/scripts.ftl index 3d005693cbf57de88d78e70a968936a71ae82b7d..393875b10f7eca78a43f2c96e9e982a29993d33e 100644 --- a/BudgetMasterServer/src/main/resources/templates/helpers/scripts.ftl +++ b/BudgetMasterServer/src/main/resources/templates/helpers/scripts.ftl @@ -1,8 +1,8 @@ <#macro scripts> <#import "/spring.ftl" as s> - <script src="<@s.url '/webjars/jquery/3.7.1/jquery.min.js'/>"></script> - <script src="<@s.url '/webjars/materializecss/1.0.0/js/materialize.min.js'/>"></script> - <script src="<@s.url '/webjars/mousetrap/1.6.5/mousetrap.js'/>"></script> + <script src="<@s.url '/webjars/jquery/jquery.min.js'/>"></script> + <script src="<@s.url '/webjars/materializecss/js/materialize.min.js'/>"></script> + <script src="<@s.url '/webjars/mousetrap/mousetrap.js'/>"></script> <script> rootURL = "<@s.url ''/>" </script> diff --git a/BudgetMasterServer/src/main/resources/templates/reports/reports.ftl b/BudgetMasterServer/src/main/resources/templates/reports/reports.ftl index 20c244bc4d23c41ea04705cb33fc073a4b1efe3b..fd6a7c2f9485c7d15fbf09d54e11b8acfd197bdf 100644 --- a/BudgetMasterServer/src/main/resources/templates/reports/reports.ftl +++ b/BudgetMasterServer/src/main/resources/templates/reports/reports.ftl @@ -109,7 +109,7 @@ <!-- Scripts--> <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> - <script src="<@s.url '/webjars/sortablejs/1.15.3/Sortable.min.js'/>"></script> + <script src="<@s.url '/webjars/sortablejs/Sortable.min.js'/>"></script> <script src="<@s.url '/js/reports.js'/>"></script> <script src="<@s.url '/js/globalDatePicker.js'/>"></script> <script src="<@s.url '/js/filter.js'/>"></script> diff --git a/BudgetMasterServer/src/main/resources/templates/templates/newTemplate.ftl b/BudgetMasterServer/src/main/resources/templates/templates/newTemplate.ftl index c6d1fa9ac0ce33707fd482f24da63167b50cffbc..9e9894a89038c3a7f3ca2102b9bc9e155a430998 100644 --- a/BudgetMasterServer/src/main/resources/templates/templates/newTemplate.ftl +++ b/BudgetMasterServer/src/main/resources/templates/templates/newTemplate.ftl @@ -105,7 +105,7 @@ <!-- Scripts--> <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> - <script src="<@s.url '/webjars/vanilla-picker/2.12.3/dist/vanilla-picker.min.js'/>"></script> + <script src="<@s.url '/webjars/vanilla-picker/dist/vanilla-picker.min.js'/>"></script> <script src="<@s.url '/js/helpers.js'/>"></script> <script src="<@s.url '/js/transactions.js'/>"></script> <script src="<@s.url '/js/templates.js'/>"></script>