Merge 8256afa into 27b2cb9

andela · Nov 7, 2018 · 3204680 · 3204680
2 parents 27b2cb9 + 8256afa
commit 3204680
Show file tree

Hide file tree

Showing 18 changed files with 537 additions and 59 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@
 .env.development.local
 .env.test.local
 .env.production.local
+package-lock.json
 
 npm-debug.log*
 yarn-debug.log*

diff --git a/package.json b/package.json
@@ -13,6 +13,8 @@
     "prop-types": "^15.6.2",
     "react": "^16.6.0",
     "react-dom": "^16.6.0",
+    "react-facebook-login": "^4.1.1",
+    "react-google-login": "^3.2.1",
     "react-notify-toast": "^0.5.0",
     "react-redux": "^5.1.0",
     "react-router-dom": "^4.3.1",

diff --git a/public/index.html b/public/index.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8">
     <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+    <link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
     <link rel="stylesheet"
           href="https://fonts.googleapis.com/css?family=Open+Sans">

diff --git a/src/actions/actionCreators.js b/src/actions/actionCreators.js
@@ -0,0 +1,13 @@
+import {
+  SOCIAL_LOGIN_INITIATED,
+  SOCIAL_LOGIN_SUCCESS,
+} from './types';
+
+export const socialLoginInitiated = () => ({
+  type: SOCIAL_LOGIN_INITIATED,
+});
+
+
+export const socialLoginSuccess = () => ({
+  type: SOCIAL_LOGIN_SUCCESS,
+});
diff --git a/src/actions/types.js b/src/actions/types.js
@@ -2,3 +2,5 @@ export const REGISTER_USER_SUCCESS = 'REGISTER_USER_SUCCESS';
 export const REGISTER_USER_ERROR = 'REGISTER_USER_ERROR';
 export const LOGIN_USER_SUCCESS = 'LOGIN_USER_SUCCESS';
 export const LOGIN_USER_ERROR = 'LOGIN_USER_ERROR';
+export const SOCIAL_LOGIN_INITIATED = 'SOCIAL_LOGIN_INITIATED';
+export const SOCIAL_LOGIN_SUCCESS = 'SOCIAL_LOGIN_SUCCESS';
diff --git a/src/actions/userActions.js b/src/actions/userActions.js
@@ -5,8 +5,13 @@ import {
   LOGIN_USER_SUCCESS,
   LOGIN_USER_ERROR,
 } from './types';
+import {
+  socialLoginInitiated,
+  socialLoginSuccess,
+} from './actionCreators';
 import axiosInstance from '../config/axiosInstance';
 
+
 export const fetchUsers = (postData) => dispatch => {
   toast.dismiss();
   axiosInstance
@@ -59,3 +64,31 @@ export const loginUser = payload => async dispatch => {
       );
     });
 };
+
+export const googleLoginUser = (serviceProvider, userData) => (dispatch) => {
+  dispatch(socialLoginInitiated(true));
+  return axiosInstance.post(serviceProvider, userData)
+    .then((res) => {
+      localStorage.setItem('auth_token', res.data.user.access_token);
+      dispatch(socialLoginSuccess(true));
+    })
+    .catch(() => {
+      toast.error('We can not logg  you in if you registered with another social account', { autoClose: 3500, hideProgressBar: true }, {
+        position: toast.POSITION.TOP_CENTER,
+      });
+    });
+};
+
+export const facebookLoginUser = (serviceProvider, userData) => (dispatch) => {
+  dispatch(socialLoginInitiated(true));
+  return axiosInstance.post(serviceProvider, userData)
+    .then((res) => {
+      localStorage.setItem('auth_token', res.data.user.access_token);
+      dispatch(socialLoginSuccess(true));
+    })
+    .catch(() => {
+      toast.error('We can not logg  you in if you registered with another social account', { autoClose: 3500, hideProgressBar: true }, {
+        position: toast.POSITION.TOP_CENTER,
+      });
+    });
+};
diff --git a/src/assets/App.css b/src/assets/App.css
@@ -115,3 +115,39 @@ header.uvp {
 .forgot-password{
   color: firebrick;
 }
+.icon-with-margin {
+  margin-right: 10px;
+}
+.google{
+  background-color: #d34836;
+  display: inline-block;
+  background: rgb(209, 72, 54);
+  color: rgb(255, 255, 255);
+  width: 150px;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  border-radius: 5px;
+  border: 1px solid transparent;
+  font-size: 20px;
+  font-weight: bold;
+  font-family: Roboto;
+  transition: background-color .3s,border-color .3s;
+}
+
+.facebook{
+  font-family: Roboto;
+  font-weight: bold;
+  display: inline-block;
+  border-radius: 5px;
+  color: #fff;
+  width: 145px;
+  padding-top: 5px;
+  padding-bottom: 5px;
+  cursor: pointer;
+  font-size: 20px;
+  text-decoration: none;
+  transition: background-color .3s,border-color .3s;
+  background-color: #4c69ba;
+  display: inline-block;
+  border:solid 1px #4c69ba;
+}
diff --git a/src/components/login/Facebook.js b/src/components/login/Facebook.js
@@ -0,0 +1,72 @@
+import React, { PureComponent } from 'react';
+import { Redirect } from 'react-router-dom';
+import { connect } from 'react-redux';
+import FacebookLogin from 'react-facebook-login';
+import PropTypes from 'prop-types';
+import { facebookLoginUser } from '../../actions/userActions';
+
+class Facebook extends PureComponent {
+  constructor(props) {
+    super(props);
+    this.state = {
+      redirect: false,
+    };
+  }
+
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.isLoggedIn) {
+      this.setState({
+        redirect: true,
+      });
+    }
+  }
+
+  signup = (userToken, serviceProvider) => {
+    let userData;
+    userData = {
+      user: {
+        access_token: userToken,
+      },
+    };
+    const { facebookLoginUser } = this.props;
+    facebookLoginUser(serviceProvider, userData);
+  }
+
+  responseFacebook = (response) => {
+    const token = response.accessToken;
+    this.signup(token, '/api/auth/facebook/');
+  }
+
+  render() {
+    const value = this.state;
+    if (value.redirect) {
+      const to = { pathname: '/' };
+      return (
+        <Redirect to={to} />
+      );
+    }
+    return (
+      <FacebookLogin
+        appId="2147542838793839"
+        fields="name,email,picture"
+        callback={this.responseFacebook}
+        icon="fa fa-facebook-square icon-with-margin"
+        cssClass="facebook"
+        textButton="Facebook"
+
+      />
+    );
+  }
+}
+
+const mapStateToProps = (state) => ({
+  isLoggedIn: state.user.isLoggedIn,
+  loading: state.user.loading,
+});
+
+Facebook.propTypes = {
+  isLoggedIn: PropTypes.bool.isRequired,
+  facebookLoginUser: PropTypes.func.isRequired,
+};
+export { Facebook as FacebookTest };
+export default connect(mapStateToProps, { facebookLoginUser })(Facebook);
diff --git a/src/components/login/Google.js b/src/components/login/Google.js
@@ -0,0 +1,84 @@
+import React, { PureComponent } from 'react';
+import { Redirect } from 'react-router-dom';
+import { connect } from 'react-redux';
+import GoogleLogin from 'react-google-login';
+import PropTypes from 'prop-types';
+
+import { googleLoginUser } from '../../actions/userActions';
+
+class Googlelogin extends PureComponent {
+  constructor(props) {
+    super(props);
+    this.state = {
+      redirect: false,
+    };
+  }
+
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.isLoggedIn) {
+      this.setState({
+        redirect: true,
+      });
+    }
+  }
+
+  signup = (userToken, serviceProvider) => {
+    let userData;
+    if (serviceProvider === '/api/auth/google/') {
+      userData = {
+        user: {
+          access_token: userToken,
+        },
+      };
+    }
+
+    const { googleLoginUser } = this.props;
+    googleLoginUser(serviceProvider, userData);
+  }
+
+  googleResponse = (response) => {
+    const token = response.tokenId;
+    this.signup(token, '/api/auth/google/');
+  }
+
+  render() {
+    const value = this.state;
+    if (value.redirect) {
+      const to = { pathname: '/' };
+      return (
+        <Redirect to={to} />
+      );
+    }
+    return (
+      <div>
+        <GoogleLogin
+          clientId="1040550554735-0lfo665jrpgkprjkqdvh9njlc46mu6rg.apps.googleusercontent.com"
+          redirectUri="/"
+          onSuccess={this.googleResponse}
+          onFailure={this.googleResponse}
+          className="google"
+        >
+          <i className="fa fa-google-plus  icon-with-margin" />
+          <span className="raised-font"> Google</span>
+
+        </GoogleLogin>
+        &nbsp;
+
+      </div>
+
+    );
+  }
+}
+
+const mapStateToProps = (state) => ({
+  isLoggedIn: state.user.isLoggedIn,
+  loading: state.user.loading,
+});
+
+Googlelogin.propTypes = {
+  isLoggedIn: PropTypes.bool.isRequired,
+  googleLoginUser: PropTypes.func.isRequired,
+};
+
+export { Googlelogin as GoogleTest };
+export default connect(mapStateToProps, { googleLoginUser })(Googlelogin);
diff --git a/src/components/login/Login.js b/src/components/login/Login.js
@@ -5,6 +5,8 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import '../../assets/App.css';
 import { loginUser } from '../../actions/userActions';
+import Googlelogin from './Google';
+import Faceboook from './Facebook';
 
 export class Login extends Component {
   constructor(props) {
@@ -92,6 +94,14 @@ export class Login extends Component {
               <div className="form-group">
                 <Link className="forgot-password" to="/forgotPassword">Forgot password?</Link>
               </div>
+              <div className="row">
+                <div className="col-md-6">
+                  <Googlelogin />
+                </div>
+                <div className="col-md-6 ">
+                  <Faceboook />
+                </div>
+              </div>
             </form>
           </div>
         </div>

diff --git a/src/config/axiosInstance.js b/src/config/axiosInstance.js
@@ -1,7 +1,7 @@
 import axios from 'axios';
 
 const axiosInstance = axios.create({
-  baseURL: 'https://ah-backend-targaryen-staging.herokuapp.com',
+  baseURL: 'http://127.0.0.1:8000',
   timeout: 60000,
   headers: { 'Content-Type': 'application/json' },
 });

diff --git a/src/reducers/userReducer.js b/src/reducers/userReducer.js
@@ -3,15 +3,21 @@ import {
   REGISTER_USER_ERROR,
   LOGIN_USER_SUCCESS,
   LOGIN_USER_ERROR,
+  SOCIAL_LOGIN_INITIATED,
+  SOCIAL_LOGIN_SUCCESS,
 } from '../actions/types';
 
+
 const initialState = {
   registerUserSuccess: false,
   isLoginSuccess: false,
   registerUserError: {},
   loginError: {},
+  isLoggedIn: false,
+  loading: false,
 };
 
+
 const userReducer = (state = initialState, action) => {
   switch (action.type) {
     case REGISTER_USER_SUCCESS:
@@ -35,6 +41,18 @@ const userReducer = (state = initialState, action) => {
         ...state,
         loginError: action.payload,
       };
+    case SOCIAL_LOGIN_INITIATED:
+      return {
+        ...state,
+        loading: true,
+      };
+    case SOCIAL_LOGIN_SUCCESS:
+      return {
+        ...state,
+        isLoggedIn: true,
+        loading: false,
+      };
+
     default:
       return state;
   }