Merge pull request #131 from o2Labs/129-reason-email

129 reason email

Author: chapmanio

README.md

@@ -98,14 +98,20 @@ config:
   office-booker:system-admin-emails:
     - [email protected]
     - [email protected]
+  office-booker:reason-to-book-req: true
+  office-booker:notification-to-address: [email protected]
 ```
 
-_Note: The secure `selftest-key` can be generated and set by running:_
+_*Note:*_
+
+_The secure `selftest-key` can be generated and set by running:_
 
 ```bash
 pulumi config set --secret selftest-key `openssl rand -base64 30`
 ```
 
+_If setting `reason-to-book-req` as true, you must also supply a `notification-to-address`._
+
 ## User Roles
 
 Quotas are applied to all users regardless of role.

client/.eslintrc

@@ -1,37 +1,4 @@
 {
-  "env": {
-    "browser": true,
-    "es6": true,
-    "node": true,
-    "jest": true
-  },
-  "plugins": ["@typescript-eslint", "prettier", "react", "react-hooks"],
-  "extends": [
-    "eslint:recommended",
-    "plugin:react/recommended",
-    "plugin:@typescript-eslint/recommended",
-    "prettier/@typescript-eslint",
-    "plugin:prettier/recommended"
-  ],
-  "settings": {
-    "react": {
-      "pragma": "React",
-      "version": "detect"
-    }
-  },
-  "rules": {
-    "prettier/prettier": ["error", { "singleQuote": true }],
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "react-hooks/rules-of-hooks": "error",
-    "react-hooks/exhaustive-deps": "warn"
-  },
-  "overrides": [
-    {
-      "files": ["**/*.tsx"],
-      "rules": {
-        "react/prop-types": "off"
-      }
-    }
-  ],
-  "parser": "@typescript-eslint/parser"
+  "extends": ["react-app", "react-app/jest", "plugin:prettier/recommended", "prettier"],
+  "plugins": ["prettier"]
 }

client/.prettierrc

@@ -1,8 +1,5 @@
 {
-  "trailingComma": "es5",
   "printWidth": 100,
   "singleQuote": true,
-  "semi": true,
-  "tabWidth": 2,
-  "useTabs": false
+  "semi": true
 }

client/.stylelintrc

@@ -3,8 +3,7 @@
     "stylelint-processor-styled-components"
   ],
   "extends": [
-    "stylelint-config-recommended",
-    "stylelint-config-styled-components",
-    "stylelint-config-prettier"
+    "stylelint-prettier/recommended",
+    "stylelint-config-styled-components"
   ]
 }

client/package.json

@@ -12,18 +12,19 @@
     "eject": "react-scripts eject"
   },
   "dependencies": {
-    "@aws-amplify/auth": "^3.2.5",
+    "@aws-amplify/auth": "^3.4.16",
     "@date-io/date-fns": "1.x",
     "@loadable/component": "^5.14.1",
     "@material-ui/core": "^4.6.1",
     "@material-ui/icons": "^4.9.1",
     "@material-ui/lab": "^4.0.0-alpha.54",
     "@material-ui/pickers": "^3.2.10",
     "@reach/router": "^1.3.3",
+    "@testing-library/user-event": "^12.6.0",
     "@types/loadable__component": "^5.13.1",
-    "amazon-cognito-identity-js": "^4.2.2",
+    "amazon-cognito-identity-js": "^4.5.6",
     "array-fns": "^1.0.0",
-    "core-js": "^3.6.5",
+    "core-js": "^3.8.2",
     "date-fns": "^2.12.0",
     "lodash": "^4.17.19",
     "react": "17.x",
@@ -33,34 +34,29 @@
     "whatwg-fetch": "^3.4.1"
   },
   "devDependencies": {
-    "@testing-library/jest-dom": "^5.11.5",
+    "@testing-library/jest-dom": "^5.11.8",
     "@testing-library/react": "^11.1.1",
     "@types/date-fns": "^2.6.0",
-    "@types/jest": "^26.0.13",
-    "@types/node": "^14.x",
+    "@types/jest": "^26.0.20",
+    "@types/node": "^14.14.20",
     "@types/reach__router": "^1.3.5",
-    "@types/react": "^16.9.34",
-    "@types/react-dom": "^16.9.7",
-    "@types/styled-components": "^5.1.0",
-    "@typescript-eslint/eslint-plugin": "^4.1.0",
-    "@typescript-eslint/parser": "^4.1.0",
+    "@types/react": "^17.0.0",
+    "@types/react-dom": "^17.0.0",
+    "@types/styled-components": "^5.1.7",
     "babel-plugin-styled-components": "^1.10.6",
-    "eslint": "7.x",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-config-react": "^1.1.7",
-    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-prettier": "^3.1.3",
-    "eslint-plugin-react": "^7.19.0",
+    "eslint-config-prettier": "^7.1.0",
+    "eslint-plugin-prettier": "^3.3.1",
     "jest-styled-components": "^7.0.2",
-    "msw": "^0.21.3",
+    "msw": "^0.25.0",
     "prettier": "^2.0.5",
     "react-scripts": "4.x",
     "stylelint": "^13.3.3",
     "stylelint-config-prettier": "^8.0.1",
-    "stylelint-config-recommended": "^3.0.0",
     "stylelint-config-styled-components": "^0.1.1",
+    "stylelint-prettier": "^1.1.2",
     "stylelint-processor-styled-components": "^1.8.0",
-    "typescript": "4.x"
+    "typescript": "4.1.3",
+    "web-vitals": "^1.0.1"
   },
   "proxy": "http://localhost:3030/"
 }

client/src/components/App/Home/MakeBooking.styles.ts

@@ -36,6 +36,18 @@ export default styled.div`
     font-weight: bold;
   }
 
+  > p.notice {
+    ${(props) => props.theme.breakpoints.up('xs')} {
+      margin: 1.6rem 0 0;
+    }
+
+    ${(props) => props.theme.breakpoints.up('sm')} {
+      margin: 2rem 0 0;
+    }
+
+    color: #e21c33;
+  }
+
   > ul {
     ${(props) => props.theme.breakpoints.up('xs')} {
       margin: 1.6rem 0 0;