Merge branch 'master' of https://github.com/moecube/moecube-accounts-web

# Conflicts:
#	.idea/workspace.xml

.gitignore

@@ -8,6 +8,7 @@
 
 # misc
 .DS_Store
-*.log*
+npm-debug.log*
 
 /utils/config.js
+.idea/workspace.xml

.idea/workspace.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="eb37985e-18dc-4e2f-82ba-9874832785ff" name="Default" comment="change language 按钮位置">
-      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="" />
+    <list default="true" id="eb37985e-18dc-4e2f-82ba-9874832785ff" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.roadhogrc.js" afterPath="$PROJECT_DIR$/.roadhogrc.js" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -15,115 +16,165 @@
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="DockManager">
-    <window id="1">
-      <content type="file-editors">
-        <state>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
+  <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-            <file leaf-file-name="i18n.json" pinned="false" current-in-tab="true">
-              <entry file="file://$PROJECT_DIR$/i18n.json">
+      <file leaf-file-name="Index.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/routes/Index.js">
           <provider selected="true" editor-type-id="text-editor">
-                  <state relative-caret-position="399">
-                    <caret line="72" column="0" lean-forward="true" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
-                    <folding />
+            <state relative-caret-position="104">
+              <caret line="130" column="68" lean-forward="true" selection-start-line="130" selection-start-column="68" selection-end-line="130" selection-end-column="68" />
+              <folding>
+                <element signature="e#0#52#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-          </leaf>
-        </state>
-      </content>
-    </window>
-  </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
-  <component name="FileEditorManager">
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="auth.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/models/auth.js">
+      <file leaf-file-name=".roadhogrc.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/.roadhogrc.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="114">
-              <caret line="8" column="14" lean-forward="false" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
+            <state relative-caret-position="45">
+              <caret line="3" column="13" lean-forward="false" selection-start-line="3" selection-start-column="2" selection-end-line="3" selection-end-column="13" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="config.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/config.js">
+      <file leaf-file-name="package.json" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/package.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="76">
-              <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
+            <state relative-caret-position="165">
+              <caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="index.less" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/index.less">
+      <file leaf-file-name="UserPanel.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/components/UserPanel.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="15" column="18" lean-forward="true" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
-              <folding />
+            <state relative-caret-position="930">
+              <caret line="62" column="0" lean-forward="true" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+              <folding>
+                <element signature="e#0#38#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="common.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/models/common.js">
+      <file leaf-file-name=".eslintrc" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/.eslintrc">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="399">
-              <caret line="27" column="25" lean-forward="true" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" />
+            <state relative-caret-position="150">
+              <caret line="10" column="58" lean-forward="false" selection-start-line="10" selection-start-column="58" selection-end-line="10" selection-end-column="58" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/index.js">
+      <file leaf-file-name="Profiles.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/routes/Profiles.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="928">
-              <caret line="49" column="0" lean-forward="true" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" />
+            <state relative-caret-position="1665">
+              <caret line="120" column="34" lean-forward="false" selection-start-line="120" selection-start-column="34" selection-end-line="120" selection-end-column="34" />
               <folding>
-                <element signature="e#0#31#0" expanded="true" />
+                <marker date="1491539278000" expanded="true" signature="895:5562" ph="{...}" />
+                <marker date="1491539278000" expanded="true" signature="2128:5560" ph="{...}" />
+                <marker date="1491539278000" expanded="true" signature="2640:5549" ph="&lt;Spin/&gt;" />
+                <marker date="1491539278000" expanded="true" signature="5596:5988" ph="{...}" />
+                <marker date="1491539278000" expanded="true" signature="5830:5985" ph="{&quot;user&quot;: user...}" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="user.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/models/user.js">
+      <file leaf-file-name="Register.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/routes/Register.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2801">
-              <caret line="177" column="66" lean-forward="false" selection-start-line="177" selection-start-column="66" selection-end-line="177" selection-end-column="66" />
-              <folding />
+            <state relative-caret-position="870">
+              <caret line="62" column="46" lean-forward="false" selection-start-line="62" selection-start-column="46" selection-end-line="62" selection-end-column="46" />
+              <folding>
+                <marker date="1491534361000" expanded="true" signature="323:5343" ph="{...}" />
+                <marker date="1491534361000" expanded="true" signature="1251:5341" ph="{...}" />
+                <marker date="1491534361000" expanded="true" signature="1495:1562" ph="{&quot;validateStatus&quot;: checkEmail...}" />
+                <marker date="1491534361000" expanded="true" signature="2068:2193" ph="{&quot;placeholder&quot;: messages.username...}" />
+                <marker date="1491534361000" expanded="true" signature="2215:5330" ph="&lt;div/&gt;" />
+                <marker date="1491534361000" expanded="true" signature="2331:5317" ph="&lt;Spin/&gt;" />
+                <marker date="1491534361000" expanded="true" signature="2379:2589" ph="&lt;Steps/&gt;" />
+                <marker date="1491534361000" expanded="true" signature="2601:5301" ph="&lt;Form/&gt;" />
+                <marker date="1491534361000" expanded="true" signature="2703:3118" ph="&lt;FormItem/&gt;" />
+                <marker date="1491534361000" expanded="true" signature="2773:3023" ph="{...}" />
+                <marker date="1491534361000" expanded="true" signature="2798:3006" ph="[...]" />
+                <marker date="1491534361000" expanded="true" signature="2799:3005" ph="{...}" />
+                <marker date="1491534361000" expanded="true" signature="3132:3680" ph="&lt;FormItem/&gt;" />
+                <marker date="1491534361000" expanded="true" signature="3207:3582" ph="{...}" />
+                <marker date="1491534361000" expanded="true" signature="3232:3565" ph="[...]" />
+                <marker date="1491534361000" expanded="true" signature="3233:3564" ph="{...}" />
+                <marker date="1491534361000" expanded="true" signature="3694:4299" ph="&lt;FormItem/&gt;" />
+                <marker date="1491534361000" expanded="true" signature="3762:3992" ph="{...}" />
+                <marker date="1491534361000" expanded="true" signature="3787:3975" ph="[...]" />
+                <marker date="1491534361000" expanded="true" signature="3788:3974" ph="{...}" />
+                <marker date="1491534361000" expanded="true" signature="3994:4057" ph="{...}" />
+                <marker date="1491534361000" expanded="true" signature="4076:4257" ph="&lt;Input/&gt;" />
+                <marker date="1491534361000" expanded="true" signature="4313:4981" ph="&lt;FormItem/&gt;" />
+                <marker date="1491534361000" expanded="true" signature="4380:4680" ph="{...}" />
+                <marker date="1491534361000" expanded="true" signature="4405:4663" ph="[...]" />
+                <marker date="1491534361000" expanded="true" signature="4406:4592" ph="{...}" />
+                <marker date="1491534361000" expanded="true" signature="4594:4662" ph="{...}" />
+                <marker date="1491534361000" expanded="true" signature="4699:4939" ph="&lt;Input/&gt;" />
+                <marker date="1491534361000" expanded="true" signature="4995:5180" ph="&lt;FormItem/&gt;" />
+                <marker date="1491534361000" expanded="true" signature="5020:5156" ph="&lt;Button/&gt;" />
+                <marker date="1491534361000" expanded="true" signature="5194:5283" ph="&lt;div/&gt;" />
+                <marker date="1491534361000" expanded="true" signature="5377:5714" ph="{...}" />
+                <marker date="1491534361000" expanded="true" signature="5581:5711" ph="{&quot;loading&quot;: loading...}" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/.gitignore">
+      <file leaf-file-name="Reset.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/routes/Reset.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="209">
-              <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="795">
+              <caret line="53" column="109" lean-forward="false" selection-start-line="53" selection-start-column="109" selection-end-line="53" selection-end-column="109" />
+              <folding>
+                <element signature="e#0#55#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="upload.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/models/upload.js">
+      <file leaf-file-name="Forgot.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/routes/Forgot.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="494">
-              <caret line="27" column="26" lean-forward="true" selection-start-line="27" selection-start-column="26" selection-end-line="27" selection-end-column="26" />
+            <state relative-caret-position="495">
+              <caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="Verify.js" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/routes/Verify.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1065">
+              <caret line="71" column="18" lean-forward="false" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
+              <folding>
+                <element signature="e#0#66#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
+      <find>reset-password</find>
+      <find>'</find>
+      <find>MoeCube.</find>
+      <find>a</find>
       <find>at</find>
       <find>aat</find>
       <find>avat</find>
@@ -150,10 +201,6 @@
       <find>h</find>
       <find>http</find>
       <find>http;</find>
-      <find>png</find>
-      <find>localStorage</find>
-      <find>index.js</find>
-      <find>index.less</find>
     </findStrings>
     <replaceStrings>
       <replace>&quot;,</replace>
@@ -167,22 +214,23 @@
     <option name="CHANGED_PATHS">
       <list>
         <option value="$PROJECT_DIR$/.gitignore" />
-        <option value="$PROJECT_DIR$/package.json" />
         <option value="$PROJECT_DIR$/src/components/Example.js" />
         <option value="$PROJECT_DIR$/src/components/SubmitButton.js" />
         <option value="$PROJECT_DIR$/src/components/UserNameForm.js" />
         <option value="$PROJECT_DIR$/src/routes/Login.js" />
         <option value="$PROJECT_DIR$/src/services/upload.js" />
         <option value="$PROJECT_DIR$/src/services/user.js" />
+        <option value="$PROJECT_DIR$/src/index.js" />
         <option value="$PROJECT_DIR$/src/router.js" />
         <option value="$PROJECT_DIR$/src/components/PasswordForm.js" />
         <option value="$PROJECT_DIR$/src/models/upload.js" />
         <option value="$PROJECT_DIR$/src/components/EmailForm.js" />
         <option value="$PROJECT_DIR$/src/components/SendEmail.js" />
+        <option value="$PROJECT_DIR$/src/models/common.js" />
         <option value="$PROJECT_DIR$/src/services/auth.js" />
         <option value="$PROJECT_DIR$/src/models/auth.js" />
         <option value="$PROJECT_DIR$/public/index.html" />
-        <option value="$PROJECT_DIR$/.travis.yml" />
+        <option value="$PROJECT_DIR$/src/models/user.js" />
         <option value="$PROJECT_DIR$/src/routes/Activate.js" />
         <option value="$PROJECT_DIR$/src/routes/Register.js" />
         <option value="$PROJECT_DIR$/src/routes/Reset.js" />
@@ -191,14 +239,13 @@
         <option value="$PROJECT_DIR$/src/routes/Profiles.js" />
         <option value="$PROJECT_DIR$/i18n.json" />
         <option value="$PROJECT_DIR$/src/utils/request.js" />
-        <option value="$PROJECT_DIR$/.roadhogrc.js" />
         <option value="$PROJECT_DIR$/src/config.js" />
         <option value="$PROJECT_DIR$/.eslintrc" />
+        <option value="$PROJECT_DIR$/.travis.yml" />
+        <option value="$PROJECT_DIR$/src/components/UserPanel.js" />
         <option value="$PROJECT_DIR$/src/routes/Index.js" />
-        <option value="$PROJECT_DIR$/src/models/common.js" />
-        <option value="$PROJECT_DIR$/src/models/user.js" />
-        <option value="$PROJECT_DIR$/src/index.less" />
-        <option value="$PROJECT_DIR$/src/index.js" />
+        <option value="$PROJECT_DIR$/.roadhogrc.js" />
+        <option value="$PROJECT_DIR$/package.json" />
       </list>
     </option>
   </component>
@@ -220,10 +267,9 @@
     <handled-path value="$PROJECT_DIR$/node_modules" />
   </component>
   <component name="ProjectFrameBounds">
-    <option name="x" value="-8" />
-    <option name="y" value="-8" />
-    <option name="width" value="1936" />
-    <option name="height" value="1176" />
+    <option name="y" value="23" />
+    <option name="width" value="1440" />
+    <option name="height" value="815" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -240,35 +286,21 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
             <PATH_ELEMENT>
-              <option name="myItemId" value="mycard-account-web" />
+              <option name="myItemId" value="moecube-accounts-web" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="mycard-account-web" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mycard-account-web" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mycard-account-web" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
+              <option name="myItemId" value="moecube-accounts-web" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scratches" />
       <pane id="Scope" />
     </panes>
   </component>
@@ -277,11 +309,11 @@
     <property name="last_opened_file_path" value="E:/qianduan/dva-quickstart" />
     <property name="HbShouldOpenHtmlAsHb" value="" />
     <property name="nodejs_interpreter_path" value="C:/Program Files/nodejs/node" />
-    <property name="node.js.path.for.package.eslint" value="project" />
-    <property name="node.js.selected.package.eslint" value="E:\zhuye\mycard-account-web\node_modules\eslint" />
-    <property name="settings.editor.selected.configurable" value="preferences.sourceCode" />
-    <property name="node.js.path.for.package.standard" value="project" />
-    <property name="node.js.selected.package.standard" value="" />
+    <property name="node.js.path.for.package.eslint" value="/usr/local/Cellar/node/7.7.4/bin/node" />
+    <property name="node.js.selected.package.eslint" value="$PROJECT_DIR$/node_modules/eslint" />
+    <property name="settings.editor.selected.configurable" value="preferences.sourceCode.TypeScript" />
+    <property name="node.js.path.for.package.standard" value="/usr/local/Cellar/node/7.7.4/bin/node" />
+    <property name="node.js.selected.package.standard" value="$PROJECT_DIR$/node_modules/eslint" />
   </component>
   <component name="RunDashboard">
     <option name="ruleStates">
@@ -306,23 +338,23 @@
       <envs />
       <method />
     </configuration>
-    <configuration default="false" name="lint" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true">
+    <configuration default="false" name="start" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true">
       <package-json value="$PROJECT_DIR$/package.json" />
       <command value="run" />
       <scripts>
-        <script value="lint" />
+        <script value="start" />
       </scripts>
       <node-interpreter value="project" />
       <envs />
       <method />
     </configuration>
-    <configuration default="false" name="start" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true">
+    <configuration default="false" name="lint" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true">
       <package-json value="$PROJECT_DIR$/package.json" />
       <command value="run" />
       <scripts>
-        <script value="start" />
+        <script value="lint" />
       </scripts>
-      <node-interpreter value="project" />
+      <node-interpreter value="/usr/local/Cellar/node/7.7.4/bin/node" />
       <envs />
       <method />
     </configuration>
@@ -394,8 +426,8 @@
     </configuration>
     <list size="3">
       <item index="0" class="java.lang.String" itemvalue="npm.build" />
-      <item index="1" class="java.lang.String" itemvalue="npm.lint" />
-      <item index="2" class="java.lang.String" itemvalue="npm.start" />
+      <item index="1" class="java.lang.String" itemvalue="npm.start" />
+      <item index="2" class="java.lang.String" itemvalue="npm.lint" />
     </list>
     <recent_temporary>
       <list size="3">
@@ -423,7 +455,7 @@
       <workItem from="1491362317876" duration="18018000" />
       <workItem from="1491448144293" duration="3984000" />
       <workItem from="1491459521278" duration="9381000" />
-      <workItem from="1491532261913" duration="7841000" />
+      <workItem from="1491532261913" duration="2395000" />
     </task>
     <task id="LOCAL-00001" summary="i18n">
       <created>1490948057319</created>
@@ -572,25 +604,18 @@
       <option name="project" value="LOCAL" />
       <updated>1491534110082</updated>
     </task>
-    <task id="LOCAL-00022" summary="change language 按钮位置">
-      <created>1491534671921</created>
+    <task id="LOCAL-00022" summary="env">
+      <created>1491539412348</created>
       <option name="number" value="00022" />
       <option name="presentableId" value="LOCAL-00022" />
       <option name="project" value="LOCAL" />
-      <updated>1491534671921</updated>
+      <updated>1491539412348</updated>
     </task>
-    <task id="LOCAL-00023" summary="i18n">
-      <created>1491540541051</created>
-      <option name="number" value="00023" />
-      <option name="presentableId" value="LOCAL-00023" />
-      <option name="project" value="LOCAL" />
-      <updated>1491540541051</updated>
-    </task>
-    <option name="localTasksCounter" value="24" />
+    <option name="localTasksCounter" value="23" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="101589000" />
+    <option name="totallyTimeSpent" value="96582000" />
   </component>
   <component name="TodoView" selected-index="3">
     <todo-panel id="selected-file">
@@ -602,26 +627,36 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
+    <frame x="0" y="23" width="1440" height="815" extended-state="6" />
     <layout>
-      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25237092" sideWeight="0.6642157" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25229034" sideWeight="0.6606061" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.49578503" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.5021075" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.21689059" sideWeight="0.49789253" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2428023" sideWeight="0.49789253" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25237092" sideWeight="0.33578432" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3153527" sideWeight="0.49789253" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24204703" sideWeight="0.49789253" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25229034" sideWeight="0.33939394" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20729366" sideWeight="0.49367756" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22683264" sideWeight="0.49367756" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.49578503" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.5021075" order="7" side_tool="true" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21743697" sideWeight="0.49789253" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2428023" sideWeight="0.49789253" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25237092" sideWeight="0.33586818" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20729366" sideWeight="0.49367756" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25237092" sideWeight="0.6641318" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
     </layout>
     <layout-to-restore>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.49578503" order="6" side_tool="false" content_ui="tabs" />
@@ -660,9 +695,10 @@
     <MESSAGE value="Merge remote-tracking branch 'origin/master'&#10;&#10;# Conflicts:&#10;#&#9;src/models/auth.js&#10;#&#9;src/routes/Index.js" />
     <MESSAGE value="travis" />
     <MESSAGE value="change language" />
-    <MESSAGE value="change language 按钮位置" />
     <MESSAGE value="i18n" />
-    <option name="LAST_COMMIT_MESSAGE" value="i18n" />
+    <MESSAGE value="change language 按钮位置" />
+    <MESSAGE value="env" />
+    <option name="LAST_COMMIT_MESSAGE" value="env" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -745,6 +781,14 @@
     <entry file="file://$PROJECT_DIR$/src/components/Haha.js" />
     <entry file="file://$PROJECT_DIR$/src/models/example.js" />
     <entry file="file://$PROJECT_DIR$/src/models/haha.js" />
+    <entry file="file://$PROJECT_DIR$/.gitignore">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="210">
+          <caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/components/EmailForm.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -802,6 +846,13 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/models/upload.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="513">
+          <caret line="27" column="26" lean-forward="true" selection-start-line="27" selection-start-column="26" selection-end-line="27" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/services/user.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
@@ -809,6 +860,23 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/models/common.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="342">
+          <caret line="18" column="19" lean-forward="false" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/models/auth.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="114">
+          <caret line="8" column="14" lean-forward="false" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
+          <folding>
+            <element signature="e#0#31#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/utils/sso.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
@@ -816,6 +884,23 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/index.less">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="30">
+          <caret line="2" column="2" lean-forward="false" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="225">
+          <caret line="15" column="33" lean-forward="false" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
+          <folding>
+            <element signature="e#0#31#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/public/index.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
@@ -825,56 +910,110 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/.travis.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="182">
-          <caret line="18" column="31" lean-forward="false" selection-start-line="18" selection-start-column="31" selection-end-line="18" selection-end-column="31" />
+        <state relative-caret-position="45">
+          <caret line="3" column="2" lean-forward="false" selection-start-line="3" selection-start-column="2" selection-end-line="3" selection-end-column="2" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/models/user.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3120">
+          <caret line="212" column="61" lean-forward="false" selection-start-line="212" selection-start-column="61" selection-end-line="212" selection-end-column="61" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/routes/Activate.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="40">
+        <state relative-caret-position="240">
           <caret line="16" column="26" lean-forward="false" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
+          <folding>
+            <element signature="e#0#30#0" expanded="false" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/routes/Register.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1174">
-          <caret line="62" column="46" lean-forward="true" selection-start-line="62" selection-start-column="46" selection-end-line="62" selection-end-column="46" />
+        <state relative-caret-position="870">
+          <caret line="62" column="46" lean-forward="false" selection-start-line="62" selection-start-column="46" selection-end-line="62" selection-end-column="46" />
+          <folding>
+            <marker date="1491534361000" expanded="true" signature="323:5343" ph="{...}" />
+            <marker date="1491534361000" expanded="true" signature="1251:5341" ph="{...}" />
+            <marker date="1491534361000" expanded="true" signature="1495:1562" ph="{&quot;validateStatus&quot;: checkEmail...}" />
+            <marker date="1491534361000" expanded="true" signature="2068:2193" ph="{&quot;placeholder&quot;: messages.username...}" />
+            <marker date="1491534361000" expanded="true" signature="2215:5330" ph="&lt;div/&gt;" />
+            <marker date="1491534361000" expanded="true" signature="2331:5317" ph="&lt;Spin/&gt;" />
+            <marker date="1491534361000" expanded="true" signature="2379:2589" ph="&lt;Steps/&gt;" />
+            <marker date="1491534361000" expanded="true" signature="2601:5301" ph="&lt;Form/&gt;" />
+            <marker date="1491534361000" expanded="true" signature="2703:3118" ph="&lt;FormItem/&gt;" />
+            <marker date="1491534361000" expanded="true" signature="2773:3023" ph="{...}" />
+            <marker date="1491534361000" expanded="true" signature="2798:3006" ph="[...]" />
+            <marker date="1491534361000" expanded="true" signature="2799:3005" ph="{...}" />
+            <marker date="1491534361000" expanded="true" signature="3132:3680" ph="&lt;FormItem/&gt;" />
+            <marker date="1491534361000" expanded="true" signature="3207:3582" ph="{...}" />
+            <marker date="1491534361000" expanded="true" signature="3232:3565" ph="[...]" />
+            <marker date="1491534361000" expanded="true" signature="3233:3564" ph="{...}" />
+            <marker date="1491534361000" expanded="true" signature="3694:4299" ph="&lt;FormItem/&gt;" />
+            <marker date="1491534361000" expanded="true" signature="3762:3992" ph="{...}" />
+            <marker date="1491534361000" expanded="true" signature="3787:3975" ph="[...]" />
+            <marker date="1491534361000" expanded="true" signature="3788:3974" ph="{...}" />
+            <marker date="1491534361000" expanded="true" signature="3994:4057" ph="{...}" />
+            <marker date="1491534361000" expanded="true" signature="4076:4257" ph="&lt;Input/&gt;" />
+            <marker date="1491534361000" expanded="true" signature="4313:4981" ph="&lt;FormItem/&gt;" />
+            <marker date="1491534361000" expanded="true" signature="4380:4680" ph="{...}" />
+            <marker date="1491534361000" expanded="true" signature="4405:4663" ph="[...]" />
+            <marker date="1491534361000" expanded="true" signature="4406:4592" ph="{...}" />
+            <marker date="1491534361000" expanded="true" signature="4594:4662" ph="{...}" />
+            <marker date="1491534361000" expanded="true" signature="4699:4939" ph="&lt;Input/&gt;" />
+            <marker date="1491534361000" expanded="true" signature="4995:5180" ph="&lt;FormItem/&gt;" />
+            <marker date="1491534361000" expanded="true" signature="5020:5156" ph="&lt;Button/&gt;" />
+            <marker date="1491534361000" expanded="true" signature="5194:5283" ph="&lt;div/&gt;" />
+            <marker date="1491534361000" expanded="true" signature="5377:5714" ph="{...}" />
+            <marker date="1491534361000" expanded="true" signature="5581:5711" ph="{&quot;loading&quot;: loading...}" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/routes/Reset.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="33">
+        <state relative-caret-position="795">
           <caret line="53" column="109" lean-forward="false" selection-start-line="53" selection-start-column="109" selection-end-line="53" selection-end-column="109" />
+          <folding>
+            <element signature="e#0#55#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/routes/Forgot.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
+        <state relative-caret-position="495">
           <caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
+          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/routes/Verify.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="123">
+        <state relative-caret-position="1065">
           <caret line="71" column="18" lean-forward="false" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
+          <folding>
+            <element signature="e#0#66#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/routes/Profiles.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2052">
-          <caret line="108" column="22" lean-forward="true" selection-start-line="108" selection-start-column="22" selection-end-line="108" selection-end-column="22" />
+        <state relative-caret-position="1665">
+          <caret line="120" column="34" lean-forward="false" selection-start-line="120" selection-start-column="34" selection-end-line="120" selection-end-column="34" />
           <folding>
-            <element signature="e#0#61#0" expanded="true" />
-            <marker date="1491536427362" expanded="true" signature="895:5562" ph="{...}" />
-            <marker date="1491536427362" expanded="true" signature="2128:5560" ph="{...}" />
-            <marker date="1491536427362" expanded="true" signature="5596:5988" ph="{...}" />
-            <marker date="1491536427362" expanded="true" signature="5830:5985" ph="{&quot;user&quot;: user...}" />
+            <marker date="1491539278000" expanded="true" signature="895:5562" ph="{...}" />
+            <marker date="1491539278000" expanded="true" signature="2128:5560" ph="{...}" />
+            <marker date="1491539278000" expanded="true" signature="2640:5549" ph="&lt;Spin/&gt;" />
+            <marker date="1491539278000" expanded="true" signature="5596:5988" ph="{...}" />
+            <marker date="1491539278000" expanded="true" signature="5830:5985" ph="{&quot;user&quot;: user...}" />
           </folding>
         </state>
       </provider>
@@ -893,33 +1032,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/utils/request.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="513">
-          <caret line="27" column="56" lean-forward="true" selection-start-line="27" selection-start-column="56" selection-end-line="27" selection-end-column="56" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/.eslintrc">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="27" column="23" lean-forward="false" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/package.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="142">
-          <caret line="9" column="14" lean-forward="true" selection-start-line="9" selection-start-column="14" selection-end-line="9" selection-end-column="14" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/assets/MoeCube.png">
-      <provider selected="true" editor-type-id="images">
-        <state />
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/services/auth.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="57">
@@ -927,34 +1039,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.roadhogrc.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="15" column="13" lean-forward="true" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/i18n.json">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="72" column="0" lean-forward="true" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/models/upload.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="494">
-          <caret line="27" column="26" lean-forward="true" selection-start-line="27" selection-start-column="26" selection-end-line="27" selection-end-column="26" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/models/auth.js">
+    <entry file="file://$PROJECT_DIR$/src/utils/request.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="114">
-          <caret line="8" column="14" lean-forward="false" selection-start-line="8" selection-start-column="14" selection-end-line="8" selection-end-column="14" />
-          <folding />
+        <state relative-caret-position="513">
+          <caret line="27" column="56" lean-forward="true" selection-start-line="27" selection-start-column="56" selection-end-line="27" selection-end-column="56" />
         </state>
       </provider>
     </entry>
@@ -962,59 +1050,56 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="76">
           <caret line="4" column="0" lean-forward="true" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/routes/Index.js">
+    <entry file="file://$PROJECT_DIR$/.eslintrc">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="513">
-          <caret line="50" column="25" lean-forward="true" selection-start-line="50" selection-start-column="25" selection-end-line="50" selection-end-column="25" />
-          <folding>
-            <element signature="e#0#52#0" expanded="true" />
-            <marker date="1491536427351" expanded="true" signature="4866:4883" ph="{&quot;messages&quot;: messages...}" />
-          </folding>
+        <state relative-caret-position="150">
+          <caret line="10" column="58" lean-forward="false" selection-start-line="10" selection-start-column="58" selection-end-line="10" selection-end-column="58" />
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/index.less">
+    <entry file="file://$PROJECT_DIR$/i18n.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="15" column="18" lean-forward="true" selection-start-line="15" selection-start-column="18" selection-end-line="15" selection-end-column="18" />
-          <folding />
+        <state relative-caret-position="190">
+          <caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/models/common.js">
+    <entry file="file://$PROJECT_DIR$/src/components/UserPanel.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="399">
-          <caret line="27" column="25" lean-forward="true" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" />
-          <folding />
+        <state relative-caret-position="930">
+          <caret line="62" column="0" lean-forward="true" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#38#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/index.js">
+    <entry file="file://$PROJECT_DIR$/src/routes/Index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="928">
-          <caret line="49" column="0" lean-forward="true" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" />
+        <state relative-caret-position="104">
+          <caret line="130" column="68" lean-forward="true" selection-start-line="130" selection-start-column="68" selection-end-line="130" selection-end-column="68" />
           <folding>
-            <element signature="e#0#31#0" expanded="true" />
+            <element signature="e#0#52#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/models/user.js">
+    <entry file="file://$PROJECT_DIR$/.roadhogrc.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2801">
-          <caret line="177" column="66" lean-forward="false" selection-start-line="177" selection-start-column="66" selection-end-line="177" selection-end-column="66" />
+        <state relative-caret-position="45">
+          <caret line="3" column="13" lean-forward="false" selection-start-line="3" selection-start-column="2" selection-end-line="3" selection-end-column="13" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.gitignore">
+    <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="209">
-          <caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
+        <state relative-caret-position="165">
+          <caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" />
           <folding />
         </state>
       </provider>

.roadhogrc.js

-
-let publicPath = 'https://cdn01.moecube.com/accounts/'
+let publicPath = 'https://cdn01.moecube.com/accounts/';
 
 const API_ROOT = {
-  test: 'http://192.168.1.9:3000',
-  dev: 'http://114.215.243.95:8082',
-  prod: 'https://api.moeube.com/accounts'
-}
+  development: 'http://192.168.1.9:3000',
+  test: 'http://114.215.243.95:8082',
+  production: 'https://api.moeube.com/accounts'
+};
 
 let defineConf = {
-  apiRoot: API_ROOT[process.env["ENV"]],
-}
+  apiRoot: API_ROOT[process.env['ENV']],
+};
 
 export default {
-  "entry": "src/index.js",
+  'entry': 'src/index.js',
   publicPath,
-  define: {...defineConf},
-  "env": {
-    "development": {
-      "extraBabelPlugins": [
-        "dva-hmr",
-        "transform-runtime",
-        ["import", { "libraryName": "antd", "style": "css" }]
+  define: { ...defineConf },
+  'env': {
+    'development': {
+      'extraBabelPlugins': [
+        'dva-hmr',
+        'transform-runtime',
+        ['import', { 'libraryName': 'antd', 'style': 'css' }]
       ]
     },
-    "production": {
-      "extraBabelPlugins": [
-        "transform-runtime",
-        ["import", { "libraryName": "antd", "style": "css" }]
+    'production': {
+      'extraBabelPlugins': [
+        'transform-runtime',
+        ['import', { 'libraryName': 'antd', 'style': 'css' }]
       ]
     }
   }
-}
+};

.travis.yml

 language: node_js
 node_js: node
 env:
-  NODE_ENV: development
   global:
     secure: NObcZ6fY1VQuoDfxRxKVOZ+p7g3LTDkonG4Ow4HIbx2g8wJ24mMqs9gN0J3Asbdbz68isDMpkKy7IW1mK9+N9fM0pBauqD1YMbglnEv+HhYjhiEsQdRdDM2nzDIjS4PCwavI1Da5TLhaUjSAM4lrHx7bVOK4YsvF3s8JEApS54QgSlbeJgvSbPcCiapl0VwwaL36cGndChc3tawq4xseuk4bP2NrTEd7ifYZMt+iojId+UuhRQk4w0HUlBhEDKiT/fLxeQDwMRv2WIdIPW7D7+Wo01iX+T0Ti629QhQBe/S76affkG6G085HIPin3VvXDQaiYbK4ALbc79O+9jqSxEFd9nwG8xbp2jezzvclUSXPhIyZe7VSRS6z1MdevlyQa56AUEP7My7IMqj8j7NPoUgrnVlKtR8WPHQacfAVkrcOIX+Tzwl2IMOCqonamDtJjUNX5xpYB+IEj+INvQmRqT2NicExGWj9LZp3L3kscwq1u+0hPzgoQ9yovE+OvLFNE/R5AE90GIaSlwXw4MqOeB+8l+ou2JzNZFJhHBvAsOFwQTloFz/pu7ichJ+P0KsMPteLFA4Btuo6bBu31K7R310CmlIdYJIeeybMuM6e6bG8IkbVcMq5skg9LNa64KuDG46oopwGLiWkdRwDzG3VmXGwVm+OF2EWZi/B0wIcTwY=
 
-script: npm run build
+script: npm run build:test
 before_deploy:
 - curl --location --retry 5 --output ossutil 'https://github.com/mycard/ossutil/releases/download/1.0.0.Beta2/ossutil'
 - chmod +x ossutil

package.json

 {
   "private": true,
   "scripts": {
-    "start": "cross-env ENV=test roadhog server",
-    "build:dev": "cross-env ENV=dev roadhog build",
-    "build": "cross-env ENV=prod roadhog build",
+    "start": "cross-env ENV=development roadhog server",
+    "build:test": "cross-env ENV=test roadhog build",
+    "build": "cross-env ENV=production roadhog build",
     "lint": "eslint --ext .js src test",
     "precommit": "npm run lint"
   },

src/components/UserPanel.css

+
+.normal {
+}

src/components/UserPanel.js

+import { Dropdown, Menu } from 'antd';
+import { connect } from 'dva';
+import { Link } from 'dva/router';
+import React from 'react';
+import { FormattedMessage as Format } from 'react-intl';
+
+const defaultAvatar = require('../../public/default_avatar.jpg');
+
+function UserPanel({ dispatch, user, token }) {
+  const { avatar } = user;
+  const menu = (
+    <Menu trigger={['click']}>
+      <Menu.Item>
+        {
+          // i18n
+          token ? <Link to="/profiles">个人中心</Link> : <Link to="/signin">登录</Link>
+        }
+      </Menu.Item>
+
+      <Menu.Divider/>
+      {
+        token &&
+        <Menu.Item >
+          <div
+            onClick={() => {
+              dispatch({ type: 'auth/signOut' });
+            }}
+          >
+            <Format id="sign-out"/>
+          </div>
+        </Menu.Item>
+      }
+    </Menu>
+  );
+
+  return (
+    <Dropdown overlay={menu} placement="bottomCenter">
+      <div className="ant-dropdown-link" style={{ display: 'flex', alignItems: 'center' }}>
+        <img
+          alt="avatar" src={avatar || defaultAvatar}
+          style={{ borderRadius: '40px', height: '40px', weight: 'auto' }}
+        />
+      </div>
+    </Dropdown>
+  );
+}
+
+function mapStateToProps(state) {
+  const {
+    common: { messages, client, language },
+    user: { user, token },
+  } = state;
+  return {
+    token,
+    user,
+    language,
+    messages,
+    client,
+  };
+}
+
+export default connect(mapStateToProps)(UserPanel);

src/router.js

@@ -17,6 +17,7 @@ import Reset from './routes/Reset.js';
 
 import Verify from './routes/Verify.js';
 
+
 function RouterConfig({ history }) {
   return (
     <Router history={history}>

src/routes/Index.js

@@ -6,11 +6,12 @@ import DocumentTitle from 'react-document-title';
 import { FormattedMessage as Format } from 'react-intl';
 import Particles from 'react-particles-js';
 import logo from '../assets/MoeCube.png';
+import UserPanel from '../components/UserPanel';
 
 const languageMap = {
   'zh-CN': '中文',
   'en-US': 'English',
-}
+};
 
 const { Header, Footer } = Layout;
 const particleConfig = {
@@ -127,30 +128,34 @@ const particleConfig = {
   retina_detect: true,
 };
 
-function Index({ children, messages, dispatch, client, token, language }) {
+function Index({ children, messages, dispatch, client, language }) {
   const menu = (
     <Menu style={{ transform: 'translateX(-16px)' }}>
       {
         Object.keys(languageMap).map((lan, i) => {
           return (
             <Menu.Item key={i}>
-              <a onClick={() => { dispatch({ type: 'common/changeLanguage', payload: { language: lan } }) }}>
+              <a
+                onClick={() => {
+                  dispatch({ type: 'common/changeLanguage', payload: { language: lan } });
+                }}
+              >
                 {languageMap[lan]}
               </a>
             </Menu.Item>
-          )
+          );
         })
       }
     </Menu>
   );
   return (
     <div style={{ display: 'flex', flexDirection: 'column', flex: 1, minHeight: '100%' }}>
-      <DocumentTitle title={messages.title || 'Moe Cube'} />
+      <DocumentTitle title={messages.title || 'Moe Cube'}/>
 
       {client !== 'electron' &&
       <Header style={{ display: 'flex', alignItems: 'center' }}>
         <Link to="/" style={{ marginTop: '20px' }}>
-            <img alt="logo" src={logo} style={{ width: '140px', height: '44px' }} />
+          <img alt="logo" src={logo} style={{ width: '140px', height: '44px' }}/>
         </Link>
 
         <Menu
@@ -161,29 +166,14 @@ function Index({ children, messages, dispatch, client, token, language }) {
         >
           <Menu.Item key="1">
             <Link to="/">
-                <Format id="Home" />
+              <Format id="Home"/>
             </Link>
           </Menu.Item>
         </Menu>
 
-          <Menu
-            theme="dark"
-            mode="horizontal"
-            defaultSelectedKeys={['1']}
-            style={{ lineHeight: '64px', position: 'absolute', right: '50px' }}
-          >
-            {token && (<Menu.Item key="1">
-              <div
-                onClick={() => {
-                  dispatch({ type: 'auth/signOut' });
-                }}
-              >
-                <Format id="sign-out" />
+        <div style={{ position: 'absolute', right: '40px' }}>
+          <UserPanel />
         </div>
-            </Menu.Item>)
-            }
-          </Menu>
-
       </Header>
       }
 
@@ -198,7 +188,7 @@ function Index({ children, messages, dispatch, client, token, language }) {
       <Footer style={{ width: '100%', justifyContent: 'space-between', display: 'flex', zIndex: 100 }}>
         <div><Dropdown overlay={menu} trigger={['click']}>
           <a className="ant-dropdown-link changelanguage">
-            {languageMap[language]} <Icon type="down" className="flag" />
+            {languageMap[language]} <Icon type="down" className="flag"/>
           </a>
         </Dropdown></div>
         <div>© MoeCube 2017 all right reserved.</div>