diff --git a/src/components/common/OrganizationsList.jsx b/src/components/common/OrganizationsList.jsx index 5e961f34..f84b91fa 100644 --- a/src/components/common/OrganizationsList.jsx +++ b/src/components/common/OrganizationsList.jsx @@ -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 ( { }, '& .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) => ( - navigate(`/organizations/${organization.name}`)}> - - {organization.name} + navigate(`/organizations/${organization}`)}> + + {organization} + + } + /> + { viewJoinButton && } - - {organization.name} - {organization.link && ( - - {organization.link} - - )} - - } secondary={organization.description} /> )) ) : ( diff --git a/src/components/organizations/index.jsx b/src/components/organizations/index.jsx index dd301bcd..279cd9b2 100644 --- a/src/components/organizations/index.jsx +++ b/src/components/organizations/index.jsx @@ -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 = () => { @@ -41,10 +41,10 @@ const Organizations = () => { return ( - + {organizations?.length} Organizations - {Object.keys(user).length !== 0 && } + {(user && user?.groupname) && } {message && (