Merge pull request #44 from KaartGroup/kaart-stage

Release v3.4.8
KaartGroup · Feb 5, 2020 · bb59c69 · bb59c69
2 parents cf4d5e2 + 501857e
commit bb59c69
Show file tree

Hide file tree

Showing 61 changed files with 1,646 additions and 3,502 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: /home/circleci/app
     docker:
-    - image: circleci/python:3-stretch-browsers
+    - image: circleci/python:3-buster-browsers
     steps:
     - checkout
     - setup_remote_docker
@@ -15,6 +15,14 @@ jobs:
           sudo apt-get install -y nodejs libgeos-dev # Required for shapely
           sudo npm install -g @mapbox/cfn-config @mapbox/cloudfriend
           sudo pip3 install awscli --upgrade
+    - run:
+        name: Install GDAL and dependencies for pip gdal
+        command: |
+            echo "deb-src http://deb.debian.org/debian buster main" | sudo tee /etc/apt/sources.list.d/source-repos-tmp.list > /dev/null
+            cat "/etc/apt/sources.list.d/source-repos-tmp.list"
+            sudo apt update
+            sudo apt build-dep -y python3-gdal
+            sudo apt install gdal-bin libgdal-dev
     - run:
         name: Set folder permissions
         command: |
@@ -39,14 +47,17 @@ jobs:
           virtualenv env
           $CIRCLE_WORKING_DIRECTORY/env/bin/pip install --upgrade pip
           $CIRCLE_WORKING_DIRECTORY/env/bin/pip install -r requirements.txt
+          # Install python gdal -- it MUST match the version of gdal installed
+          $CIRCLE_WORKING_DIRECTORY/env/bin/pip install gdal==$(gdalinfo --version | awk '{print $2}' | awk -F, '{print $1}')
     - run:
         name: Run JS Unit tests
         command: |
           # JS Unit Tests
           cd $CIRCLE_WORKING_DIRECTORY/tests/client
           mkdir $CIRCLE_WORKING_DIRECTORY/tests/client/junit
+          export OPENSSL_CONF=/etc/ssl/
           $CIRCLE_WORKING_DIRECTORY/client/node_modules/.bin/karma start ./karma.conf.js \
-            --single-run --browsers PhantomJS --reporters junit
+            --single-run --browsers FirefoxHeadless,ChromeHeadless --reporters junit
         environment:
             JUNIT_REPORT_PATH: $CIRCLE_WORKING_DIRECTORY/tests/client/junit/
             JUNIT_REPORT_NAME: test-results.xml
@@ -248,7 +259,7 @@ workflows:
               - deployment/hot-tasking-manager
         requires:
           - build
-        stack_name: "prod-restored"
+        stack_name: "production"
         environment_name: "production"
         postgres_db: POSTGRES_DB_PRODUCTION
         postgres_password: POSTGRES_PASSWORD_PRODUCTION

diff --git a/.gitignore b/.gitignore
@@ -6,15 +6,15 @@ tasking-manager*.env
 client/node_modules/
 client/assets/styles/css
 client/app/taskingmanager.config.js
+client/id_preset_categories.json
+client/app/id_preset_categories.js
 client/package-lock.json
 client/yarn.lock
 
 # Ignore dist folder as this contains the minimized build for deploy
 server/web/static/dist
 server/web/static/dist/
 
-# Ignore project files #
-server/project-files
 
 # Ignore local logs
 logs/
@@ -47,6 +47,14 @@ Thumbs.db
 .elasticbeanstalk/
 venv_aws/
 
+# VSCode
+.vscode
+
+# Elastic Beanstalk Files
+.elasticbeanstalk/*
+!.elasticbeanstalk/*.cfg.yml
+!.elasticbeanstalk/*.global.yml
+
 # emacs files #
 \#*\#
-*~
+*~
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ refresh-translations:
 tests:test-client test-server
 
 test-client:
-	docker-compose exec app sh -c "cd /usr/src/app/tests/client && ../../client/node_modules/.bin/karma start ./karma.conf.js --single-run --browsers PhantomJS"
+	docker-compose exec app sh -c "cd /usr/src/app/tests/client && ../../client/node_modules/.bin/karma start ./karma.conf.js --single-run --browsers FirefoxHeadless,ChromeHeadless"
 
 test-server:
 	docker-compose exec app sh -c "python -m unittest discover tests/server"

diff --git a/client/app/about/about.html b/client/app/about/about.html
@@ -35,7 +35,7 @@ <h2>{{ 'Contact Information' | translate }}</h2>
                     <h2>{{ 'Partnership and Funding' | translate }}</h2>
                     <p>
                         {{ 'The Tasking Manager was designed and built for the' | translate }}
-                        <a href="https://kaart.com" target="_blank" rel="noopener">{{'Kaart Team' | translate}}.</a>
+                        <a href="https://kaart.com" target="_blank" rel="noopener">Kaart Team.</a>
                     </p>
                     <p>
                         {{ 'With the invaluable support of:' | translate }}

diff --git a/client/app/about/faq.html b/client/app/about/faq.html
@@ -17,7 +17,7 @@ <h1 class="section__title">
                     <h3>{{'What is Tasking Manager 3 (TM3)?'| translate }}</h3>
                     <p>
                         {{'A new and improved version of the Tasking Manager was developed by HOT with support by USAID and DFAT during 2017. More information about what’s new in TM3 can be found here: '| translate }} <a
-                        href="https://tasks.kaart.com/what-is-new">https://tasks.kaart.com/what-is-new</a>.
+                            href="https://tasks.kaart.com/what-is-new">https://tasks.kaart.com/what-is-new</a>.
                     </p>
                     <h3>{{'When will TM3 be launched?'| translate }}</h3>
                     <p>

diff --git a/client/app/admin/create-project/create-project.html b/client/app/admin/create-project/create-project.html
@@ -86,8 +86,9 @@ <h4>{{ 'Step 1: Define Area' | translate }}</h4>
                         </div>
                         <div class="form__group form__group--section--sm">
                             <dl>
-                                <dt>Option 4:</dt>
+                                <dt>Option 3:</dt>
                                 <dd>
+                                    <p>Create tasks from Mapillary Sequences.</p>
                                     <p>Draw Bounding Box. <b>Necessary to create Mapillary Sequences.</b></p>
                                     <button class="button button--achromic" type="button"
                                             ng-click="createProjectCtrl.drawBBOX()"><span>{{ 'Draw' | translate }}</span>
@@ -138,10 +139,10 @@ <h4>{{ 'Step 2: Choose Tasks Type' | translate }}</h4>
                                 </li>
                                 <div ng-show="createProjectCtrl.taskType === 'mapillary-sequences'">
                                     <label class="form__option form__option--inline">{{ 'Start Date' | translate }} (YYYY-MM-DD)*</label>
-                                    <input type="text" class="form__control" ng-model="createProjectCtrl.mapillaryStartDate" rows="1">
+                                    <input type="date" class="form__control" ng-model="createProjectCtrl.mapillaryStartDate" rows="1">
                                     <br>
                                     <label class="form__option form__option--inline">{{ 'End Date' | translate }} (YYYY-MM-DD)*</label>
-                                    <input type="text" class="form__control" ng-model="createProjectCtrl.mapillaryEndDate" rows="1">
+                                    <input type="date" class="form__control" ng-model="createProjectCtrl.mapillaryEndDate" rows="1">
                                     <label class="form__option form__option--inline">{{ 'Usernames (comma separated)' | translate }}</label>
                                     <input type="text" class="form__control" ng-model="createProjectCtrl.mapillaryUsernames" rows="1">
                                     <p></p>