diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css
index 047d2bc1..11e90f7d 100644
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@@ -3409,7 +3409,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 (
-
-
-
-
- );
+ return ""
}
}
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index a70ae05e..eab51dc5 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){
}
+ {
+ inviteCode &&
+
+ }
{
lesson_url &&
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(
- goToSubRoot(item.path,item.type,item.name)} style={{cursor:item.type!=="submodule"?"pointer":"default"}}>
+ goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}>
{item.name}
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 7571cf27..f40dcb0a 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';
@@ -509,10 +508,6 @@ class Detail extends Component {
}
- {
- projectDetail && projectDetail.invite_code &&
-
- }
{
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index 63c13318..592002e9 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -360,4 +360,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(
-
邀请码: {code}
-
可以通过邀请码邀请成员加入项目
点击复制邀请码。} placement={"bottom"}>
- jsCopy("#devitecode")}>
-
+
邀请码
+
+ {code}
+ 可以通过邀请码邀请成员加入项目
点击复制邀请码。} placement={"bottom"}>
+ jsCopy("#devitecode")}>
+
+
)
}
diff --git a/src/forge/Main/sub/sub.scss b/src/forge/Main/sub/sub.scss
index 7c146044..aa873971 100644
--- a/src/forge/Main/sub/sub.scss
+++ b/src/forge/Main/sub/sub.scss
@@ -22,4 +22,9 @@
height: 20px;
line-height: 20px;
}
+}
+
+.detailsCode{
+ display: flex;
+ justify-content: space-between;
}
\ No newline at end of file