Commit Graph

235 Commits

Author SHA1 Message Date
fadeaf1c43 fix 2021-01-02 20:00:15 +01:00
9296e1713b SES-124 Created ability cards 2021-01-02 19:53:03 +01:00
aeafc97679 Merge branch 'dev' into SES-120 2021-01-02 17:36:31 +01:00
e1c42cf07f SES-120 Fix typo 2021-01-02 17:35:30 +01:00
da96fea874 SES-120 Preform Migration 2021-01-02 17:35:16 +01:00
de3b7e3315 SES-120 Added scripts to populate armors and weapons 2021-01-02 17:34:45 +01:00
809362175d SES-120 Added necessary Jsons 2021-01-02 17:32:45 +01:00
dcbc5326dc Merge pull request 'SES-117' (#46) from SES-117 into dev
Reviewed-on: #46
2021-01-02 16:34:54 +01:00
ebbd30fc30 Merge branch 'dev' into SES-119 2021-01-02 13:03:33 +01:00
03bca2c11f SES-117 small changes 2021-01-02 00:43:52 +01:00
45288b2e3e SES-117 implemented basic player dashboard page 2021-01-02 00:40:54 +01:00
543bc41f3f Added base for ability cards 2021-01-01 22:14:01 +01:00
02d7304de3 prettier config 2020-12-30 12:17:31 +01:00
3c52e2d65d merge 2020-12-30 11:49:12 +01:00
329ac81ed2 SES-116 backend fix 2020-12-30 11:43:57 +01:00
a7aaacb2e5 SES-116 Update icons rmd and package json 2020-12-30 11:41:24 +01:00
f75e20876b SES-116 Fix Icons on right panel 2020-12-30 11:38:58 +01:00
18d1b75c4a connected with backend - select character 2020-12-28 17:39:55 +01:00
665ef65ec0 conneted with backend - get user characters list 2020-12-28 17:03:53 +01:00
7b430e05cb SES-116 Database update and icons fix 2020-12-28 14:59:42 +01:00
d61c3f620f added pointer class, updated mockup character list 2020-12-28 13:38:45 +01:00
9477b7346b merge 2020-12-28 11:28:08 +01:00
6dc97aa9c3 Merge branch 'dev' into SES-114 2020-12-27 22:12:48 +01:00
2a5e04bbd1 SES-116 Get lsit of logged characters 2020-12-27 21:17:19 +01:00
fe5921fa57 SES-116 Small fix on backend 2020-12-27 21:17:00 +01:00
4b0382a931 SES-121 Added spells tables 2020-12-27 20:08:19 +01:00
89c25d4342 SES-119 Added items tables 2020-12-27 19:47:13 +01:00
e17e3ace58 SES-123 Added reducers and miissed unsubscribe 2020-12-27 17:55:28 +01:00
b82393a62b SES-123 Lint errors fix 2020-12-27 16:33:02 +01:00
607145f45f Icon module register 2020-12-27 16:25:12 +01:00
b9c44c9120 SES-123 Icons module added 2020-12-27 16:25:00 +01:00
004619d6dd SES-114 Adder Errors to register view and user can no longer register with two different passwords 2020-12-23 13:06:01 +01:00
d6da8436bc Merge branch 'dev' into frontend-tests 2020-12-21 20:38:29 +01:00
e47ba17121 added e2e test - zad.3 lab 9 2020-12-21 20:36:32 +01:00
e5196c3513 Tests added 2020-12-21 18:08:51 +01:00
1fc3e040e7 merge v2 2020-12-21 16:56:32 +01:00
c1f520fbc5 merge 2020-12-21 16:56:14 +01:00
f426f5029b Change to login to role 2020-12-21 16:54:22 +01:00
b49bdae96a SES-103 WIP 2020-12-21 16:17:14 +01:00
441e09a12f change login path 2020-12-21 13:40:11 +01:00
0de41a2ce8 Changed method to return characters 2020-12-21 13:30:59 +01:00
8de1b8bb5a Merge branch 'dev' into SES-105 2020-12-21 12:57:25 +01:00
9c4b438e9b Merge branch 'dev' into SES-101 2020-12-21 11:16:15 +01:00
6350ad7239 Updating 105 2020-12-20 16:34:37 +01:00
2c302d7f09 remove error response from GetLoggedUsersCharacters 2020-12-20 16:30:15 +01:00
d6db2b6b56 Fixed unnecessary call 2020-12-20 15:59:42 +01:00
10cd041d38 Fixed bug with registering the same user multiple times 2020-12-20 15:57:10 +01:00
bf5604871d Add Controller that returns logged characters 2020-12-20 15:46:00 +01:00
11af142a09 Added Service to show character basic properties 2020-12-20 15:45:29 +01:00
Gawron
1698b66f43 added basic mock select character component 2020-12-19 22:31:38 +01:00
6145d9f594 SES-101 Added Login to Signalr on GM 2020-12-19 18:43:21 +01:00
956d7b2a32 Merge branch 'dev' into SES-104 2020-12-18 21:19:54 +01:00
910918d4c5 Merge branch 'dev' into SES-107 2020-12-18 21:19:05 +01:00
6461af2757 SES-104 Character Data Seed 2020-12-18 12:00:36 +01:00
b138651a8f SES-107 Added new method to return characters list 2020-12-18 11:18:48 +01:00
eeb9c2ebe0 SES-106 Added new method in controller 2020-12-18 10:52:48 +01:00
f75e9d96f9 SES-106 changed SignalR static field to be able to share them in other classes 2020-12-18 10:52:37 +01:00
474d01e901 Update CharacterController with Either, also small style fix in UserController 2020-12-15 15:36:23 +01:00
2b4cd79484 SES-88 Created User register connection 2020-12-13 19:27:28 +01:00
c9a4e7aa0d Merge branch 'master' into SES-84 2020-12-13 13:30:33 +01:00
57759fb91e SES-89 type change 2020-12-13 13:27:45 +01:00
815bd676d1 SES-84 Change type to Either 2020-12-13 13:22:09 +01:00
1412362b79 SES-89 Switched to subscribe 2020-12-13 13:05:08 +01:00
6f8cf6dcb4 UserController.cs change 2020-12-13 12:45:50 +01:00
b9928d6ce0 SES-89 Added api connection service and display error 2020-12-13 11:19:01 +01:00
479fd2114b SES-90 Confilcts resolve 2020-12-12 19:24:18 +01:00
a4ed6faa05 SES-90 Added Game master component 2020-12-12 19:06:30 +01:00
4ed509bd0a SES-86 added validator into sign in and sing up components, changed styles 2020-12-12 18:51:08 +01:00
0fd20fd2b1 SES-90 Styles changes 2020-12-12 11:16:25 +01:00
530c49f1b7 SES-86 added Sign Up Component 2020-12-12 00:21:06 +01:00
012c8828e1 SES-87 defined default style, created LoginUI component 2020-12-11 21:58:24 +01:00
Łukasz Góreczny
b0e0e5c5f5 Merge branch 'SES-91' of git.wmi.amu.edu.pl:s426135/session-companion into SES-91 2020-12-11 11:11:06 +01:00
Łukasz Góreczny
81aebe44de SES-91 Added documentation and extra method 2020-12-11 11:10:51 +01:00
3c57f7770e Merge branch 'master' into SES-91 2020-12-10 17:41:24 +01:00
Łukasz Góreczny
db2de42824 końcowe poprawki 2020-12-10 17:34:46 +01:00
Łukasz Góreczny
8e59538db8 Utworzenie modeli success i error 2020-12-10 17:34:30 +01:00
Łukasz Góreczny
9efefd96fe SES-91 Added error middleware 2020-12-10 15:28:00 +01:00
Łukasz Góreczny
6131bbe706 New Type moved to different project and changed on of the profiles 2020-12-10 15:08:05 +01:00
Łukasz Góreczny
bc6709e905 Small fix 2020-12-10 14:31:40 +01:00
Łukasz Góreczny
2cac5bd829 Fix mapper 2020-12-10 13:55:31 +01:00
Łukasz Góreczny
09b7db8aaf Added Either return type 2020-12-10 13:15:11 +01:00
572b48c15e UserService.cs edit 2020-12-09 23:09:57 +01:00
4580c2fe17 login endpoint 2020-12-09 22:47:25 +01:00
Łukasz Góreczny
544b8a1982 SES-82 Added description to view models 2020-12-09 09:44:52 +01:00
ngawron
5d8f5578c3 added base service 2020-12-07 11:46:18 +01:00
Łukasz Góreczny
31db5c9b73 Added swagger base configuration 2020-12-06 16:28:16 +01:00
8712191acc Resolve conflicts 2020-12-06 15:41:18 +01:00
33a51eef3f Merge branch 'master' into SES-70 2020-12-06 15:33:08 +01:00
Łukasz Góreczny
46b2d54f26 Small fixes to prepare project for swagger 2020-12-06 14:34:56 +01:00
Łukasz Góreczny
6cc4ed74a9 SES-69 Added controllers and one method 2020-12-06 14:34:19 +01:00
Łukasz Góreczny
a35e2ed567 Added AutoMapper 2020-12-06 11:28:57 +01:00
Łukasz Góreczny
e6a6ac290a Dodanie profili 2020-12-06 11:21:33 +01:00
Łukasz Góreczny
71687cafad Changed method to check if GM is allready logged 2020-12-06 11:01:49 +01:00
b6a80a2e89 Merge pull request 'SES-75 added router into sign-in page' (#13) from SES-75 into master
Reviewed-on: #13
2020-12-06 08:59:07 +01:00
2db796f3dc Add services and configruations for them 2020-12-05 21:59:32 +01:00
f957654596 Add interfaces 2020-12-05 21:47:12 +01:00
4aea17277a Added base interface and service 2020-12-05 21:46:27 +01:00
e2b55ada11 Added project for services in .net 5.0 2020-12-05 21:35:31 +01:00
e27ccdd05d Merge branch 'master' into SES-77 2020-12-05 21:31:34 +01:00
ngawron
2d152df1b1 SES-75 added router into sign-in page 2020-12-05 20:24:34 +01:00
Łukasz Góreczny
a88dfaa54f SES-77 Aded singlaR methods for register and override default disconnect 2020-12-05 19:18:45 +01:00
ngawron
ceb836d734 deleted unused files, added changes after PR, fixed database property 2020-12-05 18:58:47 +01:00
ngawron
b5c37e40e4 SES-74 created master-page with - select role 2020-12-05 18:58:04 +01:00
ngawron
b2387e0cc0 SES-74 added basic structure to the code 2020-12-05 18:58:03 +01:00
Łukasz Góreczny
561b688519 SES-77 SignalR base config 2020-12-05 18:55:35 +01:00
e53d87416b Fix some weird bug with Visualstudio 2020-12-05 16:35:55 +01:00
53c2d7cfcc added repositories 2020-12-05 16:35:54 +01:00
0196595df2 Merge branch 'master' into SES-68 2020-12-05 14:02:50 +01:00
cd63f5e402 Again bug with vs 2020-12-05 14:01:46 +01:00
18fe024fd1 Merge branch 'SES-68' of git.wmi.amu.edu.pl:s426135/session-companion into SES-68 2020-12-05 14:01:03 +01:00
333283443e Change ViewModels to 5.0 2020-12-05 13:55:07 +01:00
7860c1d535 added ViewModels 2020-12-04 21:34:30 +01:00
84616f3344 Merge pull request 'dodano tabele atrybutow postaci' (#9) from SES-65 into master
Reviewed-on: #9
2020-12-04 17:04:25 +01:00
a303a7da7e dodano tabele atrybutow postaci 2020-12-04 15:49:51 +01:00
501738f247 Merged but i think its not as good as you think 2020-12-03 22:32:42 +01:00
850ae8e610 SES-68 Changes to csproj 2020-12-03 21:30:34 +01:00
f123ef65eb SES-68 Added Basic ViewModels 2020-12-03 19:22:35 +01:00
dfc3cdac98 SES-67 Add config to repositories 2020-12-03 18:52:53 +01:00
e3bcf28f46 SES-67 Add repostitories 2020-12-03 18:52:19 +01:00
d2d8bd8cab Merge pull request 'SES-65' (#5) from SES-65 into master
Reviewed-on: #5
2020-12-03 18:36:38 +01:00
f455c985d2 Add migration usage 2020-12-03 17:58:52 +01:00
50a11e0434 Add new class to have cleaner code 2020-12-03 17:50:11 +01:00
13e0e77b52 SES-65 Working database 2020-12-03 17:13:17 +01:00
d59c20bd0b Fix bug with bad intending 2020-12-03 17:00:04 +01:00
7e15254cc1 Added Some based tables and new project 2020-12-02 23:05:06 +01:00
2830b8541b Merge branch 'master' into SES-71 2020-12-02 21:04:19 +01:00
ngawron
be1e856f3a configurated material and cdk 2020-12-02 20:48:24 +01:00
6f7737baa6 Merge branch 'master' into SES-79 2020-12-02 20:39:04 +01:00
f1d906c1b1 SES-79 Small fix to Jenkinsfile 2020-12-02 20:01:41 +01:00
e183f7e161 SES-79 Check with Jenkinsfile 2020-12-02 19:17:49 +01:00
f3c55bf7e3 SES-79 Try configs for Dockerfile and Jenkinsfile 2020-12-02 18:52:16 +01:00
Łukasz Góreczny
19211e0254 Added routing and removed unnecessary pages 2020-12-02 10:39:08 +01:00
Łukasz Góreczny
1a760a881f SES-64 code cleanup 2020-12-01 20:18:09 +01:00
Łuaksz Góreczny
a83e6fac06 Small change 2020-11-30 19:18:23 +01:00
Łuaksz Góreczny
4ee65b2aac SES-64 Added base application schema 2020-11-30 19:16:20 +01:00