813 Commits

Author SHA1 Message Date
ogerly
6e250cb63b Remove console.log. 2021-12-03 16:49:03 +01:00
ogerly
df393c4ea8 Fixe calculation of the new balance. 2021-12-03 16:46:14 +01:00
ogerly
0da5c3d2c8 Store the right amount in the database. 2021-12-03 16:27:01 +01:00
elweyn
a07d34d827 Added a state_user_transaction row. withdrew / 10000 from frontend. 2021-12-03 14:25:00 +01:00
elweyn
7b3096a88b Change mutation id from int to float and changed the findOrFail parameter to simply id. 2021-12-03 12:41:24 +01:00
ogerly
f6d42e7236 add eslint-disable,@typescript-eslint/no-explicit-any @typescript-eslint/explicit-module-boundary-types 2021-12-02 12:51:07 +01:00
ogerly
a93792cab8 Mutation for confirmPendingCreation. 2021-12-02 10:55:39 +01:00
elweyn
2192863377 --author=ogerly <fridolin@tutanota.com>
creation store prepared
2021-12-02 09:06:54 +01:00
elweyn
b81336c309 Merge branch 'adminEditPendingCreationQueries' into adminDeletePendingCreationQuery 2021-12-02 06:36:14 +01:00
elweyn
2d2409b65d Added moderator query to the creationFormular so we can send the right moderator id. 2021-12-02 06:35:35 +01:00
elweyn
640109d8bf Merge moderator search from admin_pending_creation. 2021-12-02 06:32:00 +01:00
elweyn
1004718892 Added moderator query to the creationFormular so we can send the right moderator id. 2021-12-02 06:30:41 +01:00
ogerly
06983d786b remove all console logs 2021-12-01 16:54:57 +01:00
Hannes Heine
4c2e51b517 Update pending creation 2021-12-01 15:43:22 +01:00
elweyn
83af3bc692 Merge last branch in this. 2021-12-01 09:33:26 +01:00
elweyn
f452e6537f Change delete method from Query to Mutation. 2021-11-30 15:03:58 +01:00
elweyn
db6fbf72a7 Merge branch 'adminPendingCreationQueries' into adminDeletePendingCreationQuery 2021-11-30 14:59:53 +01:00
elweyn
c71eccec0e Merge branch 'admin_pending_creation' into adminPendingCreationQueries 2021-11-30 14:59:13 +01:00
elweyn
daeb0ed32c Change create method from query to mutation. 2021-11-30 14:58:47 +01:00
elweyn
6c5b4a3738 Merge adminPendingCreationQuery in here. 2021-11-30 10:19:31 +01:00
elweyn
ea9bf54c16 Merge changes from last branch. 2021-11-30 10:13:42 +01:00
elweyn
3a5999ffe5 Change note to memo. 2021-11-30 10:11:28 +01:00
elweyn
ffed004b1a Merge branch 'admin_pending_creation' into adminPendingCreationQueries 2021-11-30 10:10:15 +01:00
elweyn
e2743b979e Change note to memo. 2021-11-30 10:08:12 +01:00
ogerly
f2c31b7d68 pendingCreationRepository.manager.remove res - fix prettier 2021-11-26 17:49:29 +01:00
ogerly
a618ac678e Created delete query. 2021-11-26 15:35:21 +01:00
ogerly
e0ad9ab40a Removed unused imports. 2021-11-26 15:11:46 +01:00
ogerly
18a530b1b1 Withdrew console.logs. 2021-11-26 15:11:03 +01:00
ogerly
48c0b687d6 Query changed to Type PendingCreation, changed the login user search to state user search, adding parameters to PendingCreation object, changed frontend to map the query informations. 2021-11-26 15:05:49 +01:00
Hannes Heine
602dfd64f1 Corected return type for getPendingCreations and corected query. 2021-11-26 12:36:01 +01:00
Hannes Heine
99749eebb2 Apollo first steps getPendingCreations. 2021-11-26 11:28:14 +01:00
ogerly
7169a3635d adding formatter function on table field creation. Formatter Funktion Object to String 2021-11-26 07:54:08 +01:00
Hannes Heine
927c61ae6e
Merge branch 'master' into admin_pending_creation 2021-11-26 06:52:26 +01:00
0b3a8c013a
include review of moriz 2021-11-26 02:50:57 +01:00
c8e46b54d3
merge conflicts resolved 2021-11-26 02:39:30 +01:00
5cccd8f873
Merge branch 'master' into login_call_resetPassword
# Conflicts:
#	backend/src/graphql/resolver/UserResolver.ts
2021-11-26 02:36:32 +01:00
Hannes Heine
33c50560d6 creationDate to string and changed the other parameters to int 2021-11-25 12:06:14 +01:00
Hannes Heine
ade3719c33 Changed the response to array of openCreations. 2021-11-25 10:55:12 +01:00
Hannes Heine
4f61af06aa Withdrew console.logs and changed creationDate type from any to Date. 2021-11-25 10:22:42 +01:00
Hannes Heine
5cbdbcb7c9
Merge branch 'master' into login_call_resetPassword 2021-11-25 10:22:15 +01:00
Hannes Heine
03cb7fa558 Create entry in LoginPendingTaskAdmin table. Save creation in database. 2021-11-25 10:15:34 +01:00
897ff2ec6c
comment 2021-11-25 10:02:17 +01:00
fddc39efe5
compare with jwt assigne drole on verifyLogin instead of database query again 2021-11-25 09:57:27 +01:00
Hannes Heine
ead93b98fd Implemented check if creation is allowed. 2021-11-25 09:54:22 +01:00
ffc45d5cde
implemented JWT Admin role assignment 2021-11-25 09:52:01 +01:00
08f7952ad7
implemened isAdmin 2021-11-25 09:51:38 +01:00
39f1b9cf9f
ServerUser Repository 2021-11-25 09:51:17 +01:00
e838af8d4b
elopage hook problem 2021-11-25 09:23:23 +01:00
Hannes Heine
1c96161401 Replaced fix dates from pending queries to the calculated dates, withdrew comments. 2021-11-25 09:22:49 +01:00
0565ff4d85
reverted createUser process - this is done in another PR 2021-11-25 09:18:37 +01:00