Merge pull request #3 from commitdev/fix-env-configs

Fix env configs

Author: Direside

.circleci/config.yml

@@ -119,6 +119,14 @@ jobs:
     docker:
       - image: *build-image
     working_directory: *workspace
+    parameters:
+      config:
+        description: |
+          The config file you want to build the app using. 
+          E.g. 'development' would load configurations from 'config/development.json'
+        type: enum
+        enum: ["development", "staging", "production"]
+        default: production
     steps: # steps that comprise the `build` job
       - attach_workspace:
           at: *workspace
@@ -131,12 +139,13 @@ jobs:
           name: Build static side
           command: |
             yarn
-            yarn build
+            REACT_APP_CONFIG=<< parameters.config >> yarn build
+            mv build build_<< parameters.config >>
 
       - persist_to_workspace:
           root: /home/circleci/project
           paths:
-            - build
+            - build_<< parameters.config >>
 
       - save_cache: # Store cache in the /go/pkg directory
           key: v1-pkg-cache-{{ checksum "yarn.lock" }}
@@ -150,14 +159,21 @@ jobs:
     docker:
       - image: cimg/python:3.6
     parameters:
+      config:
+        description: |
+          The config file you want to build the app using. 
+          E.g. 'development' would load configurations from 'config/development.json'
+        type: enum
+        enum: ["development", "staging", "production"]
+        default: production
       bucket:
         description: The S3 Bucket to sync files to.
         type: string
     steps:
       - attach_workspace:
           at: *workspace
       - aws-s3/sync:
-          from: build
+          from: build_<< parameters.config >>
           overwrite: true
           to: 's3://<< parameters.bucket >>'
 
@@ -173,13 +189,22 @@ workflows:
               - checkout_code
 
         - build:
+            name: build_staging
+            config: staging
             requires:
-              - unit_test
+              - checkout_code
+
+        - build:
+            name: build_production
+            config: production
+            requires:
+              - checkout_code
 
         - deploy:
             name: deploy_staging
+            config: staging
             requires:
-              - build
+              - build_staging
             bucket: <% index .Params `stagingFrontendHost` %>
             # Depending on your development flow you may want to also only deploy to staging on master.
             # filters:
@@ -190,8 +215,8 @@ workflows:
         - deploy:
             name: deploy_production
             requires:
-              - build
-              - deploy_staging
+              - unit_test
+              - build_production
             bucket: <% index .Params `productionFrontendHost` %>
             filters:
               branches:

README.md

@@ -1,11 +1,11 @@
 ## Commit Zero
 
-This app is created to work with Commit Zero. You'll need to run the `stack` application against a `config.yaml` file to generate the code.
+This app is created to work with Commit Zero. You'll need to run the `zero` application against a `zero.yml` file to generate the code.
 
-### Stack Command
+### Zero Command
 
 ```bash
-stack -config <config file> <source directory> <destination directory>
+zero -config <config file> <source directory> <destination directory>
 ```
 
 #### Config File
@@ -37,73 +37,62 @@ _Once you've templated this out, you can remove the above section from this READ
 
 # <% .Name %>
 
-## React App
+## Create React App
 
 This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
 
-## Available Scripts
+See full documentation [here](docs/create-react-app.md)
 
-In the project directory, you can run:
+### Commands
 
-### `yarn start`
+#### Install Dependencies
 
-Runs the app in the development mode.<br />
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
-
-The page will reload if you make edits.<br />
-You will also see any lint errors in the console.
-
-### `yarn test`
-
-Launches the test runner in the interactive watch mode.<br />
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
-
-### `yarn build`
-
-Builds the app for production to the `build` folder.<br />
-It correctly bundles React in production mode and optimizes the build for the best performance.
-
-The build is minified and the filenames include the hashes.<br />
-Your app is ready to be deployed!
-
-See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
-
-### `yarn eject`
-
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+```zsh
+yarn
+```
 
-If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+#### Run locally
 
-Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+```zsh
+yarn start
+```
 
-You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+#### Run Tests
 
-## Learn More
+```zsh
+yarn test
+```
 
-You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+## Backend App
 
-To learn React, check out the [React documentation](https://reactjs.org/).
+To run the backend app locally all you need to do is build the container and run it alongside your app.
 
-### Code Splitting
+### Backend Repo
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
+The corresponding backend for this app is [zero-deployable-backend](https://github.com/commitdev/zero-deployable-backend)
 
-### Analyzing the Bundle Size
+```zsh
+git clone [email protected]:commitdev/zero-deployable-backend.git
+```
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
+### Docker
 
-### Making a Progressive Web App
+Build the docker image locally and run it. We need to set a Pod name so that the frontend can display that data.
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
+```zsh
+docker build . -t zero-deployable-backend
 
-### Advanced Configuration
+docker run -p 8080:8080 -e SERVER_PORT=8080 -e POD_NAME="Fake POD name." zero-deployable-backend
+```
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
+### Environment Configs
 
-### Deployment
+These are set by `REACT_APP_CONFIG` enviroment variable at build time. This corresponds to a json file in the config directory.
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
+For example to build the staging site and host it you would use:
 
-### `yarn build` fails to minify
+```zsh
+REACT_APP_CONFIG=staging yarn build
 
-This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
+serve -s build
+```

docs/create-react-app.md

@@ -0,0 +1,70 @@
+# Create React App
+
+This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
+
+## Available Scripts
+
+In the project directory, you can run:
+
+### `yarn start`
+
+Runs the app in the development mode.<br />
+Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+
+The page will reload if you make edits.<br />
+You will also see any lint errors in the console.
+
+### `yarn test`
+
+Launches the test runner in the interactive watch mode.<br />
+See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
+
+### `yarn build`
+
+Builds the app for production to the `build` folder.<br />
+It correctly bundles React in production mode and optimizes the build for the best performance.
+
+The build is minified and the filenames include the hashes.<br />
+Your app is ready to be deployed!
+
+See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
+
+### `yarn eject`
+
+**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+
+If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
+
+Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
+
+You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
+
+## Learn More
+
+You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
+
+To learn React, check out the [React documentation](https://reactjs.org/).
+
+### Code Splitting
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
+
+### Analyzing the Bundle Size
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
+
+### Making a Progressive Web App
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
+
+### Advanced Configuration
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
+
+### Deployment
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
+
+### `yarn build` fails to minify
+
+This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify

src/App.js

@@ -7,9 +7,9 @@ import InfoPanel from "./components/Info";
 
 // Set config based on the environment variable the build was run under.
 let config = {};
-if (process.env.NODE_ENV === "production") {
+if (process.env.REACT_APP_CONFIG === "production") {
   config = require("./config/production.json");
-} else if (process.env.NODE_ENV === "staging") {
+} else if (process.env.REACT_APP_CONFIG === "staging") {
   config = require("./config/staging.json");
 } else {
   config = require("./config/development.json");