From 14c94ce3c65358b859b9f0881c5bc2b4e7860829 Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Thu, 16 Apr 2020 22:54:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E4=B8=BApr?=
 =?UTF-8?q?ojects?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml | 199 ++++++++++++++++++++++++++------------------
 src/App.js          |  21 ++---
 2 files changed, 127 insertions(+), 93 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ec8265b84..32075d222 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,8 +3,7 @@
   <component name="ChangeListManager">
     <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$/src/forge/Version/version.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/version.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/forge/Version/version.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Version/version.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/App.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/App.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -29,10 +28,38 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
+        <entry file="file://$PROJECT_DIR$/src/App.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="314">
-              <caret line="110" column="32" lean-forward="true" selection-start-line="110" selection-start-column="32" selection-end-line="110" selection-end-column="32" />
+            <state relative-caret-position="249">
+              <caret line="788" selection-start-line="788" selection-end-line="788" />
+              <folding>
+                <element signature="e#14120#14327#0" />
+                <element signature="e#14353#14550#0" />
+                <element signature="e#14676#14872#0" />
+                <element signature="e#14904#15119#0" />
+                <element signature="e#15483#15669#0" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/AppConfig.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-4146">
+              <caret line="130" column="25" selection-start-line="130" selection-start-column="25" selection-end-line="130" selection-end-column="25" />
+              <folding>
+                <element signature="e#0#26#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/forge/Main/Index.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="163">
+              <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>
@@ -43,7 +70,7 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/forge/Version/version.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="339">
+            <state relative-caret-position="1921">
               <caret line="113" column="1" selection-start-line="113" selection-start-column="1" selection-end-line="113" selection-end-column="11" />
             </state>
           </provider>
@@ -53,8 +80,6 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>entries</find>
-      <find>/branches</find>
       <find>Detail</find>
       <find>projects/:projectsId/c</find>
       <find>branchList</find>
@@ -83,6 +108,8 @@
       <find>geturlsdata</find>
       <find>edu-menu-list</find>
       <find>ver</find>
+      <find>new_header.js</find>
+      <find>/projects</find>
     </findStrings>
     <replaceStrings>
       <replace>任务</replace>
@@ -145,6 +172,7 @@
         <option value="$PROJECT_DIR$/src/AppConfig.js" />
         <option value="$PROJECT_DIR$/src/forge/Version/version.css" />
         <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
+        <option value="$PROJECT_DIR$/src/App.js" />
       </list>
     </option>
   </component>
@@ -158,7 +186,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -166,11 +193,6 @@
               <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
-              <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
-              <item name="build" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="forgeplus-react" type="b2602c69:ProjectViewProjectNode" />
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
@@ -187,12 +209,13 @@
               <item name="forgeplus-react" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="forge" type="462c0819:PsiDirectoryNode" />
-              <item name="Version" type="462c0819:PsiDirectoryNode" />
+              <item name="Main" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -264,18 +287,19 @@
       <workItem from="1587004932342" duration="7698000" />
       <workItem from="1587020811560" duration="543000" />
       <workItem from="1587021467416" duration="8000" />
-      <workItem from="1587022017639" duration="1851000" />
+      <workItem from="1587022017639" duration="2902000" />
+      <workItem from="1587047814589" duration="788000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="138975000" />
+    <option name="totallyTimeSpent" value="140814000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.18669528" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18884121" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -288,7 +312,7 @@
       <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="Version Control" order="9" weight="0.31084338" />
-      <window_info anchor="bottom" id="Terminal" order="10" visible="true" weight="0.3987952" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.37710842" />
       <window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
       <window_info anchor="bottom" id="TypeScript" order="12" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
@@ -351,13 +375,6 @@
     </option>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/NewVersion.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-2583">
-          <caret line="4" column="28" lean-forward="true" selection-start-line="4" selection-start-column="28" selection-end-line="4" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Order/newMilepost.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="325">
@@ -668,23 +685,6 @@
         </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="61">
-          <caret line="90" column="3" lean-forward="true" selection-start-line="90" selection-start-column="3" selection-end-line="90" selection-end-column="3" />
-          <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="336">
-          <caret line="45" column="44" lean-forward="true" selection-start-line="45" selection-start-column="24" selection-end-line="45" selection-end-column="44" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Newfile/Index.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="455">
@@ -759,13 +759,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/App.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-228">
-          <caret line="487" column="31" lean-forward="true" selection-start-line="487" selection-start-column="31" selection-end-line="487" selection-end-column="31" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/build/favicon.ico">
       <provider selected="true" editor-type-id="images" />
     </entry>
@@ -779,30 +772,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/AppConfig.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="177">
-          <caret line="130" column="25" lean-forward="true" selection-start-line="130" selection-start-column="25" selection-end-line="130" selection-end-column="25" />
-          <folding>
-            <element signature="e#0#26#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="237">
-          <caret line="1427" column="71" selection-start-line="1427" selection-start-column="71" selection-end-line="1427" selection-end-column="71" />
-          <folding>
-            <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>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Main/Detail.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="618">
@@ -813,22 +782,86 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Version/version.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="339">
-          <caret line="113" column="1" selection-start-line="113" selection-start-column="1" selection-end-line="113" selection-end-column="11" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/forge/Version/version.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="314">
-          <caret line="110" column="32" lean-forward="true" selection-start-line="110" selection-start-column="32" selection-end-line="110" selection-end-column="32" />
+        <state relative-caret-position="254">
+          <caret line="120" column="49" selection-start-line="120" selection-start-column="49" selection-end-line="120" selection-end-column="49" />
           <folding>
             <element signature="e#0#42#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/forge/Version/version.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1921">
+          <caret line="113" column="1" selection-start-line="113" selection-start-column="1" selection-end-line="113" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/tpm/NewHeader.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="13677">
+          <caret line="1427" column="71" selection-start-line="1427" selection-start-column="71" selection-end-line="1427" selection-end-column="71" />
+          <folding>
+            <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>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/modules/tpm/TPMIndex.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-1259">
+          <folding>
+            <element signature="e#0#41#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="172">
+          <caret line="35" lean-forward="true" selection-start-line="35" selection-end-line="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/AppConfig.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-4146">
+          <caret line="130" column="25" selection-start-line="130" selection-start-column="25" selection-end-line="130" selection-end-column="25" />
+          <folding>
+            <element signature="e#0#26#0" expanded="true" />
+          </folding>
+        </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="163">
+          <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="249">
+          <caret line="788" selection-start-line="788" selection-end-line="788" />
+          <folding>
+            <element signature="e#14120#14327#0" />
+            <element signature="e#14353#14550#0" />
+            <element signature="e#14676#14872#0" />
+            <element signature="e#14904#15119#0" />
+            <element signature="e#15483#15669#0" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/src/App.js b/src/App.js
index c67fac722..7a92a34d0 100644
--- a/src/App.js
+++ b/src/App.js
@@ -573,12 +573,6 @@ class App extends Component {
 										}
 									}></Route>
 
-								<Route exact path="/"
-									// component={ShixunsHome}
-									render={
-										(props)=>(<ProjectIndex {...this.props} {...props} {...this.state}></ProjectIndex>)
-									}
-								/>
 								{/*题库*/}
 								<Route path="/topicbank/:username/:topicstype"
 											render={
@@ -778,11 +772,18 @@ class App extends Component {
 								{/*		(props)=>(<WXCode {...this.props} {...props} {...this.state}></WXCode>)*/}
 								{/*	}*/}
 								{/*/>*/}
+								{/*<Route exact path="/"*/}
+											{/*// component={ShixunsHome}*/}
+											{/*render={*/}
+												{/*(props)=>(<ShixunsHome {...this.props} {...props} {...this.state}></ShixunsHome>)*/}
+											{/*}*/}
+								{/*/>*/}
+
 								<Route exact path="/"
-											// component={ShixunsHome}
-											render={
-												(props)=>(<ShixunsHome {...this.props} {...props} {...this.state}></ShixunsHome>)
-											}
+									// component={ShixunsHome}
+											 render={
+												 (props)=>(<ProjectIndex {...this.props} {...props} {...this.state}></ProjectIndex>)
+											 }
 								/>
 								<Route component={Shixunnopage}/>