Eeeros
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

前端样式的修改

This commit is contained in:
sylor_huang@126.com 2020-04-21 16:30:51 +08:00
parent 330ac9aabb
commit 16f7c45da9
8 changed files with 268 additions and 301 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

426
.idea/workspace.xml
View File

@ -3,6 +3,12 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment=""> <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/forge/Main/Detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/Detail.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/login/EducoderInteresse.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/login/EducoderInteresse.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/login/EducoderLogin.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/login/EducoderLogin.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/login/LoginDialog.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/login/LoginDialog.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" afterDir="false" /> <change beforePath="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -28,97 +34,75 @@
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Infos.js"> <entry file="file://$PROJECT_DIR$/src/App.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="202"> <state relative-caret-position="164">
<caret line="271" column="22" selection-start-line="271" selection-start-column="22" selection-end-line="271" selection-end-column="22" /> <caret line="435" column="7" selection-start-line="435" selection-start-column="7" selection-end-line="435" selection-end-column="7" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js"> <entry file="file://$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184"> <state relative-caret-position="238">
<caret line="88" column="50" lean-forward="true" selection-start-line="88" selection-start-column="50" selection-end-line="88" selection-end-column="50" /> <caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
<folding> <folding>
<element signature="e#0#41#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js"> <entry file="file://$PROJECT_DIR$/src/modules/login/EducoderInteresse.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1994"> <state relative-caret-position="254">
<caret line="312" column="18" selection-start-line="312" selection-start-column="18" selection-end-line="312" selection-end-column="18" /> <caret line="78" column="28" selection-start-line="78" selection-start-column="28" selection-end-line="78" selection-end-column="28" />
<folding> <folding>
<element signature="e#0#41#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/usersInfo.css"> <entry file="file://$PROJECT_DIR$/src/modules/login/LoginDialog.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="478"> <state relative-caret-position="328">
<caret line="469" column="1" selection-start-line="469" selection-start-column="1" selection-end-line="469" selection-end-column="12" /> <caret line="727" column="131" selection-start-line="727" selection-start-column="30" selection-end-line="727" selection-end-column="131" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/publicCreatNew.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="196">
<caret line="42" column="22" selection-start-line="42" selection-start-column="22" selection-end-line="42" selection-end-column="22" />
<folding> <folding>
<element signature="e#0#41#0" expanded="true" /> <element signature="n#style#0;n#a#0;n#font#0;n#!!top" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js"> <entry file="file://$PROJECT_DIR$/src/modules/login/EducoderLogin.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="188"> <state relative-caret-position="272">
<caret line="1179" column="17" selection-start-line="1179" selection-start-column="17" selection-end-line="1179" selection-end-column="17" /> <caret line="162" selection-start-line="162" selection-end-line="162" />
<folding> <folding>
<element signature="e#0#41#0" expanded="true" /> <element signature="e#0#39#0" expanded="true" />
<element signature="e#433#515#0" expanded="true" />
<element signature="e#1358#2042#0" />
<element signature="n#!!block;n#componentDidMount#0;n#NewHeader#0" />
<element signature="e#2353#2665#0" />
<element signature="e#2760#2816#0" />
<element signature="e#2954#2960#0" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/modules/login/EducoderReg.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="41">
<caret line="17" column="12" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FindInProjectRecents"> <component name="FindInProjectRecents">
<findStrings> <findStrings>
<find>chrome</find>
<find>geturlsdata</find>
<find>edu-menu-list</find>
<find>ver</find>
<find>new_header.js</find>
<find>new_course</find>
<find>/projects&quot;</find>
<find>我的</find>
<find>/projects</find>
<find>mygetHelmetapi2.new_course</find>
<find>注册</find>
<find>build</find>
<find>问吧</find>
<find>我的项目</find>
<find>InfosProject</find>
<find>category</find>
<find>school</find> <find>school</find>
<find>homepage_info</find> <find>homepage_info</find>
<find>homepage_</find> <find>homepage_</find>
@ -133,17 +117,33 @@
<find>status</find> <find>status</find>
<find>新建</find> <find>新建</find>
<find>course</find> <find>course</find>
<find>user_phone_binded</find>
<find>新建文件</find>
<find>快速帮助</find>
<find>NullData</find>
<find>spin</find>
<find>里程碑</find>
<find>动态</find>
<find>filePath</find>
<find>register</find>
<find>找回密码</find>
<find>target=</find>
<find>target={&quot;_blank&quot;}</find>
<find>登录</find>
<find>loading...</find>
<find>title</find>
<find>background: url</find>
</findStrings> </findStrings>
<replaceStrings> <replaceStrings>
<replace>任务</replace> <replace>任务</replace>
</replaceStrings> </replaceStrings>
<dirStrings> <dirStrings>
<dir>$PROJECT_DIR$/src/forge/Merge</dir> <dir>$PROJECT_DIR$/src/forge/Merge</dir>
<dir>$PROJECT_DIR$/src/forge</dir>
<dir>$PROJECT_DIR$</dir> <dir>$PROJECT_DIR$</dir>
<dir>$PROJECT_DIR$/public</dir> <dir>$PROJECT_DIR$/public</dir>
<dir>$PROJECT_DIR$/src/modules/user/usersInfo</dir> <dir>$PROJECT_DIR$/src/modules/user/usersInfo</dir>
<dir>$PROJECT_DIR$/src/modules/user</dir> <dir>$PROJECT_DIR$/src/modules/user</dir>
<dir>$PROJECT_DIR$/src/forge</dir>
<dir>$PROJECT_DIR$/src</dir> <dir>$PROJECT_DIR$/src</dir>
</dirStrings> </dirStrings>
</component> </component>
@ -153,10 +153,6 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/forge/Order/CopyDetail.js" />
<option value="$PROJECT_DIR$/src/forge/Merge/NewMerge.js" />
<option value="$PROJECT_DIR$/src/forge/Merge/MergeSubmit.js" />
<option value="$PROJECT_DIR$/src/forge/Settings/Setting.js" />
<option value="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" /> <option value="$PROJECT_DIR$/src/forge/Settings/Collaborator.js" />
<option value="$PROJECT_DIR$/src/forge/Settings/setting.css" /> <option value="$PROJECT_DIR$/src/forge/Settings/setting.css" />
<option value="$PROJECT_DIR$/src/forge/Branch/branch.css" /> <option value="$PROJECT_DIR$/src/forge/Branch/branch.css" />
@ -188,7 +184,6 @@
<option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" /> <option value="$PROJECT_DIR$/src/forge/Merge/MessageCount.js" />
<option value="$PROJECT_DIR$/src/forge/Branch/CloneAddress.js" /> <option value="$PROJECT_DIR$/src/forge/Branch/CloneAddress.js" />
<option value="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" /> <option value="$PROJECT_DIR$/src/forge/Newfile/UserSubmitComponent.js" />
<option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
<option value="$PROJECT_DIR$/src/forge/New/Index.js" /> <option value="$PROJECT_DIR$/src/forge/New/Index.js" />
<option value="$PROJECT_DIR$/src/modules/tpm/NewFooter.js" /> <option value="$PROJECT_DIR$/src/modules/tpm/NewFooter.js" />
<option value="$PROJECT_DIR$/src/AppConfig.js" /> <option value="$PROJECT_DIR$/src/AppConfig.js" />
@ -197,17 +192,22 @@
<option value="$PROJECT_DIR$/src/forge/Index.js" /> <option value="$PROJECT_DIR$/src/forge/Index.js" />
<option value="$PROJECT_DIR$/src/modules/user/Projects.js" /> <option value="$PROJECT_DIR$/src/modules/user/Projects.js" />
<option value="$PROJECT_DIR$/src/App.js" /> <option value="$PROJECT_DIR$/src/App.js" />
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
<option value="$PROJECT_DIR$/.gitignore" /> <option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/modules/user/usersInfo/Infos.js" /> <option value="$PROJECT_DIR$/src/modules/user/usersInfo/Infos.js" />
<option value="$PROJECT_DIR$/src/modules/user/usersInfo/usersInfo.css" /> <option value="$PROJECT_DIR$/src/modules/user/usersInfo/usersInfo.css" />
<option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" /> <option value="$PROJECT_DIR$/src/modules/tpm/NewHeader.js" />
<option value="$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js" /> <option value="$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js" />
<option value="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" /> <option value="$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js" />
<option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
<option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
<option value="$PROJECT_DIR$/src/modules/login/LoginDialog.js" />
<option value="$PROJECT_DIR$/src/modules/login/EducoderLogin.js" />
<option value="$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js" />
<option value="$PROJECT_DIR$/src/modules/login/EducoderInteresse.js" />
</list> </list>
</option> </option>
</component> </component>
<component name="ProjectFrameBounds" fullScreen="true"> <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
<option name="y" value="23" /> <option name="y" value="23" />
<option name="width" value="1440" /> <option name="width" value="1440" />
<option name="height" value="877" /> <option name="height" value="877" />
@ -230,33 +230,6 @@
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" /> <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" /> <item name="src" type="462c0819:PsiDirectoryNode" />
</path> </path>
<path>
<item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="forge" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
<item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
<item name="src" type="462c0819:PsiDirectoryNode" />
<item name="modules" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
<item name="usersInfo" type="462c0819:PsiDirectoryNode" />
</path>
</expand> </expand>
<select /> <select />
</subPane> </subPane>
@ -341,18 +314,19 @@
<workItem from="1587374749323" duration="458000" /> <workItem from="1587374749323" duration="458000" />
<workItem from="1587375511570" duration="1067000" /> <workItem from="1587375511570" duration="1067000" />
<workItem from="1587376696494" duration="11000" /> <workItem from="1587376696494" duration="11000" />
<workItem from="1587376745950" duration="13822000" /> <workItem from="1587376745950" duration="14824000" />
<workItem from="1587452961769" duration="3903000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="164419000" /> <option name="totallyTimeSpent" value="169324000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="0" width="1440" height="900" extended-state="0" /> <frame x="0" y="0" width="1440" height="900" extended-state="6" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info content_ui="combo" id="Project" order="0" weight="0.20529328" /> <window_info content_ui="combo" id="Project" order="0" weight="0.16309012" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" /> <window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
@ -364,8 +338,8 @@
<window_info anchor="bottom" id="TODO" order="6" /> <window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" /> <window_info anchor="bottom" id="Database Changes" order="8" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.20843373" /> <window_info anchor="bottom" id="Version Control" order="9" weight="0.41686746" />
<window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.50963855" /> <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.5987952" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" /> <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="bottom" id="TypeScript" order="12" /> <window_info anchor="bottom" id="TypeScript" order="12" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@ -428,65 +402,6 @@
</option> </option>
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/forge/Order/Detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="461" column="41" selection-start-line="461" selection-start-column="41" selection-end-line="461" selection-end-column="41" />
<folding>
<element signature="e#0#40#0" expanded="true" />
<element signature="e#8674#13519#0" />
<element signature="e#16700#18374#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Activity/Activity.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="500">
<caret line="187" column="15" selection-start-line="187" selection-start-column="15" selection-end-line="187" selection-end-column="15" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/UpdateDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="364">
<caret line="243" selection-start-line="243" selection-end-line="245" selection-end-column="15" />
<folding>
<element signature="e#0#40#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/New.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
<caret line="3" selection-start-line="3" selection-end-line="3" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Order/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="390" column="10" selection-start-line="390" selection-start-column="10" selection-end-line="401" selection-end-column="16" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Images/fork.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootFileDetail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="110">
<caret line="126" column="20" lean-forward="true" selection-start-line="126" selection-start-column="20" selection-end-line="126" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Branch/SelectBranch.js"> <entry file="file://$PROJECT_DIR$/src/forge/Branch/SelectBranch.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="335"> <state relative-caret-position="335">
@ -618,16 +533,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/forge/Branch/CloneAddress.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
<caret line="13" column="11" lean-forward="true" selection-start-line="13" selection-start-column="11" selection-end-line="13" selection-end-column="11" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootBranch.js"> <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootBranch.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187"> <state relative-caret-position="187">
@ -715,16 +620,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="618">
<caret line="211" column="38" selection-start-line="211" selection-start-column="38" selection-end-line="211" selection-end-column="38" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Version/version.js"> <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="254"> <state relative-caret-position="254">
@ -754,23 +649,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2242">
<caret line="96" column="24" selection-start-line="96" selection-start-column="24" selection-end-line="96" selection-end-column="24" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/App.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="12410">
<caret line="762" column="54" selection-start-line="762" selection-start-column="54" selection-end-line="762" selection-end-column="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/build.js"> <entry file="file://$PROJECT_DIR$/scripts/build.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221"> <state relative-caret-position="221">
@ -799,16 +677,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/forge/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="32" column="2" selection-start-line="32" selection-start-column="2" selection-end-line="32" selection-end-column="2" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Version/version.css"> <entry file="file://$PROJECT_DIR$/src/forge/Version/version.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1921"> <state relative-caret-position="1921">
@ -823,16 +691,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="418">
<caret line="225" column="15" selection-start-line="225" selection-start-column="15" selection-end-line="225" selection-end-column="15" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosProject.js"> <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosProject.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="6630"> <state relative-caret-position="6630">
@ -843,16 +701,33 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Infos.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4318">
<caret line="271" column="22" selection-start-line="271" selection-start-column="22" selection-end-line="271" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/usersInfo.css"> <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/usersInfo.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="478"> <state relative-caret-position="7973">
<caret line="469" column="1" selection-start-line="469" selection-start-column="1" selection-end-line="469" selection-end-column="12" /> <caret line="469" column="1" selection-start-line="469" selection-start-column="1" selection-end-line="469" selection-end-column="12" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/publicCreatNew.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="714">
<caret line="42" column="22" selection-start-line="42" selection-start-column="22" selection-end-line="42" selection-end-column="22" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js"> <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="188"> <state relative-caret-position="18683">
<caret line="1179" column="17" selection-start-line="1179" selection-start-column="17" selection-end-line="1179" selection-end-column="17" /> <caret line="1179" column="17" selection-start-line="1179" selection-start-column="17" selection-end-line="1179" selection-end-column="17" />
<folding> <folding>
<element signature="e#0#41#0" expanded="true" /> <element signature="e#0#41#0" expanded="true" />
@ -866,39 +741,146 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/publicCreatNew.js"> <entry file="file://$PROJECT_DIR$/src/forge/Branch/CloneAddress.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="196"> <state relative-caret-position="207">
<caret line="42" column="22" selection-start-line="42" selection-start-column="22" selection-end-line="42" selection-end-column="22" /> <caret line="20" column="9" lean-forward="true" selection-start-line="20" selection-start-column="9" selection-end-line="20" selection-end-column="9" />
<folding> <folding>
<element signature="e#0#41#0" expanded="true" /> <element signature="e#0#42#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/NullData.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="443">
<caret line="63" column="23" selection-start-line="63" selection-start-column="15" selection-end-line="63" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js"> <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Projects.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1994"> <state relative-caret-position="783">
<caret line="312" column="18" selection-start-line="312" selection-start-column="18" selection-end-line="312" selection-end-column="18" /> <caret line="395" column="16" lean-forward="true" selection-start-line="395" selection-start-column="16" selection-end-line="395" selection-end-column="16" />
<folding>
<element signature="e#0#41#0" expanded="true" />
<element signature="e#4148#5191#0" />
<element signature="e#5202#6120#0" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="905">
<caret line="158" selection-start-line="158" selection-end-line="158" />
<folding> <folding>
<element signature="e#0#41#0" expanded="true" /> <element signature="e#0#41#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/Infos.js"> <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="202"> <state relative-caret-position="115">
<caret line="271" column="22" selection-start-line="271" selection-start-column="22" selection-end-line="271" selection-end-column="22" /> <caret line="295" column="17" lean-forward="true" selection-start-line="295" selection-start-column="17" selection-end-line="295" selection-end-column="17" />
<folding>
<element signature="e#0#42#0" expanded="true" />
<element signature="e#9003#11685#0" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js"> <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="184"> <state relative-caret-position="89">
<caret line="88" column="50" lean-forward="true" selection-start-line="88" selection-start-column="50" selection-end-line="88" selection-end-column="50" /> <caret line="340" column="21" lean-forward="true" selection-start-line="340" selection-start-column="21" selection-end-line="340" selection-end-column="21" />
<folding> <folding>
<element signature="e#0#41#0" expanded="true" /> <element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/modules/login/EducoderLogin.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="272">
<caret line="162" selection-start-line="162" selection-end-line="162" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/modules/login/EducoderInteresse.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="254">
<caret line="78" column="28" selection-start-line="78" selection-start-column="28" selection-end-line="78" selection-end-column="28" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/modules/login/LoginDialog.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="328">
<caret line="727" column="131" selection-start-line="727" selection-start-column="30" selection-end-line="727" selection-end-column="131" />
<folding>
<element signature="n#style#0;n#a#0;n#font#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/App.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="164">
<caret line="435" column="7" selection-start-line="435" selection-start-column="7" selection-end-line="435" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="194">
<caret line="216" column="38" selection-start-line="216" selection-start-column="33" selection-end-line="216" selection-end-column="38" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/forge/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="311">
<caret line="58" column="38" selection-start-line="58" selection-start-column="38" selection-end-line="58" selection-end-column="38" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/modules/login/Trialapplication.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251">
<caret line="118" lean-forward="true" selection-start-line="118" selection-end-line="118" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/modules/login/EducoderReg.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="41">
<caret line="17" column="12" selection-start-line="17" selection-start-column="12" selection-end-line="17" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/modules/user/LoginRegisterComponent.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="22" selection-start-line="14" selection-start-column="22" selection-end-line="14" selection-end-column="22" />
<folding>
<element signature="e#0#39#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>

94
src/forge/Main/CoderRootDirectory.js
View File

@ -321,66 +321,62 @@ class CoderRootDirectory extends Component{
let array = filePath && filePath.split("/"); let array = filePath && filePath.split("/");
return( return(
<Spin spinning={isSpin}> <Spin spinning={isSpin}>
{(rootList && rootList.length > 0) || (fileDetail && fileDetail.length > 0) ? <div>
<div> <Top { ...this.props } {...this.state} />
<Top { ...this.props } {...this.state} /> <div className="f-wrap-between mt20">
<div className="f-wrap-between mt20"> <div className="f-wrap-alignCenter">
<div className="f-wrap-alignCenter"> <SelectBranch branch={branch} changeBranch={this.changeBranch} {...this.props} {...this.state}></SelectBranch>
<SelectBranch branch={branch} changeBranch={this.changeBranch} {...this.props} {...this.state}></SelectBranch>
{
{ filePath &&
filePath && <span className="ml20 font-16">
<span className="ml20 font-16">
<a onClick={()=>this.returnMain(branch)} className="color-blue">{ projectDetail && projectDetail.identifier }</a> <a onClick={()=>this.returnMain(branch)} className="color-blue">{ projectDetail && projectDetail.identifier }</a>
{ {
array && array.map((item,key)=>{ array && array.map((item,key)=>{
return( return(
<React.Fragment> <React.Fragment>
{ {
key === array.length-1 ? key === array.length-1 ?
<span className="color-grey-6 subFileName" key={key}>{item}</span> <span className="color-grey-6 subFileName" key={key}>{item}</span>
: :
key === 0? key === 0?
<Link to={`/projects/${projectsId}/coders/filesurl/${item}`} className="color-blue subFileName" key={key}>{item}</Link> <Link to={`/projects/${projectsId}/coders/filesurl/${item}`} className="color-blue subFileName" key={key}>{item}</Link>
: :
<Link to={`/projects/${projectsId}/coders/filesurl/${array[key-1]}/${item}`} className="color-blue subFileName" key={key}>{item}</Link> <Link to={`/projects/${projectsId}/coders/filesurl/${array[key-1]}/${item}`} className="color-blue subFileName" key={key}>{item}</Link>
} }
</React.Fragment> </React.Fragment>
) )
}) })
} }
</span> </span>
} }
</div>
<div className="f-wrap-alignCenter">
{
subFileType !== "file" && (isManager || isDeveloper) &&
<p className="addFile mr30">
<Link to={`/projects/${projectsId}/coders/${branch}/newfile${urlRoot}`} >新建文件</Link>
</p>
}
{
filePath && filePath.length === 0 && <CloneAddress http_url={http_url} downloadUrl={downloadUrl} showNotification={this.props.showNotification}></CloneAddress>
}
</div>
</div> </div>
{/* 主目录列表 */} <div className="f-wrap-alignCenter">
{ {
rootList && subFileType !== "file" && (isManager || isDeveloper) &&
<RootTable columns = {columns} data={rootList} title={() => title()}></RootTable> <p className="addFile mr30">
<Link to={`/projects/${projectsId}/coders/${branch}/newfile${urlRoot}`} >新建文件</Link>
</p>
} }
{/* 子目录列表、文件 */}
{ {
fileDetail && fileDetail.length>0 && http_url && <CloneAddress http_url={http_url} downloadUrl={downloadUrl} showNotification={this.props.showNotification}></CloneAddress>
<CoderRootFileDetail detail = {fileDetail[0]} {...this.props} {...this.state} readOnly={this.state.readOnly}></CoderRootFileDetail>
} }
{/* readme.txt (isManager || isDeveloper)*/} </div>
{ this.renderReadMeContent(readMeContent,(isManager || isDeveloper)) }
</div> </div>
: {/* 主目录列表 */}
<NullData {...this.props} {...this.state} http_url={http_url} ></NullData> {
} rootList &&
<RootTable columns = {columns} data={rootList} title={() => title()}></RootTable>
}
{/* 子目录列表、文件 */}
{
fileDetail && fileDetail.length>0 &&
<CoderRootFileDetail detail = {fileDetail[0]} {...this.props} {...this.state} readOnly={this.state.readOnly}></CoderRootFileDetail>
}
{/* readme.txt (isManager || isDeveloper)*/}
{ this.renderReadMeContent(readMeContent,(isManager || isDeveloper)) }
</div>
</Spin> </Spin>
) )
} }

3
src/forge/Main/Detail.js
View File

@ -330,8 +330,9 @@ class Detail extends Component{
<li className={(url.indexOf("orders")>-1 && !(url.indexOf("Milepost")>0 || url.indexOf("meilpost")>0 || url.indexOf("tags")>0))? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/orders`,state}}><img alt="" src={img_2} width="12" />任务{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}</Link></li> <li className={(url.indexOf("orders")>-1 && !(url.indexOf("Milepost")>0 || url.indexOf("meilpost")>0 || url.indexOf("tags")>0))? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/orders`,state}}><img alt="" src={img_2} width="12" />任务{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}</Link></li>
<li className={url.indexOf("merge")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/merge`,state}}><img alt="" src={img_3} width="13" />合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}</Link></li> <li className={url.indexOf("merge")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/merge`,state}}><img alt="" src={img_3} width="13" />合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}</Link></li>
<li className={url.indexOf("version")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/version`,state}}><img alt="" src={img_4} width="16" />版本发布</Link></li> <li className={url.indexOf("version")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/version`,state}}><img alt="" src={img_4} width="16" />版本发布</Link></li>
<li className={url.indexOf("trends")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/trends`,state}}><img alt="" src={img_6} width="16" />动态</Link></li>
<li className={(url.indexOf("Milepost")>-1 || url.indexOf("meilpost")>-1) ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/orders/Milepost`,state}}><img alt="" src={img_milepost} width="16" />里程碑</Link></li> <li className={(url.indexOf("Milepost")>-1 || url.indexOf("meilpost")>-1) ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/orders/Milepost`,state}}><img alt="" src={img_milepost} width="16" />里程碑</Link></li>
<li className={url.indexOf("trends")>-1 ? "active" : ""}><Link to={{pathname:`/projects/${projectsId}/trends`,state}}><img alt="" src={img_6} width="16" />动态</Link></li>
{ {
isManager && isManager &&
<li className={url.indexOf("setting")>0 ? "active" : ""}><Link to={`/projects/${projectsId}/setting`}><img alt="" src={img_7} width="19" />仓库设置</Link></li> <li className={url.indexOf("setting")>0 ? "active" : ""}><Link to={`/projects/${projectsId}/setting`}><img alt="" src={img_7} width="19" />仓库设置</Link></li>

2
src/modules/login/EducoderInteresse.js
View File

@ -80,7 +80,7 @@ class EducoderInteresse extends Component {
justifyContent: "center", justifyContent: "center",
width: "100%", width: "100%",
}}> }}>
<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div> <div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;国防科技大学<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
</div> </div>
</div> </div>
</div> </div>

6
src/modules/login/EducoderLogin.js
View File

@ -181,21 +181,21 @@ class EducoderLogin extends Component {
justifyContent: "center", justifyContent: "center",
width: "100%", width: "100%",
}}> }}>
<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div> <div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;国防科技大学<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
</div>: </div>:
this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.main_site===null|| this.props.mygetHelmetapi.main_site===undefined? <div style={{ this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.main_site===null|| this.props.mygetHelmetapi.main_site===undefined? <div style={{
display: "flex", display: "flex",
justifyContent: "center", justifyContent: "center",
width: "100%", width: "100%",
}}> }}>
<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div> <div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;湘ICP备17009477号<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
</div>:this.props.mygetHelmetapi.main_site===true? </div>:this.props.mygetHelmetapi.main_site===true?
<div style={{ <div style={{
display: "flex", display: "flex",
justifyContent: "center", justifyContent: "center",
width: "100%", width: "100%",
}}> }}>
<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div> <div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;湘ICP备17009477号<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
</div> </div>
:"" :""
} }

9
src/modules/login/LoginDialog.js
View File

@ -720,9 +720,12 @@ class LoginDialog extends Component {
</span> </span>
<span className="fr"> <span className="fr">
<a onClick={(url) => this.getloginurl("/changepassword")} <a href="https://www.trustie.net/account/lost_password" className="mr3 color-grey-9" target={"_blank"}>找回密码</a>
className="mr3 color-grey-9">找回密码</a><em className="vertical-line"></em> {/*<a onClick={(url) => this.getloginurl("/changepassword")}*/}
<a onClick={(url)=>this.getloginurl("/register")} className="color-grey-9">注册</a> {/*className="mr3 color-grey-9">找回密码</a>*/}
<em className="vertical-line"></em>
{/*<a onClick={(url)=>this.getloginurl("https://www.trustie.net/login?login=false")} className="color-grey-9">注册</a>*/}
<a href="https://www.trustie.net/login?login=false" target={"_blank"} className="color-grey-9">注册</a>
</span> </span>
</p> </p>

11
src/modules/user/LoginRegisterComponent.js
View File

@ -995,7 +995,10 @@ class LoginRegisterComponent extends Component {
<div> <div>
{weixinlogin===false&&this.props.weixinlogin===undefined?<Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab} className="mt20"> {weixinlogin===false&&this.props.weixinlogin===undefined?<Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab} className="mt20">
<Menu.Item key="0" className={tab===0?"active font-18":"font-18"} > 登录</Menu.Item> <Menu.Item key="0" className={tab===0?"active font-18":"font-18"} > 登录</Menu.Item>
<Menu.Item key="1" className={tab===1?"active font-18 ":"font-18 "} style={{marginLeft:"10px"}} >注册</Menu.Item> <Menu.Item key="1" className={tab===1?"active font-18 ":"font-18 "} style={{marginLeft:"10px"}}>
<a href="https://www.trustie.net/login?login=false" target={"_blank"}>注册</a>
{/*注册*/}
</Menu.Item>
</Menu>:""} </Menu>:""}
{ {
@ -1078,9 +1081,9 @@ class LoginRegisterComponent extends Component {
<div className="left_right font-12 " style={{color: '#676767'}}> <div className="left_right font-12 " style={{color: '#676767'}}>
<Checkbox onChange={this.onAutoLoginChange} checked={autoLogin}>下次自动登录</Checkbox> <Checkbox onChange={this.onAutoLoginChange} checked={autoLogin}>下次自动登录</Checkbox>
<a href="https://www.trustie.net/account/lost_password" className="mr3 color-grey-9 mt3 font-12" target={"_blank"}>找回密码</a>
<a onClick={()=>this.StudyMakeMoney()} {/*<a onClick={()=>this.StudyMakeMoney()}*/}
className="mr3 color-grey-9 mt3 font-12">找回密码</a> {/*className="mr3 color-grey-9 mt3 font-12">找回密码</a>*/}
</div> </div>
<Button className="login_btn font-16" type="primary" style={{height:"46px"}} onClick={() => this.postLogin()} <Button className="login_btn font-16" type="primary" style={{height:"46px"}} onClick={() => this.postLogin()}

18
src/modules/user/usersInfo/InfosBanner.js
View File

@ -156,25 +156,7 @@ class InfosBanner extends Component{
onClick={() => this.setState({moduleName: 'projects'})} onClick={() => this.setState({moduleName: 'projects'})}
to={`/users/${username}/projects`}>开发项目</Link> to={`/users/${username}/projects`}>开发项目</Link>
</li> </li>
{/*<li className={`${moduleName == 'package' ? 'active' : '' }`}>*/}
{/* <Link*/}
{/* onClick={() => this.setState({moduleName: 'package'})}*/}
{/* to={`/users/${username}/package`}>众包</Link>*/}
{/*</li>*/}
{/*{this.props.user&&this.props.user.main_site===true?((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)*/}
{/*&& <li className={`${moduleName == 'videos' ? 'active' : '' }`}>*/}
{/*<Link*/}
{/*onClick={() => this.setState({moduleName: 'videos'})}*/}
{/*to={`/users/${username}/videos`}>视频</Link>*/}
{/*</li>:""}*/}
{/*自己的主页且不是学生显示题库按钮*/}
{/*{this.props.user&&this.props.user.main_site===true?(is_current && current_user&& current_user.is_teacher )*/}
{/*&&<li className={`${moduleName == 'topics' ? 'active' : '' }`}>*/}
{/*<Link*/}
{/*onClick={() => this.setState({moduleName: 'topics'})}*/}
{/*to={`/users/${username}/topics/personal`}>题库</Link>*/}
{/*</li>:""}*/}
</div> </div>
</div> </div>