Merge pull request #637 from NASA-IMPACT/develop

Production update - Jun 11th
NASA-IMPACT · Jun 11, 2024 · b5cd36b · b5cd36b
2 parents a015f1b + 8230c5a
commit b5cd36b
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 32 deletions.
diff --git a/gatsby-node.js b/gatsby-node.js
@@ -165,7 +165,11 @@ exports.sourceNodes = async ({ actions, createContentDigest }) => {
       campaign_count: "campaigns",
     }
 
-    let responses = await Promise.all(endpoints.map(key => fetchData(key)))
+    const responses = []
+    for (const key of endpoints) {
+      const response = await fetchData(key)
+      responses.push(response)
+    }
 
     responses.forEach(response => {
       if (response.success) {

diff --git a/src/components/__tests__/__snapshots__/card.test.js.snap b/src/components/__tests__/__snapshots__/card.test.js.snap
@@ -9,7 +9,7 @@ exports[`Card renders card with tag 1`] = `
     data-cy="campaigns-card"
   >
     <div
-      className="card__CardHeader-sc-16fz0z7-0 lmhbIy"
+      className="card__CardHeader-sc-16fz0z7-0 gbZyqC"
     >
       <div
         className="card___StyledDiv2-sc-16fz0z7-4 cPSZeM"
@@ -33,12 +33,6 @@ exports[`Card renders card with tag 1`] = `
           </g>
         </svg>
       </div>
-      <div
-        className="card___StyledDiv3-sc-16fz0z7-5 hcAeMi"
-        data-cy="stationary-tag"
-      >
-        Stationary
-      </div>
     </div>
     <div>
       <big
@@ -58,6 +52,12 @@ exports[`Card renders card with tag 1`] = `
         description....
       </p>
     </div>
+    <div
+      className="card___StyledDiv3-sc-16fz0z7-5 hugbRo"
+      data-cy="stationary-tag"
+    >
+      Stationary
+    </div>
   </a>
 </div>
 `;
@@ -71,7 +71,7 @@ exports[`Card renders plain card 1`] = `
     data-cy="campaigns-card"
   >
     <div
-      className="card__CardHeader-sc-16fz0z7-0 lmhbIy"
+      className="card__CardHeader-sc-16fz0z7-0 gbZyqC"
     >
       <div
         className="card___StyledDiv2-sc-16fz0z7-4 cPSZeM"
@@ -127,7 +127,7 @@ exports[`Card renders with footer list 1`] = `
     data-cy="campaigns-card"
   >
     <div
-      className="card__CardHeader-sc-16fz0z7-0 lmhbIy"
+      className="card__CardHeader-sc-16fz0z7-0 gbZyqC"
     >
       <div
         className="card___StyledDiv2-sc-16fz0z7-4 cPSZeM"

diff --git a/src/components/cards/card.js b/src/components/cards/card.js
@@ -15,6 +15,7 @@ const CardHeader = styled.div`
   justify-items: ${({ imagePosition }) =>
     imagePosition === "left top" ? "flex-start" : "center"};
   min-height: 180px;
+  margin-bottom: 0.5rem;
 `
 
 const Card = ({
@@ -77,27 +78,26 @@ const Card = ({
             <Placeholder size="medium" color={colors[mode].text} />
           </div>
         )}
-        {tag && (
-          <div
-            css={`
-               {
-                grid-area: 1 / 1;
-                align-self: flex-end;
-                justify-self: flex-start;
-                text-transform: uppercase;
-                border: 1px solid;
-                padding: 0.25rem;
-                margin: 1rem 0;
-                background-color: ${colors[mode].background};
-              }
-            `}
-            data-cy={`${tag.toLowerCase()}-tag`}
-          >
-            {tag}
-          </div>
-        )}
       </CardHeader>
       {children}
+      {tag && (
+        <div
+          css={`
+             {
+              grid-area: 1 / 1;
+              display: inline-block;
+              text-transform: uppercase;
+              border: 1px solid;
+              padding: 0.25rem;
+              margin: 1rem 0;
+              background-color: ${colors[mode].background};
+            }
+          `}
+          data-cy={`${tag.toLowerCase()}-tag`}
+        >
+          {tag}
+        </div>
+      )}
     </Link>
     {footerList && (
       <div

diff --git a/src/components/timeline/map.js b/src/components/timeline/map.js
@@ -206,7 +206,7 @@ export const MapLegend = ({
               }
             />
             <LegendText checked={selectedPlatforms.includes(platform.name)}>
-              {["Jet", "Prop", "UAV"].includes(platform.type) ? (
+              {["Jet", "Prop", "UAV", "Ships/Boats"].includes(platform.type) ? (
                 <LineIcon color="#1B9E77" size="text" />
               ) : (
                 <CircleIcon color="#E8E845" size="extra-tiny" />

diff --git a/src/templates/campaign/__tests__/__snapshots__/platform-section.test.js.snap b/src/templates/campaign/__tests__/__snapshots__/platform-section.test.js.snap
@@ -63,7 +63,7 @@ exports[`Platform Section displays content 1`] = `
               href="/platform/J-31"
             >
               <div
-                className="card__CardHeader-sc-16fz0z7-0 lmhbIy"
+                className="card__CardHeader-sc-16fz0z7-0 gbZyqC"
               >
                 <div
                   className="card___StyledDiv2-sc-16fz0z7-4 cPSZeM"
@@ -250,7 +250,7 @@ exports[`Platform Section displays content 1`] = `
               href="/platform/Aerosonde"
             >
               <div
-                className="card__CardHeader-sc-16fz0z7-0 lmhbIy"
+                className="card__CardHeader-sc-16fz0z7-0 gbZyqC"
               >
                 <div
                   className="card___StyledDiv2-sc-16fz0z7-4 cPSZeM"