Skip to content

M
Moecube Accounts Web
Commit bb2c37c3 authored by 2breakegg's avatar 2breakegg
Browse files
Options

change language

parent 1a7177ed
Show whitespace changes
Inline Side-by-side
Showing with 1087 additions and 178 deletions
.idea/workspace.xml
View file @ bb2c37c3
<?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 type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.travis.yml" />
<list default="true" id="eb37985e-18dc-4e2f-82ba-9874832785ff" name="Default" comment="change language">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/models/user.js" afterPath="$PROJECT_DIR$/src/models/user.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Activate.js" afterPath="$PROJECT_DIR$/src/routes/Activate.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Forgot.js" afterPath="$PROJECT_DIR$/src/routes/Forgot.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Profiles.js" afterPath="$PROJECT_DIR$/src/routes/Profiles.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Register.js" afterPath="$PROJECT_DIR$/src/routes/Register.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Reset.js" afterPath="$PROJECT_DIR$/src/routes/Reset.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Verify.js" afterPath="$PROJECT_DIR$/src/routes/Verify.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/" />
......@@ -26,12 +19,12 @@
<window id="1">
<content type="file-editors">
<state>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<leaf>
<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="122">
<caret line="84" column="16" lean-forward="false" selection-start-line="84" selection-start-column="16" selection-end-line="84" selection-end-column="16" />
<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>
......@@ -45,127 +38,200 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Index.js">
<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="115">
<caret line="134" column="13" lean-forward="false" selection-start-line="134" selection-start-column="13" selection-end-line="134" selection-end-column="13" />
<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#36#0" expanded="true" />
<marker date="1491471996000" expanded="true" signature="2311:3776" ph="{...}" />
<marker date="1491471996000" expanded="true" signature="2482:3513" ph="&lt;Header/&gt;" />
<marker date="1491471996000" expanded="true" signature="2549:2690" ph="&lt;Link/&gt;" />
<marker date="1491471996000" expanded="true" signature="2700:2994" ph="&lt;Menu/&gt;" />
<marker date="1491471996000" expanded="true" signature="2856:2978" ph="&lt;Menu.Item/&gt;" />
<marker date="1491471996000" expanded="true" signature="2888:2955" ph="&lt;Link/&gt;" />
<marker date="1491471996000" expanded="true" signature="3004:3497" ph="&lt;Menu/&gt;" />
<marker date="1491471996000" expanded="true" signature="3231:3461" ph="&lt;Menu.Item/&gt;" />
<marker date="1491471996000" expanded="true" signature="3263:3438" ph="&lt;div/&gt;" />
<marker date="1491471996000" expanded="true" signature="3297:3366" ph="{...}" />
<marker date="1491471996000" expanded="true" signature="3521:3629" ph="&lt;Particles/&gt;" />
<marker date="1491471996000" expanded="true" signature="3579:3619" ph="{&quot;position&quot;: 'fixed'...}" />
<marker date="1491471996000" expanded="true" signature="3654:3758" ph="&lt;Footer/&gt;" />
<marker date="1491471996000" expanded="true" signature="3810:3892" ph="{...}" />
<marker date="1491471996000" expanded="true" signature="3870:3889" ph="{&quot;messages&quot;: messages...}" />
<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="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/index.html">
<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="240">
<caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<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>
</file>
<file leaf-file-name=".travis.yml" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.travis.yml">
<file leaf-file-name="upload.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/services/upload.js">
<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" />
<folding />
<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="user.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/models/user.js">
<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="198">
<caret line="212" column="61" lean-forward="true" selection-start-line="212" selection-start-column="61" selection-end-line="212" selection-end-column="61" />
<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>
</file>
<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="40">
<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>
</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="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="172">
<caret line="119" column="34" lean-forward="false" selection-start-line="119" selection-start-column="34" selection-end-line="119" selection-end-column="34" />
<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" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Register.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Register.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="-1174">
<caret line="62" column="46" lean-forward="true" selection-start-line="62" selection-start-column="46" selection-end-line="62" selection-end-column="46" />
<state relative-caret-position="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>
<marker date="1491472843000" expanded="true" signature="1495:1562" ph="{&quot;validateStatus&quot;: checkEmail...}" />
<marker date="1491472843000" expanded="true" signature="2068:2193" ph="{&quot;placeholder&quot;: messages.username...}" />
<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>
</file>
<file leaf-file-name="Reset.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Reset.js">
<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="33">
<caret line="53" column="109" lean-forward="false" selection-start-line="53" selection-start-column="109" selection-end-line="53" selection-end-column="109" />
<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>
<element signature="e#0#55#0" expanded="true" />
<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>
</file>
<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="92">
<caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Verify.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/routes/Verify.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="123">
<caret line="71" column="18" lean-forward="false" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
<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#66#0" expanded="true" />
<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>
......@@ -237,7 +303,6 @@
<option value="$PROJECT_DIR$/src/models/common.js" />
<option value="$PROJECT_DIR$/src/services/auth.js" />
<option value="$PROJECT_DIR$/src/models/auth.js" />
<option value="$PROJECT_DIR$/src/routes/Index.js" />
<option value="$PROJECT_DIR$/public/index.html" />
<option value="$PROJECT_DIR$/.travis.yml" />
<option value="$PROJECT_DIR$/src/models/user.js" />
......@@ -247,6 +312,7 @@
<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/Index.js" />
</list>
</option>
</component>
......@@ -268,9 +334,10 @@
<handled-path value="$PROJECT_DIR$/node_modules" />
</component>
<component name="ProjectFrameBounds">
<option name="y" value="23" />
<option name="width" value="1440" />
<option name="height" value="815" />
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1936" />
<option name="height" value="1176" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
......@@ -287,25 +354,27 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="moecube-accounts-web" />
<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="moecube-accounts-web" />
<option name="myItemId" value="mycard-account-web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="moecube-accounts-web" />
<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="moecube-accounts-web" />
<option name="myItemId" value="mycard-account-web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
......@@ -315,11 +384,29 @@
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="moecube-accounts-web" />
<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="moecube-accounts-web" />
<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>
......@@ -333,11 +420,11 @@
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="moecube-accounts-web" />
<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="moecube-accounts-web" />
<option name="myItemId" value="mycard-account-web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
......@@ -349,10 +436,26 @@
<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" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -369,58 +472,457 @@
<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="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="CHANGED_ON_SERVER" />
<option name="myId" value="MODIFIED" />
<FILE-GROUP>
<option name="myUpdateName" value="Updated" />
<option name="myStatusName" value="Changed" />
<option name="myUpdateName" />
<option name="myStatusName" />
<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>
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Created" />
<option name="myStatusName" value="Created" />
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="CREATED" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Deleted" />
<option name="myStatusName" value="Deleted" />
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="true" />
<option name="myId" value="REMOVED_FROM_REPOSITORY" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Restored" />
<option name="myStatusName" value="Will be restored" />
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="RESTORED" />
</FILE-GROUP>
<option name="myId" />
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Modified" />
<option name="myStatusName" value="Modified" />
<option name="myUpdateName" />
<option name="myStatusName" />
<option name="mySupportsDeletion" value="false" />
<option name="myCanBeAbsent" value="false" />
<option name="myId" value="MODIFIED" />
<option name="myId" />
</FILE-GROUP>
</FILE-GROUP>
<FILE-GROUP>
<option name="myUpdateName" value="Skipped" />
......@@ -428,6 +930,41 @@
<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" />
......@@ -435,6 +972,41 @@
<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" />
......@@ -442,6 +1014,41 @@
<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" />
......@@ -449,6 +1056,41 @@
<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" />
......@@ -456,6 +1098,41 @@
<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" />
......@@ -463,6 +1140,41 @@
<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" />
......@@ -470,6 +1182,41 @@
<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" />
......@@ -477,6 +1224,41 @@
<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" />
......@@ -484,6 +1266,41 @@
<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>
......@@ -758,7 +1575,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="91792000" />
<option name="totallyTimeSpent" value="92379000" />
</component>
<component name="TodoView" selected-index="3">
<todo-panel id="selected-file">
......@@ -770,17 +1587,18 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" />
<frame x="-8" y="-8" width="1936" height="1176" extended-state="0" />
<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.25229034" sideWeight="0.6557789" 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.6706587" 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="true" show_stripe_button="true" weight="0.4495159" sideWeight="0.51867515" order="7" side_tool="true" 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="true" show_stripe_button="true" weight="0.4495159" sideWeight="0.48132488" 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.48696265" 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.34422112" 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.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="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.22544952" sideWeight="0.48766738" 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.22744721" 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" />
......@@ -919,7 +1737,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>
......@@ -927,7 +1744,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="242">
<caret line="27" column="23" lean-forward="false" selection-start-line="27" selection-start-column="23" selection-end-line="27" selection-end-column="23" />
<folding />
</state>
</provider>
</entry>
......@@ -1045,47 +1861,141 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="9" column="6" lean-forward="false" selection-start-line="9" selection-start-column="6" selection-end-line="9" selection-end-column="6" />
<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="90">
<caret line="6" column="33" lean-forward="false" selection-start-line="6" selection-start-column="33" selection-end-line="6" selection-end-column="33" />
<folding />
<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="266">
<caret line="14" column="6" lean-forward="false" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
<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>
<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="77" lean-forward="false" selection-start-line="45" selection-start-column="77" selection-end-line="45" selection-end-column="77" />
<folding />
<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="-220">
<caret line="13" column="5" lean-forward="false" selection-start-line="13" selection-start-column="5" selection-end-line="13" selection-end-column="5" />
<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="437">
<caret line="23" column="20" lean-forward="false" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="20" />
<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="false" />
<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>
......@@ -1104,9 +2014,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="8" column="1" lean-forward="true" selection-start-line="8" selection-start-column="1" selection-end-line="8" selection-end-column="1" />
<folding>
<element signature="e#0#28#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
......@@ -1114,7 +2021,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="2" lean-forward="false" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
......@@ -1123,32 +2029,19 @@
<state relative-caret-position="225">
<caret line="15" column="33" lean-forward="false" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
<folding>
<element signature="e#0#31#0" expanded="true" />
<element signature="e#0#31#0" expanded="false" />
</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="115">
<caret line="134" column="13" lean-forward="false" selection-start-line="134" selection-start-column="13" selection-end-line="134" selection-end-column="13" />
<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#36#0" expanded="true" />
<marker date="1491471996000" expanded="true" signature="2311:3776" ph="{...}" />
<marker date="1491471996000" expanded="true" signature="2482:3513" ph="&lt;Header/&gt;" />
<marker date="1491471996000" expanded="true" signature="2549:2690" ph="&lt;Link/&gt;" />
<marker date="1491471996000" expanded="true" signature="2700:2994" ph="&lt;Menu/&gt;" />
<marker date="1491471996000" expanded="true" signature="2856:2978" ph="&lt;Menu.Item/&gt;" />
<marker date="1491471996000" expanded="true" signature="2888:2955" ph="&lt;Link/&gt;" />
<marker date="1491471996000" expanded="true" signature="3004:3497" ph="&lt;Menu/&gt;" />
<marker date="1491471996000" expanded="true" signature="3231:3461" ph="&lt;Menu.Item/&gt;" />
<marker date="1491471996000" expanded="true" signature="3263:3438" ph="&lt;div/&gt;" />
<marker date="1491471996000" expanded="true" signature="3297:3366" ph="{...}" />
<marker date="1491471996000" expanded="true" signature="3521:3629" ph="&lt;Particles/&gt;" />
<marker date="1491471996000" expanded="true" signature="3579:3619" ph="{&quot;position&quot;: 'fixed'...}" />
<marker date="1491471996000" expanded="true" signature="3654:3758" ph="&lt;Footer/&gt;" />
<marker date="1491471996000" expanded="true" signature="3810:3892" ph="{...}" />
<marker date="1491471996000" expanded="true" signature="3870:3889" ph="{&quot;messages&quot;: messages...}" />
<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>
......@@ -1157,14 +2050,13 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/i18n.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="122">
<caret line="84" column="16" lean-forward="false" selection-start-line="84" selection-start-column="16" selection-end-line="84" selection-end-column="16" />
<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>
......@@ -1173,14 +2065,13 @@
<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" />
<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="198">
<caret line="212" column="61" lean-forward="true" selection-start-line="212" selection-start-column="61" selection-end-line="212" selection-end-column="61" />
<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" />
<folding />
</state>
</provider>
......@@ -1189,17 +2080,33 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="40">
<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/Profiles.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="172">
<caret line="119" column="34" lean-forward="false" selection-start-line="119" selection-start-column="34" selection-end-line="119" selection-end-column="34" />
<folding />
<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>
......@@ -1207,10 +2114,7 @@
<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>
<marker date="1491472843000" expanded="true" signature="1495:1562" ph="{&quot;validateStatus&quot;: checkEmail...}" />
<marker date="1491472843000" expanded="true" signature="2068:2193" ph="{&quot;placeholder&quot;: messages.username...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -1219,7 +2123,7 @@
<state relative-caret-position="33">
<caret line="53" column="109" lean-forward="false" selection-start-line="53" selection-start-column="109" selection-end-line="53" selection-end-column="109" />
<folding>
<element signature="e#0#55#0" expanded="true" />
<element signature="e#0#55#0" expanded="false" />
</folding>
</state>
</provider>
......@@ -1237,7 +2141,7 @@
<state relative-caret-position="123">
<caret line="71" column="18" lean-forward="false" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
<folding>
<element signature="e#0#66#0" expanded="true" />
<element signature="e#0#66#0" expanded="false" />
</folding>
</state>
</provider>
......
src/routes/Index.js
View file @ bb2c37c3
import { Layout, Menu, Dropdown, Icon } from 'antd';
import { Dropdown, Icon, Layout, Menu } from 'antd';
import { connect } from 'dva';
import { Link } from 'dva/router';
import React from 'react';
......@@ -123,17 +123,23 @@ const particleConfig = {
};
function Index({ children, messages, dispatch }) {
const language = localStorage.getItem('locale') || navigator.language || (navigator.languages && navigator.languages[0]) || navigator.userLanguage || navigator.browserLanguage || 'zh-CN' ;
const language = localStorage.getItem('locale') || navigator.language || (navigator.languages && navigator.languages[0]) || navigator.userLanguage || navigator.browserLanguage || 'zh-CN';
const menu = (
<Menu style={{ transform: 'translateX(-16px)' }}>
<Menu.Item key="0">
<a onClick={() => { dispatch({ type: 'common/changeLanguage', payload: { id: 'en-US' } })}} className='changelanguage'>
<a
onClick={() => {
dispatch({ type: 'common/changeLanguage', payload: { id: 'en-US' } });
}}
>
&nbsp;English</a>
</Menu.Item>
<Menu.Item key="1">
<a onClick={() => { dispatch({ type: 'common/changeLanguage', payload: { id: 'zh-EN' } })}} className='changelanguage'>
<a
onClick={() => {
dispatch({ type: 'common/changeLanguage', payload: { id: 'zh-EN' } });
}}
>
&nbsp;中文</a>
</Menu.Item>
</Menu>
......@@ -179,13 +185,12 @@ function Index({ children, messages, dispatch }) {
<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>)}
<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>
......
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