Skip to content

units page fixes #1083

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
merged 4 commits into from
Jun 17, 2024
Merged

units page fixes #1083

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
03b42e8
update background color to lightGray1
gumaerc Jun 13, 2024
4bbb5c0
use Card and not MuiCard
gumaerc Jun 13, 2024
1216a43
remove link={true} property on Card
gumaerc Jun 14, 2024
4f2a270
style the cards on the units listing page with height: 100% so that t…
gumaerc Jun 14, 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: 46 additions & 46 deletions frontends/mit-open/src/pages/UnitsListingPage/UnitsListingPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ import {
} from "api/hooks/learningResources"
import {
Banner,
MuiCard,
CardContent,
Card,
Container,
Link,
Skeleton,
Typography,
styled,
Expand Down Expand Up @@ -55,7 +53,7 @@ const sortUnits = (
}

const Page = styled.div(({ theme }) => ({
backgroundColor: theme.custom.colors.white,
backgroundColor: theme.custom.colors.lightGray1,
}))

const PageContent = styled.div(({ theme }) => ({
Expand Down Expand Up @@ -93,6 +91,10 @@ const PageHeaderText = styled(Typography)(({ theme }) => ({
...theme.typography.subtitle1,
}))

const CardStyled = styled(Card)({
height: "100%",
})

const UnitContainer = styled.div(({ theme }) => ({
display: "flex",
flexDirection: "column",
Expand Down Expand Up @@ -149,23 +151,15 @@ const GridContainer = styled.div(({ theme }) => ({
},
}))

const UnitCardContainer = styled(MuiCard)({
const UnitCardContainer = styled.div({
display: "flex",
flexDirection: "column",
alignItems: "center",
padding: "16px",
height: "100%",
})

const UnitCardLink = styled(Link)({
display: "flex",
flexDirection: "column",
alignItems: "center",
flexGrow: 1,
"&:hover": {
textDecoration: "none",
},
})

const UnitCardContent = styled(CardContent)({
const UnitCardContent = styled.div({
display: "flex",
flexDirection: "column",
flexGrow: 1,
Expand Down Expand Up @@ -318,41 +312,47 @@ const UnitCard: React.FC<UnitCardProps> = (props) => {
return channelDetailQuery.isLoading ? (
<UnitCardLoading />
) : (
<UnitCardContainer>
<UnitCardLink href={unitUrl}>
<UnitCardContent>
<LogoContainer>
<UnitLogo src={logo} alt={unit.name} />
</LogoContainer>
<ValuePropContainer>
<ValuePropText>{unit.value_prop}</ValuePropText>
</ValuePropContainer>
<CountsTextContainer>
<CountsText data-testid={`course-count-${unit.code}`}>
{courseCount > 0 ? `Courses: ${courseCount}` : ""}
</CountsText>
<CountsText data-testid={`program-count-${unit.code}`}>
{programCount > 0 ? `Programs: ${programCount}` : ""}
</CountsText>
</CountsTextContainer>
</UnitCardContent>
</UnitCardLink>
</UnitCardContainer>
<CardStyled href={unitUrl}>
<Card.Content>
<UnitCardContainer>
<UnitCardContent>
<LogoContainer>
<UnitLogo src={logo} alt={unit.name} />
</LogoContainer>
<ValuePropContainer>
<ValuePropText>{unit.value_prop}</ValuePropText>
</ValuePropContainer>
<CountsTextContainer>
<CountsText data-testid={`course-count-${unit.code}`}>
{courseCount > 0 ? `Courses: ${courseCount}` : ""}
</CountsText>
<CountsText data-testid={`program-count-${unit.code}`}>
{programCount > 0 ? `Programs: ${programCount}` : ""}
</CountsText>
</CountsTextContainer>
</UnitCardContent>
</UnitCardContainer>
</Card.Content>
</CardStyled>
)
}

const UnitCardLoading = () => {
return (
<UnitCardContainer>
<UnitCardContent>
<LogoContainer>
<Skeleton variant="rectangular" width={500} height={50} />
</LogoContainer>
<ValuePropContainer>
<Skeleton variant="text" width={500} height={200} />
</ValuePropContainer>
</UnitCardContent>
</UnitCardContainer>
<Card>
<Card.Content>
<UnitCardContainer>
<UnitCardContent>
<LogoContainer>
<Skeleton variant="rectangular" width={500} height={50} />
</LogoContainer>
<ValuePropContainer>
<Skeleton variant="text" width={500} height={200} />
</ValuePropContainer>
</UnitCardContent>
</UnitCardContainer>
</Card.Content>
</Card>
)
}

Expand Down