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.

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

Refactor new layout: responsive course card #1188

Merged
merged 4 commits into from
May 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions frontend/components/BorderedSection.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { PropsWithChildren } from "react"

import { PropsOf } from "@emotion/react"
import { styled } from "@mui/material/styles"

const BorderedSectionBase = styled("div")`
Expand Down Expand Up @@ -52,8 +53,6 @@ const BorderedSectionBase = styled("div")`
}
`

type PropsOf<T> = T extends React.ComponentType<infer P> ? P : never

function BorderedSection({
title,
children,
Expand Down
4 changes: 2 additions & 2 deletions frontend/components/Breadcrumbs.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ const BreadcrumbLinkBase = css`
`

const BreadcrumbLink = styled(Link)`
${BreadcrumbLinkBase}
${BreadcrumbLinkBase.styles}
`

const BreadcrumbNonLink = styled("div")`
${BreadcrumbLinkBase}
${BreadcrumbLinkBase.styles}
`

const BreadcrumbComponent: React.FunctionComponent<Breadcrumb> = ({
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/CourseImage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const ImageComponentBase = css`
`

const PlaceholderComponent = styled("div")`
${ImageComponentBase}
${ImageComponentBase.styles}
background-color: #F0F0F0;
display: flex;
justify-content: center;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@ import { Checkbox, FormControlLabel } from "@mui/material"
import { styled } from "@mui/material/styles"

import { ControlledFieldProps } from "."
import { InfoTooltipWithLabel } from "/components/Tooltip"
import { InfoTooltip } from "/components/Tooltip"
import { useAnchor } from "/hooks/useAnchors"

const AlignedSpan = styled("span")`
display: flex;
align-items: flex-end;
gap: 0.5rem;
`

interface ControlledCheckboxProps<
TFieldValues extends FieldValues = FieldValues,
> extends ControlledFieldProps<TFieldValues> {
Expand All @@ -26,7 +27,7 @@ const ControlledCheckboxLabel = React.memo(
return (
<AlignedSpan>
{label}
{tip && <InfoTooltipWithLabel label={label} title={tip} />}
{tip && <InfoTooltip label={label} title={tip} />}
</AlignedSpan>
)
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { ControlledFieldProps } from "."
import { pulseAnimation } from ".."
import { useCourseEditorData } from "../../Course/CourseEditorDataContext"
import RevertButton from "/components/RevertButton"
import { InfoTooltipWithLabel } from "/components/Tooltip"
import { InfoTooltip } from "/components/Tooltip"
import { useAnchor } from "/hooks/useAnchors"

const TextFieldContainer = styled("div")`
Expand Down Expand Up @@ -88,7 +88,7 @@ function ControlledTextFieldComponent<
onRevert={onRevert}
/>
)}
{tip && <InfoTooltipWithLabel label={label} title={tip} />}
{tip && <InfoTooltip label={label} title={tip} />}
</InputAdornment>
) : null,
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { useEventCallback } from "@mui/material/utils"
import { useCourseEditorData } from "./CourseEditorDataContext"
import { CourseFormValues } from "./types"
import RevertButton from "/components/RevertButton"
import { InfoTooltipWithLabel } from "/components/Tooltip"
import { InfoTooltip } from "/components/Tooltip"
import { useAnchor } from "/hooks/useAnchors"
import { useTranslator } from "/hooks/useTranslator"
import CommonTranslations from "/translations/common"
Expand Down Expand Up @@ -134,7 +134,7 @@ function CourseInstanceLanguageSelector(
}
onRevert={onRevert}
/>
<InfoTooltipWithLabel
<InfoTooltip
label={t("courseInstanceLanguage")}
title={t("helpCourseInstanceLanguage")}
/>
Expand Down
4 changes: 2 additions & 2 deletions frontend/components/Dashboard/StudyModules/ModuleCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ const ImageBackgroundBase = css`
`

const ImageBackground = styled(LoaderImage)`
${ImageBackgroundBase};
${ImageBackgroundBase.styles};
object-fit: cover;
`

const ImageBackgroundSkeleton = styled("span")`
${ImageBackgroundBase}
${ImageBackgroundBase.styles}
`

const IconBackground = styled("span")`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { PropsWithChildren, useMemo } from "react"
import { merge } from "lodash"
import { MaterialReactTableProps, MRT_ColumnDef } from "material-react-table"

import { PropsOf } from "@emotion/react"
import CheckIcon from "@fortawesome/fontawesome-free/svgs/solid/check.svg?icon"
import XMarkIcon from "@fortawesome/fontawesome-free/svgs/solid/xmark.svg?icon"
import HelpIcon from "@mui/icons-material/HelpOutlineOutlined"
Expand Down Expand Up @@ -82,8 +83,6 @@ export const NarrowCellBase = styled("div")`
padding-right: 1rem;
`

type PropsOf<T> = T extends React.ComponentType<infer P> ? P : never

const TooltipWrapper = styled("div")`
margin-left: auto;
padding: 0 0.5rem;
Expand Down
6 changes: 3 additions & 3 deletions frontend/components/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ const IconBaseStyle = css`
`

const TwitterIcon = styled(Twitter)`
${IconBaseStyle};
${IconBaseStyle.styles};
`

const FacebookIcon = styled(Facebook)`
${IconBaseStyle};
${IconBaseStyle.styles};
`

const YoutubeIcon = styled(Youtube)`
${IconBaseStyle};
${IconBaseStyle.styles};
`

const FooterBar = styled("footer")`
Expand Down
9 changes: 4 additions & 5 deletions frontend/components/NewLayout/Common/Card/index.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import Image from "next/image"

import { Typography, TypographyProps } from "@mui/material"
import { css } from "@mui/material/styles"
import { styled } from "@mui/material/styles"
import { css, styled } from "@mui/material/styles"

export const CardWrapper = styled("div")`
border-radius: 4px;
Expand Down Expand Up @@ -87,7 +86,7 @@ export const CardHeaderBackground = styled("span", {
typeof prop !== "string" ||
!["color", "image", "hue", "brightness"].includes(prop),
})<CardHeaderBackgroundProps>`
${CommonHeaderBackground};
${CommonHeaderBackground.styles};
background-size: cover;
${({ color, image }) => {
if (!color && !image) {
Expand All @@ -114,7 +113,7 @@ export const CardImageHeaderBackground = styled(Image, {
shouldForwardProp: (prop) =>
typeof prop !== "string" || !["color", "hue", "brightness"].includes(prop),
})<Omit<CardHeaderBackgroundProps, "image">>`
${CommonHeaderBackground};
${CommonHeaderBackground.styles};
width: 100%;
height: 100%;
object-fit: cover;
Expand All @@ -129,6 +128,6 @@ CardImageHeaderBackground.defaultProps = {
}

export const CardHeaderBackgroundSkeleton = styled("span")`
${CommonHeaderBackground};
${CommonHeaderBackground.styles};
background-color: #aaa;
`
Loading