Develop prime

.dockerignore

@@ -1,6 +1,5 @@
 **/.classpath
 **/.dockerignore
-**/.env
 **/.git
 **/.gitignore
 **/.project

.env

@@ -1,14 +1,15 @@
 # add env-driven feature flags with the `REACT_APP_FF_` prefix
 # example: REACT_APP_FF_MAJOR_FEATURE=true or REACT_APP_FF_EXPERIMENTAL_THING=false
 
-REACT_APP_MAPBOX_TOKEN=pk.eyJ1IjoidmpvZWxtIiwiYSI6ImNrdW15MXczdTFnaWcyb3A4NjN2dzVzdWcifQ.jYrSffOGKKPxXDJoxwtNfQ
+REACT_APP_MAPBOX_TOKEN=pk.eyJ1IjoidmpvZWxtIiwiYSI6ImNpZ3RzNXdmeDA4cm90N2tuZzhsd3duZm0ifQ.YcHUz9BmCk2oVOsL48VgVQ
 REACT_APP_DAS_HOST=''
 REACT_APP_DAS_AUTH_TOKEN_URL=/oauth2/token/
 REACT_APP_DAS_API_URL=/api/v1.0/
 REACT_APP_ROUTE_PREFIX=/
-REACT_APP_BASE_MAP_STYLES='mapbox://styles/vjoelm/ciobuir0n0061bdnj1c54oakh?optimize=true'
+REACT_APP_BASE_MAP_STYLES='mapbox://styles/vjoelm/clthqjb7400z101ptatvj7s1h'
 REACT_APP_DEFAULT_EVENT_FILTER_FROM_DAYS=31
 REACT_APP_DEFAULT_PATROL_FILTER_FROM_DAYS=1
 
 # Feature flags
-REACT_APP_ENABLE_PATROL_NEW_UI=true
+REACT_APP_LEGACY_RT_ENABLED=false
+REACT_APP_I18N_ENABLED=true

.github/workflows/develop-workflow.yml

@@ -3,10 +3,8 @@ on:
   push:
     branches:
       - "das-2-*-*"
-      - "ERA-*"
-      - "era-*"
+      - "legacy-era-*"
       - "develop*"
-      - "eruc-*"
 
 env:
   BUILD_BRANCH: ${{ github.ref_name }}
@@ -22,23 +20,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Google Auth
         id: auth
-        uses: 'google-github-actions/auth@v0'
+        uses: 'google-github-actions/auth@v2'
         with:
           token_format: 'access_token'
           workload_identity_provider: '${{ secrets.WIF_PROVIDER }}'
           service_account: '${{ secrets.WIF_SERVICE_ACCOUNT }}'
 
       - name: Setup Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 14
 
       - name: "Configure python"
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
 
@@ -52,7 +50,7 @@ jobs:
         run: yarn test-ci
 
       - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v0'
+        uses: 'google-github-actions/setup-gcloud@v2'
 
       - name: Validate existence of env
         id: validate_env
@@ -69,10 +67,11 @@ jobs:
         if: steps.validate_env.outputs.site_exists == 'true'
         run: CI=false yarn build
 
-      - name: Upload to bucket
+      - name: UploadDownload to bucket
         if: steps.validate_env.outputs.site_exists == 'true'
         run: |-
-          gsutil cp -r build/static gs://er-static/
+          gsutil -m cp -r build/static gs://er-static/
+          gsutil -m cp -r gs://er-static/api/* build/static/
 
       - name: Build docker image
         if: steps.validate_env.outputs.site_exists == 'true'

.github/workflows/main.yml

@@ -6,10 +6,28 @@ on:
       - 'release-**'
 
 jobs:
+  config:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+      - run: |
+          npm pkg set "buildbranch"="${{ github.head_ref || github.ref_name }}"
+          npm pkg set "buildnum"="${{ github.run_number }}"
+      - uses: actions/upload-artifact@v4
+        with:
+          name: npm-config
+          path: package.json
   build:
-    uses: PADAS/gundi-workflows/.github/workflows/build_docker.yml@v1-stable
+    needs: config
+    uses: PADAS/gundi-workflows/.github/workflows/build_docker.yml@v2
     with:
       environment: padas-app
       repository: europe-west3-docker.pkg.dev/padas-app/er-mt/das-web-react
       tag: ${{ github.head_ref || github.ref_name }}-${{ github.run_number }}
       dockerfile: Dockerfile.mt
+      artifact-download: true
+      artifact-name: npm-config

.github/workflows/pr-envs.yml

@@ -0,0 +1,39 @@
+name: Build das-server on Pull Request
+on:
+  pull_request:
+    types:
+      - labeled
+      - synchronize
+      - reopened
+
+jobs:
+  config:
+    if: contains(github.event.pull_request.labels.*.name, 'deploy')
+    runs-on: ubuntu-latest
+    environment: 
+      name: ${{ github.head_ref }}
+      url: "https://${{ github.head_ref }}.dev.pamdas.org"
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 18
+      - run: |
+          npm pkg set "buildbranch"="${{ github.event.pull_request.head.sha }}"
+          npm pkg set "buildnum"="${{ github.run_number }}"
+      - uses: actions/upload-artifact@v4
+        with:
+          name: npm-config
+          path: package.json
+  build:
+    if: contains(github.event.pull_request.labels.*.name, 'deploy')
+    needs: config
+    uses: PADAS/gundi-workflows/.github/workflows/build_docker.yml@v2
+    with:
+      environment: padas-app
+      repository: europe-west3-docker.pkg.dev/padas-app/er-mt/das-web-react
+      tag: ${{ github.event.pull_request.head.sha }}
+      dockerfile: Dockerfile.mt
+      artifact-download: true
+      artifact-name: npm-config

CONTRIBUTING.md

@@ -0,0 +1,66 @@
+# Contributing to EarthRanger
+Contributing to EarthRanger is highly encouraged. As an open source project, EarthRanger is dedicated to transparency, security, and the greater EarthRanger community.
+
+Please ensure that all participation in EarthRanger development adheres to our [code of conduct](CODE_OF_CONDUCT_LINK_HERE), and is a good faith effort towards the improvement of conservation technology.
+
+Please consider the following when making a contribution:
+
+1. Is the contribution specific to your site, or broadly useful in the conservation community? If it is the former, consider writing the feature as an integration, or running a fork of EarthRanger with your modified code.
+2. Can you support potential bugs and requests surrounding the feature?
+
+You are welcome to contribute to EarthRanger in a number of ways, including:
+- Reporting a bug
+- Discussing the current state of the code
+- Submitting a fix
+- Proposing new features
+- Becoming a maintainer
+
+## We Develop with Github
+We use Github to host code, to track issues and feature requests, as well as accept pull requests.
+
+## We Use [Github Flow](https://docs.github.com/en/get-started/quickstart/github-flow), So All Code Changes Happen Through Pull Requests
+Pull requests are the best way to propose changes to the codebase (we use [Github Flow](https://guides.github.com/introduction/flow/index.html)). We actively welcome your pull requests:
+
+1. Fork the repo and create your branch from `develop`.
+2. If you've added code that should be tested, add tests.
+3. If you've changed APIs, update the documentation.
+4. Ensure the test suite passes.
+5. Make sure your code lints.
+6. Issue a new pull request for the EarthRanger team to review
+
+## Any contributions you make will be under the Apache License
+In short, when you submit code changes, your submissions are understood to be under the same [Apache License](LINK_TO_LICENSE_FILE_HERE) that covers the project. Feel free to contact the maintainers if that's a concern.
+
+## Report bugs using Github's [issues](https://github.com/briandk/transcriptase-atom/issues)
+We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/PADAS/das-web-react/issues/new/choose).
+
+**When filing a bug report**, make sure to include:
+- A quick summary and/or background
+- Highly specific reproduction steps
+  - (and sample code, if/where possible)
+- What you expected would happen
+- What actually happens
+- Notes
+- Evidence - photos, screen recordings, logs, etc etc
+
+
+## Coding Standards
+* Contributions to EarthRanger require documentation and test coverage.
+* Documentation can be in the form of self-describing code, with comments, or proposal documents included in the pull request.
+* Project-wide test coverage should never regress as the result of a contribution, only maintain or increase overall coverage.
+* Our codebase enforces code styles driven by ESLint, which generally follow best practices as per the Airbnb JavaScript code style guidelines and React best practices.
+  * You can try running `npm run lint` to analyze and fix your code styles as necessary.
+* The ultimate assessment of code standards is at the discretion of the EarthRanger team.
+
+
+## The Lifecycle of a Pull Request
+1. First a contributor will file their pull request, adhering to the standards of the pull request template. Reviewers may return the PR to the contributor if the template is not filled completely.
+2. Reviewers within the EarthRanger core team will review the code, explore its functionality, and evaluate it. This is on an ad hoc basis, with no guaranteed time boundaries, but we will always put in our best effort to review in a timely manner.
+3. Comments, approvals, and change requests will be issued by the EarthRanger team's reviewers. If any changes are necessary, the pull request will be re-assigned to the contributor for further work and review. Once the contributor's work is ready for re-review, they simply click the "request re-review" button next to each reviewer's name to trigger another cycle of review.
+4. Once work has been reviewed and approved by the EarthRanger core team, it will be merged into the `develop` branch where it will undergo full regression testing before releasing into production.
+
+## License
+By contributing, you agree that your contributions will be licensed under this project's Apache License.
+
+## References
+This document was adapted from the open-source contribution guidelines for [Facebook's Draft](https://github.com/facebookarchive/draft-js/blob/main/CONTRIBUTING.md)

Dockerfile.mt

@@ -9,7 +9,7 @@ RUN yarn --ignore-scripts && \
     npm rebuild node-sass
 
 COPY . .
-RUN yarn build
+RUN ls -la && yarn build
 
 
 FROM nginx:1.25-alpine