diff --git a/explorer/cc-data.humancellatlas.dev.explorer-deploy.sh b/explorer/cc-explore.data.humancellatlas.dev.clevercanary.com-deploy.sh similarity index 66% rename from explorer/cc-data.humancellatlas.dev.explorer-deploy.sh rename to explorer/cc-explore.data.humancellatlas.dev.clevercanary.com-deploy.sh index 4f31940fd..bb35d18e1 100755 --- a/explorer/cc-data.humancellatlas.dev.explorer-deploy.sh +++ b/explorer/cc-explore.data.humancellatlas.dev.clevercanary.com-deploy.sh @@ -16,10 +16,10 @@ mkdir -p build/explore # Build AnVIL rm -rf ./out npm run build-dev:hca-dcp -mv out/explore/* build/explore +mv out/* build -export BUCKET=s3://wb8-explorer/ +export BUCKET=s3://tha-explore.data.humancellatlas.dev/ export SRCDIR=build/ aws s3 sync $SRCDIR $BUCKET --delete --profile excira -aws cloudfront create-invalidation --distribution-id E2SLGSHX4H0LO7 --paths "/*" --profile excira +aws cloudfront create-invalidation --distribution-id E3Q3S6QTTZHFMI --paths "/*" --profile excira diff --git a/explorer/cgl-explore.data.humancellatlas.prod.clevercanary.com-deploy.sh b/explorer/cgl-explore.data.humancellatlas.prod.clevercanary.com-deploy.sh new file mode 100755 index 000000000..77d146837 --- /dev/null +++ b/explorer/cgl-explore.data.humancellatlas.prod.clevercanary.com-deploy.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# Set the script to exit immediately on error +set -e + +echo \"Deleting ./out/\" +rm -rf ./out + +echo \"Deleting ./build/\" +rm -rf ./build + +n 16.15.1 +npm ci + +mkdir -p build + +# Build AnVIL +rm -rf ./out +npm run build-prod:hca-dcp +mv out/* build + +export BUCKET=s3://wve-data.humancellatlas.org.explore/ +export SRCDIR=build/ + +aws s3 sync $SRCDIR $BUCKET --delete --profile platform-hca-portal +aws cloudfront create-invalidation --distribution-id EYL2CSEQ4Z28Q --paths "/*" --profile platform-hca-portal diff --git a/explorer/package.json b/explorer/package.json index 1ba638e6a..9ce65998e 100644 --- a/explorer/package.json +++ b/explorer/package.json @@ -19,7 +19,8 @@ "build:anvil-cmg": "./scripts/build.sh anvil-cmg && next build && next export -o out/explore && npm run postbuild", "build-cc-dev:anvil-cmg": "./scripts/common-build.sh anvil-cmg cc-dev && next build && next export -o out && npm run postbuild", "dev:hca-dcp": "./scripts/dev.sh hca-dcp && next dev", - "build-dev:hca-dcp": "./scripts/build.sh hca-dcp dev && next build && next export -o out/explore && npm run postbuild", + "build-dev:hca-dcp": "./scripts/build.sh hca-dcp dev && next build && next export -o out && npm run postbuild", + "build-prod:hca-dcp": "./scripts/build.sh hca-dcp prod && next build && next export -o out && npm run postbuild", "postbuild": "next-sitemap --config next-sitemap.config.mjs", "start": "npx serve out", "lint": "next lint --dir .", diff --git a/explorer/site-config/hca-dcp/dev/.env b/explorer/site-config/hca-dcp/dev/.env index 7dff2ebd1..38b523867 100644 --- a/explorer/site-config/hca-dcp/dev/.env +++ b/explorer/site-config/hca-dcp/dev/.env @@ -1,2 +1,2 @@ NEXT_PUBLIC_SITE_CONFIG='hca-dcp-dev' -NEXT_PUBLIC_SITEMAP_DOMAIN='https://dev.singlecell.gi.ucsc.edu' +NEXT_PUBLIC_SITEMAP_DOMAIN='https://explore.data.humancellatlas.clevercanary.com' diff --git a/explorer/site-config/hca-dcp/dev/config.ts b/explorer/site-config/hca-dcp/dev/config.ts index 59e1bdc84..1a1f6b50d 100644 --- a/explorer/site-config/hca-dcp/dev/config.ts +++ b/explorer/site-config/hca-dcp/dev/config.ts @@ -20,9 +20,10 @@ import { supportConfig } from "./support/support"; // Template constants const APP_TITLE = "HCA Data Explorer"; -const BROWSER_URL = "https://data.humancellatlas.dev.clevercanary.com"; const ORG_URL = "https://www.humancellatlas.org"; const PORTAL_URL = "https://data.humancellatlas.dev.clevercanary.com"; +const BROWSER_URL = "https://explore.data.humancellatlas.dev.clevercanary.com"; + const FONT_FAMILY_DIN = "'din-2014', sans-serif"; const PAGINATION_PAGE_SIZE = "25"; export const PROJECTS_URL = "/projects"; diff --git a/explorer/site-config/hca-dcp/prod/.env b/explorer/site-config/hca-dcp/prod/.env index 2e102bce8..5489d0de4 100644 --- a/explorer/site-config/hca-dcp/prod/.env +++ b/explorer/site-config/hca-dcp/prod/.env @@ -1,2 +1,2 @@ NEXT_PUBLIC_SITE_CONFIG='hca-dcp-prod' -NEXT_PUBLIC_SITEMAP_DOMAIN='https://data.humancellatlas.org' \ No newline at end of file +NEXT_PUBLIC_SITEMAP_DOMAIN='https://explore.data.humancellatlas.org' \ No newline at end of file diff --git a/explorer/site-config/hca-dcp/prod/config.ts b/explorer/site-config/hca-dcp/prod/config.ts index eb8f649f1..c4dfbae51 100644 --- a/explorer/site-config/hca-dcp/prod/config.ts +++ b/explorer/site-config/hca-dcp/prod/config.ts @@ -4,9 +4,11 @@ import * as C from "../../../app/components"; import devConfig from "../dev/config"; // Template constants -const BROWSER_URL = "https://data.humancellatlas.org"; + const ORG_URL = "https://www.humancellatlas.org"; + const PORTAL_URL = "https://data.humancellatlas.org"; +const BROWSER_URL = "https://explore.data.humancellatlas.org"; const config: SiteConfig = { ...devConfig,