Skip to content

M
Moecube Accounts Web
Commit 61521e23 authored by 神楽坂玲奈's avatar 神楽坂玲奈
Browse files
Options

env

parent 40318e4c
Hide whitespace changes
Inline Side-by-side
Showing with 300 additions and 242 deletions
.gitignore
View file @ 61521e23
......@@ -8,6 +8,7 @@
# misc
.DS_Store
*.log*
npm-debug.log*
/utils/config.js
.idea/workspace.xml
.idea/watcherTasks.xml 0 → 100644
View file @ 61521e23
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectTasksOptions" suppressed-tasks="Less" />
</project>
\ No newline at end of file
.idea/workspace.xml
View file @ 61521e23
<?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$/src/models/common.js" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/routes/Register.js" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.eslintrc" afterPath="$PROJECT_DIR$/.eslintrc" />
<list default="true" id="eb37985e-18dc-4e2f-82ba-9874832785ff" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/watcherTasks.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/router.js" afterPath="$PROJECT_DIR$/src/router.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Profiles.js" afterPath="$PROJECT_DIR$/src/routes/Profiles.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.travis.yml" afterPath="$PROJECT_DIR$/.travis.yml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/components/UserPanel.js" afterPath="$PROJECT_DIR$/src/components/UserPanel.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Index.js" afterPath="$PROJECT_DIR$/src/routes/Index.js" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
......@@ -21,146 +19,154 @@
<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>
<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">
<provider selected="true" editor-type-id="text-editor">
<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" />
<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/services/auth.js">
<file leaf-file-name="Index.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/routes/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="3" column="12" lean-forward="true" selection-start-line="3" selection-start-column="12" selection-end-line="3" selection-end-column="12" />
<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>
<file leaf-file-name="upload.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/services/upload.js">
<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="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<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="Index.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/routes/Index.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="1805">
<caret line="207" column="15" lean-forward="true" selection-start-line="207" selection-start-column="15" selection-end-line="207" selection-end-column="15" />
<folding>
<element signature="e#0#52#0" expanded="true" />
<element signature="e#398#2275#0" expanded="false" />
<marker date="1491534380238" expanded="true" signature="5091:5096" 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>
</file>
<file leaf-file-name=".eslintrc" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.eslintrc">
<file leaf-file-name="user.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/models/user.js">
<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 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>
</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="Activate.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Activate.js">
<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="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>
<marker date="1491533542759" expanded="true" signature="36:50" ph="{&quot;apiRoot&quot;: apiRoot...}" />
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".roadhogrc.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.roadhogrc.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="152">
<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 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>
<marker date="1491534380488" expanded="true" signature="252:254" ph="{...}" />
<marker date="1491534380488" expanded="true" signature="371:525" ph="{...}" />
<marker date="1491534380488" expanded="true" signature="400:519" ph="[...]" />
<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="request.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/utils/request.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="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 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>
<element signature="e#0#30#0" expanded="true" />
<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="package.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package.json">
<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="38">
<caret line="2" column="14" lean-forward="true" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
<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>
<marker date="1491534380518" expanded="true" signature="278:311" ph="{&quot;install-node&quot;: &quot;6.9.2&quot;...}" />
<marker date="1491534380518" expanded="true" signature="331:658" ph="{&quot;antd&quot;: &quot;^2.8.2&quot;...}" />
<marker date="1491534380518" expanded="true" signature="681:1148" ph="{&quot;babel-eslint&quot;: &quot;^7.1.1&quot;...}" />
<element signature="e#0#55#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Login.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Login.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="19">
<caret line="45" column="22" lean-forward="false" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
<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="Profiles.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Profiles.js">
<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="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="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#61#0" expanded="true" />
<marker date="1491534380538" expanded="true" signature="895:5442" ph="{...}" />
<marker date="1491534380538" expanded="true" signature="2128:5440" ph="{...}" />
<marker date="1491534380538" expanded="true" signature="5476:5868" ph="{...}" />
<marker date="1491534380538" expanded="true" signature="5710:5865" ph="{&quot;user&quot;: user...}" />
<element signature="e#0#66#0" expanded="true" />
</folding>
</state>
</provider>
......@@ -230,7 +236,6 @@
<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" />
......@@ -243,6 +248,8 @@
<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" />
</list>
</option>
......@@ -265,10 +272,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">
......@@ -285,26 +291,25 @@
<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="myItemId" value="moecube-accounts-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="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="myItemId" value="moecube-accounts-web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
......@@ -314,11 +319,11 @@
</PATH>
<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="myItemId" value="moecube-accounts-web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
......@@ -326,12 +331,31 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="models" />
<option name="myItemId" value="routes" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<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="moecube-accounts-web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="components" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
......@@ -340,11 +364,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="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="reference.settingsdialog.IDE.editor.colors" />
<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.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">
......@@ -369,23 +393,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>
......@@ -457,13 +481,13 @@
</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">
<item index="0" class="java.lang.String" itemvalue="npm.start" />
<item index="1" class="java.lang.String" itemvalue="npm.lint" />
<item index="0" class="java.lang.String" itemvalue="npm.lint" />
<item index="1" class="java.lang.String" itemvalue="npm.start" />
<item index="2" class="java.lang.String" itemvalue="npm.build" />
</list>
</recent_temporary>
......@@ -639,7 +663,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="96132000" />
<option name="totallyTimeSpent" value="96253000" />
</component>
<component name="TodoView" selected-index="3">
<todo-panel id="selected-file">
......@@ -651,26 +675,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.6641318" 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="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="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" />
......@@ -711,7 +745,8 @@
<MESSAGE value="change language" />
<MESSAGE value="i18n" />
<MESSAGE value="change language 按钮位置" />
<option name="LAST_COMMIT_MESSAGE" value="change language 按钮位置" />
<MESSAGE value="env" />
<option name="LAST_COMMIT_MESSAGE" value="env" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -731,13 +766,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/config.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
<caret line="2" column="14" lean-forward="false" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/example.js" />
<entry file="file://$PROJECT_DIR$/src/components/PasswordForm.css">
<provider selected="true" editor-type-id="text-editor">
......@@ -793,7 +821,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" column="32" lean-forward="true" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
<folding />
</state>
</provider>
</entry>
......@@ -804,8 +831,9 @@
<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="247">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<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>
......@@ -828,9 +856,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
<caret line="101" column="30" lean-forward="false" selection-start-line="101" selection-start-column="30" selection-end-line="101" selection-end-column="30" />
<folding>
<element signature="e#0#35#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -845,9 +870,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="526">
<caret line="36" column="0" lean-forward="false" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
<folding>
<element signature="e#0#35#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -855,9 +877,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="74" column="30" lean-forward="false" selection-start-line="74" selection-start-column="30" selection-end-line="74" selection-end-column="30" />
<folding>
<element signature="e#0#35#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -872,9 +891,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-912">
<caret line="32" column="12" lean-forward="false" selection-start-line="32" selection-start-column="12" selection-end-line="32" selection-end-column="12" />
<folding>
<element signature="e#0#35#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -896,7 +912,6 @@
<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" />
<folding />
</state>
</provider>
</entry>
......@@ -943,47 +958,85 @@
</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="3933">
<caret line="211" column="24" lean-forward="false" selection-start-line="211" selection-start-column="24" selection-end-line="211" selection-end-column="24" />
<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="true" />
</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" />
<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>
<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="false" />
<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>
......@@ -991,24 +1044,24 @@
</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="false" />
<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="1491534380538" expanded="true" signature="895:5442" ph="{...}" />
<marker date="1491534380538" expanded="true" signature="2128:5440" ph="{...}" />
<marker date="1491534380538" expanded="true" signature="5476:5868" ph="{...}" />
<marker date="1491534380538" expanded="true" signature="5710:5865" 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>
......@@ -1017,7 +1070,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="19">
<caret line="45" column="22" lean-forward="false" selection-start-line="45" selection-start-column="22" selection-end-line="45" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
......@@ -1025,7 +1077,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
......@@ -1033,11 +1084,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
<caret line="2" column="14" lean-forward="true" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
<folding>
<marker date="1491534380518" expanded="true" signature="278:311" ph="{&quot;install-node&quot;: &quot;6.9.2&quot;...}" />
<marker date="1491534380518" expanded="true" signature="331:658" ph="{&quot;antd&quot;: &quot;^2.8.2&quot;...}" />
<marker date="1491534380518" expanded="true" signature="681:1148" ph="{&quot;babel-eslint&quot;: &quot;^7.1.1&quot;...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -1045,7 +1092,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="3" column="12" lean-forward="true" selection-start-line="3" selection-start-column="12" selection-end-line="3" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
......@@ -1053,9 +1099,6 @@
<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" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
......@@ -1063,11 +1106,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<caret line="15" column="13" lean-forward="true" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
<folding>
<marker date="1491534380488" expanded="true" signature="252:254" ph="{...}" />
<marker date="1491534380488" expanded="true" signature="371:525" ph="{...}" />
<marker date="1491534380488" expanded="true" signature="400:519" ph="[...]" />
</folding>
</state>
</provider>
</entry>
......@@ -1075,37 +1113,41 @@
<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>
<marker date="1491533542759" expanded="true" signature="36:50" ph="{&quot;apiRoot&quot;: apiRoot...}" />
</folding>
</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 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/routes/Index.js">
<entry file="file://$PROJECT_DIR$/i18n.json">
<provider selected="true" editor-type-id="text-editor">
<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/components/UserPanel.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1805">
<caret line="207" column="15" lean-forward="true" selection-start-line="207" selection-start-column="15" selection-end-line="207" selection-end-column="15" />
<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#52#0" expanded="true" />
<element signature="e#398#2275#0" expanded="false" />
<marker date="1491534380238" expanded="true" signature="5091:5096" ph="{&quot;messages&quot;: messages...}" />
<element signature="e#0#38#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/i18n.json">
<entry file="file://$PROJECT_DIR$/src/routes/Index.js">
<provider selected="true" editor-type-id="text-editor">
<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" />
<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>
......
.travis.yml
View file @ 61521e23
language: node_js
node_js: node
env:
NODE_ENV: development
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=
......
src/components/UserPanel.js
View file @ 61521e23
import React from 'react';
import { Dropdown, Menu } from 'antd';
import { connect } from 'dva';
import styles from './UserPanel.css';
import { Dropdown, Menu, Icon } from 'antd';
import { Link } from 'dva/router';
import React from 'react';
import { FormattedMessage as Format } from 'react-intl';
import { Link } from 'dva/router'
const defaultAvatar = require('../../public/default_avatar.jpg');
function UserPanel({ dispatch, user, token }) {
const { avatar } = user;
const menu = (
<Menu trigger={['click']}>
<Menu.Item>
{
token ? <Link to="/profiles">//i18n 个人中心</Link> : <Link to="/signin">//i18n 登录</Link>
}
{
// 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>
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 className="ant-dropdown-link" style={{ display: 'flex', alignItems: 'center' }}>
<img
alt="avatar" src={avatar || defaultAvatar}
style={{ borderRadius: '40px', height: '40px', weight: 'auto' }}
/>
</div>
</Dropdown>
);
......
src/routes/Index.js
View file @ 61521e23
......@@ -6,12 +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'
import UserPanel from '../components/UserPanel';
const languageMap = {
'zh-CN': '中文',
'en-US': 'English',
}
};
const { Header, Footer } = Layout;
const particleConfig = {
......@@ -128,48 +128,53 @@ 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' }} />
</Link>
<Header style={{ display: 'flex', alignItems: 'center' }}>
<Link to="/" style={{ marginTop: '20px' }}>
<img alt="logo" src={logo} style={{ width: '140px', height: '44px' }}/>
</Link>
<Menu
theme="dark"
mode="horizontal"
defaultSelectedKeys={['1']}
style={{ lineHeight: '64px' }}>
<Menu.Item key="1">
<Link to="/">
<Format id="Home" />
</Link>
</Menu.Item>
</Menu>
<Menu
theme="dark"
mode="horizontal"
defaultSelectedKeys={['1']}
style={{ lineHeight: '64px' }}
>
<Menu.Item key="1">
<Link to="/">
<Format id="Home"/>
</Link>
</Menu.Item>
</Menu>
<div style={{ position: 'absolute', right: '40px' }}>
<UserPanel />
</div>
</Header>
<div style={{ position: 'absolute', right: '40px' }}>
<UserPanel />
</div>
</Header>
}
<Particles
......@@ -183,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>
......
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