diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/ExpenseDashboard.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/ExpenseDashboard.svelte
index aa9e59f..63c3b79 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/ExpenseDashboard.svelte
+++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/ExpenseDashboard.svelte
@@ -6,4 +6,4 @@
diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Settings.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Settings.svelte
new file mode 100644
index 0000000..14d6222
--- /dev/null
+++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Settings.svelte
@@ -0,0 +1,59 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/graphs/Graph2.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/graphs/Graph2.svelte
index e36cf8a..c81928f 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/graphs/Graph2.svelte
+++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/graphs/Graph2.svelte
@@ -2,6 +2,7 @@
import Chart from 'chart.js/auto';
import { onMount } from 'svelte';
import { expenseData } from "../../../stores.js";
+ import {globalStyles} from "../../../styles.js";
let ctx;
let chartCanvas;
@@ -73,7 +74,7 @@
});
-
+
@@ -82,9 +83,10 @@
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
transition: all 0.3s cubic-bezier(.25,.8,.25,1);
flex: 1;
- border-radius: 10px;
- margin: 10px;
- background-color: #d3d3d3;
+ border-radius: 0 0 10px 10px;
+ margin: 0 0 10px 10px;
+ min-width: 0;
+ min-height:0;
}
#chart:hover {
diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/graphs/Graph3.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/graphs/Graph3.svelte
index c5c1fb6..ad13d3e 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/graphs/Graph3.svelte
+++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/graphs/Graph3.svelte
@@ -2,6 +2,7 @@
import Chart from 'chart.js/auto';
import { onMount } from 'svelte';
import { incomeData, expenseData } from "../../../stores.js";
+ import {globalStyles} from "../../../styles.js";
let ctx;
let chartCanvas;
@@ -15,34 +16,36 @@
const chartLabels = ['Incomes', 'Expenses'];
const chartValues = [totalIncomes, totalExpenses];
- ctx = chartCanvas.getContext('2d');
- if (!chart) {
- chart = new Chart(ctx, {
- type: 'pie',
- data: {
- labels: chartLabels,
- datasets: [{
- data: chartValues,
- backgroundColor: [
- 'rgb(243, 188, 0)',
- 'rgb(0, 117, 164)'
- ],
- }]
- },
- options: {
- responsive: true,
- maintainAspectRatio: false
- }
- });
- } else {
- const totalIncomesUpd = $incomeData.reduce((total, item) => total + parseInt(item.amount), 0);
- const totalExpensesUpd = $expenseData.reduce((total, item) => total + parseInt(item.amount), 0);
+ if (chartCanvas.getContext('2d') !== undefined) {
+ ctx = chartCanvas.getContext('2d');
+ if (!chart) {
+ chart = new Chart(ctx, {
+ type: 'pie',
+ data: {
+ labels: chartLabels,
+ datasets: [{
+ data: chartValues,
+ backgroundColor: [
+ 'rgb(243, 188, 0)',
+ 'rgb(0, 117, 164)'
+ ],
+ }]
+ },
+ options: {
+ responsive: true,
+ maintainAspectRatio: false
+ }
+ });
+ } else {
+ const totalIncomesUpd = $incomeData.reduce((total, item) => total + parseInt(item.amount), 0);
+ const totalExpensesUpd = $expenseData.reduce((total, item) => total + parseInt(item.amount), 0);
- const chartLabels = ['Incomes', 'Expenses'];
- const chartValues = [totalIncomesUpd, totalExpensesUpd];
- chart.data.labels = chartLabels;
- chart.data.datasets[0].data = chartValues;
- chart.update();
+ const chartLabels = ['Incomes', 'Expenses'];
+ const chartValues = [totalIncomesUpd, totalExpensesUpd];
+ chart.data.labels = chartLabels;
+ chart.data.datasets[0].data = chartValues;
+ chart.update();
+ }
}
} catch (error) {
console.error('Error:', error);
@@ -60,7 +63,7 @@
});
-
+
@@ -69,9 +72,10 @@
box-shadow: 0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24);
transition: all 0.3s cubic-bezier(.25,.8,.25,1);
flex: 1;
- border-radius: 10px;
- margin: 10px;
- background-color: #d3d3d3;
+ border-radius: 0 0 10px 10px;
+ margin: 0 0 10px 10px;
+ min-width: 0;
+ min-height:0;
}
#chart:hover {
diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/infolists/contents/ContentExpense.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/infolists/ContentExpense.svelte
similarity index 94%
rename from src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/infolists/contents/ContentExpense.svelte
rename to src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/infolists/ContentExpense.svelte
index bd64722..995ceea 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/infolists/contents/ContentExpense.svelte
+++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/infolists/ContentExpense.svelte
@@ -1,9 +1,10 @@
-
+
-
-
+
{#each $expenseData as item}
- -
+
-
{item.incomeCategory ? `${item.incomeCategory.name}: ` : `${item.expenseCategory.name}: `}
{item.incomeCategory ? `+${item.amount}$` : `-${item.amount}$`}
{`${item.date}`}
@@ -31,47 +19,58 @@
-
diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/infolists/modals/Modal.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/infolists/Modal.svelte
similarity index 100%
rename from src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/infolists/modals/Modal.svelte
rename to src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/infolists/Modal.svelte
diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/other/DataMenu.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/other/DataMenu.svelte
index cb4257c..1052824 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/other/DataMenu.svelte
+++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/other/DataMenu.svelte
@@ -2,55 +2,163 @@
import Graph2 from '../graphs/Graph2.svelte';
import Graph3 from '../graphs/Graph3.svelte';
import Expenses from "../infolists/Expenses.svelte";
+ import {globalStyles} from "../../../styles.js";
+ import { slide } from 'svelte/transition'
+ import {expenseTypes} from "../../../stores.js";
+
+ let isDateDropdownExpanded = false
+ let isCategoryDropdownExpanded = false
+
+ function clickHandlerDate() {
+ isDateDropdownExpanded = !isDateDropdownExpanded
+ }
+
+ function clickHandlerCategory() {
+ isCategoryDropdownExpanded = !isCategoryDropdownExpanded;
+ }
+
-