Merge pull request #181 from topcoder-platform/dev

Earn Restructure PR

Author: urwithat

README.md

@@ -16,31 +16,30 @@ This is a [single-spa](https://single-spa.js.org/) example React microapp.
 | Command               | Description                                                       |
 | --------------------- | ----------------------------------------------------------------- |
 | `npm start`           | Run server which serves production ready build from `dist` folder |
-| `npm run dev`         | Run app in the development mode                                   |
-| `npm run dev-https`   | Run app in the development mode using HTTPS protocol              |
-| `npm run build`       | Build app for production and puts files to the `dist` folder      |
+| `npm run dev`         | Run app in the `development` mode and `dev` config  |
+| `npm run dev-https`   | Run app in the `development` mode and `dev` config using HTTPS protocol |
+| `npm run local`       | Run app in the `development` mode and `local-dev` config   |
+| `npm run prod`        | Run app in the `development` mode and `prod` config  |
+| `npm run build`       | Build app for production and puts files to the `dist` folder, default to `development` mode and `local-dev` config |
 | `npm run analyze`     | Analyze dependencies sizes and opens report in the browser        |
 | `npm run lint`        | Check code for lint errors                                        |
 | `npm run format`      | Format code using prettier                                        |
 | `npm run test`        | Run unit tests                                                    |
 | `npm run watch-tests` | Watch for file changes and run unit tests on changes              |
 | `npm run coverage`    | Generate test code coverage report                                |
-| `npm run mock-api`    | Start the mock api which mocks Recruit api                        |
 
 ## Local Deployment
 
 Inside the project folder run:
-
-- `export APPMODE="development"; export APPENV="local";` - to load APPMODE & APPENV
 - `nvm use 10.22.1;` - to use npm version: 10.22.1
 - `npm i` - install dependencies
-- `npm run dev` - run app in development mode
-- As this app can be loaded only inside a frame single-spa, you have to run a `micro-frontends-frame` frame app and configure it to use the URL `http://localhost:8008/topcoder-micro-frontends-earn-app.js`.
+- `npm run local` - run app in `development` mode and `local-dev` config
+- As this app can be loaded only inside a frame single-spa, you have to run a `micro-frontends-frame` frame app and configure it to use the URL `http://localhost:8008/earn-app/topcoder-micro-frontends-earn-app.js`.
 
 ## Deployment to Production
 
 - `npm i` - install dependencies
-- `npm build` - build code to `dist/` folder
+- `APPMODE=production APPENV=prod npm run build` - build code to `dist/` folder
 - Now you can host `dist/` folder using any static server. For example, you may run a simple `Express` server by running `npm start`.
 
 ### Deploying to Heroku
@@ -58,21 +57,3 @@ 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/earn-app/topcoder-micro-frontends-earn-app.js` to load this microapp.
-
-### Aggregator API
-
-Please refer to [Swagger Doc](./src/api/docs/swagger.yaml) for Aggregator API endpoints
-
-#### Aggregator API Configuration
-
-In the `micro-frontends-earn-app` root directory create `.env` file with the next environment variables.
-
-  ```bash
-  # Auth0 config
-  AUTH_SECRET=
-  AUTH0_URL=
-  AUTH0_AUDIENCE=
-  AUTH0_CLIENT_ID=
-  AUTH0_CLIENT_SECRET=
-  ```
-Once the earn app is started, the aggregator api will work as well

babel.config.js

@@ -1,8 +1,8 @@
 let cssLocalIdent;
-if (process.env.APPMODE == 'development') {
-  cssLocalIdent = 'earn_[path][name]___[local]___[hash:base64:6]';
-} else {
+if (process.env.APPMODE === 'production') {
   cssLocalIdent = '[hash:base64:6]';
+} else {
+  cssLocalIdent = 'earn_[path][name]___[local]___[hash:base64:6]';
 }
 
 const config = {

config/default.js

@@ -1,52 +1,8 @@
 require("dotenv").config();
+
 module.exports = {
-  GUIKIT: {
-    DEBOUNCE_ON_CHANGE_TIME: 150,
-  },
-  API: {
-    V5: "https://api.topcoder-dev.com/v5",
-    V3: "https://api.topcoder-dev.com/v3",
-  },
-  URL: {
-    BASE: "https://www.topcoder-dev.com",
-    COMMUNITY_APP: "https://community-app.topcoder-dev.com",
-    PLATFORM_WEBSITE_URL: "https://platform.topcoder-dev.com",
-  },
-  RECRUIT_API: "https://www.topcoder-dev.com",
-  // the server api base path
-  API_BASE_PATH: process.env.API_BASE_PATH || "/earn-app/api/my-gigs",
-  // the log level, default is 'debug'
-  LOG_LEVEL: process.env.LOG_LEVEL || "debug",
-  // The authorization secret used during token verification.
-  AUTH_SECRET:
-    process.env.AUTH_SECRET,
-  // The valid issuer of tokens, a json array contains valid issuer.
-  VALID_ISSUERS:
-    process.env.VALID_ISSUERS,
-  // Auth0 URL, used to get TC M2M token
-  AUTH0_URL:
-    process.env.AUTH0_URL,
-  // Auth0 audience, used to get TC M2M token
-  AUTH0_AUDIENCE: process.env.AUTH0_AUDIENCE,
-  // Auth0 client id, used to get TC M2M token
-  AUTH0_CLIENT_ID:
-    process.env.AUTH0_CLIENT_ID,
-  // Auth0 client secret, used to get TC M2M token
-  AUTH0_CLIENT_SECRET:
-    process.env.AUTH0_CLIENT_SECRET,
-  // Proxy Auth0 URL, used to get TC M2M token
-  AUTH0_PROXY_SERVER_URL: process.env.AUTH0_PROXY_SERVER_URL,
-  m2m: {
-    M2M_AUDIT_USER_ID:
-      process.env.M2M_AUDIT_USER_ID ,
-    M2M_AUDIT_HANDLE: process.env.M2M_AUDIT_HANDLE,
-  },
-  MOCK_API_PORT: process.env.MOCK_API_PORT || 4000,
-  ALLOWED_FILE_TYPES: process.env.ALLOWED_FILE_TYPES || [
-    "pdf",
-    "doc",
-    "docx",
-    "txt",
-  ],
-  MAX_ALLOWED_FILE_SIZE_MB: process.env.MAX_ALLOWED_FILE_SIZE_MB || 10,
+  MFE_CONFIG: {
+    '@topcoder/micro-frontends-challenges-app': 'https://platform.topcoder-dev.com/challenges-app/topcoder-micro-frontends-challenges-app.js',
+    '@topcoder/micro-frontends-gigs-app': 'https://platform.topcoder-dev.com/gigs-app/topcoder-micro-frontends-gigs-app.js',
+  }
 };

config/dev.js

@@ -0,0 +1,2 @@
+module.exports = {
+};

config/development.js

@@ -0,0 +1,6 @@
+module.exports = {
+  MFE_CONFIG: {
+    '@topcoder/micro-frontends-challenges-app': 'http://localhost:8009/challenges-app/topcoder-micro-frontends-challenges-app.js',
+    '@topcoder/micro-frontends-gigs-app': 'http://localhost:8010/gigs-app/topcoder-micro-frontends-gigs-app.js',
+  }
+};

config/local-dev.js

@@ -0,0 +1,6 @@
+module.exports = {
+  MFE_CONFIG: {
+    '@topcoder/micro-frontends-challenges-app': 'http://platform.topcoder.com/challenges-app/topcoder-micro-frontends-challenges-app.js',
+    '@topcoder/micro-frontends-gigs-app': 'http://platform.topcoder.com/gigs-app/topcoder-micro-frontends-gigs-app.js',
+  }
+};

config/prod.js

@@ -3,29 +3,9 @@ FROM node:10.22.1
 
 ARG APPMODE
 ARG APPENV
-ARG RECRUIT_API
-ARG AUTH_SECRET
-ARG VALID_ISSUERS
-ARG AUTH0_URL
-ARG AUTH0_AUDIENCE
-ARG AUTH0_CLIENT_ID
-ARG AUTH0_CLIENT_SECRET
-ARG AUTH0_PROXY_SERVER_URL
-ARG M2M_AUDIT_USER_ID
-ARG M2M_AUDIT_HANDLE
 
 ENV APPMODE=$APPMODE
 ENV APPENV=$APPENV
-ENV RECRUIT_API=$RECRUIT_API
-ENV AUTH_SECRET=$AUTH_SECRET
-ENV VALID_ISSUERS=$VALID_ISSUERS
-ENV AUTH0_URL=$AUTH0_URL
-ENV AUTH0_AUDIENCE=$AUTH0_AUDIENCE
-ENV AUTH0_CLIENT_ID=$AUTH0_CLIENT_ID
-ENV AUTH0_CLIENT_SECRET=$AUTH0_CLIENT_SECRET
-ENV AUTH0_PROXY_SERVER_URL=$AUTH0_PROXY_SERVER_URL
-ENV M2M_AUDIT_USER_ID=$M2M_AUDIT_USER_ID
-ENV M2M_AUDIT_HANDLE=$M2M_AUDIT_HANDLE
 
 # Copy the current directory into the Docker image
 COPY . /micro-frontends-earn-app