Merge branch 'develop' into billing-account-beta

Author: SleepyZenitsu

.circleci/config.yml

@@ -28,11 +28,20 @@ builddeploy_steps: &builddeploy_steps
       - setup_remote_docker
       - run: *install_dependency
       - run: *install_deploysuite
-      - run: ./build.sh ${APPNAME}
+      - run:
+          name: "configuring environment"
+          command: |
+            ./awsconfiguration.sh $DEPLOY_ENV
+            ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-buildvar
+      - run: 
+          name: "building image"
+          command: |
+            source buildenvvar
+            ./build.sh ${APPNAME}
       - deploy:
           name: Running MasterScript.
           command: |
-            ./awsconfiguration.sh $DEPLOY_ENV
+            #./awsconfiguration.sh $DEPLOY_ENV
             source awsenvconf
             ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-deployvar
             source buildenvvar

build.sh

@@ -4,7 +4,7 @@ APP_NAME=$1
 UPDATE_CACHE=""
 echo "NODE ENV: $NODE_ENV"
 echo "BABEL ENV: $BABEL_ENV"
-docker-compose -f docker/docker-compose.yml build --build-arg NODE_ENV=$NODE_ENV --build-arg BABEL_ENV=$BABEL_ENV $APP_NAME
+docker-compose -f docker/docker-compose.yml build --build-arg NODE_ENV=$NODE_ENV --build-arg BABEL_ENV=$BABEL_ENV --build-arg FILE_PICKER_API_KEY=$FILE_PICKER_API_KEY --build-arg FORCE_DEV=$FORCE_DEV $APP_NAME
 docker create --name app  $APP_NAME:latest
 
 if [ -d node_modules ]

config/constants/development.js

@@ -31,5 +31,9 @@ module.exports = {
   DS_TRACK_ID: 'c0f5d461-8219-4c14-878a-c3a3f356466d',
   QA_TRACK_ID: '36e6a8d0-7e1e-4608-a673-64279d99c115',
   SEGMENT_API_KEY: 'QBtLgV8vCiuRX1lDikbMjcoe9aCHkF6n',
-  CREATE_FORUM_TYPE_IDS: ['927abff4-7af9-4145-8ba1-577c16e64e2e', 'dc876fa4-ef2d-4eee-b701-b555fcc6544c']
+  CREATE_FORUM_TYPE_IDS: ['927abff4-7af9-4145-8ba1-577c16e64e2e', 'dc876fa4-ef2d-4eee-b701-b555fcc6544c'],
+  FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY,
+  FILE_PICKER_CONTAINER_NAME: 'tc-challenge-v5-dev',
+  FILE_PICKER_REGION: 'us-east-1',
+  FILE_PICKER_CNAME: 'fs.topcoder.com'
 }

config/constants/production.js

@@ -31,5 +31,9 @@ module.exports = {
   DS_TRACK_ID: 'c0f5d461-8219-4c14-878a-c3a3f356466d',
   QA_TRACK_ID: '36e6a8d0-7e1e-4608-a673-64279d99c115',
   SEGMENT_API_KEY: 'QSQAW5BWmZfLoKFNRgNKaqHvLDLJoGqF',
-  CREATE_FORUM_TYPE_IDS: ['927abff4-7af9-4145-8ba1-577c16e64e2e', 'dc876fa4-ef2d-4eee-b701-b555fcc6544c']
+  CREATE_FORUM_TYPE_IDS: ['927abff4-7af9-4145-8ba1-577c16e64e2e', 'dc876fa4-ef2d-4eee-b701-b555fcc6544c'],
+  FILE_PICKER_API_KEY: process.env.FILE_PICKER_API_KEY,
+  FILE_PICKER_CONTAINER_NAME: 'tc-challenge-v5-prod',
+  FILE_PICKER_REGION: 'us-east-1',
+  FILE_PICKER_CNAME: 'fs.topcoder.com'
 }

docker/Dockerfile

@@ -3,8 +3,13 @@ FROM node:latest
 ARG NODE_ENV
 ARG BABEL_ENV
 
+ARG FILE_PICKER_API_KEY
+ARG FORCE_DEV
+
 ENV NODE_ENV=$NODE_ENV
 ENV BABEL_ENV=$BABEL_ENV
+ENV FILE_PICKER_API_KEY=$FILE_PICKER_API_KEY
+ENV FORCE_DEV=$FORCE_DEV
 
 # Copy the current directory into the Docker image
 COPY . /challenge-engine-ui

package-lock.json

@@ -38,7 +38,7 @@
     "eslint-plugin-standard": "^4.0.0",
     "express": "^4.16.4",
     "file-loader": "2.0.0",
-    "form-data": "^2.4.0",
+    "filestack-js": "^3.20.0",
     "fs-extra": "7.0.0",
     "html-webpack-plugin": "4.0.0-alpha.2",
     "identity-obj-proxy": "3.0.0",
@@ -71,7 +71,6 @@
     "react-debounce-input": "^3.2.0",
     "react-dev-utils": "^7.0.1",
     "react-dom": "^16.7.0",
-    "react-dropzone": "^10.1.5",
     "react-google-charts": "^3.0.13",
     "react-helmet": "^5.2.0",
     "react-js-pagination": "^3.0.3",