From da9e643b474b16ebaab49f4f1db5b1a091da7e3d Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 9 Jul 2021 17:10:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=80=E8=AF=B7=E7=A0=81=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=95=B4=E4=BD=93=E7=9A=84=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/edu-purge.css               |  2 +-
 src/Loading.js                         | 15 +--------------
 src/forge/Main/CoderDepot.jsx          | 11 ++++++++++-
 src/forge/Main/CoderDepotCatalogue.jsx |  2 +-
 src/forge/Main/Detail.js               |  7 +------
 src/forge/Main/Index.scss              |  9 +++++++++
 src/forge/Main/sub/Invite.jsx          | 12 ++++++++----
 src/forge/Main/sub/sub.scss            |  5 +++++
 8 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css
index ebb65825..ca6a95c2 100644
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@@ -3410,7 +3410,7 @@ a.user_bluebg_btn {
 }
 
 .cdefault {
-  cursor: default
+  cursor: default!important;
 }
 
 
diff --git a/src/Loading.js b/src/Loading.js
index f9905747..8175b7df 100644
--- a/src/Loading.js
+++ b/src/Loading.js
@@ -9,20 +9,7 @@ class Loading extends Component {
 	}
 
 	render() {
-		return (
-			<div className="App" style={{ minHeight: '800px', width: "100%" }}>
-				<style>
-					{
-						`
-						 .margintop{
-						   margin-top:20%;
-						 }
-						`
-					}
-				</style>
-				<Spin size="large" className={"margintop"} />
-			</div>
-		);
+		return ""
 	}
 }
 
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index f614552a..3676fa1a 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -19,7 +19,7 @@ import LanguagePower from '../Component/LanguagePower';
 import DrawerPanel from '../Component/DrawerPanel';
 import UpdateDescModal from './sub/UpdateDescModal';
 import Nodata from '../Nodata';
-
+import Invite from './sub/Invite';
 /**
  * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
  */
@@ -39,6 +39,7 @@ function returnbar(str){
 
 function CoderDepot(props){
   const [ projectDetail , setProjectDetail ]= useState(undefined);
+  const [ inviteCode , setInviteCode ] = useState(undefined);
   const [ treeValue , setTreeValue ] = useState(undefined);
   const [ treeValuePath , setTreeValuePath ] = useState(undefined);
   const [ lastCommit,setLastCommit ] = useState(undefined);
@@ -77,6 +78,7 @@ function CoderDepot(props){
       setWebsite(details.website);
       setLessonUrl(details.lesson_url);
       setDefaultBranch(details.default_branch);
+      setInviteCode(details.invite_code);
     }
   },[details])
 
@@ -455,6 +457,13 @@ function CoderDepot(props){
                         </p>
                       }
                     </div>
+                    {
+                      inviteCode && 
+                      <div>
+                        <Divider />
+                        <Invite code={inviteCode} className={"detailsCode"}/>
+                      </div>
+                    }
                     {
                       lesson_url &&
                       <div>
diff --git a/src/forge/Main/CoderDepotCatalogue.jsx b/src/forge/Main/CoderDepotCatalogue.jsx
index 9bdf093c..fae63b3f 100644
--- a/src/forge/Main/CoderDepotCatalogue.jsx
+++ b/src/forge/Main/CoderDepotCatalogue.jsx
@@ -12,7 +12,7 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
   return(
     <li>
       <span>
-        <a onClick={()=>goToSubRoot(item.path,item.type,item.name)} style={{cursor:item.type!=="submodule"?"pointer":"default"}}>
+        <a onClick={()=>goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}>
           <i className={`iconfont ${typeIco[`${item.type}`]} color-green-file mr5`}></i>{item.name}
         </a>
       </span>
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 88851b93..57438c52 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -1,9 +1,8 @@
 import React, { Component } from 'react';
 import { Spin, Tooltip } from 'antd';
 import { Link, Route, Switch } from 'react-router-dom';
-import { Content , FlexAJ , AlignTop } from '../Component/layout';
+import { Content , AlignTop } from '../Component/layout';
 import DetailBanner from './sub/DetailBanner';
-import Invite from './sub/Invite';
 import '../css/index.scss'
 import './list.css';
 
@@ -521,10 +520,6 @@ class Detail extends Component {
                     </span>
                   </span>
                 }
-                {
-                  projectDetail && projectDetail.invite_code &&
-                  <Invite code={projectDetail.invite_code} className={"mt8 textRight"}/>
-                }
               </div>
             </AlignTop>
             {
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index c4751b89..a0478b5f 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -328,4 +328,13 @@
   span{
     margin-top: 1px;
   }
+}
+.submoduleStyle{
+  cursor: default;
+  i{
+    cursor: default;
+  }
+  &:hover{
+    color: #05101a;
+  }
 }
\ No newline at end of file
diff --git a/src/forge/Main/sub/Invite.jsx b/src/forge/Main/sub/Invite.jsx
index b03ec41c..ad2a00bd 100644
--- a/src/forge/Main/sub/Invite.jsx
+++ b/src/forge/Main/sub/Invite.jsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import { Tooltip , message } from 'antd';
+import './sub.scss';
 
 function Invite({code,className}) {
 
@@ -14,10 +15,13 @@ function Invite({code,className}) {
   }
   return(
     <div className={className}>
-      <span>邀请码: <span id="devitecode">{code}</span></span>
-      <Tooltip title={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>}  placement={"bottom"}>
-        <i className="iconfont icon-fuzhi2 font-16 color-blue ml8" onClick={()=>jsCopy("#devitecode")}></i>
-      </Tooltip>
+      <span className="font-16 color-grey-6">邀请码</span>
+      <div>
+        <span id="devitecode">{code}</span>
+        <Tooltip title={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>}  placement={"bottom"}>
+          <i className="iconfont icon-fuzhi2 font-16 color-blue ml8" onClick={()=>jsCopy("#devitecode")}></i>
+        </Tooltip>
+      </div>
     </div>
   )
 }
diff --git a/src/forge/Main/sub/sub.scss b/src/forge/Main/sub/sub.scss
index 362b9f4e..61213870 100644
--- a/src/forge/Main/sub/sub.scss
+++ b/src/forge/Main/sub/sub.scss
@@ -20,4 +20,9 @@
     height: 20px;
     line-height: 20px;
   }
+}
+
+.detailsCode{
+  display: flex;
+  justify-content: space-between;
 }
\ No newline at end of file