Merge branch 'main' into FSU-415-add-testimonial-slider-to-about-page

non-profit-dev · May 6, 2024 · dba7b14 · dba7b14
2 parents 41d019d + 5d00206
commit dba7b14
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/packages/design-system/components/scrollButton/ScrollButton.jsx b/packages/design-system/components/scrollButton/ScrollButton.jsx
@@ -29,12 +29,13 @@ ScrollButton.propTypes = {
   /**
    * It's used to provide a text description for assistive technologies, like screen readers.
    */
-  ariaLabel: string.isRequired,
+  ariaLabel: string,
   className: string,
 }
 
 ScrollButton.defaultProps = {
   className: null,
+  ariaLabel: "Przejdź do kolejnej sekcji",
 }
 
 export default ScrollButton
diff --git a/packages/design-system/patterns/tabs/Tabs.jsx b/packages/design-system/patterns/tabs/Tabs.jsx
@@ -48,7 +48,7 @@ const Tabs = ({ data, id, transparentContent, className }) => {
             active={index === activeIndex}
             aria-selected={index === activeIndex}
             aria-controls={`${convertToSlug(id)}-${convertToSlug(tab)}`}
-            id={convertToSlug(tab)}
+            id={`${convertToSlug(id)}-${convertToSlug(tab)}`}
             onClick={() => setActiveIndex(index)}
             borderBottom={transparentContent || activeIndex !== index}
             transparentContent={transparentContent}

diff --git a/packages/frontend/app/templates/Animal/Animal.jsx b/packages/frontend/app/templates/Animal/Animal.jsx
@@ -59,7 +59,7 @@ const Animal = ({ data, otherAnimals }) => (
           <Typography variant="h3">
             Sprawdź, kto jeszcze czeka na miłość
           </Typography>
-          <ScrollButton sectionId="other-animals" />
+          <ScrollButton sectionId="inne-do-adopcji" />
         </Styled.ScrollContainer>
       </Container>
 

diff --git a/packages/frontend/app/templates/Animal/components/OtherAnimals/OtherAnimals.jsx b/packages/frontend/app/templates/Animal/components/OtherAnimals/OtherAnimals.jsx
@@ -11,7 +11,7 @@ import * as Styled from "./OtherAnimals.styled"
 
 const OtherAnimals = ({ data }) => (
   <Styled.Wrapper>
-    <Container id="other-animals">
+    <Container id="inne-do-adopcji">
       <Styled.ContentContainer>
         <TextBanner
           heading="Czekają na nowy dom"

diff --git a/packages/frontend/app/templates/FoundationBackstage/components/TeamCardList/TeamCardList.jsx b/packages/frontend/app/templates/FoundationBackstage/components/TeamCardList/TeamCardList.jsx
@@ -3,19 +3,16 @@ import Typography from "design-system/components/typography"
 import { teamData } from "./teamData"
 import * as Styled from "./TeamCardList.styled"
 
-const CardList = () => (
-  <Styled.TeamCardContainer>
-    {Object.entries(teamData).map(([category, { title, members }]) => (
-      <>
-        <Typography variant="h3">{title}</Typography>
-        <Styled.Wrapper key={category}>
-          {members.map((member) => (
-            <TeamCard key={member.name} member={member} />
-          ))}
-        </Styled.Wrapper>
-      </>
-    ))}
-  </Styled.TeamCardContainer>
-)
+const CardList = () =>
+  Object.entries(teamData).map(([category, { title, members }]) => (
+    <Styled.TeamCardContainer key={category}>
+      <Typography variant="h3">{title}</Typography>
+      <Styled.Wrapper>
+        {members.map((member) => (
+          <TeamCard key={member.name} member={member} />
+        ))}
+      </Styled.Wrapper>
+    </Styled.TeamCardContainer>
+  ))
 
 export default CardList