byte/expensetracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Front v3 #42

Merged
bytegrip merged 6 commits from front-v3 into master 2023-12-08 17:57:53 +00:00
Conversation 0 Commits 6 Files Changed 23 +17 -15
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cb6c03fe76 - Show all commits

30
src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Dashboard.svelte
View File

@@ -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);
}
});
</script>

2
src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/menu/SideMenu.svelte
View File

@@ -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)