Commit 323eb459 authored by 2breakegg's avatar 2breakegg

change language 按钮位置

parent 9f623290
<?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">
<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$/src/config.js" afterPath="$PROJECT_DIR$/src/config.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Index.js" afterPath="$PROJECT_DIR$/src/routes/Index.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/utils/request.js" afterPath="$PROJECT_DIR$/src/utils/request.js" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
......@@ -19,12 +22,12 @@
<window id="1">
<content type="file-editors">
<state>
<leaf>
<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="267">
<caret line="103" column="13" lean-forward="false" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="13" />
<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>
......@@ -38,105 +41,11 @@
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<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="true" />
<marker date="1491473408568" expanded="true" signature="559:2886" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="580:705" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="733:801" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="748:794" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="825:934" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="840:927" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="871:918" ph="{&quot;checkEmail&quot;: 'validating'...}" />
<marker date="1491473408568" expanded="true" signature="961:1073" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="976:1066" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1007:1057" ph="{&quot;checkUsername&quot;: 'validating'...}" />
<marker date="1491473408568" expanded="true" signature="1095:1199" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1110:1192" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1141:1183" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1226:1294" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1241:1287" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1316:1423" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1331:1416" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1362:1407" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1452:1560" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1467:1553" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1498:1544" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1586:1694" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1601:1687" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1632:1678" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1713:1817" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1728:1810" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1759:1801" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1851:1983" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1866:1976" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1924:1967" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2006:2111" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2021:2104" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2052:2095" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2131:2236" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2146:2229" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2177:2220" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2263:2369" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2278:2362" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2309:2353" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2393:2499" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2408:2492" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2439:2483" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2518:2622" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2533:2615" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2564:2606" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2648:2753" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2663:2746" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2694:2737" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2776:2881" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2791:2874" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2822:2865" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2899:6495" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2946:3274" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3022:3206" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3098:3198" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3221:3268" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3320:3799" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3348:3445" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3457:3673" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3557:3665" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3688:3793" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3848:4351" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3879:3979" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3991:4219" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4097:4211" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4234:4345" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4400:4853" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4476:4716" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4550:4708" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4731:4847" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4903:5346" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4979:5205" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="5053:5197" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="5220:5340" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="5398:6034" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="5474:5891" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="5550:5883" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="5906:6028" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="6083:6490" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="6159:6350" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="6232:6342" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="6365:6484" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="auth.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/services/auth.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<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>
......@@ -147,19 +56,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>
<marker date="1491473408712" expanded="true" signature="83:274" ph="{...}" />
<marker date="1491473408712" expanded="true" signature="212:270" ph="{&quot;method&quot;: 'POST'...}" />
</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">
<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>
......@@ -178,32 +74,65 @@
<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="1368">
<caret line="184" column="29" lean-forward="true" selection-start-line="184" selection-start-column="29" selection-end-line="184" selection-end-column="29" />
<state relative-caret-position="246">
<caret line="166" column="15" lean-forward="true" selection-start-line="166" selection-start-column="15" selection-end-line="166" selection-end-column="15" />
<folding>
<element signature="e#0#52#0" expanded="true" />
<element signature="e#398#2275#0" expanded="false" />
<marker date="1491474024470" expanded="true" signature="5107:5111" ph="{&quot;messages&quot;: messages...}" />
<marker date="1491533202282" expanded="true" signature="5092:5096" ph="{&quot;messages&quot;: messages...}" />
</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">
<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>
</file>
<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="152">
<caret line="8" column="13" lean-forward="true" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
<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">
<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>
</file>
<file leaf-file-name="package.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/package.json">
<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 />
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<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>
<marker date="1491473408641" expanded="true" signature="311:2440" ph="{...}" />
<marker date="1491473408641" expanded="true" signature="782:2438" ph="{...}" />
<marker date="1491473408641" expanded="true" signature="1931:1975" ph="&lt;FormItem/&gt;" />
<marker date="1491473408641" expanded="true" signature="1931:2398" ph="&lt;Form/&gt;" />
<marker date="1491473408641" expanded="true" signature="1931:2414" ph="&lt;Spin/&gt;" />
<marker date="1491473408641" expanded="true" signature="1988:2174" ph="&lt;FormItem/&gt;" />
<marker date="1491473408641" expanded="true" signature="2014:2150" ph="&lt;Button/&gt;" />
<marker date="1491473408641" expanded="true" signature="2188:2380" ph="&lt;div/&gt;" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -211,27 +140,10 @@
<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="380">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<state relative-caret-position="2033">
<caret line="107" column="22" lean-forward="true" selection-start-line="107" selection-start-column="22" selection-end-line="107" selection-end-column="22" />
<folding>
<element signature="e#0#61#0" expanded="true" />
<marker date="1491473408652" expanded="true" signature="4223:4249" ph="&lt;FormItem/&gt;" />
<marker date="1491473408652" expanded="true" signature="4223:4716" ph="&lt;Form/&gt;" />
<marker date="1491473408652" expanded="true" signature="4223:4737" ph="&lt;TabPane/&gt;" />
<marker date="1491473408652" expanded="true" signature="4223:5319" ph="&lt;Tabs/&gt;" />
<marker date="1491473408652" expanded="true" signature="4223:5333" ph="&lt;Spin/&gt;" />
<marker date="1491473408652" expanded="true" signature="4223:5344" ph="{...}" />
<marker date="1491473408652" expanded="true" signature="4223:5346" ph="{...}" />
<marker date="1491473408652" expanded="true" signature="4265:4466" ph="&lt;FormItem/&gt;" />
<marker date="1491473408652" expanded="true" signature="4482:4696" ph="&lt;FormItem/&gt;" />
<marker date="1491473408652" expanded="true" signature="4509:4670" ph="&lt;div/&gt;" />
<marker date="1491473408652" expanded="true" signature="4749:5303" ph="&lt;TabPane/&gt;" />
<marker date="1491473408652" expanded="true" signature="4851:5281" ph="&lt;Tabs/&gt;" />
<marker date="1491473408652" expanded="true" signature="4911:5019" ph="&lt;TabPane/&gt;" />
<marker date="1491473408652" expanded="true" signature="5035:5137" ph="&lt;TabPane/&gt;" />
<marker date="1491473408652" expanded="true" signature="5153:5261" ph="&lt;TabPane/&gt;" />
<marker date="1491473408652" expanded="true" signature="5380:5772" ph="{...}" />
<marker date="1491473408652" expanded="true" signature="5614:5769" ph="{&quot;user&quot;: user...}" />
</folding>
</state>
</provider>
......@@ -241,21 +153,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>Your-account-has-beencreated.</find>
<find>Your-account-has-been created.</find>
<find>Your-account-hasbeen created.</find>
<find>Your-account-has been created.</find>
<find>Your-accounthas been created.</find>
<find>Your-account has been created.</find>
<find>Youraccount has been created.</find>
<find>Your account has been created.</find>
<find>messages[error.message]</find>
<find>hom</find>
<find>MoeCube.21b3</find>
<find>MoeCube.21b</find>
<find>MoeCube.21</find>
<find>MoeCube.2</find>
<find>fr</find>
<find>reset-password</find>
<find>'</find>
<find>MoeCube.</find>
......@@ -266,11 +163,26 @@
<find>avata</find>
<find>avatar</find>
<find>defaultAvatar</find>
<find>h</find>
<find>home</find>
<find>sign-in</find>
<find>img</find>
<find>Index</find>
<find>/</find>
<find>//</find>
<find>//i</find>
<find>i</find>
<find>i18n</find>
<find>c</find>
<find>cha</find>
<find>chan</find>
<find>chang</find>
<find>change</find>
<find>change a</find>
<find>flag-us.png</find>
<find>upload</find>
<find>h</find>
<find>http</find>
<find>http;</find>
</findStrings>
<replaceStrings>
<replace>&quot;,</replace>
......@@ -284,7 +196,6 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/.eslintrc" />
<option value="$PROJECT_DIR$/src/config.js" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/src/components/Example.js" />
......@@ -299,7 +210,6 @@
<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$/i18n.json" />
<option value="$PROJECT_DIR$/src/models/common.js" />
<option value="$PROJECT_DIR$/src/services/auth.js" />
<option value="$PROJECT_DIR$/src/models/auth.js" />
......@@ -307,12 +217,16 @@
<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/Profiles.js" />
<option value="$PROJECT_DIR$/src/routes/Register.js" />
<option value="$PROJECT_DIR$/src/routes/Reset.js" />
<option value="$PROJECT_DIR$/src/routes/Forgot.js" />
<option value="$PROJECT_DIR$/src/routes/Verify.js" />
<option value="$PROJECT_DIR$/src/routes/Profiles.js" />
<option value="$PROJECT_DIR$/i18n.json" />
<option value="$PROJECT_DIR$/src/routes/Index.js" />
<option value="$PROJECT_DIR$/src/utils/request.js" />
<option value="$PROJECT_DIR$/.roadhogrc.js" />
<option value="$PROJECT_DIR$/src/config.js" />
</list>
</option>
</component>
......@@ -354,7 +268,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
......@@ -382,80 +295,9 @@
<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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="services" />
<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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<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="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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="models" />
<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="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="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -469,841 +311,6 @@
<property name="node.js.path.for.package.standard" value="project" />
<property name="node.js.selected.package.standard" value="" />
</component>
<component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
<UpdatedFiles>
<FILE-GROUP>
<option name="myUpdateName" value="Updated from server" />
<option name="myStatusName" value="Changed on server" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="CHANGED_ON_SERVER" />
<FILE-GROUP>
<option name="myUpdateName" value="Updated" />
<option name="myStatusName" value="Changed" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="UPDATED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Created" />
<option name="myStatusName" value="Created" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="CREATED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Deleted" />
<option name="myStatusName" value="Deleted" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="true" />
<option name="myId" value="REMOVED_FROM_REPOSITORY" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Restored" />
<option name="myStatusName" value="Will be restored" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="RESTORED" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Modified" />
<option name="myStatusName" value="Modified" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MODIFIED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Skipped" />
<option name="myStatusName" value="Skipped" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="SKIPPED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged with conflicts" />
<option name="myStatusName" value="Will be merged with conflicts" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED_WITH_CONFLICTS" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged with tree conflicts" />
<option name="myStatusName" value="Merged with tree conflicts" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged with property conflicts" />
<option name="myStatusName" value="Will be merged with property conflicts" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged" />
<option name="myStatusName" value="Will be merged" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Not in repository" />
<option name="myStatusName" value="Not in repository" />
<option name="mySupportsDeletion" value="true" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="UNKNOWN" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Locally added" />
<option name="myStatusName" value="Locally added" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="LOCALLY_ADDED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Locally removed" />
<option name="myStatusName" value="Locally removed" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="LOCALLY_REMOVED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Switched" />
<option name="myStatusName" value="Switched" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="SWITCHED" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Updated from server" />
<option name="myStatusName" value="Changed on server" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="CHANGED_ON_SERVER" />
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Updated" />
<option name="myStatusName" value="Changed" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="UPDATED" />
<PATH vcs="Git" revision="">$PROJECT_DIR$/.roadhogrc.js</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/i18n.json</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/package.json</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/src/models/user.js</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/src/routes/Activate.js</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/src/routes/Forgot.js</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/src/routes/Index.js</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/src/routes/Login.js</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/src/routes/Profiles.js</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/src/routes/Register.js</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/src/routes/Reset.js</PATH>
<PATH vcs="Git" revision="">$PROJECT_DIR$/src/routes/Verify.js</PATH>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Created" />
<option name="myStatusName" value="Created" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="CREATED" />
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Deleted" />
<option name="myStatusName" value="Deleted" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="true" />
<option name="myId" value="REMOVED_FROM_REPOSITORY" />
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Restored" />
<option name="myStatusName" value="Will be restored" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="RESTORED" />
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Modified" />
<option name="myStatusName" value="Modified" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MODIFIED" />
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Skipped" />
<option name="myStatusName" value="Skipped" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="SKIPPED" />
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged with conflicts" />
<option name="myStatusName" value="Will be merged with conflicts" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED_WITH_CONFLICTS" />
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged with tree conflicts" />
<option name="myStatusName" value="Merged with tree conflicts" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged with property conflicts" />
<option name="myStatusName" value="Will be merged with property conflicts" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Merged" />
<option name="myStatusName" value="Will be merged" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MERGED" />
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Not in repository" />
<option name="myStatusName" value="Not in repository" />
<option name="mySupportsDeletion" value="true" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="UNKNOWN" />
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Locally added" />
<option name="myStatusName" value="Locally added" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="LOCALLY_ADDED" />
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Locally removed" />
<option name="myStatusName" value="Locally removed" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="LOCALLY_REMOVED" />
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Switched" />
<option name="myStatusName" value="Switched" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="SWITCHED" />
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
</UpdatedFiles>
</component>
<component name="RunDashboard">
<option name="ruleStates">
<list>
......@@ -1317,33 +324,33 @@
</option>
</component>
<component name="RunManager">
<configuration default="false" name="lint" type="js.build_tools.npm" factoryName="npm" temporary="true" nameIsGenerated="true">
<configuration default="false" name="build" 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="build" />
</scripts>
<node-interpreter value="/usr/local/Cellar/node/7.7.4/bin/node" />
<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="/usr/local/Cellar/node/7.7.4/bin/node" />
<node-interpreter value="project" />
<envs />
<method />
</configuration>
<configuration default="false" name="build" 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="build" />
<script value="start" />
</scripts>
<node-interpreter value="/usr/local/Cellar/node/7.7.4/bin/node" />
<node-interpreter value="project" />
<envs />
<method />
</configuration>
......@@ -1414,15 +421,15 @@
<method />
</configuration>
<list size="3">
<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" />
<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" />
</list>
<recent_temporary>
<list size="3">
<item index="0" class="java.lang.String" itemvalue="npm.lint" />
<item index="1" class="java.lang.String" itemvalue="npm.build" />
<item index="2" class="java.lang.String" itemvalue="npm.start" />
<item index="0" class="java.lang.String" itemvalue="npm.start" />
<item index="1" class="java.lang.String" itemvalue="npm.lint" />
<item index="2" class="java.lang.String" itemvalue="npm.build" />
</list>
</recent_temporary>
</component>
......@@ -1444,6 +451,7 @@
<workItem from="1491362317876" duration="18018000" />
<workItem from="1491448144293" duration="3984000" />
<workItem from="1491459521278" duration="9381000" />
<workItem from="1491532261913" duration="1785000" />
</task>
<task id="LOCAL-00001" summary="i18n">
<created>1490948057319</created>
......@@ -1571,11 +579,25 @@
<option name="project" value="LOCAL" />
<updated>1491470717640</updated>
</task>
<option name="localTasksCounter" value="19" />
<task id="LOCAL-00019" summary="change language">
<created>1491474064819</created>
<option name="number" value="00019" />
<option name="presentableId" value="LOCAL-00019" />
<option name="project" value="LOCAL" />
<updated>1491474064819</updated>
</task>
<task id="LOCAL-00020" summary="i18n">
<created>1491475345189</created>
<option name="number" value="00020" />
<option name="presentableId" value="LOCAL-00020" />
<option name="project" value="LOCAL" />
<updated>1491475345189</updated>
</task>
<option name="localTasksCounter" value="21" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="92379000" />
<option name="totallyTimeSpent" value="95522000" />
</component>
<component name="TodoView" selected-index="3">
<todo-panel id="selected-file">
......@@ -1587,37 +609,26 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1176" extended-state="0" />
<frame x="-8" y="-8" width="1936" height="1176" 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.6706587" 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.25237092" sideWeight="0.6646489" 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="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="-1" 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.19865642" 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="false" show_stripe_button="true" weight="0.25237092" sideWeight="0.32934132" 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="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="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.33535108" 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.22744721" 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="true" show_stripe_button="true" weight="0.20729366" 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.19865642" 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="false" show_stripe_button="true" weight="0.25237092" sideWeight="0.32934132" 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.22744721" 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.6706587" 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" />
......@@ -1651,12 +662,13 @@
<MESSAGE value="i18n + 修改账户信息 无密码长度约束" />
<MESSAGE value="title i18n" />
<MESSAGE value="gitignore" />
<MESSAGE value="i18n" />
<MESSAGE value="error.messages" />
<MESSAGE value="reformat code" />
<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" />
<option name="LAST_COMMIT_MESSAGE" value="travis" />
<MESSAGE value="change language" />
<MESSAGE value="i18n" />
<option name="LAST_COMMIT_MESSAGE" value="i18n" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -1737,6 +749,7 @@
<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>
......@@ -1759,21 +772,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.roadhogrc.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="3" column="47" lean-forward="false" selection-start-line="3" selection-start-column="36" selection-end-line="3" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="23" column="32" lean-forward="true" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
<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">
......@@ -1781,13 +779,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/config.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
......@@ -1864,17 +855,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/upload.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>
<marker date="1491473408712" expanded="true" signature="83:274" ph="{...}" />
<marker date="1491473408712" expanded="true" signature="212:270" ph="{&quot;method&quot;: 'POST'...}" />
</folding>
</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">
......@@ -1883,129 +863,12 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<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>
<marker date="1491473408641" expanded="true" signature="311:2440" ph="{...}" />
<marker date="1491473408641" expanded="true" signature="782:2438" ph="{...}" />
<marker date="1491473408641" expanded="true" signature="1931:1975" ph="&lt;FormItem/&gt;" />
<marker date="1491473408641" expanded="true" signature="1931:2398" ph="&lt;Form/&gt;" />
<marker date="1491473408641" expanded="true" signature="1931:2414" ph="&lt;Spin/&gt;" />
<marker date="1491473408641" expanded="true" signature="1988:2174" ph="&lt;FormItem/&gt;" />
<marker date="1491473408641" expanded="true" signature="2014:2150" ph="&lt;Button/&gt;" />
<marker date="1491473408641" expanded="true" signature="2188:2380" ph="&lt;div/&gt;" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/auth.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/auth.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<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="true" />
<marker date="1491473408568" expanded="true" signature="559:2886" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="580:705" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="733:801" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="748:794" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="825:934" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="840:927" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="871:918" ph="{&quot;checkEmail&quot;: 'validating'...}" />
<marker date="1491473408568" expanded="true" signature="961:1073" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="976:1066" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1007:1057" ph="{&quot;checkUsername&quot;: 'validating'...}" />
<marker date="1491473408568" expanded="true" signature="1095:1199" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1110:1192" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1141:1183" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1226:1294" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1241:1287" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1316:1423" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1331:1416" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1362:1407" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1452:1560" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1467:1553" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1498:1544" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1586:1694" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1601:1687" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1632:1678" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1713:1817" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1728:1810" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1759:1801" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1851:1983" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1866:1976" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="1924:1967" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2006:2111" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2021:2104" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2052:2095" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2131:2236" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2146:2229" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2177:2220" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2263:2369" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2278:2362" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2309:2353" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2393:2499" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2408:2492" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2439:2483" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2518:2622" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2533:2615" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2564:2606" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2648:2753" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2663:2746" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2694:2737" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2776:2881" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2791:2874" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2822:2865" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2899:6495" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="2946:3274" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3022:3206" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3098:3198" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3221:3268" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3320:3799" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3348:3445" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3457:3673" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3557:3665" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3688:3793" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3848:4351" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3879:3979" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="3991:4219" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4097:4211" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4234:4345" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4400:4853" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4476:4716" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4550:4708" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4731:4847" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4903:5346" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="4979:5205" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="5053:5197" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="5220:5340" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="5398:6034" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="5474:5891" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="5550:5883" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="5906:6028" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="6083:6490" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="6159:6350" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="6232:6342" ph="{...}" />
<marker date="1491473408568" expanded="true" signature="6365:6484" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/utils/request.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="267">
<caret line="46" column="2" lean-forward="false" selection-start-line="46" selection-start-column="2" selection-end-line="46" selection-end-column="2" />
<folding>
<element signature="e#0#30#0" expanded="false" />
</folding>
</state>
</provider>
......@@ -2034,18 +897,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1368">
<caret line="184" column="29" lean-forward="true" selection-start-line="184" selection-start-column="29" selection-end-line="184" selection-end-column="29" />
<folding>
<element signature="e#0#52#0" expanded="true" />
<element signature="e#398#2275#0" expanded="false" />
<marker date="1491474024470" expanded="true" signature="5107:5111" ph="{&quot;messages&quot;: messages...}" />
</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">
......@@ -2053,14 +904,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/i18n.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="267">
<caret line="103" column="13" lean-forward="false" selection-start-line="103" selection-start-column="5" selection-end-line="103" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.travis.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="182">
......@@ -2083,33 +926,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Profiles.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="20" column="0" lean-forward="false" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" />
<folding>
<element signature="e#0#61#0" expanded="true" />
<marker date="1491473408652" expanded="true" signature="4223:4249" ph="&lt;FormItem/&gt;" />
<marker date="1491473408652" expanded="true" signature="4223:4716" ph="&lt;Form/&gt;" />
<marker date="1491473408652" expanded="true" signature="4223:4737" ph="&lt;TabPane/&gt;" />
<marker date="1491473408652" expanded="true" signature="4223:5319" ph="&lt;Tabs/&gt;" />
<marker date="1491473408652" expanded="true" signature="4223:5333" ph="&lt;Spin/&gt;" />
<marker date="1491473408652" expanded="true" signature="4223:5344" ph="{...}" />
<marker date="1491473408652" expanded="true" signature="4223:5346" ph="{...}" />
<marker date="1491473408652" expanded="true" signature="4265:4466" ph="&lt;FormItem/&gt;" />
<marker date="1491473408652" expanded="true" signature="4482:4696" ph="&lt;FormItem/&gt;" />
<marker date="1491473408652" expanded="true" signature="4509:4670" ph="&lt;div/&gt;" />
<marker date="1491473408652" expanded="true" signature="4749:5303" ph="&lt;TabPane/&gt;" />
<marker date="1491473408652" expanded="true" signature="4851:5281" ph="&lt;Tabs/&gt;" />
<marker date="1491473408652" expanded="true" signature="4911:5019" ph="&lt;TabPane/&gt;" />
<marker date="1491473408652" expanded="true" signature="5035:5137" ph="&lt;TabPane/&gt;" />
<marker date="1491473408652" expanded="true" signature="5153:5261" ph="&lt;TabPane/&gt;" />
<marker date="1491473408652" expanded="true" signature="5380:5772" ph="{...}" />
<marker date="1491473408652" expanded="true" signature="5614:5769" ph="{&quot;user&quot;: user...}" />
</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">
......@@ -2146,5 +962,93 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Profiles.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2033">
<caret line="107" column="22" lean-forward="true" selection-start-line="107" selection-start-column="22" selection-end-line="107" selection-end-column="22" />
<folding>
<element signature="e#0#61#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Login.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" />
<folding />
</state>
</provider>
</entry>
<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>
<entry file="file://$PROJECT_DIR$/src/services/upload.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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<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 />
</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">
<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>
<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" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.roadhogrc.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<caret line="8" column="13" lean-forward="true" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/config.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" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="246">
<caret line="166" column="15" lean-forward="true" selection-start-line="166" selection-start-column="15" selection-end-line="166" selection-end-column="15" />
<folding>
<element signature="e#0#52#0" expanded="true" />
<element signature="e#398#2275#0" expanded="false" />
<marker date="1491533202282" expanded="true" signature="5092:5096" ph="{&quot;messages&quot;: messages...}" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
......@@ -182,17 +182,6 @@ function Index({ children, messages, dispatch }) {
</div>
</Menu.Item>) : ('')
}
<Menu.Item key="2">
<Dropdown overlay={menu} trigger={['click']}>
{language === 'en-US' ?
<a className="ant-dropdown-link changelanguage" href="#">
&nbsp;English <Icon type="down" className="flag"/>
</a> : <a className="ant-dropdown-link changelanguage" href="#">
&nbsp;中文 <Icon type="down" className="flag"/>
</a>
}
</Dropdown>
</Menu.Item>
</Menu>
</Header>
......@@ -205,7 +194,16 @@ function Index({ children, messages, dispatch }) {
/>
{children}
<Footer style={{ width: '100%' }}>
<Footer style={{ width: '100%', justifyContent: 'space-between', display: 'flex', zIndex: 100 }}>
<div><Dropdown overlay={menu} trigger={['click']}>
{language === 'en-US' ?
<a className="ant-dropdown-link changelanguage" href="#">
&nbsp;English <Icon type="down" className="flag"/>
</a> : <a className="ant-dropdown-link changelanguage" href="#">
&nbsp;中文 <Icon type="down" className="flag"/>
</a>
}
</Dropdown></div>
<div>© MoeCube 2017 all right reserved.</div>
</Footer>
</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