From 82dfcd41b51ad5560e50c0bdd430d49389b84da5 Mon Sep 17 00:00:00 2001
From: Ismail <msiamil.official@gmail.com>
Date: Thu, 20 Aug 2020 20:15:32 +0500
Subject: [PATCH] Profile name displayed after login.
---
employeemanagement/src/components/dashboard/Dashboard.js | 4 +---
employeemanagement/src/components/layout/Navbar.js | 4 +++-
employeemanagement/src/index.js | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/employeemanagement/src/components/dashboard/Dashboard.js b/employeemanagement/src/components/dashboard/Dashboard.js
index c0a4dc0..696ba1e 100644
--- a/employeemanagement/src/components/dashboard/Dashboard.js
+++ b/employeemanagement/src/components/dashboard/Dashboard.js
@@ -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>
diff --git a/employeemanagement/src/components/layout/Navbar.js b/employeemanagement/src/components/layout/Navbar.js
index d9a1085..78cd1be 100644
--- a/employeemanagement/src/components/layout/Navbar.js
+++ b/employeemanagement/src/components/layout/Navbar.js
@@ -1,12 +1,14 @@
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>
diff --git a/employeemanagement/src/index.js b/employeemanagement/src/index.js
index f20d44a..59887c4 100644
--- a/employeemanagement/src/index.js
+++ b/employeemanagement/src/index.js
@@ -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
--
GitLab