-
-
-
-
-
-
- { organizeDetail && organizeDetail.can_create_project ?
-
- + 新建项目
-
- :""}
-
- 排序
-
-
+ {
+ organizeDetail.news_title &&
+
+
新闻动态
+
+ {organizeDetail.news_title}
+
+
+ {organizeDetail.news_content}
-
-
- {
- list && list.length>0 ? list.map((item,key)=>{
- return(
- -
- )
- })
- :
-
- }
-
-
- {
- totalCount > limit &&
-
- }
+ }
+
+
+ 概览
+ 仓库
+
+ {
+ mode === "overview" &&
+
+
+
+ 精选项目
+
+ }
+ btn={
+ 自定义
+ }
+ userLogin={OIdentifier}
+ type="organizations"
+ current={organizeDetail.is_admin}
+ />
+
+
+
+ 组织介绍
+
+
{organizeDetail.description}
+
+ }
+ {
+ mode === "subject" &&
+
+
+
+
+
+
+
+ { organizeDetail && organizeDetail.can_create_project ?
+
+ + 新建项目
+
+ :""}
+
+ 排序
+
+
+
+
+
+ {
+ list && list.length>0 ? list.map((item,key)=>{
+ return(
+ -
+ )
+ })
+ :
+
+ }
+
+
+
+ {
+ totalCount > limit &&
+
+ }
+
+ }
+
+
+ :""
)
}
export default List;
\ No newline at end of file
diff --git a/src/forge/Team/images/left-bc.png b/src/forge/Team/images/left-bc.png
new file mode 100644
index 000000000..c42ab3b93
Binary files /dev/null and b/src/forge/Team/images/left-bc.png differ
diff --git a/src/forge/users/GeneralView/ConcentrateBox.jsx b/src/forge/users/GeneralView/ConcentrateBox.jsx
index 0bc04a716..bc31dc16e 100644
--- a/src/forge/users/GeneralView/ConcentrateBox.jsx
+++ b/src/forge/users/GeneralView/ConcentrateBox.jsx
@@ -5,7 +5,7 @@ import CheckProfile from '../../Component/ProfileModal/Profile';
const { Search } = Input;
const limit = 20;
-function ConcentrateBox({ visible , onCancel , onSure , username , choosed , history , showCompeleteDialog , completeProfile }) {
+function ConcentrateBox({ visible , onCancel , onSure , type , username , choosed , history , showCompeleteDialog , completeProfile }) {
const [ page , setPage ]= useState(1);
const [ total , setTotal ]= useState(0);
const [ pageSize , setPageSize ] = useState(false);
@@ -54,7 +54,7 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed , his
},[value])
function getProjectList(p,s) {
- const url = `/users/${username}/projects.json`;
+ const url = `/${type || `users`}/${username}/projects.json`;
Axios.get(url,{
params:{
page:p,limit,is_public: "public",search:s,choosed
@@ -152,15 +152,16 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed , his
{
copyList && copyList.length >0 && copyList.map((i,k)=>{
return(
-
j === i.id).length===0)}>{i.author && i.author.name}/{i.name}
+
j === i.id).length===0)}>{i.author && `${i.author.name}/`}{i.name}
)
})
}
{
list && list.length > 0 && list.map((i,k)=>{
+ console.log(i);
let c = copyList && copyList.length >0 && copyList.filter(j=>j.id === i.id).length !== 0;
return(
- !c &&
j === i.id).length===0)}>{i.author && i.author.name}/{i.name}
+ !c &&
j === i.id).length===0)}>{i.author && `${i.author.name}/`}{i.name}
)
})
}
diff --git a/src/forge/users/GeneralView/ConcentrateProject.jsx b/src/forge/users/GeneralView/ConcentrateProject.jsx
index 9fe436ead..d68095040 100644
--- a/src/forge/users/GeneralView/ConcentrateProject.jsx
+++ b/src/forge/users/GeneralView/ConcentrateProject.jsx
@@ -3,8 +3,18 @@ import { FlexAJ , AlignCenter } from '../../Component/layout';
import { Link } from 'react-router-dom';
import axios from 'axios';
import Box from './ConcentrateBox';
+import './Index.scss';
-function ConcentrateProject({userLogin,current,showCompeleteDialog,completeProfile,history}) {
+function ConcentrateProject({
+ userLogin,
+ current,
+ showCompeleteDialog,
+ completeProfile,
+ history,
+ type,
+ title,
+ btn
+}) {
const [ list , setList ] = useState(undefined);
const [ visible , setVisible ] = useState(false);
const [ value , setValue ] = useState([]);
@@ -14,7 +24,7 @@ function ConcentrateProject({userLogin,current,showCompeleteDialog,completeProfi
},[])
function getList() {
- const url = `/users/${userLogin}/is_pinned_projects.json`;
+ const url = `/${type || `users`}/${userLogin}/is_pinned_projects.json`;
axios.get(url).then(result=>{
if(result && result.data){
let p = result.data.projects;
@@ -33,7 +43,7 @@ function ConcentrateProject({userLogin,current,showCompeleteDialog,completeProfi
if(is_pinned_project_ids && is_pinned_project_ids.length===0){
setValue([]);
}
- const url = `/users/${userLogin}/is_pinned_projects/pin.json`;
+ const url = `/${type || `users`}/${userLogin}/is_pinned_projects/pin.json`;
axios.post(url,{
is_pinned_project_ids
}).then(result=>{
@@ -54,14 +64,21 @@ function ConcentrateProject({userLogin,current,showCompeleteDialog,completeProfi
completeProfile={completeProfile}
showCompeleteDialog={showCompeleteDialog}
history={history}
+ type={type}
/>
- {
- list && list.length>0 &&
- 精选项目
- { current && setVisible(true)}>自定义精选项目 }
+ {
+ title || 精选项目
+ }
+ { current &&
+ setVisible(true)}>
+ {btn || "自定义精选项目"}
+
+ }
+ {
+ list && list.length>0 &&
{
@@ -71,12 +88,12 @@ function ConcentrateProject({userLogin,current,showCompeleteDialog,completeProfi
{i.name}
{i.description}
{/* 项目标签 */}
- {i.topics &&
+ {i.topics &&
{i.topics.map(item=>{item.name})}
}
{ i.category && {i.category.name} }
- {i.watchers_count}
+ {i.watchers_count}
{i.forked_count}
@@ -85,8 +102,8 @@ function ConcentrateProject({userLogin,current,showCompeleteDialog,completeProfi
}
}
+
{
list && list.length === 0 && current &&
}
diff --git a/src/forge/users/GeneralView/Index.scss b/src/forge/users/GeneralView/Index.scss
index 5615c22af..5a3879e91 100644
--- a/src/forge/users/GeneralView/Index.scss
+++ b/src/forge/users/GeneralView/Index.scss
@@ -18,14 +18,16 @@
}
.name{
font-size: 16px;
- // color: #4CACFF;
color: $primary-color;
+ height: 20px;
+ line-height: 20px;
&:hover{
color: $primary-color-hover;
}
}
.desc{
color: #999;
+ line-height: 21px;
}
.tagName{
display: block;
@@ -36,6 +38,7 @@
height: 22px;
line-height: 22px;
font-size: 13px;
+ margin-right: 20px;
}
.pariseCount,.forkCount{
i{
@@ -43,7 +46,7 @@
margin-right: 4px;
}
color: #999;
- margin-left: 20px;
+ margin-right: 20px;
}
}
}
@@ -152,13 +155,13 @@
display: flex;
flex-wrap: wrap;
.viewProListTopic{
- background-color:#f3f8ff;
+ background-color:rgba(70, 106, 255, 0.12);
border-radius: 4px;
max-width: 158px;
padding: 0 10px;
height: 24px;
line-height: 24px;
- color: #4c5b76;
+ color:#466aff;
margin-bottom: 5px !important;
}
}
\ No newline at end of file