From fcd72069332db4976502809653871d487e1f29cf Mon Sep 17 00:00:00 2001 From: kflemin <2205659+kflemin@users.noreply.github.com> Date: Tue, 2 Sep 2025 14:28:43 -0600 Subject: [PATCH 1/2] add analytics and DAP code --- src/index.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/index.html b/src/index.html index 6cc3b7c4..881c2166 100644 --- a/src/index.html +++ b/src/index.html @@ -6,8 +6,20 @@ + + + + + + + From 5ec086cbb1210bb8b359054fa246a7facad79b2a Mon Sep 17 00:00:00 2001 From: kflemin <2205659+kflemin@users.noreply.github.com> Date: Wed, 3 Sep 2025 13:49:42 -0600 Subject: [PATCH 2/2] cleanup old subsites --- .github/workflows/deploy.yml | 27 --------------------------- README.md | 25 +------------------------ 2 files changed, 1 insertion(+), 51 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f2d05d8d..91ccd0dd 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -51,30 +51,3 @@ jobs: if: github.ref == 'refs/heads/develop' run: | aws s3 sync --delete ./dist s3://${{ secrets.AWS_STAGING_BUCKET }} - - - name: Deploy NREL - uses: JamesIves/github-pages-deploy-action@v4.6.4 - if: github.ref == 'refs/heads/nrel' - with: - repository-name: BuildingEnergyTools/tools-website-nrel - branch: gh-pages - folder: dist - token: ${{ secrets.DEPLOY_STAGING_KEY }} - - - name: Deploy LBNL - uses: JamesIves/github-pages-deploy-action@v4.6.4 - if: github.ref == 'refs/heads/lbnl' - with: - repository-name: BuildingEnergyTools/tools-website-lbnl - branch: gh-pages - folder: dist - token: ${{ secrets.DEPLOY_STAGING_KEY }} - - - name: Deploy PNNL - uses: JamesIves/github-pages-deploy-action@v4.6.4 - if: github.ref == 'refs/heads/pnnl' - with: - repository-name: BuildingEnergyTools/tools-website-pnnl - branch: gh-pages - folder: dist - token: ${{ secrets.DEPLOY_STAGING_KEY }} diff --git a/README.md b/README.md index 00650faf..75b6c0a0 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,7 @@ [![CI](https://github.com/BuildingEnergyTools/tools-website/actions/workflows/ci.yml/badge.svg)](https://github.com/BuildingEnergyTools/tools-website/actions/workflows/ci.yml) [![Deploy](https://github.com/BuildingEnergyTools/tools-website/actions/workflows/deploy.yml/badge.svg)](https://github.com/BuildingEnergyTools/tools-website/actions/workflows/deploy.yml) -This project was generated with the Angular CLI. For more information on developing with Angular see the README -in the [doc folder](doc). The purpose of this README is to document the basic workflows of getting started. +This project was generated with the Angular CLI. ## Basic Workflow @@ -13,24 +12,6 @@ The most basic workflow to edit content is to leverage GitHub's website to creat - `main` - this is the branch that will be automatically deployed to the `gh-pages` and subsequently to https://buildingdata.energy.gov. - `develop` - the most recent changes and from where all updates should branch. Will be deployed to https://buildingdata-stage.energy.gov. - `gh-pages` - built and deployed website -- `pnnl` - branch to stage PNNL updates -- `lbnl` - branch to stage LBNL updates -- `nrel` - branch to stage NREL updates - -** TODO: This needs to be updated, the deployment to these staging branches isn't working as expected. For now deploy to develop and the normal staging branch for testing ** - -The staging branches should be the jumping off point for each user in the respective labs; however, ensure that the staging branch is up-to-date with develop before starting. This is easily done by creating a new pull request in GitHub and having the base branch be the national lab. Click on the links below to be directed to this for you: - -- [Update PNNL with Develop](https://github.com/BuildingEnergyTools/tools-website/compare/pnnl...develop) -- [Update LBNL with Develop](https://github.com/BuildingEnergyTools/tools-website/compare/lbnl...develop) -- [Update NREL with Develop](https://github.com/BuildingEnergyTools/tools-website/compare/nrel...develop) - -There are 3 staging sites (one for each laboratory). The respective lab branches will automatically be built and deployed upon pushing -to this lab's branch to this repository (pnnl, lbnl, nrel). The sites are located here: - -- [PNNL Staging Site](https://staging-pnnl.buildingenergytools.org) -- [LBNL Staging Site](https://staging-lbnl.buildingenergytools.org) -- [NREL Staging Site](https://staging-nrel.buildingenergytools.org) ## Advanced Workflow @@ -61,7 +42,3 @@ To manually sync the website with the S3 bucket, configure permissions for using ng build aws s3 sync dist s3://nrel-btodatatools-web-prod-bucket ``` - -## Subdomain management - -There are three subdomains on GitHub that are used to view the website before pushing to develop and main.