Commit 35196841 authored by nano's avatar nano

fix

parent c87135f2
...@@ -151,8 +151,13 @@ export default { ...@@ -151,8 +151,13 @@ export default {
}, },
*checkEmail({ payload }, { call, put }) { *checkEmail({ payload }, { call, put }) {
if(!payload.email){
yield put({ type: 'check', payload: { checkEmail: 'error' } })
return
}
try { try {
const { data } = yield call(checkUserExists, payload) const { data } = yield call(checkUserExists, {email: payload.email})
if (data) { if (data) {
yield put({ type: 'check', payload: { isEmailExists: true, checkEmail: 'warning' } }) yield put({ type: 'check', payload: { isEmailExists: true, checkEmail: 'warning' } })
} }
...@@ -161,14 +166,18 @@ export default { ...@@ -161,14 +166,18 @@ export default {
} }
}, },
*checkUsername({ payload }, { call, put }) { *checkUsername({ payload }, { call, put }) {
if(!payload.username){
yield put({ type: 'check', payload: { checkUsername: 'error' } })
return
}
try { try {
const { data } = yield call(checkUserExists, payload) const { data } = yield call(checkUserExists, { username: payload.username})
if (data) { if (data) {
yield put({ type: 'check', payload: { isUserNameExists: true, checkUsername: 'warning' } }) yield put({ type: 'check', payload: { isUserNameExists: true, checkUsername: 'warning' } })
} }
} catch (error) { } catch (error) {
yield put({ type: 'check', payload: { isUserNameExists: false, checkUsername: 'success' } }) yield put({ type: 'check', payload: { isUserNameExists: false, checkUsername: 'success' } })
} }
}, },
*login({ payload }, { call, put }) { *login({ payload }, { call, put }) {
...@@ -196,7 +205,6 @@ export default { ...@@ -196,7 +205,6 @@ export default {
} }
}, },
*register({ payload }, { call, put }) { *register({ payload }, { call, put }) {
try { try {
const { data } = yield call(register, payload) const { data } = yield call(register, payload)
if (data) { if (data) {
......
...@@ -23,7 +23,7 @@ function RouterConfig({ history }) { ...@@ -23,7 +23,7 @@ function RouterConfig({ history }) {
<Route path="/"> <Route path="/">
<Route path="/signin" component={Login}/> <Route path="/signin" component={Login}/>
<Route path="/forgot" component={Forgot}/> <Route path="/forgot" component={Forgot}/>
<Route path="/register" component={Register}/> <Route path="/signup" component={Register}/>
<Route path="/reset" component={Reset}/> <Route path="/reset" component={Reset}/>
<Route path="/profiles" component={Profiles}/> <Route path="/profiles" component={Profiles}/>
</Route> </Route>
......
...@@ -67,7 +67,7 @@ class Login extends React.Component { ...@@ -67,7 +67,7 @@ class Login extends React.Component {
<Format id={'send-email'} /> <Format id={'send-email'} />
</Button> </Button>
<FormItem> <FormItem>
<Link to="/signin"><Format id={'login'} /></Link> <Link to="/signin"><Format id={'sign-in'} /></Link>
</FormItem> </FormItem>
</Form> </Form>
</Spin> </Spin>
......
...@@ -59,7 +59,7 @@ class Login extends React.Component { ...@@ -59,7 +59,7 @@ class Login extends React.Component {
</Button> </Button>
</FormItem> </FormItem>
<Form> <Form>
<Link to="/register"><Format id={'Register'} /></Link> <Link to="/signup"><Format id={'sign-up'} /></Link>
<Link to="/forgot" className="login-form-forgot"><Format id={'forgot-password'} /></Link> <Link to="/forgot" className="login-form-forgot"><Format id={'forgot-password'} /></Link>
</Form> </Form>
</Form> </Form>
......
...@@ -149,7 +149,7 @@ class Register extends React.Component { ...@@ -149,7 +149,7 @@ class Register extends React.Component {
<Format id={'sign-up'} /> <Format id={'sign-up'} />
</Button> </Button>
<FormItem> <FormItem>
<Link to="/signin"><Format id={'login'} /></Link> <Link to="/signin"><Format id={'sign-in'} /></Link>
</FormItem> </FormItem>
</Form> </Form>
</Spin> </Spin>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment