Skip to content

ILEX-113 Organizations - connect the getter to the UI component #108

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

Merged
ddelpiano merged 2 commits into from
May 27, 2025
Merged

ILEX-113 Organizations - connect the getter to the UI component #108

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
016e5ac
ILEX-113 update ui design of organizations
Aiga115 May 23, 2025
57b702a
ILEX-113 use user's groupname to show button
Aiga115 May 27, 2025
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
59 changes: 22 additions & 37 deletions src/components/common/OrganizationsList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,32 @@
import PropTypes from "prop-types";
import { useNavigate } from "react-router-dom";
import PersonAddOutlinedIcon from '@mui/icons-material/PersonAddOutlined';
import {Box, Typography, Button, Link, List, ListItem, ListItemText} from "@mui/material";
import {Box, Typography, Button, List, ListItem, ListItemText} from "@mui/material";

import { vars } from "../../theme/variables";
const { gray700, gray500, gray200, brand600 } = vars;
const { gray50, gray700, gray200, brand600 } = vars;

const OrganizationsList = ({organizations, viewJoinButton = true}) => {
const navigate = useNavigate();
console.log("organizations: ", organizations)

return (
<List sx={{
width: '100%',
padding: 0,
'& .MuiListItem-root': {
display: 'flex',
flexDirection: 'column',
alignItems: 'flex-start',
alignItems: 'center',
justifyContent: 'space-between',
marginBottom: '0.75rem',
padding: '1.5rem',
gap: '1rem',
borderBottom: `1px solid ${gray200}`,
position: 'relative',
borderRadius: "0.5rem",
'&:hover': {
cursor: 'pointer',
backgroundColor: gray50,
'& .join-button': {
display: 'inline-flex',
visibility: 'visible'
},
'& .MuiListItemText-root': {
position: 'relative',
Expand All @@ -50,59 +52,42 @@ const OrganizationsList = ({organizations, viewJoinButton = true}) => {
},
'& .MuiListItemText-root': {
margin: 0,
display: 'flex',
flexDirection: 'column',
gap: '1rem',
width: '100%',
'& .MuiListItemText-primary': {
'& .MuiTypography-root': {
color: gray700,
fontSize: '1.25rem',
fontWeight: 500
},
'& .MuiLink-root': {
textDecoration: 'none',
color: gray500,
fontSize: '1.125rem',
fontWeight: 500,
lineHeight: "1.875rem"
}
},
'& .MuiListItemText-secondary': {
color: gray500,
fontSize: '0.875rem',
fontWeight: 400,
}
}
}}>
{organizations.length > 0 ? (
organizations?.map((organization, index) => (
<ListItem key={index} onClick={() => navigate(`/organizations/${organization.name}`)}>
<Box display='flex' alignItems='center' justifyContent='space-between' width={1}>
<img src={organization.logo} alt={organization.name} />
<ListItem key={index} onClick={() => navigate(`/organizations/${organization}`)}>
<ListItemText
primary={
<Box display='flex' alignItems='center' justifyContent='space-between'>
<Typography component='span'>{organization}</Typography>
</Box>
}
/>
<Box display='flex' alignItems='center' justifyContent='space-between'>
{
viewJoinButton && <Button
variant="outlined"
className="join-button"
onClick={() => navigate(`/organizations/${organization.name}`)}
onClick={() => navigate(`/organizations/${organization}`)}
startIcon={<PersonAddOutlinedIcon />}
sx={{
display: 'none',
visibility: 'hidden',
width: 1
}}
>
Join organization
</Button>
}
</Box>
<ListItemText primary={
<Box display='flex' alignItems='center' justifyContent='space-between'>
<Typography component='span'>{organization.name}</Typography>
{organization.link && (
<Link href={organization.link} display='flex'>
{organization.link}
</Link>
)}
</Box>
} secondary={organization.description} />
</ListItem>
))
) : (
Expand Down
6 changes: 3 additions & 3 deletions src/components/organizations/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { GlobalDataContext } from "../../contexts/DataContext";
import MessageDialog from "../common/MessageDialog";

import { vars } from "../../theme/variables";
const { gray700 } = vars;
const { gray600 } = vars;


const Organizations = () => {
Expand Down Expand Up @@ -41,10 +41,10 @@ const Organizations = () => {
return (
<Box p='2.25rem 5rem' flexGrow={1} overflow='auto'>
<Stack direction="row" sx={{ justifyContent: "space-between" }}>
<Typography fontSize='1.5rem' color={gray700} fontWeight={600} mb='1.5rem'>
<Typography fontSize='1.5rem' color={gray600} fontWeight={600} mb='1.5rem'>
{organizations?.length} Organizations
</Typography>
{Object.keys(user).length !== 0 && <Button type="string" startIcon={<GroupAddOutlinedIcon />} onClick={handleCreateOrganization}>Create a new organization</Button>}
{(user && user?.groupname) && <Button type="string" startIcon={<GroupAddOutlinedIcon />} onClick={handleCreateOrganization}>Create a new organization</Button>}
</Stack>
<OrganizationsList organizations={organizations} />
{message && (
Expand Down