Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mr-julyedu
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
baiguangyao
mr-julyedu
Commits
f289fea0
Commit
f289fea0
authored
Jun 10, 2019
by
zhanghaozhe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加本地代理服务器cookie设置,privateRoute,登录相关redux逻辑
parent
cbb48655
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
12 deletions
+5
-12
src/components/passport/accountLogin/index.js
+2
-11
src/router/privateRoute.js
+3
-1
No files found.
src/components/passport/accountLogin/index.js
View file @
f289fea0
...
@@ -15,7 +15,6 @@ import PasswordInput from '../common/passwordInput'
...
@@ -15,7 +15,6 @@ import PasswordInput from '../common/passwordInput'
// import LoginWays from '../common/LoginWays'
// import LoginWays from '../common/LoginWays'
class
AccountLogin
extends
PureComponent
{
class
AccountLogin
extends
PureComponent
{
render
()
{
render
()
{
return
(
return
(
...
@@ -75,19 +74,11 @@ const formikConfig = {
...
@@ -75,19 +74,11 @@ const formikConfig = {
})
})
}
}
}
}
const
mapStateToProps
=
state
=>
({
user
:
state
.
user
})
const
mapDispatchToProps
=
{
accountLogin
}
export
default
compose
(
export
default
compose
(
connect
(
connect
(
mapStateToProps
,
state
=>
({
user
:
state
.
user
})
,
mapDispatchToProps
{
accountLogin
}
),
),
withFormik
(
formikConfig
)
withFormik
(
formikConfig
)
)(
AccountLogin
)
)(
AccountLogin
)
src/router/privateRoute.js
View file @
f289fea0
import
React
from
'react'
;
import
React
from
'react'
;
import
{
Route
,
Redirect
}
from
"react-router-dom"
;
import
{
Route
,
Redirect
}
from
"react-router-dom"
;
import
{
connect
}
from
"react-redux"
;
import
{
connect
}
from
"react-redux"
;
import
jsCookie
from
'js-cookie'
const
PrivateRoute
=
({
component
:
Component
,
path
,
user
,
...
rest
})
=>
{
const
PrivateRoute
=
({
component
:
Component
,
path
,
user
,
...
rest
})
=>
{
let
authenticated
=
Object
.
keys
(
user
.
data
).
some
(
item
=>
!!
user
.
data
[
item
])
// let authenticated = Object.keys(user.data).some(item => !!user.data[item])
let
authenticated
=
jsCookie
.
get
(
'token'
)
&&
jsCookie
.
get
(
'uid'
)
return
(
return
(
<
Route
{...
rest
}
render
=
{
props
=>
{
<
Route
{...
rest
}
render
=
{
props
=>
{
return
authenticated
return
authenticated
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment