Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redesign: Standardise User Management Screens for Admin and Super Admin #1988

Closed
Closed
Show file tree
Hide file tree
Changes from 52 commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
7188257
fixed failing tests
Doraemon012 May 17, 2024
7ba67d0
fixed formatting
Doraemon012 May 17, 2024
83b51f8
Enhanced code coverage
Doraemon012 May 23, 2024
d55f74f
Update src/components/OrgMemberDetail/OrgMemberDetails.test.tsx
varshith257 May 23, 2024
9407be7
fixed failing tests
Doraemon012 May 23, 2024
ee5e922
fixed failing test
Doraemon012 May 23, 2024
0c86d37
Merge branch 'develop' into talawa-admin-t
Doraemon012 May 23, 2024
b80ec57
Resolved conflicts
Doraemon012 Jun 2, 2024
99ebd9d
Merge branch 'develop' into talawa-admin-t
Doraemon012 Jun 2, 2024
bb61827
fixed formatting
Doraemon012 Jun 2, 2024
0dcc032
Merge branch 'talawa-admin-t' of https://github.com/Doraemon012/talaw…
Doraemon012 Jun 2, 2024
eb017a9
fixed formatting
Doraemon012 Jun 2, 2024
73b318a
added translations
Doraemon012 Jun 2, 2024
6787698
Added remaining translations
Doraemon012 Jun 3, 2024
5cc8cca
Merge branch 'develop' into talawa-admin-t
Doraemon012 Jun 3, 2024
fe69035
enhanced coverage
Doraemon012 Jun 3, 2024
d571f56
Merge branch 'talawa-admin-t' of https://github.com/Doraemon012/talaw…
Doraemon012 Jun 3, 2024
cce831c
enhanced coverage
Doraemon012 Jun 3, 2024
a801c09
fixed styling
Doraemon012 Jun 5, 2024
2f8633f
fixed titles
Doraemon012 Jun 5, 2024
d65e3e9
Merge branch 'develop' into talawa-admin-t
Doraemon012 Jun 5, 2024
064f9dc
fixed formatting
Doraemon012 Jun 5, 2024
6b878c9
Merge branch 'talawa-admin-t' of https://github.com/Doraemon012/talaw…
Doraemon012 Jun 5, 2024
63df040
fixed formatting
Doraemon012 Jun 5, 2024
c947df0
fixed bug in title handeling and enhanced coverage
Doraemon012 Jun 24, 2024
8447f09
Merge branch 'develop' into talawa-admin-t
Doraemon012 Jun 24, 2024
5db8ed3
fixed formatting
Doraemon012 Jun 24, 2024
760a229
added missing translation
Doraemon012 Jun 24, 2024
1137ec0
removed comments
Doraemon012 Jun 24, 2024
d65b820
fixed formatting
Doraemon012 Jun 24, 2024
8565d6e
fixed ui
Doraemon012 Aug 25, 2024
4ad402a
Merge branch 'develop' into talawa-admin-t
Doraemon012 Aug 25, 2024
3201833
removed useless fields
Doraemon012 Aug 25, 2024
1ea2ddb
removed comments in css
Doraemon012 Aug 25, 2024
a296b3e
removed useless fields
Doraemon012 Aug 25, 2024
849d3b5
fixed formatting
Doraemon012 Aug 25, 2024
6ef7537
Merge remote-tracking branch 'origin/talawa-admin-t' into talawa-admin-t
Doraemon012 Aug 25, 2024
0765a1e
fixed formatting
Doraemon012 Aug 25, 2024
7edfc02
fixed tsdoc comments
Doraemon012 Aug 25, 2024
02d869b
fixed formatting
Doraemon012 Aug 25, 2024
b791eac
added translations
Doraemon012 Aug 25, 2024
d92dc4f
fixed failing test in OrgPeopleOrganizationsCard
Doraemon012 Aug 25, 2024
ddd94a8
fixed failing tests
Doraemon012 Aug 25, 2024
efaf116
Merge branch 'develop' into talawa-admin-t
Doraemon012 Aug 28, 2024
08a8748
Merge branch 'develop' into talawa-admin-t
Doraemon012 Sep 3, 2024
8152c23
fixed conflicts
Doraemon012 Sep 3, 2024
b9d9c4c
Merge branch 'develop' into talawa-admin-t
Doraemon012 Sep 27, 2024
b93ebcf
Fixed formating.tsx
Doraemon012 Sep 27, 2024
392ab42
Fixed error in OrgPeopleOrganizationsCard.tsx
Doraemon012 Sep 27, 2024
9d7f9dd
fixed failing tests
Doraemon012 Sep 29, 2024
645ba48
fixed formatting
Doraemon012 Sep 29, 2024
b7c0eb2
Merge branch 'develop' into talawa-admin-t
Doraemon012 Sep 29, 2024
f9cc50b
fixed failing test in leftdrawerorg
Doraemon012 Oct 5, 2024
fa768e5
Merge branch 'develop' into talawa-admin-t
Doraemon012 Oct 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 30 additions & 4 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,17 @@
"admins": "admins",
"members": "members"
},
"orgPeopleOrganizationsCard": {
"manage": "Manage",
"notMember": "User is not a member",
"unblock": "UnBlock",
"block": "Block",
"blockedSuccessfully": "User blocked successfully",
"unBlockedSuccessfully": "User Un-Blocked successfully",
"blockedUser": "User is blocked",
"roleUpdated": "Role Updated.",
"memberRemoved": "The Member is removed"
},
"paginationList": {
"rowsPerPage": "rows per page",
"all": "All"
Expand Down Expand Up @@ -269,7 +280,8 @@
"talawaApiUnavailable": "talawaApiUnavailable"
},
"organizationPeople": {
"title": "Talawa Members",
"title": "Members",
"title_superadmin": "Users",
"filterByName": "Filter by Name",
"filterByLocation": "Filter by Location",
"filterByEvent": "Filter by Event",
Expand Down Expand Up @@ -863,6 +875,14 @@
"installMsg": "This feature is now enabled in your organization"
},
"memberDetail": {
"overview": "Overview",
"organizations": "Organizations",
"events": "Events",
"tags": "Tags",
"title_superadmin": "User Details",
"title": "Member Details"
},
"orgMemberDetail": {
"title": "User Details",
"addAdmin": "Add Admin",
"alreadyIsAdmin": "Member is already an Admin",
Expand Down Expand Up @@ -904,9 +924,11 @@
"joined": "joined",
"talawaApiUnavailable": "talawaApiUnavailable"
},
"people": {
"title": "People",
"searchUsers": "Search users"
"memberOrganization": {
"sort": "Sort",
"noOrgError": "Organizations not found, please create an organization through dashboard",
"noOrgErrorTitle": "Organizations Not Found",
"noOrgErrorDescription": "Please create an organization through dashboard"
},
"userLogin": {
"login": "Login",
Expand All @@ -922,6 +944,10 @@
"register": "register",
"talawaApiUnavailable": "talawaApiUnavailable"
},
"people": {
"title": "People",
"searchUsers": "Search People"
},
"userRegister": {
"enterFirstName": "Enter your first name",
"enterLastName": "Enter your last name",
Expand Down
34 changes: 30 additions & 4 deletions public/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,17 @@
"admins": "Administrateurs",
"members": "Membres"
},
"orgPeopleOrganizationsCard": {
"manage": "Gérer",
"notMember": "L'utilisateur n'est pas un membre",
"unblock": "Débloquer",
"block": "Bloc",
"blockedSuccessfully": "Utilisateur bloqué avec succès",
"unBlockedSuccessfully": "Utilisateur débloqué avec succès",
"blockedUser": "Utilisateur bloqué",
"roleUpdated": "Rôle mis à jour.",
"memberRemoved": "Le membre est supprimé"
},
"paginationList": {
"rowsPerPage": "lignes par page",
"all": "Tous"
Expand Down Expand Up @@ -269,7 +280,8 @@
"talawaApiUnavailable": "API Talawa indisponible"
},
"organizationPeople": {
"title": "Membres Talawa",
"title": "Membres",
"title_superadmin": "Utilisateurs",
"filterByName": "Filtrer par nom",
"filterByLocation": "Filtrer par emplacement",
"filterByEvent": "Filtrer par événement",
Expand Down Expand Up @@ -863,6 +875,14 @@
"installMsg": "Cette fonctionnalité est désormais activée dans votre organisation"
},
"memberDetail": {
"overview": "Aperçu",
"organizations": "Organisations",
"events": "Événements",
"tags": "Balises",
"title_superadmin": "Détails de l'utilisateur",
"title": "Détails du membre"
},
"orgMemberDetail": {
"title": "Détails de l'utilisateur",
"addAdmin": "Ajouter un administrateur",
"alreadyIsAdmin": "Le membre est déjà un administrateur",
Expand Down Expand Up @@ -904,9 +924,11 @@
"joined": "Rejoint",
"talawaApiUnavailable": "API Talawa non disponible"
},
"people": {
"title": "Personnes",
"searchUsers": "Rechercher des utilisateurs"
"memberOrganization": {
"sort": "Trier",
"noOrgError": "Organisations non trouvées, veuillez créer une organisation via le tableau de bord",
"noOrgErrorTitle": "Organisations non trouvées",
"noOrgErrorDescription": "Veuillez créer une organisation via le tableau de bord"
},
"userLogin": {
"login": "Se connecter",
Expand All @@ -922,6 +944,10 @@
"register": "Inscription",
"talawaApiUnavailable": "API Talawa non disponible"
},
"people": {
"title": "Personnes",
"searchUsers": "Rechercher des utilisateurs"
},
"userRegister": {
"enterFirstName": "Entrez votre prénom",
"enterLastName": "Entrez votre nom de famille",
Expand Down
34 changes: 30 additions & 4 deletions public/locales/hi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,17 @@
"admins": "प्रशासक",
"members": "सदस्य"
},
"orgPeopleOrganizationsCard": {
"manage": "प्रबंधित करें",
"notMember": "उपयोगकर्ता सदस्य नहीं है",
"unblock": "अनब्लॉक करें",
"block": "ब्लॉक करें",
"blockedSuccessfully": "उपयोगकर्ता को सफलतापूर्वक ब्लॉक किया गया",
"unBlockedSuccessfully": "उपयोगकर्ता को सफलतापूर्वक अनब्लॉक किया गया",
"blockedUser": "उपयोगकर्ता ब्लॉक है",
"roleUpdated": "भूमिका अद्यतन की गई।",
"memberRemoved": "सदस्य को हटा दिया गया"
},
"paginationList": {
"rowsPerPage": "प्रति पृष्ठ पंक्तियाँ",
"all": "सभी"
Expand Down Expand Up @@ -269,7 +280,8 @@
"talawaApiUnavailable": "तालावा एपीआई अनुपलब्ध"
},
"organizationPeople": {
"title": "तालावा सदस्य",
"title": "सदस्य",
"title_superadmin": "उपयोगकर्ता",
"filterByName": "नाम से फ़िल्टर करें",
"filterByLocation": "स्थान से फ़िल्टर करें",
"filterByEvent": "घटना से फ़िल्टर करें",
Expand Down Expand Up @@ -863,6 +875,14 @@
"installMsg": "यह सुविधा अब आपके संगठन में सक्षम है"
},
"memberDetail": {
"overview": "अवलोकन",
"organizations": "संगठन",
"events": "घटनाएँ",
"tags": "टैग",
"title_superadmin": "उपयोगकर्ता विवरण",
"title": "सदस्य विवरण"
},
"orgMemberDetail": {
"title": "उपयोगकर्ता विवरण",
"addAdmin": "व्यवस्थापक जोड़ें",
"alreadyIsAdmin": "सदस्य पहले से ही एक व्यवस्थापक है",
Expand Down Expand Up @@ -904,9 +924,11 @@
"joined": "शामिल हुए",
"talawaApiUnavailable": "Talawa API अनुपलब्ध"
},
"people": {
"title": "लोग",
"searchUsers": "उपयोगकर्ताओं को खोजें"
"memberOrganization": {
"sort": "क्रम से लगाना",
"noOrgError": "संगठन नहीं मिला, कृपया डैशबोर्ड के माध्यम से एक संगठन बनाएं",
"noOrgErrorTitle": "संगठन नहीं मिले",
"noOrgErrorDescription": "कृपया डैशबोर्ड के माध्यम से एक संगठन बनाएं"
Doraemon012 marked this conversation as resolved.
Show resolved Hide resolved
},
"userLogin": {
"login": "लॉग इन करें",
Expand All @@ -922,6 +944,10 @@
"register": "पंजीकरण करें",
"talawaApiUnavailable": "Talawa API अनुपलब्ध"
},
"people": {
"title": "लोग",
"searchUsers": "उपयोगकर्ता खोजें"
},
"userRegister": {
"enterFirstName": "अपना पहला नाम दर्ज करें",
"enterLastName": "अपना अंतिम नाम दर्ज करें",
Expand Down
29 changes: 27 additions & 2 deletions public/locales/sp/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,17 @@
"manage": "Administrar",
"sampleOrganization": "Organización de muestra"
},
"orgPeopleOrganizationsCard": {
"manage": "Gestionar",
"notMember": "El usuario no es miembro",
"unblock": "Desbloquear",
"block": "Bloquear",
"blockedSuccessfully": "Usuario bloqueado con éxito",
"unBlockedSuccessfully": "Usuario desbloqueado exitosamente",
"blockedUser": "Usuario bloqueado",
"roleUpdated": "Rol actualizado.",
"memberRemoved": "El miembro ha sido eliminado"
},
"paginationList": {
"rowsPerPage": "filas por página",
"all": "Todos"
Expand Down Expand Up @@ -269,7 +280,8 @@
"talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Compruebe también la conectividad de su red."
},
"organizationPeople": {
"title": "Miembros Talawa",
"title": "Miembros",
"title_superadmin": "Usuarios",
"filterByName": "Filtrar por nombre",
"filterByLocation": "Filtrar por Ubicación",
"filterByEvent": "Filtrar por Evento",
Expand Down Expand Up @@ -611,7 +623,6 @@
"raisedAmount": "Monto recaudado",
"pledgedAmount": "Monto comprometido"
},

"orgPost": {
"title": "Publicaciones de Talawa",
"searchPost": "Buscar Publicación",
Expand Down Expand Up @@ -864,6 +875,20 @@
"installMsg": "Mensaje de instalación"
},
"memberDetail": {
"overview": "Resumen",
"organizations": "Organizaciones",
"events": "Eventos",
"tags": "Etiquetas",
"title_superadmin": "Detalles del usuario",
"title": "Detalles del miembro"
},
"memberOrganization": {
"sort": "Ordenar",
"noOrgError": "Organizaciones no encontradas, por favor crea una organización a través del panel de control",
"noOrgErrorTitle": "Organizaciones no encontradas",
"noOrgErrorDescription": "Por favor, crea una organización a través del panel de control"
},
"orgMemberDetail": {
"title": "Detalles del usuario",
"addAdmin": "Agregar administrador",
"alreadyIsAdmin": "El Miembro ya es Administrador",
Expand Down
28 changes: 27 additions & 1 deletion public/locales/zh/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,17 @@
"admins": "管理员",
"members": "成员"
},
"orgPeopleOrganizationsCard": {
"manage": "管理",
"notMember": "不是会员",
"unblock": "解锁",
"block": "堵塞",
"blockedSuccessfully": "用户被成功屏蔽",
"unBlockedSuccessfully": "用户解封成功",
"blockedUser": "被阻止的用户",
"roleUpdated": "角色已更新。",
"memberRemoved": "该会员已被删除"
},
"paginationList": {
"rowsPerPage": "每页行数",
"all": "全部"
Expand Down Expand Up @@ -270,6 +281,7 @@
},
"organizationPeople": {
"title": "塔拉瓦会员",
"title_superadmin": "塔拉瓦用户",
"filterByName": "按名称过滤",
"filterByLocation": "按地点过滤",
"filterByEvent": "按事件过滤",
Expand Down Expand Up @@ -863,7 +875,15 @@
"installMsg": "您的组织现已启用此功能"
},
"memberDetail": {
"title": "用户详细信息",
"overview": "概览",
"organizations": "组织",
"events": "活动",
"tags": "标签",
"title_superadmin": "用户详情",
"title": "成员详情"
},
"orgMemberDetail": {
"title": "用户详情",
"addAdmin": "添加管理员",
"alreadyIsAdmin": "会员已经是管理员",
"organizations": "组织机构",
Expand Down Expand Up @@ -904,6 +924,12 @@
"joined": "已加入",
"talawaApiUnavailable": "塔拉瓦 API 不可用"
},
"memberOrganization": {
"sort": "按角色搜索",
"noOrgError": "未找到组织,请通过仪表板创建组织",
"noOrgErrorTitle": "未找到组织",
"noOrgErrorDescription": "请通过仪表板创建组织"
},
"userLogin": {
"login": "登录",
"loginIntoYourAccount": "登录您的帐户",
Expand Down
7 changes: 7 additions & 0 deletions src/GraphQl/Queries/Queries.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,13 @@ export const ORGANIZATION_CONNECTION_LIST = gql`
sortingCode
state
}
blockedUsers {
_id
firstName
lastName
email
}
description
}
}
`;
Expand Down
Loading
Loading