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

Jump to bottom

[Fix]: 'View More' Functionality and Initial User Display in Orgusers Component #1176 #1179

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[Fix]: 'View More' Functionality and Initial User Display in Orgusers Component #1176 #1179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ebce8b
fix/view-more/functionality
shikhar-4739 Feb 10, 2024
9885869
changes
shikhar-4739 Feb 10, 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
92 changes: 51 additions & 41 deletions src/components/Organization/OrgUsers/OrgUsers.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { Avatar, Button, Grid, Paper, Typography } from "@mui/material";
import { makeStyles } from "@mui/styles";
import React from "react";
import React, { useState } from "react";
import AddIcon from "@mui/icons-material/Add";
import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
import ExpandLessRoundedIcon from "@mui/icons-material/ExpandLessRounded";

const useStyles = makeStyles(theme => ({
root: {
Expand Down Expand Up @@ -67,6 +68,12 @@ function Orgusers({
dataTestId
}) {
const classes = useStyles();
const [showAllUsers, setShowAllUsers] = useState(false);

const handleViewMoreClick = () => {
setShowAllUsers(!showAllUsers);
};

return (
<React.Fragment>
<Paper elevation={0} className={classes.root} data-testid={dataTestId}>
Expand Down Expand Up @@ -107,49 +114,51 @@ function Orgusers({
className={classes.userList}
data-testid="org-userlist"
>
{Users.map((user, index) => (
<React.Fragment key={index}>
<Grid
container
direction="row"
justifyContent="center"
alignItems="center"
className={classes.userCard}
data-testid="org-user-card"
spacing={2}
>
<Grid
item
container
xs={3}
md={1}
justifyContent="center"
alignItems="center"
>
{user.avatar.type === "char" ? (
<Avatar>{user.avatar.value}</Avatar>
) : (
<Avatar src={user.avatar.value} />
)}
</Grid>
{Users.slice(0, showAllUsers ? Users.length : 3).map(
(user, index) => (
<React.Fragment key={index}>
<Grid
item
xs={9}
md={11}
container
direction="row"
justifyContent="center"
alignItems="center"
className={classes.userCard}
data-testid="org-user-card"
spacing={2}
>
<Typography className={classes.userName}>
{user.name},
</Typography>
<Typography className={classes.userDesignation}>
{user.designation}
</Typography>
<Grid
item
container
xs={3}
md={1}
justifyContent="center"
alignItems="center"
>
{user.avatar.type === "char" ? (
<Avatar>{user.avatar.value}</Avatar>
) : (
<Avatar src={user.avatar.value} />
)}
</Grid>
<Grid
item
xs={9}
md={11}
container
direction="row"
alignItems="center"
>
<Typography className={classes.userName}>
{user.name},
</Typography>
<Typography className={classes.userDesignation}>
{user.designation}
</Typography>
</Grid>
</Grid>
</Grid>
</React.Fragment>
))}
</React.Fragment>
)
)}
</Grid>
</Grid>
<Grid
Expand All @@ -160,12 +169,13 @@ function Orgusers({
alignItems="center"
className={classes.viewMore}
style={{
display: isViewMore ? "flex" : "none"
display: Users.length > 3 ? "flex" : "none"
}}
onClick={handleViewMoreClick}
>
<ExpandMoreIcon />
{showAllUsers ? <ExpandLessRoundedIcon /> : <ExpandMoreIcon />}
<Typography variant="body1" className={classes.body}>
View More
{showAllUsers ? "View Less" : "View More"}
</Typography>
</Grid>
</Paper>
Expand Down
96 changes: 96 additions & 0 deletions src/components/Organization/pages/Users.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,46 @@ function Users() {
type: "image",
value: "https://i.pravatar.cc/300"
}
},
{
name: "Shahaab Manzar",
designation: "GSoC 22'",
avatar: {
type: "char",
value: "A"
}
},
{
name: "Shahaab Manzar",
designation: "GSoC 22'",
avatar: {
type: "char",
value: "A"
}
},
{
name: "Shahaab Manzar",
designation: "GSoC 22'",
avatar: {
type: "char",
value: "A"
}
},
{
name: "Shahaab Manzar",
designation: "GSoC 22'",
avatar: {
type: "char",
value: "A"
}
},
{
name: "Shahaab Manzar",
designation: "GSoC 22'",
avatar: {
type: "char",
value: "A"
}
}
];

Expand Down Expand Up @@ -67,6 +107,62 @@ function Users() {
type: "image",
value: "https://i.pravatar.cc/300"
}
},
{
name: "Saksham Sharma",
designation: "GSoC 22'",
avatar: {
type: "image",
value: "https://i.pravatar.cc/300"
}
},
{
name: "Saksham Sharma",
designation: "GSoC 22'",
avatar: {
type: "image",
value: "https://i.pravatar.cc/300"
}
},
{
name: "Saksham Sharma",
designation: "GSoC 22'",
avatar: {
type: "image",
value: "https://i.pravatar.cc/300"
}
},
{
name: "Saksham Sharma",
designation: "GSoC 22'",
avatar: {
type: "image",
value: "https://i.pravatar.cc/300"
}
},
{
name: "Saksham Sharma",
designation: "GSoC 22'",
avatar: {
type: "image",
value: "https://i.pravatar.cc/300"
}
},
{
name: "Saksham Sharma",
designation: "GSoC 22'",
avatar: {
type: "image",
value: "https://i.pravatar.cc/300"
}
},
{
name: "Saksham Sharma",
designation: "GSoC 22'",
avatar: {
type: "image",
value: "https://i.pravatar.cc/300"
}
}
];

Expand Down
Loading