From cd0b45627f0d8da8c8dc4edde223f3c36e9bcfbf Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Sun, 25 Apr 2021 16:01:14 +0200 Subject: build: Migrate to flat project structure This change updates the project structure to become flattened. Previously, the simulator, frontend and API each lived into their own directory. With this change, all modules of the project live in the top-level directory of the repository. This should improve discoverability of modules of the project. --- frontend/src/containers/auth/Login.js | 62 ----------------------------- frontend/src/containers/auth/Logout.js | 13 ------ frontend/src/containers/auth/ProfileName.js | 14 ------- 3 files changed, 89 deletions(-) delete mode 100644 frontend/src/containers/auth/Login.js delete mode 100644 frontend/src/containers/auth/Logout.js delete mode 100644 frontend/src/containers/auth/ProfileName.js (limited to 'frontend/src/containers/auth') diff --git a/frontend/src/containers/auth/Login.js b/frontend/src/containers/auth/Login.js deleted file mode 100644 index 2f9726bf..00000000 --- a/frontend/src/containers/auth/Login.js +++ /dev/null @@ -1,62 +0,0 @@ -import PropTypes from 'prop-types' -import React from 'react' -import GoogleLogin from 'react-google-login' -import { connect } from 'react-redux' -import { logIn } from '../../actions/auth' - -class LoginContainer extends React.Component { - static propTypes = { - visible: PropTypes.bool.isRequired, - onLogin: PropTypes.func.isRequired, - } - - onAuthResponse(response) { - this.props.onLogin({ - email: response.getBasicProfile().getEmail(), - givenName: response.getBasicProfile().getGivenName(), - familyName: response.getBasicProfile().getFamilyName(), - googleId: response.googleId, - authToken: response.getAuthResponse().id_token, - expiresAt: response.getAuthResponse().expires_at, - }) - } - - onAuthFailure(error) { - console.error(error) - } - - render() { - if (!this.props.visible) { - return - } - - return ( - ( - - Login with Google - - )} - > - ) - } -} - -const mapStateToProps = (state, ownProps) => { - return { - visible: ownProps.visible, - } -} - -const mapDispatchToProps = (dispatch) => { - return { - onLogin: (payload) => dispatch(logIn(payload)), - } -} - -const Login = connect(mapStateToProps, mapDispatchToProps)(LoginContainer) - -export default Login diff --git a/frontend/src/containers/auth/Logout.js b/frontend/src/containers/auth/Logout.js deleted file mode 100644 index 22400381..00000000 --- a/frontend/src/containers/auth/Logout.js +++ /dev/null @@ -1,13 +0,0 @@ -import { connect } from 'react-redux' -import { logOut } from '../../actions/auth' -import LogoutButton from '../../components/navigation/LogoutButton' - -const mapDispatchToProps = (dispatch) => { - return { - onLogout: () => dispatch(logOut()), - } -} - -const Logout = connect(undefined, mapDispatchToProps)(LogoutButton) - -export default Logout diff --git a/frontend/src/containers/auth/ProfileName.js b/frontend/src/containers/auth/ProfileName.js deleted file mode 100644 index 06da75ab..00000000 --- a/frontend/src/containers/auth/ProfileName.js +++ /dev/null @@ -1,14 +0,0 @@ -import React from 'react' -import { connect } from 'react-redux' - -const mapStateToProps = (state) => { - return { - text: state.auth.givenName + ' ' + state.auth.familyName, - } -} - -const SpanElement = ({ text }) => {text} - -const ProfileName = connect(mapStateToProps)(SpanElement) - -export default ProfileName -- cgit v1.2.3