Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v2.0.0 #370

Merged
merged 90 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
5fac41b
Add info and media sections for casagfed
j08lue Mar 4, 2024
28424ad
Update Air-Sea CO₂ Flux thumbnail
faustoperez Mar 5, 2024
413788b
Add structured metadata
j08lue Mar 5, 2024
1101a6f
Update 5 collections layer thumbnails
faustoperez Mar 5, 2024
d0439ba
Merge branch 'ena-dataset-metadata' of https://github.com/US-GHG-Cent…
faustoperez Mar 5, 2024
5c9d004
Add OCO-2 datasets thumbnails
faustoperez Mar 6, 2024
4713449
Add epa-ch4emission-yeargrid-v2express thumbnails
faustoperez Mar 6, 2024
d296217
info description for each dataset added
siddharth0248 Mar 6, 2024
9254870
layer info added
siddharth0248 Mar 8, 2024
daebb01
epa layer info corrected
siddharth0248 Mar 8, 2024
f974953
Units are abbreviated
siddharth0248 Mar 18, 2024
47a0920
Add config to open external links in a new tab
sandesh-sp Mar 18, 2024
d54faf2
Change to temporalResolution and update info
j08lue Mar 22, 2024
d91d18c
Update homepage links to use ui/utils/url/getLinkProps
sandesh-sp Mar 22, 2024
d7eff3a
Add constant contact subscription form
slesaad Mar 27, 2024
59ecddc
Update to use relative link
slesaad Mar 28, 2024
d3d618c
Add newline
slesaad Mar 28, 2024
3a65ce8
Update subscription form link
slesaad Mar 28, 2024
92f455c
Update the commit pointer of .veda/ui
sandesh-sp Mar 29, 2024
1708cfd
Replace NASA,NOAA with NASA / NOAA
j08lue Apr 3, 2024
c7da5d6
Point VEDA UI to v4.2.0 to match develop
j08lue Apr 3, 2024
12b74c7
Merge branch 'develop' into ena-dataset-metadata
j08lue Apr 3, 2024
f7764ba
Update subscription link throughout the website
slesaad Apr 3, 2024
67bb9e7
Point VEDA UI to main again
j08lue Apr 3, 2024
ba25358
Link back to ghgcenter
slesaad Apr 3, 2024
077c3e8
Add constant contact subscription form #332
slesaad Apr 3, 2024
05d3311
Merge pull request #317 from US-GHG-Center/ena-dataset-metadata
j08lue Apr 3, 2024
10ea06a
Fix separation of source names
j08lue Apr 4, 2024
ac66710
Merge pull request #335 from US-GHG-Center/nasa-nies
j08lue Apr 5, 2024
89ec450
Disclaimer added for EMIT
siddharth0248 Apr 12, 2024
4b3925a
Learn Page - Newsletters (#337)
siddharth0248 Apr 17, 2024
160f1ff
Update UI, Update keypoints as Card component changes
hanbyul-here Apr 25, 2024
71bb53c
Turn on exploration
hanbyul-here Apr 25, 2024
178bc64
Change footer link and disclaimer for exploration
j08lue Apr 25, 2024
1f9aa71
Merge pull request #341 from US-GHG-Center/update-ui-r2
j08lue Apr 25, 2024
c8bfadf
Update VEDA UI pointer to match develop
j08lue Apr 25, 2024
9718800
Merge branch 'develop' into external-link-config
j08lue Apr 25, 2024
9b1cbb0
Merge pull request #326 from US-GHG-Center/external-link-config
j08lue Apr 25, 2024
11b27eb
Update beta page text for R2
j08lue Apr 26, 2024
f3caf38
Use equal-area projection for zonal statistics
j08lue Apr 26, 2024
c37e82d
Make title not capitalized
j08lue Apr 26, 2024
f4673a0
Merge pull request #344 from US-GHG-Center/feat/beta-page-r2
j08lue Apr 26, 2024
952efc2
Add equal area crs to casagfed analysis
j08lue Apr 26, 2024
af7503d
[R2] Add new MiCASA and LPJ datasets and update dataset overview page…
siddharth0248 Apr 26, 2024
256256e
Add equal area projection param to all remaining datasets
j08lue Apr 27, 2024
ba462bc
Merge branch 'develop' into feat/area-weighted-statistics
j08lue Apr 27, 2024
79899fa
Add params to new lpj and micasa
j08lue Apr 27, 2024
3630c05
Merge pull request #345 from US-GHG-Center/feat/area-weighted-statistics
j08lue Apr 27, 2024
5663fdd
Update Exploration disclaimer
j08lue Apr 29, 2024
055867e
Update formulation about equal area
j08lue Apr 29, 2024
25173bc
Merge pull request #348 from US-GHG-Center/feat/exploration-disclaimer
j08lue Apr 29, 2024
a4ae360
Fixing Error for R2 {Test}
siddharth0248 Apr 29, 2024
198483d
Make EPA dataset source-exclusive in E&A
j08lue Apr 29, 2024
e63b2b6
Merge pull request #351 from US-GHG-Center/fix/epa-source-exclusive
j08lue Apr 29, 2024
0f7e7e1
Update VEDA UI to latest main
j08lue Apr 29, 2024
a533c64
Merge pull request #353 from US-GHG-Center/feat/update-veda-ui
j08lue Apr 29, 2024
a3f8c44
Updates - Testing R2 (#352)
siddharth0248 Apr 30, 2024
e31de2b
Update UI to 4.3
hanbyul-here May 1, 2024
565884b
Merge pull request #355 from US-GHG-Center/update-ui-4.3
hanbyul-here May 1, 2024
5136e82
Update banner text and link
j08lue May 1, 2024
dd64479
Update expiry date
j08lue May 1, 2024
c9cc42f
Update banner link
j08lue May 1, 2024
87df703
Merge pull request #357 from US-GHG-Center/feat/banner-r2
j08lue May 1, 2024
0549a87
Bump version to 2.0.0-rc1
j08lue May 1, 2024
ef9f3c0
Update release date
j08lue May 1, 2024
733ae1c
Merge pull request #358 from US-GHG-Center/release/v2rc1
j08lue May 1, 2024
dfe151f
Use WebEx URL without expiring part
j08lue May 1, 2024
535e8ac
Merge pull request #360 from US-GHG-Center/fix/banner-webex-url
j08lue May 1, 2024
e82d15f
Add video modal override component
sandrahoang686 May 2, 2024
f6e0fba
Remove empty tags
sandrahoang686 May 2, 2024
f7d5a20
Add icon in button
sandrahoang686 May 2, 2024
ebd81fe
hopefully this bumps quality
sandrahoang686 May 2, 2024
3861e91
Merge pull request #362 from US-GHG-Center/add/demo-video-modal
sandrahoang686 May 2, 2024
b4ee667
Add video to stories/into-us-ghg-center
sandrahoang686 May 2, 2024
e32dce0
Merge pull request #364 from US-GHG-Center/add/into-us-ghg-center-dem…
j08lue May 3, 2024
86501b6
Change button style
sandrahoang686 May 3, 2024
a151bf1
Merge pull request #366 from US-GHG-Center/update/demo-video-button
sandrahoang686 May 3, 2024
93d041f
Update noaa interfaces link to production links
slesaad May 6, 2024
36fe87e
Update NOAA interfaces link to production links
slesaad May 6, 2024
e5f7bda
Minor Update in Content (#369)
siddharth0248 May 6, 2024
dfe897a
Adjust box shadow size, and padding for learn page
hanbyul-here May 6, 2024
7cb759b
Merge pull request #371 from US-GHG-Center/card-style
hanbyul-here May 6, 2024
9e38434
Update UI to v4.4.0
hanbyul-here May 6, 2024
6e282f0
Add G3W talk series to learn page events
slesaad May 6, 2024
db800ea
Update webinar pdf link
slesaad May 6, 2024
4e8e7d3
Merge pull request #372 from US-GHG-Center/ui-update-4.4
hanbyul-here May 6, 2024
bfa5834
Add G3W talk series to learn page events #373
slesaad May 6, 2024
241cbac
Fix broken links
slesaad May 6, 2024
cb1662a
Update attr link
slesaad May 6, 2024
ec6c051
Fix broken links #375
slesaad May 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ HUB_NAME='Hub'

CUSTOM_SCRIPT_SRC=https://dap.digitalgov.gov/Universal-Federated-Analytics-Min.js?agency=NASA&subagency=HQ
CUSTOM_SCRIPT_ID=_fed_an_ua_tag

FEATURE_NEW_EXPLORATION = 'TRUE'
1 change: 0 additions & 1 deletion .env.local-sample
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Get your public token from Mapbox dashboard
# Then copy this file, name it as .env.local
MAPBOX_TOKEN='YOUR_MAPBOX_TOKEN'

# Google Tag Manager tracking code
# Not required unless you are actively developing
GOOGLE_TAG_MANAGER_ID=''
Expand Down
2 changes: 1 addition & 1 deletion .veda/ui
Submodule ui updated 126 files
2 changes: 2 additions & 0 deletions constants.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
const SUBSCRIPTION_PATH = '/public/subscription/index.html';
export const SUBSCRIPTION_URL = (process.env.PUBLIC_URL || '') + SUBSCRIPTION_PATH;
20 changes: 11 additions & 9 deletions custom-pages/learn/component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@ export const continuumFoldSpanCols = {
largeUp: 4
};

const FoldSection = styled.div`
grid-column: 1 / -1;
display: flex;
flex-flow: column nowrap;
margin-bottom: ${glsp(2)};
`;

const StyledContinuumCardsDragScrollWrapper = styled(ContinuumCardsDragScrollWrapper)`
// @NOTE: There is a bug that wrapper's height doesn't respect the child's padding
// when there is only one item in the list
${(props) => props.itemsN === 1 ? `padding-bottom: 1rem` : ``};
`

const StyledCard = styled(Card)`
box-shadow: 0 0 2px 0 rgba(44,62,80,0.08),0 6px 6px 0 rgba(44,62,80,0.08);

h3:first-child {
margin-bottom: 0;
&:before {
Expand Down Expand Up @@ -71,8 +73,8 @@ function getEventTemporalState(startDate, endDate) {

export function EventsComponent ({items}) {
const { isScrolling, scrollProps } = useReactIndianaScrollControl();
return (<ContinuumCardsDragScrollWrapper>

return (<StyledContinuumCardsDragScrollWrapper itemsN={items.length}>
<ContinuumScrollIndicator />
<ContinuumDragScroll hideScrollbars={false} {...scrollProps}>
<StyledContinuum
Expand Down Expand Up @@ -113,6 +115,6 @@ export function EventsComponent ({items}) {
}}
/>
</ContinuumDragScroll>
</ContinuumCardsDragScrollWrapper>
</StyledContinuumCardsDragScrollWrapper>
)
};
14 changes: 12 additions & 2 deletions custom-pages/learn/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ description: "
---

import { EventsComponent } from './component'
import { NEWS_ITEMS, EVENT_ITEMS } from './learn-page-content'
import { NEWS_ITEMS, EVENT_ITEMS, NEWSLETTER_ITEMS } from './learn-page-content'
import AnchorScroll from './AnchorScroll'

import { SUBSCRIPTION_URL } from "../../constants";


<AnchorScroll />
<Block >
<Prose>
Expand All @@ -19,7 +22,7 @@ import AnchorScroll from './AnchorScroll'

The US GHG Center website is always evolving with new data and information. This page highlights US GHG Center news, trainings, and workshop opportunities.

If you would like to stay informed, please [subscribe to our email newsletter](https://docs.google.com/forms/d/e/1FAIpQLSfDxq_jR3z_006WkUnNKriGFlAdXhiZxC0ppkxV9fDXSM_FxQ/viewform).
If you would like to stay informed, please <a href={SUBSCRIPTION_URL}>subscribe to our email newsletter</a>.
</Prose>
</Block>

Expand Down Expand Up @@ -47,6 +50,13 @@ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque vel nunc mauris
</Block>


<Block>
<Prose>
## Newsletters
<EventsComponent items={NEWSLETTER_ITEMS} />
</Prose>
</Block>

{/* <Block>
<Prose>
## Learn More
Expand Down
38 changes: 32 additions & 6 deletions custom-pages/learn/learn-page-content.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
export const NEWSLETTER_ITEMS = [
{
name: 'The inaugural US GHG Center Newsletter',
asLink : {
url: 'https://myemail-api.constantcontact.com/US-GHG-Center-Newsletter.html?soid=1141171816352&aid=TCM2bjPR30g'
},
media: {
src: new URL('./media/news/newsletter.jpg', import.meta.url).href,
alt: 'March 2024'
},
description: 'Volume 1.1, March 2024'
}
]
export const NEWS_ITEMS = [
{
name: 'US GHG Center announced at COP28',
Expand Down Expand Up @@ -36,17 +49,17 @@ export const NEWS_ITEMS = [

export const EVENT_ITEMS = [
{
name: 'Policy Speaker Series: Implementing the U.S. Greenhouse Gas Center',
name: 'Policy Speaker Series: An Overview of the Global Greenhouse Gas Watch (G3W)',
asLink : {
url: 'https://carbon.nasa.gov/pdfs/Feb%202024%20PSS%20Talk%20Announcement%20.pdf'
url: 'https://carbon.nasa.gov/docs/May%202024%20PSS%20Talk%20Announcement.pdf'
},
media: {
src: new URL('./media/events/GHGC_CMS_Joint_Policy_Speaker_Series_v1.png', import.meta.url).href,
src: new URL('./media/events/GHGC_CMS_Joint_Policy_Speaker_Series_G3W_Webinar.png', import.meta.url).href,
alt: 'CMS speaker series screenshot'
},
description: 'The US GHG Center is joining with NASAs Carbon Monitoring System (CMS) Initiative to present a webinar on Tuesday, February 20, 2024 from 12-1PM ET. Dr. Argyro Kavvada, Dr. Lesley Ott, and Dr. Erin McDuffie will discuss development and implementation for the multi-agency US GHG Center and links to the national GHG strategy. Participants can attend on-site at GSFC in Building 33, conference room H114 or virtually through WebEx. Attendees must register.',
startDate: '2024-06-11',
endDate: '2024-06-21'
description: "The US GHG Center is joining with NASA's Carbon Monitoring System (CMS) Initiative to present a webinar on Wednesday, May 8, 2024 from 12-1PM ET. Gianpaolo Balsamo, director of the World Meteorological Organization (WMO) and G3W leader, will discuss how G3W fills critical information gaps on greenhouse gases via an integrated operational framework. Participants can register for the event virtually through WebEx. Attendees must register.",
startDate: '2024-05-08',
endDate: '2024-05-08'
},
{
name: 'US GHG Center Summer School',
Expand All @@ -61,6 +74,19 @@ export const EVENT_ITEMS = [
startDate: '2024-06-11',
endDate: '2024-06-21'
},
{
name: 'Policy Speaker Series: Implementing the U.S. Greenhouse Gas Center',
asLink : {
url: 'https://carbon.nasa.gov/pdfs/Feb%202024%20PSS%20Talk%20Announcement%20.pdf'
},
media: {
src: new URL('./media/events/GHGC_CMS_Joint_Policy_Speaker_Series_v1.png', import.meta.url).href,
alt: 'CMS speaker series screenshot'
},
description: 'The US GHG Center is joining with NASA’s Carbon Monitoring System (CMS) Initiative to present a webinar on Tuesday, February 20, 2024 from 12-1PM ET. Dr. Argyro Kavvada, Dr. Lesley Ott, and Dr. Erin McDuffie will discuss development and implementation for the multi-agency US GHG Center and links to the national GHG strategy. Participants can attend on-site at GSFC in Building 33, conference room H114 or virtually through WebEx. Attendees must register.',
startDate: '2024-02-21',
endDate: '2024-02-21'
},
{
name: 'American Meteorological Society (AMS) Annual Meeting',
asLink : {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added custom-pages/learn/media/news/newsletter.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading