From a92468953a628ef79a6b196ab3ee19f1e92acc27 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 1 Mar 2021 11:11:30 +0800
Subject: [PATCH 01/16] style

---
 src/forge/Main/Detail.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 03257489..9244af7e 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -394,13 +394,13 @@ class Detail extends Component {
             <div className="f-wrap-between pb15" style={{ position: "relative" }}>
               <p className="font-22 df flex-1 lineH2 mt15" style={{ alignItems: "center" }}>
                 {project && project.author &&
-                  <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`} className="show-user-link">
+                  <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`} className="show-user-link color-white">
                     {project.author.name}
                   </Link>
                 }
-                <span className="ml5 mr5">/</span>
+                <span className="ml5 mr5 color-white">/</span>
                 <span className="hide-1 flex-1 df">
-                  <Link to={`/projects/${owner}/${projectsId}`} className="font-22">{project && project.name}</Link>
+                  <Link to={`/projects/${owner}/${projectsId}`} className="font-22 color-white">{project && project.name}</Link>
                   {
                     projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
                       <Tooltip placement={'right'} title={text}>
@@ -482,23 +482,23 @@ class Detail extends Component {
             </div>
             {
               firstSync ? "" :
-              <div className="f-wrap-between mt15">
+              <div className="f-wrap-between pb15">
                 <ul className="headerMenu-wrapper">
                   <li className={pathname==="about" ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}/about`, state }}>
-                      <i className={(pathname==="" || urlFlag) ? "iconfont icon-zhuye1 color-grey-3 mr5 font-14":"iconfont icon-zhuye1 color-grey-6 font-14 mr5"}></i>
+                      <i className={(pathname==="" || urlFlag) ? "iconfont icon-zhuye1 color-white mr5 font-14":"iconfont icon-zhuye1 color-white font-14 mr5"}></i>
                       <span>主页</span>
                       </Link>
                   </li>
                   <li className={(pathname==="" || urlFlag) ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}`, state }}>
-                      <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimaku color-grey-3 mr5 font-14":"iconfont icon-daimaku color-grey-6 font-14 mr5"}></i>
+                      <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimaku color-white mr5 font-14":"iconfont icon-daimaku color-white font-14 mr5"}></i>
                       <span>代码库</span>
                       </Link>
                   </li>
                   <li className={pathname==="issues" ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
-                      <i className={pathname==="issues" ? "iconfont icon-renwu color-grey-3 mr5 font-14":"iconfont icon-renwu color-grey-6 font-14 mr5"}></i>
+                      <i className={pathname==="issues" ? "iconfont icon-renwu color-white mr5 font-14":"iconfont icon-renwu color-white font-14 mr5"}></i>
                       <span>易修 (Issue)</span>
                       {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
                     </Link>
@@ -507,13 +507,13 @@ class Detail extends Component {
                     projectDetail && parseInt(projectDetail.type) !== 2 && platform &&
                     <li className={pathname==="pulls" ? "active" : ""}>
                       <Link to={{ pathname: `/projects/${owner}/${projectsId}/pulls`, state }}>
-                        <i className={pathname==="pulls" ? "iconfont icon-hebingqingqiu1 color-grey-3 mr5 font-14":"iconfont icon-hebingqingqiu1 color-grey-6 font-14 mr5"}></i>
+                        <i className={pathname==="pulls" ? "iconfont icon-hebingqingqiu1 color-white mr5 font-14":"iconfont icon-hebingqingqiu1 color-white font-14 mr5"}></i>
                         <span>合并请求</span>
                         {projectDetail && projectDetail.pull_requests_count ? <span className="num">{projectDetail.pull_requests_count}</span> : ""}
                       </Link>
                     </li>
                   }
-                  {
+                  {/* {
                      platform &&
                      <li className={pathname==="devops" ? "active" : ""}>
                       <Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}>
@@ -521,18 +521,18 @@ class Detail extends Component {
                         {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} 
                       </Link>
                     </li>
-                  }
+                  } */}
                   
                   <li className={pathname==="milestones" ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}/milestones`, state }}>
-                        <i className={pathname==="milestones" ? "iconfont icon-lichengbei color-grey-3 mr5 font-14":"iconfont icon-lichengbei color-grey-6 font-14 mr5"}></i>
+                        <i className={pathname==="milestones" ? "iconfont icon-lichengbei color-white mr5 font-14":"iconfont icon-lichengbei color-white font-14 mr5"}></i>
                         <span>里程碑</span>
                         {projectDetail && projectDetail.versions_count ? <span className="num">{projectDetail.versions_count}</span> :""}
                     </Link>
                   </li>
                   <li className={pathname==="activity" ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}/activity`, state }}>
-                      <i className={pathname==="activity" ? "iconfont icon-tongzhi color-grey-3 mr5 font-14":"iconfont icon-tongzhi color-grey-6 font-14 mr5"}></i>
+                      <i className={pathname==="activity" ? "iconfont icon-tongzhi color-white mr5 font-14":"iconfont icon-tongzhi color-white font-14 mr5"}></i>
                       <span>动态</span>
                     </Link>
                   </li>
@@ -540,7 +540,7 @@ class Detail extends Component {
                     isManager && platform &&
                     <li className={url.indexOf("/setting") > 0 ? "active" : ""}>
                       <Link to={`/projects/${owner}/${projectsId}/setting`}>
-                        <i className={url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i>
+                        <i className={url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-white mr5 font-14":"iconfont icon-cangku color-white font-14 mr5"}></i>
                         <span>仓库设置</span>
                       </Link>
                     </li>

From f0e1858cd4a4daecebfc30fef3fc249aee7ab55c Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 1 Mar 2021 16:01:26 +0800
Subject: [PATCH 02/16] update

---
 src/AppConfig.js            |   2 +-
 src/forge/Main/Detail.js    |  82 +++++++++++++------
 src/forge/Main/IndexItem.js | 155 ++++++++++++++++++++++++------------
 3 files changed, 160 insertions(+), 79 deletions(-)

diff --git a/src/AppConfig.js b/src/AppConfig.js
index 8434a70c..a2b53c06 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -25,7 +25,7 @@ if (isDev) {
   }
   debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
     window.location.search.indexOf('debug=s') !== -1 ? 'student' :
-      window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'p86402359'
+      window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
 }                 
 function clearAllCookie() {
   cookie.remove('_educoder_session', { path: '/' });
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 9244af7e..887896d8 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -4,6 +4,7 @@ import { Link, Route, Switch } from 'react-router-dom';
 import { Content } from '../Component/layout';
 import '../css/index.scss'
 import './list.css';
+import SpecialModal from './SpecialModal';
 
 import Loadable from 'react-loadable';
 import Loading from '../../Loading';
@@ -114,9 +115,9 @@ const DevIndex = Loadable({
 /**
  * permission：Manager:管理员，Reporter：报告人员(只有读取权限)，Developer：开发人员（除不能设置仓库信息外）
  */
-function checkPathname(projectsId,owner,pathname){
+function checkPathname(pathname){
   let name = "";
-  if(pathname && pathname !== `/projects/${owner}/${projectsId}`){
+  if(pathname){
     if(pathname.indexOf("/about")>-1){
       name="about"
     }else if(pathname.indexOf("/issues")>-1 ||pathname.indexOf("Milepost") > 0){
@@ -129,7 +130,7 @@ function checkPathname(projectsId,owner,pathname){
       name="activity"
     }else if(pathname.indexOf("/setting")>-1){
       name="setting"
-    }else if(pathname.indexOf(`/devops`)>-1){
+    }else if(pathname.indexOf("/devops")>-1){
       name="devops"
     }
   }
@@ -161,7 +162,9 @@ class Detail extends Component {
       defaultBranch:undefined,
 
       // 非本平台项目
-      platform:false
+      platform:false,
+      visible:false,
+      user_apply_signatures:[]
     }
   }
 
@@ -178,6 +181,7 @@ class Detail extends Component {
   }
 
   getProject = (num) => {
+    const {user} = this.props;
     const { projectsId , owner } = this.props.match.params;
     const url = `/${owner}/${projectsId}/simple.json`;
     axios.get(url).then((result) => {
@@ -187,6 +191,24 @@ class Detail extends Component {
           open_devops:result.data.open_devops,
           platform:result.data.platform && result.data.platform !== 'educoder'
         })
+        let signa = result.data.user_apply_signatures && result.data.user_apply_signatures[0];
+        if(result.data.is_secret && !result.data.is_member && (!signa || (signa && signa.status !== "passed")) && user.login !== owner){
+          this.setState({
+            visible:true,
+            is_secret:result.data.is_secret,
+            user_apply_signatures:signa
+          })
+        }
+
+        // 工作流：两种状态进入的链接不同
+        const pathname = this.props.history.location.pathname;
+        if(pathname===`/projects/${owner}/${projectsId}/devops`){
+          if(result.data.open_devops && pathname === `/projects/${owner}/${projectsId}/devops`){
+            this.props.history.push(`/projects/${owner}/${projectsId}/devops/list`);
+          }else if(result.data.open_devops===false && pathname !== `/projects/${owner}/${projectsId}/devops`){
+            this.props.history.push(`/projects/${owner}/${projectsId}/devops`);
+          }
+        }
 
         if (result.data.type !== 0 && result.data.mirror_status === 1) {
           console.log("--------start channel --------");
@@ -347,6 +369,7 @@ class Detail extends Component {
     const url = `/${owner}/${projectsId}/sync_mirror.json`;
     axios.post(url).then(result => {
       if (result && result.data && result.data.status === 0) {
+        this.props.showNotification("镜像同步成功!");
         this.getProject(2);
       } else {
         this.props.showNotification("镜像同步失败!");
@@ -356,19 +379,30 @@ class Detail extends Component {
     })
   }
 
+  hideModal=()=>{
+    this.setState({
+      visible:false
+    })
+  }
+
+  sureModal=()=>{
+    this.hideModal();
+    this.props.history.push('/projects');
+  }
+
   
 
   render() {
     const { projectDetail, watchers_count, praises_count, 
       forked_count, firstSync , secondSync , 
       isManager, watched, praised, 
-      project , open_devops , platform , defaultBranch } = this.state;
+      project , open_devops , platform , defaultBranch , project_id , user_apply_signatures , visible } = this.state;
     const url = this.props.history.location.pathname;
     const urlArr = url.split("/");
     const urlFlag = (urlArr.length === 3);
+    let pathname = checkPathname(url);
 
     const { projectsId , owner } = this.props.match.params;
-    let pathname = checkPathname(projectsId,owner,url);
 
     const { state } = this.props.history.location;
     
@@ -389,18 +423,19 @@ class Detail extends Component {
     }
     return (
       <div>
+         <SpecialModal {...this.props} visible={visible} hideModal={this.sureModal} user_apply_signatures={user_apply_signatures} project_id={project_id} sureModal={this.sureModal}></SpecialModal>
         <div className="detailHeader-wrapper">
           <div className="normal">
             <div className="f-wrap-between pb15" style={{ position: "relative" }}>
-              <p className="font-22 df flex-1 lineH2 mt15" style={{ alignItems: "center" }}>
+              <p className="color-white font-22 df flex-1 lineH2 mt15" style={{ alignItems: "center" }}>
                 {project && project.author &&
-                  <Link to={`${project.author.type ==="Organization" ? "/organize":'/users'}/${project.author.login}`} className="show-user-link color-white">
+                  <Link to={`/users/${project.author.login}`} className="show-user-link color-white">
                     {project.author.name}
                   </Link>
                 }
-                <span className="ml5 mr5 color-white">/</span>
+                <span className="ml5 mr5">/</span>
                 <span className="hide-1 flex-1 df">
-                  <Link to={`/projects/${owner}/${projectsId}`} className="font-22 color-white">{project && project.name}</Link>
+                  <Link to={`/projects/${owner}/${projectsId}`} className="color-white font-22">{project && project.name}</Link>
                   {
                     projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
                       <Tooltip placement={'right'} title={text}>
@@ -437,15 +472,14 @@ class Detail extends Component {
                       <span>{watched ? '取消关注' : '关注'}</span>
                     </a>
                     {
-                      watchers_count > 0 ?
                       platform ?
                       <Link className="detail_tag_btn_count" style={{color:`${watched?"#2878FF":"#666"}`}} to={platform?{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }:""}>
                         {watchers_count}
                       </Link>
                       :
                       <span className="detail_tag_btn_count">{watchers_count}</span>
-                      :""
                     }
+                   
                   </span>
                   <span className="detail_tag_btn">
                     <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}>
@@ -453,13 +487,11 @@ class Detail extends Component {
                       <span>{praised ? '取消点赞' : '点赞'}</span>
                     </a>
                     {
-                      praises_count > 0 ?
                       platform ?
                       <Link className="detail_tag_btn_count" style={{color:`${praised?"#2878FF":"#666"}`}} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
                         {praises_count}
                       </Link>:
                       <span className="detail_tag_btn_count">{praises_count}</span>
-                      :""
                     }
                   </span>
                   <span className="detail_tag_btn">
@@ -467,14 +499,12 @@ class Detail extends Component {
                       <i className="iconfont icon-fork color-grey-9 mr3"></i>复刻 (Fork)
                     </a>
                     {
-                      forked_count > 0 ?
                       platform ?
                       <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
                         {forked_count}
                       </Link>
                       :
-                      <span className="detail_tag_btn_count">{forked_count}</span>
-                      :""
+                      <span className="detail_tag_btn_count">{praises_count}</span>
                     }
                   </span>
                 </span>
@@ -482,23 +512,23 @@ class Detail extends Component {
             </div>
             {
               firstSync ? "" :
-              <div className="f-wrap-between pb15">
+              <div className="f-wrap-between pb20">
                 <ul className="headerMenu-wrapper">
                   <li className={pathname==="about" ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}/about`, state }}>
-                      <i className={(pathname==="" || urlFlag) ? "iconfont icon-zhuye1 color-white mr5 font-14":"iconfont icon-zhuye1 color-white font-14 mr5"}></i>
+                      <i className={ pathname === "about" ? "iconfont icon-zhuye1 color-blue mr5 font-14":"iconfont icon-zhuye1 color-white font-14 mr5"}></i>
                       <span>主页</span>
                       </Link>
                   </li>
                   <li className={(pathname==="" || urlFlag) ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}`, state }}>
-                      <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimaku color-white mr5 font-14":"iconfont icon-daimaku color-white font-14 mr5"}></i>
+                      <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimaku color-blue mr5 font-14":"iconfont icon-daimaku color-white font-14 mr5"}></i>
                       <span>代码库</span>
                       </Link>
                   </li>
                   <li className={pathname==="issues" ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
-                      <i className={pathname==="issues" ? "iconfont icon-renwu color-white mr5 font-14":"iconfont icon-renwu color-white font-14 mr5"}></i>
+                      <i className={pathname==="issues" ? "iconfont icon-renwu color-blue mr5 font-14":"iconfont icon-renwu color-white font-14 mr5"}></i>
                       <span>易修 (Issue)</span>
                       {projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""}
                     </Link>
@@ -507,7 +537,7 @@ class Detail extends Component {
                     projectDetail && parseInt(projectDetail.type) !== 2 && platform &&
                     <li className={pathname==="pulls" ? "active" : ""}>
                       <Link to={{ pathname: `/projects/${owner}/${projectsId}/pulls`, state }}>
-                        <i className={pathname==="pulls" ? "iconfont icon-hebingqingqiu1 color-white mr5 font-14":"iconfont icon-hebingqingqiu1 color-white font-14 mr5"}></i>
+                        <i className={pathname==="pulls" ? "iconfont icon-hebingqingqiu1 color-blue mr5 font-14":"iconfont icon-hebingqingqiu1 color-white font-14 mr5"}></i>
                         <span>合并请求</span>
                         {projectDetail && projectDetail.pull_requests_count ? <span className="num">{projectDetail.pull_requests_count}</span> : ""}
                       </Link>
@@ -516,7 +546,7 @@ class Detail extends Component {
                   {/* {
                      platform &&
                      <li className={pathname==="devops" ? "active" : ""}>
-                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}>
+                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/list`:""}`, state }}>
                         <i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流(beta版)
                         {projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} 
                       </Link>
@@ -525,14 +555,14 @@ class Detail extends Component {
                   
                   <li className={pathname==="milestones" ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}/milestones`, state }}>
-                        <i className={pathname==="milestones" ? "iconfont icon-lichengbei color-white mr5 font-14":"iconfont icon-lichengbei color-white font-14 mr5"}></i>
+                        <i className={pathname==="milestones" ? "iconfont icon-lichengbei color-blue mr5 font-14":"iconfont icon-lichengbei color-white font-14 mr5"}></i>
                         <span>里程碑</span>
                         {projectDetail && projectDetail.versions_count ? <span className="num">{projectDetail.versions_count}</span> :""}
                     </Link>
                   </li>
                   <li className={pathname==="activity" ? "active" : ""}>
                     <Link to={{ pathname: `/projects/${owner}/${projectsId}/activity`, state }}>
-                      <i className={pathname==="activity" ? "iconfont icon-tongzhi color-white mr5 font-14":"iconfont icon-tongzhi color-white font-14 mr5"}></i>
+                      <i className={pathname==="activity" ? "iconfont icon-tongzhi color-blue mr5 font-14":"iconfont icon-tongzhi color-white font-14 mr5"}></i>
                       <span>动态</span>
                     </Link>
                   </li>
@@ -540,7 +570,7 @@ class Detail extends Component {
                     isManager && platform &&
                     <li className={url.indexOf("/setting") > 0 ? "active" : ""}>
                       <Link to={`/projects/${owner}/${projectsId}/setting`}>
-                        <i className={url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-white mr5 font-14":"iconfont icon-cangku color-white font-14 mr5"}></i>
+                        <i className={url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-blue mr5 font-14":"iconfont icon-cangku color-white font-14 mr5"}></i>
                         <span>仓库设置</span>
                       </Link>
                     </li>
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index c334715a..8841a7ae 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -6,72 +6,123 @@ import '../css/index.scss';
 import Nodata from '../Nodata';
 import './list.css';
 import img_parise from '../Images/parise.png';
+import SpecialModal from './SpecialModal';
 
 class IndexItem extends Component {
+  constructor(props){
+    super(props);
+    this.state={
+      visible:false,
+      user_apply_signatures:[],
+      project_id:undefined
+    }
+  }
   TurnToDetail = (login, url) => {
     this.props.history.push({
       pathname: url,
       state: login
     })
   }
+  /**
+   * link:跳转到详情的地址
+   * user_apply_signatures:是否已经发送访问特殊开源项目的文件
+   * project_id：项目id
+   * is_secret:是否是特殊开源许可证项目
+   * id：创建者login
+   * is_member:是否是项目成员(如果是项目成员可以直接进入项目)
+   * */ 
+  projectHref=(link , user_apply_signatures,project_id,is_secret , id,is_member)=>{
+    const { user , showLoginDialog } = this.props;
+    if(is_secret && (!user || (user && !user.login))){
+      showLoginDialog();
+      return;
+    }
+    let signa = user_apply_signatures && user_apply_signatures[0];
+    if((is_secret && !is_member && (!signa || (signa && signa.status !== "passed"))) && user.login !== id ){
+      this.setState({
+        visible:true,
+        user_apply_signatures:user_apply_signatures.length>0 ? user_apply_signatures[0] : undefined,
+        project_id
+      })
+    }else{
+      this.props.history.push(link);
+    }
+  }
+  hideModal=()=>{
+    this.setState({
+      visible:false
+    })
+  }
+
+  sureModal=()=>{
+    this.hideModal();
+    const { getListData } = this.props;
+    getListData && getListData(1);
+  }
+
   render() {
     const { projects } = this.props;
-    return (
-      <div className="project-list minH-670">
-        { projects && projects.length > 0 ? projects.map((item, key) => {
-          return (
-            <div className="p-r-Item" key={key}>
-              {
-                item.platform === "educoder" ?
-                <a href="javascript:void(0)" style={{cursor:"default"}} className="show-user-link">
-                  <img className="p-r-photo" alt="" src={item.author && item.author.image_url} ></img>
-                </a>
-                :
-                <Link to={`/users/${item.author.login}`} className="show-user-link">
-                  <img className="p-r-photo" alt="" src={getImageUrl(`${item.author && item.author.image_url}`)} ></img>
-                </Link>
-              }
-              <div className="p-r-Infos">
-                <div className="p-r-name">
-                  <Link to={`/projects/${item.author.login}/${item.identifier}`} className="hide-1 color-grey-3 font-18 task-hide " style={{ whiteSpace: "wrap", display: 'flex', width: 400 }}>
-                    {item.author.name}/{item.name}
-                    {
-                      item.forked_from_project_id ?
-                        <span className="ml5">
-                          <i className="iconfont icon-fork font-18 color-orange" />
-                        </span>
-                        : ""
-                    }
-                    {
-                      item.type && item.type !== 0 ? 
-                      item.type === 2 ?
-                      <Tooltip title="该项目是一个镜像" className="ml5">
-                        <i className="iconfont icon-banbenku font-18 color-green" />
-                      </Tooltip>:
+    const { visible , user_apply_signatures , project_id } = this.state;
+    const renderList = (
+      projects && projects.length > 0 ? projects.map((item, key) => {
+        return (
+          <div className="p-r-Item" key={key}>
+            {
+              item.platform === "educoder" ?
+              <a style={{cursor:"default"}} className="show-user-link">
+                <img className="p-r-photo" alt="" src={item.author && item.author.image_url} ></img>
+              </a>
+              :
+              <Link to={`/users/${item.author.login}`} className="show-user-link">
+                <img className="p-r-photo" alt="" src={getImageUrl(`${item.author && item.author.image_url}`)} ></img>
+              </Link>
+            }
+            <div className="p-r-Infos">
+              <div className="p-r-name">
+                <a onClick={()=>this.projectHref(`/projects/${item.author.login}/${item.identifier}`,item.user_apply_signatures, item.id,item.is_secret,item.author.login,item.is_member)} className="hide-1 color-grey-3 font-18 task-hide fwt-500 " style={{ whiteSpace: "wrap", display: 'flex', width: 400 }}>
+                  {item.author.name}/{item.name}
+                  {
+                    item.forked_from_project_id ?
                       <span className="ml5">
-                        <i className="iconfont icon-jingxiang font-18 color-green" />
-                      </span>:""
-                    }
-                  </Link>
-                  <span className="p-r-tags">
-                    <span className="pariseTag"><img src={img_parise} alt="" className="pariseImg" />赞 {item.praises_count}</span>
-                    <span><i className="iconfont icon-fork mr3 font-16" style={{ color: "#1B8FFF" }} />fork {item.forked_count}</span>
-                  </span>
-                </div>
-                <p className="break_word task-hide-2 mt10" style={{ maxHeight: "44px",lineHeight:"22px" }}>{item.description}</p>
+                        <i className="iconfont icon-fork font-18 color-orange" />
+                      </span>
+                      : ""
+                  }
+                  {
+                    item.type && item.type !== 0 ? 
+                    item.type === 2 ?
+                    <Tooltip title="该项目是一个镜像" className="ml5">
+                      <i className="iconfont icon-banbenku font-18 color-green" />
+                    </Tooltip>:
+                    <span className="ml5">
+                      <i className="iconfont icon-jingxiang font-18 color-green" />
+                    </span>:""
+                  }
+                </a>
+                <span className="p-r-tags">
+                  <span className="pariseTag"><img src={img_parise} alt="" className="pariseImg" />赞 {item.praises_count}</span>
+                  <span><i className="iconfont icon-fork mr3 font-16" style={{ color: "#1B8FFF" }} />fork {item.forked_count}</span>
+                </span>
+              </div>
+              <p className="break_word task-hide-2 mt8 color-grey-3 " style={{ maxHeight: "44px",lineHeight:"22px" }}>{item.description}</p>
 
-                <div className="p-r-about">
-                  <span className="p-r-detail">
-                    {/* <span><label>浏览量：</label>{item.visits}</span> */}
-                    {/* {item.category && item.category.id && <span>{item.category.name}</span>} */}
-                    {item.last_update_time ? <span><label>更新于</label>{item.time_ago}</span> : ""}
-                    {item.language && item.language.id ? <span className="color-grey-3">{item.language.name}</span> : ""}
-                  </span>
-                </div>
+              <div className="p-r-about">
+                <span className="p-r-detail">
+                  {/* <span><label>浏览量：</label>{item.visits}</span> */}
+                  {/* {item.category && item.category.id && <span>{item.category.name}</span>} */}
+                  {item.last_update_time ? <span><label>更新于</label>{item.time_ago}</span> : ""}
+                  {item.language && item.language.id ? <span className="color-grey-3">{item.language.name}</span> : ""}
+                </span>
               </div>
             </div>
-          )
-        }) : <Nodata _html="暂无数据~"></Nodata>}
+          </div>
+        )
+      }) : <Nodata _html="暂无数据~"></Nodata>
+    )
+    return (
+      <div className="project-list minH-670">
+        <SpecialModal {...this.props} visible={visible} hideModal={this.hideModal} user_apply_signatures={user_apply_signatures} project_id={project_id} sureModal={this.sureModal}></SpecialModal>
+        {renderList}
       </div>
     )
   }

From 80f1e4d44898da4658811c7d40327c296648b1be Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 2 Mar 2021 10:51:50 +0800
Subject: [PATCH 03/16] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=96=87=E4=BB=B6-url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/DevOps/Dispose/List.jsx    |  2 +-
 src/forge/Main/CoderRootDirectory.js | 73 +++++++---------------------
 src/forge/Merge/Files.jsx            |  2 +-
 3 files changed, 19 insertions(+), 58 deletions(-)

diff --git a/src/forge/DevOps/Dispose/List.jsx b/src/forge/DevOps/Dispose/List.jsx
index b218281d..32bf5d8d 100644
--- a/src/forge/DevOps/Dispose/List.jsx
+++ b/src/forge/DevOps/Dispose/List.jsx
@@ -32,7 +32,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
       ellipsis:true,
       render:(value,item)=>{
         return(
-          <Link to={`/projects/${owner}/${projectsId}/branch/${item.branch}?url=${value}`} className="color-blue">{value}</Link>
+          <Link to={`/projects/${owner}/${projectsId}/branch/${item.branch}/tree/${value}`} className="color-blue">{value}</Link>
         )
       }
     },
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index b4a31c0e..a6dc2658 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -52,7 +52,8 @@ class CoderRootDirectory extends Component {
       tar_url:undefined,
       chooseType:undefined,
 
-      md:false
+      md:false,
+      treeValue:undefined
     }
   }
   changeAddress = (address) => {
@@ -87,15 +88,13 @@ class CoderRootDirectory extends Component {
   };
 
   Init = () => {
-    let { search } = this.props.history.location;
-    const { branchName } = this.props.match.params;
+    let { pathname } = this.props.history.location;
+    const { branchName , owner , projectsId } = this.props.match.params;
     const { defaultBranch } = this.props;
     let branch = branchName || defaultBranch;
-    if (search && (search.indexOf("?url=") > -1 || search.indexOf("&url=") > -1)) {
-      let url = search.split("url=")[1];
-      if(url && decodeURI(url).indexOf("&")){
-        url=decodeURI(url).split("&")[0];
-      }
+    if (pathname && (pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf("/tree/") > -1)) {
+      let url = pathname.split("/tree/")[1];
+      this.setState({treeValue:url})
       this.getFileDetail(decodeURI(url),branch);
     } else {
       this.getProjectRoot(branch);
@@ -106,7 +105,8 @@ class CoderRootDirectory extends Component {
   returnMain = (branch) => {
     const { projectsId , owner , branchName } = this.props.match.params;
     this.setState({
-      readOnly:true
+      readOnly:true,
+      treeValue:undefined
     })
     this.props.history.push(`/projects/${owner}/${projectsId}${branchName?`/branch/${branchName}`:""}`);
     this.getProjectRoot(branch);
@@ -145,45 +145,13 @@ class CoderRootDirectory extends Component {
   ChangeFile = (arr, readOnly) => {
     const { projectsId , owner } = this.props.match.params;
     //点击直接跳转页面 加载一次路由
-    this.props.history.push(`/projects/${owner}/${projectsId}?url=${arr.path}`);
+    this.props.history.push(`/projects/${owner}/${projectsId}/tree/${arr.path}`);
     this.setState({
       readOnly: readOnly,
       chooseType:"file"
     });
   };
 
-  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({
-          key: k,
-          index: k,
-          name: i,
-          path: str.substr(1),
-          type: filePath && filePath.length > 0 ? filePath[k] ? filePath[k].type : type : type,
-        });
-      });
-      const { projectsId , owner } = this.props.match.params;
-      //点击直接跳转页面 加载一次路由
-      this.props.history.push(`/projects/${owner}/${projectsId}?url=${str.substr(1)}`);
-    } else {
-      list.push({
-        index: 0,
-        name,
-        path,
-        type,
-      });
-    }
-    this.setState({
-      filePath: list,
-    });
-  };
-
   // 获取子目录
   getFileDetail = (path, ref) => {
     this.setState({
@@ -267,7 +235,7 @@ class CoderRootDirectory extends Component {
       chooseType:type
     })
     const { projectsId, owner , branchName } = this.props.match.params;
-    this.props.history.push(`/projects/${owner}/${projectsId}${branchName?`/branch/${branchName}`:""}?url=${path}`);
+    this.props.history.push(`/projects/${owner}/${projectsId}${branchName?`/branch/${branchName}`:""}${path?`/tree/${path}`:""}`);
     if(filename.substring(filename.length - 3) === ".md"){
       this.setState({
         md:true
@@ -320,17 +288,9 @@ class CoderRootDirectory extends Component {
 
   // 选择分支
   changeBranch = (value) => {
-    let { search } = this.props.history.location;
     const { projectsId , owner } = this.props.match.params;
-
-    let url = `/projects/${owner}/${projectsId}${value && `/branch/${value}`}`;
-    if (search && (search.indexOf("?url=") > -1 || search.indexOf("&url=") > -1)) {
-      let u = search.split("url=")[1];
-      if(u && decodeURI(u).indexOf("&")){
-        u=decodeURI(u).split("&")[0];
-      }
-      url += `?url=${u}`;
-    }
+    const { treeValue } = this.state;
+    let url = `/projects/${owner}/${projectsId}${value && `/branch/${value}`}${treeValue ? `/tree/${treeValue}`:""}`;
     this.props.history.push(url);
   }
 
@@ -338,10 +298,11 @@ class CoderRootDirectory extends Component {
   returnUlr=(url)=>{
     this.setState({
       chooseType:"dir",
-      readOnly:true
+      readOnly:true,
+      treeValue:url
     })
-    const { projectsId , owner } = this.props.match.params;
-    this.props.history.push(`/projects/${owner}/${projectsId}?url=${url}`);
+    const { projectsId , owner , branchName } = this.props.match.params;
+    this.props.history.push(`/projects/${owner}/${projectsId}${branchName?`/branch/${branchName}`:""}/tree/${url}`);
   }
 
   onEdit=(readOnly)=>{
diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index 08983266..aa7003e5 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -47,7 +47,7 @@ function Files({data,history,owner,projectsId}){
                       <span>{item.name}</span>
                     </AlignCenter>
                     <span>
-                      <Button className="mr20" onClick={()=>{history.push(`/projects/${owner}/${projectsId}${item.sha ? `/branch/${truncateCommitId(item.sha)}?`:"?"}url=${item.name}`)}}>查看文件</Button>
+                      <Button className="mr20" onClick={()=>{history.push(`/projects/${owner}/${projectsId}${item.sha ? `/branch/${truncateCommitId(item.sha)}/`:"/"}tree/${item.name}`)}}>查看文件</Button>
                       <span className="color-green">+{item.addition}</span>
                       <span className="color-red ml20">-{item.deletion}</span>
                     </span>

From 72fcbcd4dd792a91ef183c0ba53d4f12e5513211 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 2 Mar 2021 11:40:55 +0800
Subject: [PATCH 04/16] root

---
 src/forge/Main/CoderRootDirectory.js | 11 ++++++-----
 src/forge/Main/CoderRootIndex.js     |  2 +-
 src/forge/Main/Detail.js             |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index a6dc2658..759165de 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -92,8 +92,8 @@ class CoderRootDirectory extends Component {
     const { branchName , owner , projectsId } = this.props.match.params;
     const { defaultBranch } = this.props;
     let branch = branchName || defaultBranch;
-    if (pathname && (pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf("/tree/") > -1)) {
-      let url = pathname.split("/tree/")[1];
+    if (pathname && (pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${branchName}/`) > -1)) {
+      let url = pathname.split(`/tree/${branchName}/`)[1];
       this.setState({treeValue:url})
       this.getFileDetail(decodeURI(url),branch);
     } else {
@@ -108,7 +108,7 @@ class CoderRootDirectory extends Component {
       readOnly:true,
       treeValue:undefined
     })
-    this.props.history.push(`/projects/${owner}/${projectsId}${branchName?`/branch/${branchName}`:""}`);
+    this.props.history.push(`/projects/${owner}/${projectsId}${branchName?`/tree/${branchName}`:""}`);
     this.getProjectRoot(branch);
   };
 
@@ -235,7 +235,8 @@ class CoderRootDirectory extends Component {
       chooseType:type
     })
     const { projectsId, owner , branchName } = this.props.match.params;
-    this.props.history.push(`/projects/${owner}/${projectsId}${branchName?`/branch/${branchName}`:""}${path?`/tree/${path}`:""}`);
+    const { defaultBranch } = this.props;
+    this.props.history.push(`/projects/${owner}/${projectsId}${`/tree/${branchName || defaultBranch}`}${path?`/${path}`:""}`);
     if(filename.substring(filename.length - 3) === ".md"){
       this.setState({
         md:true
@@ -290,7 +291,7 @@ class CoderRootDirectory extends Component {
   changeBranch = (value) => {
     const { projectsId , owner } = this.props.match.params;
     const { treeValue } = this.state;
-    let url = `/projects/${owner}/${projectsId}${value && `/branch/${value}`}${treeValue ? `/tree/${treeValue}`:""}`;
+    let url = `/projects/${owner}/${projectsId}${value && `/tree/${value}`}${treeValue ? `/${treeValue}`:""}`;
     this.props.history.push(url);
   }
 
diff --git a/src/forge/Main/CoderRootIndex.js b/src/forge/Main/CoderRootIndex.js
index 27dbbb9d..0e9c7207 100644
--- a/src/forge/Main/CoderRootIndex.js
+++ b/src/forge/Main/CoderRootIndex.js
@@ -145,7 +145,7 @@ class CoderRootIndex extends Component{
               () => (<CoderRootTag {...this.props} {...this.state} />)
             }
           ></Route>
-          <Route path="/projects/:owner/:projectsId/branch/:branchName"
+          <Route path="/projects/:owner/:projectsId/tree/:branchName"
             render={
               (props) => (<CoderRootDirectory {...this.props} {...this.state} getTopCount={this.getTopCount} />)
             }
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 76852525..00d80046 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -701,7 +701,7 @@ class Detail extends Component {
                   (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
                 }
               ></Route>
-              <Route path="/projects/:owner/:projectsId/branch/:branchName"
+              <Route path="/projects/:owner/:projectsId/tree/:branchName"
                 render={
                   (props) => (<CoderRootIndex {...this.props} {...props} {...this.state} {...common} />)
                 }

From f1c2841fe036452d0431361f9c2621d2ee0837ff Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 3 Mar 2021 16:46:45 +0800
Subject: [PATCH 05/16] logo

---
 src/modules/tpm/NewHeader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index daaefca9..f133e911 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -713,7 +713,7 @@ class NewHeader extends Component {
               mygetHelmetapi2 && mygetHelmetapi2.nav_logo_url ?
               <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl(mygetHelmetapi2.nav_logo_url)}></img>
               :
-              <img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={logo}></img>
+              ""
             }
           </a>
           <div className="head-nav pr" id={"head-navpre1"}>

From 860b71c7c6de4e5edacdc646e01069c60384ed0b Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 4 Mar 2021 17:02:20 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E5=A4=96=E5=9B=B4=E8=B4=A1=E7=8C=AE?=
 =?UTF-8?q?=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Settings/CollaboratorMember.jsx | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/forge/Settings/CollaboratorMember.jsx b/src/forge/Settings/CollaboratorMember.jsx
index f4d7aaeb..f594912e 100644
--- a/src/forge/Settings/CollaboratorMember.jsx
+++ b/src/forge/Settings/CollaboratorMember.jsx
@@ -15,7 +15,7 @@ const MENU_LIST = [
 function CollaboratorMember({projectsId,owner,project_id,author,showNotification,newId}){
   const [ roleName , setRoleName ] = useState(undefined);
   const [ search , setSearch ] = useState(undefined);
-  const [ page , setPage ] = useState(undefined);
+  const [ page , setPage ] = useState(1);
   const [ isSpin , setIsSpin ] = useState(false);
   const [ role , setRole ] = useState(undefined);
   const [ listData , setListData ] = useState(undefined);
@@ -166,7 +166,11 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
           <label className={get_color(item.role)}>
             {operation && operation[0].name}
           </label>
-        ) : (
+        ) 
+        :
+        item.is_apply_signature ?
+        <label className="text-grey">外围贡献者</label>
+        :(
           <Dropdown overlay={setRoles(`${item.id}`)} placement={"bottomCenter"}>
             <span className={get_color(item.role)}>
               {operation && operation[0].name}
@@ -261,14 +265,8 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
         </div>
       </Spin>
       {total > LIMIT ?
-        <div className="edu-txt-center mt20 mb20">
-          <Pagination
-            showQuickJumper
-            pageSize={LIMIT}
-            current={page}
-            total={total}
-            onChange={()=>setPage(page)}
-          ></Pagination>
+        <div className="edu-txt-center mt20 pb20">
+          <Pagination simple current={page} pageSize={LIMIT} total={total} onChange={(page)=>setPage(page)}/>
         </div>
       :""}
     </React.Fragment>

From 5565eac6011994d2b153c95801e0cc4e087158c0 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 8 Mar 2021 09:55:12 +0800
Subject: [PATCH 07/16] nodata

---
 src/forge/Main/CoderRootCommit.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js
index 9fc39cae..c9665c77 100644
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@@ -145,7 +145,7 @@ class CoderRootCommit extends Component{
                     )
                   })
                 }
-                {commitDatas && commitDatas.length > 0 && <Nodata _html="暂无数据"/>}
+                {commitDatas && commitDatas.length === 0 && <Nodata _html="暂无数据"/>}
               </div>
             </div>
             {

From 916cc293ac1993c3424544a85b1efbd1c09ce6d7 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 8 Mar 2021 11:15:05 +0800
Subject: [PATCH 08/16] url

---
 src/forge/Main/Detail.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index df8a94e5..9886b7e2 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -115,22 +115,23 @@ const DevIndex = Loadable({
 /**
  * permission：Manager:管理员，Reporter：报告人员(只有读取权限)，Developer：开发人员（除不能设置仓库信息外）
  */
-function checkPathname(pathname){
+function checkPathname(projectsId,owner,pathname){
   let name = "";
-  if(pathname){
-    if(pathname.indexOf("/about")>-1){
+  if(pathname && pathname !== `/projects/${owner}/${projectsId}`){
+    let url = pathname.split(`/projects/${owner}/${projectsId}`)[1];
+    if(url.indexOf("/about")>-1){
       name="about"
-    }else if(pathname.indexOf("/issues")>-1 ||pathname.indexOf("Milepost") > 0){
+    }else if(url.indexOf("/issues")>-1 ||url.indexOf("Milepost") > 0){
       name = "issues";
-    }else if(pathname.indexOf("/pulls")>-1){
+    }else if(url.indexOf("/pulls")>-1){
       name="pulls"
-    }else if(pathname.indexOf("/milestones")>-1){
+    }else if(url.indexOf("/milestones")>-1){
       name="milestones"
-    }else if(pathname.indexOf("/activity")>-1){
+    }else if(url.indexOf("/activity")>-1){
       name="activity"
-    }else if(pathname.indexOf("/setting")>-1){
+    }else if(url.indexOf("/setting")>-1){
       name="setting"
-    }else if(pathname.indexOf("/devops")>-1){
+    }else if(url.indexOf(`/devops`)>-1){
       name="devops"
     }
   }
@@ -400,9 +401,9 @@ class Detail extends Component {
     const url = this.props.history.location.pathname;
     const urlArr = url.split("/");
     const urlFlag = (urlArr.length === 3);
-    let pathname = checkPathname(url);
 
     const { projectsId , owner } = this.props.match.params;
+    let pathname = checkPathname(projectsId,owner,url);
 
     const { state } = this.props.history.location;
     

From a6e2171fcacce6c892e4adaac0cc8e7f1febd116 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 9 Mar 2021 11:49:48 +0800
Subject: [PATCH 09/16] filedetail

---
 src/forge/Main/CoderRootDirectory.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index 759165de..e36c9a1e 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -251,7 +251,7 @@ class CoderRootDirectory extends Component {
   // readme文件内容
   renderReadMeContent = (readMeContent, permission) => {
     const { fileDetail, readMeFile } = this.state;
-    if (fileDetail) {
+    if (fileDetail && fileDetail.length !== 0) {
       return;
     }
     if (readMeContent && readMeContent.length > 0) {

From 41ae6b1f8d9624e226ac0369da897a3273d65c18 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 9 Mar 2021 13:55:02 +0800
Subject: [PATCH 10/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E7=BB=83=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/users/Infos.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index f33a3f10..17b0c6f0 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -167,7 +167,7 @@ class Infos extends Component {
                         <Button
                           block
                           className="text-button-grey"
-                          href={`/users/${user.login}/profiles`}
+                          href={`https://osredm.com/users/${user.login}/profiles`}
                         >
                           {" "}
                           <i className="iconfont icon-shezhi4 font-15 mr5"></i>

From d68d8318c190de5446c009f97ed10fa9b5056301 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 9 Mar 2021 13:59:02 +0800
Subject: [PATCH 11/16] account

---
 src/forge/users/Infos.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index 17b0c6f0..8c942144 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -167,7 +167,10 @@ class Infos extends Component {
                         <Button
                           block
                           className="text-button-grey"
-                          href={`https://osredm.com/users/${user.login}/profiles`}
+                          href={`${
+                            mygetHelmetapi &&mygetHelmetapi.new_course&&
+                            mygetHelmetapi.new_course.edit_account
+                          }`}
                         >
                           {" "}
                           <i className="iconfont icon-shezhi4 font-15 mr5"></i>

From 2c034f5dff6e2f783f6a500a3318bceb3cb31590 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 9 Mar 2021 14:09:06 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=99-url?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/users/Infos.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index 8c942144..b2933dfa 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -137,7 +137,7 @@ class Infos extends Component {
 
 
   render() {
-    const { current_user, mygetHelmetapi } = this.props;
+    const { current_user, main_web_site_url } = this.props;
     const { username } = this.props.match.params;
 
     const { user, isSpin, project_type, route_type } = this.state;
@@ -167,10 +167,7 @@ class Infos extends Component {
                         <Button
                           block
                           className="text-button-grey"
-                          href={`${
-                            mygetHelmetapi &&mygetHelmetapi.new_course&&
-                            mygetHelmetapi.new_course.edit_account
-                          }`}
+                          href={`${main_web_site_url ? main_web_site_url :"https://osredm.com/"}users/${user.login}/profiles`}
                         >
                           {" "}
                           <i className="iconfont icon-shezhi4 font-15 mr5"></i>

From 4cf40f9dfc8d1dffc128bbb276fcefae45cffba5 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 9 Mar 2021 15:33:18 +0800
Subject: [PATCH 13/16] update

---
 src/forge/users/Infos.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index b2933dfa..0965d27a 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -167,7 +167,7 @@ class Infos extends Component {
                         <Button
                           block
                           className="text-button-grey"
-                          href={`${main_web_site_url ? main_web_site_url :"https://osredm.com/"}users/${user.login}/profiles`}
+                          href={`${main_web_site_url || "https://osredm.com/"}users/${user.login}/profiles`}
                         >
                           {" "}
                           <i className="iconfont icon-shezhi4 font-15 mr5"></i>

From 5530e8c7231849eb2bdb454b84d7f1696012060f Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 10 Mar 2021 10:48:08 +0800
Subject: [PATCH 14/16] =?UTF-8?q?diff-=E6=9F=A5=E7=9C=8B=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/Files.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/forge/Merge/Files.jsx b/src/forge/Merge/Files.jsx
index aa7003e5..8c8ba7a8 100644
--- a/src/forge/Merge/Files.jsx
+++ b/src/forge/Merge/Files.jsx
@@ -47,7 +47,7 @@ function Files({data,history,owner,projectsId}){
                       <span>{item.name}</span>
                     </AlignCenter>
                     <span>
-                      <Button className="mr20" onClick={()=>{history.push(`/projects/${owner}/${projectsId}${item.sha ? `/branch/${truncateCommitId(item.sha)}/`:"/"}tree/${item.name}`)}}>查看文件</Button>
+                    <Button className="mr20" onClick={()=>{history.push(`/projects/${owner}/${projectsId}/tree/${truncateCommitId(item.sha)}/${item.name}`)}}>查看文件</Button>
                       <span className="color-green">+{item.addition}</span>
                       <span className="color-red ml20">-{item.deletion}</span>
                     </span>

From 2591f28ccc1398b491156582f78e586c64c5917a Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 22 Mar 2021 09:37:37 +0800
Subject: [PATCH 15/16] bug

---
 src/AppConfig.js                 | 2 +-
 src/modules/login/LoginDialog.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/AppConfig.js b/src/AppConfig.js
index a2b53c06..9bf5e095 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -25,7 +25,7 @@ if (isDev) {
   }
   debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
     window.location.search.indexOf('debug=s') !== -1 ? 'student' :
-      window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
+      window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 's'
 }                 
 function clearAllCookie() {
   cookie.remove('_educoder_session', { path: '/' });
diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js
index 47fad4b1..bd57e094 100644
--- a/src/modules/login/LoginDialog.js
+++ b/src/modules/login/LoginDialog.js
@@ -580,9 +580,9 @@ class LoginDialog extends Component {
                       <label htmlFor="p_autolog" style={{ top: '0px' }}>下次自动登录</label>
                     </span>
                     <span className="fr">
-                      <a onClick={(url) => this.getloginurl("http://39.105.176.215/account/lost_password")}
+                      <a onClick={(url) => this.getloginurl("https://osredm.com/account/lost_password")}
                         className="mr3 color-grey-9">找回密码</a><em className="vertical-line"></em>
-                      <a onClick={(url) => this.getloginurl("http://39.105.176.215/user_join")} className="color-grey-9">注册</a>
+                      <a onClick={(url) => this.getloginurl("https://osredm.com/user_join")} className="color-grey-9">注册</a>
                     </span>
                   </p>
 

From c965da7dd50dbb86b723ecf67579b015512edac9 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Mon, 22 Mar 2021 09:47:34 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E9=BB=98=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Settings/CollaboratorMember.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/forge/Settings/CollaboratorMember.jsx b/src/forge/Settings/CollaboratorMember.jsx
index f594912e..d556b6ab 100644
--- a/src/forge/Settings/CollaboratorMember.jsx
+++ b/src/forge/Settings/CollaboratorMember.jsx
@@ -16,7 +16,7 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
   const [ roleName , setRoleName ] = useState(undefined);
   const [ search , setSearch ] = useState(undefined);
   const [ page , setPage ] = useState(1);
-  const [ isSpin , setIsSpin ] = useState(false);
+  const [ isSpin , setIsSpin ] = useState(true);
   const [ role , setRole ] = useState(undefined);
   const [ listData , setListData ] = useState(undefined);
   const [ total , setTotal ] = useState(0);