Merge branch 'bugbash' into yoution-issue-24

Author: luizrrodrigues

.circleci/config.yml

@@ -29,8 +29,16 @@ builddeploy_steps: &builddeploy_steps
   - run: *install_dependency
   - run: *install_deploysuite
   - restore_cache: *restore_cache_settings_for_build
-  - run: ./build.sh ${APPNAME}
-  - save_cache: *save_cache_settings
+  - run:
+      command: |
+        ./awsconfiguration.sh $DEPLOY_ENV
+        source awsenvconf
+        ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-buildvar
+  - run:
+      command: |
+        source buildenvvar
+        ./build.sh ${APPNAME}
+  #- save_cache: *save_cache_settings
   - deploy:
       name: Running MasterScript.
       command: |
@@ -69,7 +77,7 @@ workflows:
             branches:
               only:
                 - dev
-                - challenge-listing-part-1
+                - challenge-listing-part-2
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.

README.md

@@ -56,5 +56,5 @@ Make sure you have [Heroky CLI](https://devcenter.heroku.com/articles/heroku-cli
 
 - `git push heroku master` - push changes to Heroku and trigger deploying
 
-- Now you have to configure frame app to use the URL provided by Heroku like `https://<APP-NAME>.herokuapp.com/topcoder-micro-frontends-earn-app.js` to load this microapp.
+- Now you have to configure frame app to use the URL provided by Heroku like `https://<APP-NAME>.herokuapp.com/earn-app/topcoder-micro-frontends-earn-app.js` to load this microapp.
 

build.sh

@@ -3,7 +3,9 @@ set -eo pipefail
 APP_NAME=$1
 UPDATE_CACHE=""
 
-docker build -f docker/Dockerfile -t $APP_NAME:latest .
+docker build -f docker/Dockerfile -t $APP_NAME:latest \
+--build-arg APPMODE=$APPMODE \
+--build-arg APPENV=$APPENV .
 
 docker create --name app $APP_NAME:latest
 

config/default.js

@@ -3,10 +3,10 @@ module.exports = {
     DEBOUNCE_ON_CHANGE_TIME: 150,
   },
   API: {
-    V5: 'https://api.topcoder-dev.com/v5',
-    V3: 'https://api.topcoder-dev.com/v3',
+    V5: "https://api.topcoder-dev.com/v5",
+    V3: "https://api.topcoder-dev.com/v3",
   },
   URL: {
-    COMMUNITY_APP: 'https://community-app.topcoder-dev.com',
+    COMMUNITY_APP: "https://community-app.topcoder-dev.com",
   }
 }

config/development.js

@@ -0,0 +1,12 @@
+module.exports = {
+  GUIKIT: {
+    DEBOUNCE_ON_CHANGE_TIME: 150,
+  },
+  API: {
+    V5: "https://api.topcoder-dev.com/v5",
+    V3: "https://api.topcoder-dev.com/v3",
+  },
+  URL: {
+    COMMUNITY_APP: "https://community-app.topcoder-dev.com",
+  },
+};

config/jest/setup.js

@@ -0,0 +1,3 @@
+const config = require("config");
+
+global.process.env = {...global.process.env, ...config};

config/production.js

@@ -0,0 +1,12 @@
+module.exports = {
+  GUIKIT: {
+    DEBOUNCE_ON_CHANGE_TIME: 150,
+  },
+  API: {
+    V5: "https://api.topcoder.com/v5",
+    V3: "https://api.topcoder.com/v3",
+  },
+  URL: {
+    COMMUNITY_APP: "https://community-app.topcoder.com",
+  },
+};

docker/Dockerfile

@@ -1,6 +1,12 @@
 # Use the base image with Node.js
 FROM node:latest
 
+ARG APPMODE
+ARG APPENV
+
+ENV APPMODE=$APPMODE
+ENV APPENV=$APPENV
+
 # Copy the current directory into the Docker image
 COPY . /micro-frontends-earn-app
 

jest.config.js

@@ -4,10 +4,12 @@ module.exports = {
     "^.+\\.(j|t)sx?$": "babel-jest",
   },
   moduleNameMapper: {
-    "\\.(css)$": "identity-obj-proxy",
-    "\\.svg$": "<rootDir>/__mocks__/fileMock.js",
+    "\\.(css|scss)$": "identity-obj-proxy",
+    "\\.(png|eot|otf|ttf|woff|woff2|svg)$": "<rootDir>/__mocks__/fileMock.js",
+
   },
   setupFilesAfterEnv: [
     "../node_modules/@testing-library/jest-dom/dist/index.js",
+    "../config/jest/setup.js",
   ],
 };