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

Update/layout fixes #55

Merged
merged 4 commits into from
Jun 12, 2023
Merged

Update/layout fixes #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da25318
add back margin to list
Woozl Jun 8, 2023
9c223b0
add divider to /collaborations sections
Woozl Jun 8, 2023
b3169c9
link to page on whole person card, adjust spacing of name/title
Woozl Jun 8, 2023
3a48452
fix cramped people page cramped layout, image too large on small screens
Woozl Jun 8, 2023
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
35 changes: 22 additions & 13 deletions components/layout/text-image-section/text-image-section.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,34 @@ import { Box, Stack } from '@mui/material'
import Image from 'next/image'
import PropTypes from 'prop-types'

export const TextImageSection = ({ imageUrl, imageHeight, imageWidth, children }) => (
export const TextImageSection = ({ imageUrl, imageHeight, imageWidth, imageAlt, children, imageAspectRatio, rounded }) => (
<Stack
direction={{ sm: 'column', md: 'row' }}
spacing={{ sm: 2, md: 6 }}
direction={{ xs: 'column', sm: 'row' }}
spacing={{ xs: 2, sm: 6 }}
sx={{
marginY: '3rem',
}}
>
{imageUrl && <Box sx={{
flex: {
sm: '0 0',
md: `0 0 ${255 / 16}rem`
xs: '0 0',
sm: `0 0 ${255 / 16}rem`
},
}}>
<Image
priority
src={imageUrl}
width={imageWidth}
height={imageHeight}
layout="responsive"
objectFit='contain'
/>
<Box sx={{
aspectRatio: imageAspectRatio,
...(rounded && { borderRadius: '50%', overflow: 'hidden' })
}}>
<Image
priority
src={imageUrl}
alt={imageAlt}
width={imageWidth}
height={imageHeight}
layout="responsive"
objectFit='cover'
/>
</Box>
</Box>}
<Box sx={{ flex: '1' }}>
{children}
Expand All @@ -35,5 +41,8 @@ TextImageSection.propTypes = {
imageUrl: PropTypes.string,
imageHeight: PropTypes.number,
imageWidth: PropTypes.number,
imageAlt: PropTypes.string,
imageAspectRatio: PropTypes.string,
rounded: PropTypes.bool,
children: PropTypes.node.isRequired,
}
90 changes: 51 additions & 39 deletions components/people/person-card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,48 +1,60 @@
import React from 'react'
import PropTypes from 'prop-types'
import { Card, CardMedia, CardContent, Typography } from '@mui/material'
import { Link } from '../link'
import avatar from '../../images/generic-avatar.svg'
import { useTheme } from '@emotion/react'
import React from "react";
import PropTypes from "prop-types";
import { Card, CardMedia, CardContent, Typography, Box } from "@mui/material";
import { Link } from "../link";
import avatar from "../../images/generic-avatar.svg";
import { useTheme } from "@emotion/react";

export const PersonCard = ({ person, showTitle = false, anchorName }) => {
const theme = useTheme();

return (
<Card elevation={ 0 } name={ anchorName } sx={{
display: 'flex',
flexDirection: 'column',
<Card
elevation={0}
name={anchorName}
sx={{
"& a": { textDecoration: "none" },
}}
>
<Link to={`/people/${person.slug}`}>
<Box sx={{
display: "flex",
flexDirection: "column",
[theme.breakpoints.down("sm")]: {
flexDirection: "row",
alignItems: "center",
},
}}>
<CardMedia
component="img"
sx={{
aspectRatio: "1 / 1",
borderRadius: "50%",

[theme.breakpoints.down('sm')]: {
flexDirection: 'row',
alignItems: 'center'
}
}}>
<CardMedia
component="img"
sx={{
aspectRatio: '1 / 1',
borderRadius: '50%',
[theme.breakpoints.down("sm")]: {
width: 100,
},
}}
image={person.photoURL ? person.photoURL : avatar.src}
alt={`${person.firstName} ${person.lastName} photo`}
/>

[theme.breakpoints.down('sm')]: {
width: 100,
}
}}
image={ person.photoURL ? person.photoURL : avatar.src }
alt={ `${person.firstName} ${person.lastName} photo` }
/>
<CardContent sx={{ display: "flex", flexDirection: "column" }}>
<Typography mb={0.5} sx={{ textDecoration: "underline" }}>
{person.firstName} {person.lastName}
</Typography>

<CardContent sx={{ display: 'flex', flexDirection: 'column' }}>
<Link to={ `/people/${ person.slug }` }>
{ person.firstName } { person.lastName }
</Link>
{ showTitle && person.title && (
<Typography variant='caption'>{ person.title }</Typography>
)}
</CardContent>
</Card>
)
}
{showTitle && person.title && (
<Typography variant="caption" sx={{ lineHeight: 1.4 }}>
{person.title}
</Typography>
)}
</CardContent>
</Box>
</Link>
</Card>
);
};

PersonCard.propTypes = {
anchorName: PropTypes.string,
Expand All @@ -54,4 +66,4 @@ PersonCard.propTypes = {
title: PropTypes.string,
photo: PropTypes.object,
}),
}
};
60 changes: 37 additions & 23 deletions pages/collaborations/[id].js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { fetchStrapiCollaboration } from '../../lib/strapi'
import {
Link, Page, PersonCard, PersonGrid, Section, Markdown
} from '../../components'
import { Divider } from '@mui/material'

export default function Collaboration({ collaboration }) {
return (
Expand All @@ -13,36 +14,49 @@ export default function Collaboration({ collaboration }) {
>
{
!collaboration.featuredImage && collaboration.description && (
<Section title="Description">
<Markdown>
{collaboration.description}
</Markdown>
</Section>
<>
<Section title="Description">
<Markdown>
{collaboration.description}
</Markdown>
</Section>
<Divider />
</>
)
}
{
collaboration.role && (
<Section title="RENCI's Role">
<Markdown>
{collaboration.role}
</Markdown>
</Section>
<>
<Section title="RENCI's Role">
<Markdown>
{collaboration.role}
</Markdown>
</Section>
<Divider />
</>
)
}

<Section title="Projects">
<ul style={{ margin: 0 }}>
{
collaboration.projects
.sort((p, q) => p.name.toLowerCase() < q.name.toLowerCase() ? -1 : 1)
.map(project => (
<li key={ `${ collaboration.name }-${ project.name }` }>
<Link to={ `/projects/${ project.slug }` }>{ project.name }</Link>
</li>
))
}
</ul>
</Section>
{
collaboration.projects?.length !== 0 && (
<>
<Section title="Projects">
<ul style={{ margin: 0 }}>
{
collaboration.projects
.sort((p, q) => p.name.toLowerCase() < q.name.toLowerCase() ? -1 : 1)
.map(project => (
<li key={ `${ collaboration.name }-${ project.name }` }>
<Link to={ `/projects/${ project.slug }` }>{ project.name }</Link>
</li>
))
}
</ul>
</Section>
<Divider />
</>
)
}

<Section title="Contributors">
<h3>People</h3>
Expand Down
3 changes: 3 additions & 0 deletions pages/people/[slug].js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ export default function Person({ person }) {
imageUrl={ person.photoURL }
imageWidth={400}
imageHeight={400}
imageAspectRatio={"1 / 1"}
imageAlt={ `Photo of ${ person.firstName } ${ person.lastName }` }
rounded={true}
>
<Typography variant="h1" >
{ person.fullName }
Expand Down
2 changes: 1 addition & 1 deletion pages/teams/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export default function Teams({ teams }) {
Learn more about RENCI&apos;s Operations teams below.
</Typography>

<ul style={{ margin: 0 }}>
<ul>
{
teams.map(team => (
<li key={ `link-to-${ team.name }` }>
Expand Down