fix(web-client): Improve ux (#303)

* fix(web-admin) update deprecated and improved ux * fix(web-admin): improved ux - easier access to checkin * refactor(web-admin): cleanup sidebar * feat(web-admin) : Add users and display users * fix(core-admin): return volunteer details * fix(web-admin):improved ux * fix toolbar
IEDCMEC · Feb 17, 2024 · 188ce5d · 188ce5d
1 parent 2e5a9e9
commit 188ce5d
Show file tree

Hide file tree

Showing 5 changed files with 1,796 additions and 1,836 deletions.
diff --git a/apps/core-admin/src/controllers/organizations.ts b/apps/core-admin/src/controllers/organizations.ts
@@ -67,8 +67,15 @@ export const getOrganizationMembers = async (req: Request, res: Response) => {
         user: true,
       },
     });
+    const users = await prisma.user.findMany({
+      where: {
+        id: {
+          in: organizationUsers.map((ou: { userId: any }) => ou.userId),
+        },
+      },
+    });
 
-    return res.status(200).json({ organizationUsers });
+    return res.status(200).json({ organizationUsers, users });
   } catch (err: any) {
     console.error(err);
     return res.status(500).json({ error: 'Something went wrong' });

diff --git a/apps/web-admin/src/pages/organizations/[orgId]/events/[eventId]/participants/index.jsx b/apps/web-admin/src/pages/organizations/[orgId]/events/[eventId]/participants/index.jsx
@@ -101,9 +101,6 @@ export default function Events() {
             <DataGrid
               rows={participants}
               columns={columns}
-              slots={{
-                Toolbar: GridToolbar,
-              }}
               slotProps={{
                 toolbar: {
                   showQuickFilter: true,
@@ -122,6 +119,9 @@ export default function Events() {
                   cursor: 'pointer',
                 },
               }}
+              slots={{
+                toolbar: GridToolbar,
+              }}
               onRowClick={handleRowClick}
             />
           </ThemeProvider>

diff --git a/apps/web-admin/src/pages/organizations/[orgId]/events/index.jsx b/apps/web-admin/src/pages/organizations/[orgId]/events/index.jsx
@@ -142,16 +142,25 @@ export default function Events() {
           <Text fontSize="4xl" fontWeight="bold">
             Events
           </Text>
-          <Button
-            padding="4"
-            minWidth="-moz-initial"
-            bgColor="rgb(128, 90, 213)"
-            color="white"
-            _hover={{ bgColor: 'rgb(100, 70, 183)' }}
-            onClick={handleClick}
-          >
-            Add Event
-          </Button>
+          <Box display={'flex'} gap={4}>
+            <Button
+              padding="4"
+              minWidth="-moz-initial"
+              bgColor="rgb(128, 90, 213)"
+              color="white"
+              _hover={{ bgColor: 'rgb(100, 70, 183)' }}
+              onClick={handleClick}
+            >
+              Add Event
+            </Button>
+            <Button
+              onClick={() => {
+                router.push(`/organizations/${orgId}/members`);
+              }}
+            >
+              Members
+            </Button>
+          </Box>
         </Box>
         <Box width="100%" height="100%">
           <ThemeProvider theme={MuiTheme}>

diff --git a/apps/web-admin/src/pages/organizations/index.jsx b/apps/web-admin/src/pages/organizations/index.jsx
@@ -33,7 +33,7 @@ export default function Organizations() {
 
   const [organizations, setOrganizations] = useState([]);
   const handleRowClick = (row) => {
-    router.push(`/organizations/${row.id}`);
+    router.push(`/organizations/${row.id}/events`);
   };
 
   const columns = [