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

Jump to bottom

Vulcan: Problem List: Ancestor problem lists #2231

Merged
merged 4 commits into from
Feb 7, 2024
Merged

Vulcan: Problem List: Ancestor problem lists #2231

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
07d72d2
Put together basic grouped version of problems data
Feb 2, 2024
33b55ba
Hook up ancestor Problem data, conditionally render Answers
ianrohde Feb 6, 2024
4f95bc5
Correct wrapper padding breakpoint
ianrohde Feb 7, 2024
35dec8c
Fix answers heading fontSize
ianrohde Feb 7, 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
8 changes: 5 additions & 3 deletions frontend/app/(defaultLayout)/Troubleshooting/[device]/components/Answers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,20 @@ export function Answers({
answers,
allAnswersUrl,
allAnswersCount,
}: TroubleshootingAnswersData) {
hasProblems,
}: TroubleshootingAnswersData & { hasProblems: boolean }) {
const answersData = answers.slice(0, 8); // design calls for 8

return (
<>
<Stack className="answers" spacing={4}>
<Stack spacing={2} pt={6}>
<Heading
as="h3"
as={hasProblems ? 'h4' : 'h3'}
color="gray.800"
fontSize={{ base: '20px', mdPlus: '24px' }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is mdPlus a custom breakpoint we created? I haven't seen it before

Copy link
Contributor Author

@ianrohde ianrohde Feb 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I added it here: https://github.com/iFixit/react-commerce/pull/2143/files#diff-9e3cebe6686b9c7a2c8f51158b777b7f8d7b7bd53fd8a126776adc1e655bf956R7

tl;dr: Chakra uses min-width @media queries, so we need 'md' + 1px

fontWeight="medium"
lineHeight="normal"
lineHeight="115%"
>
Didn&apos;t see your problem? Try one of these answers.
</Heading>
Expand Down
145 changes: 88 additions & 57 deletions frontend/app/(defaultLayout)/Troubleshooting/[device]/components/troubleshootingProblems.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,28 @@ import { NavBar } from './NavBar';
import { Answers } from './Answers';
import { ProblemCard } from './ProblemCard';

import type { TroubleshootingProblemsApiData } from '../hooks/useTroubleshootingProblemsProps';
import type {
TroubleshootingProblemsApiData,
Problems,
} from '../hooks/useTroubleshootingProblemsProps';
import groupBy from 'lodash/groupBy';

export default function TroubleshootingProblems(
TroubleshootingProblems: TroubleshootingProblemsApiData
) {
const {
title,
editUrl,
historyUrl,
deviceUrls,
breadcrumbs,
answers,
allAnswersUrl,
allAnswersCount,
} = TroubleshootingProblems;
const ProblemsData = TroubleshootingProblems.problems.slice(0, 10); // Design calls for 10
export default function TroubleshootingProblems({
editUrl,
historyUrl,
deviceUrls,
breadcrumbs,
answers,
allAnswersUrl,
allAnswersCount,
problems,
}: TroubleshootingProblemsApiData) {
const problemsData = problems.slice(0, 10); // Design calls for 10
const hasProblems = problemsData.length > 0;
const problemsDataGroups: Record<string, Problems[]> = groupBy(
problemsData,
'deviceTitle'
);

return (
<>
Expand All @@ -35,51 +41,76 @@ export default function TroubleshootingProblems(
className="wrapper"
maxWidth="1280px"
mx="auto"
px={{ base: 4, md: 8 }}
pt={{ md: 8 }}
px={{ base: 4, sm: 8 }}
pt={{ sm: 8 }}
pb={8}
>
<Stack as="main" spacing={6}>
<Box className="header">
<Heading
color="gray.800"
fontSize={{ base: '24px', sm: '30px' }}
fontWeight="medium"
lineHeight="115%"
>
Most Common {title} Troubleshooting Problems
</Heading>
<Text mt={2}>
When your {title} runs into issues, it can be a source of
frustration and inconvenience. Never fear &mdash;
we&apos;ve compiled a comprehensive guide to diagnose and
fix the most common problems that can plague your {title}.
</Text>
</Box>
<SimpleGrid
className="problem-list"
columns={{ base: 1, md: 2 }}
spacing={{ base: 4, md: 6 }}
>
{ProblemsData.map((problem: any, index: number) => (
<ProblemCard
key={index}
imageSrcStandard={problem.imageSrcStandard}
imageSrcThumbnail={problem.imageSrcThumbnail}
problemTypeIcon={problem.problemTypeIcon}
problemTitle={problem.problemTitle}
problemUrl={problem.problemUrl}
deviceTitle={problem.deviceTitle}
description={problem.description}
altText={problem.altText}
/>
))}
</SimpleGrid>
<Answers
answers={answers}
allAnswersUrl={allAnswersUrl}
allAnswersCount={allAnswersCount}
/>
{Object.entries(problemsDataGroups).map(
([deviceName, problems]) => {
const title = deviceName;
return (
<>
<Stack className="header" spacing={2}>
<Heading
as="h2"
color="gray.800"
fontSize={{ base: '24px', sm: '30px' }}
fontWeight="medium"
lineHeight="115%"
>
Most Common{' '}
<Box as="span" fontWeight="bold">
{title}
</Box>{' '}
Troubleshooting Problems
</Heading>
<Text>
When your {title} runs into issues, it can be a
source of frustration and inconvenience. Never
fear &mdash; we&apos;ve compiled a
comprehensive guide to diagnose and fix the
most common problems that can plague your{' '}
{title}
</Text>
</Stack>
<SimpleGrid
className="problem-ancestor-list"
columns={{ base: 1, md: 2 }}
spacing={{ base: 4, md: 6 }}
>
{problems.map(
(problem: Problems, index: number) => (
<ProblemCard
key={index}
imageSrcStandard={
problem.imageSrcStandard
}
imageSrcThumbnail={
problem.imageSrcThumbnail
}
problemTypeIcon={problem.problemTypeIcon}
problemTitle={problem.problemTitle}
problemUrl={problem.problemUrl}
deviceTitle={problem.deviceTitle}
description={problem.description}
altText={problem.altText}
/>
)
)}
</SimpleGrid>
</>
);
}
)}
{answers.length > 0 && (
<Answers
answers={answers}
allAnswersUrl={allAnswersUrl}
allAnswersCount={allAnswersCount}
hasProblems={hasProblems}
/>
)}
</Stack>
</Box>
</>
Expand Down
5 changes: 3 additions & 2 deletions ...end/app/(defaultLayout)/Troubleshooting/[device]/hooks/useTroubleshootingProblemsProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ export type TroubleshootingProblemsApiData = {

export type Problems = {
problemTitle: string;
problemUrl: string;
deviceTitle: string;
description: string;
altText: string;
imageSrcLg?: string;
imageSrcThumb?: string;
imageSrcStandard?: string;
imageSrcThumbnail?: string;
problemTypeIcon?: FaIconProps;
badges?: string[];
};
Expand Down
Loading