Commit Graph

162 Commits

Author SHA1 Message Date
Dmitrii Cravcenco
4e00244a26 Merge branch 'master' into security_branch 2023-10-24 18:30:40 +03:00
Dmitrii Cravcenco
84b48afb21 Fix expense/income creation 2023-10-24 18:30:37 +03:00
Dmitrii Cravcenco
0aee8afbac Merge remote-tracking branch 'origin/master' 2023-10-23 18:53:23 +03:00
Dmitrii Cravcenco
4fed3dba9e Change getting expenses/incomes logic 2023-10-23 18:53:00 +03:00
mirrerror
c07e3ca876 optimize code 2023-10-23 16:48:10 +03:00
mirrerror
0afa1b2b7c optimize code, add interfaces 2023-10-23 16:38:09 +03:00
mirrerror
e47f2f8df6 move money transaction interface 2023-10-23 16:13:25 +03:00
mirrerror
0698eb2478 make income and expense implement interface 2023-10-23 16:09:54 +03:00
6ca8b861e4 Connected two graphs to backend, WIP 2023-10-19 23:02:09 +03:00
Dmitrii Cravcenco
1009ca7bdb Add google oauth2 2023-10-16 21:37:04 +03:00
DmitriiKaban
6ccf92ecce Merge pull request #18 from lumijiez/security_branch
Security branch
2023-10-12 13:37:01 +03:00
Dmitrii Cravcenco
a3bbe4433e Merge branch 'security_branch' 2023-10-12 13:34:44 +03:00
Dmitrii Cravcenco
0b98fe3db4 Change response status when token is expired 2023-10-12 13:26:01 +03:00
Dmitrii Cravcenco
3160a19fa5 Add refresh token generation 2023-10-12 12:52:54 +03:00
00b487e1b3 Svelte front, first commit 2023-10-11 18:45:08 +03:00
Dmitrii Cravcenco
b1b13dc736 Add refresh token endpoint 2023-10-11 12:58:48 +03:00
Dmitrii Cravcenco
19ac92f268 Encapsulated methods that are allowed only for admins. Removed ability to add new user, new user must be registered using auth. 2023-10-07 10:18:35 +03:00
DmitriiCravcenco
2ba128b7ed Merge remote-tracking branch 'origin/security_branch_fix_jwt_roles' into security_branch_fix_jwt_roles 2023-10-05 22:25:28 +03:00
DmitriiCravcenco
7f6a0c1f92 Fixed JWT Role assignment and method access 2023-10-05 22:25:05 +03:00
DmitriiKaban
7fb60a6f00 Merge branch 'master' into security_branch_fix_jwt_roles 2023-10-05 20:00:19 +03:00
DmitriiCravcenco
a6ed3794fe Fix mapper + DTO 2023-10-05 19:52:13 +03:00
DmitriiCravcenco
e17eb3deec Merge updates from master 2023-10-05 19:10:53 +03:00
DmitriiCravcenco
c666092cd3 Delete file 2023-10-05 19:04:38 +03:00
mirrerror
735b2bc90c update dto 2023-10-05 14:08:37 +03:00
mirrerror
5350fc3adf add dto, refactor names, update controllers 2023-10-05 13:13:53 +03:00
DmitriiCravcenco
b396c1c137 Fix bugs caused by Expense/Income controllers 2023-10-04 09:00:24 +03:00
DmitriiCravcenco
5e0000d532 Add JWT authentication 2023-10-03 12:28:42 +03:00
mirrerror
f4ca6b8f08 Merge branch 'dimas' of https://github.com/lumijiez/ExpenseTrackerFAF into dimas 2023-10-03 11:53:27 +03:00
mirrerror
46dad36166 remove debugging 2023-10-03 11:52:35 +03:00
mirrerror
5119b506b2 set repositories to final 2023-10-02 17:23:44 +03:00
mirrerror
f512c50aaf fix controllers 2023-10-02 10:00:11 +03:00
mirrerror
16d74c0ab6 update controllers and services 2023-10-02 08:58:17 +03:00
mirrerror
51b5537558 update expense serivce, controller 2023-10-02 08:49:01 +03:00
mirrerror
336359f267 optimize code 2023-10-02 08:26:18 +03:00
mirrerror
32066bb47a optimize code 2023-10-02 08:25:41 +03:00
DmitriiCravcenco
15f9a6418a Merge updates from master 2023-10-02 08:25:10 +03:00
DmitriiCravcenco
35fb05ac01 Add JWT authorization 2023-10-02 08:18:57 +03:00
Daniel
2be3094705 Merge branch 'master' into daniel 2023-09-30 22:18:21 +03:00
f235921744 Implemented service, repository and controller for each entity 2023-09-30 22:13:46 +03:00
Dmitrii Cravcenco
c0f3a7f7a7 Add repositories 2023-09-21 14:55:38 +03:00
mirrerror
908b223399 fix expenses and incomes 2023-09-21 13:41:40 +03:00
b34c5884b1 Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF into daniel
# Conflicts:
#	src/main/resources/application.properties
2023-09-21 13:40:17 +03:00
mirrerror
48476e405c fix expenses and incomes 2023-09-21 13:35:39 +03:00
mirrerror
bd5514380b remove an unnecessary comment 2023-09-21 13:26:05 +03:00
mirrerror
48bf511dea Merge remote-tracking branch 'origin/dimas' into dimas 2023-09-21 13:23:34 +03:00
mirrerror
6628a3ea20 test 2023-09-21 13:22:59 +03:00
Dima
7d334c7c8d Delete src/main/resources/application.properties 2023-09-21 13:22:09 +03:00
mirrerror
e793191685 Change .gitignore and connect to the DB 2023-09-21 13:18:56 +03:00
9ec97ed9fe Changed folder structure 2023-09-21 13:08:43 +03:00
4c97a09d84 Changed folder structure 2023-09-21 12:58:08 +03:00