Skip to content

Commit

Permalink
Production deploy v0.10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
danielfdsilva committed Aug 4, 2023
2 parents e961601 + 7af2eaa commit 7d76136
Show file tree
Hide file tree
Showing 158 changed files with 359 additions and 400 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

## Why are you creating this Pull Request?

- [Adding Datasets or Discoveries](?title=Content%3A%20%3Cname%3E&expand=1&template=content.md)
- [Adding Datasets or Stories](?title=Content%3A%20%3Cname%3E&expand=1&template=content.md)
- [Version Release](?title=Deploy%20vX.X.X&expand=1&template=version_release.md)
- [Other](?expand=1&template=default.md)
14 changes: 7 additions & 7 deletions .github/PULL_REQUEST_TEMPLATE/content.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ _Replace with brief description/list of the content being added_

## Content checklist

Check the [Content Documentation](https://github.com/NASA-IMPACT/veda-config/blob/main/docs/CONTENT.md) for more details.
Check the [Content Documentation](https://github.com/NASA-IMPACT/veda-ui/blob/main/docs/CONTENT.md) for more details.

### Any content
- [ ] Cover image with proper attribution (when relevant) is present.
- [ ] Cover images do not contain any text (they're used as a background and text may not be readable).
- [ ] All images are not too big/heavy. As a general rule of thumb, they should not weigh more than 500KB, or be larger than 2000px. See the [media guide](https://github.com/NASA-IMPACT/veda-config/blob/main/docs/frontmatter/media.md#media) for more info.
- [ ] Content was added using the available [MDX Blocks](https://github.com/NASA-IMPACT/veda-config/blob/main/docs/MDX_BLOCKS.md).
- [ ] All images are not too big/heavy. As a general rule of thumb, they should not weigh more than 500KB, or be larger than 2000px. See the [media guide](https://github.com/NASA-IMPACT/veda-ui/blob/main/docs/frontmatter/media.md#media) for more info.
- [ ] Content was added using the available [MDX Blocks](https://github.com/NASA-IMPACT/veda-ui/blob/main/docs/MDX_BLOCKS.md).

### Datasets
- [ ] [Layer description](https://github.com/NASA-IMPACT/veda-config/blob/main/docs/frontmatter/layer.md#properties) is defined.
- [ ] [Layer legend](https://github.com/NASA-IMPACT/veda-config/blob/main/docs/frontmatter/layer.md#legend) is setup.
- [ ] [Layer description](https://github.com/NASA-IMPACT/veda-ui/blob/main/docs/frontmatter/layer.md#properties) is defined.
- [ ] [Layer legend](https://github.com/NASA-IMPACT/veda-ui/blob/main/docs/frontmatter/layer.md#legend) is setup.
- [ ] The Dataset is showing up on the map correctly

### Discoveries
- [ ] [Publication date](https://github.com/NASA-IMPACT/veda-config/blob/main/docs/CONTENT.md#discoveries) value is set
### Stories
- [ ] [Publication date](https://github.com/NASA-IMPACT/veda-ui/blob/main/docs/CONTENT.md#stories) value is set
23 changes: 4 additions & 19 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,10 @@ jobs:
with:
access_token: ${{ github.token }}

# Both veda-ui and veda-config are private repos. Since the token issued
# to GH does not have access to the veda-ui submodule, we have to
# manually check it out using a ssh deploy key.
- name: Checkout
uses: actions/checkout@v3
- name: Get submodules
env:
SSH_KEY_SUBMODULE: ${{secrets.DELTA_UI_FETCH_KEY}}
run: |
eval `ssh-agent -s`
ssh-add - <<< "${SSH_KEY_SUBMODULE}"; git submodule update --init --recursive
with:
submodules: recursive

- name: Use Node.js ${{ env.NODE }}
uses: actions/setup-node@v1
Expand All @@ -63,16 +56,8 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v3

# See comment on checks-yml - prep step
- name: Checkout
uses: actions/checkout@v3
- name: Get submodules
env:
SSH_KEY_SUBMODULE: ${{secrets.DELTA_UI_FETCH_KEY}}
run: |
eval `ssh-agent -s`
ssh-add - <<< "${SSH_KEY_SUBMODULE}"; git submodule update --init --recursive
with:
submodules: recursive

- name: Use Node.js ${{ env.NODE }}
uses: actions/setup-node@v1
Expand Down
60 changes: 22 additions & 38 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,18 @@

name: Deploy Production - MCP (S3)

permissions:
id-token: write
contents: read

on:
push:
branches:
- 'main'

env:
NODE: 16
# DOMAIN_PROD: https://www.earthdata.nasa.gov/dashboard
DOMAIN_PROD: /dashboard
DOMAIN_PROD: https://www.earthdata.nasa.gov/dashboard
DEPLOY_BUCKET_PROD: climatedashboard
DEPLOY_BUCKET_PROD_REGION: us-east-1

Expand All @@ -24,15 +27,10 @@ jobs:
with:
access_token: ${{ github.token }}

# See comment on checks.yml - prep step
- name: Checkout
uses: actions/checkout@v3
- name: Get submodules
env:
SSH_KEY_SUBMODULE: ${{secrets.DELTA_UI_FETCH_KEY}}
run: |
eval `ssh-agent -s`
ssh-add - <<< "${SSH_KEY_SUBMODULE}"; git submodule update --init --recursive
with:
submodules: recursive

- name: Use Node.js ${{ env.NODE }}
uses: actions/setup-node@v1
Expand Down Expand Up @@ -71,15 +69,11 @@ jobs:
needs: build

steps:
# See comment on checks.yml - prep step
- name: Checkout
uses: actions/checkout@v3
- name: Get submodules
env:
SSH_KEY_SUBMODULE: ${{secrets.DELTA_UI_FETCH_KEY}}
run: |
eval `ssh-agent -s`
ssh-add - <<< "${SSH_KEY_SUBMODULE}"; git submodule update --init --recursive
with:
submodules: recursive

- name: Restore node_modules
uses: actions/cache@v2
id: cache-node-modules
Expand Down Expand Up @@ -107,28 +101,18 @@ jobs:
mv dist deploy/dashboard
cp deploy/dashboard/index.html deploy/index.html
- name: Deploy to S3 Production
uses: jakejarvis/s3-sync-action@master
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v2
with:
# acl is not permitted with current credentials
# args: --acl public-read --follow-symlinks --delete
args: --follow-symlinks --delete
env:
AWS_S3_BUCKET: ${{ env.DEPLOY_BUCKET_PROD }}
AWS_REGION: ${{ env.DEPLOY_BUCKET_PROD_REGION }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
# When serving from a subpath:
# SOURCE_DIR: ./deploy
# Otherwise use the build directory directly:
# SOURCE_DIR: ./dist
SOURCE_DIR: ./deploy
role-to-assume: ${{ secrets.DEPLOYMENT_ROLE_ARN }}
role-session-name: "veda-dashboard-prod-deployment"
aws-region: ${{ env.DEPLOY_BUCKET_PROD_REGION }}

- name: Deploy to S3 Production
run: |
aws s3 sync ./deploy s3://${{ env.DEPLOY_BUCKET_PROD }} --delete
- name: Invalidate CloudFront cache
uses: chetan/invalidate-cloudfront-action@v2
env:
DISTRIBUTION: ${{ secrets.CLOUDFRONT_DISTRIBUTION_PROD }}
PATHS: "/*"
AWS_REGION: ${{ env.DEPLOY_BUCKET_PROD_REGION }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
uses: oneyedev/aws-cloudfront-invalidation@v1
with:
distribution-id: ${{ secrets.CLOUDFRONT_DISTRIBUTION_PROD }}
121 changes: 0 additions & 121 deletions .github/workflows/deploy-staging.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .veda/ui
Submodule ui updated 74 files
+1 −0 .env
+ app/graphics/layout/vp-01-illu.png
+ app/graphics/layout/vp-02-illu.png
+ app/graphics/layout/vp-03-illu.png
+7 −7 app/index.html
+4 −7 app/scripts/components/analysis/define/index.tsx
+4 −4 app/scripts/components/analysis/define/use-stac-search.ts
+1 −1 app/scripts/components/analysis/page-hero-analysis.tsx
+15 −8 app/scripts/components/analysis/results/timeseries-data.ts
+1 −1 app/scripts/components/common/blocks/index.tsx
+1 −1 app/scripts/components/common/blocks/scrollytelling/index.tsx
+92 −110 app/scripts/components/common/browse-controls/index.tsx
+20 −31 app/scripts/components/common/browse-controls/use-browse-controls.ts
+5 −1 app/scripts/components/common/card-sources.tsx
+85 −0 app/scripts/components/common/content-taxonomy.tsx
+21 −13 app/scripts/components/common/featured-slider-section.tsx
+1 −1 app/scripts/components/common/mapbox/aoi/mb-aoi-draw.js
+33 −27 app/scripts/components/common/mapbox/index.tsx
+7 −2 app/scripts/components/common/mapbox/layer-legend.tsx
+14 −5 app/scripts/components/common/mapbox/layers/raster-timeseries.tsx
+22 −5 app/scripts/components/common/mapbox/layers/utils.ts
+5 −5 app/scripts/components/common/mapbox/layers/vector-timeseries.tsx
+157 −0 app/scripts/components/common/mapbox/layers/zarr-timeseries.tsx
+2 −2 app/scripts/components/common/mapbox/map-options/basemaps.ts
+24 −15 app/scripts/components/common/mapbox/use-mapbox-control.tsx
+4 −4 app/scripts/components/common/page-header.tsx
+11 −11 app/scripts/components/common/related-content.tsx
+1 −1 app/scripts/components/common/search-field.tsx
+136 −112 app/scripts/components/data-catalog/index.tsx
+6 −1 app/scripts/components/datasets/s-overview/index.tsx
+0 −54 app/scripts/components/discoveries/single/index.tsx
+15 −15 app/scripts/components/home/featured-stories.tsx
+2 −2 app/scripts/components/home/index.tsx
+2 −1 app/scripts/components/home/value-propostion.tsx
+2 −1 app/scripts/components/sandbox/cards/index.js
+6 −0 app/scripts/components/sandbox/index.js
+81 −0 app/scripts/components/sandbox/mdx-editor/index.tsx
+287 −0 app/scripts/components/sandbox/mdx-editor/mdx-editor.tsx
+90 −78 app/scripts/components/stories/hub/index.tsx
+60 −0 app/scripts/components/stories/single/index.tsx
+21 −19 app/scripts/context/layer-data.tsx
+13 −9 app/scripts/main.tsx
+17 −18 app/scripts/redirects.tsx
+0 −0 app/scripts/styles/constrainer.ts
+4 −4 app/scripts/utils/routes.ts
+9 −8 app/scripts/utils/use-sliding-sticky-header.ts
+30 −10 app/scripts/utils/veda-data.ts
+23 −11 docs/content/CONFIGURATION.md
+43 −55 docs/content/CONTENT.md
+2 −2 docs/content/MDX_BLOCKS.md
+4 −4 docs/content/PAGE_OVERRIDES.md
+22 −46 docs/content/TAXONOMY.md
+ docs/content/media/taxonomy-filters.png
+3 −3 docs/development/ARCHITECTURE.md
+1 −1 docs/development/SETUP.md
+14 −2 mock/datasets/fire.data.mdx
+14 −3 mock/datasets/nighttime-lights.data.mdx
+15 −4 mock/datasets/no2.data.mdx
+46 −0 mock/datasets/oco2-geos-l3-daily.data.mdx
+9 −8 mock/datasets/sandbox.data.mdx
+ mock/stories/air-quality-and-covid-19--story-cover.jpg
+6 −4 mock/stories/air-quality-and-covid-19.stories.mdx
+ mock/stories/img-placeholder-5.jpg
+ mock/stories/img-placeholder-6.jpg
+8 −5 mock/stories/life-of-water.stories.mdx
+0 −17 mock/taxonomies.yml
+8 −3 mock/veda.config.js
+14 −5 package.json
+20 −0 parcel-resolver-veda/defaults.js
+29 −18 parcel-resolver-veda/index.d.ts
+23 −30 parcel-resolver-veda/index.js
+36 −104 parcel-resolver-veda/taxonomies.js
+1 −1 posthtml.config.js
+273 −63 yarn.lock
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

​VEDA is a dashboard to explore data.

VEDA is organized around datasets and discoveries.
VEDA is organized around datasets and data stories.
A Dataset represents a piece of geo-referenced data displayed as a set of related layers on a map.
Discoveries are long form pieces of content that tell a story about some interesting portion of the data.
Data Stories are long form pieces of content that tell a story about some interesting portion of the data.

## Getting started

Expand All @@ -19,7 +19,7 @@ If you plan to do development on `veda-config` or update the `veda-ui` version

The configuration and content options for VEDA will depend on the `veda-ui` (the actual interface code) version that `veda-config` is running.

**The documentation for the current version can be viewed at [169ea81 of veda-ui](https://github.com/NASA-IMPACT/veda-ui/tree/169ea81629ebae74c2d9e46a7b416f784b025fdf/README.md).
**The documentation for the current version can be viewed at [v2.0.0 of veda-ui](https://github.com/NASA-IMPACT/veda-ui/blob/v2.0.0/README.md).

## License
This project is licensed under **Apache 2**, see the [LICENSE](LICENSE) file for more details.
Expand Down
6 changes: 4 additions & 2 deletions datasets/CMIP-winter-median-pr.data.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ media:
author:
name: Justin Pflug
url:
thematics:
- eis
taxonomy:
- name: Topics
values:
- EIS
layers:
- id: CMIP245-winter-median-pr
stacCol: CMIP245-winter-median-pr
Expand Down
6 changes: 4 additions & 2 deletions datasets/CMIP-winter-median-ta.data.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ media:
author:
name: Justin Pflug
url:
thematics:
- eis
taxonomy:
- name: Topics
values:
- EIS
layers:
- id: CMIP245-winter-median-ta
stacCol: CMIP245-winter-median-ta
Expand Down
7 changes: 4 additions & 3 deletions datasets/bangladesh-landcover-2001-2020.data.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ id: bangladesh-landcover-2001-2020
name: 'Land Cover - Bangladesh'
description: 'Annual land cover maps for 2001 and 2020 (Bangladesh)'
media:

src: ::file ./bangladesh-landcover-2001-2020--dataset-cover.jpg
alt: 'Annual land cover maps for 2001 and 2020 (Bangladesh)'
author:
name: USGS
url: https://unsplash.com/photos/d59NHNtT_Ss
thematics:
- eis
taxonomy:
- name: Topics
values:
- EIS
layers:
- id: bangladesh-landcover-2001-2020
stacCol: bangladesh-landcover-2001-2020
Expand Down
6 changes: 4 additions & 2 deletions datasets/barc-thomasfire.data.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ media:
author:
name: Mike Newbry
url: https://unsplash.com/photos/DwtX9mMHBJ0
thematics:
- eis
taxonomy:
- name: Topics
values:
- EIS
layers:
- id: barc-thomasfire
stacCol: barc-thomasfire
Expand Down
6 changes: 4 additions & 2 deletions datasets/caldor-fire-characteristics-burn-severity.data.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ media:
author:
name: Marek Piwnicki
url: https://unsplash.com/photos/WiZOyYqzUss
thematics:
- eis
taxonomy:
- name: Topics
values:
- EIS
layers:
- id: caldor-fire-behavior
stacCol: caldor-fire-behavior
Expand Down
Loading

0 comments on commit 7d76136

Please sign in to comment.