From c8f9d7758dbae6836bb402fc9f86b08e131e1f00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 2 Jan 2020 17:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tpm/shixunchild/Repository/Repository.css | 22 +++++++++++-
 .../tpm/shixunchild/Repository/Repository.js  | 35 ++++++++++++++-----
 .../Repository/RepositoryNoneData.js          | 13 +++++--
 3 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/public/react/src/modules/tpm/shixunchild/Repository/Repository.css b/public/react/src/modules/tpm/shixunchild/Repository/Repository.css
index 8a2cde805..9e8b570a0 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/Repository.css
+++ b/public/react/src/modules/tpm/shixunchild/Repository/Repository.css
@@ -1,5 +1,5 @@
 .copy_rep_contentbox{
-    width: 360px;
+    width: 310px;
     background: rgba(250,250,250,1);
     border-radius: 4px;
     padding: 10px;
@@ -29,4 +29,24 @@
 .padding16{
     padding: 16px;
     box-sizing: border-box;
+}
+
+.width490Repository{
+    width: 490px;
+    margin: 0 auto;
+    text-align: left;
+    color:#888888
+}
+
+.color5091FF{
+    color:#5091FF;
+}
+
+.height7052pxRepositor{
+    height: 70px;
+    line-height: 52px;
+}
+
+.padding020Repository{
+    padding: 0px 20px 0px 20px;
 }
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js
index 4fa2c429c..11dd1e47d 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js
@@ -5,8 +5,8 @@ import axios from 'axios';
 import { trace, trace_collapse ,getImageUrl, toPath} from "educoder";
 
 import RepositoryDirectories from './RepositoryDirectories';
-
-import { ActionBtn , NoneData } from 'educoder';
+import { Button } from "antd";
+import {Link} from 'react-router-dom';
 import RepositoryCombinePath from './RepositoryCombinePath';
 import RepositoryNoneData from './RepositoryNoneData';
 import './Repository.css';
@@ -58,7 +58,7 @@ class Repository extends Component {
                       <label className="fl Websiteclone">网址克隆：</label>
                       <div className={"fl copy_rep_contentbox"}>
                       <input type="text" id="copy_rep_content" className="fl url-input mt2"
-                             defaultValue={ git_url } style={{width: 313}}/>
+                             defaultValue={ git_url } style={{width: 266}}/>
                       <a onClick={() => {
                         jsCopy()
                       }} data-tip-down="点击复制版本库地址"
@@ -123,7 +123,24 @@ class Repository extends Component {
                     {
                       this.props.current_user && (this.props.current_user.admin ==true || (TPMRightSectionData && TPMRightSectionData.creator && TPMRightSectionData.creator.login == this.props.current_user.login)) ?
                         !this.props.secret_repository_tab &&
-                        <ActionBtn style="orangeLine" className="ml20 fr" to={`/shixuns/${match.params.shixunId}/repository/add_file`}>+添加文件</ActionBtn>
+                        (
+                          <div>
+                            <Button type="primary"
+                                    className="edu-default-btn edu-greenback-btn  mt5 fr"
+                            >新建文件夹</Button>
+
+                            <Link to={`/shixuns/${match.params.shixunId}/repository/add_file`}>
+                              <Button type="primary"
+                                      className="edu-default-btn edu-greenback-btn  mt5 mr10 fr"
+                              >新建文件</Button>
+                            </Link>
+
+                            <Button type="primary"
+                                    className="edu-default-btn edu-greenback-btn  mt5 mr10 fr"
+                            >上传文件</Button>
+                          </div>
+                        )
+
                         :""
                     }
 
@@ -146,13 +163,13 @@ class Repository extends Component {
               {/* 用户、最近提交时间 */}
               {
                 trees === undefined || trees === null ||trees.length===0? <RepositoryNoneData></RepositoryNoneData>:
-                  <div>
-										{commits===undefined?"":commits===null||commits.length===0?"":<div className="edu-back-skyblue padding10-20 clearfix">
-                      <img alt={author.name} className="radius fl mr10"
-                           height="30"
+                  <div className={"padding020Repository"}>
+										{commits===undefined?"":commits===null||commits.length===0?"":<div className=" padding10-20 clearfix height7052pxRepositor borbotF4">
+                      <img alt={author.name} className="radius fl mr10 mt10"
+                           height="35"
                            src={getImageUrl(`images/`+commits[0].author.image_url)}
                            style={{display:userauthority===true?"none":"block"}}
-                           width="30"/>
+                           width="35"/>
                       <a href={author.user_url} className="mr5 va_sub" target="_blank">{commits[0].author.name}</a>
                       <span className="color-grey-6 va_sub">提交于
                                 <acronym title={commits[0].time}>
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryNoneData.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryNoneData.js
index b72aff298..ca7fe8298 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryNoneData.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryNoneData.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { getImageUrl , getUrl } from 'educoder';
-
+import './Repository.css';
 class RepositoryNoneData extends Component{
   constructor(props) {
     super(props)
@@ -27,7 +27,16 @@ class RepositoryNoneData extends Component{
           `}
         </style>
         <img className="RepositoryNoneDataimg mb30" src={getUrl("/images/educoder/RepositoryNoneData.png")}/>
-        <p className="edu-nodata-p mb50">暂时还没有相关数据哦！</p>
+
+        <div className="edu-nodata-p  font-14">
+            <div>此处存放本实训所需的所有代码等相关文件，你可以通过以下两种方式来使用：</div>
+        </div>
+        <div className="edu-nodata-p  font-14">
+            <div className={"width490Repository"}><span className={"color5091FF"}>1、Git客户端</span>上传已有文件来开始使用。</div>
+        </div>
+        <div className="edu-nodata-p mb50 font-14">
+            <div className={"width490Repository"}>2、直接在平台上创建文件目录以及相关代码文件。</div>
+        </div>
       </div>
     )
   }