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.

Sign up for GitHub

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

Updated User Management Section #1557

Merged
merged 8 commits into from
Jan 13, 2024
Merged

Updated User Management Section #1557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7adc155
fix+feat:refractored the current code in accordance to MUI component …
freaky4wrld Dec 23, 2023
1182fd7
fix: added styles to various box and button to achieve the UI specs
freaky4wrld Dec 26, 2023
3f1cd4d
fix: added some padding to the element, provided horizontal rule afte…
freaky4wrld Dec 27, 2023
aca674f
fix: fixed the UI pushed the button down, gave root element a width o…
freaky4wrld Dec 28, 2023
85ce20f
Added breakpoints to the button text
freaky4wrld Jan 9, 2024
8e6899a
fix: refactored divs to Box, removed commented and unused objects, ga…
freaky4wrld Jan 13, 2024
cb81070
fix: tried to manipulate the design with margin and padding as directed
freaky4wrld Jan 13, 2024
c3746c2
fix: replaced hardcode strings with numerical value, set result as bl…
freaky4wrld Jan 13, 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
166 changes: 107 additions & 59 deletions client/src/components/user-admin/UserManagement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
import React, { useState } from 'react';
import {Box, Button, ButtonGroup, TextField, Typography, List, ListItem, ListItemButton} from '@mui/material';


import '../../sass/UserAdmin.scss';

const Buttonsx = {
px: 2,
py: 0.5,
}

const UserManagement = ({ users, setUserToEdit }) => {
let searchResults = [];
const [searchResultType, setSearchResultType] = useState('name'); // Which results will diplay
Expand Down Expand Up @@ -42,69 +50,109 @@ const UserManagement = ({ users, setUserToEdit }) => {
);
}
return (
<div className="container--usermanagement">
<div>
<h3>User Management</h3>
<input
<Box className="container--usermanagement" sx={{px: '1.8rem'}}>
<Box sx={{
freaky4wrld marked this conversation as resolved.
Show resolved Hide resolved
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
pt: 5,
height: '100%',
width: 1/1,
}}>
<Typography variant='h1'>User Management</Typography>

<Box className="tab-buttons">
<ButtonGroup sx={{
display: 'flex',
flexDirection: 'row',
justifyContent: 'center',
whiteSpace: 'nowrap',
mx: 1,
}}>
<Button
sx={Buttonsx}
type="button"
variant={
searchResultType === 'name'
? 'contained'
: 'secondary'
}
onClick={buttonSwap}
>
Results by Name
</Button>
<Button
sx={Buttonsx}
type="button"
variant={
searchResultType === 'email'
? 'contained'
: 'secondary'
}
onClick={buttonSwap}
>
Results by Email
</Button>
</ButtonGroup>
</Box>
<TextField
trillium marked this conversation as resolved.
Show resolved Hide resolved
type="text"
placeholder="Search by name and email..."
placeholder="Enter name and / or email to find a user."
variant='standard'
value={searchTerm}
onChange={handleChange}
/>
<div className="tab-buttons">
<div>
<button
type="button"
className={
searchResultType === 'name'
? 'select-button selected'
: 'select-button'
}
onClick={buttonSwap}
disabled={searchResultType === 'name'}
>
Results by Name
</button>
</div>
<div>
<button
type="button"
className={
searchResultType === 'email'
? 'select-button selected'
: 'select-button'
}
onClick={buttonSwap}
disabled={searchResultType === 'email'}
>
Results by Email
</button>
</div>
</div>
<div>
<div>
<ul className="search-results">
{searchResults.map((u) => {
return (
// eslint-disable-next-line no-underscore-dangle
<li key={`result_${u._id}`}>
<button
className="search-results-button"
type="button"
onClick={() => setUserToEdit(u)}
>
{searchResultType === 'name'
? `${u.name?.firstName} ${u.name?.lastName} ( ${u.email} )`
: `${u.email} ( ${u.name?.firstName} ${u.name?.lastName} )`}
</button>
</li>
);
})}
</ul>
</div>
</div>
</div>
</div>
<Box sx={{
freaky4wrld marked this conversation as resolved.
Show resolved Hide resolved
bgcolor: searchResults.length>0? '#F5F5F5': 'transparent',
trillium marked this conversation as resolved.
Show resolved Hide resolved
my: 1.2,
borderRadius: 1,
flexGrow: 1,
width: 1/1,
}}>
<Box>
<List className="search-results disablePadding">
{searchResults.map((u) => {
return (
// eslint-disable-next-line no-underscore-dangle
<ListItem
sx={{
px: 2.4,
py: 1,
borderBottom: 1.6,
borderBottomColor: 'grey.300',
}}
key={`result_${u._id}`}>
<ListItemButton
sx={{
px: 0.25,
py: 0.36,
color: 'primary.main',
mx: 0.16,
}}
className="search-results-button"
type="button"
onClick={() => setUserToEdit(u)}
>
{searchResultType === 'name'
? `${u.name?.firstName} ${u.name?.lastName} ( ${u.email} )`
: `${u.email} ( ${u.name?.firstName} ${u.name?.lastName} )`}
</ListItemButton>
</ListItem>
);
})}
</List>
</Box>
</Box>
<Box>
<Button
type='button'
variant='secondary'
>
Add a New User
</Button>
</Box>
</Box>
</Box>
);
};

Expand Down
1 change: 1 addition & 0 deletions client/src/sass/UserAdmin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
align-items: center;
z-index: 1;
margin-bottom: 200px;
height: 100%;
}

.edit-users {
Expand Down
Loading