4440 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ulf Gebhardt	754bd89723	lint	2021-11-25 08:49:47 +01:00
Ulf Gebhardt	77dc54155a	Merge branch 'master' into backend_rights ... # Conflicts: # admin/src/router/guards.js # admin/src/store/store.js # backend/src/graphql/resolver/UserResolver.ts # frontend/src/components/SidebarPlugin/SideBar.vue # frontend/src/graphql/queries.js # frontend/src/routes/guards.js	2021-11-25 08:49:06 +01:00
Hannes Heine	1d612c034e	add users Promis all	2021-11-25 08:08:27 +01:00
Moriz Wahl	2f92aec460	Merge branch 'master' into admin_pending_creation	2021-11-24 21:27:44 +01:00
Moriz Wahl	67594ce6ee	Merge pull request #1125 from gradido/login_admin_interface ... Login admin interface	2021-11-24 21:23:23 +01:00
Moriz Wahl	62b3600ac7	coverage unit tests admin interface 51%	2021-11-24 21:12:59 +01:00
Moriz Wahl	e0e707e680	test router navigation guards	2021-11-24 21:11:33 +01:00
Ulf Gebhardt	fcd475f80d	fixed footer merge error	2021-11-24 19:49:33 +01:00
Moriz Wahl	fd9f6f6d55	fix error caused by merging	2021-11-24 19:49:17 +01:00
Moriz Wahl	7c49600df6	test logout action in store	2021-11-24 19:43:31 +01:00
Ulf Gebhardt	a3b87c39bf	moved hasRight into Role class ... defined roles better	2021-11-24 19:41:26 +01:00
Ulf Gebhardt	a24c6119a6	check rights on all resolvers	2021-11-24 19:41:26 +01:00
Ulf Gebhardt	44365bccf1	refactored isAuthorized & implemented a new role & rights based system	2021-11-24 19:40:49 +01:00
Ulf Gebhardt	963bff1c0b	refactored jwt	2021-11-24 19:38:42 +01:00
Ulf Gebhardt	6ea8d08963	fix tests	2021-11-24 19:38:42 +01:00
Ulf Gebhardt	5184d1dd2d	fixed locales	2021-11-24 19:38:42 +01:00
Ulf Gebhardt	bde8cc6067	add infos about jq software requirement	2021-11-24 19:38:42 +01:00
Ulf Gebhardt	2a431c40e9	properly handle auth shortcut in oder to not break layout on logout	2021-11-24 19:38:42 +01:00
Ulf Gebhardt	9dcab6478b	lint admin	2021-11-24 19:38:42 +01:00
Ulf Gebhardt	33783702bc	frontend lint	2021-11-24 19:38:42 +01:00
Ulf Gebhardt	cefc963780	implemented isAdmin from backend	2021-11-24 19:38:42 +01:00
Ulf Gebhardt	6119d38561	corrected ports	2021-11-24 19:37:06 +01:00
Ulf Gebhardt	332ba0dd2c	convenience mode to disable the auth mode for development	2021-11-24 19:37:06 +01:00
Ulf Gebhardt	7e5bfcff2b	implement back to wallet or logout in navbar, remove profile thingy	2021-11-24 19:37:06 +01:00
Ulf Gebhardt	aa7b46b342	logout page	2021-11-24 19:37:06 +01:00
Ulf Gebhardt	d49e4728a5	todo port & define port due to my setup	2021-11-24 19:37:06 +01:00
Ulf Gebhardt	3301e0763d	separate router.beforeach & implement the authenticate route	2021-11-24 19:37:06 +01:00
Ulf Gebhardt	c636bf36ad	config WALLET_AUTH_URL	2021-11-24 19:37:06 +01:00
Ulf Gebhardt	d24cb5806f	rename views to pages	2021-11-24 19:37:06 +01:00
Ulf Gebhardt	c91c4096c1	seperate app and layouts	2021-11-24 19:34:39 +01:00
Ulf Gebhardt	5baeb0b0ef	refactor routes and route guards	2021-11-24 19:33:17 +01:00
Ulf Gebhardt	2c25651db0	store token is actually set	2021-11-24 19:33:17 +01:00
Ulf Gebhardt	a8995141c8	link to admin if isAdmin is true	2021-11-24 19:32:44 +01:00
Ulf Gebhardt	c11ef2fbbb	admin_area language file	2021-11-24 19:32:44 +01:00
Ulf Gebhardt	afda08a589	delete some weird docu stuff	2021-11-24 19:32:44 +01:00
Moriz Wahl	544c221fb9	move specs to pages folder	2021-11-24 18:37:35 +01:00
Moriz Wahl	53c396e170	fix test of App.vue	2021-11-24 18:34:34 +01:00
Moriz Wahl	9e34c3459a	fix test for main and router	2021-11-24 18:32:03 +01:00
Moriz Wahl	b0ac9b6632	Merge branch 'login_admin_interface' of github.com:gradido/gradido into login_admin_interface	2021-11-24 18:26:38 +01:00
Moriz Wahl	ac7eb303b4	Merge branch 'master' into login_admin_interface	2021-11-24 18:23:31 +01:00
Moriz Wahl	6b56d61824	Merge pull request #1116 from gradido/ADMINBEREICH-first-step ... Adminbereich first step	2021-11-24 18:15:30 +01:00
Moriz Wahl	fa717e7046	Merge branch 'master' into ADMINBEREICH-first-step	2021-11-24 18:03:38 +01:00
Moriz Wahl	ff20a223b9	coverage for unit tests admin interface to 47%	2021-11-24 18:02:29 +01:00
Moriz Wahl	7d39797a3e	test router	2021-11-24 17:58:42 +01:00
Moriz Wahl	b3580184f5	test creation confirm	2021-11-24 17:44:59 +01:00
Moriz Wahl	fb7868344a	test user search	2021-11-24 17:29:53 +01:00
Hannes Heine	e67b724058	Calculate the usedAmount with the pending amounts.	2021-11-24 16:08:01 +01:00
Hannes Heine	7c0f1cfc0f	Query Builder to get the pending creation amount of this, last and beforeLast Month	2021-11-24 16:04:40 +01:00
Hannes Heine	91089c6668	Change the result value to the sum value.	2021-11-24 14:46:56 +01:00
Hannes Heine	3cd5ab27db	Change getRawOne to getOne.	2021-11-24 14:40:22 +01:00