Skip to content

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

Merge remote-tracking branch 'origin/master'

parents 455a6db7 20311474
Hide whitespace changes
Inline Side-by-side
Showing with 247 additions and 323 deletions
.eslintrc
View file @ c5d1df44
......@@ -10,6 +10,7 @@
"react/forbid-prop-types": [0],
"react/jsx-filename-extension": [1, { "extensions": [".js"] }],
"global-require": [1],
"react/jsx-closing-bracket-location":[0],
"import/prefer-default-export": [0],
"react/jsx-no-bind": [0],
"react/prop-types": [0],
......
.idea/watcherTasks.xml deleted 100644 → 0
View file @ 455a6db7
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectTasksOptions" suppressed-tasks="Less" />
</project>
\ No newline at end of file
.idea/workspace.xml
View file @ c5d1df44
<?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="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.roadhogrc.js" afterPath="$PROJECT_DIR$/.roadhogrc.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
<list default="true" id="eb37985e-18dc-4e2f-82ba-9874832785ff" name="Default" comment="i18n">
<change type="DELETED" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Profiles.js" afterPath="$PROJECT_DIR$/src/routes/Profiles.js" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
<ignored path="$PROJECT_DIR$/tmp/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DockManager">
<window id="1">
<content type="file-editors">
<state>
<leaf>
<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="475">
<caret line="25" column="30" lean-forward="false" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</state>
</content>
</window>
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="130" column="68" lean-forward="true" selection-start-line="130" selection-start-column="68" selection-end-line="130" selection-end-column="68" />
<folding>
<element signature="e#0#52#0" expanded="true" />
</folding>
<state relative-caret-position="399">
<caret line="32" column="17" lean-forward="true" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="19" />
<folding />
</state>
</provider>
</entry>
......@@ -34,17 +57,17 @@
<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="45">
<state relative-caret-position="57">
<caret line="3" column="13" lean-forward="false" selection-start-line="3" selection-start-column="2" selection-end-line="3" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="package.json" pinned="false" current-in-tab="true">
<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="165">
<state relative-caret-position="209">
<caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" />
<folding />
</state>
......@@ -54,8 +77,8 @@
<file leaf-file-name="UserPanel.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/UserPanel.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="930">
<caret line="62" column="0" lean-forward="true" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
<state relative-caret-position="266">
<caret line="14" column="51" lean-forward="true" selection-start-line="14" selection-start-column="51" selection-end-line="14" selection-end-column="51" />
<folding>
<element signature="e#0#38#0" expanded="true" />
</folding>
......@@ -63,11 +86,11 @@
</provider>
</entry>
</file>
<file leaf-file-name=".eslintrc" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.eslintrc">
<file leaf-file-name="SendEmail.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/SendEmail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="10" column="58" lean-forward="false" selection-start-line="10" selection-start-column="58" selection-end-line="10" selection-end-column="58" />
<state relative-caret-position="133">
<caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -76,92 +99,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="1665">
<caret line="120" column="34" lean-forward="false" selection-start-line="120" selection-start-column="34" selection-end-line="120" selection-end-column="34" />
<folding>
<marker date="1491539278000" expanded="true" signature="895:5562" ph="{...}" />
<marker date="1491539278000" expanded="true" signature="2128:5560" ph="{...}" />
<marker date="1491539278000" expanded="true" signature="2640:5549" ph="&lt;Spin/&gt;" />
<marker date="1491539278000" expanded="true" signature="5596:5988" ph="{...}" />
<marker date="1491539278000" expanded="true" signature="5830:5985" ph="{&quot;user&quot;: user...}" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Register.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Register.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="870">
<caret line="62" column="46" lean-forward="false" selection-start-line="62" selection-start-column="46" selection-end-line="62" selection-end-column="46" />
<folding>
<marker date="1491534361000" expanded="true" signature="323:5343" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="1251:5341" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="1495:1562" ph="{&quot;validateStatus&quot;: checkEmail...}" />
<marker date="1491534361000" expanded="true" signature="2068:2193" ph="{&quot;placeholder&quot;: messages.username...}" />
<marker date="1491534361000" expanded="true" signature="2215:5330" ph="&lt;div/&gt;" />
<marker date="1491534361000" expanded="true" signature="2331:5317" ph="&lt;Spin/&gt;" />
<marker date="1491534361000" expanded="true" signature="2379:2589" ph="&lt;Steps/&gt;" />
<marker date="1491534361000" expanded="true" signature="2601:5301" ph="&lt;Form/&gt;" />
<marker date="1491534361000" expanded="true" signature="2703:3118" ph="&lt;FormItem/&gt;" />
<marker date="1491534361000" expanded="true" signature="2773:3023" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="2798:3006" ph="[...]" />
<marker date="1491534361000" expanded="true" signature="2799:3005" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="3132:3680" ph="&lt;FormItem/&gt;" />
<marker date="1491534361000" expanded="true" signature="3207:3582" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="3232:3565" ph="[...]" />
<marker date="1491534361000" expanded="true" signature="3233:3564" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="3694:4299" ph="&lt;FormItem/&gt;" />
<marker date="1491534361000" expanded="true" signature="3762:3992" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="3787:3975" ph="[...]" />
<marker date="1491534361000" expanded="true" signature="3788:3974" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="3994:4057" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="4076:4257" ph="&lt;Input/&gt;" />
<marker date="1491534361000" expanded="true" signature="4313:4981" ph="&lt;FormItem/&gt;" />
<marker date="1491534361000" expanded="true" signature="4380:4680" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="4405:4663" ph="[...]" />
<marker date="1491534361000" expanded="true" signature="4406:4592" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="4594:4662" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="4699:4939" ph="&lt;Input/&gt;" />
<marker date="1491534361000" expanded="true" signature="4995:5180" ph="&lt;FormItem/&gt;" />
<marker date="1491534361000" expanded="true" signature="5020:5156" ph="&lt;Button/&gt;" />
<marker date="1491534361000" expanded="true" signature="5194:5283" ph="&lt;div/&gt;" />
<marker date="1491534361000" expanded="true" signature="5377:5714" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="5581:5711" ph="{&quot;loading&quot;: loading...}" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Reset.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Reset.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="795">
<caret line="53" column="109" lean-forward="false" selection-start-line="53" selection-start-column="109" selection-end-line="53" selection-end-column="109" />
<state relative-caret-position="600">
<caret line="120" column="81" lean-forward="true" selection-start-line="120" selection-start-column="81" selection-end-line="120" selection-end-column="81" />
<folding>
<element signature="e#0#55#0" expanded="true" />
</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="495">
<caret line="37" column="20" lean-forward="false" selection-start-line="37" selection-start-column="20" selection-end-line="37" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Verify.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Verify.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1065">
<caret line="71" column="18" lean-forward="false" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
<folding>
<element signature="e#0#66#0" expanded="true" />
<element signature="e#0#61#0" expanded="true" />
</folding>
</state>
</provider>
......@@ -171,36 +112,36 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>reset-password</find>
<find>'</find>
<find>MoeCube.</find>
<find>a</find>
<find>at</find>
<find>aat</find>
<find>avat</find>
<find>avata</find>
<find>avatar</find>
<find>defaultAvatar</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>
<find>/</find>
<find>//i</find>
<find>//i1</find>
<find>//i18</find>
<find>//i18n</find>
<find>/i18n</find>
<find>i18n</find>
<find>i18ns</find>
<find>i18nss</find>
<find>i18nsss</find>
<find>x</find>
<find>l</find>
<find>la</find>
<find>lab</find>
<find>labe</find>
<find>label</find>
<find>m</find>
<find>mess</find>
<find>message</find>
<find>message.</find>
<find>message.i</find>
<find>message.in</find>
<find>message.inf</find>
<find>message.info</find>
</findStrings>
<replaceStrings>
<replace>&quot;,</replace>
......@@ -236,16 +177,16 @@
<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/utils/request.js" />
<option value="$PROJECT_DIR$/src/config.js" />
<option value="$PROJECT_DIR$/.eslintrc" />
<option value="$PROJECT_DIR$/.travis.yml" />
<option value="$PROJECT_DIR$/src/components/UserPanel.js" />
<option value="$PROJECT_DIR$/src/routes/Index.js" />
<option value="$PROJECT_DIR$/.roadhogrc.js" />
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/i18n.json" />
<option value="$PROJECT_DIR$/src/routes/Profiles.js" />
<option value="$PROJECT_DIR$/src/components/UserPanel.js" />
</list>
</option>
</component>
......@@ -253,12 +194,6 @@
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER">
<package-json value="$PROJECT_DIR$/package.json" />
</component>
<component name="JsFlowSettings">
<service-enabled>false</service-enabled>
<exe-path />
<annotation-enable>false</annotation-enable>
<other-services-enabled>false</other-services-enabled>
</component>
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
<sorting>DEFINITION_ORDER</sorting>
......@@ -267,9 +202,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">
......@@ -286,22 +222,36 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<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="mycard-account-web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="mycard-account-web" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="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="public" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -310,7 +260,7 @@
<property name="HbShouldOpenHtmlAsHb" value="" />
<property name="nodejs_interpreter_path" value="C:/Program Files/nodejs/node" />
<property name="node.js.path.for.package.eslint" value="/usr/local/Cellar/node/7.7.4/bin/node" />
<property name="node.js.selected.package.eslint" value="$PROJECT_DIR$/node_modules/eslint" />
<property name="node.js.selected.package.eslint" value="E:\zhuye\mycard-account-web\node_modules\eslint" />
<property name="settings.editor.selected.configurable" value="preferences.sourceCode.TypeScript" />
<property name="node.js.path.for.package.standard" value="/usr/local/Cellar/node/7.7.4/bin/node" />
<property name="node.js.selected.package.standard" value="$PROJECT_DIR$/node_modules/eslint" />
......@@ -431,8 +381,8 @@
</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.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>
......@@ -456,6 +406,8 @@
<workItem from="1491448144293" duration="3984000" />
<workItem from="1491459521278" duration="9381000" />
<workItem from="1491532261913" duration="2395000" />
<workItem from="1491540996018" duration="97000" />
<workItem from="1491541146809" duration="5302000" />
</task>
<task id="LOCAL-00001" summary="i18n">
<created>1490948057319</created>
......@@ -611,52 +563,47 @@
<option name="project" value="LOCAL" />
<updated>1491539412348</updated>
</task>
<option name="localTasksCounter" value="23" />
<task id="LOCAL-00023" summary="Merge branch 'master' of https://github.com/moecube/moecube-accounts-web&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml">
<created>1491541170259</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1491541170259</updated>
</task>
<task id="LOCAL-00024" summary="i18n">
<created>1491541761516</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1491541761516</updated>
</task>
<option name="localTasksCounter" value="25" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="96582000" />
</component>
<component name="TodoView" selected-index="3">
<todo-panel id="selected-file">
<is-autoscroll-to-source value="true" />
</todo-panel>
<todo-panel id="all">
<are-packages-shown value="true" />
<is-autoscroll-to-source value="true" />
</todo-panel>
<option name="totallyTimeSpent" value="101981000" />
</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="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.25229034" sideWeight="0.6606061" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16491044" sideWeight="0.65254235" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.49578503" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.5021075" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.3153527" sideWeight="0.49789253" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24204703" sideWeight="0.49789253" order="7" side_tool="false" content_ui="tabs" />
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25229034" sideWeight="0.33939394" order="2" side_tool="true" content_ui="tabs" />
<window_info id="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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24184261" sideWeight="0.49789253" order="7" 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.21689059" sideWeight="0.49789253" order="2" 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.16491044" sideWeight="0.34745762" 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.22683264" sideWeight="0.49367756" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" 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="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="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="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.49578503" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.5021075" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.21743697" sideWeight="0.49789253" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2428023" sideWeight="0.49789253" order="7" side_tool="false" content_ui="tabs" />
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25237092" sideWeight="0.33586818" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.20729366" sideWeight="0.49367756" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25237092" sideWeight="0.6641318" order="0" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
</layout>
<layout-to-restore>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.49578503" order="6" side_tool="false" content_ui="tabs" />
......@@ -695,10 +642,11 @@
<MESSAGE value="Merge remote-tracking branch 'origin/master'&#10;&#10;# Conflicts:&#10;#&#9;src/models/auth.js&#10;#&#9;src/routes/Index.js" />
<MESSAGE value="travis" />
<MESSAGE value="change language" />
<MESSAGE value="i18n" />
<MESSAGE value="change language 按钮位置" />
<MESSAGE value="env" />
<option name="LAST_COMMIT_MESSAGE" value="env" />
<MESSAGE value="Merge branch 'master' of https://github.com/moecube/moecube-accounts-web&#10;&#10;# Conflicts:&#10;#&#9;.idea/workspace.xml" />
<MESSAGE value="i18n" />
<option name="LAST_COMMIT_MESSAGE" value="i18n" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -781,14 +729,6 @@
<entry file="file://$PROJECT_DIR$/src/components/Haha.js" />
<entry file="file://$PROJECT_DIR$/src/models/example.js" />
<entry file="file://$PROJECT_DIR$/src/models/haha.js" />
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="210">
<caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/EmailForm.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
......@@ -825,13 +765,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/SendEmail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="380">
<caret line="74" column="30" lean-forward="false" selection-start-line="74" selection-start-column="30" selection-end-line="74" selection-end-column="30" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/SubmitButton.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
......@@ -912,7 +845,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="2" lean-forward="false" selection-start-line="3" selection-start-column="2" selection-end-line="3" selection-end-column="2" />
<folding />
</state>
</provider>
</entry>
......@@ -928,67 +860,30 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="26" lean-forward="false" selection-start-line="16" selection-start-column="26" selection-end-line="16" selection-end-column="26" />
<folding>
<element signature="e#0#30#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Register.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="870">
<state relative-caret-position="1102">
<caret line="62" column="46" lean-forward="false" selection-start-line="62" selection-start-column="46" selection-end-line="62" selection-end-column="46" />
<folding>
<marker date="1491534361000" expanded="true" signature="323:5343" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="1251:5341" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="1495:1562" ph="{&quot;validateStatus&quot;: checkEmail...}" />
<marker date="1491534361000" expanded="true" signature="2068:2193" ph="{&quot;placeholder&quot;: messages.username...}" />
<marker date="1491534361000" expanded="true" signature="2215:5330" ph="&lt;div/&gt;" />
<marker date="1491534361000" expanded="true" signature="2331:5317" ph="&lt;Spin/&gt;" />
<marker date="1491534361000" expanded="true" signature="2379:2589" ph="&lt;Steps/&gt;" />
<marker date="1491534361000" expanded="true" signature="2601:5301" ph="&lt;Form/&gt;" />
<marker date="1491534361000" expanded="true" signature="2703:3118" ph="&lt;FormItem/&gt;" />
<marker date="1491534361000" expanded="true" signature="2773:3023" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="2798:3006" ph="[...]" />
<marker date="1491534361000" expanded="true" signature="2799:3005" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="3132:3680" ph="&lt;FormItem/&gt;" />
<marker date="1491534361000" expanded="true" signature="3207:3582" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="3232:3565" ph="[...]" />
<marker date="1491534361000" expanded="true" signature="3233:3564" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="3694:4299" ph="&lt;FormItem/&gt;" />
<marker date="1491534361000" expanded="true" signature="3762:3992" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="3787:3975" ph="[...]" />
<marker date="1491534361000" expanded="true" signature="3788:3974" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="3994:4057" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="4076:4257" ph="&lt;Input/&gt;" />
<marker date="1491534361000" expanded="true" signature="4313:4981" ph="&lt;FormItem/&gt;" />
<marker date="1491534361000" expanded="true" signature="4380:4680" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="4405:4663" ph="[...]" />
<marker date="1491534361000" expanded="true" signature="4406:4592" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="4594:4662" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="4699:4939" ph="&lt;Input/&gt;" />
<marker date="1491534361000" expanded="true" signature="4995:5180" ph="&lt;FormItem/&gt;" />
<marker date="1491534361000" expanded="true" signature="5020:5156" ph="&lt;Button/&gt;" />
<marker date="1491534361000" expanded="true" signature="5194:5283" ph="&lt;div/&gt;" />
<marker date="1491534361000" expanded="true" signature="5377:5714" ph="{...}" />
<marker date="1491534361000" expanded="true" signature="5581:5711" ph="{&quot;loading&quot;: loading...}" />
</folding>
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Reset.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="795">
<state relative-caret-position="950">
<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>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Forgot.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="495">
<state relative-caret-position="627">
<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>
......@@ -996,24 +891,10 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Verify.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1065">
<state relative-caret-position="1254">
<caret line="71" column="18" lean-forward="false" selection-start-line="71" selection-start-column="18" selection-end-line="71" selection-end-column="18" />
<folding>
<element signature="e#0#66#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Profiles.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1665">
<caret line="120" column="34" lean-forward="false" selection-start-line="120" selection-start-column="34" selection-end-line="120" selection-end-column="34" />
<folding>
<marker date="1491539278000" expanded="true" signature="895:5562" ph="{...}" />
<marker date="1491539278000" expanded="true" signature="2128:5560" ph="{...}" />
<marker date="1491539278000" expanded="true" signature="2640:5549" ph="&lt;Spin/&gt;" />
<marker date="1491539278000" expanded="true" signature="5596:5988" ph="{...}" />
<marker date="1491539278000" expanded="true" signature="5830:5985" ph="{&quot;user&quot;: user...}" />
<element signature="e#0#66#0" expanded="false" />
</folding>
</state>
</provider>
......@@ -1055,51 +936,76 @@
</entry>
<entry file="file://$PROJECT_DIR$/.eslintrc">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<state relative-caret-position="190">
<caret line="10" column="58" lean-forward="false" selection-start-line="10" selection-start-column="58" selection-end-line="10" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/i18n.json">
<entry file="file://$PROJECT_DIR$/src/routes/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="10" column="13" lean-forward="false" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
<state relative-caret-position="399">
<caret line="32" column="17" lean-forward="true" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/UserPanel.js">
<entry file="file://$PROJECT_DIR$/package.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="930">
<caret line="62" column="0" lean-forward="true" selection-start-line="62" selection-start-column="0" selection-end-line="62" selection-end-column="0" />
<folding>
<element signature="e#0#38#0" expanded="true" />
</folding>
<state relative-caret-position="209">
<caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Index.js">
<entry file="file://$PROJECT_DIR$/src/components/SendEmail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="130" column="68" lean-forward="true" selection-start-line="130" selection-start-column="68" selection-end-line="130" selection-end-column="68" />
<folding>
<element signature="e#0#52#0" expanded="true" />
</folding>
<state relative-caret-position="133">
<caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.roadhogrc.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<state relative-caret-position="57">
<caret line="3" column="13" lean-forward="false" selection-start-line="3" selection-start-column="2" selection-end-line="3" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/package.json">
<entry file="file://$PROJECT_DIR$/i18n.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="4" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="11" selection-end-column="4" />
<state relative-caret-position="475">
<caret line="25" column="30" lean-forward="false" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="30" />
<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="600">
<caret line="120" column="81" lean-forward="true" selection-start-line="120" selection-start-column="81" selection-end-line="120" selection-end-column="81" />
<folding>
<element signature="e#0#61#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/UserPanel.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="14" column="51" lean-forward="true" selection-start-line="14" selection-start-column="51" selection-end-line="14" selection-end-column="51" />
<folding>
<element signature="e#0#38#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="19" />
<folding />
</state>
</provider>
......
i18n.json
View file @ c5d1df44
......@@ -23,6 +23,7 @@
"sign-up": "Sign Up",
"sign-in": "Sign In",
"sign-out": "Sign out",
"User-Center":"User Center",
"Please-sign-in":"Please sign In",
"email-address-or-username": "E-Mail or Username",
"register-now": "register-now!",
......@@ -106,6 +107,7 @@
"sign-up": "注册",
"sign-in": "登陆",
"sign-out": "登出",
"User-Center":"用户中心",
"Please-sign-in":"您尚未登录，请先登录",
"email-address-or-username": "邮箱或用户名",
"register-now": "现在注册",
......
src/components/EmailForm.js
View file @ c5d1df44
......@@ -81,7 +81,7 @@ class EmailForm extends React.Component {
{getFieldDecorator('email', { ...emailProps.decorator })(
<Input
{...emailProps.input}
onBlur={() => dispatch({ type: 'auth/checkEmail', payload: { ...form.getFieldsValue(), id } })}
onBlur={() => dispatch({ type: 'auth/checkEmail', payload: { ...form.getFieldsValue(), user_id: id } })}
/>,
)}
</FormItem>
......
src/components/SendEmail.js
View file @ c5d1df44
......@@ -61,7 +61,7 @@ class EmailForm extends React.Component {
{getFieldDecorator('email', { ...emailProps.decorator })(
<Input
{...emailProps.input}
onBlur={() => dispatch({ type: 'auth/checkEmail', payload: { ...form.getFieldsValue(), id } })}
onBlur={() => dispatch({ type: 'auth/checkEmail', payload: { ...form.getFieldsValue(), user_id: id } })}
/>,
)}
</FormItem>
......
src/components/UserPanel.js
View file @ c5d1df44
......@@ -6,20 +6,19 @@ import { FormattedMessage as Format } from 'react-intl';
const defaultAvatar = require('../../public/default_avatar.jpg');
function UserPanel({ dispatch, user, token }) {
function UserPanel({ dispatch, user }) {
const { avatar } = user;
const menu = (
<Menu trigger={['click']}>
<Menu.Item>
{
// i18n
token ? <Link to="/profiles">个人中心</Link> : <Link to="/signin">登录</Link>
user.active ? <Link to="/profiles"><Format id="User-Center"/></Link> : <Link to="/signin"><Format id="sign-in"/></Link>
}
</Menu.Item>
<Menu.Divider/>
{
token &&
user.active &&
<Menu.Item >
<div
onClick={() => {
......@@ -38,8 +37,10 @@ function UserPanel({ dispatch, user, token }) {
<div className="ant-dropdown-link" style={{ display: 'flex', alignItems: 'center' }}>
<img
alt="avatar" src={avatar || defaultAvatar}
style={{ borderRadius: '40px', height: '40px', weight: 'auto' }}
/>
style={{ borderRadius: '45px',
height: '45px',
weight: '45px',
border: '2px solid rgba(255,255,255,0.2' }} />
</div>
</Dropdown>
);
......
src/index.js
View file @ c5d1df44
......@@ -47,13 +47,12 @@ app.router(require('./router'));
addLocaleData([...en, ...zh]);
/*eslint-disable */
let language = localStorage.getItem('locale') || navigator.language || (navigator.languages && navigator.languages[0]) || navigator.userLanguage;
/*eslint-enable */
const languageWithoutRegionCode = language.toLowerCase().split(/[_-]+/)[0];
language = (localeData[languageWithoutRegionCode] || localeData[language]) ? language : 'zh-CN';
const messages = localeData[languageWithoutRegionCode] || localeData[language] || localeData.zh;
const languageY = localStorage.getItem('locale') || navigator.language || (navigator.languages && navigator.languages[0]) || navigator.userLanguage;
const anguageWithoutRegionCode = languageY.toLowerCase().split(/[_-]+/)[0];
const language = anguageWithoutRegionCode === 'zh' ? 'zh-CN' : 'en-US';
const messages = localeData[language];
const App = app.start();
ReactDOM.render(
......
src/index.less
View file @ c5d1df44
......@@ -4,6 +4,9 @@ html, body, :global(#root) {
}
:global {
.ant-layout-header, .ant-menu-item{
background: #001933 !important
}
.example-enter {
opacity: 0.01;
}
......
src/models/auth.js
View file @ c5d1df44
......@@ -165,10 +165,10 @@ export default {
try {
const { data } = yield call(activate, payload);
if (data) {
message.success(messages['Your-account-has-been-successfully-activated!'], 5);
message.success(messages['Your-account-has-been-successfully-activated!'], 3);
}
} catch (error) {
message.error(error.message);
message.error(error.message, 3);
}
},
*checkEmail({ payload }, { call, put }) {
......@@ -178,7 +178,10 @@ export default {
}
try {
const { data } = yield call(checkUserExists, { email: payload.email });
const { data } = yield call(checkUserExists, {
email: payload.email,
user_id: payload.user_id,
});
if (data) {
yield put({ type: 'check', payload: { isEmailExists: true, checkEmail: 'warning' } });
}
......@@ -193,7 +196,10 @@ export default {
}
try {
const { data } = yield call(checkUserExists, { username: payload.username });
const { data } = yield call(checkUserExists, {
username: payload.username,
user_id: payload.user_id,
});
if (data) {
yield put({ type: 'check', payload: { isUserNameExists: true, checkUsername: 'warning' } });
}
......@@ -212,7 +218,7 @@ export default {
}
} catch (error) {
yield put({ type: 'loginFail' });
message.error(messages[error.message] || error.message);
message.error(messages[error.message] || error.message, 3);
}
},
*forgot({ payload }, { call, put, select }) {
......@@ -221,7 +227,7 @@ export default {
const { data } = yield call(forgot, payload);
if (data) {
yield put({ type: 'forgotSuccess' });
message.info(messages['A-password-reset-email-has-been-sent-to-you.'], 5);
message.info(messages['A-password-reset-email-has-been-sent-to-you.'], 3);
}
} catch (error) {
yield put({ type: 'forgotFail' });
......@@ -237,7 +243,7 @@ export default {
yield put({ type: 'user/loginSuccess', payload: { data } });
yield put({ type: 'loginSuccess', payload: { input: payload } });
message.info(messages['Your-account-has-been-created.'], 5);
message.info(messages['Your-account-has-been-created.'], 3);
yield put(routerRedux.replace('/verify'));
}
} catch (error) {
......
src/models/common.js
View file @ c5d1df44
......@@ -27,9 +27,10 @@ export default {
subscriptions: {
setup({ dispatch }) {
let client;
const language = localStorage.getItem('locale') || navigator.language || (navigator.languages && navigator.languages[0]) || navigator.userLanguage;
const languageY = localStorage.getItem('locale') || navigator.language || (navigator.languages && navigator.languages[0]) || navigator.userLanguage;
// const languageWithoutRegionCode = language.toLowerCase().split(/[_-]+/)[0];
const anguageWithoutRegionCode = languageY.toLowerCase().split(/[_-]+/)[0];
const language = anguageWithoutRegionCode === 'zh' ? 'zh-CN' : 'en-US';
const messages = i18n[language];
const { userAgent } = navigator;
......
src/models/upload.js
View file @ c5d1df44
......@@ -17,6 +17,14 @@ export default {
},
};
},
abort(state) {
return {
...state,
...{
isUpload: false,
},
};
},
getfile(state, action) {
return {
...state, ...action.payload,
......
src/models/user.js
View file @ c5d1df44
......@@ -93,7 +93,7 @@ export default {
*loginSuccess({ payload }, { put }) {
const { data: { user, token } } = payload;
if (!payload.data) {
message.error('error ');
message.error('error ', 3);
}
if (token) {
yield put({ type: 'storeToken', payload: { token } });
......@@ -108,7 +108,7 @@ export default {
if (user.active) {
yield put(routerRedux.replace('/profiles'));
// message.info("登录成功")
// message.info("登录成功, 3")
} else {
yield put(routerRedux.replace('/verify'));
}
......@@ -124,7 +124,7 @@ export default {
}
} catch (error) {
yield put({ type: 'getAuthUserFail' });
// message.error(error.message)
// message.error(error.messag, 3e)
}
},
*preLogin({ payload }, { call, put }) {
......@@ -149,7 +149,7 @@ export default {
}
} catch (error) {
yield put(routerRedux.replace('/signin'));
// message.error(error.message)
// message.error(error.messag, 3e)
}
},
*updateProfile({ payload }, { call, put, select }) {
......@@ -162,11 +162,11 @@ export default {
if (data) {
yield put({ type: 'updateProfileSuccess', payload: { user: data, token } });
message.info(messages.update_success);
message.info(messages.update_success, 3);
}
} catch (error) {
yield put({ type: 'updateProfileFail' });
message.error(error.message);
message.error(error.message, 3);
}
},
*updateEmail({ payload }, { call, put, select }) {
......@@ -176,11 +176,11 @@ export default {
const { data } = yield call(updateAccount, { ...payload, token });
if (data) {
yield put({ type: 'updateAccountSuccess', payload: { user: data, token } });
message.info(messages['A-verification-email-has-been-sent-to-you,please-check-the-mail-to-complete.']);
message.info(messages['A-verification-email-has-been-sent-to-you,please-check-the-mail-to-complete.'], 3);
}
} catch (error) {
yield put({ type: 'updateAccountFail' });
message.error(messages[error.message] || error.message);
message.error(messages[error.message] || error.message, 3);
}
},
......@@ -191,11 +191,11 @@ export default {
const { data } = yield call(updateAccount, { ...payload, token });
if (data) {
yield put({ type: 'updateAccountSuccess', payload: { user: data, token } });
message.info(messages.update_success);
message.info(messages.update_success, 3);
}
} catch (error) {
yield put({ type: 'updateAccountFail' });
message.error(messages[error.message] || error.message);
message.error(messages[error.message] || error.message, 3);
}
},
},
......@@ -208,15 +208,10 @@ export default {
dispatch(routerRedux.replace('/signin'));
}
history.listen(({ pathname, query }) => {
history.listen(({ pathname }) => {
if (pathname === '/') {
dispatch({ type: 'preLogin', payload: { token } });
}
if (pathname === '/reset' || pathname === '/activate') {
if (!query.key) {
message.error('缺少参数');
}
}
});
},
},
......
src/routes/Profiles.js
View file @ c5d1df44
......@@ -49,14 +49,21 @@ class Profiles extends React.Component {
};
onGetFile = (e) => {
let files;
let files = [];
if (e.dataTransfer) {
files = e.dataTransfer.files;
} else if (e.target) {
files = e.target.files;
}
if (files.length <= 0) {
this.props.dispatch({ type: 'upload/abort' })
return
}
const reader = new FileReader();
reader.onload = () => {
this.props.dispatch({ type: 'upload/start' })
this.props.dispatch({ type: 'upload/getfile', payload: { imageUrl: reader.result } });
};
reader.readAsDataURL(files[0]);
......@@ -69,13 +76,12 @@ class Profiles extends React.Component {
const { user: { id } } = this.props;
this.cropper.getCroppedCanvas().toBlob((blob) => {
console.log(blob);
this.props.dispatch({ type: 'upload/upload', payload: { image: blob, user_id: id } });
});
};
render() {
const { dispatch, form, user, loading, imageUrl, isUpload } = this.props;
const { form, user, loading, imageUrl, isUpload } = this.props;
const { getFieldDecorator } = form;
const { name, avatar } = user;
const { intl: { messages } } = this.context;
......@@ -119,8 +125,8 @@ class Profiles extends React.Component {
<div style={{ display: !isUpload ? 'flex' : 'none', flexDirection: 'column' }}>
<img alt="avatar" src={avatar || imageUrl || defaultAvatar}/>
<Button onClick={() => { dispatch({ type: 'upload/start' }); }}>
<label>
<Button style={{ padding: '4px 0' }}>
<label style={{ display: 'flex', flex: 1, justifyContent: 'center', alignItems: 'center' }}>
<Icon type="plus"/><Format id="Change-Avatar"/>
<input
type="file" onChange={this.onGetFile} ref={(file) => {
......
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