Skip to content

Commit

Permalink
Merge pull request #165 from NASA-IMPACT/develop
Browse files Browse the repository at this point in the history
[RELEASE] Deploy new version
  • Loading branch information
danielfdsilva authored Dec 13, 2022
2 parents 9913bc4 + 6dd3f76 commit 44987a2
Show file tree
Hide file tree
Showing 63 changed files with 1,773 additions and 226 deletions.
8 changes: 0 additions & 8 deletions .delta/setup

This file was deleted.

1 change: 0 additions & 1 deletion .delta/ui
Submodule ui deleted from a63545
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ assignees: ''

- [ ] Read the story
- [ ] Make sure all datasets required have been published
- [ ] Configure all datasets in delta-config ([Content documentation](../../docs/CONTENT.md) is a good place to start)
- [ ] Configure story content in delta-config and check preview (dependency on running the dashboard locally or https://github.com/NASA-IMPACT/delta-config/issues/12)
- [ ] Configure all datasets in veda-config ([Content documentation](../../docs/CONTENT.md) is a good place to start)
- [ ] Configure story content in veda-config and check preview (dependency on running the dashboard locally or https://github.com/NASA-IMPACT/veda-config/issues/12)
- [ ] Preview story with story tellers
12 changes: 6 additions & 6 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
with:
access_token: ${{ github.token }}

# Both delta-ui and delta-config are private repos. Since the token issued
# to GH does not have access to the delta-ui submodule, we have to
# 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
Expand All @@ -50,11 +50,11 @@ jobs:
with:
path: |
node_modules
.delta/ui/node_modules
.veda/ui/node_modules
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}

- name: Install
run: ./.delta/setup
run: ./.veda/setup

test:
needs: prep
Expand Down Expand Up @@ -85,11 +85,11 @@ jobs:
with:
path: |
node_modules
.delta/ui/node_modules
.veda/ui/node_modules
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}

- name: Install
run: ./.delta/setup
run: ./.veda/setup

- name: Test
run: yarn test
6 changes: 3 additions & 3 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
with:
path: |
node_modules
.delta/ui/node_modules
.veda/ui/node_modules
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}

- name: Cache dist
Expand All @@ -56,7 +56,7 @@ jobs:
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.workflow }}-${{ github.sha }}

- name: Install
run: ./.delta/setup
run: ./.veda/setup

- name: Build production
env:
Expand All @@ -83,7 +83,7 @@ jobs:
with:
path: |
node_modules
.delta/ui/node_modules
.veda/ui/node_modules
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}

- name: Restore dist cache
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
with:
path: |
node_modules
.delta/ui/node_modules
.veda/ui/node_modules
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}

- name: Cache dist
Expand All @@ -55,7 +55,7 @@ jobs:
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ github.workflow }}-${{ github.sha }}

- name: Install
run: ./.delta/setup
run: ./.veda/setup

- name: Build Staging
env:
Expand All @@ -82,7 +82,7 @@ jobs:
with:
path: |
node_modules
.delta/ui/node_modules
.veda/ui/node_modules
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package.json') }}

- name: Restore dist cache
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule ".delta/ui"]
path = .delta/ui
url = https://github.com/NASA-IMPACT/delta-ui.git
[submodule ".veda/ui"]
path = .veda/ui
url = https://github.com/NASA-IMPACT/veda-ui.git
8 changes: 8 additions & 0 deletions .veda/setup
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/usr/bin/env bash

echo "Installing veda-config dependencies"
yarn

echo "Installing veda-ui dependencies"
cd .veda/ui
yarn
1 change: 1 addition & 0 deletions .veda/ui
Submodule ui added at 1c4162
8 changes: 4 additions & 4 deletions .delta/delta → .veda/veda
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ const path = require('path');
const inputCmd = process.argv.slice(2).join(' ');
if (inputCmd === '--info') {
const uiPkg = require(path.join(__dirname, 'ui/package.json'))
console.log(`Current delta-ui: ${uiPkg.version}`);
console.log(`Current veda-ui: ${uiPkg.version}`);

process.exit();
}

const configFile = path.join(__dirname, '../delta.config.js');
process.env.DELTA_CONFIG_PATH = process.env.DELTA_CONFIG_PATH || configFile;
const configFile = path.join(__dirname, '../veda.config.js');
process.env.VEDA_CONFIG_PATH = process.env.VEDA_CONFIG_PATH || configFile;

const rootDir = path.join(__dirname, '../');

Expand All @@ -54,6 +54,6 @@ if (inputCmd === 'test') {
const gulpCli = path.join(__dirname, 'ui/node_modules/gulp-cli/bin/gulp.js');
const gulpConfig = path.join(__dirname, 'ui/gulpfile.js');

const cmd = `node ${gulpCli} --cwd ${rootDir} -f ${gulpConfig} ${inputCmd} --delta-config ${configFile}`;
const cmd = `node ${gulpCli} --cwd ${rootDir} -f ${gulpConfig} ${inputCmd} --veda-config ${configFile}`;

execSync(cmd, { stdio: 'inherit' });
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
# Welcome to Delta
# Welcome to Veda

Delta is a dashboard to explore data.
![VEDA logo](./docs/media/veda_logo_blue_text_transparent.png)

Delta is organized around the concept of Thematic areas. Each thematic area explores a topic in detail via datasets and discoveries.
Veda is a dashboard to explore data.

Veda is organized around the concept of Thematic areas. Each thematic area explores a topic in detail via datasets and discoveries.
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.

## Getting started

1) Check [SETUP](./docs/SETUP.md) to see how you can run the project locally. (You'll need this to preview content.)
2) Check [CONFIGURATION](./docs/CONFIGURATION.md) to see a list of configuration options for Delta.
2) Check [CONFIGURATION](./docs/CONFIGURATION.md) to see a list of configuration options for Veda.
3) Check [CONTENT](./docs/CONTENT.md) for how to structure the content pieces.

If you plan to add features to `delta-config` check [DEVELOPMENT](./docs/DEVELOPMENT.md).
If you plan to add features to `veda-config` check [DEVELOPMENT](./docs/DEVELOPMENT.md).

# License
## License
This project is licensed under **Apache 2**, see the [LICENSE](LICENSE) file for more details.

Loading

0 comments on commit 44987a2

Please sign in to comment.