Skip to content

Commit db74864

Browse files
author
Matt
committed
fix redirect after login
1 parent 78e1831 commit db74864

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

client/src/App.js

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
import React from 'react'
2-
import { BrowserRouter as Router, Route } from 'react-router-dom'
2+
import { Switch, Route, withRouter } from 'react-router-dom'
33
import LoginContainer from 'components/Login/LoginContainer'
44
import ProtectedContainer from 'components/Protected/ProtectedContainer'
55
import HomeContainer from 'components/Home/HomeContainer'
6-
import Header from 'components/Header'
76
import 'App.css'
87

98
const App = () => (
10-
<Router>
11-
<div>
12-
<Header />
9+
<Switch>
1310
<Route exact path="/" component={HomeContainer} />
1411
<Route path="/login" component={LoginContainer} />
1512
<Route path="/protected" component={ProtectedContainer} />
16-
</div>
17-
</Router>
13+
</Switch>
1814
)
1915

20-
export default App
16+
export default withRouter(App)

client/src/components/Login/LoginContainer.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class LoginContainer extends React.Component {
1616
return (
1717
<div>
1818
{loggedIn ? (
19-
<Redirect to="/home" />
19+
<Redirect to="/" />
2020
) : (
2121
<LoginForm
2222
handleSubmit={handleSubmit}

client/src/index.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import { Provider } from 'react-redux'
66
import { homeReducer } from './reducers'
77
import { createStore, applyMiddleware } from 'redux'
88
import thunk from 'redux-thunk'
9+
import { BrowserRouter as Router } from 'react-router-dom'
10+
import Header from 'components/Header'
911

1012
const store = createStore(
1113
homeReducer,
@@ -15,7 +17,12 @@ const store = createStore(
1517

1618
ReactDOM.render(
1719
<Provider store={store}>
18-
<App />
20+
<Router>
21+
<div>
22+
<Header />
23+
<App />
24+
</div>
25+
</Router>
1926
</Provider>,
2027
document.getElementById('root')
2128
)

0 commit comments

Comments
 (0)