From fed2131a5436ce9a9ef1f0b7ef751ceea9fa14de Mon Sep 17 00:00:00 2001 From: Slesa Adhikari Date: Thu, 23 Nov 2023 10:39:02 -0600 Subject: [PATCH 01/11] Remove trailing slash from api urls (#56) --- .env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 1f8e89597..bbdb5f1d5 100644 --- a/.env +++ b/.env @@ -8,10 +8,10 @@ APP_DESCRIPTION='Explore our changing planet.' APP_CONTACT_EMAIL=eleanor.stokes@nasa.gov # Endpoint for the Tiler server. No trailing slash. -API_RASTER_ENDPOINT='https://staging-raster.delta-backend.com/' +API_RASTER_ENDPOINT='https://staging-raster.delta-backend.com' # Endpoint for the STAC server. No trailing slash. -API_STAC_ENDPOINT='https://staging-stac.delta-backend.com/' +API_STAC_ENDPOINT='https://staging-stac.delta-backend.com' MAPBOX_STYLE_URL='mapbox://styles/covid-nasa/ckb01h6f10bn81iqg98ne0i2y' From 7de85b37c5f717b2a1f664a3ad500519bf0d427a Mon Sep 17 00:00:00 2001 From: Jonas Date: Thu, 23 Nov 2023 20:36:11 +0100 Subject: [PATCH 02/11] Correct energy intro story id --- overrides/common/story-data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overrides/common/story-data.ts b/overrides/common/story-data.ts index 37ebbccd2..63bc377eb 100644 --- a/overrides/common/story-data.ts +++ b/overrides/common/story-data.ts @@ -44,7 +44,7 @@ export const disastersStoryIds = [ ] export const energyStoryIds = [ - "introduction_energy_generation" + "introduction_energy" ]; export const greenhouseGasesStoryIds = [ From 640b3f5bb741dc6a5d326865db284d57b0af60d4 Mon Sep 17 00:00:00 2001 From: Jonas Date: Thu, 23 Nov 2023 20:58:26 +0100 Subject: [PATCH 03/11] Reorder front matter to match AQ_ --- stories/theme.AG_.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stories/theme.AG_.mdx b/stories/theme.AG_.mdx index 9a10b53f6..6a7ec7c7e 100644 --- a/stories/theme.AG_.mdx +++ b/stories/theme.AG_.mdx @@ -3,10 +3,10 @@ featuredOn: - agriculture id: "agriculture" name: Agriculture -theme: true description: " Learn how Earth data are being used to help farmers manage their crops in a changing climate. " +theme: true media: src: ::file ./external_headers/connected_earth_agriculture.png alt: " From b397674610283de38b4b29a6ef869e2af283f49b Mon Sep 17 00:00:00 2001 From: Jonas Date: Thu, 23 Nov 2023 20:59:58 +0100 Subject: [PATCH 04/11] Fix unrelated punctuation --- .../theme.AG_.introduction_agriculture/carousel_content.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stories/theme.AG_.introduction_agriculture/carousel_content.json b/stories/theme.AG_.introduction_agriculture/carousel_content.json index 6cc2e5864..ea9efa216 100644 --- a/stories/theme.AG_.introduction_agriculture/carousel_content.json +++ b/stories/theme.AG_.introduction_agriculture/carousel_content.json @@ -10,7 +10,7 @@ },{ "src":"https://www.youtube.com/embed/12npc-rtlI8", "title":"Water Cycle Extremes", - "caption":"This shows the extremes of the water cycle — droughts and intense rainfall — over a 20-year period (2002-2021). Based on observations from two NASA satellites, GRACE (Gravity Recovery and Climate Experiment) and GRACE-Follow On, droughts are shown as red spheres, extreme rainfall as blue spheres. To show the changes over a 20-year period (2002-2021) earlier years are spheres of a lighter shade, later years are darker. The size of the sphere shows the intensity of the events with exceptional events appearing as larger spheres.. There are 1,056 extreme events shown, and the plots at the bottom show the connection to warmer global temperatures. The most intense event was a 2019 excessive and persistent rain in central Africa." + "caption":"This shows the extremes of the water cycle — droughts and intense rainfall — over a 20-year period (2002-2021). Based on observations from two NASA satellites, GRACE (Gravity Recovery and Climate Experiment) and GRACE-Follow On, droughts are shown as red spheres, extreme rainfall as blue spheres. To show the changes over a 20-year period (2002-2021) earlier years are spheres of a lighter shade, later years are darker. The size of the sphere shows the intensity of the events with exceptional events appearing as larger spheres. There are 1,056 extreme events shown, and the plots at the bottom show the connection to warmer global temperatures. The most intense event was a 2019 excessive and persistent rain in central Africa." },{ "src":"https://www.youtube.com/embed/TtnhSc1rU4I", "title":"Global Carbon Dioxide 2020-2021", @@ -20,4 +20,4 @@ "title":"Relative Wetness Root Zone Versus Groundwater Comparison", "caption":"These maps combine satellite and ground-based measurements to model the relative amount of water stored at two different depths: plant root level and underground. The brown regions represent dry conditions. The blue regions represent wet areas. The maps do not attempt to represent human consumption of water; but rather, they show changes in water storage related to weather, climate, and seasonal patterns. NASA researchers developed these maps with data incorporated data from the joint NASA-German Gravity Recovery and Climate Experiment (GRACE) and GRACE Follow-On (GRACE-FO) missions in partnership with the National Drought Mitigation Center." } -] \ No newline at end of file +] From 06e66761e2f8421e3246e4e30fa9356bbdaf04e2 Mon Sep 17 00:00:00 2001 From: Jonas Date: Thu, 23 Nov 2023 21:09:45 +0100 Subject: [PATCH 05/11] Remove AG_ stories CardGallery since there are none yet --- stories/theme.AG_.mdx | 2 -- 1 file changed, 2 deletions(-) diff --git a/stories/theme.AG_.mdx b/stories/theme.AG_.mdx index 6a7ec7c7e..1814881af 100644 --- a/stories/theme.AG_.mdx +++ b/stories/theme.AG_.mdx @@ -78,5 +78,3 @@ import contentArray from './theme.AG_.introduction_agriculture/carousel_content. - - From 45cf5b00dc8701b5f97865a1fce7b8f6fd6bbcd4 Mon Sep 17 00:00:00 2001 From: Jonas Date: Thu, 23 Nov 2023 21:11:18 +0100 Subject: [PATCH 06/11] Add missing semicolon --- overrides/common/story-data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overrides/common/story-data.ts b/overrides/common/story-data.ts index 63bc377eb..0642f73ff 100644 --- a/overrides/common/story-data.ts +++ b/overrides/common/story-data.ts @@ -41,7 +41,7 @@ export const biodiversityStoryIds = [ ]; export const disastersStoryIds = [ -] +]; export const energyStoryIds = [ "introduction_energy" From c4262c8e86a417f630354f31cb0c91f5e7c16c45 Mon Sep 17 00:00:00 2001 From: Jonas Date: Thu, 23 Nov 2023 21:17:30 +0100 Subject: [PATCH 07/11] Remove DIS stories CardGallery since there are none yet --- stories/theme.DIS.mdx | 2 -- 1 file changed, 2 deletions(-) diff --git a/stories/theme.DIS.mdx b/stories/theme.DIS.mdx index 4ac3c2937..ae369f1e0 100644 --- a/stories/theme.DIS.mdx +++ b/stories/theme.DIS.mdx @@ -77,5 +77,3 @@ import contentArray from './theme.DIS.introduction_disasters/carousel_content.js - - \ No newline at end of file From 5af2c9cdd94fc6f5576250e39f55ed420ccb7310 Mon Sep 17 00:00:00 2001 From: Jonas Date: Thu, 23 Nov 2023 21:24:04 +0100 Subject: [PATCH 08/11] Do not +1 the total carousel item count --- overrides/common/embedded-video-carousel.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overrides/common/embedded-video-carousel.tsx b/overrides/common/embedded-video-carousel.tsx index 1a971e6f0..ef6d16bb0 100644 --- a/overrides/common/embedded-video-carousel.tsx +++ b/overrides/common/embedded-video-carousel.tsx @@ -139,7 +139,7 @@ export default function Carousel({ items }: EmbeddedVideosPropType) { Current slide: {props.currentSlide + 1} - Total of /{items.length + 1} + Total of /{items.length} ); }} From 43bfeb2c00b5d6d13250c1d82f90e429c0883a4b Mon Sep 17 00:00:00 2001 From: Jonas Date: Thu, 23 Nov 2023 21:28:11 +0100 Subject: [PATCH 09/11] Add /viewform to google form link --- overrides/about.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overrides/about.mdx b/overrides/about.mdx index 555c570a0..bb07f676f 100644 --- a/overrides/about.mdx +++ b/overrides/about.mdx @@ -117,7 +117,7 @@ description: " " ## We want your help! Please Share Your Ideas and Feedback! - Please contact us by filling out [this form](https://docs.google.com/forms/d/1mDgFqUsNv90Js7pERNDbmyN5RksztIy5ZZojWD0n5Pg). + Please contact us by filling out [this form](https://docs.google.com/forms/d/1mDgFqUsNv90Js7pERNDbmyN5RksztIy5ZZojWD0n5Pg/viewform). From 7daf2edfadc00aad4952afa54907777cd56d7310 Mon Sep 17 00:00:00 2001 From: Jonas Date: Thu, 23 Nov 2023 21:28:50 +0100 Subject: [PATCH 10/11] Add /viewform to google form link --- custom-pages/teach/index.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom-pages/teach/index.mdx b/custom-pages/teach/index.mdx index 5da9f93f6..04adea295 100644 --- a/custom-pages/teach/index.mdx +++ b/custom-pages/teach/index.mdx @@ -16,7 +16,7 @@ import Cmp from "./component"; ## Get Involved - Visit an Earth Information Center or [provide feedback](https://docs.google.com/forms/d/1mDgFqUsNv90Js7pERNDbmyN5RksztIy5ZZojWD0n5Pg) about our site. + Visit an Earth Information Center or [provide feedback](https://docs.google.com/forms/d/1mDgFqUsNv90Js7pERNDbmyN5RksztIy5ZZojWD0n5Pg/viewform) about our site. We would love to hear from you! From 4b7a36b454b0c3c38bd7cf4e6f1c5dd151ab0476 Mon Sep 17 00:00:00 2001 From: Jonas Date: Thu, 23 Nov 2023 21:29:34 +0100 Subject: [PATCH 11/11] Add /viewform to google form link --- overrides/components/page-footer/component.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/overrides/components/page-footer/component.tsx b/overrides/components/page-footer/component.tsx index dfaa86eb9..d1870ffd9 100644 --- a/overrides/components/page-footer/component.tsx +++ b/overrides/components/page-footer/component.tsx @@ -274,7 +274,7 @@ export default function PageFooter(props) {
  • Contact Us