From bb2691767befc6614041d8fa1eab1763090835d7 Mon Sep 17 00:00:00 2001
From: caicai8 <1149225589@qq.com>
Date: Fri, 3 Jan 2020 19:03:09 +0800
Subject: [PATCH] build

---
 public/react/src/forge/Branch/SelectBranch.js | 31 ++++++++++
 .../src/forge/Main/CoderRootDirectory.js      | 61 +++++++++----------
 public/react/src/forge/Main/Detail.js         | 11 ++--
 public/react/src/forge/New/Index.js           |  1 +
 4 files changed, 68 insertions(+), 36 deletions(-)
 create mode 100644 public/react/src/forge/Branch/SelectBranch.js

diff --git a/public/react/src/forge/Branch/SelectBranch.js b/public/react/src/forge/Branch/SelectBranch.js
new file mode 100644
index 000000000..ca5ee9413
--- /dev/null
+++ b/public/react/src/forge/Branch/SelectBranch.js
@@ -0,0 +1,31 @@
+import React , { Component } from 'react';
+import { Dropdown , Icon , Menu } from 'antd';
+
+class SelectBranch extends Component{
+
+  render(){
+    const { branchs , branch , changeBranch } = this.props;
+    const menu = (
+      <Menu>
+        {
+          branchs && branchs.map((item,key)=>{
+            return(
+              <Menu.Item key={item.index} onClick={(value)=>changeBranch(value)}>{item.name}</Menu.Item>
+            )
+          })
+        }
+      </Menu>
+    );
+    return(
+      <div className="branchDropdown">
+        <span className="color-grey-9 mr3"><i className="iconfont icon-fenzhi font-20 color-grey-6 mr3"></i>分支:</span>
+        <Dropdown overlay={menu} trigger={['click']} placement="bottomRight">
+          <a className="ant-dropdown-link">
+            {branch} <Icon type="down" />
+          </a>
+        </Dropdown>
+      </div>
+    )
+  }
+}
+export default SelectBranch;
\ No newline at end of file
diff --git a/public/react/src/forge/Main/CoderRootDirectory.js b/public/react/src/forge/Main/CoderRootDirectory.js
index 2b83644e9..038f841a8 100644
--- a/public/react/src/forge/Main/CoderRootDirectory.js
+++ b/public/react/src/forge/Main/CoderRootDirectory.js
@@ -5,6 +5,8 @@ import {Link} from 'react-router-dom';
 import { getImageUrl } from 'educoder';
 import axios from 'axios';
 
+import SelectBranch from '../Branch/SelectBranch'
+
 // 点击按钮复制功能
 function jsCopy(){
   var e = document.getElementById("copy_rep_content");
@@ -16,7 +18,8 @@ class CoderRootDirectory extends Component{
     super(props);
     this.state={
       address:"http",
-      ref:"master",
+      branch:"master",
+      http_url:undefined,
 
       rootList:undefined,
       branchList:undefined,
@@ -54,21 +57,22 @@ class CoderRootDirectory extends Component{
         this.setState({
           branchList:result.data,
           branchs,
-          branchLastCommit:result.data[0]
+          branchLastCommit:result.data[0],
+          http_url:result.data[0].http_url
         })
       }
     }).catch((error)=>{})
   }
 
   // 获取分支文件
-  getProjectRoot=(ref)=>{
+  getProjectRoot=(branch)=>{
     const { login } = this.props.current_user;
     const { projectsId } = this.props.match.params;
 
     const url = `/${login}/${projectsId}/entries.json`;
     axios.get((url),{
       params:{
-        ref
+        branch
       }
     }).then((result)=>{
       if(result && result.data && result.data.length > 0){
@@ -96,8 +100,9 @@ class CoderRootDirectory extends Component{
     let branchLastCommit = branchList[parseInt(value.key)];
 
     this.setState({
-      ref:branchLastCommit.name,
-      branchLastCommit
+      branch:branchLastCommit.name,
+      branchLastCommit,
+      http_url:branchLastCommit.http_url
     })
   }
 
@@ -114,18 +119,8 @@ class CoderRootDirectory extends Component{
       }
     ];
 
-    const { address , ref , rootList , branchList , branchs, branchLastCommit } = this.state;
-    const menu = (
-      <Menu>
-        {
-          branchs && branchs.map((item,key)=>{
-            return(
-              <Menu.Item key={item.index} onClick={this.changeBranch}>{item.name}</Menu.Item>
-            )
-          })
-        }
-      </Menu>
-    );
+    const { branch , rootList , branchs, branchLastCommit , http_url } = this.state;
+    
 
     const title = () =>{
       if(branchLastCommit && branchLastCommit.last_commit){
@@ -134,7 +129,7 @@ class CoderRootDirectory extends Component{
             {
               branchLastCommit.author ?
                 <React.Fragment>
-                  <img src={getImageUrl(`/images${branchLastCommit.author.image_url}`)} alt=""/>
+                  <img src={getImageUrl(`images/${branchLastCommit.author.image_url}`)} alt=""/>
                   <span className="mr15">{branchLastCommit.author.login}</span>
                 </React.Fragment>
               :""
@@ -148,6 +143,17 @@ class CoderRootDirectory extends Component{
         return undefined;
       }
     }
+
+    const downloadUrl = ()=>{
+      if(branchLastCommit && branchLastCommit.zip_url){
+        return(
+          <Menu>
+            <Menu.Item><a href={branchLastCommit.zip_url}>ZIP</a></Menu.Item>
+            <Menu.Item><a href={branchLastCommit.tar_url}>TAR.GZ</a></Menu.Item>
+          </Menu>
+        )
+      }
+    } 
     return(
       <div className="main">
         <p className="branch-wrapper">
@@ -156,21 +162,14 @@ class CoderRootDirectory extends Component{
         </p>
 
         <div className="f-wrap-between mt20">
-          <div className="branchDropdown">
-            <span className="color-grey-9 mr3"><i className="iconfont icon-fenzhi font-20 color-grey-6 mr3"></i>分支:</span>
-            <Dropdown overlay={menu} trigger={['click']} placement="bottomRight">
-              <a className="ant-dropdown-link">
-                {ref} <Icon type="down" />
-              </a>
-            </Dropdown>
-          </div>
+          <SelectBranch branch={branch} branchs={branchs} changeBranch={this.changeBranch}></SelectBranch>
           <div className="gitAddressClone">
-            <span className={address ==="http" ? "addressType active":"addressType"} onClick={()=>this.changeAddress("http")}>HTTP</span>
-            <span className={address ==="ssh" ? "addressType active":"addressType"} onClick={()=>this.changeAddress("ssh")}>SSH</span>
-            <input type="text" id="copy_rep_content" value={"git@testgitea.trustie.net:sylor/test11.git"}/>
+            <span className={"addressType active"} onClick={()=>this.changeAddress("http")}>HTTP</span>
+            {/* <span className={address ==="ssh" ? "addressType active":"addressType"} onClick={()=>this.changeAddress("ssh")}>SSH</span> */}
+            <input type="text" id="copy_rep_content" value={ http_url }/>
             <span onClick={()=>jsCopy()}><i className="iconfont icon-fuzhi"></i></span>
             <span>
-            <Dropdown overlay={menu} trigger={['click']} placement="bottomRight">
+            <Dropdown overlay={downloadUrl} trigger={['click']} placement="bottomRight">
               <a className="ant-dropdown-link">
                 <Icon type="cloud-download" className="font-18 fl"/>
               </a>
diff --git a/public/react/src/forge/Main/Detail.js b/public/react/src/forge/Main/Detail.js
index c533a48bc..d22f1fe67 100644
--- a/public/react/src/forge/Main/Detail.js
+++ b/public/react/src/forge/Main/Detail.js
@@ -24,6 +24,7 @@ class Detail extends Component{
   }
   render(){
     const { currentKey } = this.state;
+    const { projectsId } = this.props.match.params;
     return(
       <div>
         <div className="detailHeader-wrapper">
@@ -38,11 +39,11 @@ class Detail extends Component{
           </div>
           <div className="normal f-wrap-between">
             <ul className="headerMenu-wrapper">
-              <li className={currentKey === "coder" ? "active" : ""}><Link to={''}>代码</Link></li>
-              <li className={currentKey === "orders" ? "active" : ""}><Link to={''}>工单</Link></li>
-              <li className={currentKey === "merge" ? "active" : ""}><Link to={''}>合并请求</Link></li>
-              <li className={currentKey === "edition" ? "active" : ""}><Link to={''}>版本发布</Link></li>
-              <li className={currentKey === "trends" ? "active" : ""}><Link to={''}>动态</Link></li>
+              <li className={currentKey === "coder" ? "active" : ""}><Link to={`/projects/${projectsId}`}>代码</Link></li>
+              <li className={currentKey === "orders" ? "active" : ""}><Link to={`/projects/${projectsId}/orders`}>工单</Link></li>
+              <li className={currentKey === "merge" ? "active" : ""}><Link to={`/projects/${projectsId}/merge`}>合并请求</Link></li>
+              <li className={currentKey === "edition" ? "active" : ""}><Link to={`/projects/${projectsId}/edition`}>版本发布</Link></li>
+              <li className={currentKey === "trends" ? "active" : ""}><Link to={`/projects/${projectsId}/trends`}>动态</Link></li>
             </ul>
           </div>
         </div>
diff --git a/public/react/src/forge/New/Index.js b/public/react/src/forge/New/Index.js
index b07805e56..e83e07435 100644
--- a/public/react/src/forge/New/Index.js
+++ b/public/react/src/forge/New/Index.js
@@ -107,6 +107,7 @@ class Index extends Component{
           if(result){
             if(result.data.id){
               this.props.showNotification(`${projectsType === "deposit" ? "托管" :"镜像"}项目创建成功!`);
+              this.history.push('/projects');
             }
           }
         }).catch((error)=>{