);
diff --git a/src/components/AddUserForm/AddUserForm.test.js b/src/components/AddUserForm/AddUserForm.test.js
index 695d0d303..3a209016f 100644
--- a/src/components/AddUserForm/AddUserForm.test.js
+++ b/src/components/AddUserForm/AddUserForm.test.js
@@ -31,6 +31,7 @@ describe('AddUserForm', () => {
};
});
+ /* eslint-disable jsx-a11y/control-has-associated-label */
describe('the options for the User Type form', () => {
it('includes an option for guest if the hasGuestRole prop is true', () => {
props.hasGuestRole = true;
diff --git a/src/components/App.js b/src/components/App.js
index 8649fc6ea..177ba050e 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -7,10 +7,13 @@
* LICENSE.txt file in the root directory of this source tree.
*/
+import StyleContext from 'isomorphic-style-loader/StyleContext';
import PropTypes from 'prop-types';
import React, { Children } from 'react';
import { Provider as ReduxProvider } from 'react-redux';
+import { Loader } from '@googlemaps/js-api-loader';
import IntlProviderContainer from './IntlProvider/IntlProviderContainer';
+import GoogleMapsLoaderContext from './GoogleMapsLoaderContext/GoogleMapsLoaderContext';
const ContextType = {
// Enables critical path CSS rendering
@@ -18,8 +21,10 @@ const ContextType = {
insertCss: PropTypes.func.isRequired,
// Universal HTTP client
fetch: PropTypes.func.isRequired,
+ googleApiKey: PropTypes.string.isRequired,
pathname: PropTypes.string.isRequired,
query: PropTypes.object,
+ store: PropTypes.object.isRequired,
// Integrate Redux
// http://redux.js.org/docs/basics/UsageWithReact.html
...ReduxProvider.childContextTypes,
@@ -55,6 +60,20 @@ class App extends React.PureComponent {
static childContextTypes = ContextType;
+ constructor(props) {
+ super(props);
+
+ this.loaderContextValue = {
+ loader: new Loader({
+ apiKey: this.props.context.googleApiKey,
+ version: 'weekly',
+ libraries: ['places', 'geocoder']
+ })
+ };
+
+ this.styleContextValue = { insertCss: props.context.insertCss };
+ }
+
getChildContext() {
return this.props.context;
}
@@ -63,9 +82,17 @@ class App extends React.PureComponent {
// NOTE: If you need to add or modify header, footer etc. of the app,
// please do that inside the Layout component.
return (
-
- {Children.only(this.props.children)}
-
+
+
+
+
+ {Children.only(this.props.children)}
+
+
+
+
);
}
}
diff --git a/src/components/ChangeTeamURLModal/ChangeTeamURLModal.js b/src/components/ChangeTeamURLModal/ChangeTeamURLModal.js
index b871b1109..a0a1441f8 100644
--- a/src/components/ChangeTeamURLModal/ChangeTeamURLModal.js
+++ b/src/components/ChangeTeamURLModal/ChangeTeamURLModal.js
@@ -1,16 +1,14 @@
import PropTypes from 'prop-types';
import React, { Component } from 'react';
-import withStyles from 'isomorphic-style-loader/lib/withStyles';
-import Col from 'react-bootstrap/lib/Col';
-import ControlLabel from 'react-bootstrap/lib/ControlLabel';
-import FormControl from 'react-bootstrap/lib/FormControl';
-import FormGroup from 'react-bootstrap/lib/FormGroup';
-import InputGroup from 'react-bootstrap/lib/InputGroup';
-import Modal from 'react-bootstrap/lib/Modal';
-import ModalBody from 'react-bootstrap/lib/ModalBody';
-import ModalFooter from 'react-bootstrap/lib/ModalFooter';
-import Row from 'react-bootstrap/lib/Row';
-import Button from 'react-bootstrap/lib/Button';
+import withStyles from 'isomorphic-style-loader/withStyles';
+import Col from 'react-bootstrap/Col';
+import Form from 'react-bootstrap/Form';
+import InputGroup from 'react-bootstrap/InputGroup';
+import Modal from 'react-bootstrap/Modal';
+import ModalBody from 'react-bootstrap/ModalBody';
+import ModalFooter from 'react-bootstrap/ModalFooter';
+import Row from 'react-bootstrap/Row';
+import Button from 'react-bootstrap/Button';
import { TEAM_SLUG_REGEX } from '../../constants';
import s from './ChangeTeamURLModal.scss';
@@ -20,16 +18,20 @@ class ChangeTeamURLModal extends Component {
team: PropTypes.object.isRequired,
shown: PropTypes.bool.isRequired,
hideModal: PropTypes.func.isRequired,
- updateTeam: PropTypes.func.isRequired
+ updateTeam: PropTypes.func.isRequired,
};
- state = {
- newSlug: '',
- oldSlug: ''
- };
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ newSlug: '',
+ oldSlug: '',
+ };
+ }
- handleChange = field => event => this.setState({
- [field]: event.target.value
+ handleChange = (field) => (event) => this.setState({
+ [field]: event.target.value,
});
handleSubmit = () => {
@@ -39,7 +41,7 @@ class ChangeTeamURLModal extends Component {
updateTeam({ slug: newSlug }).then(() => {
window.location.href = `//${newSlug}.${host}/team`;
});
- }
+ };
render() {
const { team, shown, hideModal } = this.props;
@@ -51,18 +53,22 @@ class ChangeTeamURLModal extends Component {
Be forewarned:
{' '}
-Changing the team URL frees up the old URL to be used
- by other teams. This means that any bookmarks your team members have created for this
- team will no longer work. We’ll send out an email notification to all users on
- the team that this change has taken place.
+ Changing the team URL frees up the
+ old URL to be used by other teams. This means that any bookmarks
+ your team members have created for this team will no longer work.
+ We’ll send out an email notification to all users on the team
+ that this change has taken place.
+
+
+ To confirm, please write the current URL of the team in the field
+ below.
-
To confirm, please write the current URL of the team in the field below.
-
- Current team URL
+
+ Current team URL
-
- .lunch.pink
+ .lunch.pink
-
-
- New team URL
+
+
+ New team URL
-
- .lunch.pink
+ .lunch.pink
-
+
-
+