@@ -102,7 +101,7 @@ class CoderRootCommit extends Component{
-
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index 85f809372..72bf82025 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -27,7 +27,6 @@ class CoderRootDirectory extends Component{
address:"http",
branch:"master",
filePath:undefined,
- http_url:undefined,
subFileType:undefined,
readMeContent:undefined,
readMeFile: undefined,
@@ -253,12 +252,11 @@ class CoderRootDirectory extends Component{
// 选择分支
changeBranch=(value)=>{
const { branchList } = this.props;
- let branchLastCommit = branchList && branchList.length >0 && branchList.filter(item=>item.name === value)[0];
- if(branchLastCommit){
+ // let branchLastCommit = branchList && branchList.length >0 && branchList.filter(item=>item.name === value)[0];
+ // if(branchLastCommit){
this.setState({
branch:value,
- branchLastCommit,
- http_url:branchLastCommit && branchLastCommit.http_url,
+ // branchLastCommit,
isSpin: true
})
let { search } = this.props.history.location;
@@ -271,11 +269,11 @@ class CoderRootDirectory extends Component{
}else{
this.getProjectRoot( value );
}
- }
+ // }
}
render(){
const { rootList , branch ,filePath , fileDetail , subFileType , readMeContent, isSpin } = this.state;
- const { branchLastCommit , http_url , isManager , isDeveloper } = this.props;
+ const { branchLastCommit , isManager , isDeveloper , projectDetail } = this.props;
const { projectsId } = this.props.match.params;
const columns = [
@@ -340,14 +338,13 @@ class CoderRootDirectory extends Component{
}
const urlRoot = filePath === undefined ? '':`/${filePath}`;
- const { projectDetail } = this.props;
let array = filePath && filePath.split("/");
return(
diff --git a/src/forge/Main/CoderRootDirectorytext.js b/src/forge/Main/CoderRootDirectorytext.js
deleted file mode 100644
index 0eb58b8f9..000000000
--- a/src/forge/Main/CoderRootDirectorytext.js
+++ /dev/null
@@ -1,333 +0,0 @@
-import React , { Component } from 'react';
-import {Menu, Spin} from 'antd';
-import { getImageUrl , markdownToHTML } from 'educoder';
-import { Router , Route , Link } from 'react-router-dom';
-import Top from './DetailTop';
-
-import './list.css';
-
-import SelectBranch from '../Branch/SelectBranch';
-import CloneAddress from '../Branch/CloneAddress';
-import RootTable from './RootTable';
-import CoderRootFileDetail from './CoderRootFileDetail';
-import NullData from './NullData';
-
-import axios from 'axios';
-/**
- * address:http和SSH，http_url(对应git地址)
- * branch:当前分支
- * filePath:点击目录时当前目录的路径
- * subfileType:保存当前点击目录的文件类型（显示目录列表时才显示新建文件，如果点击的是文件就不显示新建文件按钮）
- * readMeContent:根目录下面的readme文件内容
- */
-class CoderRootDirectorytext extends Component{
- constructor(props){
- super(props);
- this.state={
- address:"http",
- branch:"master",
- filePath:[],
- http_url:undefined,
- subFileType:"",
- readMeContent:undefined,
-
- isSpin:true,
-
- branchList:undefined,
- fileDetail:undefined,
- branchLastCommit:undefined,
-
- rootData:undefined
- }
- }
- changeAddress=(address)=>{
- this.setState({
- address
- })
- }
-
- componentDidMount=()=>{
-
- let { search } = this.props.history.location;
- let branchName = undefined;
- if(search && search.indexOf("branch")>-1){
- branchName = search.split("=")[1];
- this.setState({
- branch:branchName
- })
- }
- const { branch } = this.state;
- this.getProjectRoot(branchName || branch);
- }
-
- // 获取根目录
- getProjectRoot=(branch)=>{
- const { projectsId } = this.props.match.params;
- const url = `/repositories/${projectsId}/entries.json`;
- axios.get((url),{
- params:{
- branch
- }
- }).then((result)=>{
- if(result){
- if(result && result.data && result.data.length > 0){
- this.setState({
- filePath:[],
- fileDetail:undefined,
- isSpin: false
- })
- this.renderData(result.data);
- }
- this.setState({
- rootData:result.data
- })
- }
-
- }).catch((error)=>{})
- }
-
- ChangeFile=(arr,index)=>{
- this.renderUrl(arr.name,arr.path,arr.type);
- //点击直接跳转页面 加载一次路由
- this.getFileDetail(arr);
- this.setState({
- subFileType:arr.type
- })
- }
-
- renderUrl=(name,path,type)=>{
- let list =[];
- const { filePath } = this.state;
- if(path.indexOf("/")){
- const array = path.split("/");
- let str = "";
- array.map((i,k)=>{
- str += '/'+i;
- return list.push({
- index:k,
- name:i,
- path:str.substr(1),
- type:(filePath && filePath.length>0) ? (filePath[k] ? filePath[k].type : type) : type
- })
- })
- }else{
- list.push({
- index:0,
- name,path,type
- })
- }
- this.setState({
- filePath:list
- })
- }
-
- // 获取子目录
- getFileDetail=(arr)=>{
- const { projectsId } = this.props.match.params;
- const { branch } = this.state;
- const url =`/repositories/${projectsId}/sub_entries.json`;
-
- axios.get(url,{
- params:{
- filepath:arr.path,
- ref:branch
- }
- }).then((result)=>{
- if(result && result.data && result.data.length > 0){
- if(arr.type==="file"){
- this.setState({
- fileDetail:result.data[0],
- rootList:undefined
- })
- }else{
- if(arr.type===""){
- this.props.showNotification('该文件夹下已无文件')
- return
- }
- this.setState({
- fileDetail:undefined
- })
- this.renderData(result.data)
- }
- }
- }).catch((error)=>{
- console.log(error);
- })
- }
-
- renderData=(data)=>{
- const rootList = [];
- const readMeContent = [];
- data && data.map((item,key)=>{
- rootList.push({
- key,
- ...item
- })
- if(item.name === 'README.md'){
- readMeContent.push({...item})
- }
- })
- this.setState({
- rootList:rootList,
- readMeContent
- })
- }
-
- // readme文件内容
- renderReadMeContent=(readMeContent)=>{
- const { fileDetail } = this.state;
- if(fileDetail){return;}
- if(readMeContent && readMeContent.length > 0){
- return(
-
- {
- rootData &&
-
- {
- rootData.length > 0 ?
-
- }
-
- )
- }
-}
-export default CoderRootDirectorytext;
diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js
index 56d1a428f..fe69ae1a2 100644
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@@ -52,7 +52,7 @@ class CoderRootIndex extends Component{
}
>
{/* diff */}
- (
@@ -340,8 +368,7 @@ class Detail extends Component {
{watchers_count}
-
- {/* {watchers_count} */}
+
this.pariseFunc(praised)}>
diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx
index 25cfc7b67..639f2d30e 100644
--- a/src/forge/Main/Diff.jsx
+++ b/src/forge/Main/Diff.jsx
@@ -1,81 +1,193 @@
-import React from 'react';
-import styled from 'styled-components';
-import { Button } from 'antd';
-import User from '../Component/User';
-import Keys from '../Component/Keys';
+import React, { useEffect, useState } from "react";
+import styled from "styled-components";
+import { Button ,Spin } from "antd";
+import { truncateCommitId } from '../common/util';
+import Nodata from '../Nodata';
+
+import User from "../Component/User";
+import Keys from "../Component/Keys";
+
+import axios from "axios";
const Infos = styled.div`
- border:1px solid #DDDDDD;
- & .commitinfos{
- background-color:#F1F8FF;
- border-bottom:1px solid #ddd;
- padding:20px;
+ border: 1px solid #dddddd;
+ & .commitinfos {
+ background-color: #f1f8ff;
+ border-bottom: 1px solid #ddd;
+ padding: 20px;
}
- & > .f-wrap-between{
- padding:10px 24px;
+ & > .f-wrap-between {
+ padding: 10px 24px;
}
`;
const Operation = styled.p`
- border-bottom:1px solid #eee;
- padding:12px 0px;
- margin-top:10px;
- display:flex;
+ border-bottom: 1px solid #eee;
+ padding: 12px 0px;
+ margin-top: 10px;
+ display: flex;
justify-content: space-between;
align-items: center;
`;
-const fileUl = styled.ul`
- & li{
- display:flex;
+const FileUl = styled.ul`
+ padding-top: 10px;
+ & li {
+ display: flex;
justify-content: space-between;
align-items: center;
- height:20px;
- line-height:20px;
- margin-bottom:10px;
+ height: 20px;
+ line-height: 20px;
+ margin-bottom: 10px;
}
`;
+const DetailP = styled.p`
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ padding: 12px 20px 12px 12px;
+ background-color: #fafafa;
+ border: 1px solid #dddddd;
+`;
-const files = ()=>{
- return(
-
-
-
-
-
- )
-}
+export default ({ projectDetail, match }) => {
+ const [data, setData] = useState(undefined);
+ const [commit, setCommit] = useState(undefined);
+ const [files, setFiles] = useState(undefined);
+ const [parents, setParents] = useState(undefined);
+ const [committer, setCommitter] = useState(undefined);
+ const [fileflag , setFileflag] = useState(false);
+ const [isSpin, setIsSpin] = useState(true);
-export default () => {
- return(
-
-
-
- )
- }
- }
-
- // 选择分支
- changeBranch=(value)=>{
- const { branchList } = this.props;
-
- let branchLastCommit = branchList && branchList.length >0 && branchList.filter(item=>item.name === value)[0];
- this.setState({
- branch:branchLastCommit && branchLastCommit.name,
- branchLastCommit,
- http_url:branchLastCommit && branchLastCommit.http_url,
- isSpin: true
- })
- this.getProjectRoot(branchLastCommit.name);
-
- }
- render(){
- const { rootList , branch ,filePath , fileDetail , subFileType , readMeContent, isSpin , rootData } = this.state;
- const { branchLastCommit , http_url , isManager , isDeveloper } = this.props;
- const { projectsId } = this.props.match.params;
-
- const columns = [
- {
- dataIndex: 'name',
- width:"100%",
- render: (text,item) => (
- this.ChangeFile(item)}>
- {text}
-
- ),
- }
- ];
- const title = () =>{
- if(branchLastCommit && branchLastCommit.last_commit){
- return(
- {readMeContent[0].name}
-
- {
- readMeContent[0].content ?
-
- :
- 暂无~
- }
-
-
- {
- branchLastCommit.author ?
-
- })
- {branchLastCommit.author.login}
-
- :""
- }
- {branchLastCommit.last_commit.id}
- {branchLastCommit.last_commit.message}
- {branchLastCommit.last_commit.time_from_now}
-
- )
- }else{
- return undefined;
- }
- }
-
- const downloadUrl = ()=>{
- if(branchLastCommit && branchLastCommit.zip_url){
- return(
-
- )
- }
- }
-
- const urlRoot = filePath && filePath.length > 0 ? `/${filePath[filePath.length - 1].path}` : "";
- return(
-
-
- {/* 文件夹-子目录列表 */}
- {
- rootList && title()}>
- }
-
- {
- fileDetail &&
-
-
- :
-
-
-
-
- {
- key === filePath.length-1 ?
- {item.name}
- :
- this.ChangeFile(item,key)} className="color-blue subFileName" key={key}>{item.name}
- }
-
- )
- })
- }
-
-
- }
-
-
-
- {
- subFileType !== "file" && (isManager || isDeveloper) &&
-
- - 新建文件 - {/* 上传文件 */} -
- } - { - filePath && filePath.length === 0 &&
-
-
-
-
-
-
- 共有3个文件被更改，包括20次插入和3次删除
+ const repo_id = projectDetail && projectDetail.repo_id;
+ const { sha } = match.params;
+ useEffect(() => {
+ if (repo_id && sha) {
+ const url = `/repositories/${repo_id}/commits/${sha}.json`;
+ axios
+ .get(url)
+ .then(result => {
+ if (result) {
+ setData(result.data);
+ setCommit(result.data.commit);
+ setFiles(result.data.files);
+ setParents(result.data.parents);
+ setCommitter(result.data.committer || (result.data.commit && result.data.commit.committer));
+ setIsSpin(false);
+ }
+ })
+ .catch(error => {
+ console.log(error);
+ });
+ }
+ }, [repo_id, sha]);
+ const renderFiles = () => {
+ return (
+
+ {
+ files && files.length > 0 && files.map((item,key)=>{
+ return(
+
+
+
+ {item.Name}
+
+
+
+
+
+
+ )
+ })
+ }
+
+ );
+ };
+
+ function changeFlag(){
+ let flag = !fileflag;
+ setFileflag(flag);
+ }
+
+ const filesDetail = () => {
+ return (
+
-
- - title - -
-I wanner be a dancer \n I wanner be a dancer I wanner be a dancer-
-
-
-
- -
-
+
+
+
+ README.md
-
-
-
+
+
+
+ );
+ };
+ return (
+
+
+
+
+ {
+ files && files.length > 0 ?
+
+
+
+
+
+ 共有{files && files.length}个文件被更改，包括
+ {data && data.additions ? (
+ {data.additions}次插入
+ ) : (
+ ""
+ )}
+ {data && data.additions && data.deletions ? "和" : ""}
+ {data && data.deletions ? (
+ {data.deletions}次删除
+ ) : (
+ ""
+ )}
+
+
+
+
+ {fileflag && renderFiles()}
+ {filesDetail()}
+
+ :
+
- )
-}
\ No newline at end of file
+ );
+};
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index eff4b42d0..a022bb31c 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -558,6 +558,18 @@
line-height: 50px;
border-bottom: 1px solid #ddd;
}
+.synchronism{
+ display: block;
+ height: 26px;
+ line-height: 26px;
+ padding:0px 15px;
+ color: #fff!important;
+ background-color: #28BD6C;
+ border-radius: 4px;
+}
+.files_info{
+ cursor: pointer;
+}
.commonBox .commonBox-info{
padding:20px 15px;
}
diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js
index 0d6ec90ab..084df0eaa 100644
--- a/src/forge/New/Index.js
+++ b/src/forge/New/Index.js
@@ -1,6 +1,7 @@
import React, { Component } from 'react';
import { Link } from 'react-router-dom';
import { Input, Form, Select, Checkbox, Button, Divider, Spin, AutoComplete } from 'antd';
+import { Base64 } from 'js-base64';
import '../css/index.css';
import './new.css'
@@ -16,6 +17,8 @@ class Index extends Component {
gitignoreType: "0",
LicensesType: "0",
+ mirrorCheck:false,
+
CategoryList: undefined,
LanguageList: undefined,
GitignoreList: undefined,
@@ -129,17 +132,19 @@ class Index extends Component {
}
subMitFrom = () => {
- this.setState({
- isSpin: true
- })
this.props.form.validateFieldsAndScroll((err, values) => {
if (!err) {
+ this.setState({
+ isSpin: true
+ })
const { current_user } = this.props;
const { projectsType } = this.props.match.params;
const { project_language_id, project_category_id, license_id, ignore_id } = this.state;
+ const decoderPass = Base64.encode(values.password);
const url = projectsType === "deposit" ? "/projects.json" : "/projects/migrate.json";
axios.post(url, {
...values,
+ auth_password:decoderPass,
project_language_id,
project_category_id,
license_id,
@@ -204,6 +209,13 @@ class Index extends Component {
callback();
}
+ changeMirrorCheck=()=>{
+ const { mirrorCheck } = this.state;
+ this.setState({
+ mirrorCheck:!mirrorCheck
+ })
+ }
+
render() {
const { getFieldDecorator } = this.props.form;
// 项目类型：deposit-托管项目，mirror-镜像项目
@@ -228,6 +240,8 @@ class Index extends Component {
project_category_list,
license_list,
ignore_list,
+
+ mirrorCheck
} = this.state;
return (
+
+ + + { commit && commit.title } + + +
+ {commit && commit.message ? ( +{commit.message}
+ ) : (
+ ""
+ )}
+
+
+ {
+ parents && parents.length > 0 && parents.map((item,key)=>{
+ return(
+
+
+ -
+
@@ -254,6 +268,39 @@ class Index extends Component {
+
+ }
@@ -384,6 +431,18 @@ class Index extends Component {
将项目设为私有(只有项目所有人或拥有权限的项目成员才能看到)
)}
+ {
+ projectsType !== "deposit" &&
+
+ {getFieldDecorator('is_mirror')(
+ 该仓库将是一个镜像(设置为镜像后，该项目为只读，不能进行push等相关操作)
+ )}
+
+ }
示例：https://github.com/facebook/reack.git
} + { + projectsType !== "deposit" && +需要授权验证
+ { + mirrorCheck && +
+ 用户名
+
+ {getFieldDecorator('auth_username', {
+ rules: [],
+ })(
+
+ )}
+
+ 密码
+
+ {getFieldDecorator('password', {
+ rules: [],
+ })(
+
+ )}
+
+
+ }
+
注： 为必填项，否则为选填
diff --git a/src/forge/common/util.js b/src/forge/common/util.js
index 66a5b4c1e..8ea1c5953 100644
--- a/src/forge/common/util.js
+++ b/src/forge/common/util.js
@@ -1,6 +1,6 @@
export function truncateCommitId(str) {
- if (str.length > 11) {
+ if (str && str.length > 11) {
return str.substring(0, 10)
}
}
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index 19db1c1a9..4136ae3a8 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -296,13 +296,13 @@ export function TPMIndexHOC(WrappedComponent) {
}
fetchUser = () => {
+ console.log("`111111");
let url = `/users/get_user_info.json`
let courseId;
let query = this.props.location.pathname;
const type = query.split('/');
if (type[1] == 'classrooms' && type[2]) {
courseId = parseInt(type[2])
- // url += `?course_id=${courseId}`
}
var datay = {};
if (JSON.stringify(this.state.dataquerys) === "{}") {
@@ -320,25 +320,11 @@ export function TPMIndexHOC(WrappedComponent) {
}
}
axios.get(url, {
- params:
- datay
+ params: datay
}).then((response) => {
- /*
- {
- "username": "黄井泉",
- "login": "Hjqreturn",
- "user_id": 12,
- "image_url": "avatar/User/12",
- "admin": true,
- "is_teacher": false,
- "tidding_count": 0
- }
- */
- if (response === undefined) {
- return
- }
- if (response.data) {
- this.initCommonState(response.data)
+ if (response && response.data) {
+ console.log("`111111",response.data);
+ this.initCommonState(response.data);
this.setState({
tpmLoading: false,
coursedata: {
@@ -346,12 +332,9 @@ export function TPMIndexHOC(WrappedComponent) {
course_public: response.data.course_public,
name: response.data.course_name,
userid: response.data.user_id
- },
-
+ }
})
-
}
-
}).catch((error) => {
console.log(error)
})