fixed update

src/routes/Forgot.js

@@ -43,7 +43,7 @@ class Login extends React.Component {
 
   render() {
     const { getFieldDecorator, dispatch } = this.props.form;
-    const { isForgotSubmit = false } = this.props;
+    const { loading } = this.props;
     const { intl: { messages } } = this.context;
     return (
       <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
@@ -66,7 +66,9 @@ class Login extends React.Component {
             <Button type="primary" htmlType="submit" className="login-form-button">
               <Format id={'send-email'} />
             </Button>
-            Or <Link to="/login"><Format id={'sign-in'} /></Link>
+            <FormItem>
+              <Link to="/signin"><Format id={'login'} /></Link>                       
+            </FormItem>
           </Form>
         </Spin>
       </div>

src/routes/Login.js

@@ -53,18 +53,15 @@ class Login extends React.Component {
               )}
             </FormItem>
             <FormItem>
-              {getFieldDecorator('remember', {
-                valuePropName: 'checked',
-                initialValue: true,
-              })(
-                <Checkbox><Format id={'remember-me'} /></Checkbox>,
-              )}
-              <Link to="/forgot" className="login-form-forgot"><Format id={'forgot-password'} /></Link>
+              
               <Button type="primary" htmlType="submit" className="login-form-button">
                 <Format id={'sign-in'} />
               </Button>
-              Or <Link to="/register"><Format id={'sign-up'} /></Link>
             </FormItem>
+            <Form>
+              <Link to="/register"><Format id={'Register'} /></Link>
+              <Link to="/forgot" className="login-form-forgot"><Format id={'forgot-password'} /></Link>
+            </Form>
           </Form>
         </Spin>
       </div>

src/routes/Register.js

@@ -148,7 +148,9 @@ class Register extends React.Component {
             <Button type="primary" htmlType="submit" className="login-form-button">
               <Format id={'sign-up'} />
             </Button>
-            Or <Link to="/login"><Format id={'sign-in'} /></Link>
+            <FormItem>
+              <Link to="/signin"><Format id={'login'} /></Link>
+            </FormItem>
           </Form>
         </Spin>
       </div>