Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/models/user.js

.roadhogrc

 {
   "entry": "src/index.js",
+  "publicPath":"https://cdn01.moecube.com/accounts/",
   "env": {
     "development": {
       "extraBabelPlugins": [

package.json

@@ -14,6 +14,7 @@
     "babel-runtime": "^6.9.2",
     "dva": "^1.2.1",
     "dva-loading": "^0.2.1",
+    "egg-init": "^1.8.1",
     "rc-queue-anim": "^0.13.3",
     "react": "^15.4.0",
     "react-addons-transition-group": "^15.4.2",

src/models/user.js

@@ -120,12 +120,13 @@ export default {
       const { token } = payload;
 
       try {
-        let { data } = yield call(getAuthUser, { token });
-        if (data) {
-          yield put({ type: 'getAuthUserSuccess', payload: { user: data, token } });
+        let { data } =  yield call(getAuthUser, { token })
+        if(data) {
+          yield put({ type: 'getAuthUserSuccess', payload: { user: data, token }})
         }
-      } catch (error) {
-        message.error(error.message);
+      }catch(error) {
+        yield put({ type: 'getAuthUserFail'})
+        // message.error(error.message)
       }
     },
     *preLogin({ payload }, { call, put, select }) {

src/routes/Activate.js

@@ -14,7 +14,7 @@ class Active extends React.Component {
   render() {
     const { loading } = this.props;
     return (
-      <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', minHeight: '100%' }}>
+      <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', flex: 1 }}>
         <Button type="primary" icon="poweroff" loading={loading} onClick={this.handleClick}>
           <Format id={'verify-email'} />
         </Button>

src/routes/Forgot.js

@@ -46,7 +46,7 @@ class Login extends React.Component {
     const { loading } = this.props;
     const { intl: { messages } } = this.context;
     return (
-      <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
+      <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', flex: 1}}>
         <Spin spinning={loading} delay={100}>
           <Form onSubmit={this.onSubmitLogin} className="login-form">
 

src/routes/Index.js

@@ -125,7 +125,7 @@ const particleConfig = {
 
 function Index({ dispatch, children, messages }) {
   return (
-    <div style={{ height: "100%" }}>
+    <div style={{ display: 'flex', flexDirection: 'column', flex: 1, height: '100vh' }}>
       <DocumentTitle title={messages['title'] || 'Moe Cube'} />                                                       
 
       <Header style={{ display: 'flex', alignItems: 'center'}}>

src/routes/Register.js

@@ -77,7 +77,7 @@ class Register extends React.Component {
     };
 
     return (
-      <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', height: '100%' }}>
+      <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', flex: 1 }}>
 
         <Spin spinning={loading} delay={100}>
           <Steps size="large" current={0}>

src/routes/Reset.js

@@ -51,7 +51,7 @@ class Reset extends React.Component {
     const { intl: { messages } } = this.context;
 
     return (
-      <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100%' }}>
+      <div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', flex: 1 }}>
         <Spin spinning={isResetSubmit} delay={100}>
           <Form onSubmit={this.onSubmitReset} className="login-form">
             <FormItem>

src/routes/Verify.js

@@ -64,7 +64,7 @@ class Verify extends React.Component {
 
 
     return (
-      <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', height: '100%' }}>
+      <div style={{ display: 'flex', flexDirection: 'column', alignItems: 'center', justifyContent: 'center', flex: 1 }}>
 
         <Spin spinning={loading} delay={100}>
           <Steps size="large" current={1}>