Master 202401

.bowerrc

@@ -1,5 +1,6 @@
 {
   "directory": "bower_components",
   "analytics": false,
+  "strict-ssl": false,
   "registry": "https://registry.bower.io"
 }

.env.colombia

@@ -1,6 +1,7 @@
 GA=Winter_is_coming
 OTHER_LOCALE=en-col
 DEFAULT_LOCALE=es-col
-API_URL=http://atlas-colombia-harvard.cid-labs.com/api
+API_URL=http://datlascolombia.bancoldex.com:9006
 DOWNLOAD_URL=https://s3.amazonaws.com/datlas-colombia-downloads
 MAP_URL=http://download.geofabrik.de/south-america/colombia.html
+AGRO_URL=http://datlascolombia.bancoldex.com:9007

.env.deploy

@@ -4,3 +4,4 @@ DEFAULT_LOCALE=es-col
 API_URL=http://atlas-colombia-harvard.cid-labs.com/api
 DOWNLOAD_URL=https://s3.amazonaws.com/datlas-colombia-downloads
 MAP_URL=http://download.geofabrik.de/south-america/colombia.html
+AGRO_URL=http://52.44.92.68:8080

.env.example

@@ -5,4 +5,5 @@ API_URL=something-something
 DOWNLOAD_URL=another-url-for-download
 ROOT_URL= /
 DOWNLOAD_URL=something-something
+AGRO_URL=http://52.44.92.68:8080
 

.env.mexico

@@ -5,3 +5,4 @@ API_URL=http://cide.cid-labs.com/api/
 ROOT_URL= /
 DOWNLOAD_URL=https://s3-us-west-2.amazonaws.com/datlas-mexico-downloads-prod
 MAP_URL=http://mapserver.inegi.org.mx/MGN/mge2010v5_0.zip
+AGRO_URL=http://52.44.92.68:8080

.env.peru

@@ -4,3 +4,4 @@ DEFAULT_LOCALE=es-peru
 API_URL=http://atlas-peru-preview.cid-labs.com/api
 DOWNLOAD_URL=https://s3.amazonaws.com/datlas-peru-downloads
 MAP_URL=http://www.geoidep.gob.pe/index.php/catalogo-nacional-de-servicios-web/servicios-de-publicacion-de-objetos-wfs
+AGRO_URL=http://52.44.92.68:8080

.github/workflows/aws.yml

@@ -0,0 +1,86 @@
+# This workflow will build and push a new container image to Amazon ECR,
+# and then will deploy a new task definition to Amazon ECS, when a release is created
+#
+# To use this workflow, you will need to complete the following set-up steps:
+#
+# 1. Create an ECR repository to store your images.
+#    For example: `aws ecr create-repository --repository-name my-ecr-repo --region us-east-2`.
+#    Replace the value of `ECR_REPOSITORY` in the workflow below with your repository's name.
+#    Replace the value of `aws-region` in the workflow below with your repository's region.
+#
+# 2. Create an ECS task definition, an ECS cluster, and an ECS service.
+#    For example, follow the Getting Started guide on the ECS console:
+#      https://us-east-2.console.aws.amazon.com/ecs/home?region=us-east-2#/firstRun
+#    Replace the values for `service` and `cluster` in the workflow below with your service and cluster names.
+#
+# 3. Store your ECS task definition as a JSON file in your repository.
+#    The format should follow the output of `aws ecs register-task-definition --generate-cli-skeleton`.
+#    Replace the value of `task-definition` in the workflow below with your JSON file's name.
+#    Replace the value of `container-name` in the workflow below with the name of the container
+#    in the `containerDefinitions` section of the task definition.
+#
+# 4. Store an IAM user access key in GitHub Actions secrets named `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`.
+#    See the documentation for each action used below for the recommended IAM policies for this IAM user,
+#    and best practices on handling the access key credentials.
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+      branches: [ master ]
+
+name: Deploy to Amazon ECS
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    environment: deploy_prod
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{ secrets.AWS_REGION_NAME }}
+
+    - name: Login to Amazon ECR
+      id: login-ecr
+      uses: aws-actions/amazon-ecr-login@v1
+
+    - name: Build, tag, and push image to Amazon ECR
+      id: build-image
+      env:
+        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+        ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
+        IMAGE_TAG: ${{ github.sha }}
+      run: |
+        # Build a docker container and
+        # push it to ECR so that it can
+        # be deployed to ECS.
+        docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f ./docker/Dockerfile .
+        docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+        echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+
+    - name: Download task definition
+      run: |
+        aws ecs describe-task-definition --task-definition ${{ secrets.ECS_TASK_DEFINITION }} --query taskDefinition > task-definition.json
+
+    - name: Fill in the new image ID in the Amazon ECS task definition
+      id: task-def
+      uses: aws-actions/amazon-ecs-render-task-definition@v1
+      with:
+        task-definition: task-definition.json
+        container-name: ${{ secrets.CONTAINER_NAME }}
+        image: ${{ steps.build-image.outputs.image }}
+
+    - name: Deploy Amazon ECS task definition
+      uses: aws-actions/amazon-ecs-deploy-task-definition@v1
+      with:
+        task-definition: ${{ steps.task-def.outputs.task-definition }}
+        service: ${{ secrets.ECS_SERVICE_NAME }}
+        cluster: ${{ secrets.ECS_CLUSTER }}
+        wait-for-service-stability: true

.github/workflows/aws_develop.yml

@@ -0,0 +1,84 @@
+# This workflow will build and push a new container image to Amazon ECR,
+# and then will deploy a new task definition to Amazon ECS, when a release is created
+#
+# To use this workflow, you will need to complete the following set-up steps:
+#
+# 1. Create an ECR repository to store your images.
+#    For example: `aws ecr create-repository --repository-name my-ecr-repo --region us-east-2`.
+#    Replace the value of `ECR_REPOSITORY` in the workflow below with your repository's name.
+#    Replace the value of `aws-region` in the workflow below with your repository's region.
+#
+# 2. Create an ECS task definition, an ECS cluster, and an ECS service.
+#    For example, follow the Getting Started guide on the ECS console:
+#      https://us-east-2.console.aws.amazon.com/ecs/home?region=us-east-2#/firstRun
+#    Replace the values for `service` and `cluster` in the workflow below with your service and cluster names.
+#
+# 3. Store your ECS task definition as a JSON file in your repository.
+#    The format should follow the output of `aws ecs register-task-definition --generate-cli-skeleton`.
+#    Replace the value of `task-definition` in the workflow below with your JSON file's name.
+#    Replace the value of `container-name` in the workflow below with the name of the container
+#    in the `containerDefinitions` section of the task definition.
+#
+# 4. Store an IAM user access key in GitHub Actions secrets named `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY`.
+#    See the documentation for each action used below for the recommended IAM policies for this IAM user,
+#    and best practices on handling the access key credentials.
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+      branches: [ develop ]
+
+name: Deploy to Amazon ECS
+
+jobs:
+  deploy:
+    name: Deploy
+    runs-on: ubuntu-latest
+    environment: deploy
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v1
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: ${{ secrets.AWS_REGION_NAME }}
+
+    - name: Login to Amazon ECR
+      id: login-ecr
+      uses: aws-actions/amazon-ecr-login@v1
+
+    - name: Build, tag, and push image to Amazon ECR
+      id: build-image
+      env:
+        ECR_REGISTRY: ${{ steps.login-ecr.outputs.registry }}
+        ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
+        IMAGE_TAG: ${{ github.sha }}
+      run: |
+        # Build a docker container and
+        # push it to ECR so that it can
+        # be deployed to ECS.
+        docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG -f ./docker/Dockerfile .
+        docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
+        echo "::set-output name=image::$ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG"
+    - name: Download task definition
+      run: |
+        aws ecs describe-task-definition --task-definition ${{ secrets.ECS_TASK_DEFINITION }} --query taskDefinition > task-definition.json
+    - name: Fill in the new image ID in the Amazon ECS task definition
+      id: task-def
+      uses: aws-actions/amazon-ecs-render-task-definition@v1
+      with:
+        task-definition: task-definition.json
+        container-name: ${{ secrets.CONTAINER_NAME }}
+        image: ${{ steps.build-image.outputs.image }}
+
+    - name: Deploy Amazon ECS task definition
+      uses: aws-actions/amazon-ecs-deploy-task-definition@v1
+      with:
+        task-definition: ${{ steps.task-def.outputs.task-definition }}
+        service: ${{ secrets.ECS_SERVICE_NAME }}
+        cluster: ${{ secrets.ECS_CLUSTER }}
+        wait-for-service-stability: true

.gitignore

@@ -3,6 +3,8 @@
 # compiled output
 /dist
 /tmp
+.idea/
+package-lock.json
 
 # dependencies
 /node_modules

Brocfile.js

@@ -42,7 +42,7 @@ var app = new EmberApp({
 });
 
 // FileSaver
-app.import('bower_components/FileSaver.js/FileSaver.min.js');
+app.import('bower_components/FileSaver.js/dist/FileSaver.min.js');
 
 // PapaParse
 app.import('bower_components/papaparse/papaparse.min.js');
@@ -72,13 +72,17 @@ app.import('vendor/networks/col-industry_space.json', { destDir: 'assets/network
 app.import('vendor/networks/mex-industry_space.json', { destDir: 'assets/networks' });
 
 app.import('vendor/color_mappings/product_section_colors.json', { destDir: 'assets/color_mappings' });
+app.import('vendor/color_mappings/partners_section_colors.json', { destDir: 'assets/color_mappings' });
+app.import('vendor/color_mappings/farmtypes_section_colors.json', { destDir: 'assets/color_mappings' });
+app.import('vendor/color_mappings/agproducts_section_colors.json', { destDir: 'assets/color_mappings' });
 
 app.import('vendor/color_mappings/col-industry_section_colors.json', { destDir: 'assets/color_mappings' });
 app.import('vendor/color_mappings/mex-industry_section_colors.json', { destDir: 'assets/color_mappings' });
 
 //Import leaflet-omnivore
 app.import('vendor/leaflet-omnivore.min.js');
 
+
 // Font Awesome
 // The npm package readme mentions refactoring this as a Broccoli tree, so consider that a TODO
 app.import('bower_components/font-awesome/fonts/fontawesome-webfont.eot', { destDir: 'fonts' });