- this.changeType(`${item.project_type}`, `${item.id}`)}>
- // {item.name}
- // {item.projects_count}
- //
- // )
- // })
- // })
}
}).catch((error)=>{})
}
@@ -86,9 +79,11 @@ class Index extends Component{
this.setState({
typeList:list.map((item)=>{
return(
- this.changeType(`${item.project_type}`, list)}>
- {item.name}
- {item.projects_count}
+ this.changeType(`${item.project_type}`, list)}>
+
)
})
@@ -122,9 +117,11 @@ class Index extends Component{
this.setState({
categoryList:list.map((item)=>{
return(
- this.changeCategory(`${item.id}`,list)}>
- {item.name}
- {item.projects_count}
+ this.changeCategory(`${item.id}`,list)}>
+
)
})
@@ -217,9 +214,21 @@ class Index extends Component{
{ categoryList }
-
-
diff --git a/public/react/src/forge/Main/Index.js b/public/react/src/forge/Main/Index.js
index 8b2e4cf3c..869805ad9 100644
--- a/public/react/src/forge/Main/Index.js
+++ b/public/react/src/forge/Main/Index.js
@@ -8,8 +8,11 @@ import './list.css';
import ListItem from './IndexItem'
import axios from 'axios';
+import img_new from '../Images/new.png';
+import img_array from '../Images/array.png';
+
const Search = Input.Search;
-const { SubMenu } = Menu;
+
class Index extends Component{
constructor(props){
super(props);
@@ -68,16 +71,6 @@ class Index extends Component{
axios.get(url).then((result)=>{
if(result && result.data){
this.setTypeList(result.data, undefined)
- // this.setState({
- // typeList:result.data && result.data.map((item,key)=>{
- // return(
- // {projectDetail && projectDetail.author && projectDetail.author.name} / { projectDetail && projectDetail.identifier }
- - - - this.focusFunc(projectDetail && projectDetail.watched)}> - - {projectDetail && projectDetail.watched ? '取消关注':'关注'} - - {watchers_count} - - - this.pariseFunc(projectDetail && projectDetail.praised)}> - - {projectDetail && projectDetail.praised ? '取消点赞':'点赞'} - - {praises_count} +
+
+
+ + {projectDetail && projectDetail.author && projectDetail.author.name} + | + { projectDetail && projectDetail.identifier } +
+
+ 
+ {projectDetail && projectDetail.watched ? '取消关注':'关注'}
+
+ {watchers_count}
+
+
+ this.pariseFunc(projectDetail && projectDetail.praised)}>
+
+ {projectDetail && projectDetail.praised ? '取消点赞':'点赞'}
+
+ {praises_count}
+
+
+
+ 
Fork
+ {forked_count}
+
-
- Fork
- {forked_count}
-
-
-
- -
+
- 0 || urlFlag)? "active" : ""}>
代码
+ - 0 ? "active" : ""}>
工单{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""}
+ - 0 ? "active" : ""}>
合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""}
+ - 0 ? "active" : ""}>
版本发布
+ - 0 ? "active" : ""}>
动态
+ {
+ isManager &&
+ - 0 ? "active" : ""}>仓库设置 + } +
- 0 ? "active" : ""}>仓库设置 +
-
-
-
- 0 || urlFlag)? "active" : ""}>代码 -
- 0 ? "active" : ""}>工单{projectDetail&&projectDetail.issues_count===0?"":projectDetail&&projectDetail.issues_count===0?projectDetail.issues_count:""} -
- 0 ? "active" : ""}>合并请求{projectDetail&&projectDetail.pull_requests_count===0?"":projectDetail&&projectDetail.pull_requests_count===0?projectDetail.pull_requests_count:""} -
- 0 ? "active" : ""}>版本发布 -
- 0 ? "active" : ""}>动态 - { - isManager && -
- 0 ? "active" : ""}>仓库设置 - } -
- 0 ? "active" : ""}>仓库设置 -
+ {item.name} + {item.projects_count} +
+ {item.name} + {item.projects_count} +
+
diff --git a/public/react/src/forge/Main/list.css b/public/react/src/forge/Main/list.css
index e17397862..d28b36a00 100644
--- a/public/react/src/forge/Main/list.css
+++ b/public/react/src/forge/Main/list.css
@@ -3,8 +3,8 @@ body,#root{
}
.lineH2{line-height:2}
.t_project_banner {
- background: url(../../images/forge/project.jpg) no-repeat top center;
height: 260px;
+ background: url(../Images/banner_list.png) no-repeat center;
background-color: #050d34;
}
.ProjectListIndex{
@@ -30,30 +30,43 @@ body,#root{
margin-bottom: 20px;
}
.list-l-Menu>li{
- height: 40px;
- line-height: 40px;
font-size: 1rem;
padding:0px 20px;
box-sizing: border-box;
color: #333;
+ position: relative;
+}
+.list-l-Menu>li > p{
+ height: 50px;
+ line-height: 50px;
+ width: 100%;
+ border-bottom: 1px solid #eee;
display: flex;
justify-content: space-between;
cursor: pointer;
}
-.list-l-Menu li span:last-child{
+.list-l-Menu>li:last-child > p{
+ border-bottom: none;
+}
+.list-l-Menu li p span:last-child{
color: #999;
}
.list-l-Menu .MenuTitle{
- background-color: #efefef;
- border-radius: 4px 4px 0px 0px;
font-size: 16px;
+ background:url(../Images/dir.png) no-repeat;
+ background-size: 100% 100%;
+ color: #fff!important;
+ height: 50px;
+ line-height: 50px;
}
-.list-l-Menu > li:not(.MenuTitle):hover{
- background-color: #1890ff;
+.list-l-Menu:nth-child(2) .MenuTitle{
+ background:url(../Images/type.png) no-repeat;
+ background-size: 100% 100%;
}
-.list-l-Menu > li:not(.MenuTitle):hover span{
- color: #fff;
+.list-l-Menu > li:not(.MenuTitle):hover{
+ background-color: #ECF6FF;
}
+
/* 左侧menu */
.list-l-Menu .ant-menu-inline{
border:none;
@@ -64,17 +77,27 @@ body,#root{
.list-l-Menu .ant-menu-item-group-title{
padding:0px;
}
-
+.list-l-Menu li.active::before{
+ position: absolute;
+ left: 0px;
+ top: 8px;
+ width: 2px;
+ content: '';
+ height: 34px;
+ background: #4CACFF;
+}
.list-r-operation{
display: flex;
justify-content: space-between;
flex-wrap: wrap;
align-items: center;
- padding:15px 0px 25px;
+ padding:25px 0px;
}
.list-r-Search{
width: 400px;
- margin-right: 20px;
+}
+.padding0-25{
+ padding:0px 25px;
}
.list-r-Search .ant-btn-lg{
height: 38px;
@@ -94,7 +117,14 @@ body,#root{
.p-r-Item{
display: flex;
padding:15px 0px;
- border-top: 1px solid #eee;
+ box-shadow:0px 2px 20px 0px rgba(0,0,0,0.05);
+ border-radius:2px;
+ border:1px solid rgba(238,238,238,1);
+ margin-bottom: 15px;
+ padding:20px;
+}
+.boxShandow{
+ box-shadow:0px 2px 20px 10px rgba(0,0,0,0.03);
}
.p-r-photo{
width: 42px;
@@ -151,15 +181,19 @@ body,#root{
}
.p-r-tags > span{
margin-left: 15px;
- border-radius: 4px;
- border:1px solid #efefef;
- background: #e2f0fd;
+ padding:0px 10px;
+ border-radius:15px;
+ background: #EBF4FE;
+ color: #333;
height: 24px;
line-height: 24px;
display: block;
font-size: 12px;
display: flex;
}
+.p-r-tags > span.pariseTag{
+ background: #FFF3DC;
+}
.p-r-tags.large > span >label{
padding:0px 12px;
}
@@ -169,6 +203,12 @@ body,#root{
.p-r-tags.large > span >span{
padding:0px 6px;
}
+.pariseImg{
+ width: 14px;
+ height: 12px;
+ margin-top: 6px;
+ margin-right: 3px;
+}
.p-r-tags > span >span{
display: block;
background: #fff;
@@ -180,6 +220,7 @@ body,#root{
.p-r-content{
margin-top:10px;
color: #666;
+ display: flex;
}
.p-r-detail > span{
margin-right: 15px;
@@ -199,28 +240,57 @@ body,#root{
/* -----------详情------------ */
.detailHeader-wrapper{
- background: #f7f7f7;
- padding-top:20px;
- border-bottom: 1px solid rgba(34,36,38,.15);
+ background:url(../Images/banner_sub.png) no-repeat center;
+ background-size: 100% 100%;
+ height: 120px;
}
.headerMenu-wrapper{
- background: #f7f7f7;
font-size: 16px;
display: flex;
flex-direction: row;
- color: #999;
}
.headerMenu-wrapper li{
- padding:6px 14px;
+ padding:0px 18px;
position: relative;
- text-align: center
+ text-align: center;
+ height: 30px;
+ line-height: 30px;
+}
+.headerMenu-wrapper li a{
+ color: #fff;
+ display: flex;
+ align-items: center;
+}
+.headerMenu-wrapper li a > img{
+ margin-right: 5px;
}
.headerMenu-wrapper li.active{
- background: #fff;
- margin-bottom: -1px;
- border:1px solid rgba(34,36,38,.15);
- border-bottom: none;
- border-radius: 4px 4px 0px 0px;
+ background:linear-gradient(180deg,rgba(58,194,255,1) 0%,rgba(27,143,255,1) 100%);
+ border-radius: 15px;
+}
+.detail_tag_btn{
+ height:30px;
+ line-height: 30px;
+ border-radius:4px;
+ border:1px solid rgba(28,145,255,1);
+ display: flex;
+ align-items: center;
+ margin-left: 30px
+}
+.detail_tag_btn_name{
+ padding:0px 10px;
+ display: flex;
+ align-items: center;
+ color: #fff;
+}
+.detail_tag_btn_name img{
+ margin-right: 3px;
+}
+.detail_tag_btn_count{
+ padding:0px 10px;
+ color: #fff;
+ background: #1C91FF;
+ border-radius: 0px 4px 4px 0px;
}
/* 详情-代码 */
.branch-wrapper{
diff --git a/public/react/src/forge/Settings/Collaborator.js b/public/react/src/forge/Settings/Collaborator.js
index c8602ea97..0691645c6 100644
--- a/public/react/src/forge/Settings/Collaborator.js
+++ b/public/react/src/forge/Settings/Collaborator.js
@@ -1,6 +1,6 @@
import React , { Component } from 'react';
import { Link } from 'react-router-dom';
-import { Input , AutoComplete , Dropdown , Menu , Icon , Spin } from 'antd';
+import { Input , AutoComplete , Dropdown , Menu , Icon , Spin , Pagination } from 'antd';
import axios from 'axios';
const { Option } = AutoComplete;
@@ -24,25 +24,27 @@ class Collaborator extends Component{
user_id:undefined,
userDataSource:undefined,
page:1,
+ total_count:undefined,
isSpin:true
}
}
componentDidMount=()=>{
if(this.props.project_id){
- this.getMember(this.props.project_id);
+ const { page } = this.state;
+ this.getMember(this.props.project_id,page);
}
}
componentDidUpdate=(prevState)=>{
if(this.props.project_id && this.props.project_id !== prevState.project_id){
- this.getMember(this.props.project_id);
+ const { page } = this.state;
+ this.getMember(this.props.project_id,page);
}
}
// 获取项目协作者
- getMember=(project_id)=>{
- const { page } = this.state;
+ getMember=(project_id,page)=>{
const url = `/projects/${project_id}/members.json`;
axios.get(url,{
params:{
@@ -52,7 +54,8 @@ class Collaborator extends Component{
if(result){
this.setState({
listData:result.data.members,
- isSpin:false
+ isSpin:false,
+ total_count:result.data.total_count
})
}
}).catch(error=>{
@@ -108,7 +111,7 @@ class Collaborator extends Component{
// 修改权限
changeOperaiton=(e,id)=>{
- const { project_id } = this.props;
+ const { project_id , page } = this.props;
this.setState({
isSpin:true
})
@@ -122,7 +125,7 @@ class Collaborator extends Component{
isSpin:true
})
this.props.showNotification('权限修改成功!');
- this.getMember(project_id);
+ this.getMember(project_id,page);
}
}).catch(error=>{
console.log(error);
@@ -131,6 +134,7 @@ class Collaborator extends Component{
// 删除协作者
deleteUser=(id)=>{
+ const { page } = this.state;
this.props.confirm({
content:"确认将此成员从项目中移除？",
onOk:()=>{
@@ -144,7 +148,7 @@ class Collaborator extends Component{
isSpin:true
})
this.props.showNotification("成员删除成功！");
- this.getMember(project_id);
+ this.getMember(project_id,page);
}
}).catch(error=>{
console.log(error);
@@ -152,8 +156,15 @@ class Collaborator extends Component{
}
})
}
+ changePage=(page)=>{
+ this.setState({
+ page
+ })
+ const { project_id } = this.props;
+ this.getMember(project_id,page);
+ }
render(){
- const { userDataSource , listData , isSpin } = this.state;
+ const { userDataSource , listData , isSpin , page , total_count } = this.state;
// 获取当前项目的拥有者
const { author } = this.props;
const menu =(id)=> (
@@ -223,7 +234,13 @@ class Collaborator extends Component{
增加协作者
{item.name}
+
+
+
+ 
点赞 ({ item.praises_count })
{ item.language && item.language.id ? :"" }
- {item.description}
- { item.forked_count ? { item.forked_count}:"" } - { item.praises_count } + {/* { item.forked_count ? { item.forked_count}:"" } */} +
-
{item.description}
-
{item.visits}
{ item.category && item.category.id && {item.category.name}}
+ {item.last_update_time ? {item.time_ago} : "" }
- {item.last_update_time ? 更新于{item.time_ago} : "" }