+ {contentTitle &&
+ {contentTitle}
} +{content}
+{content}
+
+
+ {total > 10 && (!pagination) &&
+
+
+ )
+}
diff --git a/src/components/pagination-table/index.scss b/src/components/pagination-table/index.scss
new file mode 100644
index 000000000..64edaae7a
--- /dev/null
+++ b/src/components/pagination-table/index.scss
@@ -0,0 +1,38 @@
+.pagination-table {
+ margin-top: 1rem;
+ padding: 1.5rem;
+ background-color: #ffffff;
+ box-shadow:0px 0px 10px rgba(88, 116, 255, 0.18);
+ .ant-table {
+ border-radius: 0 0 4px 4px;
+ tr > td{
+ border-bottom: none;
+ border-top: 1px solid #e2e6f5;
+ }
+ tr:first-child > td{border-top: none;}
+ tr:last-child > td{border-bottom: 1px solid #e2e6f5;}
+ .ant-table-expanded-row td{border-top: none;}
+ }
+ .ant-table-thead tr th div {
+ color: #181818;
+ font-weight: 500;
+ }
+ .ant-table-wrapper {
+ ::-webkit-scrollbar {
+ width: 5px;
+ height: 5px;
+ }
+ .ant-table-hide-scrollbar {
+ margin-bottom: -5px;
+ overflow-y: hidden !important;
+ ::-webkit-scrollbar {
+ width: 5px;
+ height: 5px;
+ }
+ }
+ }
+ .ant-pagination {
+ margin: 2rem 1.5rem;
+ text-align: right;
+ }
+}
diff --git a/src/components/uploadImg.jsx b/src/components/uploadImg.jsx
new file mode 100644
index 000000000..47ea7800e
--- /dev/null
+++ b/src/components/uploadImg.jsx
@@ -0,0 +1,46 @@
+import React, { forwardRef, useState } from 'react';
+import { Upload , Icon , message } from "antd";
+import { getUploadActionUrl } from 'educoder';
+let chromeSettingArray = JSON.parse(localStorage.getItem('chromesetting'));
+
+function UploadImage({ getImageId , imageId }){
+ // 上传前
+ function beforeUpload(file){
+ const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+ if (!isJpgOrPng) {
+ message.error('上传的图片只能是JPG或者PNG格式!');
+ }
+ const isLt2M = file.size / 1024 / 1024 < 2;
+ if (!isLt2M) {
+ message.error('上传的图片不能超过2MB!');
+ }
+ return isJpgOrPng && isLt2M;
+ }
+ // 上传完成后
+ function handleChange(info){
+ if(info && info.file && info.file.status === "done"){
+ getImageId(info.file.response.id);
+ }
+ }
+
+ return(
+
+
+ }
+ 点击上传
+ - {title} + {title} {rightBtn}
-
+ setVisible(true)}>加入项目
+ {/* 红山无资料要求限制，暂时注释 */}
+ {/* setVisible(true)}>加入项目 */}
+
)
}
diff --git a/src/forge/Images/explore1.png b/src/forge/Images/explore1.png
new file mode 100644
index 000000000..e87043ea8
Binary files /dev/null and b/src/forge/Images/explore1.png differ
diff --git a/src/forge/Images/explore10.png b/src/forge/Images/explore10.png
new file mode 100644
index 000000000..c9a342c06
Binary files /dev/null and b/src/forge/Images/explore10.png differ
diff --git a/src/forge/Images/explore2.png b/src/forge/Images/explore2.png
new file mode 100644
index 000000000..14c1e5531
Binary files /dev/null and b/src/forge/Images/explore2.png differ
diff --git a/src/forge/Images/explore3.png b/src/forge/Images/explore3.png
new file mode 100644
index 000000000..574c1244c
Binary files /dev/null and b/src/forge/Images/explore3.png differ
diff --git a/src/forge/Images/explore4.png b/src/forge/Images/explore4.png
new file mode 100644
index 000000000..3198ff2fa
Binary files /dev/null and b/src/forge/Images/explore4.png differ
diff --git a/src/forge/Images/explore5.png b/src/forge/Images/explore5.png
new file mode 100644
index 000000000..2919bba60
Binary files /dev/null and b/src/forge/Images/explore5.png differ
diff --git a/src/forge/Images/explore6.png b/src/forge/Images/explore6.png
new file mode 100644
index 000000000..5cece8565
Binary files /dev/null and b/src/forge/Images/explore6.png differ
diff --git a/src/forge/Images/explore7.png b/src/forge/Images/explore7.png
new file mode 100644
index 000000000..18df9c6bb
Binary files /dev/null and b/src/forge/Images/explore7.png differ
diff --git a/src/forge/Images/explore8.png b/src/forge/Images/explore8.png
new file mode 100644
index 000000000..c820795c6
Binary files /dev/null and b/src/forge/Images/explore8.png differ
diff --git a/src/forge/Images/explore9.png b/src/forge/Images/explore9.png
new file mode 100644
index 000000000..f1c2b190c
Binary files /dev/null and b/src/forge/Images/explore9.png differ
diff --git a/src/forge/Images/organizationBg1.png b/src/forge/Images/organizationBg1.png
new file mode 100644
index 000000000..c93c26e1c
Binary files /dev/null and b/src/forge/Images/organizationBg1.png differ
diff --git a/src/forge/Images/organizationBg2.png b/src/forge/Images/organizationBg2.png
new file mode 100644
index 000000000..5efbb1344
Binary files /dev/null and b/src/forge/Images/organizationBg2.png differ
diff --git a/src/forge/Images/organizationImg.png b/src/forge/Images/organizationImg.png
new file mode 100644
index 000000000..2e2ff802b
Binary files /dev/null and b/src/forge/Images/organizationImg.png differ
diff --git a/src/forge/Images/recommend1.png b/src/forge/Images/recommend1.png
new file mode 100644
index 000000000..e228026bf
Binary files /dev/null and b/src/forge/Images/recommend1.png differ
diff --git a/src/forge/Index.js b/src/forge/Index.js
index 562ee4478..0029e94a9 100644
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@@ -41,7 +41,7 @@ class Index extends Component {
return (
{desc}
{bottomInfos}
diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss
index da292d237..ca232dbae 100644
--- a/src/forge/Component/Component.scss
+++ b/src/forge/Component/Component.scss
@@ -16,15 +16,13 @@ li.ant-menu-item{
.cards{
display: flex;
align-items: center;
- padding:20px 34px;
+ padding:35px 30px;
background-color: #fff;
- margin-bottom:18px;
min-height: 130px;
- border:1px solid #eee;
.img{
margin-right: 20px;
- width: 190px;
- height: 90px;
+ width: 100px;
+ height: 100px;
border:1px solid rgba(238,238,238,1);
display: flex;
justify-content: center;
@@ -41,13 +39,16 @@ li.ant-menu-item{
.titles{
display: flex;
justify-content: space-between;
- margin-bottom: 10px!important;
+ margin-bottom: 15px!important;
align-items: center;
height: 22px;
- line-height: 22px;;
- &>a{
- font-size:18px ;
- color: #333;
+ line-height: 22px;
+ .organizationName{
+ color: #1e2941;
+ font-weight: 700;
+ }
+ .settingsLink{
+ color:#104fd9;
}
}
.desc{
@@ -56,7 +57,10 @@ li.ant-menu-item{
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
- line-height: 20px;
+ line-height: 1.5;
+ }
+ .bottomInfos{
+ color:#67738e;
}
}
}
diff --git a/src/forge/Component/NoticeModal/SystemNotice.jsx b/src/forge/Component/NoticeModal/SystemNotice.jsx
index 33871e8cc..29708e7f3 100644
--- a/src/forge/Component/NoticeModal/SystemNotice.jsx
+++ b/src/forge/Component/NoticeModal/SystemNotice.jsx
@@ -6,12 +6,21 @@ import RenderHtml from '../../../components/render-html';
import cookie from 'react-cookies';
// import axios from 'axios';
-function SystemNotice({showNotice,system_notification,history,login,hideSystemNotice}){
+function SystemNotice({showNotice,system_notification,history,login,hideSystemNotice,location}){
const [ visible , setVisible ] = useState(false);
useEffect(()=>{
if(system_notification && !cookie.load('notice_stage')){
- setVisible(true);
+ let pathname=history.location.pathname;
+ let isCompetition=pathname.indexOf('/competition/')>-1;
+ let openNotice=true;
+ // 非启智竞赛路由不展示启智通知
+ if(isCompetition&&system_notification.subject.indexOf('启智')&&!(pathname.indexOf('/competition/qz2022')>-1)){
+ openNotice=false;
+ }
+
+ openNotice&&setVisible(true);
}
+
},[system_notification,history.location])
// useEffect(()=>{
diff --git a/src/forge/GetData/getData.jsx b/src/forge/GetData/getData.jsx
index 2ecc3111b..785a475a9 100644
--- a/src/forge/GetData/getData.jsx
+++ b/src/forge/GetData/getData.jsx
@@ -5,7 +5,7 @@ export const getBranch = async (id,owner)=>{
}
// 获取标签列表
export const getTag = async (id,owner)=>{
- return (await axios.get(`/${owner}/${id}/tags.json`)).data;
+ return (await axios.get(`/${owner}/${id}/tags.json`,{params:{only_name:true}})).data.tags;
}
// 获取hooks（仓库设置-管理web钩子）列表
export const getHooks = async (id,params)=>{
diff --git a/src/forge/Head/AddProjectModal.jsx b/src/forge/Head/AddProjectModal.jsx
index 3fd88fec2..bdcb6aa44 100644
--- a/src/forge/Head/AddProjectModal.jsx
+++ b/src/forge/Head/AddProjectModal.jsx
@@ -1,7 +1,7 @@
import React, { useState , forwardRef, useEffect } from 'react';
-import { Form , Modal , Input , Radio } from 'antd';
+import { Form , Modal , Input , Radio ,Button} from 'antd';
import Axios from 'axios';
-import CheckProfile from '../Component/ProfileModal/Profile';
+// import CheckProfile from '../Component/ProfileModal/Profile';
function AddProjectModal(props){
const { getFieldDecorator, validateFields , setFieldsValue } = props && props.form;
const [ visible , setVisible ] = useState(false);
@@ -78,7 +78,9 @@ function AddProjectModal(props){
-
- {window.location.href.indexOf('osredm.jk') < 0&&
-
- urlLink(`/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件
+ urlLink(`/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>
+ 上传文件
+ {/* urlLink(`/${owner}/${projectsId}/${checkvalue}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件 */}
-
- urlLink(`/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件
+ urlLink(`/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件
+ {/* urlLink(`/${owner}/${projectsId}/${checkvalue}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件 */}
)
@@ -434,8 +435,8 @@ function CoderDepot(props){
{
{
- baseOperate &&
- urlLink(`/${owner}/${projectsId}/compare/master...${turnbar(branchName || defaultBranch)}`)} >+ 合并请求
+ baseOperate &&urlLink(`/${owner}/${projectsId}/compare/master...${turnbar(branchName || defaultBranch)}`)}>+ 合并请求
+ // urlLink(`/${owner}/${projectsId}/compare/master...${turnbar(branchName || defaultBranch)}`)} >+ 合并请求
}
+ 疑修
{/* {
diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx
index bb9bdd5b3..586f57fb7 100644
--- a/src/forge/Main/CoderDepotReadme.jsx
+++ b/src/forge/Main/CoderDepotReadme.jsx
@@ -11,8 +11,8 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
const [ content ,setContent ] = useState(undefined);
useEffect(()=>{
- if(readme && readme.content){
- setContent(readme.content);
+ if(readme && readme.replace_content){
+ setContent(readme.replace_content);
}else{
setContent(undefined);
}
diff --git a/src/forge/Main/CoderRootTag.js b/src/forge/Main/CoderRootTag.js
index 484836213..2d3a64776 100644
--- a/src/forge/Main/CoderRootTag.js
+++ b/src/forge/Main/CoderRootTag.js
@@ -14,10 +14,10 @@ export default (( props, { projectDetail }) => {
useEffect(() => {
if (projectsId) {
const url = `/${owner}/${projectsId}/tags.json`;
- axios.get(url).then((result) => {
- if (result) {
+ axios.get(url,{params:{page:1,limit:1000}}).then((result) => {
+ if (result.data) {
setSpin(false);
- setData(result.data);
+ setData(result.data.tags);
}
}).catch(error => {
console.log(error);
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index deca680c4..e2177f657 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -527,6 +527,17 @@ class Detail extends Component {
: ""
}
+ hideModal = () => {
+ this.setState({
+ visible: false
+ });
+ this.props.history.push('/projects');
+ }
+
+ sureModal = () => {
+ const { getListData } = this.props;
+ getListData && getListData(1);
+ }
render() {
const { projectDetail, watchers_count, praises_count,
@@ -550,7 +561,7 @@ class Detail extends Component {
}
return (
-
diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js
index 25b710b20..0edb19c79 100644
--- a/src/forge/Main/Index.js
+++ b/src/forge/Main/Index.js
@@ -11,7 +11,22 @@ import axios from 'axios';
import img_new from '../Images/new.png';
import img_array from '../Images/array.png';
import banner from '../Images/banner_list.png';
-import CheckProfile from '../Component/ProfileModal/Profile';
+// import CheckProfile from '../Component/ProfileModal/Profile';
+import Slider from 'react-slick';
+import left from './img/left.png';
+import right from './img/right.png';
+import explore1 from '../Images/explore1.png';
+import explore2 from '../Images/explore2.png';
+import explore3 from '../Images/explore3.png';
+import explore4 from '../Images/explore4.png';
+import explore5 from '../Images/explore5.png';
+import explore6 from '../Images/explore6.png';
+import explore7 from '../Images/explore7.png';
+import explore8 from '../Images/explore8.png';
+import explore9 from '../Images/explore9.png';
+import explore10 from '../Images/explore10.png';
+import { getImageUrl } from 'educoder';
+import { Link } from 'react-router-dom';
const Search = Input.Search;
@@ -27,18 +42,19 @@ class Index extends Component {
total: 0,
isSpin: true,
category_id: undefined,
-
typeList: undefined,
categoryList: undefined,
recommendList:undefined,
-
recommendOriList:undefined,
-
languageList:undefined,
languageId:undefined,
-
- CategoryList:undefined
-
+ CategoryList:undefined,
+ bannerList: undefined,
+ // 今日、本周热门项目
+ hotProjectTime: 7,
+ hotProjectList: undefined,
+ // 热门开发者
+ authorList: undefined
}
}
@@ -46,16 +62,53 @@ class Index extends Component {
componentDidMount = () => {
const { page,search, sort,category_id , languageId } = this.state;
this.getListData(page,search, sort,category_id , languageId);
-
this.getType();
-
this.getCategory();
-
// this.getRecommand();
-
this.getLanguage();
-
+ this.getBannerList();
// this.getRecommandOri();
+ this.getList(7);
+ this.getAuthorList();
+ }
+
+ // 获取热门开发者
+ getAuthorList = ()=>{
+ axios.get(`/user_rank.json`,{
+ params:{
+ time: 30
+ }
+ }).then(result=>{
+ if(result && result.data){
+ this.setState({authorList: result.data.users.slice(0,10)})
+ }
+ }).catch(error=>{})
+ }
+
+ // 获取热门项目
+ getList = (time) => {
+ const url = `/project_rank.json`;
+ axios.get(url,{
+ params:{
+ time
+ }
+ }).then(result=>{
+ if(result && result.data){
+ this.setState({hotProjectList: result.data.projects})
+ }
+ }).catch(error=>{})
+ }
+
+ // 获取banner图列表
+ getBannerList = ()=>{
+ const url = '/topics.json?topic_type=banner&limit=5';
+ axios.get(url).then(result=>{
+ if(result){
+ this.setState({
+ bannerList:result.data.topics
+ })
+ }
+ }).catch(error=>{})
}
// 获取语言列表
@@ -144,7 +197,7 @@ class Index extends Component {
this.changeType(`${item.id}`, list)}>
)
@@ -187,7 +240,7 @@ class Index extends Component {
this.changeCategory(`${item.id}`, list)}>
)
@@ -263,12 +316,12 @@ class Index extends Component {
newItem = ()=>{
return(
-
{item.name} - {item.projects_count} + {/* {item.projects_count} */}
{item.name} - {item.projects_count} + {/* {item.projects_count} */}
-
-
-
-
{this.props.history.push('/projects/deposit/new')}}>新建项目 +-
+
- {this.props.history.push('/projects/deposit/new')}}>新建项目
+ {/*
{this.props.history.push('/projects/deposit/new')}}>新建项目 */}
- -
-
{this.props.history.push('/projects/mirror/new')}}>导入项目 + - {this.props.history.push('/projects/mirror/new')}}>导入项目
+ {/*
{this.props.history.push('/projects/mirror/new')}}>导入项目 */}
--
- {/* { - recommendOriList && recommendOriList.length>0? --
- { - recommendOriList.map((i,k)=>{ - return( - - :"" - } */} - {/* { - recommendList && recommendList.length>0 && -5 ? "recommandProjects":"recommandProjects mb20"}> - { - recommendList.map((item,key)=>{ - return( - - } */} -this.getoDetail(item.author && item.author.login,item.identifier)}> -- ) - }) - } ----
{item.name}
-{item.author && item.author.name}
-- {item.visits} - {item.category && item.category.name} --- -- -+-
-
- {this.getType();this.changeType(undefined, this.state.typeList);}}> - - 语言 -
{typeList}--
-
- {this.getCategory();this.changeCategory(undefined, this.state.categoryList);}}> - 项目类别 - -
{categoryList}-+ {/* banner图 */} + {bannerList ? bannerList.length === 1 ? bannerList[0].url ?diff --git a/src/forge/Main/SpecialModal.jsx b/src/forge/Main/SpecialModal.jsx index dd1fab9e1..66b79ed36 100644 --- a/src/forge/Main/SpecialModal.jsx +++ b/src/forge/Main/SpecialModal.jsx @@ -37,7 +37,7 @@ function SpecialModal({ visible , hideModal , sureModal , showNotification , use } } return( -: +
+ {bannerList.map((item) => { + return item.url ? ( + + :+ + ) :
+- ) + ); } } export default Index; diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index 4ba8d2a3a..74104926c 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -524,3 +524,64 @@ } } +.projectBannerBox{ + .imgBox{ + max-height: 250px; + } + .slick-arrow{ + width: 70px; + height: 70px; + z-index: 2; + &::before{content: none;} + &.slick-prev{left: 50px;} + &.slick-next{right: 50px;} + } + .slick-dots{ + width: 1200px; + left: 50%; + margin-left: -600px; + bottom: 7%; + position: absolute; + display: flex!important; + justify-content: center; + z-index: 2; + li{ + background-color: rgba(225,225,225,0.5); + position: relative; + height: 3px; + width: 46px; + margin-right: 15px; + &::after{ + position: absolute; + left: 0px; + width: 0px; + top:0px; + height: 100%; + content: ""; + transition: 5.2s; + transition-property: width; + } + &.slick-active::after{ + background-color: #fff; + width: 100%; + } + button{ + position: absolute; + width: 100%; + height: 10px; + left:0px; + background-color: transparent!important; + border:none; + cursor: pointer; + color: transparent; + &::before{content: none;} + } + } + } +} +.newProject li{ + cursor: pointer; + &:hover{ + color: $primary-color; + } +} \ No newline at end of file diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index ac5eb23cd..9b6c57364 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -6,7 +6,6 @@ import { Link } from 'react-router-dom'; import '../css/index.scss'; import Nodata from '../Nodata'; import './list.scss'; -import img_parise from '../Images/parise.png'; import SpecialModal from './SpecialModal'; class IndexItem extends Component { @@ -73,11 +72,15 @@ class IndexItem extends Component { { item.platform === "educoder" ? -+ -+-
+
-
+
语言 +
+
{typeList}+-
+
-
+
项目类别 +
+
{categoryList}+++-} size="large" onSearch={this.searchFun} - className="list-r-Search" + className="list-r-Search searchBox" value={search} onChange={this.changeSearchValue} + allowClear /> - { - current_user && current_user.login && + {current_user && current_user.login && (- - - } + )} -新建 + + 新建
- - 排序 +
+ + 排序 - {this.pagination(total,limit,page)} + + {this.pagination(total, limit, page)} + {/* 帮助手册 */} + {window.location.href.indexOf('osredm.jk') < 0 &&+ +} + {/* 热门项目（本周/本月） */} ++ +
++ {/* 热门开发者 */} +++ {hotProjectList && hotProjectList.length > 0 && hotProjectList.map((i, index)=>{ + return{this.setState({hotProjectTime: 7}); this.getList(7)}}> +++ 本周热门 +
{this.setState({hotProjectTime: 30}); this.getList(30)}}> +++ 本月热门 +
++ })} ++ {i.owner && i.owner.name}/{i.name} + + {i.praises} + +++ {i.description ? i.description : "暂无项目简介"} ++++++开源贡献者TOP10 +
++ {authorList && authorList.length > 0 && authorList.map((i, index) =>{ + return排名+贡献者+总积分+++ })} +{index<3 ?+ +: index+1}
+ {i.name} + +
{i.score}++
+: -+}@@ -101,13 +104,13 @@ class IndexItem extends Component { :"" } */} - this.projectHref(`/${item.author.login}/${item.identifier}`, item.user_apply_signatures, item.id, item.is_secret, item.author.login, item.is_member)} className="hide-1 color-grey-3 font-18 task-hide fwt-500 " style={{ whiteSpace: "wrap", display: 'flex', width: 400 }}> + this.projectHref(`/${item.author.login}/${item.identifier}`, item.user_apply_signatures, item.id, item.is_secret, item.author.login, item.is_member)} className="hide-1 font-16 task-hide" style={{ whiteSpace: "wrap", flex: 1, color:'#232a39'}}> {item.author.name}/{item.name} { item.forked_from_project_id ? - - - +-+ + : "" } { @@ -123,19 +126,18 @@ class IndexItem extends Component { -赞 {item.praises_count} + 赞 {item.praises_count} - fork {item.forked_count} + fork {item.forked_count}
{item.description}
- +{item.description}
- - {item.last_update_time ? {item.time_ago} : ""} - {item.language && item.language.id ? {item.language.name} : ""} + + {item.last_update_time ? 更新于{item.time_ago} : ""} + {item.language && item.language.id ? {item.language.name} : ""}+ { !user_apply_signatures || (user_apply_signatures && user_apply_signatures.status !== "waiting") ? diff --git a/src/forge/Main/img/left.png b/src/forge/Main/img/left.png new file mode 100644 index 000000000..e51738608 Binary files /dev/null and b/src/forge/Main/img/left.png differ diff --git a/src/forge/Main/img/right.png b/src/forge/Main/img/right.png new file mode 100644 index 000000000..f5a134bd9 Binary files /dev/null and b/src/forge/Main/img/right.png differ diff --git a/src/forge/Main/list.scss b/src/forge/Main/list.scss index 69732aa6f..e3ceb825c 100644 --- a/src/forge/Main/list.scss +++ b/src/forge/Main/list.scss @@ -11,6 +11,110 @@ display: flex; align-items: flex-start; flex-wrap:wrap; + &.exploreBox{ + flex-wrap: nowrap; + .actionBtnBox{ + color: #2a3ee9; + display: inline-flex; + align-items: center; + &.top{ + position: relative; + top: -2px; + } + } + .searchBox .ant-input{ + padding-left: 16px; + height: 36px; + border: 1px solid #ffffff; + background-color: #f8fbff !important; + } + .searchBox .ant-input-search-button{ + height: 36px !important; + padding: 0 20px; + } + .helpText{ + height:100px; + background-image:linear-gradient(131.52deg,#2a3ee9 0%,#428cff 46.02%,#6479ff 100%); + border:2px solid #ffffff; + .helpImg1{ + width: 96%; + margin: 1.5% 2.1%; + } + } + .helpImg2{ + vertical-align: text-bottom; + } + .hotProjects{ + background-image:linear-gradient(180deg,#f4f5f8 0%,#fbfcfd 100%); + border:2px solid #ffffff; + } + .hotProjectsTitle{ + color: #000000; + height:50px; + line-height: 50px; + background-color:rgba(243, 250, 255, 0.74); + box-shadow:0px 2px 3px rgba(212, 217, 255, 0.57); + } + .oneItemTil{ + display: inline-block; + width: 158px; + text-align: center; + cursor: pointer; + } + .activeHot{ + color:#2a3ee9; + border-bottom: 1px solid #2a3ee9; + } + .hotProjectItem{ + padding-bottom: 16px; + margin: 20px 20px 16px; + border-bottom: 1px dashed #cccfd6; + .mInfos{ + display: flex; + align-items: center; + height: 20px; + color: #656977; + .name{ + flex:1; + color:#232a39; + } + } + .sInfos{ + background: #F7F8F9; + font-weight: 400; + color:#525561; + line-height: 24px; + word-break: break-all; + } + } + .hotProjectItem:last-child{ + border-bottom: none; + } + .hotAuthor{ + height: 50px; + display: flex; + align-items: center; + &.til{ + color:#989fab; + } + &.otherColor{ + background-color:rgba(238, 243, 251, 0.76); + } + &:not(.til):hover{ + background-color:rgba(225, 225, 225, 0.28); + } + } + .hotAuthor1{ + width: 90px; + text-align: center; + } + .hotAuthor2{ + flex: 1; + } + .hotAuthor3{ + width: 75px; + } + } } .list-left{ width: 26%; @@ -19,13 +123,10 @@ margin-bottom: 20px; } .affix-list-left{ - width: 26%; + width:200px; box-sizing: border-box; margin-bottom: 20px; } -.affix-list-content{ - padding-right:20px; -} .list-left > div{ border:1px solid #eee; } @@ -61,8 +162,7 @@ justify-content: space-between; flex-wrap: wrap; align-items: center; - padding:25px 30px; - border-bottom: 1px solid #E0E0E0; + padding: 15px 23px 0; } .list-r-Search{ width: 400px; @@ -100,23 +200,39 @@ } .p-r-Item{ display: flex; - border-bottom:1px solid rgba(238,238,238,1); - padding:22px 0px; justify-content: flex-start; + padding-top: 22px; } .boxShandow{ - box-shadow:0px 2px 20px 10px rgba(0,0,0,0.03); + flex: 1; + background-image:linear-gradient(180deg,#f3f5f8 0%,#ffffff 100%); + box-shadow:8px 6px 18px rgba(171, 202, 255, 0.24) inset; } .p-r-photo{ width: 60px; height: 60px; border-radius: 50%; - margin-right: 22px; - margin-top: 8px; + &.explore{ + background-color: white; + width: 32px; + height: 32px; + } +} +.recommendItemPng{ + background-image: url('../Images/recommend1.png'); + background-size: 100% 100%; + width: 50px; + height: 55px; + display: flex; + justify-content: center; + padding-top: 7px; + margin-left: -8px; } .p-r-Infos{ flex: 1; width: 0; + padding-bottom: 19px; + border-bottom: 1px dashed #cccfd6; } .p-r-name{ display: flex; @@ -166,16 +282,16 @@ margin-left: 15px; padding:0px 10px; border-radius:15px; - background: #EBF4FE; - color: #333; - height: 24px; - line-height: 24px; + background: #e3ebff; + color:#656977; + height: 28px; + line-height: 28px; display: block; font-size: 12px; display: flex; } .p-r-tags > span.pariseTag{ - background: #FFF3DC; + background: rgba(223, 115, 20, 0.08); } .p-r-tags.large > span >label{ padding:0px 12px; @@ -207,10 +323,7 @@ } .p-r-detail > span{ margin-right: 22px; - color: #888; -} -.p-r-detail > span > label{ - color: #999; + color:#9b9eaa; } .p-r-about{ @@ -218,7 +331,7 @@ justify-content: space-between; flex-wrap: nowrap; margin-top: 8px; - color: #666; + color:#9b9eaa; } .spincontent{ height:400px; diff --git a/src/forge/Main/tag/Index.jsx b/src/forge/Main/tag/Index.jsx index ff7648513..a80515aca 100644 --- a/src/forge/Main/tag/Index.jsx +++ b/src/forge/Main/tag/Index.jsx @@ -1,6 +1,6 @@ -import React,{ useEffect , useState } from 'react'; +import React, { useEffect, useState } from 'react'; import SubMenu from '../sub/SubMenu'; -import { Table , Tooltip , Spin } from 'antd'; +import { Table, Tooltip, Spin,Pagination } from 'antd'; import axios from 'axios'; import { Link } from 'react-router-dom'; import { truncateCommitId } from '../../common/util'; @@ -12,32 +12,41 @@ import moment from 'moment'; function Tags(props) { - const [ source , setSource ] = useState(undefined); - const [ isSpin , setIsSpin ] = useState(true); - - const { projectsId , owner } = props.match.params; + const [source, setSource] = useState(undefined); + const [isSpin, setIsSpin] = useState(true); + const [page, setPage] = useState(1); + const [total,setTotal] =useState(0); + const [limit,setLimit] =useState(10); + const { projectsId, owner } = props.match.params; useEffect(() => { if (projectsId) { + setIsSpin(true); const url = `/${owner}/${projectsId}/tags.json`; - axios.get(url).then((result) => { + axios.get(url, { + params: { + limit, + page: page + } + }).then((result) => { if (result) { - setSource(result.data); + setSource(result.data.tags); + setTotal(result.data.total_count); setIsSpin(false); } - }).catch(error => {}) + }).catch(error => { }) } - }, [owner, projectsId]); + }, [owner, projectsId,page]); - const columns=[ + const columns = [ { - title:"标签名", - dataIndex:"name", - key:1, - ellipsis:true, - width:"200px", - render:(txt,item)=>{ - return( + title: "标签名", + dataIndex: "name", + key: 1, + ellipsis: true, + width: "200px", + render: (txt, item) => { + return ({ data && data.user_admin_or_developer && -{item.name}@@ -45,11 +54,11 @@ function Tags(props) { } }, { - title:"创建时间", - dataIndex:"time_ago", - key:2, - ellipsis:true, - render:(txt,item)=>{ + title: "创建时间", + dataIndex: "time_ago", + key: 2, + ellipsis: true, + render: (txt, item) => { return ( { @@ -57,13 +66,13 @@ function Tags(props) {{ item.tagger.id ? - - } @@ -73,36 +82,36 @@ function Tags(props) { } }, { - title:"提交ID", - dataIndex:"id", - key:3, - ellipsis:true, - render:(txt,item)=>{ + title: "提交ID", + dataIndex: "id", + key: 3, + ellipsis: true, + render: (txt, item) => { return ( -- - : - -
- +
+ ) } }, { - title:"描述信息", - dataIndex:"message", - key:4, - ellipsis:true, - render:(txt,item)=>{ + title: "描述信息", + dataIndex: "message", + key: 4, + ellipsis: true, + render: (txt, item) => { return item.message || "--" } }, { - title:"下载", - dataIndex:"stage_type", - key:5, - ellipsis:true, - align:"center", - width:"204px", - render:(txt,item)=>{ + title: "下载", + dataIndex: "stage_type", + key: 5, + ellipsis: true, + align: "center", + width: "204px", + render: (txt, item) => { return (@@ -116,20 +125,36 @@ function Tags(props) { } } ] - return( + + + return ( -diff --git a/src/forge/Main/version/New.jsx b/src/forge/Main/version/New.jsx index b1d764af2..19132e69e 100644 --- a/src/forge/Main/version/New.jsx +++ b/src/forge/Main/version/New.jsx @@ -61,12 +61,12 @@ export default Form.create()( const url = `/${owner}/${projectsId}/tags.json`; axios .get(url,{params:{ - limit:1000 + page:1,limit:1000 }}) .then(result => { - if (result) { - setTagList(result.data); - setOptions(renderTagList(result.data)); + if (result.data) { + setTagList(result.data.tags); + setOptions(renderTagList(result.data.tags)); } }) .catch(error => { diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index 0f6f1ac81..b493360a9 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -1,5 +1,5 @@ import React, { Component } from "react"; -import { Input, Dropdown, Menu, Icon, Pagination, Spin } from "antd"; +import { Input, Dropdown, Menu, Icon, Pagination, Spin, Button } from "antd"; import "./merge.css"; import "../Order/order.css"; import "../Order/index.scss"; @@ -257,9 +257,10 @@ class merge extends Component {+ - { - source && source.length > 0 && -- } - { - source && source.length === 0 &&
- } + { + source && source.length > 0 && + record.id} + className="tagTable" + dataSource={source} columns={columns} pagination={false}>
+ } + {total > limit ? ( +++ ) : ( + "" + )} + { + source && source.length === 0 &&{setPage(e)}} + > ++ } this.checkOperation()}> - + 新建合并请求 - + + //this.checkOperation()}> + // + 新建合并请求 + // }diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js index 08cac8d69..0ab63dbb5 100644 --- a/src/forge/Newfile/UserSubmitComponent.js +++ b/src/forge/Newfile/UserSubmitComponent.js @@ -6,6 +6,7 @@ import "./index.css"; import { turnbar , returnbar } from 'educoder'; import axios from "axios"; +import { Base64 } from "js-base64"; const TextArea = Input.TextArea; class UserSubmitComponent extends Component { @@ -63,7 +64,7 @@ class UserSubmitComponent extends Component { filepath: filename ? filename : path, branch: returnbar(branch), new_branch: submitType === "1" ? values.branchname : undefined, - content, + content:editor_type === "upload" ? content : Base64.encode(content), message: values.desc, }) .then((result) => { diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index 48fc286ba..b4d073a39 100644 --- a/src/forge/Order/Milepost.js +++ b/src/forge/Order/Milepost.js @@ -4,7 +4,7 @@ import { Dropdown, Icon, Menu, Pagination, Typography, Popconfirm, Spin } from ' import NoneData from '../Nodata'; import axios from 'axios'; import './order.css'; -import CheckProfile from '../Component/ProfileModal/Profile'; +// import CheckProfile from '../Component/ProfileModal/Profile'; const { Text } = Typography; @@ -189,7 +189,8 @@ class Milepost extends Component { { data && data.user_admin_or_member ? -diff --git a/src/forge/Order/MilepostDetail.js b/src/forge/Order/MilepostDetail.js index 66322ae18..86b60b339 100644 --- a/src/forge/Order/MilepostDetail.js +++ b/src/forge/Order/MilepostDetail.js @@ -3,7 +3,7 @@ import { Link } from 'react-router-dom'; import { Dropdown, Menu, Icon, Pagination, Spin } from 'antd'; import './order.css'; import { FlexAJ } from '../Component/layout'; -import CheckProfile from '../Component/ProfileModal/Profile'; +// import CheckProfile from '../Component/ProfileModal/Profile'; import NoneData from '../Nodata'; import OrderItem from './OrderItem'; @@ -246,7 +246,8 @@ class MilepostDetail extends Component { } { current_user && current_user.login ? -{this.props.history.push(`/${owner}/${projectsId}/milestones/new`)}}>新的里程碑 + //{this.props.history.push(`/${owner}/${projectsId}/milestones/new`)}}>新的里程碑 + 新的里程碑 : '' }{this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建疑修 + //{this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建疑修 + 创建疑修 : 创建疑修 } diff --git a/src/forge/SecuritySetting/sub/New.jsx b/src/forge/SecuritySetting/sub/New.jsx index 409098e0b..cd2e20906 100644 --- a/src/forge/SecuritySetting/sub/New.jsx +++ b/src/forge/SecuritySetting/sub/New.jsx @@ -48,7 +48,7 @@ function New({ form , showNotification , history }) { {getFieldDecorator("key",{ rules:[{required:true,message:"请输入密钥"}] })( - + )} diff --git a/src/forge/Settings/Collaborator.js b/src/forge/Settings/Collaborator.js index cca2520ae..ddb213a39 100644 --- a/src/forge/Settings/Collaborator.js +++ b/src/forge/Settings/Collaborator.js @@ -30,11 +30,11 @@ function Collaborator(props){ { author && author.type === "Organization" ? - {setNav("1");setNewId(undefined)}}>协作者管理 + {setNav("1");setNewId(undefined)}}>成员管理 {setNav("2");setNewId(undefined);setNewGroupId(undefined)}}>团队管理 : - 协作者管理 + 成员管理 } { nav === "1" && diff --git a/src/forge/Settings/Index.js b/src/forge/Settings/Index.js index ae9579117..fcc2453d5 100644 --- a/src/forge/Settings/Index.js +++ b/src/forge/Settings/Index.js @@ -74,7 +74,7 @@ class Index extends Component {- 协作者管理 + 成员管理
diff --git a/src/forge/Settings/SpecialProject.jsx b/src/forge/Settings/SpecialProject.jsx index 883b5d0aa..ab7bf348b 100644 --- a/src/forge/Settings/SpecialProject.jsx +++ b/src/forge/Settings/SpecialProject.jsx @@ -8,7 +8,7 @@ const { Search } = Input; const LIMIT = 15; function SpecialProject(props){ const [ page , setPage] = useState(1); - const [ searchValue , SetSearchValue ] = useState(undefined); + const [ searchValue , setSearchValue ] = useState(undefined); const [ total , setTotal ] = useState(0); const [ list , setList ] = useState(undefined); const [ status , setStatus ] = useState(undefined); @@ -22,7 +22,7 @@ function SpecialProject(props){ setLoading(true); Init(searchValue, status); } - },[page,project_id]); + },[page, project_id, searchValue]); function Init(search,status){ const url = `/apply_signatures.json`; @@ -125,9 +125,9 @@ function SpecialProject(props){ }).catch(error=>{setLoading(false)}) } - function searchList(){ + function searchList(value){ + setSearchValue(value); setLoading(true); - Init(searchValue,status); } const menu=( @@ -155,9 +155,7 @@ function SpecialProject(props){ enterButton="搜索" style={{width:400}} size="middle" - value={searchValue} - onChange={(e)=>SetSearchValue(e.target.value)} - onSearch={searchList} + onSearch={(value)=>searchList(value)} />diff --git a/src/forge/Team/Group/GroupDetailSetting.jsx b/src/forge/Team/Group/GroupDetailSetting.jsx index 168ba6ff4..357868966 100644 --- a/src/forge/Team/Group/GroupDetailSetting.jsx +++ b/src/forge/Team/Group/GroupDetailSetting.jsx @@ -42,7 +42,7 @@ export default (props)=>{ active } return( - + 团队设置} nav={array}> -
-
-
-
{props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目 +-
+
- {props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目
+ {/*
{props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目 */}
- -
-
{props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目 + - {props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目
+ {/*
{props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目 */}
-++setVisible(false)} + onSure={onSure} + getProjectListUrl={`/organizations/${OIdentifier}/projects.json`} + choosed={value} + completeProfile={completeProfile} + showCompeleteDialog={showCompeleteDialog} + history={history} + createProjectUrl={`/projects/deposit/new/${OIdentifier}`} + /> + {/* 新闻动态 */} + {organizeDetail && (organizeDetail.news_banner_id || organizeDetail.news_content) && + {(organizeDetail.news_banner_id || organizeDetail.news_content) &&} + {/* 概览or仓库 */} ++} ++ 新闻动态 + +
+ {organizeDetail.news_banner_id &&+} + {organizeDetail.news_content &&+ {organizeDetail.news_url ? {organizeDetail.news_title} :} +{organizeDetail.news_title}
} +{organizeDetail.news_content}++ {setActive(0)}}>概览 + {setActive(1)}}>仓库 +++ {active === 1 &&) } diff --git a/src/forge/Team/RightBox.jsx b/src/forge/Team/RightBox.jsx index 5c85ae474..feaefd055 100644 --- a/src/forge/Team/RightBox.jsx +++ b/src/forge/Team/RightBox.jsx @@ -6,7 +6,8 @@ import { getImageUrl } from 'educoder'; import { Link } from 'react-router-dom'; import Nodata from '../Nodata'; -import CheckProfile from '../Component/ProfileModal/Profile'; +// import CheckProfile from '../Component/ProfileModal/Profile'; +import { Progress } from 'antd'; const Span = styled.span`{ color:#888; @@ -40,11 +41,13 @@ const Img = styled.img`{ function RightBox({ OIdentifier , history , admin , showCompeleteDialog ,completeProfile }) { const [ memberData, setMemberData ] = useState(undefined); const [ groupData, setGroupData ] = useState(undefined); + const [ languages, setLanguages ] = useState(undefined); useEffect(()=>{ if(OIdentifier){ getMember(OIdentifier); getGroup(OIdentifier); + getLanguage(OIdentifier); } },[OIdentifier]) @@ -64,8 +67,40 @@ function RightBox({ OIdentifier , history , admin , showCompeleteDialog ,complet } }).catch(error=>{}) } + function getLanguage(iden){ + const url = `/organizations/${iden}/languages.json`; + axios.get(url).then(result=>{ + if(result && result.data){ + let data = []; + Object.keys(result.data).map(item=>{ + data.push({name:item,percent:result.data[item].substring(0, result.data[item].length-1),color:getColor()}); + }) + setLanguages(data); + } + }).catch(error=>{}) + } + + function getColor(){ + let str = "#"; + let arr = ["1","2","3","4","4","5","6","7","8","9","a","b","c","d","e","f"]; + for(var i=0;i<6;i++){ + let num = parseInt(Math.random() * 16); + str+=arr[num]; + } + return str; + } + return(} + {active === 0 &&-@@ -109,14 +183,43 @@ function List(props){} -setPage(page)}/> + + {proList && organizeDetail && (proList.length > 0 || (proList.length === 0 && organizeDetail.is_admin)) &&} ++} + {organizeDetail && organizeDetail.memo &&+ 精选项目 + {organizeDetail.is_admin && setVisible(true)}>+自定义精选项目} + + {proList && proList.length > 0 ? proList.map(item =>{ + return++ {item.name} ++ }):{item.description}++ {item.category && item.category.name && {item.category.name}} +++ {item.watchers_count} + {item.forked_count} ++} + +} + {organizeDetail && proList && !organizeDetail.memo && proList.length === 0 && !organizeDetail.is_admin &&组织介绍++ } + + + {/* 仓库语言 */} + {languages && languages.length>0 &&+} { memberData && memberData.organization_users && memberData.organization_users.length>0 ?+ 仓库语言 +++ {languages.map(item=>{return+{item.name}})} +@@ -89,13 +124,13 @@ function RightBox({ OIdentifier , history , admin , showCompeleteDialog ,complet name="组织团队" count={groupData && groupData.total_count} bottom={ - admin && - history.push(`/${OIdentifier}/teams/new`)} - className={"ant-btn ant-btn-primary"} - >新建团队 + admin && 新建团队 + //history.push(`/${OIdentifier}/teams/new`)} + // className={"ant-btn ant-btn-primary"} + // >新建团队 } url={`/${OIdentifier}/teams`} > diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx index 3e0389e36..cb5e38a24 100644 --- a/src/forge/Team/Setting/TeamSettingCommon.jsx +++ b/src/forge/Team/Setting/TeamSettingCommon.jsx @@ -62,7 +62,6 @@ export default Form.create()( if(result && result.data){ showNotification("组织信息更新成功！"); if(values.name !== organizeDetail.name){ - console.log("false111"); history.push(`/${values.name}/setting`); } updateFunc && updateFunc(values.name,values.description); @@ -74,7 +73,6 @@ export default Form.create()( function getImage(image){ setImageFlag(true); setImage(image); - console.log(image); } // 删除组织 @@ -108,7 +106,7 @@ export default Form.create()( } callback(); } - + return(@@ -137,12 +135,13 @@ export default Form.create()( {helper( "组织描述：", "description", - [], - - {props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目
+ {/*
- {this.props.history.push('/projects/deposit/new')}}>新建项目
+ {/*