From 448f350c2ed5a134fcddbb13f4f105c799974359 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= Date: Wed, 10 Jul 2019 21:45:37 +0200 Subject: [PATCH] Implement paginating user view for admins --- backend/src/seed/seed-db.js | 7 +++ webapp/locales/de.json | 9 +++- webapp/locales/en.json | 9 +++- webapp/pages/admin.vue | 7 ++- webapp/pages/admin/users.vue | 86 ++++++++++++++++++++++++++++++++++-- 5 files changed, 108 insertions(+), 10 deletions(-) diff --git a/backend/src/seed/seed-db.js b/backend/src/seed/seed-db.js index 18eefb76f..bd12549be 100644 --- a/backend/src/seed/seed-db.js +++ b/backend/src/seed/seed-db.js @@ -707,6 +707,13 @@ import Factory from './factories' to: 'o3', }), ]) + + await Promise.all( + [...Array(30).keys()].map(i => { + return f.create('User') + }), + ) + /* eslint-disable-next-line no-console */ console.log('Seeded Data...') process.exit(0) diff --git a/webapp/locales/de.json b/webapp/locales/de.json index f5231ddf6..2f38e2be3 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -188,7 +188,14 @@ "name": "Organisationen" }, "users": { - "name": "Benutzer" + "name": "Benutzer", + "table": { + "columns": { + "name": "Name", + "slug": "Username", + "role": "Rolle" + } + } }, "pages": { "name": "Seiten" diff --git a/webapp/locales/en.json b/webapp/locales/en.json index 7fb596c9e..14872b3d4 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -189,7 +189,14 @@ "name": "Organizations" }, "users": { - "name": "Users" + "name": "Users", + "table": { + "columns": { + "name": "Name", + "slug": "Username", + "role": "Role" + } + } }, "pages": { "name": "Pages" diff --git a/webapp/pages/admin.vue b/webapp/pages/admin.vue index c9e48ca65..4d498dc9b 100644 --- a/webapp/pages/admin.vue +++ b/webapp/pages/admin.vue @@ -24,11 +24,10 @@ export default { name: this.$t('admin.dashboard.name'), path: `/admin`, }, - // TODO implement - /* { + { name: this.$t('admin.users.name'), - path: `/admin/users` - }, */ + path: `/admin/users`, + }, // TODO implement /* { name: this.$t('admin.organizations.name'), diff --git a/webapp/pages/admin/users.vue b/webapp/pages/admin/users.vue index 90f6d598d..6632d39ca 100644 --- a/webapp/pages/admin/users.vue +++ b/webapp/pages/admin/users.vue @@ -1,15 +1,93 @@