Merge staging to master (#56)

* user form for volunteer

* remove e2e
2

* remove yarn.lock

* circl ci

* circl ci fix error

* fix bugs and move files one step back

* fix eslint

* fix eslint

* fix eslint

* form is done

* fix bugs, fix gitHub comments and clean the code

* fix bugs, fix gitHub comments and clean the code

* add welcome message

* add back vscode/launch, config and cypress files

* Nima's suggestion

* Alec feedbacks

* fix bugs

* add mobile view

* fix bugs and show error message

* fix bug, validation form

* make the phone number as required field, Change become a volunteer in reading about to close button

* new design (#52)

* change CYF to code your future, change font size of some of inputs (#53)

* change CYF to code your future, change font size of some of inputs

* wording

* Style/cyf (#54)

* change CYF to code your future, change font size of some of inputs

* Change some text in the form

* Feature/dashboard volunteer (#55)

* change CYF to code your future, change font size of some of inputs

* Change some text in the form

* connecting dashboard to volunteer form

* fix bugs

Author: Wolfjawan

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 
 commands:
   s3deploy:
-    description: "Deploy to S3"
+    description: 'Deploy to S3'
     parameters:
       to:
         type: string
@@ -30,23 +30,12 @@ jobs:
     working_directory: ~/repo
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            - yarn-dependencies-{{ checksum "yarn.lock" }}
       - run:
           name: Install dependencies for lint and test
           command: yarn
-      - save_cache:
-          key: yarn-dependencies-{{ checksum "yarn.lock" }}
-          paths:
-            - ~/.npm
-      - run:
-          name: Lint project & run test
-          command: yarn test
       - run:
           name: Set env variables
-          command:
-            echo 'export VERSION=$(echo $CIRCLE_SHA1 | cut -c -7)' >> $BASH_ENV
+          command: echo 'export VERSION=$(echo $CIRCLE_SHA1 | cut -c -7)' >> $BASH_ENV
       - run:
           name: build staging
           command: REACT_APP_NODE_ENV=STAGING yarn build:staging
@@ -59,28 +48,6 @@ jobs:
             - staging
             - production
 
-  e2e:
-    docker:
-      - image: cypress/base:10
-    working_directory: ~/repo
-    steps:
-      - checkout
-      - restore_cache:
-          keys:
-            - e2e-dependencies-{{ checksum "yarn.lock" }}
-            - e2e-dependencies-
-      - run:
-          name: Install dependencies
-          command: yarn
-      - save_cache:
-          key: e2e-dependencies-{{ checksum "yarn.lock" }}
-          paths:
-            - ~/.npm
-            - ~/.cache
-      - run:
-          name: End-to-end test
-          command: yarn e2e
-
   deploy_staging:
     docker:
       - image: circleci/python:3.6-jessie
@@ -98,7 +65,7 @@ jobs:
           command: sudo pip install awscli
       - s3deploy:
           dir: staging
-          to: "staging.forms.codeyourfuture.io"
+          to: 'staging.forms.codeyourfuture.io'
           cf_distribution_id: E3MJAA9E60TZUB
 
   deploy_production:
@@ -118,7 +85,7 @@ jobs:
           command: sudo pip install awscli
       - s3deploy:
           dir: production
-          to: "forms.codeyourfuture.io"
+          to: 'forms.codeyourfuture.io'
           cf_distribution_id: E3MHHTOV68A76Q
 
 workflows:
@@ -127,13 +94,10 @@ workflows:
     jobs:
       - test:
           context: build
-      - e2e:
-          context: build
       - deploy_staging:
           context: deployments_staging
           requires:
             - test
-            - e2e
           filters:
             branches:
               only:
@@ -142,7 +106,6 @@ workflows:
           context: deployments
           requires:
             - test
-            - e2e
           filters:
             branches:
               only:

.eslintrc

@@ -0,0 +1,17 @@
+{
+  "extends": ["prettier"],
+  "parser": "babel-eslint",
+  "env": {
+    "jest": true,
+    "browser": true
+  },
+  "rules": {
+    "prettier": [
+      0
+    ]
+  },
+  "plugins": ["prettier"],
+  "globals": {
+    "window": true
+  }
+}

.gitignore

@@ -28,3 +28,20 @@ yarn-error.log*
 
 # JetBrains
 .idea/
+node_modules
+node_modules/*
+keys/*
+flow-typed/*
+config/*
+scripts/*
+# .vscode/*
+build/*
+staging/*
+production/*
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.env
+package-lock.json
+yarn.lock

.prettierrc

@@ -0,0 +1,8 @@
+{
+  "bracketSpacing": true,
+  "singleQuote": true,
+  "tabWidth": 2,
+  "useTabs": false,
+  "trailingComma": "none",
+  "semi": false
+}

.vscode/launch.json

@@ -13,4 +13,4 @@
       "webRoot": "${workspaceFolder}"
     }
   ]
-}
+}

config-overrides.js

@@ -3,24 +3,24 @@
  * @see https://github.com/timarney/react-app-rewired/ for more details
  */
 
-const FilterWarningsPlugin = require('webpack-filter-warnings-plugin');
+const FilterWarningsPlugin = require('webpack-filter-warnings-plugin')
 
 module.exports = {
-    webpack: (config, env) => ({
-        ...config,
-        plugins: config.plugins.concat([
-            new FilterWarningsPlugin({
-                exclude: /Conflicting order between/,
-            }),
-        ]),
-        optimization: {
-            ...config.optimization,
-            runtimeChunk: false,
-            splitChunks: {
-                cacheGroups: {
-                    default: false
-                },
-            },
-        },
-    }),
-};
+  webpack: (config, env) => ({
+    ...config,
+    plugins: config.plugins.concat([
+      new FilterWarningsPlugin({
+        exclude: /Conflicting order between/
+      })
+    ]),
+    optimization: {
+      ...config.optimization,
+      runtimeChunk: false,
+      splitChunks: {
+        cacheGroups: {
+          default: false
+        }
+      }
+    }
+  })
+}

e2e/.eslintrc

@@ -1,49 +1,49 @@
-const express = require("express");
-const cors = require("cors");
+const express = require('express')
+const cors = require('cors')
 
-const port = parseInt(process.env.MOCK_PORT || "3001");
+const port = parseInt(process.env.MOCK_PORT || '3001')
 
 const app = express()
   .use(cors())
-  .use(express.json({ type: "*/*" }));
+  .use(express.json({ type: '*/*' }))
 
-const calls = [];
+const calls = []
 
-app.post("/google", (req, res) => {
+app.post('/google', (req, res) => {
   console.log({
     body: req.body,
     headers: req.headers
-  });
+  })
   calls.push({
     body: req.body,
     headers: req.headers
-  });
-  res.sendStatus(204);
-});
+  })
+  res.sendStatus(204)
+})
 
-app.post("/volunteer", (req, res) => {
+app.post('/volunteer', (req, res) => {
   console.log({
     body: req.body,
     headers: req.headers
-  });
+  })
   calls.push({
     body: req.body,
     headers: req.headers
-  });
-  res.sendStatus(204);
-});
+  })
+  res.sendStatus(204)
+})
 
-app.get("/_calls", (req, res) => {
-  res.json(calls);
-});
+app.get('/_calls', (req, res) => {
+  res.json(calls)
+})
 
-app.post("/_reset", (req, res) => {
+app.post('/_reset', (req, res) => {
   while (calls.length > 0) {
-    calls.pop();
+    calls.pop()
   }
-  res.sendStatus(204);
-});
+  res.sendStatus(204)
+})
 
 app.listen(port, () => {
-  console.log(`Listening on ${port}`);
-});
+  console.log(`Listening on ${port}`)
+})