diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Dashboard.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Dashboard.svelte index ac065bf..0f35fd1 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Dashboard.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Dashboard.svelte @@ -30,21 +30,23 @@ } }; - try { - const [incomeResponse, expenseResponse, incomeTypesResponse, expenseTypesResponse] = await Promise.all([ - axios.get('http://localhost:8081/incomes/personal-incomes', config), - axios.get('http://localhost:8081/expenses/personal-expenses', config), - axios.get('http://localhost:8081/incomes/categories', config), - axios.get('http://localhost:8081/expenses/categories', config) - ]); + try { + const [incomeResponse, expenseResponse, incomeTypesResponse, expenseTypesResponse] = await Promise.all([ + axios.get('http://localhost:8081/incomes/personal-incomes?month=11', config), + axios.get('http://localhost:8081/expenses/personal-expenses?month=11', config), + axios.get('http://localhost:8081/incomes/categories', config), + axios.get('http://localhost:8081/expenses/categories', config) + ]); - incomeData.set(incomeResponse.data); - expenseData.set(expenseResponse.data); - incomeTypes.set(incomeTypesResponse.data); - expenseTypes.set(expenseTypesResponse.data); - } catch (error) { - console.error('Error:', error); - } + console.log("Data", incomeResponse.data); + + incomeData.set(incomeResponse.data); + expenseData.set(expenseResponse.data); + incomeTypes.set(incomeTypesResponse.data); + expenseTypes.set(expenseTypesResponse.data); + } catch (error) { + console.error('Error:', error); + } }); diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/menu/SideMenu.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/menu/SideMenu.svelte index df98d3d..b4081b7 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/menu/SideMenu.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/menu/SideMenu.svelte @@ -17,7 +17,7 @@ }; try { - const response = await axios.get('http://localhost:8081/users/getUserData', config); + const response = await axios.get('http://localhost:8081/users/get-user-data', config); const data = response.data; username = data.username; console.log(username)