-
{
firstSync ? "" :
- +
{project && project.author &&
-
+
{project.author.name}
}
/
- {project && project.name}
+ {project && project.name}
{
projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
+ {/*
*/}
+
{watched ? '取消关注' : '关注'}
-
+
{watchers_count}
this.pariseFunc(praised)}>
-
+ {/*
*/}
+
{praised ? '取消点赞' : '点赞'}
-
+
{praises_count}
-
Fork
+ Fork
{forked_count}
@@ -465,24 +473,33 @@ class Detail extends Component {
+
@@ -522,6 +543,12 @@ class Detail extends Component {
:
+ {/* 主页 */}
+ (
{/* 工作流 */}
{
- const { page, limit, search, sort, project_type, category_id } = this.state;
- this.getListData(page, limit, search, sort, project_type, category_id);
+ const { page, limit, search, sort, project_type, category_id , languageId } = this.state;
+ this.getListData(page, limit, search, sort, project_type, category_id , languageId);
this.getType();
this.getCategory();
+
+ this.getRecommand();
+
+ this.getLanguage();
+ }
+
+ // 获取语言列表
+ getLanguage=()=>{
+ const url = '/project_languages.json';
+ axios.get(url).then(result=>{
+ if(result){
+ this.setState({
+ languageList:result.data.project_languages
+ })
+ }
+ }).catch(error=>{})
+ }
+ // 获取推荐列表
+ getRecommand=()=>{
+ const url = `/projects/recommend.json`;
+ axios.get(url).then(result=>{
+ if(result){
+ this.setState({
+ recommendList:result.data
+ })
+ }
+ }).catch(error=>{})
}
// 获取列表
- getListData = (page, limit, search, sort, project_type, category_id) => {
+ getListData = (page, limit, search, sort, project_type, category_id,languageId) => {
const { current_user } = this.props;
const url = `/projects.json`;
axios.get(url, {
@@ -51,7 +84,8 @@ class Index extends Component {
search,
sort_by: sort,
project_type,
- category_id
+ category_id,
+ language_id:languageId
}
}).then((result) => {
if (result) {
@@ -97,8 +131,8 @@ class Index extends Component {
search: undefined
})
this.setTypeList(list, type)
- const { page, limit, sort, category_id } = this.state;
- this.getListData(page, limit, undefined, sort, type, category_id);
+ const { page, limit, sort, category_id , languageId } = this.state;
+ this.getListData(page, limit, undefined, sort, type, category_id , languageId);
}
// 获取类型
@@ -133,8 +167,8 @@ class Index extends Component {
page: 1
});
this.setCategoryList(list, id)
- const { limit, sort, project_type } = this.state;
- this.getListData(1, limit, undefined, sort, project_type, id);
+ const { limit, sort, project_type , languageId } = this.state;
+ this.getListData(1, limit, undefined, sort, project_type, id , languageId);
}
// 排序
@@ -145,8 +179,8 @@ class Index extends Component {
search: undefined,
isSpin: true
})
- const { limit, project_type, category_id } = this.state;
- this.getListData(1, limit, undefined, e.key, project_type, category_id);
+ const { limit, project_type, category_id , languageId } = this.state;
+ this.getListData(1, limit, undefined, e.key, project_type, category_id , languageId);
}
// 搜索
@@ -158,8 +192,8 @@ class Index extends Component {
project_type: undefined,
sort: "updated_on"
})
- const { limit, sort, category_id } = this.state;
- this.getListData(1, limit, value, sort, undefined, category_id);
+ // const { limit, sort, category_id , languageId } = this.state;
+ // this.getListData(1, limit, value, sort, undefined, category_id , languageId);
}
changeSearchValue = (e) => {
this.setState({
@@ -171,8 +205,22 @@ class Index extends Component {
this.setState({
page
})
- const { limit, search, sort, project_type, category_id } = this.state;
- this.getListData(page, limit, search, sort, project_type, category_id);
+ const { limit, search, sort, project_type, category_id , languageId } = this.state;
+ this.getListData(page, limit, search, sort, project_type, category_id , languageId);
+ }
+
+ getoDetail=(login,identifier)=>{
+ this.props.history.push(`/projects/${login}/${identifier}/about`);
+ }
+
+ // 选择语言类别
+ changeLanguage=(e)=>{
+ this.setState({
+ isSpin:true,
+ languageId:e === 0 ?undefined:e
+ })
+ const { page, limit, sort , project_type , category_id } = this.state;
+ this.getListData(page, limit, undefined, sort, project_type, category_id ,e === 0 ?undefined:e);
}
render() {
@@ -192,7 +240,8 @@ class Index extends Component {
)
- const { projectsList, isSpin, total, search, limit, page, typeList, categoryList } = this.state;
+ const { projectsList , recommendList , languageList , languageId ,
+ isSpin, total, search, limit, page, typeList, categoryList } = this.state;
const pagination = (
total && total > limit ?
@@ -205,6 +254,29 @@ class Index extends Component {
-
+
- + + + 主页 + +
-
-
代码库 + + 代码库
-
-
任务 - {projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} : ""} + + 任务 + {projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} : ""}
{
projectDetail && parseInt(projectDetail.type) !== 2 &&
-
-
合并请求 + + 合并请求 {projectDetail && projectDetail.pull_requests_count ? {projectDetail.pull_requests_count} : ""}
@@ -495,18 +512,22 @@ class Detail extends Component {
-
-
里程碑 + + 里程碑 {projectDetail && projectDetail.versions_count ? {projectDetail.versions_count} :""}
-
-
动态 + + 动态
{
isManager &&
- - 0 ? "active" : ""}>
仓库设置
+ - 0 ? "active" : ""}> + 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}> + 仓库设置 }
+ {
+ recommendList.map((item,key)=>{
+ return(
+
+ }
+
this.getoDetail(item.author && item.author.login,item.identifier)}>
+
+ )
+ })
+ }
+
+ 
+
+
+ {item.author && item.author.name}
+{item.name}
+
+ {item.visits}
+ 项目类型：{item.category && item.category.name}
+
+ -
@@ -219,15 +291,35 @@ class Index extends Component {
-
+
+
{
current_user && current_user.login &&
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
new file mode 100644
index 00000000..a14b9070
--- /dev/null
+++ b/src/forge/Main/Index.scss
@@ -0,0 +1,73 @@
+/* recommandProjects */
+.recommandProjects{
+ display: flex;
+ max-width: 1200px;
+ margin:20px auto;
+}
+.recommandProjects >div{
+ background-color: #fff;
+ border-radius: 10px;
+ width: 220px;
+ margin-right: 25px;
+ cursor: pointer;
+ &:last-child{
+ margin-right: 0px;
+ }
+}
+.recommandProjects > div:hover{
+ box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.1);
+}
+.recommandProjects > div .mainInfo{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ min-height: 160px;
+ border-bottom: 1px solid #eee;
+ padding:20px;
+ box-sizing: border-box;
+ img{
+ height: 50px;
+ width:50px;
+ border-radius: 50%;
+ }
+ .name{
+ font-size: 16px;
+ color: #333;
+ height: 20px;
+ line-height: 20px;
+ margin-top:12px;
+ }
+ .school{
+ color: #888;
+ height: 18px;
+ line-height: 18px;
+ margin-top:12px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ max-width:100%;
+ }
+}
+.recommandProjects{
+ .baseInfo{
+ padding:18px 15px;
+ display: flex;
+ font-size: 12px;
+ color:#888;
+ .look{
+ i{
+ margin-right: 5px;
+ }
+ margin-right: 10px;
+ }
+ .type{
+ flex:1;
+ width:0;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ text-align: center;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index 1195ebbb..614cd412 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -25,7 +25,7 @@ class IndexItem extends Component {
-
+
{item.author.name}/{item.name}
{
item.forked_from_project_id ?
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index d4de3c40..2e73bdc1 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -69,6 +69,7 @@
color: #fff!important;
}
+
/* 列表 */
.project-list{
padding:0px 30px;
@@ -207,9 +208,9 @@
}
/* -----------详情------------ */
.detailHeader-wrapper{
- background:linear-gradient(82deg,rgba(82,91,215,1) 0%,rgba(34,24,171,1) 100%);
- background: url(../Images/forgeBanner.jpg) no-repeat center;
- background-size:cover;
+ background-color:#FAFBFC;
+ /* background: url(../Images/forgeBanner.jpg) no-repeat center; */
+ /* background-size:cover; */
}
.headerMenu-wrapper{
font-size: 16px;
@@ -217,14 +218,14 @@
flex-direction: row;
}
.headerMenu-wrapper li{
- padding:0px 18px;
position: relative;
text-align: center;
- height: 30px;
- line-height: 30px;
+ height: 40px;
+ line-height: 28px;
+ margin-right: 25px;
}
.headerMenu-wrapper li a{
- color: #fff;
+ color: #666;
display: flex;
align-items: center;
}
@@ -232,24 +233,26 @@
margin-right: 8px;
}
.headerMenu-wrapper li a > span{
- background-color: #676AF1;
height: 18px;
line-height: 18px;
- border-radius: 10px;
- display: block;
- padding:0px 6px;
- margin-left: 5px;
- font-size: 11px;
+ margin-left: 8px;
+ font-size: 12px;
+ color: #2878FF;
}
-.headerMenu-wrapper li.active{
- border-radius: 15px;
- border:1px solid #71A6FF;
+.headerMenu-wrapper li.active::after{
+ position: absolute;
+ bottom:0px;
+ height:2px;
+ background-color: #5091FF;
+ content:'';
+ left: 0px;
+ width:100%;
}
.detail_tag_btn{
height:26px;
line-height: 26px;
border-radius:5px;
- border:1px solid #71A6FF;
+ border:1px solid #f1f1f1;
display: flex;
align-items: center;
margin-left: 30px
@@ -261,21 +264,17 @@
padding:0px 10px;
display: flex;
align-items: center;
- color: #fff;
+ color: #666;
}
.detail_tag_btn_name img{
margin-right: 10px;
}
.detail_tag_btn_count{
padding:0px 10px;
- color: #fff !important;
- background: rgba(255,255,255,0.2);
+ background: #fff;
border-radius: 0px 4px 4px 0px;
font-size: 12px;
-}
-.detail_tag_btn_count:hover{
- /* color: #1C91FF !important; */
- background: rgba(255,255,255,0.5);
+ height:100%;
}
.files-md{
border:1px solid #eee;
diff --git a/src/forge/Order/index.scss b/src/forge/Order/index.scss
index d57ae499..9576503b 100644
--- a/src/forge/Order/index.scss
+++ b/src/forge/Order/index.scss
@@ -4,6 +4,12 @@
padding-left: 20px;
box-sizing: border-box;
}
+.attachment-list-div:hover {
+ background-color: #e6f7ff;
+}
+.attachment-list-div:hover .attachment-list-delete {
+ display: block !important;
+}
.searchBanner{
display: flex;
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css
index 6aa1912b..b0fe49fd 100644
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@@ -561,12 +561,6 @@ a.issue-type-button.active:hover {
.attachment-list-delete {
display: none;
}
-.attachment-list-div:hover {
- background-color: #e6f7ff;
-}
-.attachment-list-div:hover .attachment-list-delete {
- display: block !important;
-}
.attachment-list-a {
color: rgba(0, 0, 0, 0.65) !important;
}
diff --git a/src/forge/Upload/Index.js b/src/forge/Upload/Index.js
index f366d5da..46f05b7e 100644
--- a/src/forge/Upload/Index.js
+++ b/src/forge/Upload/Index.js
@@ -11,6 +11,20 @@ class Index extends Component {
fileList: undefined,
}
}
+ componentDidMount=()=>{
+ this.checkInitFile();
+ }
+ componentDidUpdate=(prevProps)=>{
+ if(prevProps && prevProps.fileList !== this.props.fileList){
+ this.checkInitFile();
+ }
+ }
+ checkInitFile=()=>{
+ const { fileList } = this.props;
+ if(fileList && fileList.length>0){
+ this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });
+ }
+ }
onAttachmentRemove = (file) => {
if (!file.percent || file.percent === 100) {
diff --git a/src/forge/Upload/attachment.js b/src/forge/Upload/attachment.js
index 78e9871c..9918363d 100644
--- a/src/forge/Upload/attachment.js
+++ b/src/forge/Upload/attachment.js
@@ -119,8 +119,9 @@ class Attachment extends Component {
Deleted.length > 0 && Deleted.indexOf(item.id) !== -1
? "none"
: "block",
+ padding:"4px"
}}
- className="pd510 attachment-list-div"
+ className="attachment-list-div"
>
{this.is_video(item.title) ? (