Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Moecube Accounts Web
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Moecube Accounts Web
Commits
33d3118b
Commit
33d3118b
authored
Apr 07, 2017
by
nano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix lint
parent
8c6eb8a2
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
30 additions
and
21 deletions
+30
-21
.eslintrc
.eslintrc
+1
-0
src/components/EmailForm.js
src/components/EmailForm.js
+1
-1
src/components/SendEmail.js
src/components/SendEmail.js
+1
-1
src/components/UserPanel.js
src/components/UserPanel.js
+4
-2
src/models/auth.js
src/models/auth.js
+13
-7
src/models/user.js
src/models/user.js
+10
-10
No files found.
.eslintrc
View file @
33d3118b
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
"react/forbid-prop-types": [0],
"react/forbid-prop-types": [0],
"react/jsx-filename-extension": [1, { "extensions": [".js"] }],
"react/jsx-filename-extension": [1, { "extensions": [".js"] }],
"global-require": [1],
"global-require": [1],
"react/jsx-closing-bracket-location":[0],
"import/prefer-default-export": [0],
"import/prefer-default-export": [0],
"react/jsx-no-bind": [0],
"react/jsx-no-bind": [0],
"react/prop-types": [0],
"react/prop-types": [0],
...
...
src/components/EmailForm.js
View file @
33d3118b
...
@@ -81,7 +81,7 @@ class EmailForm extends React.Component {
...
@@ -81,7 +81,7 @@ class EmailForm extends React.Component {
{
getFieldDecorator
(
'
email
'
,
{
...
emailProps
.
decorator
})(
{
getFieldDecorator
(
'
email
'
,
{
...
emailProps
.
decorator
})(
<
Input
<
Input
{...
emailProps
.
input
}
{...
emailProps
.
input
}
onBlur
=
{()
=>
dispatch
({
type
:
'
auth/checkEmail
'
,
payload
:
{
...
form
.
getFieldsValue
(),
id
}
})}
onBlur
=
{()
=>
dispatch
({
type
:
'
auth/checkEmail
'
,
payload
:
{
...
form
.
getFieldsValue
(),
user_id
:
id
}
})}
/>
,
/>
,
)}
)}
<
/FormItem
>
<
/FormItem
>
...
...
src/components/SendEmail.js
View file @
33d3118b
...
@@ -61,7 +61,7 @@ class EmailForm extends React.Component {
...
@@ -61,7 +61,7 @@ class EmailForm extends React.Component {
{
getFieldDecorator
(
'
email
'
,
{
...
emailProps
.
decorator
})(
{
getFieldDecorator
(
'
email
'
,
{
...
emailProps
.
decorator
})(
<
Input
<
Input
{...
emailProps
.
input
}
{...
emailProps
.
input
}
onBlur
=
{()
=>
dispatch
({
type
:
'
auth/checkEmail
'
,
payload
:
{
...
form
.
getFieldsValue
(),
id
}
})}
onBlur
=
{()
=>
dispatch
({
type
:
'
auth/checkEmail
'
,
payload
:
{
...
form
.
getFieldsValue
(),
user_id
:
id
}
})}
/>
,
/>
,
)}
)}
<
/FormItem
>
<
/FormItem
>
...
...
src/components/UserPanel.js
View file @
33d3118b
...
@@ -37,8 +37,10 @@ function UserPanel({ dispatch, user, token }) {
...
@@ -37,8 +37,10 @@ function UserPanel({ dispatch, user, token }) {
<div className=
"
ant
-
dropdown
-
link
"
style={{ display: 'flex', alignItems: 'center' }}>
<div className=
"
ant
-
dropdown
-
link
"
style={{ display: 'flex', alignItems: 'center' }}>
<img
<img
alt=
"
avatar
"
src={avatar || defaultAvatar}
alt=
"
avatar
"
src={avatar || defaultAvatar}
style={{ borderRadius: '40px', height: '40px', weight: 'auto' }}
style={{ borderRadius: '45px',
/>
height: '45px',
weight: '45px',
border: '2px solid rgba(255,255,255,0.2' }} />
</div>
</div>
</Dropdown>
</Dropdown>
);
);
...
...
src/models/auth.js
View file @
33d3118b
...
@@ -165,10 +165,10 @@ export default {
...
@@ -165,10 +165,10 @@ export default {
try
{
try
{
const
{
data
}
=
yield
call
(
activate
,
payload
);
const
{
data
}
=
yield
call
(
activate
,
payload
);
if
(
data
)
{
if
(
data
)
{
message
.
success
(
messages
[
'
Your-account-has-been-successfully-activated!
'
],
5
);
message
.
success
(
messages
[
'
Your-account-has-been-successfully-activated!
'
],
3
);
}
}
}
catch
(
error
)
{
}
catch
(
error
)
{
message
.
error
(
error
.
message
);
message
.
error
(
error
.
message
,
3
);
}
}
},
},
*
checkEmail
({
payload
},
{
call
,
put
})
{
*
checkEmail
({
payload
},
{
call
,
put
})
{
...
@@ -178,7 +178,10 @@ export default {
...
@@ -178,7 +178,10 @@ export default {
}
}
try
{
try
{
const
{
data
}
=
yield
call
(
checkUserExists
,
{
email
:
payload
.
email
,
user_id
:
payload
.
user_id
});
const
{
data
}
=
yield
call
(
checkUserExists
,
{
email
:
payload
.
email
,
user_id
:
payload
.
user_id
,
});
if
(
data
)
{
if
(
data
)
{
yield
put
({
type
:
'
check
'
,
payload
:
{
isEmailExists
:
true
,
checkEmail
:
'
warning
'
}
});
yield
put
({
type
:
'
check
'
,
payload
:
{
isEmailExists
:
true
,
checkEmail
:
'
warning
'
}
});
}
}
...
@@ -193,7 +196,10 @@ export default {
...
@@ -193,7 +196,10 @@ export default {
}
}
try
{
try
{
const
{
data
}
=
yield
call
(
checkUserExists
,
{
username
:
payload
.
username
,
user_id
:
payload
.
user_id
});
const
{
data
}
=
yield
call
(
checkUserExists
,
{
username
:
payload
.
username
,
user_id
:
payload
.
user_id
,
});
if
(
data
)
{
if
(
data
)
{
yield
put
({
type
:
'
check
'
,
payload
:
{
isUserNameExists
:
true
,
checkUsername
:
'
warning
'
}
});
yield
put
({
type
:
'
check
'
,
payload
:
{
isUserNameExists
:
true
,
checkUsername
:
'
warning
'
}
});
}
}
...
@@ -212,7 +218,7 @@ export default {
...
@@ -212,7 +218,7 @@ export default {
}
}
}
catch
(
error
)
{
}
catch
(
error
)
{
yield
put
({
type
:
'
loginFail
'
});
yield
put
({
type
:
'
loginFail
'
});
message
.
error
(
messages
[
error
.
message
]
||
error
.
message
);
message
.
error
(
messages
[
error
.
message
]
||
error
.
message
,
3
);
}
}
},
},
*
forgot
({
payload
},
{
call
,
put
,
select
})
{
*
forgot
({
payload
},
{
call
,
put
,
select
})
{
...
@@ -221,7 +227,7 @@ export default {
...
@@ -221,7 +227,7 @@ export default {
const
{
data
}
=
yield
call
(
forgot
,
payload
);
const
{
data
}
=
yield
call
(
forgot
,
payload
);
if
(
data
)
{
if
(
data
)
{
yield
put
({
type
:
'
forgotSuccess
'
});
yield
put
({
type
:
'
forgotSuccess
'
});
message
.
info
(
messages
[
'
A-password-reset-email-has-been-sent-to-you.
'
],
5
);
message
.
info
(
messages
[
'
A-password-reset-email-has-been-sent-to-you.
'
],
3
);
}
}
}
catch
(
error
)
{
}
catch
(
error
)
{
yield
put
({
type
:
'
forgotFail
'
});
yield
put
({
type
:
'
forgotFail
'
});
...
@@ -237,7 +243,7 @@ export default {
...
@@ -237,7 +243,7 @@ export default {
yield
put
({
type
:
'
user/loginSuccess
'
,
payload
:
{
data
}
});
yield
put
({
type
:
'
user/loginSuccess
'
,
payload
:
{
data
}
});
yield
put
({
type
:
'
loginSuccess
'
,
payload
:
{
input
:
payload
}
});
yield
put
({
type
:
'
loginSuccess
'
,
payload
:
{
input
:
payload
}
});
message
.
info
(
messages
[
'
Your-account-has-been-created.
'
],
5
);
message
.
info
(
messages
[
'
Your-account-has-been-created.
'
],
3
);
yield
put
(
routerRedux
.
replace
(
'
/verify
'
));
yield
put
(
routerRedux
.
replace
(
'
/verify
'
));
}
}
}
catch
(
error
)
{
}
catch
(
error
)
{
...
...
src/models/user.js
View file @
33d3118b
...
@@ -93,7 +93,7 @@ export default {
...
@@ -93,7 +93,7 @@ export default {
*
loginSuccess
({
payload
},
{
put
})
{
*
loginSuccess
({
payload
},
{
put
})
{
const
{
data
:
{
user
,
token
}
}
=
payload
;
const
{
data
:
{
user
,
token
}
}
=
payload
;
if
(
!
payload
.
data
)
{
if
(
!
payload
.
data
)
{
message
.
error
(
'
error
'
);
message
.
error
(
'
error
'
,
3
);
}
}
if
(
token
)
{
if
(
token
)
{
yield
put
({
type
:
'
storeToken
'
,
payload
:
{
token
}
});
yield
put
({
type
:
'
storeToken
'
,
payload
:
{
token
}
});
...
@@ -108,7 +108,7 @@ export default {
...
@@ -108,7 +108,7 @@ export default {
if
(
user
.
active
)
{
if
(
user
.
active
)
{
yield
put
(
routerRedux
.
replace
(
'
/profiles
'
));
yield
put
(
routerRedux
.
replace
(
'
/profiles
'
));
// message.info("登录成功")
// message.info("登录成功
, 3
")
}
else
{
}
else
{
yield
put
(
routerRedux
.
replace
(
'
/verify
'
));
yield
put
(
routerRedux
.
replace
(
'
/verify
'
));
}
}
...
@@ -124,7 +124,7 @@ export default {
...
@@ -124,7 +124,7 @@ export default {
}
}
}
catch
(
error
)
{
}
catch
(
error
)
{
yield
put
({
type
:
'
getAuthUserFail
'
});
yield
put
({
type
:
'
getAuthUserFail
'
});
// message.error(error.message)
// message.error(error.messag
, 3
e)
}
}
},
},
*
preLogin
({
payload
},
{
call
,
put
})
{
*
preLogin
({
payload
},
{
call
,
put
})
{
...
@@ -149,7 +149,7 @@ export default {
...
@@ -149,7 +149,7 @@ export default {
}
}
}
catch
(
error
)
{
}
catch
(
error
)
{
yield
put
(
routerRedux
.
replace
(
'
/signin
'
));
yield
put
(
routerRedux
.
replace
(
'
/signin
'
));
// message.error(error.message)
// message.error(error.messag
, 3
e)
}
}
},
},
*
updateProfile
({
payload
},
{
call
,
put
,
select
})
{
*
updateProfile
({
payload
},
{
call
,
put
,
select
})
{
...
@@ -162,11 +162,11 @@ export default {
...
@@ -162,11 +162,11 @@ export default {
if
(
data
)
{
if
(
data
)
{
yield
put
({
type
:
'
updateProfileSuccess
'
,
payload
:
{
user
:
data
,
token
}
});
yield
put
({
type
:
'
updateProfileSuccess
'
,
payload
:
{
user
:
data
,
token
}
});
message
.
info
(
messages
.
update_success
);
message
.
info
(
messages
.
update_success
,
3
);
}
}
}
catch
(
error
)
{
}
catch
(
error
)
{
yield
put
({
type
:
'
updateProfileFail
'
});
yield
put
({
type
:
'
updateProfileFail
'
});
message
.
error
(
error
.
message
);
message
.
error
(
error
.
message
,
3
);
}
}
},
},
*
updateEmail
({
payload
},
{
call
,
put
,
select
})
{
*
updateEmail
({
payload
},
{
call
,
put
,
select
})
{
...
@@ -176,11 +176,11 @@ export default {
...
@@ -176,11 +176,11 @@ export default {
const
{
data
}
=
yield
call
(
updateAccount
,
{
...
payload
,
token
});
const
{
data
}
=
yield
call
(
updateAccount
,
{
...
payload
,
token
});
if
(
data
)
{
if
(
data
)
{
yield
put
({
type
:
'
updateAccountSuccess
'
,
payload
:
{
user
:
data
,
token
}
});
yield
put
({
type
:
'
updateAccountSuccess
'
,
payload
:
{
user
:
data
,
token
}
});
message
.
info
(
messages
[
'
A-verification-email-has-been-sent-to-you,please-check-the-mail-to-complete.
'
]);
message
.
info
(
messages
[
'
A-verification-email-has-been-sent-to-you,please-check-the-mail-to-complete.
'
]
,
3
);
}
}
}
catch
(
error
)
{
}
catch
(
error
)
{
yield
put
({
type
:
'
updateAccountFail
'
});
yield
put
({
type
:
'
updateAccountFail
'
});
message
.
error
(
messages
[
error
.
message
]
||
error
.
message
);
message
.
error
(
messages
[
error
.
message
]
||
error
.
message
,
3
);
}
}
},
},
...
@@ -191,11 +191,11 @@ export default {
...
@@ -191,11 +191,11 @@ export default {
const
{
data
}
=
yield
call
(
updateAccount
,
{
...
payload
,
token
});
const
{
data
}
=
yield
call
(
updateAccount
,
{
...
payload
,
token
});
if
(
data
)
{
if
(
data
)
{
yield
put
({
type
:
'
updateAccountSuccess
'
,
payload
:
{
user
:
data
,
token
}
});
yield
put
({
type
:
'
updateAccountSuccess
'
,
payload
:
{
user
:
data
,
token
}
});
message
.
info
(
messages
.
update_success
);
message
.
info
(
messages
.
update_success
,
3
);
}
}
}
catch
(
error
)
{
}
catch
(
error
)
{
yield
put
({
type
:
'
updateAccountFail
'
});
yield
put
({
type
:
'
updateAccountFail
'
});
message
.
error
(
messages
[
error
.
message
]
||
error
.
message
);
message
.
error
(
messages
[
error
.
message
]
||
error
.
message
,
3
);
}
}
},
},
},
},
...
...
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