From 6b2d45fd706ba733e12843d9303eaca4f5b77e59 Mon Sep 17 00:00:00 2001 From: Moulika Kulkarni Date: Wed, 1 Nov 2023 17:16:37 +0530 Subject: [PATCH] fix: UI-users-fixes Signed-off-by: Moulika Kulkarni --- src/app/SideBar.astro | 150 ++++++++++-------- .../organization/invitations/Invitations.tsx | 5 +- src/components/organization/users/Members.tsx | 18 ++- 3 files changed, 94 insertions(+), 79 deletions(-) diff --git a/src/app/SideBar.astro b/src/app/SideBar.astro index 0ee34c9de..835d08b59 100644 --- a/src/app/SideBar.astro +++ b/src/app/SideBar.astro @@ -162,15 +162,16 @@ import { pathRoutes } from '../config/pathRoutes'; > @@ -351,7 +352,82 @@ import { pathRoutes } from '../config/pathRoutes'; - +
  • + +
    • +
  • + + + + + + GitHub Repository + +
    • +
  • + + + + + + Documentation + +
    • + +
  • + + + + + + Support + +
    • + - - - - - - Support - + diff --git a/src/components/organization/invitations/Invitations.tsx b/src/components/organization/invitations/Invitations.tsx index 017f0e3fa..43db0c787 100644 --- a/src/components/organization/invitations/Invitations.tsx +++ b/src/components/organization/invitations/Invitations.tsx @@ -164,14 +164,14 @@ const Invitations = () => {

    {invitation.email}

      -
    • +
    • {invitation.orgRoles.length>1 ? 'Roles:' : 'Role:'} @@ -226,7 +226,6 @@ const Invitations = () => { > Invited On:  {dateConversion(invitation.createDateTime)}

      -
      • )) diff --git a/src/components/organization/users/Members.tsx b/src/components/organization/users/Members.tsx index 677419589..b1d0766cb 100644 --- a/src/components/organization/users/Members.tsx +++ b/src/components/organization/users/Members.tsx @@ -144,15 +144,16 @@ const Members = () => { ) : ( usersList && usersList?.length > 0 && ( -
      -
      +
      +
        +
        {usersList.map((user) => (
      • -
        +
        -

        +

        {user.firstName} {user.lastName}

        @@ -160,8 +161,8 @@ const Members = () => {
        • -
          - Roles: +
          + {user.roles.length >1 ? 'Roles:' : 'Role:'} {user.roles && user.roles.length > 0 && user.roles.map( @@ -197,7 +198,7 @@ const Members = () => { className="cursor-pointer mr-2 flex items-center text-sm font-medium text-gray-500 dark:text-gray-400" > {
          • ))} +
      -
      +
      ) )}