Merge branch 'feature/cfa-projects-list' into feature/single-project-…

…page
CodeForAfrica · Sep 28, 2023 · 7830c9b · 7830c9b
2 parents be7a361 + 39e7f3e
commit 7830c9b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/apps/codeforafrica/src/components/ProjectCard/ProjectCard.js b/apps/codeforafrica/src/components/ProjectCard/ProjectCard.js
@@ -31,7 +31,6 @@ const ProjectActionArea = styled(CardActionArea, {
 
 const ProjectCard = React.forwardRef(function ProjectCard(props, ref) {
   const {
-    externalLink,
     link: { href },
     icon,
     name,

diff --git a/apps/codeforafrica/src/components/ProjectPageHeader/ProjectPageHeader.js b/apps/codeforafrica/src/components/ProjectPageHeader/ProjectPageHeader.js
@@ -60,7 +60,7 @@ const ProjectTitle = styled(RichTypography, {
 const ProjectPageHeader = React.forwardRef(
   function ProjectPageHeader(props, ref) {
     const {
-      externalLink,
+      externalLink: { href },
       icon,
       name,
       subtitle,
@@ -133,8 +133,8 @@ const ProjectPageHeader = React.forwardRef(
               </CardContent>
               <CardActions sx={{ mt: 2, p: 0 }}>
                 <Button
-                  href={externalLink}
-                  component={externalLink ? Link : undefined}
+                  href={href}
+                  component={href ? Link : undefined}
                   endIcon={
                     <SvgIcon
                       component={ExternalLinkIcon}

diff --git a/apps/codeforafrica/src/components/ProjectPageHeader/ProjectPageHeader.snap.js b/apps/codeforafrica/src/components/ProjectPageHeader/ProjectPageHeader.snap.js
@@ -111,10 +111,12 @@ exports[`<ProjectPageHeader /> renders unchanged 1`] = `
           <div
             class="MuiCardActions-root MuiCardActions-spacing css-1jzc3k6-MuiCardActions-root"
           >
-            <button
-              class="MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium css-12dqrmj-MuiButtonBase-root-MuiButton-root"
+            <a
+              class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways MuiButtonBase-root MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium MuiButton-root MuiButton-contained MuiButton-containedPrimary MuiButton-sizeMedium MuiButton-containedSizeMedium active css-15w6lcd-MuiTypography-root-MuiLink-root-MuiButtonBase-root-MuiButton-root"
+              href="https://codeforafrica.org"
+              rel="noreferrer noopener"
               tabindex="0"
-              type="button"
+              target="_blank"
             >
               Launch Project
               <span
@@ -127,7 +129,7 @@ exports[`<ProjectPageHeader /> renders unchanged 1`] = `
                   viewbox="0 0 24 24"
                 />
               </span>
-            </button>
+            </a>
           </div>
         </div>
       </div>

diff --git a/apps/codeforafrica/src/components/ProjectPageHeader/ProjectPageHeader.test.js b/apps/codeforafrica/src/components/ProjectPageHeader/ProjectPageHeader.test.js
@@ -11,6 +11,7 @@ const render = createRender({ theme });
 const defaultProps = {
   href: "/projects/test-project",
   tag: "Iniatives",
+  externalLink: { href: "https://codeforafrica.org" },
 };
 
 describe("<ProjectPageHeader />", () => {

diff --git a/apps/codeforafrica/src/payload/collections/Projects.js b/apps/codeforafrica/src/payload/collections/Projects.js
@@ -41,7 +41,7 @@ const Projects = {
     {
       name: "tagLine",
       label: {
-        en: "Tag Line",
+        en: "Tagline",
       },
       type: "text",
     },
@@ -52,7 +52,7 @@ const Projects = {
         position: "sidebar",
       },
     }),
-    linkGroup({ overrides: { name: "externalLink", label: "External Link" } }),
+    linkGroup({ overrides: { name: "externalLink", label: "Link" } }),
     image({
       overrides: {
         label: {
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,7 +31,6 @@ const ProjectActionArea = styled(CardActionArea, { @@
     const ProjectCard = React.forwardRef(function ProjectCard(props, ref) {
       const {
-        externalLink,
         link: { href },
         icon,
         name,
@@ Expand Down @@