Skip to content

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

error.messages

parent a96f7307
Hide whitespace changes
Inline Side-by-side
Showing with 177 additions and 162 deletions
.idea/workspace.xml
View file @ 5f0ec4b2
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="eb37985e-18dc-4e2f-82ba-9874832785ff" name="Default" comment="gitignore"> <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$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/i18n.json" afterPath="$PROJECT_DIR$/i18n.json" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/i18n.json" afterPath="$PROJECT_DIR$/i18n.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/models/auth.js" afterPath="$PROJECT_DIR$/src/models/auth.js" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Index.js" afterPath="$PROJECT_DIR$/src/routes/Index.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Reset.js" afterPath="$PROJECT_DIR$/src/routes/Reset.js" />
</list> </list>
<ignored path="$PROJECT_DIR$/.tmp/" /> <ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" /> <ignored path="$PROJECT_DIR$/temp/" />
...@@ -16,14 +17,34 @@ ...@@ -16,14 +17,34 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </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="437">
<caret line="83" column="16" lean-forward="true" selection-start-line="83" selection-start-column="16" selection-end-line="83" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</state>
</content>
</window>
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="EmailForm.js" pinned="false" current-in-tab="false"> <file leaf-file-name="EmailForm.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/EmailForm.js"> <entry file="file://$PROJECT_DIR$/src/components/EmailForm.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361"> <state relative-caret-position="855">
<caret line="45" column="35" lean-forward="true" selection-start-line="45" selection-start-column="35" selection-end-line="45" selection-end-column="35" /> <caret line="45" column="35" lean-forward="false" selection-start-line="45" selection-start-column="35" selection-end-line="45" selection-end-column="35" />
<folding> <folding>
<element signature="e#0#41#0" expanded="true" /> <element signature="e#0#41#0" expanded="true" />
</folding> </folding>
...@@ -31,18 +52,18 @@ ...@@ -31,18 +52,18 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false"> <file leaf-file-name="common.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore"> <entry file="file://$PROJECT_DIR$/src/models/common.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247"> <state relative-caret-position="0">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="EmailForm.css" pinned="false" current-in-tab="false"> <file leaf-file-name="upload.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/EmailForm.css"> <entry file="file://$PROJECT_DIR$/src/models/upload.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
...@@ -51,70 +72,45 @@ ...@@ -51,70 +72,45 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="auth.js" pinned="false" current-in-tab="false"> <file leaf-file-name="Index.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/models/auth.js"> <entry file="file://$PROJECT_DIR$/src/routes/Index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4161"> <state relative-caret-position="551">
<caret line="222" column="9" lean-forward="true" selection-start-line="222" selection-start-column="9" selection-end-line="222" selection-end-column="9" /> <caret line="143" column="30" lean-forward="false" selection-start-line="143" selection-start-column="26" selection-end-line="143" selection-end-column="30" />
<folding> <folding>
<marker date="1491448972714" expanded="true" signature="7:9" ph="..." /> <element signature="e#0#26#0" expanded="true" />
<marker date="1491460543549" expanded="true" signature="3649:3653" ph="{&quot;messages&quot;: messages...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="common.js" pinned="false" current-in-tab="false"> <file leaf-file-name="router.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/models/common.js"> <entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <state relative-caret-position="209">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="29" column="50" lean-forward="true" selection-start-line="29" selection-start-column="50" selection-end-line="29" selection-end-column="50" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="upload.js" pinned="false" current-in-tab="false"> <file leaf-file-name="Profiles.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/models/upload.js"> <entry file="file://$PROJECT_DIR$/src/routes/Profiles.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-285"> <state relative-caret-position="457">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="165" column="0" lean-forward="true" selection-start-line="165" selection-start-column="0" selection-end-line="165" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="user.js" pinned="false" current-in-tab="true"> <file leaf-file-name="Activate.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/models/user.js"> <entry file="file://$PROJECT_DIR$/src/routes/Activate.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-453"> <state relative-caret-position="494">
<caret line="154" column="0" lean-forward="false" selection-start-line="154" selection-start-column="0" selection-end-line="154" selection-end-column="0" /> <caret line="29" column="47" lean-forward="true" selection-start-line="29" selection-start-column="47" selection-end-line="29" selection-end-column="47" />
<folding> <folding />
<element signature="e#0#40#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SubmitButton.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/SubmitButton.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<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>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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="2356">
<caret line="131" column="13" lean-forward="false" selection-start-line="131" selection-start-column="13" selection-end-line="131" selection-end-column="13" />
<folding>
<marker date="1491382491077" expanded="true" signature="3621:3625" ph="{&quot;messages&quot;: messages...}" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -122,8 +118,8 @@ ...@@ -122,8 +118,8 @@
<file leaf-file-name="Login.js" pinned="false" current-in-tab="false"> <file leaf-file-name="Login.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Login.js"> <entry file="file://$PROJECT_DIR$/src/routes/Login.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="551"> <state relative-caret-position="-976">
<caret line="35" column="47" lean-forward="false" selection-start-line="35" selection-start-column="47" selection-end-line="35" selection-end-column="47" /> <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="56" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -133,18 +129,7 @@ ...@@ -133,18 +129,7 @@
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>&lt;f</find>
<find>重</find>
<find>sign-in</find>
<find>Register</find>
<find>t</find>
<find>tij</find>
<find>tiji</find>
<find>tijiao</find>
<find>select</find>
<find>messages</find>
<find>fa</find> <find>fa</find>
<find>fr</find>
<find>Format</find> <find>Format</find>
<find>提交</find> <find>提交</find>
<find>M</find> <find>M</find>
...@@ -163,6 +148,17 @@ ...@@ -163,6 +148,17 @@
<find>Your-account has been created.</find> <find>Your-account has been created.</find>
<find>Youraccount has been created.</find> <find>Youraccount has been created.</find>
<find>Your account has been created.</find> <find>Your account has been created.</find>
<find>messages[error.message]</find>
<find>h</find>
<find>hom</find>
<find>home</find>
<find>MoeCube.21b3</find>
<find>MoeCube.21b</find>
<find>MoeCube.21</find>
<find>MoeCube.2</find>
<find>MoeCube.</find>
<find>fr</find>
<find>reset-password</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>&quot;,</replace> <replace>&quot;,</replace>
...@@ -189,14 +185,14 @@ ...@@ -189,14 +185,14 @@
<option value="$PROJECT_DIR$/src/routes/Reset.js" /> <option value="$PROJECT_DIR$/src/routes/Reset.js" />
<option value="$PROJECT_DIR$/src/components/UserNameForm.js" /> <option value="$PROJECT_DIR$/src/components/UserNameForm.js" />
<option value="$PROJECT_DIR$/src/components/PasswordForm.js" /> <option value="$PROJECT_DIR$/src/components/PasswordForm.js" />
<option value="$PROJECT_DIR$/src/models/user.js" />
<option value="$PROJECT_DIR$/src/routes/Verify.js" /> <option value="$PROJECT_DIR$/src/routes/Verify.js" />
<option value="$PROJECT_DIR$/src/components/SubmitButton.js" /> <option value="$PROJECT_DIR$/src/components/SubmitButton.js" />
<option value="$PROJECT_DIR$/i18n.json" />
<option value="$PROJECT_DIR$/src/routes/Index.js" />
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/components/EmailForm.js" /> <option value="$PROJECT_DIR$/src/components/EmailForm.js" />
<option value="$PROJECT_DIR$/src/models/auth.js" /> <option value="$PROJECT_DIR$/src/models/auth.js" />
<option value="$PROJECT_DIR$/src/models/user.js" />
<option value="$PROJECT_DIR$/src/routes/Index.js" />
<option value="$PROJECT_DIR$/i18n.json" />
</list> </list>
</option> </option>
</component> </component>
...@@ -467,7 +463,8 @@ ...@@ -467,7 +463,8 @@
<workItem from="1491013749160" duration="21185000" /> <workItem from="1491013749160" duration="21185000" />
<workItem from="1491038261063" duration="38000" /> <workItem from="1491038261063" duration="38000" />
<workItem from="1491362317876" duration="18018000" /> <workItem from="1491362317876" duration="18018000" />
<workItem from="1491448144293" duration="937000" /> <workItem from="1491448144293" duration="3984000" />
<workItem from="1491459521278" duration="1043000" />
</task> </task>
<task id="LOCAL-00001" summary="i18n"> <task id="LOCAL-00001" summary="i18n">
<created>1490948057319</created> <created>1490948057319</created>
...@@ -532,11 +529,25 @@ ...@@ -532,11 +529,25 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1491382308833</updated> <updated>1491382308833</updated>
</task> </task>
<option name="localTasksCounter" value="10" /> <task id="LOCAL-00010" summary="i18n">
<created>1491449096526</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1491449096526</updated>
</task>
<task id="LOCAL-00011" summary="error.messages">
<created>1491454098539</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1491454098539</updated>
</task>
<option name="localTasksCounter" value="12" />
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="76993000" /> <option name="totallyTimeSpent" value="81083000" />
</component> </component>
<component name="TodoView" selected-index="3"> <component name="TodoView" selected-index="3">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -548,19 +559,19 @@ ...@@ -548,19 +559,19 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1176" extended-state="6" /> <frame x="-8" y="-8" width="1936" height="1176" extended-state="0" />
<layout> <layout>
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25237092" sideWeight="0.6771084" 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.6698795" 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="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="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="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.26679462" 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.32289156" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2034549" sideWeight="0.49789253" order="2" 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.2034549" sideWeight="0.49789253" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2428023" sideWeight="0.49789253" order="7" side_tool="false" content_ui="tabs" />
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25237092" sideWeight="0.33012047" 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="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.6631478" sideWeight="0.49367756" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6631478" 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="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="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="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="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="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" />
...@@ -579,10 +590,11 @@ ...@@ -579,10 +590,11 @@
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
<MESSAGE value="lint" /> <MESSAGE value="lint" />
<MESSAGE value="i18n + 修改账户信息 无密码长度约束" /> <MESSAGE value="i18n + 修改账户信息 无密码长度约束" />
<MESSAGE value="i18n" />
<MESSAGE value="title i18n" /> <MESSAGE value="title i18n" />
<MESSAGE value="gitignore" /> <MESSAGE value="gitignore" />
<option name="LAST_COMMIT_MESSAGE" value="gitignore" /> <MESSAGE value="i18n" />
<MESSAGE value="error.messages" />
<option name="LAST_COMMIT_MESSAGE" value="error.messages" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
...@@ -737,13 +749,6 @@ ...@@ -737,13 +749,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="29" column="50" lean-forward="true" selection-start-line="29" selection-start-column="50" selection-end-line="29" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/auth.js"> <entry file="file://$PROJECT_DIR$/src/services/auth.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120"> <state relative-caret-position="120">
...@@ -753,21 +758,6 @@ ...@@ -753,21 +758,6 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/Haha.css" /> <entry file="file://$PROJECT_DIR$/src/components/Haha.css" />
<entry file="file://$PROJECT_DIR$/src/components/Haha.js" /> <entry file="file://$PROJECT_DIR$/src/components/Haha.js" />
<entry file="file://$PROJECT_DIR$/src/routes/Activate.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
<caret line="7" column="23" lean-forward="true" selection-start-line="7" selection-start-column="23" selection-end-line="7" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Profiles.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="498">
<caret line="39" column="12" lean-forward="false" selection-start-line="39" selection-start-column="12" selection-end-line="39" selection-end-column="12" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/index.js"> <entry file="file://$PROJECT_DIR$/src/index.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133"> <state relative-caret-position="133">
...@@ -820,15 +810,15 @@ ...@@ -820,15 +810,15 @@
<caret line="65" column="22" lean-forward="false" selection-start-line="65" selection-start-column="22" selection-end-line="65" selection-end-column="22" /> <caret line="65" column="22" lean-forward="false" selection-start-line="65" selection-start-column="22" selection-end-line="65" selection-end-column="22" />
<folding> <folding>
<element signature="e#0#70#0" expanded="false" /> <element signature="e#0#70#0" expanded="false" />
<marker date="1491378116228" expanded="true" signature="513:2340" ph="{...}" /> <marker date="1491454211200" expanded="true" signature="513:2332" ph="{...}" />
<marker date="1491378116228" expanded="true" signature="971:2338" ph="{...}" /> <marker date="1491454211200" expanded="true" signature="971:2330" ph="{...}" />
<marker date="1491378116228" expanded="true" signature="1138:2327" ph="&lt;div/&gt;" /> <marker date="1491454211200" expanded="true" signature="1138:2319" ph="&lt;div/&gt;" />
<marker date="1491378116228" expanded="true" signature="1244:2314" ph="&lt;Spin/&gt;" /> <marker date="1491454211200" expanded="true" signature="1236:2306" ph="&lt;Spin/&gt;" />
<marker date="1491378116228" expanded="true" signature="1292:2298" ph="&lt;Form/&gt;" /> <marker date="1491454211200" expanded="true" signature="1284:2290" ph="&lt;Form/&gt;" />
<marker date="1491378116228" expanded="true" signature="1602:1638" ph="&lt;FormItem/&gt;" /> <marker date="1491454211200" expanded="true" signature="1594:1630" ph="&lt;FormItem/&gt;" />
<marker date="1491378116228" expanded="true" signature="2190:2280" ph="&lt;div/&gt;" /> <marker date="1491454211200" expanded="true" signature="2182:2272" ph="&lt;div/&gt;" />
<marker date="1491378116228" expanded="true" signature="2381:2536" ph="{...}" /> <marker date="1491454211200" expanded="true" signature="2373:2528" ph="{...}" />
<marker date="1491378116228" expanded="true" signature="2495:2533" ph="{&quot;loading&quot;: loading...}" /> <marker date="1491454211200" expanded="true" signature="2487:2525" ph="{&quot;loading&quot;: loading...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -838,7 +828,7 @@ ...@@ -838,7 +828,7 @@
<state relative-caret-position="1178"> <state relative-caret-position="1178">
<caret line="62" column="16" lean-forward="false" selection-start-line="62" selection-start-column="16" selection-end-line="62" selection-end-column="16" /> <caret line="62" column="16" lean-forward="false" selection-start-line="62" selection-start-column="16" selection-end-line="62" selection-end-column="16" />
<folding> <folding>
<element signature="e#0#35#0" expanded="true" /> <element signature="e#0#35#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -855,15 +845,6 @@ ...@@ -855,15 +845,6 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57"> <state relative-caret-position="57">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<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="551">
<caret line="35" column="47" lean-forward="false" selection-start-line="35" selection-start-column="47" selection-end-line="35" selection-end-column="47" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -872,17 +853,7 @@ ...@@ -872,17 +853,7 @@
<state relative-caret-position="209"> <state relative-caret-position="209">
<caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> <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> <folding>
<element signature="e#0#30#0" expanded="true" /> <element signature="e#0#30#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="2356">
<caret line="131" column="13" lean-forward="false" selection-start-line="131" selection-start-column="13" selection-end-line="131" selection-end-column="13" />
<folding>
<marker date="1491382491077" expanded="true" signature="3621:3625" ph="{&quot;messages&quot;: messages...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -903,35 +874,57 @@ ...@@ -903,35 +874,57 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/i18n.json"> <entry file="file://$PROJECT_DIR$/src/routes/Profiles.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1399"> <state relative-caret-position="457">
<caret line="78" column="21" lean-forward="false" selection-start-line="78" selection-start-column="21" selection-end-line="78" selection-end-column="21" /> <caret line="165" column="0" lean-forward="true" selection-start-line="165" selection-start-column="0" selection-end-line="165" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/components/EmailForm.js"> <entry file="file://$PROJECT_DIR$/src/routes/Activate.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="361"> <state relative-caret-position="494">
<caret line="45" column="35" lean-forward="true" selection-start-line="45" selection-start-column="35" selection-end-line="45" selection-end-column="35" /> <caret line="29" column="47" lean-forward="true" selection-start-line="29" selection-start-column="47" selection-end-line="29" selection-end-column="47" />
<folding> <folding />
<element signature="e#0#41#0" expanded="true" /> </state>
</folding> </provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="21" lean-forward="false" selection-start-line="0" selection-start-column="19" selection-end-line="0" selection-end-column="21" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/models/auth.js"> <entry file="file://$PROJECT_DIR$/src/models/auth.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4161"> <state relative-caret-position="-10">
<caret line="222" column="9" lean-forward="true" selection-start-line="222" selection-start-column="9" selection-end-line="222" selection-end-column="9" /> <caret line="151" column="10" lean-forward="false" selection-start-line="151" selection-start-column="10" selection-end-line="151" selection-end-column="10" />
<folding> <folding>
<marker date="1491448972714" expanded="true" signature="7:9" ph="..." /> <element signature="e#0#31#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/models/common.js"> <entry file="file://$PROJECT_DIR$/src/routes/Login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-976">
<caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="56" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="29" column="50" lean-forward="true" selection-start-line="29" selection-start-column="50" selection-end-line="29" selection-end-column="50" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/upload.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0"> <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" /> <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
...@@ -939,20 +932,39 @@ ...@@ -939,20 +932,39 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/models/upload.js"> <entry file="file://$PROJECT_DIR$/src/models/common.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-285"> <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" /> <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 /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/models/user.js"> <entry file="file://$PROJECT_DIR$/src/components/EmailForm.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-453"> <state relative-caret-position="855">
<caret line="154" column="0" lean-forward="false" selection-start-line="154" selection-start-column="0" selection-end-line="154" selection-end-column="0" /> <caret line="45" column="35" lean-forward="false" selection-start-line="45" selection-start-column="35" selection-end-line="45" selection-end-column="35" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/i18n.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="437">
<caret line="83" column="16" lean-forward="true" selection-start-line="83" selection-start-column="16" selection-end-line="83" selection-end-column="16" />
<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="551">
<caret line="143" column="30" lean-forward="false" selection-start-line="143" selection-start-column="26" selection-end-line="143" selection-end-column="30" />
<folding> <folding>
<element signature="e#0#40#0" expanded="true" /> <element signature="e#0#26#0" expanded="true" />
<marker date="1491460543549" expanded="true" signature="3649:3653" ph="{&quot;messages&quot;: messages...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
......
i18n.json
View file @ 5f0ec4b2
{ {
"en": { "en": {
"title":"MoeCube", "title":"MoeCube",
"Home":"Home",
"username": "User Name", "username": "User Name",
"email": "E-Mail", "email": "E-Mail",
"password": "Password", "password": "Password",
...@@ -27,7 +28,7 @@ ...@@ -27,7 +28,7 @@
"send-email": "Send Email", "send-email": "Send Email",
"reset-success": "reset success", "reset-success": "reset success",
"reset-fail": "reset fail", "reset-fail": "reset fail",
"reset-password": "Reset Password", "reset-password2": "Reset Password",
"remember-me":"Remember me", "remember-me":"Remember me",
"Please-use-a-correct-E-Mail-address.": "Please use a correct E-Mail address.", "Please-use-a-correct-E-Mail-address.": "Please use a correct E-Mail address.",
"User-name-can-not-be-empty.": "User name can not be empty.", "User-name-can-not-be-empty.": "User name can not be empty.",
...@@ -80,6 +81,7 @@ ...@@ -80,6 +81,7 @@
}, },
"zh": { "zh": {
"title":"萌立方", "title":"萌立方",
"Home":"主页",
"username": "用户名", "username": "用户名",
"email": "邮箱", "email": "邮箱",
"password": "密码", "password": "密码",
...@@ -106,7 +108,7 @@ ...@@ -106,7 +108,7 @@
"send-email": "发送邮件", "send-email": "发送邮件",
"reset-success": "修改成功", "reset-success": "修改成功",
"reset-fail": "修改失败", "reset-fail": "修改失败",
"reset-password": "重设密码", "reset-password2": "重置密码",
"remember-me":"记住我", "remember-me":"记住我",
"Please-use-a-correct-E-Mail-address.": "请填写正确的邮箱地址", "Please-use-a-correct-E-Mail-address.": "请填写正确的邮箱地址",
"User-name-can-not-be-empty.": "用户名不能为空", "User-name-can-not-be-empty.": "用户名不能为空",
......
src/routes/Index.js
View file @ 5f0ec4b2
...@@ -3,6 +3,7 @@ import { connect } from 'dva'; ...@@ -3,6 +3,7 @@ import { connect } from 'dva';
import styles from './Index.less'; import styles from './Index.less';
import Particles from 'react-particles-js' import Particles from 'react-particles-js'
import DocumentTitle from 'react-document-title' import DocumentTitle from 'react-document-title'
import { FormattedMessage as Format } from 'react-intl';
import { Layout, Button, Menu } from 'antd'; import { Layout, Button, Menu } from 'antd';
import { Link } from 'dva/router' import { Link } from 'dva/router'
import logo from '../assets/MoeCube.png' import logo from '../assets/MoeCube.png'
...@@ -126,24 +127,24 @@ const particleConfig = { ...@@ -126,24 +127,24 @@ const particleConfig = {
function Index({ dispatch, children, messages }) { function Index({ dispatch, children, messages }) {
return ( return (
<div style={{ display: 'flex', flexDirection: 'column', flex: 1, height: '100vh' }}> <div style={{ display: 'flex', flexDirection: 'column', flex: 1, height: '100vh' }}>
<DocumentTitle title={messages['title'] || 'Moe Cube'} /> <DocumentTitle title={messages['title'] || 'Moe Cube'} />
<Header style={{ display: 'flex', alignItems: 'center'}}> <Header style={{ display: 'flex', alignItems: 'center'}}>
<Link to="/" style={{ marginTop: '20px'}}> <Link to="/" style={{ marginTop: '20px'}}>
<img src={logo} style={{ width: '140px', height: '44px'}}/> <img src={logo} style={{ width: '140px', height: '44px'}}/>
</Link> </Link>
<Menu <Menu
theme="dark" theme="dark"
mode="horizontal" mode="horizontal"
defaultSelectedKeys={['1']} defaultSelectedKeys={['1']}
style={{ lineHeight: '64px' }}> style={{ lineHeight: '64px' }}>
<Menu.Item key="1"> <Menu.Item key="1">
<Link to="/"> <Link to="/">
Home <Format id="Home"/>
</Link> </Link>
</Menu.Item> </Menu.Item>
</Menu> </Menu>
</Header> </Header>
<Particles <Particles
...@@ -152,7 +153,7 @@ function Index({ dispatch, children, messages }) { ...@@ -152,7 +153,7 @@ function Index({ dispatch, children, messages }) {
position: "fixed" position: "fixed"
}} }}
/> />
{children} {children}
<Footer style={{ position: 'absolute', width: '100%', bottom: 0, left: 0, display: 'flex', justifyContent: 'space-between' }}> <Footer style={{ position: 'absolute', width: '100%', bottom: 0, left: 0, display: 'flex', justifyContent: 'space-between' }}>
<div>© MoeCube 2017 all right reserved.</div> <div>© MoeCube 2017 all right reserved.</div>
......
src/routes/Reset.js
View file @ 5f0ec4b2
...@@ -55,7 +55,7 @@ class Reset extends React.Component { ...@@ -55,7 +55,7 @@ class Reset extends React.Component {
<Spin spinning={isResetSubmit} delay={100}> <Spin spinning={isResetSubmit} delay={100}>
<Form onSubmit={this.onSubmitReset} className="login-form"> <Form onSubmit={this.onSubmitReset} className="login-form">
<FormItem> <FormItem>
<h1><Format id='reset-password'/></h1> <h1><Format id='reset-password2'/></h1>
</FormItem> </FormItem>
<FormItem> <FormItem>
{getFieldDecorator('password', { {getFieldDecorator('password', {
...@@ -81,7 +81,7 @@ class Reset extends React.Component { ...@@ -81,7 +81,7 @@ class Reset extends React.Component {
</FormItem> </FormItem>
<Button type="primary" htmlType="submit" className="login-form-button"> <Button type="primary" htmlType="submit" className="login-form-button">
<Format id='reset-password'/> <Format id='reset-password2'/>
</Button> </Button>
</Form> </Form>
</Spin> </Spin>
......
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