From 30f1a396f353ac5ee7452c1dd8a2ffaf461b796a Mon Sep 17 00:00:00 2001
From: "sylor_huang@126.com" <sylor_huang@126.com>
Date: Fri, 17 Apr 2020 00:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BB=E5=9F=9F=E5=90=8D?=
 =?UTF-8?q?=E7=9A=84=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml | 79 +++++++++++++++++++--------------------------
 src/forge/Index.js  |  6 ++++
 2 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 32075d222..c7212104b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +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/App.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/App.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Index.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Index.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -27,42 +27,28 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <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" />
+            <state relative-caret-position="362">
+              <caret line="781" column="16" selection-start-line="781" selection-start-column="16" selection-end-line="786" selection-end-column="18" />
               <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" />
+                <element signature="e#15678#15867#0" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/AppConfig.js">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/forge/Index.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>
+            <state relative-caret-position="103">
+              <caret line="58" column="71" selection-start-line="58" selection-start-column="71" selection-end-line="58" selection-end-column="71" />
             </state>
           </provider>
         </entry>
@@ -127,7 +113,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/src/forge/Index.js" />
         <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" />
@@ -173,6 +158,7 @@
         <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" />
+        <option value="$PROJECT_DIR$/src/forge/Index.js" />
       </list>
     </option>
   </component>
@@ -288,18 +274,18 @@
       <workItem from="1587020811560" duration="543000" />
       <workItem from="1587021467416" duration="8000" />
       <workItem from="1587022017639" duration="2902000" />
-      <workItem from="1587047814589" duration="788000" />
+      <workItem from="1587047814589" duration="1618000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="140814000" />
+    <option name="totallyTimeSpent" value="141644000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.18884121" />
+      <window_info content_ui="combo" id="Project" order="0" 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" />
@@ -312,7 +298,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 active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.37710842" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="10" visible="true" weight="0.6325301" />
       <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" />
@@ -822,13 +808,6 @@
         </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">
@@ -839,9 +818,24 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/App.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="362">
+          <caret line="781" column="16" selection-start-line="781" selection-start-column="16" selection-end-line="786" selection-end-column="18" />
+          <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" />
+            <element signature="e#15678#15867#0" />
+          </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">
+        <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" />
@@ -849,17 +843,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/App.js">
+    <entry file="file://$PROJECT_DIR$/src/forge/Index.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 relative-caret-position="103">
+          <caret line="58" column="71" selection-start-line="58" selection-start-column="71" selection-end-line="58" selection-end-column="71" />
         </state>
       </provider>
     </entry>
diff --git a/src/forge/Index.js b/src/forge/Index.js
index 893cfc2f3..37284d101 100644
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@@ -53,6 +53,12 @@ class Index extends Component{
               (props) => (<ProjectIndex {...this.props} {...props} {...this.state}/>)
             }
           ></Route>
+          <Route exact path="/"
+            // component={ShixunsHome}
+                 render={
+                   (props)=>(<ProjectIndex {...this.props} {...props} {...this.state}></ProjectIndex>)
+                 }
+          />
         </Switch>
       </div>
     )