diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index 0cba9123..15d7990b 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -55,7 +55,7 @@ class IndexItem extends Component {
{
item.type && item.type === 1 ?
-
+
:""
}
diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js
index deccb3da..86383fc7 100644
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@@ -267,6 +267,11 @@ class Setting extends Component {
},
],
})(
)}
+ {
+ projectDetail && projectDetail.type && projectDetail.type !== 0 ?
+
该项目导入于 {projectDetail.mirror_url}
+ : ""
+ }
可见性
diff --git a/src/forge/Team/ListItem.jsx b/src/forge/Team/ListItem.jsx
index a908f80b..a1f4fa89 100644
--- a/src/forge/Team/ListItem.jsx
+++ b/src/forge/Team/ListItem.jsx
@@ -16,7 +16,7 @@ function ListItem({item,key,OIdentifier}) {
:
-
+
:""
}
From 0e6cb3954a816504495e98fae58b1b190d396cac Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Mon, 25 Oct 2021 11:09:13 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A1=B5icon=E6=9B=B4?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/IndexItem.js | 6 ------
1 file changed, 6 deletions(-)
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index 15d7990b..4ddd7633 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -52,12 +52,6 @@ class IndexItem extends Component {
:""
}
- {
- item.type && item.type === 1 ?
-
-
- :""
- }
{
From aeff357660ace0991da45c8493db7f9af519dd26 Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Mon, 25 Oct 2021 11:09:41 +0800
Subject: [PATCH 03/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A1=B5icon=E6=9B=B4?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/IndexItem.js | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index 4ddd7633..15d7990b 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -52,6 +52,12 @@ class IndexItem extends Component {
:""
}
+ {
+ item.type && item.type === 1 ?
+
+
+ :""
+ }
{
From d37709b1a5f05ed8acd79a962f73512d324d6a92 Mon Sep 17 00:00:00 2001
From: caishi
Date: Mon, 25 Oct 2021 11:24:21 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Index.js | 11 +++++++++++
src/forge/Main/projecthome/Index.jsx | 10 ++++++++++
src/forge/Main/projecthome/Index.scss | 0
src/modules/tpm/TPMIndex.css | 6 +++---
4 files changed, 24 insertions(+), 3 deletions(-)
create mode 100644 src/forge/Main/projecthome/Index.jsx
create mode 100644 src/forge/Main/projecthome/Index.scss
diff --git a/src/forge/Index.js b/src/forge/Index.js
index c2e36916..5cdf4b4f 100644
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@@ -22,6 +22,11 @@ const ProjectIndex = Loadable({
loading: Loading,
});
+const ProjectHome = Loadable({
+ loader: () => import("./Main/projecthome/Index"),
+ loading: Loading,
+});
+
// 项目详情放在用户和组织下作为二级菜单存在
// const ProjectDetail = Loadable({
// loader: () => import("./Main/Detail"),
@@ -68,6 +73,12 @@ class Index extends Component {
> */}
(
+
+ )}
+ >
+ (
)}
diff --git a/src/forge/Main/projecthome/Index.jsx b/src/forge/Main/projecthome/Index.jsx
new file mode 100644
index 00000000..c2e8a21e
--- /dev/null
+++ b/src/forge/Main/projecthome/Index.jsx
@@ -0,0 +1,10 @@
+import React from 'react';
+import './Index.scss';
+
+
+function Index(props) {
+ return(
+ 首页index
+ )
+}
+export default Index;
\ No newline at end of file
diff --git a/src/forge/Main/projecthome/Index.scss b/src/forge/Main/projecthome/Index.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css
index bdd6d36a..09bd0a72 100644
--- a/src/modules/tpm/TPMIndex.css
+++ b/src/modules/tpm/TPMIndex.css
@@ -28,13 +28,13 @@ body>.-task-title {
height:70px;
min-width: 1200px;
z-index: 1000;
- background:rgba(255,255,255,1);
+ background: rgba(0, 0, 0, 0.4);
+ box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
position: fixed;
- box-shadow: 0px 0px 14px rgb(0 0 0 / 10%);
}
.headerContent{
- width:1200px;
margin:0px auto;
+ padding:0px 30px;
display: flex;
align-items: center;
height: 100%;
From 60da6bd110d55a9ee10ee43a638c2bd1fb15b7f1 Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Mon, 25 Oct 2021 15:46:57 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=93=BE=E6=8E=A5?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Team/ListItem.jsx | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/forge/Team/ListItem.jsx b/src/forge/Team/ListItem.jsx
index a1f4fa89..8ccfdda2 100644
--- a/src/forge/Team/ListItem.jsx
+++ b/src/forge/Team/ListItem.jsx
@@ -15,9 +15,7 @@ function ListItem({item,key,OIdentifier}) {
:
-
-
- :""
+ :""
}
From 7872d5ecab95974de47fd50782ec1d6fefe95f8c Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Mon, 25 Oct 2021 15:56:06 +0800
Subject: [PATCH 06/11] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=93=BE=E6=8E=A5?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Main/IndexItem.js | 6 ------
1 file changed, 6 deletions(-)
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index 15d7990b..4ddd7633 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -52,12 +52,6 @@ class IndexItem extends Component {
:""
}
- {
- item.type && item.type === 1 ?
-
-
- :""
- }
{
From 746f552a21dc5e2d5451cf6aa508fc81974b1f44 Mon Sep 17 00:00:00 2001
From: hucong <1422588487@qq.com>
Date: Mon, 25 Oct 2021 16:37:50 +0800
Subject: [PATCH 07/11] issue
---
src/forge/Team/ListItem.jsx | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/forge/Team/ListItem.jsx b/src/forge/Team/ListItem.jsx
index 8ccfdda2..ab9d64f2 100644
--- a/src/forge/Team/ListItem.jsx
+++ b/src/forge/Team/ListItem.jsx
@@ -10,12 +10,10 @@ function ListItem({item,key,OIdentifier}) {
{item.name}
{ item.forked_from_project_id && }
{
- item.type && item.type !== 0 ?
- item.type === 2 ?
+ item.type && item.type === 2 ?
- :
- :""
+ :""
}
From 3d3ef19d4ada8ebae16a2822b7608c8349349ca1 Mon Sep 17 00:00:00 2001
From: caishi
Date: Tue, 26 Oct 2021 09:40:35 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A6=96=E9=A1=B5=20ba?=
=?UTF-8?q?nner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/css/edu-purge.css | 5 +-
src/forge/Component/HeadSearch.jsx | 2 +-
src/forge/Head/Header.js | 8 +-
src/forge/Main/img/index/banner.png | Bin 0 -> 245239 bytes
src/forge/Main/img/index/box.png | Bin 0 -> 50884 bytes
src/forge/Main/img/index/data.png | Bin 0 -> 460 bytes
src/forge/Main/img/index/earth.png | Bin 0 -> 463 bytes
src/forge/Main/img/index/eye.png | Bin 0 -> 435 bytes
src/forge/Main/projecthome/Index.jsx | 6 +-
src/forge/Main/projecthome/Index.scss | 152 +++++++++++++++++++++++
src/forge/Main/projecthome/SubBanner.jsx | 77 ++++++++++++
src/modules/tpm/TPMIndex.css | 5 +-
12 files changed, 245 insertions(+), 10 deletions(-)
create mode 100644 src/forge/Main/img/index/banner.png
create mode 100644 src/forge/Main/img/index/box.png
create mode 100644 src/forge/Main/img/index/data.png
create mode 100644 src/forge/Main/img/index/earth.png
create mode 100644 src/forge/Main/img/index/eye.png
create mode 100644 src/forge/Main/projecthome/SubBanner.jsx
diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css
index 0d146204..9877c4ea 100644
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@@ -3971,9 +3971,12 @@ html>body #ajax-indicator {
display: block;
height: 100%;
width: 100%;
- color: #333;
+ color: #fff;
font-size: 16px;
}
+.head-right i{
+ color: #fff!important;
+}
.head-nav ul#header-nav li a:hover,.head-nav ul#header-nav li.active a {
color: #5091FF;
diff --git a/src/forge/Component/HeadSearch.jsx b/src/forge/Component/HeadSearch.jsx
index fb7c9f25..10b829a2 100644
--- a/src/forge/Component/HeadSearch.jsx
+++ b/src/forge/Component/HeadSearch.jsx
@@ -32,7 +32,7 @@ export default ({history}) => {
/>
:
-
{
+ {
setOpenSearch(true)
}} />
}
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index ac139351..622eef3c 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -433,7 +433,7 @@ class NewHeader extends Component {
{
current_user && (current_user.main_site || current_user.login) && (settings && settings.add && settings.add.length>0)?
-
+
:""
}
@@ -448,7 +448,7 @@ class NewHeader extends Component {
>
{current_user &&
-
+
}
@@ -457,10 +457,10 @@ class NewHeader extends Component {