diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/package.json b/src/main/java/com/faf223/expensetrackerfaf/web/package.json index 6dd1555..6d06dc6 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/package.json +++ b/src/main/java/com/faf223/expensetrackerfaf/web/package.json @@ -2,7 +2,7 @@ "name": "expensetracker", "version": "0.0.1", "scripts": { - "dev": "vite dev", + "dev": "vite dev --host", "build": "vite build", "preview": "vite preview", "lint": "prettier --plugin-search-dir . --check . && eslint .", diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/+page.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/+page.svelte new file mode 100644 index 0000000..b5f860b --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/+page.svelte @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/auth/login/LoginForm.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/auth/login/LoginForm.svelte index a0bade3..02eed3d 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/auth/login/LoginForm.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/auth/login/LoginForm.svelte @@ -22,7 +22,7 @@ event.preventDefault(); try { - const response = await axios.post('http://localhost:8081/api/v1/auth/authenticate', { + const response = await axios.post('http://trackio.online:8081/api/v1/auth/authenticate', { email: username, password: password, }); diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/auth/register/RegisterForm.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/auth/register/RegisterForm.svelte index 6372a01..92a9d05 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/auth/register/RegisterForm.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/auth/register/RegisterForm.svelte @@ -36,7 +36,7 @@ console.log(data) - const response = await axios.post('http://localhost:8081/api/v1/auth/register', data); + const response = await axios.post('http://trackio.online:8081/api/v1/auth/register', data); const { access_token, refresh_token } = response.data; 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 0f35fd1..93540c7 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 @@ -31,11 +31,13 @@ }; try { + var currentDate = new Date(); + var currentMonth = currentDate.getMonth() + 1; 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) + axios.get('http://trackio.online:8081/incomes/personal-incomes?month=' + currentMonth , config), + axios.get('http://trackio.online:8081/expenses/personal-expenses?month=' + currentMonth, config), + axios.get('http://trackio.online:8081/incomes/categories', config), + axios.get('http://trackio.online:8081/expenses/categories', config) ]); console.log("Data", incomeResponse.data); diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/infolists/ContentExpense.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/infolists/ContentExpense.svelte index 995ceea..752a002 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/infolists/ContentExpense.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/expenses/infolists/ContentExpense.svelte @@ -49,7 +49,7 @@ try { const token = getCookie('access_token'); - const response = await axios.post('http://localhost:8081/expenses', data, { + const response = await axios.post('http://trackio.online:8081/expenses', data, { headers: { 'Authorization': `Bearer ${token}`, 'Content-Type': 'application/json', 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 1052824..b540626 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 @@ -4,7 +4,9 @@ import Expenses from "../infolists/Expenses.svelte"; import {globalStyles} from "../../../styles.js"; import { slide } from 'svelte/transition' - import {expenseTypes} from "../../../stores.js"; + import {expenseTypes, expenseData} from "../../../stores.js"; + import axios from "axios"; + import {getCookie} from "svelte-cookie"; let isDateDropdownExpanded = false let isCategoryDropdownExpanded = false @@ -17,6 +19,38 @@ isCategoryDropdownExpanded = !isCategoryDropdownExpanded; } + async function getToday() { + var currentDate = new Date(); + var currentDay = currentDate.toISOString().split('T')[0]; + try { + const response = await axios.get('http://trackio.online:8081/expenses/personal-expenses?date=' + currentDay, { + headers: { + 'Authorization': `Bearer ${getCookie('access_token')}` + } + }); + expenseData.set(response.data); + } catch (error) { + console.error("Error fetching expenses:", error); + } + } + + async function getLastYear() { + var currentDate = new Date(); + var year = currentDate.getFullYear(); + + try { + const response = await axios.get('http://trackio.online:8081/expenses/personal-expenses?year=' + year, { + headers: { + 'Authorization': `Bearer ${getCookie('access_token')}` + } + }); + + expenseData.set(response.data); + } catch (error) { + console.error("Error fetching expenses:", error); + } + } +
@@ -27,12 +61,12 @@ {#if isDateDropdownExpanded}
-
console.log("Today")}>Today
+
getToday()}>Today
console.log("Yesterday")}>Yesterday
console.log("Last week")}>Last week
console.log("Last month")}>Last month
console.log("Current quarter")}>Current quarter
-
console.log("This year")}>This year
+
getLastYear()}>This year
{/if}
@@ -76,35 +110,49 @@ flex: 1 1 auto; } + /*#button {*/ + /* background-color: #fff000;*/ + /* border-radius: 12px;*/ + /* color: #000;*/ + /* cursor: pointer;*/ + /* font-weight: bold;*/ + /* padding: 10px 15px;*/ + /* text-align: center;*/ + /* transition: 200ms;*/ + /* width: 100%;*/ + /* box-sizing: border-box;*/ + /* border: 0;*/ + /* font-size: 16px;*/ + /* user-select: none;*/ + /* -webkit-user-select: none;*/ + /* touch-action: manipulation;*/ + /*}*/ + + /*#button:not(:disabled):hover,*/ + /*#button:not(:disabled):focus {*/ + /* outline: 0;*/ + /* background: #f4e603;*/ + /* box-shadow: 0 0 0 2px rgba(0,0,0,.2), 0 3px 8px 0 rgba(0,0,0,.15);*/ + /*}*/ + + /*#button:disabled {*/ + /* filter: saturate(0.2) opacity(0.5);*/ + /* -webkit-filter: saturate(0.2) opacity(0.5);*/ + /* cursor: not-allowed;*/ + /*}*/ + #button { - background-color: #fff000; - border-radius: 12px; - color: #000; + font-size: large; + background-color: #007BFF; + color: #fff; + border: none; + border-radius: 20px; + line-height: 40px; cursor: pointer; - font-weight: bold; - padding: 10px 15px; - text-align: center; - transition: 200ms; - width: 100%; - box-sizing: border-box; - border: 0; - font-size: 16px; - user-select: none; - -webkit-user-select: none; - touch-action: manipulation; } - #button:not(:disabled):hover, - #button:not(:disabled):focus { - outline: 0; - background: #f4e603; - box-shadow: 0 0 0 2px rgba(0,0,0,.2), 0 3px 8px 0 rgba(0,0,0,.15); - } - - #button:disabled { - filter: saturate(0.2) opacity(0.5); - -webkit-filter: saturate(0.2) opacity(0.5); - cursor: not-allowed; + #button:hover { + background-color: #0056b3; } @@ -131,7 +179,8 @@ border-top-left-radius: 20px; border-top-right-radius: 20px; font-size: larger; - border: #8BD17C 2px solid; + margin-bottom: 5px; + /*border: #8BD17C 2px solid;*/ } #data-menu { diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/incomes/infolists/ContentIncome.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/incomes/infolists/ContentIncome.svelte index 8c8b8da..2cc51f8 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/incomes/infolists/ContentIncome.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/incomes/infolists/ContentIncome.svelte @@ -50,7 +50,7 @@ try { const token = getCookie('access_token'); - const response = await axios.post('http://localhost:8081/incomes', data, { + const response = await axios.post('http://trackio.online:8081/incomes', data, { headers: { 'Authorization': `Bearer ${token}`, 'Content-Type': 'application/json', diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/incomes/other/DataMenu.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/incomes/other/DataMenu.svelte index 64cf655..7b3dfc5 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/incomes/other/DataMenu.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/incomes/other/DataMenu.svelte @@ -76,38 +76,51 @@ flex: 1 1 auto; } + /*#button {*/ + /* background-color: #fff000;*/ + /* border-radius: 12px;*/ + /* color: #000;*/ + /* cursor: pointer;*/ + /* font-weight: bold;*/ + /* padding: 10px 15px;*/ + /* text-align: center;*/ + /* transition: 200ms;*/ + /* width: 100%;*/ + /* box-sizing: border-box;*/ + /* border: 0;*/ + /* font-size: 16px;*/ + /* user-select: none;*/ + /* -webkit-user-select: none;*/ + /* touch-action: manipulation;*/ + /*}*/ + + /*#button:not(:disabled):hover,*/ + /*#button:not(:disabled):focus {*/ + /* outline: 0;*/ + /* background: #f4e603;*/ + /* box-shadow: 0 0 0 2px rgba(0,0,0,.2), 0 3px 8px 0 rgba(0,0,0,.15);*/ + /*}*/ + + /*#button:disabled {*/ + /* filter: saturate(0.2) opacity(0.5);*/ + /* -webkit-filter: saturate(0.2) opacity(0.5);*/ + /* cursor: not-allowed;*/ + /*}*/ + #button { - background-color: #fff000; - border-radius: 12px; - color: #000; + font-size: large; + background-color: #007BFF; + color: #fff; + border: none; + border-radius: 20px; + line-height: 40px; cursor: pointer; - font-weight: bold; - padding: 10px 15px; - text-align: center; - transition: 200ms; - width: 100%; - box-sizing: border-box; - border: 0; - font-size: 16px; - user-select: none; - -webkit-user-select: none; - touch-action: manipulation; } - #button:not(:disabled):hover, - #button:not(:disabled):focus { - outline: 0; - background: #f4e603; - box-shadow: 0 0 0 2px rgba(0,0,0,.2), 0 3px 8px 0 rgba(0,0,0,.15); + #button:hover { + background-color: #0056b3; } - #button:disabled { - filter: saturate(0.2) opacity(0.5); - -webkit-filter: saturate(0.2) opacity(0.5); - cursor: not-allowed; - } - - #date-list { background-color: #8BD17C; position:absolute; @@ -131,7 +144,8 @@ border-top-left-radius: 20px; border-top-right-radius: 20px; font-size: larger; - border: #8BD17C 2px solid; + margin-bottom: 5px; + /*border: #8BD17C 2px solid;*/ } #data-menu { 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 b4081b7..855e96b 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/get-user-data', config); + const response = await axios.get('http://trackio.online:8081/users/get-user-data', config); const data = response.data; username = data.username; console.log(username) @@ -110,6 +110,7 @@ justify-content: center; align-items: center; border-radius: 20px; + cursor: pointer; } .sideMenuItem:hover { diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/vite.config.js b/src/main/java/com/faf223/expensetrackerfaf/web/vite.config.js index bbf8c7d..d186e68 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/vite.config.js +++ b/src/main/java/com/faf223/expensetrackerfaf/web/vite.config.js @@ -2,5 +2,8 @@ import { sveltekit } from '@sveltejs/kit/vite'; import { defineConfig } from 'vite'; export default defineConfig({ - plugins: [sveltekit()] + plugins: [sveltekit()], + server: { + port: 80, + } });