Skip to content
Snippets Groups Projects
Commit 82dfcd41 authored by Ismail's avatar Ismail
Browse files

Profile name displayed after login.

parent 41ae71cc
No related branches found
No related tags found
No related merge requests found
......@@ -3,8 +3,6 @@ import Navbar from '../layout/Navbar';
import ManageShift from '../layout/ManageShift';
import ShiftReport from '../layout/ShiftReport';
import { connect } from 'react-redux';
import { firestoreConnect } from 'react-redux-firebase';
import { compose } from 'redux';
import { Redirect } from 'react-router-dom';
class Dashboard extends Component {
......@@ -13,7 +11,7 @@ class Dashboard extends Component {
if( !auth.uid ) return <Redirect to='/signin' />
return (
<div id="content">
<Navbar profile={ profile } />
<Navbar profile = { profile } />
<ManageShift />
<ShiftReport />
</div>
......
import React from 'react'
import { connect } from 'react-redux';
import { signOut } from '../../store/actions/authAction';
import { Link } from 'react-router-dom';
const Navbar = (props) => {
return(
<nav className="navbar navbar-expand-lg navbar-light bg-primary">
<div className="container">
<Link className="navbar-brand" to="/">
<h5>Employee Management</h5>
</Link>
<h5 className="text-center">Welcome { props.profile.firstName} { props.profile.lastName }</h5>
<button type="button" onClick={ props.signOut } className="btn btn-success btn-sm float-right btn-logout">Logout</button>
</div>
......
......@@ -8,14 +8,14 @@ import rootReducer from './store/reducers/rootReducer';
import { Provider } from 'react-redux';
import thunk from 'redux-thunk';
import { reduxFirestore, getFirestore, createFirestoreInstance } from 'redux-firestore';
import { ReactReduxFirebaseProvider, getFirebase, reactReduxFirebase } from 'react-redux-firebase';
import fbConfig from './config/firebaseConfig';
import { ReactReduxFirebaseProvider, getFirebase } from 'react-redux-firebase';
import firebaseConfig from './config/firebaseConfig';
import firebase from 'firebase/app';
const store = createStore(rootReducer,
compose(
applyMiddleware(thunk.withExtraArgument({getFirebase, getFirestore})),
reduxFirestore(fbConfig)
reduxFirestore(firebaseConfig)
));
const profileSpecificProps = {
......@@ -27,7 +27,7 @@ const profileSpecificProps = {
const rrfProps = {
firebase,
config: fbConfig,
config: firebaseConfig,
config: profileSpecificProps,
dispatch: store.dispatch,
createFirestoreInstance
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment