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

Merge dev into production #2760

Merged
merged 2 commits into from
Apr 17, 2024
+53 −30
Merged

Merge dev into production #2760

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
554e9f1
Fix google/seo indexing and a11y of "what is starknet"
igalst Apr 15, 2024
36014ef
Merge pull request #2759 from starknet-io/fix-indexing-and-q11y-of-wh…
igalst Apr 15, 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
50 changes: 35 additions & 15 deletions workspaces/website/src/blocks/VideoSectionBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import { Box, Show } from "@chakra-ui/react";
import {
VideoSectionBlock as VideoSectionProps,
ChapterInfo
ChapterInfo,
} from "@starknet-io/cms-data/src/pages";

import { CategoryTabs } from "@ui/CategoryTabs/CategoryTabs";
Expand All @@ -30,15 +30,19 @@ export default function VideoSectionBlock(props: VideoSectionProps) {

const normalizedPlaylist = useMemo(() => {
return playlist.map((chapter) => {
const chapterInfo = props[chapter.id as keyof VideoSectionProps] as ChapterInfo;
return ({
const chapterInfo = props[
chapter.id as keyof VideoSectionProps
] as ChapterInfo;
return {
...chapter,
...chapterInfo
}) as ChapterType;
...chapterInfo,
} as ChapterType;
});
}, [props, playlist])
}, [props, playlist]);

const [currentChapter, setCurrentChapter] = useState<ChapterType>(normalizedPlaylist[0]);
const [currentChapter, setCurrentChapter] = useState<ChapterType>(
normalizedPlaylist[0]
);

return (
<Box>
Expand All @@ -54,18 +58,25 @@ export default function VideoSectionBlock(props: VideoSectionProps) {
<VideoPlayerWebsite
chapters={normalizedPlaylist}
currentChapter={currentChapter}
onChapterChange={(id) =>
setCurrentChapter(normalizedPlaylist.find((p) => p.id === id) ?? normalizedPlaylist[0])
onChapterChange={(id) =>
setCurrentChapter(
normalizedPlaylist.find((p) => p.id === id) ?? normalizedPlaylist[0]
)
}
playlistOnBottom={playlistOnBottom}
/>

<Box marginTop={{ base: "32px", lg: !playlistOnBottom ? "64px" : "32px" }}>
<Show above="lg">
<Box
marginTop={{ base: "32px", lg: !playlistOnBottom ? "64px" : "32px" }}
>
<Show above="lg">
<CategoryTabs
currentChapter={currentChapter}
onChapterChange={(id) =>
setCurrentChapter(normalizedPlaylist.find((p) => p.id === id) ?? normalizedPlaylist[0])
onChapterChange={(id) =>
setCurrentChapter(
normalizedPlaylist.find((p) => p.id === id) ??
normalizedPlaylist[0]
)
}
items={normalizedPlaylist.map((p) => ({
id: p.id,
Expand All @@ -77,9 +88,18 @@ export default function VideoSectionBlock(props: VideoSectionProps) {
<Box
maxW={chapterDescriptionFullWidth ? "100%" : "656px"}
marginInline="auto"
marginTop={'32px'}
marginTop={"32px"}
>
<MarkdownBlock body={currentChapter.content} />
{normalizedPlaylist.map((chapter) => (
<Box
role="tabpanel"
hidden={chapter.id !== currentChapter.id}
id={`${chapter.id}-content`}
key={`${chapter.id}-content`}
>
<MarkdownBlock body={chapter.content} />
</Box>
))}
</Box>
</Box>
</Box>
Expand Down
33 changes: 18 additions & 15 deletions workspaces/website/src/components/CategoryTabs/CategoryTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

/**
* Module dependencies
*/
Expand Down Expand Up @@ -35,7 +34,6 @@ export const CategoryTabs = ({
currentChapter,
onChapterChange,
}: CategoryTabsProps) => {

return (
<Box
borderTopWidth="1px"
Expand All @@ -48,22 +46,27 @@ export const CategoryTabs = ({
sx={{ overflowX: "auto" }}
gap="24px"
width="100%"
padding={'0 24px'}
padding={"0 24px"}
role="tablist"
aria-orientation="horizontal"
>
{items.map((item, index) => {
return (
<Box key={item.label + index}>
<Button
as={item.link ? "a" : "button"}
href={item.link}
isActive={item.id === currentChapter.id}
onClick={() => onChapterChange(item.id)}
variant="category"
padding={'24px 12px'}
>
{item.label}
</Button>
</Box>
<Button
id={item.id}
key={item.id}
role="tab"
aria-selected={item.id === currentChapter.id}
aria-controls={`${item.id}-content`}
as={item.link ? "a" : "button"}
href={item.link}
isActive={item.id === currentChapter.id}
onClick={() => onChapterChange(item.id)}
variant="category"
padding={"24px 12px"}
>
{item.label}
</Button>
);
})}
</Flex>
Expand Down
Loading