-
+
{readMeContent[0].name}
@@ -285,7 +283,7 @@ class CoderRootDirectory extends Component {
onClick={() => this.ChangeFile(readMeFile[0], false)}
className="ml20 pull-right"
>
-
+
) : (
""
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index a177234e..70be7405 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import { Spin, Tooltip } from 'antd';
import { Link, Route, Switch } from 'react-router-dom';
-
+import { Content } from '../Component/layout';
import '../css/index.scss'
import './list.css';
@@ -57,66 +57,55 @@ const OrderMilepost = Loadable({
loader: () => import('../Order/Milepost'),
loading: Loading,
})
-
const OrdernewMilepost = Loadable({
loader: () => import('../Order/newMilepost'),
loading: Loading,
})
-
const OrderupdateMilepost = Loadable({
loader: () => import('../Order/UpdateMilepost'),
loading: Loading,
})
-
const OrderupdateDetail = Loadable({
loader: () => import('../Order/UpdateDetail'),
loading: Loading,
})
-
const OrdercopyDetail = Loadable({
loader: () => import('../Order/CopyDetail'),
loading: Loading,
})
-
//合并请求
const MergeIndexDetail = Loadable({
loader: () => import('../Merge/merge'),
loading: Loading,
})
-
const CreateMerge = Loadable({
loader: () => import('../Merge/NewMerge'),
loading: Loading,
})
-
const MessageCount = Loadable({
loader: () => import('../Merge/MessageCount'),
loading: Loading,
})
-
const UpdateMerge = Loadable({
loader: () => import('../Merge/UpdateMerge'),
loading: Loading,
})
-
const MilepostDetail = Loadable({
loader: () => import('../Order/MilepostDetail'),
loading: Loading,
})
const WatchUsers = Loadable({
- loader: () => import('../UsersList/watch_users'),
- loading: Loading,
+ loader: () => import('../UsersList/watch_users'),
+ loading: Loading,
})
const PraiseUsers = Loadable({
- loader: () => import('../UsersList/praise_users'),
- loading: Loading,
+ loader: () => import('../UsersList/praise_users'),
+ loading: Loading,
})
const ForkUsers = Loadable({
- loader: () => import('../UsersList/fork_users'),
- loading: Loading,
+ loader: () => import('../UsersList/fork_users'),
+ loading: Loading,
})
-
-
const TrendsIndex = Loadable({
loader: () => import('../Activity/Activity'),
loading: Loading,
@@ -125,12 +114,11 @@ const TrendsIndex = Loadable({
/**
* permission：Manager:管理员，Reporter：报告人员(只有读取权限)，Developer：开发人员（除不能设置仓库信息外）
*/
-
class Detail extends Component {
constructor(props) {
super(props);
this.state = {
- isSpin: true,
+ isMirror: true,
projectDetail: undefined,
isManager: false,
isReporter: false,
@@ -151,24 +139,62 @@ class Detail extends Component {
componentDidMount = () => {
this.getProject();
- this.getDetail();
}
componentDidUpdate = (prevState) => {
if ((prevState.match.params.projectsId !== this.props.match.params.projectsId)) {
this.getProject();
- this.getDetail();
}
}
getProject = () => {
const { projectsId } = this.props.match.params;
- const url = `/projects/${projectsId}/simple.json`;
- axios.get(url).then((result) => {
+ const url = `ws://192.168.2.59:3000/cable`;
+ const scoket = new WebSocket(url);
+ scoket.onopen=()=>{
+ scoket.send(JSON.stringify({ "id": `${projectsId}`}));
+ console.log(1);
+ }
+ scoket.onmessage=(result)=>{
+ console.log(2," ",result);
+ if(result){
+ this.setState({
+ project: result.data
+ })
+ let mirror_status = result.data.mirror_status;
+ // this.checkMirror(mirror_status);
+ scoket.close();
+ }
+ }
+ scoket.onclose=(event)=>{
+ console.log(3," ",event);
+ }
+ // const url = `/projects/${projectsId}/simple.json`;
+
+ // axios.get(url).then((result) => {
+ // if (result) {
+ // this.setState({
+ // project: result.data
+ // })
+ // let mirror_status = result.data.mirror_status;
+ // this.checkMirror(mirror_status);
+ // }
+ // })
+ }
+ checkMirror=(mirror_status)=>{
+ if (!mirror_status || (mirror_status && mirror_status === 0)) {
this.setState({
- project: result.data
+ isMirror:false
})
- })
+ this.getDetail();
+ } else {
+ this.setState({
+ isMirror: true
+ })
+ setTimeout(() => {
+ this.getProject();
+ }, 600000);
+ }
}
getDetail = () => {
@@ -189,7 +215,6 @@ class Detail extends Component {
watchers_count: result.data.watchers_count,
praises_count: result.data.praises_count,
forked_count: result.data.forked_count,
- isSpin:false
})
}
}).catch((error) => { })
@@ -199,22 +224,22 @@ class Detail extends Component {
focusFunc = (flag) => {
const { project_id } = this.state;
- axios({
- method: flag? 'delete' : 'post',
- url: `/watchers/${flag? 'unfollow' : 'follow'}.json`,
+ axios({
+ method: flag ? 'delete' : 'post',
+ url: `/watchers/${flag ? 'unfollow' : 'follow'}.json`,
params: {
target_type: "project",
id: project_id
}
- })
- .then(result => {
- if(result && result.data.status === 0){
- this.setWatchersCount(result.data.watchers_count, result.data.watched);
- }
- })
- .catch(error => {
- console.log(error);
- });
+ })
+ .then(result => {
+ if (result && result.data.status === 0) {
+ this.setWatchersCount(result.data.watchers_count, result.data.watched);
+ }
+ })
+ .catch(error => {
+ console.log(error);
+ });
}
// 点赞和取消点赞
@@ -250,13 +275,6 @@ class Detail extends Component {
// fork项目
forkFunc = () => {
- // if (!checkIfLogin) {
- // this.props.showLoginDialog();
- // return;
- // }
- this.setState({
- isSpin: true
- })
const { project_id } = this.state;
const url = `/projects/${project_id}/forks.json`;
axios.post(url).then(result => {
@@ -264,46 +282,33 @@ class Detail extends Component {
this.props.history.push(`/projects/${result.data.id}/coders`);
this.props.showNotification(result.data.message);
}
- this.setState({
- isSpin: false
- })
}).catch(error => {
- this.setState({
- isSpin: false
- })
console.log(error);
})
}
// 同步镜像
- synchronismMirror=()=>{
+ synchronismMirror = () => {
const { repo_id } = this.state.projectDetail;
- this.setState({
- isSpin:true
- })
- const url = `/repositories/${repo_id}/sync_mirror.json`;
- axios.post(url).then(result=>{
- if(result && result.data && result.data.status === 0){
+ const url = `/repositories/${repo_id}/sync_mirror.json`;
+ axios.post(url).then(result => {
+ if (result && result.data && result.data.status === 0) {
this.props.showNotification("镜像同步成功!");
this.getProject();
- this.getDetail();
- }else{
+ // this.getDetail();
+ } else {
this.props.showNotification("镜像同步失败!");
- this.setState({
- isSpin:false
- })
}
-
- }).catch(error=>{
+ }).catch(error => {
console.log(error);
})
}
render() {
- const { projectDetail, watchers_count, praises_count, forked_count, isSpin, isManager, watched, praised, project } = this.state;
+ const { projectDetail, watchers_count, praises_count, forked_count, isManager, watched, praised, project, isMirror } = this.state;
const url = this.props.history.location.pathname;
- const urlArr = url.split("/");
+ const urlArr = url.split("/");
const urlFlag = (urlArr.length === 3);
const { projectsId } = this.props.match.params;
@@ -324,279 +329,293 @@ class Detail extends Component {
const mirror = (
镜像自
- {projectDetail && projectDetail.mirror_url}
+ {projectDetail && projectDetail.mirror_url}
)
- const common ={
- getDetail:this.getDetail
+ const common = {
+ getDetail: this.getDetail
}
return (
-
-
:
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index ceacee08..3aa5b441 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -192,10 +192,15 @@
margin-top: 8px;
color: #666;
}
-
+.spincontent{
+ height:400px;
+}
+.spincontent .ant-spin-text{
+ margin-top:30px;
+ color: #888;
+}
/* -----------详情------------ */
.detailHeader-wrapper{
- height: 125px;
background:linear-gradient(82deg,rgba(82,91,215,1) 0%,rgba(34,24,171,1) 100%);
}
.headerMenu-wrapper{
diff --git a/src/forge/Settings/Collaborator.js b/src/forge/Settings/Collaborator.js
index e1bf408e..e3d23791 100644
--- a/src/forge/Settings/Collaborator.js
+++ b/src/forge/Settings/Collaborator.js
@@ -429,7 +429,7 @@ class Collaborator extends Component {
return (
-
+
+
+
+ :
+
+
+ {/* 新建文件 */}
+ (
+ (
+ (
-
- {/* 新建文件 */}
- (
- (
- (
-
- {/* 标签列表 */}
- (
- {/* 仓库设置 */}
- (
- {/* 任务详情 */}
- (
- {/* 里程碑 */}
- (
- {/* 新建里程碑 */}
- (
- {/*里程碑详情*/}
- (
- {/*修改里程碑*/}
- (
+ {/* 标签列表 */}
+ (
+ {/* 仓库设置 */}
+ (
+ {/* 任务详情 */}
+ (
+ {/* 里程碑 */}
+ (
+ {/* 新建里程碑 */}
+ (
+ {/*里程碑详情*/}
+ (
+ {/*修改里程碑*/}
+ (
- {/* 里程碑页面新建任务 */}
- (
- {/* 新建任务 */}
- (
+ {/* 里程碑页面新建任务 */}
+ (
+ {/* 新建任务 */}
+ (
- {/* 修改详情 */}
- (
+ {/* 修改详情 */}
+ (
- {/* 复制详情 */}
- (
+ {/* 复制详情 */}
+ (
- {/* 动态 */}
- (
+ {/* 动态 */}
+ (
- {/* 代码Index */}
- (
+ {/* 代码Index */}
+ (
- ()
- }
- >
+ (
- (
+ (
- (
+ (
- (
+ (
- (
- (
- (
- (
- (
- (
- (
-
+ (
+ (
+ (
+ (
+ (
+ (
+ (
+
+
+ }
)
}
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index 4926f48d..093b3246 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -34,8 +34,8 @@ class IndexItem extends Component {
: ""
}
{
- item.type && item.type !==0 ?
- item.type ==2?
+ item.type && item.type !== 0 ?
+ item.type === 2 ?
-
+ {
+ isMirror ?
+ - {project && project.author && - - {project.author.name} - +
+
+
+ 
+ {watched ? '取消关注' : '关注'}
+
+
+ {watchers_count}
+
+
+
+ this.pariseFunc(praised)}>
+ 
+ {praised ? '取消点赞' : '点赞'}
+
+
+ {praises_count}
+
+
+
+
+ 
Fork
+
+ {forked_count}
+
+
+
+ }
+ {
+ isMirror ? "" :
+
+
- {watched ? '取消关注' : '关注'}
-
-
- {watchers_count}
-
-
-
- this.pariseFunc(praised)}>
-
- {praised ? '取消点赞' : '点赞'}
-
-
- {praises_count}
-
-
-
-
- Fork
-
- {forked_count}
-
-
-
-
+ {project && project.author &&
+
+ {project.author.name}
+
+ }
+ /
+
+ {project && project.name}
+ {
+ projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
+
-
+
+ {
+ isMirror ? "" :
+
+ {
+ projectDetail && projectDetail.type && projectDetail.type === 2 ?
+ 同步镜像 : ""
+ }
+
+ this.focusFunc(watched)}>
+ -
-
- -1 || urlFlag) ? "active" : ""}>
-
-
代码库 - -
- - -1 && !(url.indexOf("Milepost") > 0 || url.indexOf("meilpost") > 0 || url.indexOf("tags") > 0)) ? "active" : ""}>
-
-
任务 - { projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} :""} - -
- - -1 ? "active" : ""}>
-
-
合并请求 - { projectDetail && projectDetail.pull_requests_count ? {projectDetail.pull_requests_count} : "" } - -
- - -1 || url.indexOf("meilpost") > -1) ? "active" : ""}>
-
-
里程碑 - {projectDetail && projectDetail.version_count && {projectDetail.version_count}} - -
- - -1 ? "active" : ""}>
-
-
动态 - -
- {
- isManager &&
- - 0 ? "active" : ""}>
仓库设置
- }
-
+
+ }
-
+
- -1 || urlFlag) ? "active" : ""}>
+
+
+
- -1 && !(url.indexOf("Milepost") > 0 || url.indexOf("meilpost") > 0 || url.indexOf("tags") > 0)) ? "active" : ""}>
+
+
+
- -1 ? "active" : ""}>
+
+
+
- -1 || url.indexOf("meilpost") > -1) ? "active" : ""}>
+
+
+
- -1 ? "active" : ""}>
+
+
+ {
+ isManager &&
+
- 0 ? "active" : ""}>
+ }
+
- 协作者管理
+ 协作者管理
- 项目标签
+ 项目标签
{data && data.user_admin_or_member ? (
-