From 6ca8b861e49bbe3476768bb94d14dc2c47c07842 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 19 Oct 2023 23:02:09 +0300 Subject: [PATCH 1/9] Connected two graphs to backend, WIP --- pom.xml | 5 + .../expensetrackerfaf/config/CorsConfig.java | 14 +++ .../expensetrackerfaf/config/CorsFilter.java | 40 ++++++++ .../controller/IncomeController.java | 2 + .../expensetrackerfaf/web/package-lock.json | 91 +++++++++++++++++++ .../faf223/expensetrackerfaf/web/package.json | 1 + .../dashboard/board/graphs/Graph1.svelte | 62 ++++++++----- .../dashboard/board/graphs/Graph3.svelte | 91 +++++++++---------- 8 files changed, 236 insertions(+), 70 deletions(-) create mode 100644 src/main/java/com/faf223/expensetrackerfaf/config/CorsConfig.java create mode 100644 src/main/java/com/faf223/expensetrackerfaf/config/CorsFilter.java diff --git a/pom.xml b/pom.xml index 49ac77e..4a4217c 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,11 @@ spring-boot-starter-web 3.1.4 + + org.apache.httpcomponents + httpclient + test + org.springframework.boot spring-boot-starter-data-jpa diff --git a/src/main/java/com/faf223/expensetrackerfaf/config/CorsConfig.java b/src/main/java/com/faf223/expensetrackerfaf/config/CorsConfig.java new file mode 100644 index 0000000..458f2ff --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/config/CorsConfig.java @@ -0,0 +1,14 @@ +package com.faf223.expensetrackerfaf.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class CorsConfig implements WebMvcConfigurer { + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**").allowedMethods("*"); + } +} diff --git a/src/main/java/com/faf223/expensetrackerfaf/config/CorsFilter.java b/src/main/java/com/faf223/expensetrackerfaf/config/CorsFilter.java new file mode 100644 index 0000000..8c61939 --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/config/CorsFilter.java @@ -0,0 +1,40 @@ +package com.faf223.expensetrackerfaf.config; + +import jakarta.servlet.*; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +@Component +@Order(Ordered.HIGHEST_PRECEDENCE) +public class CorsFilter implements Filter { + + @Override + public void destroy() { + } + + @Override + public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) + throws IOException, ServletException { + HttpServletResponse response = (HttpServletResponse) res; + HttpServletRequest request = (HttpServletRequest) req; + + response.setHeader("Access-Control-Allow-Origin", "http://localhost:5173"); + response.setHeader("Access-Control-Allow-Methods", "POST, PUT, GET, OPTIONS, DELETE"); + response.setHeader("Access-Control-Max-Age", "3600"); + response.setHeader("Access-Control-Allow-Headers", "X-Requested-With, X-Auth-Token"); + response.setHeader("Access-Control-Allow-Credentials", "true"); + + if (!"OPTIONS".equalsIgnoreCase(request.getMethod())) { + chain.doFilter(req, res); + } + } + + @Override + public void init(FilterConfig config) { + } +} diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java index 6811d10..eb42b55 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; import java.util.stream.Collectors; +@CrossOrigin @RestController @RequestMapping("/incomes") @RequiredArgsConstructor @@ -54,6 +55,7 @@ public class IncomeController { } } + @CrossOrigin @GetMapping("/{userUuid}") public ResponseEntity> getIncomesByUser(@PathVariable String userUuid) { List incomes = incomeService.getIncomesByUserId(userUuid).stream().map(incomeMapper::toDto).collect(Collectors.toList()); diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/package-lock.json b/src/main/java/com/faf223/expensetrackerfaf/web/package-lock.json index 58c9edf..720921d 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/package-lock.json +++ b/src/main/java/com/faf223/expensetrackerfaf/web/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@fortawesome/free-brands-svg-icons": "^6.4.2", "@fortawesome/free-solid-svg-icons": "^6.4.2", + "axios": "^1.5.1", "chart.js": "^4.4.0", "email-validator": "^2.0.4", "svelte-fa": "^3.0.4" @@ -810,6 +811,21 @@ "dequal": "^2.0.3" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/axios": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz", + "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==", + "dependencies": { + "follow-redirects": "^1.15.0", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/axobject-query": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz", @@ -902,6 +918,17 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -988,6 +1015,14 @@ "node": ">=0.10.0" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/dequal": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", @@ -1349,6 +1384,38 @@ "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", "dev": true }, + "node_modules/follow-redirects": { + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -1693,6 +1760,25 @@ "node": ">=10.0.0" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -2011,6 +2097,11 @@ "svelte": "^3.2.0 || ^4.0.0-next.0" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/punycode": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/package.json b/src/main/java/com/faf223/expensetrackerfaf/web/package.json index 556c627..6e015a3 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/package.json +++ b/src/main/java/com/faf223/expensetrackerfaf/web/package.json @@ -26,6 +26,7 @@ "dependencies": { "@fortawesome/free-brands-svg-icons": "^6.4.2", "@fortawesome/free-solid-svg-icons": "^6.4.2", + "axios": "^1.5.1", "chart.js": "^4.4.0", "email-validator": "^2.0.4", "svelte-fa": "^3.0.4" diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph1.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph1.svelte index b96ee01..44f850e 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph1.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph1.svelte @@ -1,30 +1,44 @@ @@ -34,15 +48,15 @@ \ No newline at end of file + #chart:hover { + box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22); + } + diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph3.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph3.svelte index dd737a6..0390f12 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph3.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph3.svelte @@ -1,45 +1,44 @@ @@ -49,15 +48,15 @@ \ No newline at end of file + #chart:hover { + box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22); + } + From d990d224ab3d2459acfa4756647cb8211e0953c8 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 24 Oct 2023 23:36:47 +0300 Subject: [PATCH 2/9] Connecting front to back --- .../expensetrackerfaf/web/package-lock.json | 37 +++++++++++- .../faf223/expensetrackerfaf/web/package.json | 5 +- .../src/routes/auth/login/LoginForm.svelte | 60 ++++++++++++++----- .../routes/auth/register/RegisterForm.svelte | 2 +- .../dashboard/board/graphs/Graph1.svelte | 7 ++- 5 files changed, 90 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/package-lock.json b/src/main/java/com/faf223/expensetrackerfaf/web/package-lock.json index 720921d..d332004 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/package-lock.json +++ b/src/main/java/com/faf223/expensetrackerfaf/web/package-lock.json @@ -13,7 +13,10 @@ "axios": "^1.5.1", "chart.js": "^4.4.0", "email-validator": "^2.0.4", - "svelte-fa": "^3.0.4" + "js-cookie": "^3.0.5", + "svelte-cookie": "^1.0.1", + "svelte-fa": "^3.0.4", + "svelte-spa-router": "^3.3.0" }, "devDependencies": { "@fontsource/fira-mono": "^4.5.10", @@ -1615,6 +1618,14 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true }, + "node_modules/js-cookie": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", + "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==", + "engines": { + "node": ">=14" + } + }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -2131,6 +2142,14 @@ } ] }, + "node_modules/regexparam": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/regexparam/-/regexparam-2.0.1.tgz", + "integrity": "sha512-zRgSaYemnNYxUv+/5SeoHI0eJIgTL/A2pUtXUPLHQxUldagouJ9p+K6IbIZ/JiQuCEv2E2B1O11SjVQy3aMCkw==", + "engines": { + "node": ">=8" + } + }, "node_modules/resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -2341,6 +2360,11 @@ "node": ">=16" } }, + "node_modules/svelte-cookie": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/svelte-cookie/-/svelte-cookie-1.0.1.tgz", + "integrity": "sha512-c4cXLMeG7vlAk3Q5axjxlppMJgeLLWd/6cCvo1wEL6ZwEueVHAP71SBRi9r5XmLYnCYr7eAqlK6NrYT/29KuKQ==" + }, "node_modules/svelte-eslint-parser": { "version": "0.33.1", "resolved": "https://registry.npmjs.org/svelte-eslint-parser/-/svelte-eslint-parser-0.33.1.tgz", @@ -2385,6 +2409,17 @@ "svelte": "^3.19.0 || ^4.0.0" } }, + "node_modules/svelte-spa-router": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/svelte-spa-router/-/svelte-spa-router-3.3.0.tgz", + "integrity": "sha512-cwRNe7cxD43sCvSfEeaKiNZg3FCizGxeMcf7CPiWRP3jKXjEma3vxyyuDtPOam6nWbVxl9TNM3hlE/i87ZlqcQ==", + "dependencies": { + "regexparam": "2.0.1" + }, + "funding": { + "url": "https://github.com/sponsors/ItalyPaleAle" + } + }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/package.json b/src/main/java/com/faf223/expensetrackerfaf/web/package.json index 6e015a3..ee464f0 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/package.json +++ b/src/main/java/com/faf223/expensetrackerfaf/web/package.json @@ -29,6 +29,9 @@ "axios": "^1.5.1", "chart.js": "^4.4.0", "email-validator": "^2.0.4", - "svelte-fa": "^3.0.4" + "js-cookie": "^3.0.5", + "svelte-cookie": "^1.0.1", + "svelte-fa": "^3.0.4", + "svelte-spa-router": "^3.3.0" } } 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 a0284fa..5d11866 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 @@ -1,29 +1,57 @@ @@ -39,7 +67,7 @@ event => {username = event.target.value} }> {password = event.target.password} + event => {password = event.target.value} }> Forgot your 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 002540f..076d8a7 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 @@ -8,7 +8,7 @@ function submitForm(event) { event.preventDefault(); console.log("Tried to submit!"); - console.log("Valid? ", (validateEmail() && validateUsername() && va && validatePassword() ? "Yes" : "No")); + console.log("Valid? ", (validateEmail() && validateUsername() && validatePassword() ? "Yes" : "No")); } function validateEmail() { diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph1.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph1.svelte index 44f850e..5c3db43 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph1.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph1.svelte @@ -2,20 +2,23 @@ import Chart from 'chart.js/auto'; import { onMount } from 'svelte'; import axios from 'axios'; + import {getCookie} from "svelte-cookie"; let ctx; let chartCanvas; onMount(async () => { + + const token = getCookie('access_token'); const config = { headers: { - 'Authorization': `Bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJkYW4uYmFsYW5AZ21haWwuY29tIiwiaWF0IjoxNjk3NzQ0MjY3LCJleHAiOjE2OTc4MzA2Njd9.hzbEDDuOVCY_EQAA8xGlJskQ2FQjw8o0CtFKB1dKYOU` + 'Authorization': `Bearer ${token}` } }; try { const response = await axios.get('http://localhost:8081/incomes/00112233-4455-6677-8899-aabbccddeeaa', config); - const incomeData = response.data; // Assuming the response is an array of income data + const incomeData = response.data; const chartLabels = incomeData.map(item => item.category.categoryName); const chartValues = incomeData.map(item => item.amount); From 0baac602e44867564cd4cb2123415b43130b1179 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 25 Oct 2023 01:24:28 +0300 Subject: [PATCH 3/9] Fixed couple of endpoints, implemented more of the frontend --- pom.xml | 6 +- .../controller/UserController.java | 18 ++- .../expensetrackerfaf/dto/ExpenseDTO.java | 2 - .../expensetrackerfaf/dto/IncomeDTO.java | 2 - .../src/routes/auth/login/LoginForm.svelte | 1 + .../web/src/routes/dashboard/+page.svelte | 1 + .../routes/dashboard/board/Dashboard.svelte | 11 +- .../routes/dashboard/board/DataMenu.svelte | 15 +-- .../routes/dashboard/board/Expenses.svelte | 71 ++++++++++ .../src/routes/dashboard/board/Incomes.svelte | 71 ++++++++++ .../dashboard/board/NotificationBoard.svelte | 15 --- .../dashboard/board/QuickInfobar.svelte | 5 +- .../dashboard/board/graphs/Graph1.svelte | 12 +- .../dashboard/board/graphs/Graph2.svelte | 122 +++++++++++------- .../dashboard/board/graphs/Graph3.svelte | 29 +++-- .../dashboard/board/graphs/Graph4.svelte | 48 ------- .../dashboard/board/graphs/Graph5.svelte | 48 ------- .../src/routes/dashboard/menu/SideMenu.svelte | 27 +++- 18 files changed, 300 insertions(+), 204 deletions(-) create mode 100644 src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Expenses.svelte create mode 100644 src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Incomes.svelte delete mode 100644 src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/NotificationBoard.svelte delete mode 100644 src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph4.svelte delete mode 100644 src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph5.svelte diff --git a/pom.xml b/pom.xml index 5a0cfdd..5744dc1 100644 --- a/pom.xml +++ b/pom.xml @@ -22,11 +22,7 @@ spring-boot-starter-web 3.1.4 - - org.apache.httpcomponents - httpclient - test - + org.springframework.boot spring-boot-starter-data-jpa diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/UserController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/UserController.java index 093190f..407f99c 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controller/UserController.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controller/UserController.java @@ -8,6 +8,9 @@ import com.faf223.expensetrackerfaf.service.UserService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; @@ -33,11 +36,16 @@ public class UserController { } } - @GetMapping("/{userUuid}") - public ResponseEntity getUser(@PathVariable String userUuid) { - User user = userService.getUserById(userUuid); - if (user != null) return ResponseEntity.ok(userMapper.toDto(user)); - else return ResponseEntity.notFound().build(); + @GetMapping("/getUserData") + public ResponseEntity getUser() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + + if (authentication != null && authentication.getPrincipal() instanceof UserDetails userDetails) { + User user = userService.getUserByEmail(userDetails.getUsername()); + if (user != null) return ResponseEntity.ok(userMapper.toDto(user)); + else return ResponseEntity.notFound().build(); + } + return ResponseEntity.notFound().build(); } @GetMapping() diff --git a/src/main/java/com/faf223/expensetrackerfaf/dto/ExpenseDTO.java b/src/main/java/com/faf223/expensetrackerfaf/dto/ExpenseDTO.java index e956e14..0804ff6 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/dto/ExpenseDTO.java +++ b/src/main/java/com/faf223/expensetrackerfaf/dto/ExpenseDTO.java @@ -1,7 +1,6 @@ package com.faf223.expensetrackerfaf.dto; import com.faf223.expensetrackerfaf.model.ExpenseCategory; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; import lombok.Data; @@ -10,7 +9,6 @@ import java.time.LocalDate; @Data @AllArgsConstructor -@JsonIgnoreProperties({"expenseCategory"}) public class ExpenseDTO { private long expenseId; private UserDTO userDTO; diff --git a/src/main/java/com/faf223/expensetrackerfaf/dto/IncomeDTO.java b/src/main/java/com/faf223/expensetrackerfaf/dto/IncomeDTO.java index b494bfb..ce2d912 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/dto/IncomeDTO.java +++ b/src/main/java/com/faf223/expensetrackerfaf/dto/IncomeDTO.java @@ -1,7 +1,6 @@ package com.faf223.expensetrackerfaf.dto; import com.faf223.expensetrackerfaf.model.IncomeCategory; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.AllArgsConstructor; import lombok.Data; @@ -10,7 +9,6 @@ import java.time.LocalDate; @Data @AllArgsConstructor -@JsonIgnoreProperties({"incomeCategory"}) public class IncomeDTO { private long incomeId; private UserDTO userDTO; 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 5d11866..ed00879 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 @@ -34,6 +34,7 @@ setCookie('access_token', access_token); setCookie('refresh_token', refresh_token); console.log(access_token, refresh_token); + window.location.href = '/dashboard' } catch (error) { console.error('Login failed:', error); } diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/+page.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/+page.svelte index 456cfb0..3be4a70 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/+page.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/+page.svelte @@ -16,5 +16,6 @@ display: flex; align-items: stretch; min-height: 100vh; + max-height: 100%; } \ No newline at end of file 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 e2d518b..cd19337 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 @@ -2,7 +2,14 @@ import DashHeader from "./DashHeader.svelte"; import DataMenu from "./DataMenu.svelte"; import QuickInfobar from "./QuickInfobar.svelte"; - import NotificationBoard from "./NotificationBoard.svelte"; + import { getCookie } from "svelte-cookie"; + import {onMount} from "svelte"; + + onMount(() => { + if (getCookie('access_token') === null ) { + window.location.href = '/auth/login'; + } + })
@@ -17,7 +24,7 @@ background-color: rgb(245,242,243); border-radius: 20px; margin: 20px; - min-width: 100px; + min-width: 100px; display: flex; flex:1 1 auto; flex-direction: column; diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/DataMenu.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/DataMenu.svelte index 1271f15..e09ea12 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/DataMenu.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/DataMenu.svelte @@ -2,8 +2,8 @@ import Graph1 from './graphs/Graph1.svelte'; import Graph2 from './graphs/Graph2.svelte'; import Graph3 from './graphs/Graph3.svelte'; - import Graph4 from './graphs/Graph4.svelte'; - import Graph5 from './graphs/Graph5.svelte'; + import Expenses from "./Expenses.svelte"; + import Incomes from "./Incomes.svelte";
@@ -14,9 +14,9 @@
-
- - +
+ +
@@ -34,7 +34,6 @@ } - #twoVertical { display: flex; flex-direction: column; @@ -53,9 +52,9 @@ min-height:0; } - #twoHorizontal { + #dataPanel { display: flex; - flex-direction: column; + flex-direction: row; align-self: stretch; flex-grow: 1; min-width: 0; diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Expenses.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Expenses.svelte new file mode 100644 index 0000000..3a2390f --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Expenses.svelte @@ -0,0 +1,71 @@ + + +
+

Expenses

+
    + {#each data as item} +
  • + {item.incomeCategory ? `${item.incomeCategory.name}: ` : `${item.expenseCategory.name}: `} + {item.incomeCategory ? `+${item.amount}$` : `-${item.amount}$`} + {`${item.date}`} +
  • + {/each} +
+
+ + \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Incomes.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Incomes.svelte new file mode 100644 index 0000000..018a098 --- /dev/null +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Incomes.svelte @@ -0,0 +1,71 @@ + + +
+

Incomes

+
    + {#each data as item} +
  • + {item.incomeCategory ? `${item.incomeCategory.name}: ` : `${item.expenseCategory.name}: `} + {item.incomeCategory ? `+${item.amount}$` : `-${item.amount}$`} + {`${item.date}`} +
  • + {/each} +
+
+ + \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/NotificationBoard.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/NotificationBoard.svelte deleted file mode 100644 index a037f02..0000000 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/NotificationBoard.svelte +++ /dev/null @@ -1,15 +0,0 @@ - - -
- -
- - \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/QuickInfobar.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/QuickInfobar.svelte index 8db424a..4ce18dc 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/QuickInfobar.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/QuickInfobar.svelte @@ -23,15 +23,12 @@ height: 100px; padding: 10px; border-radius: 10px; - background-color: #ffdde2; + background-color: #d3d3d3; 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); - /* border: 1px solid black; */ } .infobarElement:hover { - /* color:white; */ - /* background-color: black; */ box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22); } \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph1.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph1.svelte index 5c3db43..a981296 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph1.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph1.svelte @@ -10,6 +10,7 @@ onMount(async () => { const token = getCookie('access_token'); + const config = { headers: { 'Authorization': `Bearer ${token}` @@ -17,21 +18,22 @@ }; try { - const response = await axios.get('http://localhost:8081/incomes/00112233-4455-6677-8899-aabbccddeeaa', config); + const response = await axios.get('http://localhost:8081/incomes/personal-incomes', config); + console.log(response.data); const incomeData = response.data; - const chartLabels = incomeData.map(item => item.category.categoryName); + const chartLabels = incomeData.map(item => item.incomeCategory.name); const chartValues = incomeData.map(item => item.amount); ctx = chartCanvas.getContext('2d'); new Chart(ctx, { - type: 'bar', // Set chart type to 'bar' for a bar graph + type: 'bar', data: { labels: chartLabels, datasets: [{ label: 'Revenue', backgroundColor: 'rgb(255, 99, 132)', - data: chartValues // Changed from 'data' to 'chartValues' + data: chartValues }] }, options: { @@ -56,7 +58,7 @@ flex: 1; border-radius: 10px; margin: 10px; - background-color: #ffdde2; + background-color: #d3d3d3; } #chart:hover { diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph2.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph2.svelte index 492ab87..98a362c 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph2.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph2.svelte @@ -1,48 +1,70 @@ @@ -52,15 +74,15 @@ \ No newline at end of file + #chart:hover { + box-shadow: 0 14px 28px rgba(0,0,0,0.25), 0 10px 10px rgba(0,0,0,0.22); + } + diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph3.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph3.svelte index 0390f12..9d5057a 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph3.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph3.svelte @@ -2,33 +2,44 @@ import chartjs from 'chart.js/auto'; import { onMount } from 'svelte'; import axios from 'axios'; + import { getCookie } from "svelte-cookie"; let ctx; let chartCanvas; onMount(async () => { + const token = getCookie('access_token'); + const config = { headers: { - 'Authorization': `Bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJkYW4uYmFsYW5AZ21haWwuY29tIiwiaWF0IjoxNjk3NzQ0MjY3LCJleHAiOjE2OTc4MzA2Njd9.hzbEDDuOVCY_EQAA8xGlJskQ2FQjw8o0CtFKB1dKYOU` + 'Authorization': `Bearer ${token}` } }; try { - const response = await axios.get('http://localhost:8081/incomes/00112233-4455-6677-8899-aabbccddeeaa', config); - const incomeData = response.data; // Assuming the response is an array of income data + const [incomesResponse, expensesResponse] = await Promise.all([ + axios.get('http://localhost:8081/incomes/personal-incomes', config), + axios.get('http://localhost:8081/expenses/personal-expenses', config) + ]); - // Extract income categories and their values - const chartLabels = incomeData.map(item => item.category.categoryName); - const chartValues = incomeData.map(item => item.amount); + const incomesData = incomesResponse.data; + const expensesData = expensesResponse.data; + + const totalIncomes = incomesData.reduce((total, item) => total + item.amount, 0); + + const totalExpenses = expensesData.reduce((total, item) => total + item.amount, 0); + + const chartLabels = ['Incomes', 'Expenses']; + const chartValues = [totalIncomes, totalExpenses]; ctx = chartCanvas.getContext('2d'); new chartjs(ctx, { - type: 'pie', // Set chart type to 'pie' for a pie chart + type: 'pie', data: { labels: chartLabels, datasets: [{ data: chartValues, - backgroundColor: ['red', 'orange', 'yellow', 'green', 'blue'], // Customize colors as needed + backgroundColor: ['green', 'red'], }] }, options: { @@ -53,7 +64,7 @@ flex: 1; border-radius: 10px; margin: 10px; - background-color: #ffdde2; + background-color: #d3d3d3; } #chart:hover { diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph4.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph4.svelte deleted file mode 100644 index 0825a16..0000000 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph4.svelte +++ /dev/null @@ -1,48 +0,0 @@ - - -
- -
- - \ No newline at end of file diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph5.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph5.svelte deleted file mode 100644 index 0825a16..0000000 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/graphs/Graph5.svelte +++ /dev/null @@ -1,48 +0,0 @@ - - -
- -
- - \ No newline at end of file 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 57bf783..4f7a164 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 @@ -1,4 +1,29 @@ @@ -37,7 +62,7 @@
-
Profile Info
+
Hello, {username}
From 20dd0f34bfea79fabe7248c821703e77bf784da0 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 25 Oct 2023 01:31:12 +0300 Subject: [PATCH 4/9] Added logout button --- .../web/src/routes/dashboard/menu/SideMenu.svelte | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 4f7a164..c3fb4a6 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 @@ -1,7 +1,7 @@
-
Income for this month 50$
-
Expense for this month 40$
-
Income for this month 50$
-
Expense for this month 40$
+
+
+
+
\ No newline at end of file + diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Incomes.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Incomes.svelte index 018a098..9f1d7f6 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Incomes.svelte +++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/Incomes.svelte @@ -30,19 +30,26 @@
-

Incomes

-
    - {#each data as item} -
  • - {item.incomeCategory ? `${item.incomeCategory.name}: ` : `${item.expenseCategory.name}: `} - {item.incomeCategory ? `+${item.amount}$` : `-${item.amount}$`} - {`${item.date}`} -
  • - {/each} -
+

Incomes

+
+
    + {#each data as item} +
  • + {item.incomeCategory ? `${item.incomeCategory.name}: ` : `${item.expenseCategory.name}: `} + {item.incomeCategory ? `+${item.amount}$` : `-${item.amount}$`} + {`${item.date}`} +
  • + {/each} +
+
\ No newline at end of file + +