Merge pull request 'issue' (#322) from caishi/forgeplus-react:gitlink_server into gitlink_server

src/forge/Component/Title.jsx

@@ -5,7 +5,7 @@ const Nav = styled.div`{
   background-color:#fff;
   padding:20px 30px;
   border-bottom:1px solid #eee;
-  font-size:16px;
+  font-size:18px;
   color:#333;
   display:flex;
   justify-content: space-between;

src/forge/Main/CoderRootIndex.js

@@ -29,14 +29,6 @@ const CoderRootVersion = Loadable({
   loader: () => import('./version/Index'),
   loading: Loading,
 })
-// const CoderRootVersionNew = Loadable({
-//   loader: () => import('./version/New'),
-//   loading: Loading,
-// })
-// const CoderRootVersionUpdate = Loadable({
-//   loader: () => import('./version/New'),
-//   loading: Loading,
-// })
 const Diff =  Loadable({
   loader: () => import('./Diff'),
   loading: Loading,
@@ -50,37 +42,6 @@ class CoderRootIndex extends Component{
     }
   }
 
-  // componentDidMount=()=>{
-  //   this.Init();
-  // }
-  // componentDidUpdate=(prevProps)=>{
-  //   const { location } = this.props;
-  //   const prevlocation = prevProps && prevProps.location;
-  //   if (location !== prevlocation) {
-  //     this.Init();
-  //   }
-  // }
-
-  // Init=()=>{
-  //   const { branchName } = this.props.match.params;
-  //   const { defaultBranch } = this.props;
-  //   this.getTopCount(branchName || defaultBranch);
-  // }
-
-  // 获取<Top />组件里要显示的数据
-  // getTopCount=(branch)=>{
-  //   const { projectsId , owner } = this.props.match.params;
-  //   const url = `/${owner}/${projectsId}/top_counts.json`;
-  //   axios.get(url,{params:{
-  //     ref:branch
-  //   }}).then(result=>{
-  //     if(result){
-  //       this.setState({
-  //         coderCount:result.data
-  //       })
-  //     }
-  //   }).catch(error=>{console.log(error);})
-  // }
   render(){
     return(
       <div className="coderSubPage">

src/forge/Main/tree/Index.jsx

@@ -11,15 +11,6 @@ import Tree from '../img/tree.png';
 import Axios from 'axios';
 
 function turnbar(str){
-  // const s = '!！@/:："“”<《》>|｜？？%$¥';
-  // for(var i=0;i<s.length;i++){
-  //   let s1 = s[i];
-  //   if(str.indexOf(s1) > -1){
-  //     return Base64.encode(str);
-  //   }else{
-  //     continue;
-  //   }
-  // }
   if(str && str.length>0 && str.indexOf("/")>-1){
     return str.replaceAll('/','%2F');
   }

src/forge/Merge/CreateMerge.js

@@ -178,8 +178,6 @@ class CreateMerge extends Component {
 
   // compare接口，获取分支对比信息
   compareProject = (sameProject, branchParams) => {
-    // const { project } = this.props;
-    // const { owner, projectsId } = this.props.match.params;
     const { pullOwner, pullBranch, mergeOwner, mergeBranch, projectId } = branchParams;
 
     let url = `/${mergeOwner}/${projectId}/compare`;

src/forge/Order/CopyDetail.js

@@ -4,8 +4,6 @@ import OrderItem from './order_form'
 
 
 function CopyDetail(props){
-  const operate = props.match.params.operate;
-  console.log(operate);
   return(
     <OrderItem form_type="copy" {...props}></OrderItem>
   )

src/forge/Order/Detail.js

@@ -124,22 +124,6 @@ class Detail extends Component {
   //复制
   copydetail = () => {
     const { projectsId, orderId, owner } = this.props.match.params;
-    // const url = `/${owner}/${projectsId}/issues/${orderId}/copy.json`;
-    // axios
-    //   .post(url, {
-    //     project_id: projectsId,
-    //     id: orderId,
-    //   })
-    //   .then((result) => {
-    //     if (result) {
-    //       this.props.history.push(
-    //         `/${owner}/${projectsId}/issues/${result.data.issue_id}/copyetail`
-    //       );
-    //     }
-    //   })
-    //   .catch((error) => {
-    //     console.log(error);
-    //   });
     this.props.history.push(
       `/${owner}/${projectsId}/issues/${orderId}/copyetail`
     );

src/forge/Order/index.scss

@@ -49,16 +49,6 @@
     justify-content: center
   }
 }
-// .statusTag{
-//   display: block;
-//   height: 24px;
-//   line-height: 24px;
-//   border-radius: 4px;
-//   padding:0px 12px;
-//   color: #fff;
-//   margin:3px 0px 0px 10px;
-// }
-
 .updateBtn{
   display: block;
   width:60px;

src/forge/SecuritySetting/notice/myNotice/Index.scss

@@ -42,21 +42,6 @@
 
   .but25{height: 32px; }
 }
-
-// button {
-//   color: #333333;
-//   background: #FAFBFC;
-//   border: 1px solid #D0D0D0;
-//   border-radius: 4px;
-//   height: 32px;
-// }
-// button:hover {
-//   background: #F3F4F6;
-// }
-// button:active {
-//   background: #EBECF0;
-// }
-
 .deleteBut{
   color: #DF0002;
 }

src/forge/SecuritySetting/sub/SSH.jsx

@@ -54,7 +54,7 @@ function SSH(props) {
     <div>
       <DeleteBox visible={visible} onCancel={()=>setVisible(false)} onSuccess={onSuccess}/>
       <SSHDetail visible={visibleDesc} onCancel={()=>setVisibleDesc(false)} desc={content}/>
-      <div className="sshHead">
+      <div className="sshHead" style={{paddingBottom:'10px'}}>
         <span className="text-shadow07">SSH密钥</span>
         <button type="primary" size="large" onClick={()=>props.history.push('/settings/SSH/new')} className="but25">添加SSH密钥</button>
       </div>

src/forge/users/Team.jsx

@@ -12,7 +12,7 @@ function Team(props){
   const [ list ,setList ] = useState(undefined);
   const [ page ,setPage ] = useState(1);
   const [ total ,setTotal ] = useState(0);
-  const [ sort_direction , setSort_direction ] = useState("asc");
+  const [ sort_direction , setSort_direction ] = useState("desc");
   const [ sort_by ,setSort_by ] = useState("created_at");
   const [ search ,setSearch ] = useState(undefined);
   const { checkIfLogin , showLoginDialog , current_user } = props;
@@ -42,7 +42,7 @@ function Team(props){
   }
   const menu = (
     <Menu onClick={(e)=>setSort_by(e.key)}>
-      <Menu.Item value="created_at" key="created_at">更新时间排序</Menu.Item>
+      <Menu.Item value="created_at" key="created_at">创建时间排序</Menu.Item>
       <Menu.Item value="num_projects" key="num_projects">项目数排序</Menu.Item>
       <Menu.Item value="num_users" key="num_users">用户数排序</Menu.Item>
     </Menu>