Skip to content

Commit 63131e4

Browse files
willemarcelwillemarcel
authored
Merge pull request #778 from NASA-IMPACT/develop
Production update Oct 1st
2 parents bc105fe + dd4c514 commit 63131e4

File tree

9 files changed

+44
-56
lines changed

9 files changed

+44
-56
lines changed

‎src/components/__tests__/__snapshots__/data-section.test.js.snap‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ exports[`Data Section matches snapshot 1`] = `
3939
.
4040
</p>
4141
<div
42-
className="sc-gsFSXq kJXqwY"
42+
className="sc-kAyceB cmntgn"
4343
>
4444
<div
45-
className="sc-dcJsrY dHXEzq"
45+
className="sc-iGgWBj ffsQLJ"
4646
>
4747
<span
4848
id="Campaigns"
@@ -73,7 +73,7 @@ exports[`Data Section matches snapshot 1`] = `
7373
<span
7474
aria-haspopup="listbox"
7575
aria-labelledby="Campaigns button--Campaigns-listbox"
76-
className="sc-iGgWBj fTSerX"
76+
className="sc-gsFSXq gvpUwd"
7777
data-reach-listbox-button=""
7878
id="button--Campaigns-listbox"
7979
onKeyDown={[Function]}
@@ -93,7 +93,7 @@ exports[`Data Section matches snapshot 1`] = `
9393
</div>
9494
</div>
9595
<div
96-
className="sc-dcJsrY dHXEzq"
96+
className="sc-iGgWBj ffsQLJ"
9797
>
9898
<span
9999
id="Platforms"
@@ -124,7 +124,7 @@ exports[`Data Section matches snapshot 1`] = `
124124
<span
125125
aria-haspopup="listbox"
126126
aria-labelledby="Platforms button--Platforms-listbox"
127-
className="sc-iGgWBj fTSerX"
127+
className="sc-gsFSXq gvpUwd"
128128
data-reach-listbox-button=""
129129
id="button--Platforms-listbox"
130130
onKeyDown={[Function]}
@@ -145,10 +145,10 @@ exports[`Data Section matches snapshot 1`] = `
145145
</div>
146146
</div>
147147
<div
148-
className="sc-kAyceB eXDdVo"
148+
className="sc-imWYAI gofPVd"
149149
>
150150
<div
151-
className="sc-imWYAI hPXUzq"
151+
className="sc-jXbUNg iDdYvM"
152152
data-cy="data-product"
153153
>
154154
<div>
@@ -199,7 +199,7 @@ exports[`Data Section matches snapshot 1`] = `
199199
</div>
200200
</div>
201201
<div
202-
className="sc-imWYAI hPXUzq"
202+
className="sc-jXbUNg iDdYvM"
203203
data-cy="data-product"
204204
>
205205
<div>
@@ -284,7 +284,7 @@ exports[`Data Section matches snapshot 1`] = `
284284
</div>
285285
</div>
286286
<div
287-
className="sc-imWYAI hPXUzq"
287+
className="sc-jXbUNg iDdYvM"
288288
data-cy="data-product"
289289
>
290290
<div>
@@ -335,7 +335,7 @@ exports[`Data Section matches snapshot 1`] = `
335335
</div>
336336
</div>
337337
<div
338-
className="sc-imWYAI hPXUzq"
338+
className="sc-jXbUNg iDdYvM"
339339
data-cy="data-product"
340340
>
341341
<div>
@@ -386,7 +386,7 @@ exports[`Data Section matches snapshot 1`] = `
386386
</div>
387387
</div>
388388
<div
389-
className="sc-imWYAI hPXUzq"
389+
className="sc-jXbUNg iDdYvM"
390390
data-cy="data-product"
391391
>
392392
<div>

‎src/components/header.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { IconButton } from "./button"
1111
import NasaLogoIcon from "../icons/nasa-logo"
1212
import NavList from "./nav"
1313
import UnscrollableBody from "./unscrollable-body"
14+
import SimpleBanner from "./simple-banner"
1415

1516
const reveal = keyframes`
1617
0% {
@@ -184,6 +185,7 @@ const Header = ({ shortname, mode }) => {
184185
return (
185186
<StickyBanner navRevealed={navRevealed}>
186187
<PageHeaderSelf id="main-header" mode={mode}>
188+
<SimpleBanner />
187189
{navRevealed && <UnscrollableBody />}
188190
<PageHeaderInner>
189191
<PageHeadline>

‎src/components/home/region-carousel.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { controlButtonLRStyle } from "../carousel-styles"
99

1010
export const RegionCarousel = ({ regions }) => {
1111
const controlTextRef = useRef(null)
12-
1312
const [slideIndex, setSlideIndex] = useState(0)
1413

1514
return (
@@ -86,7 +85,7 @@ export const RegionCarousel = ({ regions }) => {
8685
height: 550px;
8786
`}
8887
>
89-
{region.image?.gatsbyImg && (
88+
{region.image?.gatsbyImg?.childImageSharp && (
9089
<GatsbyImage
9190
image={
9291
region.image.gatsbyImg.childImageSharp.gatsbyImageData

‎src/components/simple-banner.js‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ import { POSITIVE, NEGATIVE } from "../utils/constants"
66
import { colors } from "../theme"
77

88
const SimpleBanner = () => {
9-
const [hasSeenWorkshopNotice, setHasSeenNotice] = useState(false)
9+
const [hasSeenNotice, setHasSeenNotice] = useState(false)
1010
const [checkedLocalStorage, setCheckedLocalStorage] = useState(false)
1111

1212
// This runs when the page is loaded.
1313
useEffect(() => {
14-
if (localStorage.getItem("has_seen_workshop_recording_banner")) {
14+
if (localStorage.getItem("has_seen_shutdown_banner")) {
1515
setHasSeenNotice(true)
1616
}
1717
setCheckedLocalStorage(true)
1818
}, [])
1919

2020
const markWorkshopNoticeSeen = () => {
21-
localStorage.setItem("has_seen_workshop_recording_banner", "true")
21+
localStorage.setItem("has_seen_shutdown_banner", "true")
2222
setHasSeenNotice(true)
2323
}
2424

@@ -38,24 +38,11 @@ const SimpleBanner = () => {
3838
padding-left: 2.5rem;
3939
padding-right: 2.5rem;
4040
z-index: 400;
41-
display: ${hasSeenWorkshopNotice ? "none" : "flex"};
41+
display: ${hasSeenNotice ? "none" : "flex"};
4242
`}
4343
>
4444
<div>
45-
<span>{`July update: Please note that session recordings from the 2024 Airborne & Field Data Workshop are now available`}</span>
46-
<a
47-
target="_blank"
48-
rel="noopener noreferrer"
49-
href={`https://www.earthdata.nasa.gov/learn/webinars-and-tutorials/second-airborne-field-data-workshop`}
50-
css={`
51-
color: ${colors[POSITIVE].text};
52-
font-weight: bold;
53-
`}
54-
data-cy={`workshop-link`}
55-
>
56-
{"\u00a0here"}
57-
</a>
58-
<span>!</span>
45+
<span>{`Due to the lapse in federal government funding, NASA is not updating this website. We sincerely regret this inconvenience.`}</span>
5946
</div>
6047
<div
6148
css={`

‎src/content/nasa-images.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{
99
"shortname": "maritime",
1010
"category": "region",
11-
"image": "https://climate.nasa.gov/system/resources/detail_files/170_gulfoffinland_full.jpg",
11+
"image": "https://assets.science.nasa.gov/dynamicimage/assets/science/esd/climate/2023/11/gulfoffinland_full.jpg",
1212
"nasaImgAlt": "Phytoplankton blooms across the northern basins of the North Atlantic and Arctic Oceans. (Photography courtesy NASA/Climate)"
1313
},
1414
{
@@ -26,7 +26,7 @@
2626
{
2727
"shortname": "island",
2828
"category": "region",
29-
"image": "https://climate.nasa.gov/system/resources/detail_files/218_PIA21166_hires-768px-v2.jpg",
29+
"image": "https://assets.science.nasa.gov/dynamicimage/assets/science/esd/climate/2023/11/PIA21166_hires-768px-v2.jpg",
3030
"nasaImgAlt": "The Republic of Maldives with its twenty-six atolls, and 1192 coral islands, with an average ground elevation of 1.5 meters (about 5 feet). (Photography courtesy NASA/Climate)"
3131
},
3232
{

‎src/templates/campaign/__tests__/__snapshots__/focus-section.test.js.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ exports[`Focus Section displays content 1`] = `
3939
className="focus-area-gallery___StyledDiv-sc-1h9c11a-0 eGQTcA"
4040
>
4141
<a
42-
className="sc-fqkvVR eoLNjC"
42+
className="sc-dcJsrY llcBLh"
4343
data-cy="focus-area"
4444
href="/focus/Carbon Cycle & Ecosystems"
4545
state={

‎src/templates/campaign/__tests__/__snapshots__/platform-section.test.js.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ exports[`Platform Section displays content 1`] = `
3030
data-cy="platform-carousel"
3131
>
3232
<div
33-
className="sc-fqkvVR EeYsO"
33+
className="sc-dcJsrY bMhzgJ"
3434
data-cy="carousel-list-text-control"
3535
>
3636
<button

‎src/templates/campaign/__tests__/__snapshots__/program-info-section.test.js.snap‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ exports[`Program Info Section renders logo when present in props 1`] = `
2727
mode="darkTheme"
2828
>
2929
<div
30-
className="sc-fqkvVR gOztfi"
30+
className="sc-dcJsrY hKvuh"
3131
>
3232
<div
33-
className="sc-dcJsrY eCZDRB"
33+
className="sc-iGgWBj ellSkC"
3434
>
3535
<div
3636
className="program-info-section___StyledDiv3-sc-g8ragl-0 sRfvN"
@@ -334,10 +334,10 @@ exports[`Program Info Section renders placeholder when no logo is available 1`]
334334
mode="darkTheme"
335335
>
336336
<div
337-
className="sc-fqkvVR gOztfi"
337+
className="sc-dcJsrY hKvuh"
338338
>
339339
<div
340-
className="sc-dcJsrY eCZDRB"
340+
className="sc-iGgWBj ellSkC"
341341
>
342342
<svg
343343
height="120"

‎src/templates/instrument/__tests__/__snapshots__/overview-section.test.js.snap‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ exports[`Overview Section displays content 1`] = `
177177
</dt>
178178
<dd>
179179
<ul
180-
className="sc-kpDqfm jLnnIm"
180+
className="sc-dAlyuH hBcSuC"
181181
>
182182
<li
183183
className="overview-section___StyledLi3-sc-1n109jn-0 hCiXBP"
@@ -227,15 +227,15 @@ exports[`Overview Section displays content 1`] = `
227227
mode="lightTheme"
228228
>
229229
<ul
230-
className="sc-iGgWBj RCXbQ"
230+
className="sc-gsFSXq kzwoEy"
231231
data-cy="instrument-background"
232232
>
233233
<li
234-
className="sc-fqkvVR jZuyot"
234+
className="sc-dcJsrY ccZwwy"
235235
data-cy="lead-investigator-label"
236236
>
237237
<label
238-
className="sc-dcJsrY chCXHW"
238+
className="sc-iGgWBj kTTaXJ"
239239
>
240240
Lead Investigator
241241
</label>
@@ -244,11 +244,11 @@ exports[`Overview Section displays content 1`] = `
244244
</p>
245245
</li>
246246
<li
247-
className="sc-fqkvVR jZuyot"
247+
className="sc-dcJsrY ccZwwy"
248248
data-cy="technical-contact-label"
249249
>
250250
<label
251-
className="sc-dcJsrY chCXHW"
251+
className="sc-iGgWBj kTTaXJ"
252252
>
253253
Technical Contact
254254
</label>
@@ -257,11 +257,11 @@ exports[`Overview Section displays content 1`] = `
257257
</p>
258258
</li>
259259
<li
260-
className="sc-fqkvVR jZuyot"
260+
className="sc-dcJsrY ccZwwy"
261261
data-cy="instrument-manufacturer-label"
262262
>
263263
<label
264-
className="sc-dcJsrY chCXHW"
264+
className="sc-iGgWBj kTTaXJ"
265265
>
266266
Instrument Maker
267267
</label>
@@ -270,11 +270,11 @@ exports[`Overview Section displays content 1`] = `
270270
</p>
271271
</li>
272272
<li
273-
className="sc-fqkvVR jZuyot"
273+
className="sc-dcJsrY ccZwwy"
274274
data-cy="funding-source-label"
275275
>
276276
<label
277-
className="sc-dcJsrY chCXHW"
277+
className="sc-iGgWBj kTTaXJ"
278278
>
279279
Funding Source
280280
</label>
@@ -283,10 +283,10 @@ exports[`Overview Section displays content 1`] = `
283283
</p>
284284
</li>
285285
<div
286-
className="sc-gsFSXq dDMmLj"
286+
className="sc-kAyceB eYmdyc"
287287
>
288288
<p
289-
className="sc-kAyceB cJuHEe"
289+
className="sc-imWYAI hQDGZD"
290290
>
291291
DOI:
292292
@@ -327,11 +327,11 @@ exports[`Overview Section displays content 1`] = `
327327
</p>
328328
</div>
329329
<li
330-
className="sc-fqkvVR jZuyot"
330+
className="sc-dcJsrY ccZwwy"
331331
data-cy="data-locations-label"
332332
>
333333
<label
334-
className="sc-dcJsrY chCXHW"
334+
className="sc-iGgWBj kTTaXJ"
335335
>
336336
Overview Publications
337337
</label>
@@ -340,16 +340,16 @@ exports[`Overview Section displays content 1`] = `
340340
</p>
341341
</li>
342342
<li
343-
className="sc-imWYAI fgfAYF"
343+
className="sc-jXbUNg bbNKTf"
344344
data-cy="repositories-label"
345345
>
346346
<label
347-
className="sc-jXbUNg hmvVST"
347+
className="sc-dhKdcB evpdNh"
348348
>
349349
Repositories
350350
</label>
351351
<ul
352-
className="sc-dhKdcB ixDHJU"
352+
className="sc-kpDqfm iKvLGT"
353353
data-cy="repository-list"
354354
>
355355
<li

0 commit comments

Comments
 (0)