.babelrc

@@ -1,16 +0,0 @@
-{
-  "presets": [
-    "es2015",
-    "react",
-    "stage-2"
-  ],
-  "plugins": [[
-	  "transform-runtime",
-	  {
-	    "helpers": false,
-	    "polyfill": false,
-	    "regenerator": true,
-	    "moduleName": "babel-runtime"
-	  }
-	]]
-}

.vscode/settings.json

@@ -1,2 +0,0 @@
-{
-}

LICENSE

@@ -1,124 +0,0 @@
-木兰宽松许可证， 第2版
-
-2020年1月 http://license.coscl.org.cn/MulanPSL2
-
-您对“软件”的复制、使用、修改及分发受木兰宽松许可证，第2版（“本许可证”）的如下条款的约束：
-
-0.   定义
-
-“软件” 是指由“贡献”构成的许可在“本许可证”下的程序和相关文档的集合。
-
-“贡献” 是指由任一“贡献者”许可在“本许可证”下的受版权法保护的作品。
-
-“贡献者” 是指将受版权法保护的作品许可在“本许可证”下的自然人或“法人实体”。
-
-“法人实体” 是指提交贡献的机构及其“关联实体”。
-
-“关联实体” 是指，对“本许可证”下的行为方而言，控制、受控制或与其共同受控制的机构，此处的控制是指有受控方或共同受控方至少50%直接或间接的投票权、资金或其他有价证券。
-
-1.   授予版权许可
-
-每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的版权许可，您可以复制、使用、修改、分发其“贡献”，不论修改与否。
-
-2.   授予专利许可
-
-每个“贡献者”根据“本许可证”授予您永久性的、全球性的、免费的、非独占的、不可撤销的（根据本条规定撤销除外）专利许可，供您制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与许可“贡献”时的“软件”结合而将必然会侵犯的专利权利要求，不包括对“贡献”的修改或包含“贡献”的其他结合。如果您或您的“关联实体”直接或间接地，就“软件”或其中的“贡献”对任何人发起专利侵权诉讼（包括反诉或交叉诉讼）或其他专利维权行动，指控其侵犯专利权，则“本许可证”授予您对“软件”的专利许可自您提起诉讼或发起维权行动之日终止。
-
-3.   无商标许可
-
-“本许可证”不提供对“贡献者”的商品名称、商标、服务标志或产品名称的商标许可，但您为满足第4条规定的声明义务而必须使用除外。
-
-4.   分发限制
-
-您可以在任何媒介中将“软件”以源程序形式或可执行形式重新分发，不论修改与否，但您必须向接收者提供“本许可证”的副本，并保留“软件”中的版权、商标、专利及免责声明。
-
-5.   免责声明与责任限制
-
-“软件”及其中的“贡献”在提供时不带任何明示或默示的担保。在任何情况下，“贡献者”或版权所有者不对任何人因使用“软件”或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论,即使其曾被建议有此种损失的可能性。
-
-6.   语言
-
-“本许可证”以中英文双语表述，中英文版本具有同等法律效力。如果中英文版本存在任何冲突不一致，以中文版为准。
-
-条款结束
-
-如何将木兰宽松许可证，第2版，应用到您的软件
-
-如果您希望将木兰宽松许可证，第2版，应用到您的新软件，为了方便接收者查阅，建议您完成如下三步：
-
-1， 请您补充如下声明中的空白，包括软件名、软件的首次发表年份以及您作为版权人的名字；
-
-2， 请您在软件包的一级目录下创建以“LICENSE”为名的文件，将整个许可证文本放入该文件中；
-
-3， 请将如下声明文本放入每个源文件的头部注释中。
-
-Copyright (c) [Year] [name of copyright holder]
-[Software Name] is licensed under Mulan PSL v2.
-You can use this software according to the terms and conditions of the Mulan PSL v2.
-You may obtain a copy of Mulan PSL v2 at:
-         http://license.coscl.org.cn/MulanPSL2
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-See the Mulan PSL v2 for more details.
-Mulan Permissive Software License，Version 2
-Mulan Permissive Software License，Version 2 (Mulan PSL v2)
-
-January 2020 http://license.coscl.org.cn/MulanPSL2
-
-Your reproduction, use, modification and distribution of the Software shall be subject to Mulan PSL v2 (this License) with the following terms and conditions:
-
-0. Definition
-
-Software means the program and related documents which are licensed under this License and comprise all Contribution(s).
-
-Contribution means the copyrightable work licensed by a particular Contributor under this License.
-
-Contributor means the Individual or Legal Entity who licenses its copyrightable work under this License.
-
-Legal Entity means the entity making a Contribution and all its Affiliates.
-
-Affiliates means entities that control, are controlled by, or are under common control with the acting entity under this License, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity.
-
-1. Grant of Copyright License
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not.
-
-2. Grant of Patent License
-
-Subject to the terms and conditions of this License, each Contributor hereby grants to you a perpetual, worldwide, royalty-free, non-exclusive, irrevocable (except for revocation under this Section) patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution, where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Software to which the Contribution was contributed. The patent license shall not apply to any modification of the Contribution, and any other combination which includes the Contribution. If you or your Affiliates directly or indirectly institute patent litigation (including a cross claim or counterclaim in a litigation) or other patent enforcement activities against any individual or entity by alleging that the Software or any Contribution in it infringes patents, then any patent license granted to you under this License for the Software shall terminate as of the date such litigation or activity is filed or taken.
-
-3. No Trademark License
-
-No trademark license is granted to use the trade names, trademarks, service marks, or product names of Contributor, except as required to fulfill notice requirements in section 4.
-
-4. Distribution Restriction
-
-You may distribute the Software in any medium with or without modification, whether in source or executable forms, provided that you provide recipients with a copy of this License and retain copyright, patent, trademark and disclaimer statements in the Software.
-
-5. Disclaimer of Warranty and Limitation of Liability
-
-THE SOFTWARE AND CONTRIBUTION IN IT ARE PROVIDED WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED. IN NO EVENT SHALL ANY CONTRIBUTOR OR COPYRIGHT HOLDER BE LIABLE TO YOU FOR ANY DAMAGES, INCLUDING, BUT NOT LIMITED TO ANY DIRECT, OR INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING FROM YOUR USE OR INABILITY TO USE THE SOFTWARE OR THE CONTRIBUTION IN IT, NO MATTER HOW IT’S CAUSED OR BASED ON WHICH LEGAL THEORY, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-6. Language
-
-THIS LICENSE IS WRITTEN IN BOTH CHINESE AND ENGLISH, AND THE CHINESE VERSION AND ENGLISH VERSION SHALL HAVE THE SAME LEGAL EFFECT. IN THE CASE OF DIVERGENCE BETWEEN THE CHINESE AND ENGLISH VERSIONS, THE CHINESE VERSION SHALL PREVAIL.
-
-END OF THE TERMS AND CONDITIONS
-
-How to Apply the Mulan Permissive Software License，Version 2 (Mulan PSL v2) to Your Software
-
-To apply the Mulan PSL v2 to your work, for easy identification by recipients, you are suggested to complete following three steps:
-
-Fill in the blanks in following statement, including insert your software name, the year of the first publication of your software, and your name identified as the copyright owner;
-Create a file named "LICENSE" which contains the whole context of this License in the first directory of your software package;
-Attach the statement to the appropriate annotated syntax at the beginning of each source file.
-Copyright (c) [Year] [name of copyright holder]
-[Software Name] is licensed under Mulan PSL v2.
-You can use this software according to the terms and conditions of the Mulan PSL v2.
-You may obtain a copy of Mulan PSL v2 at:
-         http://license.coscl.org.cn/MulanPSL2
-THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
-EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
-MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
-See the Mulan PSL v2 for more details.

README.md

@@ -1,16 +0,0 @@
-<h3>前端react环境安装：</h3>
-<p>1、 安装node v6.9.x；此安装包含了node和npm。</p>
-<p>2、 安装cnpm（命令行）： npm install -g cnpm --registry=https://registry.npm.taobao.org</p>
-<p>3、 安装依赖的js库（public/react目录下<即项目package.json所在目录>，开启命令行）： cnpm install</p>
-<p>4、 如果你的ruby服务使用的是3000端口，则需要在package.json中修改"port"参数的值</p>
-<p>5、 启动服务（命令行-目录同3）： npm start</p>
-<p>6、 build初始化 npm run build</p>
-
-
-<h3>分支信息：</h3>
-<p>相关代码提交到对应分支，能上线的代码先提交到develop分支上测试版，测试通过后合并提交到master分支上线正式版</p>
-<p>master:开发环境（正式环境）</p>
-<p>develop:测试环境</p>
-<p>dev_local:本地版本</p>
-<p>dev_chain:含有区块链相关内容的分支</p>
-<p>PS:新增加的需求功能先新建新分支开发，在测试版测试没问题后再分别合并到develop和master分支</p>

config/webpack.config.prod.js

@@ -17,10 +17,18 @@ const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
 const paths = require("./paths");
 const getClientEnvironment = require("./env");
 
+// Some apps do not use client-side routing with pushState.
+// For these, "homepage" can be set to "." to enable relative asset paths.
 let publicPath = "/react/build/";
+// let nodeEnv = process.env.NODE_ENV
+// if (nodeEnv === 'testBuild') {
+// 	publicPath = 'https://testforgeplus.trustie.net/react/build/';
+// }
+// if (nodeEnv === 'production') {
+// 	publicPath = 'https://forgeplus.trustie.net/react/build/';
+// }
 const publicUrl = publicPath.slice(0, -1);
-// const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
+const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== "false";
-const shouldUseSourceMap = process.env.NODE_ENV !== "production";
 const env = getClientEnvironment(publicPath);
 
 // This is the production configuration.
@@ -55,8 +63,7 @@ module.exports = {
   },
   bail: true,
   mode: "production",
-  // devtool: false, //测试版
+  devtool: false, //测试版
-  devtool: shouldUseSourceMap?'source-map':false,
   entry: [require.resolve("./polyfills"), paths.appIndexJs],
   output: {
     path: paths.appBuild,
@@ -134,6 +141,7 @@ module.exports = {
               name: "static/media/[name].[hash:8].[ext]",
             },
           },
+          // Process JS with Babel.
           {
             test: /\.(js|jsx|mjs)$/,
             include: paths.appSrc,
@@ -153,8 +161,10 @@ module.exports = {
               ],
             },
           },
+
           {
             test: /\.css$/,
+
             use: [
               {
                 loader: MiniCssExtractPlugin.loader,

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "forge",
+  "name": "educoder",
-  "version": "3.0.0",
+  "version": "0.1.0",
   "private": true,
   "dependencies": {
     "@monaco-editor/react": "^2.3.0",
@@ -10,11 +10,11 @@
     "array-flatten": "^2.1.2",
     "autoprefixer": "7.1.6",
     "axios": "^0.18.1",
+    "babel-core": "6.26.0",
     "babel-eslint": "7.2.3",
     "babel-jest": "20.0.3",
     "babel-loader": "7.1.2",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-polyfill": "^6.26.0",
     "babel-preset-react-app": "^3.1.1",
     "babel-runtime": "6.26.0",
     "bizcharts": "^3.5.8",
@@ -22,17 +22,14 @@
     "case-sensitive-paths-webpack-plugin": "2.1.1",
     "chalk": "1.1.3",
     "classnames": "^2.2.5",
-    "clipboard": "^2.0.8",
+    "clipboard": "^2.0.6",
     "code-prettify": "^0.1.0",
     "codemirror": "^5.53.0",
     "connected-react-router": "4.4.1",
-    "cross-env": "^7.0.3",
     "css-loader": "^3.5.2",
-    "dompurify": "^2.0.15",
     "dotenv": "4.0.0",
     "dotenv-expand": "4.2.0",
-    "echarts": "^4.9.0",
+    "echarts": "^4.7.0",
-    "echarts-wordcloud": "^2.0.0",
     "editor.md": "^1.5.0",
     "eslint": "4.10.0",
     "eslint-config-react-app": "^2.1.0",
@@ -49,7 +46,6 @@
     "install": "^0.12.2",
     "jest": "20.0.4",
     "js-base64": "^2.5.2",
-    "js2wordcloud": "^1.1.12",
     "katex": "^0.11.1",
     "lodash": "^4.17.15",
     "loglevel": "^1.6.8",
@@ -66,7 +62,7 @@
     "postcss-loader": "2.0.8",
     "promise": "8.0.1",
     "prop-types": "^15.6.1",
-    "qrcode.react": "^1.0.1",
+    "qrcode.react": "^1.0.0",
     "qs": "^6.9.3",
     "quill": "^1.3.7",
     "quill-delta-to-html": "^0.11.0",
@@ -96,7 +92,6 @@
     "react-resizable": "^1.10.1",
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",
-    "react-slick": "^0.28.1",
     "react-split-pane": "^0.1.91",
     "react-url-query": "^1.5.0",
     "react-zmage": "^0.8.5-beta.31",
@@ -104,11 +99,9 @@
     "redux-thunk": "2.3.0",
     "rsuite": "^4.3.4",
     "sass-loader": "7.3.1",
-    "save-dev": "0.0.1-security",
     "scroll-into-view": "^1.14.2",
     "showdown": "^1.9.1",
     "showdown-katex": "^0.8.0",
-    "slick-carousel": "^1.8.1",
     "store": "^2.0.12",
     "style-loader": "0.19.0",
     "styled-components": "^4.4.1",
@@ -118,14 +111,12 @@
     "webpack-dev-server": "^3.10.3",
     "webpack-manifest-plugin": "^2.2.0",
     "whatwg-fetch": "2.0.3",
-    "wrap-md-editor": "^0.2.20",
+    "wrap-md-editor": "^0.2.20"
-    "xterm": "4.8.1",
-    "xterm-addon-fit": "0.4.0"
   },
   "scripts": {
     "start": "node --max_old_space_size=15360 scripts/start.js",
-    "build": "cross-env NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
+    "build": "NODE_ENV=production node --max_old_space_size=15360 scripts/build.js",
-    "test-build": "cross-env NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
+    "test-build": "NODE_ENV=testBuild node --max_old_space_size=15360 scripts/build.js",
     "pre-build": "NODE_ENV=preBuild node --max_old_space_size=15360 scripts/build.js",
     "gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json",
     "ana": "webpack-bundle-analyzer ./stats.json",
@@ -187,18 +178,11 @@
   "eslintConfig": {
     "extends": "react-app"
   },
-  "proxy": "http://localhost:3001",
+  "proxy": "http://localhost:3000",
   "port": "3007",
   "devDependencies": {
     "@babel/runtime": "7.0.0-beta.51",
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.0",
     "babel-plugin-import": "^1.13.0",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-react": "^6.24.1",
-    "babel-preset-stage-2": "^6.24.1",
     "compression-webpack-plugin": "^1.1.12",
     "concat": "^1.0.3",
     "happypack": "^5.0.1",
@@ -206,7 +190,6 @@
     "node-sass": "^4.12.0",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "purgecss": "^2.1.2",
-    "react-json-view": "^1.21.3",
     "reqwest": "^2.0.5",
     "resize-observer-polyfill": "^1.5.1",
     "terser-webpack-plugin": "^2.3.5",

public/css/edu-all.css

@@ -38,6 +38,78 @@
   box-sizing: border-box;
 }
 
+.head-nav ul#header-nav li {
+  float: left;
+  height: 60px;
+  line-height: 60px;
+  margin-right: 30px;
+  cursor: pointer;
+  position: relative;
+  font-size: 16px
+}
+
+.head-nav ul#header-nav li a {
+  display: block;
+  height: 100%;
+  width: 100%;
+  color: #fff
+}
+
+.head-nav ul#header-nav li a:hover {
+  color: #cccccc;
+}
+
+.head-nav ul#header-nav li:last-child {
+  margin-right: 0px
+}
+
+.head-nav ul#header-nav li.active a {
+  color: #459be5 !important;
+}
+
+.head-nav ul#header-nav li.active p {
+  color: #459be5 !important;
+}
+
+.head-nav ul#header-nav li p:hover {
+  color: #cccccc;
+}
+
+.head-nav ul#header-nav li p {
+  display: block;
+  height: 100%;
+  width: 100%;
+  color: #fff
+}
+
+.head-nav ul#header-nav li.active div ul li a {
+  color: #000 !important;
+}
+
+.head-nav ul#header-nav li.active div ul li a:hover {
+  color: #FFF !important;
+}
+
+.head-nav ul#header-nav li.active ul li a {
+  color: #000 !important;
+}
+
+.head-nav ul#header-nav li.active ul li a:hover {
+  color: #FFF !important;
+}
+
+.head-nav ul#header-nav li.active:after {
+  content: '';
+  position: absolute;
+  left: 0px;
+  top: auto;
+  bottom: 10px;
+  right: auto;
+  height: 2px;
+  width: 14px;
+  background-color: #459be5;
+}
+
 .nav-img {
   position: absolute;
   top: 2px;

public/css/edu-common.css

@@ -114,6 +114,14 @@ a:visited {
   color: #898989;
 }
 
+a:hover {
+  color: #FF7500;
+}
+
+a:hover.fa {
+  color: #FF7500;
+}
+
 input,
 textarea,
 select {

public/css/edu-main.css

@@ -97,6 +97,10 @@ a:visited {
   color: #05101a;
 }
 
+a:hover {
+  color: #459be5;
+}
+
 ol,
 ul,
 li {

public/css/edu-purge.css

@@ -1,4 +1,3 @@
-@charset "utf-8";
 /* 头部 */
 .header {
   width: 100%;
@@ -1272,7 +1271,7 @@ html body {
   font-size: 14px;
   line-height: 2.0;
   background: #fafafa;
-  font-family: "Microsoft YaHei", "SimSun";
+  font-family: "微软雅黑", "宋体";
   color: #05101a;
   height: 100%;
   position: relative;
@@ -1308,7 +1307,6 @@ td,
 span {
   margin: 0;
   padding: 0;
-  margin-bottom: 0px!important;
 }
 
 table,
@@ -1365,6 +1363,10 @@ a:visited {
   color: #05101a;
 }
 
+a:hover {
+  color: #459be5;
+}
+
 ol,
 ul,
 li {
@@ -1471,7 +1473,7 @@ a.edu-txt-w80,
 
 /*隐藏*/
 .none {
-  display: none!important;
+  display: none
 }
 
 .block {
@@ -1520,15 +1522,7 @@ a.edu-txt-w80,
 .font-16 {
   font-size: 16px !important;
 }
-.weight400{
+
-  font-weight: 400;
-}
-.weight500{
-  font-weight: 500;
-}
-.weight{
-  font-weight: bold;
-}
 .font-17 {
   font-size: 17px !important;
 }
@@ -1548,9 +1542,6 @@ a.edu-txt-w80,
 .font-25 {
   font-size: 25px !important;
 }
-.font-26 {
-  font-size: 26px !important;
-}
 
 .font-24 {
   font-size: 24px !important;
@@ -1572,9 +1563,6 @@ a.edu-txt-w80,
   font-size: 36px !important;
 }
 
-.font-40 {
-  font-size: 40px !important;
-}
 .font-50 {
   font-size: 50px !important;
 }
@@ -1760,20 +1748,12 @@ a.decoration {
   margin-bottom: 10px;
 }
 
-.mb12 {
-  margin-bottom: 12px;
-}
-
-.mb13 {
-  margin-bottom: 13px;
-}
-
 .mb14 {
   margin-bottom: 14px;
 }
 
 .mb15 {
-  margin-bottom: 15px!important;
+  margin-bottom: 15px;
 }
 
 .mb16 {
@@ -2366,6 +2346,7 @@ input::-ms-clear {
 /*中间部分宽度固定为1200*/
 .newMain {
   margin: 0 auto;
+  padding-bottom: 110px;
   min-width: 1200px;
 }
 
@@ -2444,23 +2425,13 @@ input::-ms-clear {
 .color-grey-c {
   color: #ccc !important;
 }
-a.hoverLine:hover{
+
-  text-decoration: underline;
-}
 .color-grey-cd {
   color: #cdcdcd !important;
 }
-.color-grey-d {
-  color: #ddd;
-}
-
 
 .color-grey-9 {
-  color: #999 !important;
+  color: #999999 !important;
-}
-
-a:hover{
-  color: #466AFF !important;
 }
 
 .color-grey-98 {
@@ -2495,23 +2466,33 @@ a:hover{
 a.color-grey-name:hover,
 a.color-dark:hover,
 a.color-grey-6:hover,
-a.color-grey-3:hover,a.color-ooo:hover {
+a.color-grey-3:hover {
-  color: #2A61FF !important;
+  color: #4cacff !important;
+}
+
+a.color-grey-9:hover,
+a.color-grey-8:hover,
+a.color-grey-c:hover {
+  color: #111C24 !important;
 }
 
 /*蓝色*/
 .color-blue {
-  color: #2A61FF !important;
+  color: #4CACFF !important;
-}
-.color-blue-file {
-  color: #4598FA!important;
 }
 /* 绿色 */
+.color-green-file{
+  color: #28BD6C;
+}
 /*主*/
 .color-blue_4C {
   color: #4CACFF !important;
 }
 
+a.color-blue:hover,
+a.color-blue_4C:hover {
+  color: #459BE6 !important;
+}
 
 /*橙色*/
 .color-orange {
@@ -3429,7 +3410,7 @@ a.user_bluebg_btn {
 }
 
 .cdefault {
-  cursor: default!important;
+  cursor: default
 }
 
 
@@ -3604,6 +3585,42 @@ a.user_bluebg_btn {
   margin-right: 5px;
 }
 
+/*-------------------个人主页：右侧提示区域--------------------------*/
+.-task-sidebar {
+  position: fixed;
+  width: 40px;
+  height: 180px;
+  right: 0;
+  bottom: 80px;
+  z-index: 10;
+}
+
+.-task-sidebar div {
+  height: 40px;
+  line-height: 40px;
+  box-sizing: border-box;
+  width: 40px;
+  background: #4CACFF;
+  color: #fff;
+  font-size: 20px;
+  text-align: center;
+  margin-bottom: 5px;
+  border-radius: 4px;
+}
+
+.-task-sidebar div i {
+  color: #fff;
+}
+
+.-task-sidebar div i:hover {
+  color: #fff !important;
+}
+
+.gotop {
+  background-color: rgba(208, 207, 207, 0.5) !important;
+  padding: 0px !important;
+}
+
 
 /***** loading ******/
 /*****载入中******/
@@ -3928,21 +3945,11 @@ html>body #ajax-indicator {
   max-height: 340px;
 }/*头部导航条样式---2018-03-19--by-cs*/
 
-.privateTag{
-  display: block;
-  padding:0px 6px;
-  border-radius: 12px;
-  border:1px solid #2FC25B;
-  height: 18px;
-  line-height: 18px;
-  font-size: 12px;
-  margin-left: 10px;
-  color: #2FC25B;
-}
 .head-nav {
   text-align: center;
   height: 70px;
   box-sizing: border-box;
+  min-width: 780px;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -3964,7 +3971,7 @@ html>body #ajax-indicator {
   cursor: pointer;
   position: relative;
   font-size: 16px;
-  padding-right:40px;
+  padding:0px 20px;
 }
 
 .head-nav ul#header-nav li a {
@@ -4101,6 +4108,21 @@ em.vertical-line {
 
 /* 右侧内容宽度变化的话，需要调整posi-search right的值*/
 
+/*底部*/
+.newFooter {
+  max-height: 110px;
+}
+
+.newFooter {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background: #323232;
+  clear: both;
+  min-width: 1200px;
+  z-index: 8;
+  left: 0px;
+}
 
 .footercon {
   border-bottom: 1px solid #47494d;
@@ -6696,19 +6718,4 @@ ul.count_ul li:not(:last-child):after {
 }
 input.ant-input-lg::placeholder{
 font-size: 14px !important;
-}
-p{
-  margin-bottom: 0px!important;
-}
-.toprightNum{
-  position: absolute;
-  right: 0px;
-  top:4px;
-  color: #999;
-}
-.ant-input, .ant-input .ant-input-suffix{
-  background-color: #fff!important;
-}
-.has-error .ant-input{
-  background-color: #FEF1F0!important;
 }

public/css/merge.css

@@ -1,111 +0,0 @@
-
-.CodeMirror-merge {
-  position: relative;
-  white-space: pre;
-}
-
-.CodeMirror-merge, .CodeMirror-merge .CodeMirror {
-  min-height:50px;
-}
-
-.CodeMirror-merge-2pane .CodeMirror-merge-pane { width: 48%; }
-.CodeMirror-merge-2pane .CodeMirror-merge-gap { width: 4%; }
-.CodeMirror-merge-3pane .CodeMirror-merge-pane { width: 31%; }
-.CodeMirror-merge-3pane .CodeMirror-merge-gap { width: 3.5%; }
-
-.CodeMirror-merge-pane {
-  display: inline-block;
-  white-space: normal;
-  vertical-align: top;
-}
-.CodeMirror-merge-pane-rightmost {
-  position: absolute;
-  right: 0px;
-  z-index: 1;
-}
-
-.CodeMirror-merge-gap {
-    z-index: 2;
-    display: inline-block;
-    height: 100%;
-    -moz-box-sizing: border-box;
-    box-sizing: border-box;
-    overflow: hidden;
-    position: relative;
-    background: #515151;
-}
-
-.CodeMirror-merge-scrolllock-wrap {
-  position: absolute;
-  bottom: 0; left: 50%;
-}
-.CodeMirror-merge-scrolllock {
-  position: relative;
-  left: -50%;
-  cursor: pointer;
-  color: #d8d8d8;
-  line-height: 1;
-}
-
-.CodeMirror-merge-copybuttons-left, .CodeMirror-merge-copybuttons-right {
-  position: absolute;
-  left: 0; top: 0;
-  right: 0; bottom: 0;
-  line-height: 1;
-}
-
-.CodeMirror-merge-copy {
-  position: absolute;
-  cursor: pointer;
-  color: #ce374b;
-  z-index: 3;
-}
-
-.CodeMirror-merge-copy-reverse {
-  position: absolute;
-  cursor: pointer;
-  color: #44c;
-}
-
-.CodeMirror-merge-copybuttons-left .CodeMirror-merge-copy { left: 2px; }
-.CodeMirror-merge-copybuttons-right .CodeMirror-merge-copy { right: 2px; }
-
-.CodeMirror-merge-r-inserted, .CodeMirror-merge-l-inserted {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12MwuCXy3+CWyH8GBgYGJgYkAABZbAQ9ELXurwAAAABJRU5ErkJggg==);
-  background-position: bottom left;
-  background-repeat: repeat-x;
-}
-
-.CodeMirror-merge-r-deleted, .CodeMirror-merge-l-deleted {
-  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAACCAYAAACddGYaAAAAGUlEQVQI12M4Kyb2/6yY2H8GBgYGJgYkAABURgPz6Ks7wQAAAABJRU5ErkJggg==);
-  background-position: bottom left;
-  background-repeat: repeat-x;
-}
-
-.CodeMirror-merge-r-chunk { background: #9a6868; }
-.CodeMirror-merge-r-chunk-start { /*border-top: 1px solid #ee8; */}
-.CodeMirror-merge-r-chunk-end {/* border-bottom: 1px solid #ee8; */}
-.CodeMirror-merge-r-connect { fill:#9a6868;}
-
-.CodeMirror-merge-l-chunk { background: #eef; }
-.CodeMirror-merge-l-chunk-start { border-top: 1px solid #88e; }
-.CodeMirror-merge-l-chunk-end { border-bottom: 1px solid #88e; }
-.CodeMirror-merge-l-connect { fill: #eef; stroke: #88e; stroke-width: 1px; }
-
-.CodeMirror-merge-l-chunk.CodeMirror-merge-r-chunk { background: #dfd; }
-.CodeMirror-merge-l-chunk-start.CodeMirror-merge-r-chunk-start { border-top: 1px solid #4e4; }
-.CodeMirror-merge-l-chunk-end.CodeMirror-merge-r-chunk-end { border-bottom: 1px solid #4e4; }
-
-.CodeMirror-merge-collapsed-widget:before {
-  content: "(...)";
-}
-.CodeMirror-merge-collapsed-widget {
-  cursor: pointer;
-  color: #88b;
-  background: #eef;
-  border: 1px solid #ddf;
-  font-size: 90%;
-  padding: 0 3px;
-  border-radius: 4px;
-}
-.CodeMirror-merge-collapsed-line .CodeMirror-gutter-elt { display: none; }

public/index.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="zh-CN" class="notranslate translated-ltr" translate="no">
+<html lang="en">
 <head>
   <meta charset="utf-8">
   <meta name=”Keywords” Content=”trustie,trustieforge,forge,确实让创建更美好,协同开发平台″>
@@ -8,9 +8,18 @@
   <meta name=”Description” Content=”持续构建协同、共享、可信的软件创建生态开源创作与软件生产相结合，支持大规模群体开展软件协同创新活动”>
   <meta name="theme-color" content="#000000">
   <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
-  
+  <!-- <script type="text/javascript">
-  <link rel="stylesheet" type="text/css" href="%PUBLIC_URL%css/iconfont.css">
+    window.__isR = true;
-  <link rel="stylesheet" type="text/css" href="%PUBLIC_URL%css/edu-purge.css">
+    if (
+      (navigator.userAgent.indexOf('MSIE 9') != -1
+        || navigator.userAgent.indexOf('MSIE 10') != -1)
+      &&
+      location.pathname.indexOf("/compatibility") == -1) {
+      location.href = '/compatibility.html'
+    }
+  </script> -->
+  <link rel=" stylesheet" type="text/css" href="%PUBLIC_URL%css/iconfont.css">
+  <link rel=" stylesheet" type="text/css" href="%PUBLIC_URL%css/edu-purge.css">
   <link rel="stylesheet" type="text/css" href="%PUBLIC_URL%css/editormd.min.css">
   <link rel="stylesheet" type="text/css" href="%PUBLIC_URL%css/merge.css">
   <%= htmlWebpackPlugin.tags.headTags %>
@@ -21,7 +30,6 @@
   <div id="root" class="page -layout-v -fit widthunit"></div>
   <div id="picture_display" style="display: none;"></div>
   <script src="%PUBLIC_URL%js/jquery-1.8.3.min.js"></script>
-  <script src="%PUBLIC_URL%js/js_min_all.js"></script>
   <script src="%PUBLIC_URL%js/codemirror/codemirror.js"></script>
   <script src="%PUBLIC_URL%js/editormd/editormd.min.js"></script>
   <script src="%PUBLIC_URL%js/codemirror/merge/merge.js"></script>

public/js/editormd/editormd.min.js

@@ -3319,9 +3319,9 @@
                     text = text.replace(emailReg, function ($1, $2, $3, $4) {
                         return $1.replace(/@/g, "_#_@_#_");
                     });
-                    // " + editormd.urls.atLinkBase + "" + $2 + "
+
                     text = text.replace(atLinkReg, function ($1, $2) {
-                        return "<span title=\"&#64;" + $2 + "\" class=\"at-link\"> " + $1 + " </span>";
+                        return "<a href=\"" + editormd.urls.atLinkBase + "" + $2 + "\" title=\"&#64;" + $2 + "\" class=\"at-link\">" + $1 + "</a>";
                     }).replace(/_#_&#64;_#_/g, "@");
                 }
 

src/App.css

@@ -60,13 +60,12 @@ body {
 .ant-progress-textno {
   color: #f5222d;
 }
-.CodeMirror pre.CodeMirror-line{
+
-  font-size: 16px!important;
-}
 /* md多空格 */
 .markdown-body p {
   margin:10px 0px!important;
   font-size: 16px !important;
+  line-height: 2 !important;
   white-space: pre-wrap;
 }
 
@@ -88,10 +87,6 @@ body {
   border-left: 1px solid rgb(221, 221, 221);
   /* 某些情况下，被cm盖住了 */
   z-index: 99;
-  padding:8px 8px 50px;
-}
-.editormd-preview .markdown-body{
-  padding:0px !important;
 }
 
 /* 图片点击放大的场景，隐藏图片链接 */

src/App.js

@@ -3,13 +3,19 @@ import './App.css';
 import { ConfigProvider } from 'antd'
 import zhCN from 'antd/lib/locale-provider/zh_CN';
 import {
-	// BrowserRouter as Router,
+	BrowserRouter as Router,
 	Route,
 	Switch
 } from 'react-router-dom';
 import axios from 'axios';
 import LoginDialog from './modules/login/LoginDialog';
-import 'babel-polyfill';
+import Notcompletedysl from './modules/user/Notcompletedysl';
+import Trialapplicationysl from './modules/login/Trialapplicationysl';
+import Trialapplicationreview from './modules/user/Trialapplicationreview';
+import AccountProfile from "./modules/user/AccountProfile";
+import Accountnewprofile from './modules/user/Accountnewprofile';
+import Certifiedprofessional from './modules/modals/Certifiedprofessional';
+
 import Loading from './Loading'
 
 import Loadable from 'react-loadable';
@@ -17,9 +23,10 @@ import marked from './common/marked';
 import moment from 'moment'
 
 import { MuiThemeProvider, createMuiTheme } from 'material-ui/styles';
-import SiderBar from './forge/Component/SiderBar'
 
-import { SnackbarHOC } from 'educoder';
+import history from './history';
+
+import { SnackbarHOC } from 'educoder'
 import { initAxiosInterceptors } from './AppConfig'
 import { Provider } from 'react-redux';
 import configureStore from './redux/stores/configureStore';
@@ -39,16 +46,6 @@ const Projects = Loadable({
 	loader: () => import('./forge/Index'),
 	loading: Loading,
 })
-// forge项目详情
-const ProjectDetail = Loadable({
-  loader: () => import("./forge/Main/DetailAdaptor"),
-  loading: Loading,
-});
-//forge安全设置
-const Security = Loadable({
-	loader: () => import('./forge/SecuritySetting/Index'),
-	loading: Loading,
-})
 //forge项目-devOps详情
 const OpsDetail = Loadable({
 	loader: () => import('./forge/DevOps/opsDetail'),
@@ -79,31 +76,6 @@ const OrganizeIndex = Loadable({
 	loader: () => import('./forge/Team/Index'),
 	loading: Loading,
 })
-const EducoderLogin = Loadable({
-	loader: () => import('./modules/login/EducoderLogin'),
-	loading: Loading,
-})
-const Search = Loadable({
-	loader: () => import('./modules/search/'),
-	loading: Loading,
-})
-const WikiPreview = Loadable({
-	loader: () => import('./forge/Wiki/Preview'),
-	loading: Loading,
-})
-
-const ProjectIndex = Loadable({
-	loader: () => import("./forge/Index"),
-	loading: Loading,
-});
-
-// const CreateMerge = Loadable({
-//   loader: () => import('./forge/Merge/NewMerge'),
-//   loading: Loading,
-// })
-
-// 此处仅维护前端可能的一级路由，不用进行项目或者组织判断的字段。
-const keyWord = ["explore", "settings", "setting", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search", "organize"];
 
 class App extends Component {
 	constructor(props) {
@@ -114,51 +86,6 @@ class App extends Component {
 			mydisplay: false,
 			occupation: 0,
 			mygetHelmetapi: null,
-			pathType: null,
-			pathName: null,
-		}
-	}
-
-	UNSAFE_componentWillMount() {
-		initAxiosInterceptors(this.props);
-		let pathname = window.location.pathname ? window.location.pathname.split('/')[1] : '';
-		pathname && this.getPathnameType(pathname);
-
-		// 添加路由监听，决定组织还是个人
-		this.unlisten = this.props.history.listen((location) => {
-			let newPathname = location.pathname.split('/')[1];
-			if (this.state.pathName !== newPathname) {
-				// this.setState({ pathType: '' });
-				newPathname && this.getPathnameType(newPathname);
-			}
-		});
-	}
-
-	shouldComponentUpdate(nextProps, nextState) {
-		// (!keyWord.includes(this.props.location.pathname.split('/')[1])) &&
-		if (nextProps.location.pathname.split('/')[1] !== this.props.location.pathname.split('/')[1] && nextState.pathType === this.state.pathType) {
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	getPathnameType = (pathname) => {
-		if (!keyWord.includes(pathname)) {
-			let url = `/owners/${pathname}.json`;
-			axios.get(url).then((response) => {
-				if (response && response.status === 200) {
-					this.setState({
-						pathType: response.data.type || '404',
-						pathName: pathname,
-					})
-				}
-			});
-		}else{
-			this.setState({
-				pathType: pathname,
-				pathName: pathname,
-			});
 		}
 	}
 
@@ -175,22 +102,43 @@ class App extends Component {
 			Addcoursestypes: false
 		})
 	};
+	ModalCancelsy = () => {
+		this.setState({
+			mydisplay: false,
+		})
+		window.location.href = "/";
+	};
+	ModalshowCancelsy = () => {
+		this.setState({
+			mydisplay: true,
+		})
+	};
 
+	disableVideoContextMenu = () => {
+		window.$("body").on("mousedown", "video", function (event) {
+			if (event.which === 3) {
+				window.$('video').bind('contextmenu', function () { return false; });
+			} else {
+				window.$('video').unbind('contextmenu');
+			}
+		});
+	}
 	componentDidMount() {
 		document.title = "loading...";
+		this.disableVideoContextMenu();
+		history.listen(() => {
+			this.forceUpdate()
+			const $ = window.$
+			$("html").animate({ scrollTop: $('html').scrollTop() - 0 })
+		});
 
+		initAxiosInterceptors(this.props);
 		this.getAppdata();
 
 		window.addEventListener('error', (event) => {
 			const msg = `${event.type}: ${event.message}`;
 		});
-
 	}
-
-	componentWillUnmount() {
-		this.unlisten && this.unlisten(); // 执行解绑
-	}
-
 	//修改登录方法
 	Modifyloginvalue = () => {
 		this.setState({
@@ -261,139 +209,68 @@ class App extends Component {
 	};
 
 	render() {
-		const { mygetHelmetapi, pathType} = this.state;
-		let personal = mygetHelmetapi && mygetHelmetapi.personal;
 		return (
 			<Provider store={store}>
 				<ConfigProvider locale={zhCN}>
 					<MuiThemeProvider theme={theme}>
+						{/* <Accountnewprofile {...this.props}{...this.state} /> */}
 						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
-						<SiderBar />
+						{/* <Notcompletedysl {...this.props} {...this.state}></Notcompletedysl> */}
-						{/* <Router> */}
+						{/* <Trialapplicationysl  {...this.props} {...this.state}></Trialapplicationysl> */}
-						<Switch>
+						{/* <Trialapplicationreview  {...this.props} {...this.state}></Trialapplicationreview> */}
-							{/* wiki预览 */}
+						{/* <AccountProfile {...this.props} {...this.state} /> */}
-							<Route path="/:owner/:projectsId/wiki/preview/:projectName/:projectId" render={
+						{/* <Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.ModalCancelsy} ModalshowCancelsy={this.ModalshowCancelsy} /> */}
-								(props) => {
+						<Router>
-									return (<WikiPreview {...this.props} {...props} {...this.state} />)
+							<Switch>
-								}
+								{/*项目*/}
-							} />
+								<Route
-
+									path={"/projects/:owner/:projectId/devops/:opsId/detail"}
-							{/* 项目PR */}
+									render={
-							<Route path="/:owner/:projectsId/compare"
+										(props) => {
-								render={
+											return (<OpsDetail {...this.props} {...props} {...this.state} />)
-									(props) => (<ProjectDetail {...this.props} {...props} {...this.state} />)
-								}
-							></Route>
-
-							{/*项目*/}
-							<Route
-								path={"/:owner/:projectId/devops/:opsId/detail"}
-								render={
-									(props) => {
-										return (<OpsDetail {...this.props} {...props} {...this.state} />)
-									}
-								}>
-							</Route>
-							<Route
-								path={"/settings"}
-								render={
-									(props) => {
-										return (<Security {...this.props} {...props} {...this.state} />)
-									}
-								}>
-							</Route>
-
-							<Route
-								path="/register"
-								render={
-									(props) => {
-										return (<EducoderLogin {...this.props} {...props} {...this.state} />)
-									}
-								}
-							/>
-							{/*403*/}
-							<Route path="/403" component={Shixunauthority} />
-
-							<Route path="/500" component={http500} />
-
-							{/*404*/}
-							<Route path="/nopage" component={Shixunnopage} />
-
-							{/* 查询 */}
-							<Route path="/search" component={Search} />
-
-							<Route exact path="/explore"
-								render={
-									(props) => (
-											<ProjectIndex {...this.props} {...props} />
-									)
-								}
-							/>
-
-
-							{/* 组织 */}
-							<Route path={"/organize"}
-								render={
-									(props) => {
-										return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
-									}
-								}>
-							</Route>
-							
-							{/*新建项目等*/}
-							<Route
-								path={"/projects"}
-								render={
-									(props) => {
-										return (<Projects {...this.props} {...props} {...this.state} />)
-									}
-								}>
-							</Route>
-
-							{/* 判断为用户/组织，并进入对应页面 */}
-							{
-								pathType === 'User' ?
-									<Route exact path="/:username"
-										render={
-											(props) => {
-												return (<InfosIndex {...this.props} {...this.state} />)
-											}
 										}
-									/> : pathType === 'Organization' ? <Route path={"/:OIdentifier"}
+									}>
-										render={
+								</Route>
-											(props) => {
+								{/*项目*/}
-												return (<OrganizeIndex {...props} {...this.props} {...this.state} />)
+								<Route
-											}
+									path={"/projects"}
-										}>
+									render={
-									</Route> : pathType === '404' ? <Route component={Shixunnopage} />:
+										(props) => {
-										<Route exact path="/"
+											return (<Projects {...this.props} {...props} {...this.state} />)
-											render={
+										}
-												(props) => (
+									}>
-													personal && personal.length > 0 ?
+								</Route>
-														<InfosIndex {...this.props} {...props} />
+								
-														:
+								{/*403*/}
-														<ProjectIndex {...this.props} {...props} />
+								<Route path="/403" component={Shixunauthority} />
-												)
-											}
-										/>
-								// <Route path="/" component={Loading} />
-								// <Route path="/" component={Shixunnopage} /> 
-							}
 
-
+								<Route path="/500" component={http500} />
-
+								<Route path={"/organize"}
-							{/* 个人主页 */}
+									render={
-							<Route path="/:username"
+										(props) => {
-								render={
+											return (<OrganizeIndex {...this.props} {...props} {...this.state} />)
-									(props) => {
+										}
-										return (<InfosIndex {...this.props} {...this.state} />)
+									}>
-									}
+								</Route>
+								{/*404*/}
+								<Route path="/nopage" component={Shixunnopage} />
+								{/* 个人主页 */}
+								<Route path="/users/:username"
+									render={
+										(props) => {
+											return (<InfosIndex {...this.props} {...this.state} />)
+										}
 								}></Route>
-
+								<Route exact path="/"
-
+									render={
-							<Route component={Shixunnopage} />
+										(props) => (
-						</Switch>
+											<Projects {...this.props} {...props} {...this.state}></Projects>
-						{/* </Router> */}
+										)
+									}
+								/>
+								<Route component={Shixunnopage} />
+							</Switch>
+						</Router>
 					</MuiThemeProvider>
 				</ConfigProvider>
 			</Provider>

src/AppConfig.js

@@ -2,17 +2,19 @@ import axios from 'axios';
 import { requestProxy } from "./indexEduplus2RequestProxy";
 import { broadcastChannelOnmessage, isDev, queryString } from 'educoder';
 import { notification } from 'antd';
-
+import cookie from 'react-cookies';
 import './index.css';
-
 let message501 = false;
+
 broadcastChannelOnmessage('refreshPage', () => {
-  window.location.reload();
+  window.location.reload()
 })
 
 function locationurl(list) {
-  if (window.location.port !== "3007") {
+  if (window.location.port === "3007") {
-  window.location.href = list
+
+  } else {
+    window.location.href = list
   }
 }
 // TODO 开发期多个身份切换
@@ -24,22 +26,56 @@ if (isDev) {
     parsed = queryString.parse(_search);
   }
   debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
-  window.location.search.indexOf('debug=s') !== -1 ? 'student' :
+    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 || 'admin'
-}                 
+}
+function clearAllCookie() {
+  cookie.remove('_educoder_session', { path: '/' });
+  cookie.remove('autologin_trustie', { path: '/' });
+  setpostcookie()
+}
+clearAllCookie();
+function setpostcookie() {
+  const str = window.location.pathname;
+  if (str.indexOf("/wxcode") !== -1) {
+    console.log("123")
+    cookie.remove('_educoder_session', { path: '/' });
+    cookie.remove('autologin_trustie', { path: '/' });
+    const _params = window.location.search;
+    if (_params) {
+      let _search = _params.split('?')[1];
+      let _educoder_sessions = _search.split('&')[0].split('=');
+      cookie.save('_educoder_session', _educoder_sessions[1], { domain: '.educoder.net', path: '/' });
+      let autologin_trusties = _search.split('&')[1].split('=');
+      cookie.save('autologin_trustie', autologin_trusties[1], { domain: '.educoder.net', path: '/' });
+    }
+  }
+}
+setpostcookie();
+
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
-  // 判断网络是否连接
+  initOnlineOfflineListener()
-  initOnlineOfflineListener();
+  // TODO 避免重复的请求 https://github.com/axios/axios#cancellation
+  var
+    proxy = "http://localhost:3000"
+    proxy = "https://testforgeplus.trustie.net"
 
-  var proxy = "https://testforgeplus.trustie.net";
+  const requestMap = {};
+  window.setfalseInRequestMap = function (keyName) {
+    requestMap[keyName] = false;
+  }
   //响应前的设置
   axios.interceptors.request.use(
     config => {
-      if(config.url.indexOf("http") !== -1) {
+      setpostcookie()
+      clearAllCookie()
+
+      if (config.url.indexOf(proxy) !== -1 || config.url.indexOf(':') !== -1) {
         return config
       }
-      requestProxy(config);
+      requestProxy(config)
+
       let url = `/api${config.url}`;
 
       if (`${config[0]}` !== `true`) {
@@ -53,12 +89,18 @@ export function initAxiosInterceptors(props) {
         } else {
           config.url = url;
         }
+        setpostcookie();
+      }
+      if (config.url.indexOf('update_file') === -1) {
+        requestMap[config.url] = true;
+
+        window.setTimeout("setfalseInRequestMap('" + config.url + "')", 900)
       }
       return config;
     },
     err => {
       return Promise.reject(err);
-  });
+    });
 
   axios.interceptors.response.use(function (response) {
     if (response === undefined) {
@@ -85,10 +127,7 @@ export function initAxiosInterceptors(props) {
     }
 
     if (response.data.status === 404) {
-      let responseURL = response.request ? response.request.responseURL:'';
+      locationurl('/nopage');
-      if (responseURL.indexOf('/api/users/') === -1 && responseURL.indexOf('/api/organizations/') === -1 ) {
-        locationurl('/nopage');
-      }
     }
 
     if (response.data.status === 500) {
@@ -110,6 +149,8 @@ export function initAxiosInterceptors(props) {
         message501 = false
       }, 2000);
     }
+    requestMap[response.config.url] = false;
+    setpostcookie();
     return response;
   }, function (error) {
     return Promise.reject(error);

src/Loading.js

@@ -9,7 +9,20 @@ class Loading extends Component {
 	}
 
 	render() {
-		return ""
+		return (
+			<div className="App" style={{ minHeight: '800px', width: "100%" }}>
+				<style>
+					{
+						`
+						 .margintop{
+						   margin-top:20%;
+						 }
+						`
+					}
+				</style>
+				<Spin size="large" className={"margintop"} />
+			</div>
+		);
 	}
 }
 

src/college/College.js

@@ -195,7 +195,7 @@ class College extends Component {
 					align: 'center',
 					className: "edu-txt-center font-14 maxnamewidth105",
 					render: (text, record) => (
-						<a href={`/${record.login}`} title={record.name} target="_blank"  className="task-hide maxnamewidth105" style={{
+						<a href={`/users/${record.login}`} title={record.name} target="_blank"  className="task-hide maxnamewidth105" style={{
 							color:'#007bff',
 
 						}}>	{

src/college/colleagecss/colleage.css

@@ -218,7 +218,7 @@ a:hover {
 }
 
 .color-blue {
-  color: #2A61FF;
+  color: #4CACFF;
 }
 
 .color-huang {

src/common/DateUtil.js

@@ -1,5 +1,4 @@
 import moment  from "moment";
-import { number } from "prop-types";
 
 // 处理整点 半点
 // 取传入时间往后的第一个半点
@@ -98,41 +97,3 @@ export function formatDuring(mss){
 	}
   return days + "天" + hours + "小时" + minutes + "分";
 }
-
-/*
-  返回：多久以前
-  backDate：以前的某个日期
-*/
-export function timeAgo(backDate) {
-  try {
-    moment(backDate);
-  } catch (e) {
-    return '刚刚';
-  }
-  if(typeof backDate ==='number'){
-    backDate=backDate*1000
-  }else{
-    backDate= moment(backDate);
-  }
-  let time = new Date() - backDate;
-  var days = Math.floor(time / (1000 * 60 * 60 * 24));
-  var hours = Math.floor((time % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
-  var minutes = Math.floor((time % (1000 * 60 * 60)) / (1000 * 60));
-  var seconds = Math.floor((time % (1000 * 60 * 60)) / 1000);
-  if (time <= 0) {
-    return "刚刚";
-  }
-  if (days) {
-    return days + "天前";
-  }
-  if (hours) {
-    return hours + "小时前";
-  }
-  if (minutes) {
-    return minutes + "分前";
-  }
-  if (seconds) {
-    return seconds + "秒前";
-  }
-  return "刚刚";
-}

src/common/TextUtil.js

@@ -69,7 +69,7 @@ export function appendFileSizeToUploadFile(item) {
 }
 export function appendFileSizeToUploadFileAll(fileList) {
     return fileList.map(item => {
-        if (item.name.indexOf(uploadNameSizeSeperator) === -1) {
+        if (item.name.indexOf(uploadNameSizeSeperator) == -1) {
             return Object.assign({}, item, { name: `${item.name}${uploadNameSizeSeperator}${bytesToSize(item.size)}` })
         }
         return item

src/common/UrlTool.js

@@ -15,24 +15,7 @@ export function getImageUrl(path) {
 	if (isDev) {
 		return `${local}/${path}`
 	}
-	return `${path}`;
+	return `/${path}`;
-}
-
-export function numFormat(num, digits){
-	let d = digits || 1;
-  var si = [
-    { value: 1, symbol: "" },
-    { value: 1E3, symbol: "k" },
-    { value: 1E4, symbol: "W" }
-  ];
-  var rx = /\.0+$|(\.[0-9]*[1-9])0+$/;
-  var i;
-  for (i = si.length - 1; i > 0; i--) {
-    if (num >= si[i].value) {
-      break;
-    }
-  }
-  return (num / si[i].value).toFixed(d).replace(rx, "$1") + si[i].symbol;
 }
 
 export function getImage(path) {
@@ -179,28 +162,28 @@ export function getmyUrl(geturl) {
 }
 
 export function getUploadActionUrl(path, goTest) {
-	return `${getUrl()}/api/attachments.json${isDev ?`${isDev ?`?debug=${window._debugType || 'admin'}` : ""}` : ""}`;
+	return `${getUrl()}/api/attachments.json?debug=${window._debugType || 'admin'}`;
 }
 
 export function getUploadLogoActionUrl() {
-	return `${getUrl()}/api/resumes/logo.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`;
+	return `${getUrl()}/api/resumes/logo.json?debug=${window._debugType || 'admin'}`;
 }
 
 export function getUploadActionUrltwo(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_data_sets.json?debug=${window._debugType || 'admin'}`
 }
 
 export function getUploadActionUrlthree() {
-	return `${getUrlmys()}/api/jupyters/import_with_tpm.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrlmys()}/api/jupyters/import_with_tpm.json?debug=${window._debugType || 'admin'}`
 }
 
 export function getupload_git_file(id) {
-	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrlmys()}/api/shixuns/${id}/upload_git_file.json?debug=${window._debugType || 'admin'}`
 }
 
 
 export function getUploadActionUrlOfAuth(id) {
-	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json${isDev ?`?debug=${window._debugType || 'admin'}` : ""}`
+	return `${getUrl()}/api/users/accounts/${id}/auth_attachment.json?debug=${window._debugType || 'admin'}`
 }
 
 export function getRandomNumber(type) {

src/common/components/comment/CommentItem.js

@@ -64,7 +64,7 @@ function CommentItem({
   const commentAvatar = (author) => (
     <img
       className="item-flex flex-image"
-      src={author.image_url ? getImageUrl(`/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
+      src={author.image_url ? getImageUrl(`images/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
       alt=""
     />
   );

src/common/components/comment/util.js

@@ -38,11 +38,13 @@ export const formatDelta = (deltas) => {
             alt="${alt}"
           />
         `;
+        // text = "<img src="+url+" width='60px' height='30px' onclick='' alt="+alt+"/>";
       }
     }
 
     formatted.push(text);
   });
+  console.log(formatted);
   return formatted.join('');
 }
 

src/common/educoder.js

@@ -3,7 +3,7 @@
 // export { default as OrderStateUtil } from          '../routes/Order/components/OrderStateUtil';
 
 export {
-	getUploadLogoActionUrl as getUploadLogoActionUrl,numFormat as numFormat,
+	getUploadLogoActionUrl as getUploadLogoActionUrl,
 	getImageUrl as getImageUrl,getImage as getImage, getmyUrl as getmyUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
 	, getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
 	, getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode, getupload_git_file as getupload_git_file, getcdnImageUrl as getcdnImageUrl
@@ -27,7 +27,7 @@ export {
 	markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
 	downloadFile, sortDirections, validateLength, mdJSONParse, exportMdtoHtml
 } from './TextUtil'
-export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds ,timeAgo} from './DateUtil'
+export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds } from './DateUtil'
 
 export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from './util/ShareUtil'
 
@@ -76,4 +76,10 @@ export { default as AliyunUploader } from './components/media/AliyunUploader'
 export { default as ImageLayer2 } from './hooks/ImageLayer2'
 
 // 外部
+export { default as CBreadcrumb } from '../modules/courses/common/CBreadcrumb'
 export { CNotificationHOC as CNotificationHOC } from '../modules/courses/common/CNotificationHOC'
+export { default as ModalWrapper } from '../modules/courses/common/ModalWrapper'
+export { default as NoneData } from '../modules/courses/coursesPublic/NoneData'
+
+export { default as WordNumberTextarea } from '../modules/modals/WordNumberTextarea'
+

src/common/marked.js

@@ -48,15 +48,15 @@ function buildToc(coll, k, level, ctx) {
     });
     ctx.push("</ul>")
   }
-  ctx.push("</li>");
+  ctx.push("</li>")
   k = buildToc(coll, k, level, ctx)
   return k
 }
 
 export function getTocContent() {
-  buildToc(toc, 0, 0, ctx);
+  buildToc(toc, 0, 0, ctx)
-  ctx.push("</ul>");
+  ctx.push("</ul>")
-  return ctx.join("");
+  return ctx.join("")
 }
 
 const tokenizer = {
@@ -157,6 +157,7 @@ renderer.heading = function (text, level, raw) {
   })
   return '<h' + level + ' id="' + anchor + '">' + text + '</h' + level + '>'
 }
+
 marked.setOptions({
   silent: true,
   smartypants: true,

src/components/render-html.jsx

@@ -1,67 +1,46 @@
-import React, { useEffect, useRef, useMemo } from 'react'
+import React, { useEffect, useRef, useMemo } from "react";
-import 'katex/dist/katex.min.css'
+import "katex/dist/katex.min.css";
-import marked, { getTocContent, cleanToc, getMathExpressions, resetMathExpressions } from '../common/marked';
+import { renderToString } from 'katex';
+import marked, { getTocContent, cleanToc, getMathExpressions, resetMathExpressions } from "../common/marked";
 import 'code-prettify'
-import dompurify from 'dompurify';
-
-import { renderToString } from 'katex'
 
 const preRegex = /<pre[^>]*>/g
+
 function _unescape(str) {
   let div = document.createElement('div')
   div.innerHTML = str
-  return div.childNodes.length === 0 ? "" : div.childNodes[0].nodeValue
+  return div.childNodes.length === 0 ? "" : div.childNodes[0].nodeValue;
 }
 
+export default ({ value = '', className, style = {} }) => {
+  let str = String(value)
 
-
-export default ({
-  value = '',
-  className,
-  style = {},
-  url
-}) => {
-  let str = String(value);
   const html = useMemo(() => {
-    let rs = marked(str);
+    let rs = marked(str)
-    const math_expressions = getMathExpressions();
+    const math_expressions = getMathExpressions()
     if (str.match(/\[TOC\]/)) {
       rs = rs.replace("<p>[TOC]</p>", getTocContent())
       cleanToc()
     }
     rs = rs.replace(/(__special_katext_id_\d+__)/g, (_match, capture) => {
       const { type, expression } = math_expressions[capture]
-      return renderToString(_unescape(expression) || '', { displayMode: type === 'block', throwOnError: false, output: 'html' })
+      return renderToString(_unescape(expression), { displayMode: type === 'block', throwOnError: false, output: 'html' })
     })
     rs = rs.replace(/▁/g, "▁▁▁")
     resetMathExpressions()
-    return dompurify.sanitize(rs)
+    return rs
-  }, [str]);
+  }, [str])
 
-  // 锚点跳转，链接地址里含#对应的id
+  const el = useRef()
-  useEffect(()=>{
-    if(url && url.hash && html){
-      let u = url.hash;
-      if(u){
-        let id = decodeURIComponent(u.split("#")[1]);
-        let ele = document.getElementById(id);
-        if(ele){
-          window.scrollTo(0, ele.offsetTop + 120);
-        }
-      }
-    }
-  },[url,html])
-
-  const el = useRef();
   function onAncherHandler(e) {
-    let target = e.target;
+    let target = e.target
     if (target.tagName.toUpperCase() === 'A') {
-      let ancher = target.getAttribute('href');
+      let ancher = target.getAttribute('href')
-      if (ancher && ancher.startsWith('#')) {
+      if (ancher.startsWith('#')) {
         e.preventDefault()
         let viewEl = document.getElementById(ancher.replace('#', ''))
         if (viewEl) {
-          viewEl.scrollIntoView(true)
+          viewEl.parentNode.scrollTop = viewEl.offsetTop
         }
       }
     }
@@ -82,12 +61,6 @@ export default ({
       }
     }
   }, [html, el.current, onAncherHandler])
-  return (
+
-    <div
+  return (<div ref={el} style={style} className={`${className ? className : ''} markdown-body`} dangerouslySetInnerHTML={{ __html: html }}></div>)
-      ref={el}
-      style={style}
-      className={`${className ? className : ''} markdown-body`}
-      dangerouslySetInnerHTML={{ __html: html }}
-    ></div>
-  )
 }

src/context/TPIContextProvider.js

@@ -435,11 +435,11 @@ class TPIContextProvider extends Component {
 		image_url: "avatars/User/1"
 		login: "innov"
 		name: "Coder"
-		user_url: "/innov"
+		user_url: "/users/innov"
 		 */
 		let user = resData.user;
 		user.username = resData.user.name;
-		user.user_url = `/${resData.user.login}`;
+		user.user_url = `/users/${resData.user.login}`;
 		// user.image_url = resData.image_url;
 		user.is_teacher = resData.is_teacher;
 		resData.user = user;

src/forge/About/Index.jsx

@@ -67,17 +67,18 @@ function Index(props){
   }
   return(
     <div className="aboutPanels">
+      
       <div className="aboutContent">
-        <AlignCenterBetween style={{padding:"14px 20px"}}>
+        <AlignCenterBetween style={{padding:"14px 0px"}}>
-          <span className="font-16"><i className="iconfont icon-xiangmujianjie mr5 font-16 color-blue"></i>项目概览</span>
+          <span className="font-16"><i className="iconfont icon-xiangmujianjie mr5 font-16 color-blue"></i>项目简介</span>
           { editOpration && !edit && <a onClick={editContent} className="color-blue">编辑</a> }
         </AlignCenterBetween>
         {
           edit ? 
-          <div className="padding20">
+          <div>
             <MDEditor
               placeholder={"请输入描述信息"}
-              height={500}
+              height={200}
               mdID={"order-new-description"}
               initValue={content}
               onChange={onContentChange}
@@ -113,11 +114,11 @@ function Index(props){
             </div>
           </div>
           :
-          <div className="padding20">
+          <div style={{padding:"20px 0px"}}>
             {content ? 
-              <RenderHtml className="break_word_comments imageLayerParent" value={content} url={props.history.location}/>
+              <RenderHtml className="break_word_comments imageLayerParent" value={content} />
               :
-              <div>暂无概览~</div>
+              <div>暂无简介~</div>
             }
             {attachments && attachments.length > 0 &&
               <Attachments

src/forge/About/index.scss

@@ -4,6 +4,7 @@
   .aboutContent{
     border-radius: 2px;
     border: 1px solid #EEEEEE;
+    padding:0px 30px;
     width:100%;
     background-color: #fff;
     margin-top:20px;

src/forge/Activity/Activity.js

@@ -1,7 +1,7 @@
 import React , { Component } from 'react';
 import { Dropdown , Menu , Icon , Pagination , Spin } from 'antd';
 import '../css/index.scss';
-import '../Branch/branch.scss';
+import '../Branch/branch.css';
 import './activity.css';
 import NoneData from '../Nodata';
 
@@ -10,10 +10,6 @@ import ActivityItem from './ActivityItem';
 import axios from 'axios';
 const LIMIT = 15;
 const ARRAY = [
-  {
-    id:"",
-    name:'全部'
-  },
   {
     id:1,
     name:'1天'
@@ -36,15 +32,10 @@ class Activity extends Component{
   constructor(props){
     super(props);
     this.state={
-      time:undefined,
+      time:'30',
       type:undefined,
       state:undefined,
       page:1,
-      pr_count:undefined,
-      new_pr_count:undefined,
-      close_issues_count:undefined,
-      open_issues_count:undefined,
-      pr_all_count:undefined,issues_count:undefined,
 
       data:undefined,
       project_trends:undefined,
@@ -72,15 +63,8 @@ class Activity extends Component{
         this.setState({
           data:result.data,
           project_trends:result.data.project_trends,
-          isSpin:false,
+          isSpin:false
-          pr_count:result.data.pr_count,
-          new_pr_count:result.data.new_pr_count,
-          close_issues_count:result.data.close_issues_count,
-          open_issues_count:result.data.open_issues_count,
-          pr_all_count:result.data.pr_all_count,
-          issues_count:result.data.issues_count,
         })
-        window.scrollTo(0,0);
       }
     }).catch(error=>{
       console.log(error);
@@ -90,19 +74,19 @@ class Activity extends Component{
   // 切换周期
   changeTime=(e)=>{
     this.setState({
-      time:e.key ==="item_0"?undefined:e.key,
+      time:e.key,
       isSpin:true
     })
     const { type,status,page } = this.state;
-    this.getInfo(e.key ==="item_0"?undefined:e.key,type,status,page);
+    this.getInfo(e.key,type,status,page);
   }
    //筛选
    changeTrends=(type,status)=>{
     this.setState({
-      type,status,page:1
+      type,status
     })
-    const {time}=this.state;
+    const {time,page}=this.state;
-    this.getInfo(time,type,status,1);
+    this.getInfo(time,type,status,page);
    }
   // 分页
   ChangePage=(page)=>{
@@ -124,14 +108,12 @@ class Activity extends Component{
     </Menu>
   )
   render(){
-    const { time , data , page , project_trends , isSpin , pr_count , new_pr_count , close_issues_count , open_issues_count , pr_all_count ,issues_count } = this.state;
+    const { time , data , page , project_trends , isSpin } = this.state;
-    let name = time ? ARRAY.filter(item=>item.id === parseInt(time)) :[{name:"全部"}];
 
-    const first_per = pr_all_count > 0 ? `${parseFloat(pr_count/pr_all_count).toFixed(2)*100}%` :"50%";
+    let name = time && ARRAY.filter(item=>item.id === parseInt(time)) ;
-    const second_per =pr_all_count > 0 ? `${parseFloat(new_pr_count/pr_all_count).toFixed(2)*100}%` :"50%";
+    const second_per = (parseInt(data && data.close_issues_count)/parseInt(data && data.issues_count)*100)+'%';
-    const third_per =issues_count > 0 ?`${parseFloat(close_issues_count/issues_count).toFixed(2)*100}%` :"50%";
+    const third_per = (parseInt(data && data.close_issues_count)/parseInt(data && data.issues_count)*100)+'%';
-    const fourth_per =issues_count > 0 ?`${parseFloat(open_issues_count/issues_count).toFixed(2)*100}%` :"50%";
+    const fourth_per = (parseInt(data && data.open_issues_count)/parseInt(data && data.issues_count)*100)+'%';
-    
     return(
       <div className="main">
         
@@ -140,7 +122,7 @@ class Activity extends Component{
           <div className="orderInfo">
             <div>
               <div className="percentLine prPercent">
-                <p className="percent_purple" style={{width:first_per}}></p>
+                <p className="percent_purple" style={{width:'100%'}}></p>
                 <p className="percent_green resetStyle" style={{width:`${second_per}`}}></p>
               </div>
               <span>{data && data.pr_all_count}合并请求</span>
@@ -150,25 +132,25 @@ class Activity extends Component{
                 <p className="percent_red" style={{width:`${third_per}`}}></p>
                 <p className="percent_green" style={{width:`${fourth_per}`}}></p>
               </div>
-              <span>{data && data.issues_count}易修</span>
+              <span>{data && data.issues_count}任务</span>
             </div>
           </div>
           <ul className="percentBox">
             <li>
               <span className="purple">{data && data.pr_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("PullRequest","delay")}>已处理的合并请求</span>
+              <span className="change" onClick={()=>this.changeTrends("PullRequest","close")}>已处理的合并请求</span>
             </li>
             <li>
               <span className="green">{data && data.new_pr_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("PullRequest","not_delay")}>未处理的合并请求</span>
+              <span className="change" onClick={()=>this.changeTrends("PullRequest","create")}>未处理的合并请求</span>
             </li>
             <li>
               <span className="red">{data && data.close_issues_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("Issue","delay")}>已关闭的易修</span>
+              <span className="change" onClick={()=>this.changeTrends("Issue","close")}>已关闭的任务</span>
             </li>
             <li>
               <span className="green">{data && data.open_issues_count}</span>
-              <span className="change" onClick={()=>this.changeTrends("Issue","not_delay")}>未处理的易修</span>
+              <span className="change" onClick={()=>this.changeTrends("Issue","create")}>未处理的任务</span>
             </li>
           </ul>
         </div>

src/forge/Activity/ActivityItem.js

@@ -14,26 +14,26 @@ class ActivityItem extends Component {
           {/* 如果是版本发布 */}
           {item.trend_type === "VersionRelease" ?
           <p className="itemLine">
-            <Link to={`/${owner}/${projectsId}/releases`} className="color-blue font-16">{item.name}</Link>
+            <Link to={`/projects/${owner}/${projectsId}/version`} className="color-blue font-16">{item.name}</Link>
             <span className="activity_type">{item.trend_type}</span>
           </p >
           :
           // 如果是任务
           item.trend_type === "Issue" ?
             <p className="itemLine">
-              <Link to={`/${owner}/${projectsId}/issues/${item.trend_id}`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/projects/${owner}/${projectsId}/issues/${item.trend_id}/detail`} className="color-blue font-16">{item.name}</Link>
               <span className="activity_type">{item.trend_type}</span>
             </p >
             :
             // 如果是合并请求
             <p className="itemLine">
-              <Link to={`/${owner}/${projectsId}/pulls/${item.trend_id}`} className="color-blue font-16">{item.name}</Link>
+              <Link to={`/projects/${owner}/${projectsId}/pulls/${item.trend_id}/Messagecount`} className="color-blue font-16">{item.name}</Link>
               <span className="activity_type">{item.trend_type}</span>
             </p >
           }
           <p className="itemLine mt10">
-            <Link to={`/${item && item.user_login}`} className="show-user-link">
+            <Link to={`/users/${item && item.login}`} className="show-user-link">
-              <img alt="" src={getImageUrl(`/${item.user_avatar}`)} className="createImage" />
+              <img alt="" src={getImageUrl(`images/${item.user_avatar}`)} className="createImage" />
               <span className="mr20">{item.user_name}</span>
             </Link>
             {item.created_at && <span className="color-grey-9">创建于<span className="ml2 color-grey-6">{item.created_at}</span></span>}

src/forge/Branch/CloneAddress.js

@@ -1,27 +1,39 @@
-import React, { useState } from 'react';
+import React, { Component } from 'react';
-import { Menu } from 'antd';
+import { Dropdown, Icon, Tooltip } from 'antd';
-import "./branch.scss";
+import "./branch.css";
-import CopyTool from '../Component/CopyTool';
 
-function CloneAddress({http_url , ssh_url , zip_url , tar_url}) {
+class CloneAddress extends Component {
-  const [ key , setKey ] = useState("HTTP");
+  // 点击按钮复制功能
-  return (
+  jsCopy = () => {
-    <div className="downMenu">
+    var e = document.getElementById("copy_rep_content");
-      <div style={{borderBottom:"1px solid #eee"}}>
+    e.select();
-        <Menu className="urlMenu" selectedKeys={[key]} mode={"horizontal"}>
+    document.execCommand("Copy");
-          <Menu.Item key="HTTP" onClick={(e)=>{setKey(e.key)}}>HTTP</Menu.Item>
+  }
-          <Menu.Item key="SSH" onClick={(e)=>{setKey(e.key)}}>SSH</Menu.Item>
+
-        </Menu>
+  render() {
-        <div className="gitAddressClone">
+    const { http_url, downloadUrl } = this.props;
-          <input type="text" id="copy_rep_content" value={key==="HTTP" ? http_url:ssh_url} />
+    return (
-          <CopyTool inputId="copy_rep_content" className="copytool"/>
+      <div className="gitAddressClone">
-        </div>
+        {/* <p className="addressTips"><span>版本库地址已变更，请基于新地址提交代码</span></p> */}
+        {
+          http_url && <span>HTTP</span>
+        }
+        <input type="text" id="copy_rep_content" value={http_url} />
+        <Tooltip title="复制链接">
+          <span className="color-blue" onClick={() => this.jsCopy()}><i className="iconfont icon-fuzhi"></i></span>
+        </Tooltip>
+        {
+          downloadUrl &&
+          <span>
+            <Dropdown overlay={downloadUrl} trigger={['click']} placement="bottomRight">
+              <a className="ant-dropdown-link">
+                <Icon type="cloud-download" className="font-18 fl color-blue" />
+              </a>
+            </Dropdown>
+          </span>
+        }
       </div>
-      <Menu className="edu-txt-center">
+    )
-        <Menu.Item><a href={zip_url}>下载 ZIP</a></Menu.Item>
+  }
-        <Menu.Item><a href={tar_url}>下载 TAR.GZ</a></Menu.Item>
-      </Menu>
-    </div>
-  )
 }
 export default CloneAddress;

src/forge/Branch/Select.jsx

@@ -1,65 +1,110 @@
-import React , { useState , useEffect , useRef } from 'react';
+import React , { useState , useEffect } from 'react';
-import { Dropdown} from 'antd';
+import { Popover , Input , Spin } from 'antd';
-import './branch.scss';
+import './branch.css';
-import SelectOverlay from './SelectOverlay';
+import { getBranch , getTag } from '../GetData/getData';
-import { findDOMNode } from 'react-dom';
 
-export default (({ projectsId , branch , owner , changeBranch , branchList , tagflag = true })=>{
+
+export default (({ projectsId , repo_id , changeBranch , branch , owner })=>{
   const [ showValue , setShowValue ] = useState(branch);
-  const [ visible , setVisible ] = useState(false);
+  const [ inputValue , setInputValue] = useState(undefined);
+  const [ nav , setNav ] = useState(0);
+  const [ isSpin , setIsSpin ] = useState(true);
+  const [ flag , setFlag ] = useState(false);
 
-  const refFa = useRef(null);
+  const [ data , setData ] = useState(undefined);
-  const refBox = useRef(null);
+  const [ datas , setDatas ] = useState(undefined);
-
-  useEffect(() => {
-    document.addEventListener('click', clickMe , false);
-  }, [])
-
-  const clickMe = ({ target }) => {
-    // 查找父组件
-    const faComponent = findDOMNode(refFa.current);
-    const boxComponent = findDOMNode(refBox.current);
-
-    if (faComponent && boxComponent) {
-      const isChild = faComponent.contains(target);
-      const isBox = boxComponent.contains(target);
-      if(!isChild && !isBox){
-        setVisible(false);
-      }
-    }
-  }
 
   useEffect(()=>{
     setShowValue(branch);
   },[branch])
+  useEffect(()=>{
+    document.body.addEventListener('click', e => {
+      let name = e.target.className;
+      let turn = name == "ant-input OptionsInput" || name == "navli active"|| name == "navli" || name == "padding10 bor-bottom-greyE";
+      if(turn){
+        return;
+      }else{
+        setFlag(false);
+      }
+    })
+  })
 
-  function ChangeB(params) {
+  useEffect(()=>{
-    setVisible(false);
+    getBranchs(projectsId,owner);
-    changeBranch(params);
+  },[projectsId])
+
+
+  async function getBranchs(id,owner){
+    let result = await getBranch(id,owner);
+    setData(result);
+    setDatas(result);
+    setIsSpin(false);
+  }
+  async function getTags(id,owner){
+    let result = await getTag(id,owner);
+    setData(result);
+    setDatas(result);
+    setIsSpin(false);
   }
 
+  function changeInputValue(e){
+    setInputValue(e.target.value);
+    let filter = e.target.value ? data && data.length>0 && data.filter(item=>item.name.indexOf(e.target.value)>-1) : data;
+    setDatas(filter);
+  }
+
+  function changeNav(nav){
+    setNav(nav);
+    setIsSpin(true);
+    if(nav === 0){
+      getBranchs(projectsId,owner);
+    }else{
+      getTags(projectsId,owner);
+    }
+  }
+  function chooseitem(value){
+    setShowValue(value);
+    changeBranch(value);
+  }
+
+
   const menu = (
-    <div ref={refFa}>
+    <div>
-      <SelectOverlay 
+      <div className="padding10 bor-bottom-greyE">
-        visible={visible}
+        <Input 
-        changeBranch={ChangeB} 
+          placeholder="请输入分支或标签名称搜索" 
-        tagflag={tagflag} 
+          autocomplete="off" className="OptionsInput" value={inputValue} 
-        projectsId={projectsId}
+          onChange={changeInputValue} style={{width:"220px"}}
-        owner={owner}
+        />
-        branchList={branchList}
+        <ul className="navUl">
-      />
+          <li className={nav==0?"navli active":"navli"} onClick={()=>changeNav(0)}><i className="iconfont icon-fenzhi1 font-14 mr3"></i>分支列表</li>
+          <li className={nav==1?"navli active":"navli"} onClick={()=>changeNav(1)}><i className="iconfont icon-biaoqian3 font-14 mr3"></i>标签列表</li>
+        </ul>
+      </div>
+      <Spin spinning={isSpin}>
+        <ul className="OptionsUl" id="ul-btn">
+          {
+            datas && datas.length>0 ?
+            datas.map((item,key)=>{
+              return(
+                <li key={key} onClick={()=>chooseitem(item.name)}><a className="task-hide ulALink">{item.name}</a></li>
+              )
+            }):
+            <p className="listTips">暂无{inputValue}{nav === 0 ?"分支":"标签"}~</p>
+          }
+        </ul>
+      </Spin>
     </div>
   );
   return(
-    <Dropdown placement='bottomLeft' visible={visible} overlay={menu} overlayClassName="branch-tagBox-list" trigger={['click']} >
+    <Popover placement="bottom" visible={flag} content={menu} onClick={()=>setFlag(!flag)} overlayClassName="branch-tagBox-list">
-      <div className="branch-tagBox" ref={refBox} onClick={()=>setVisible(visible ? false : true)}>
+      <div className="branch-tagBox">
-        {/* {nav === 0 ?"分支":"标签"} */}
+        <span className="color-grey-9 mr3 ml8">{nav === 0 ?"分支":"标签"}:</span>
-        <span className="color-grey-9 mr3 ml8"><i className="iconfont icon-fenzhi2 font-18"></i></span>
+        <a className="ant-dropdown-link">
-        <span className="ant-dropdown-link task-hide" style={{fontWeight:"500",minWidth:"45px",maxWidth:"270px"}}>
           {showValue}
-        </span>
+        </a>
-        <i className="showtag iconfont icon-sanjiaoxing-down font-15 color-grey-9 mr5 ml5 mt1" />
+        <i className="showtag iconfont icon-xiajiantou font-14 color-grey-9 mr8" />
       </div>
-    </Dropdown>
+    </Popover>
   )
 })

src/forge/Branch/SelectOverlay.jsx

@@ -1,90 +0,0 @@
-import React , { useState , useEffect } from 'react';
-import { Input , Spin , Menu } from 'antd';
-import { getBranch , getTag } from '../GetData/getData';
-
-function SelectOverlay({ changeBranch , tagflag , projectsId , owner , visible }) {
-  const [ inputValue , setInputValue] = useState(undefined);
-  const [ nav , setNav ] = useState(0);
-  const [ isSpin , setIsSpin ] = useState(true);
-
-  const [ data , setData ] = useState(undefined);
-  const [ datas , setDatas ] = useState(undefined);
-  const [ keys ,setKeys] = useState("branch");
-
-  useEffect(()=>{
-    if(visible){
-      setKeys("branch");
-      getBranchs(projectsId,owner);
-      setIsSpin(true);
-    }
-  },[visible])
-
-  async function getBranchs(id,owner){
-    let result = await getBranch(id,owner);
-    setData(result);
-    setDatas(result);
-    setIsSpin(false);
-  }
-  async function getTags(id,owner){
-    let result = await getTag(id,owner);
-    setData(result);
-    setDatas(result);
-    setIsSpin(false);
-  }
-  function chooseitem(value){
-    changeBranch(value);
-  }
-  function changeInputValue(e){
-    setInputValue(e.target.value);
-    let filter = e.target.value ? data && data.length>0 && data.filter(item=>item.name.indexOf(e.target.value)>-1) : data;
-    setDatas(filter);
-  }
-
-  function changeNav(e){
-    setKeys(e.key);
-    setIsSpin(true);
-    if(e.key === "branch"){
-      getBranchs(projectsId,owner);
-      setNav(0);
-    }else{
-      getTags(projectsId,owner);
-      setNav(1);
-    }
-  }
-
-  return(
-    <div className="overlayBranch">
-      <div className="padding15" style={{paddingBottom:"0px"}}>
-        <Input 
-          prefix={<i className="iconfont icon-sousuo_icon1 font-14"></i>}
-          placeholder={`请输入分支${tagflag ? "或标签" :""}名称搜索`}
-          autocomplete="off" className="OptionsInput" 
-          value={inputValue} 
-          onChange={changeInputValue}
-        />
-      </div>
-      <Menu mode="horizontal" className="navUl" selectedKeys={[keys]} onClick={changeNav}>
-        <Menu.Item key={"branch"}>分支</Menu.Item>
-        { tagflag && <Menu.Item key={"tag"}>标签</Menu.Item> }
-      </Menu>
-      <Spin spinning={isSpin}>
-        <ul className="OptionsUl" id="ul-btn">
-          {
-            datas && datas.length>0 &&
-            datas.map((item,key)=>{
-              return(
-                <li key={key} onClick={()=>chooseitem(item.name)}><a className="task-hide ulALink">{item.name}</a></li>
-              )
-            })
-           
-          }
-          {
-            datas && datas.length === 0 &&
-            <p className="listTips">暂无{inputValue}{nav === 0 ?"分支":"标签"}~</p>
-          }
-        </ul>
-      </Spin>
-    </div>
-  )
-}
-export default SelectOverlay;

src/forge/Branch/branch.css

@@ -0,0 +1,84 @@
+.branchDropdown{
+  border:1px solid #eee;
+  border-radius: 4px;
+  display: flex;
+  justify-content: center;
+  height: 40px;
+  line-height: 40px;
+  min-width: 220px;
+}
+.branchDropdown .ant-dropdown-trigger{
+  width: 100%;
+  padding:0px 15px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  cursor: pointer;
+}
+.branchOptions{
+  width: 220px;
+  box-shadow: 0px 0px 3px 1px rgba(134, 134, 134, 0.4);
+  border-radius: 3px;
+  background: #fff;
+  max-height: 300px;
+}
+.OptionsUl{
+  max-height: 220px;
+  overflow-y: auto;
+}
+.OptionsUl li{
+  height: 35px;
+  line-height: 35px;
+  cursor: pointer;
+  padding:0px 10px;
+}
+.OptionsUl li:hover{
+   background-color: #F0F0F0;
+}
+.OptionsUl li a{
+  display: block;
+}
+.OptionsInput{
+  height: 32px;
+  padding-left: 4px;
+  line-height: 32px;
+  width: 100%;
+}
+.branch-tagBox{
+  border:1px solid #eee;
+  border-radius: 3px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  cursor: pointer;
+  min-width: 240px;
+}
+.branch-tagBox-list .ant-popover-arrow{
+  display: none;
+}
+.branch-tagBox-list.ant-popover.ant-popover-placement-bottom{
+  padding-top:0px;
+}
+.branch-tagBox .ant-dropdown-link{
+  display: block;
+  flex:1;
+}
+.branch-tagBox-list .ant-popover-inner-content{
+  padding:0px;
+}
+.navUl{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-top: 5px;
+}
+.navUl li{
+  cursor: pointer;
+}
+.navUl li.active{
+  color:#5091FF;
+}
+.listTips{
+  padding:20px 0px;
+  text-align: center;
+}

src/forge/Branch/branch.scss

@@ -1,129 +0,0 @@
-.branchDropdown{
-  border:1px solid #eee;
-  border-radius: 4px;
-  display: flex;
-  justify-content: center;
-  height: 40px;
-  line-height: 40px;
-  min-width: 220px;
-}
-.branchDropdown .ant-dropdown-trigger{
-  width: 100%;
-  padding:0px 15px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  cursor: pointer;
-}
-.branchOptions{
-  width: 220px;
-  box-shadow: 0px 0px 3px 1px rgba(134, 134, 134, 0.4);
-  border-radius: 3px;
-  background: #fff;
-  max-height: 300px;
-}
-.OptionsUl{
-  min-height: 50px;
-  max-height: 220px;
-  overflow-y: auto;
-}
-.OptionsUl li{
-  height: 30px;
-  line-height: 30px;
-  cursor: pointer;
-  padding:0px 20px;
-  margin:5px 0px;
-}
-.OptionsUl li:hover{
-   background-color: #F0F0F0;
-}
-.OptionsUl li a{
-  display: block;
-}
-.OptionsInput{
-  height: 32px;
-  padding-left: 4px;
-  line-height: 32px;
-  width: 100%;
-}
-.branch-tagBox{
-  border:1px solid #D0D0D0;
-  border-radius: 3px;
-  height: 32px;
-  display: flex;
-  align-items: center;
-  cursor: pointer;
-  min-width: 104px;
-}
-.branch-tagBox:hover{
-  background-color: #F3F4F6;
-}
-.branch-tagBox-list{
-  background: #FFFFFF;
-  box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5);
-  border-radius: 4px;
-  .ant-popover-arrow{
-    display: none;
-  }
-  &.ant-popover.ant-popover-placement-bottom{
-    padding-top:0px;
-  }
-  .branch-tagBox .ant-dropdown-link{
-    display: block;
-    flex:1;
-    max-width: 105px;
-  }
-  .ant-popover-inner-content{
-    padding:0px;
-  }
-}
-.overlayBranch{
-  width: 325px;
-  .navUl{
-    margin-top: 8px;
-    height: 30px;
-    line-height: 30px;
-    li{
-      height: 30px;
-      line-height: 30px;
-      padding:0px 5px;
-      margin-left: 20px!important;
-      &.ant-menu-item-selected{
-        border-color:#466aff!important;
-        color:#466aff!important;
-      }
-      &.ant-menu-item-active{
-        border-color:transparent ;
-      }
-    }
-  }
-}
-.listTips{
-  padding:20px 0px;
-  text-align: center;
-}
-
-.urlMenu{
-  line-height: 30px;
-  margin-bottom: 10px;
-  padding:15px 20px 0px 20px;
-  border-bottom: none;
-  li.ant-menu-item{
-    height: 30px;
-    line-height: 30px;
-    padding:0px 5px;
-    margin-right: 20px!important;
-    &.ant-menu-item-selected,&.ant-menu-item-active{
-      color: #333;
-    }
-    &.ant-menu-item-selected{
-      border-color:#466aff!important;
-    }
-    &.ant-menu-item-active{
-      border-color:transparent ;
-    }
-  }
-}
-.copytool{
-  margin:0px 10px;
-}

src/forge/Component/AddGroup.jsx

@@ -1,84 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { AutoComplete , Button , Icon } from 'antd';
-import axios from 'axios';
-
-const { Option } = AutoComplete;
-function AddGroup({organizeId,getGroupID}){
-  const [ id , setID ] = useState(undefined);
-  const [ source , setSource ] = useState(undefined);
-  const [ searchKey , setSearchKey ] = useState("");
-  
-  useEffect(()=>{
-    getUserList();
-  },[searchKey])
-
-  function getUserList(e){
-    const url = `/organizations/${organizeId}/teams/search.json`;
-    axios.get(url, {
-      params: {
-        search: searchKey,
-      },
-    }).then((result) => {
-      if (result) {
-        sourceOptions(result.data.teams);
-      }
-    })
-    .catch((error) => {
-      console.log(error);
-    });
-  };
-
-  function sourceOptions(userDataSource){
-    const s = userDataSource && userDataSource.map((item, key) => {
-      return (
-        <Option
-          key={key}
-          value={`${item.id}`}
-          name={item.name}
-        >
-          {item.name}
-        </Option>
-      );
-    });
-    setSource(s);
-  }
-
-  function changeInputUser(e){
-    setSearchKey(e || "");
-  };
-
-  // 选择用户
-  function selectInputUser(e, option){
-    setID(e);
-    setSearchKey(option.props.name);
-  };
-
-  function addCollaborator(){
-    getGroupID && getGroupID(id);
-    setID(undefined);
-  }
-
-  return(
-    <div className="addPanel">
-      <AutoComplete
-        dataSource={source}
-        value={searchKey}
-        style={{ width: 300 }}
-        onChange={changeInputUser}
-        onSelect={selectInputUser}
-        placeholder="搜索需要添加的团队..."
-        allowClear
-      />
-      <Button
-        type="primary"
-        ghost
-        onClick={addCollaborator}
-        className="ml15"
-      >
-        <Icon type="plus" size="16"></Icon>
-        添加团队
-      </Button>
-    </div>
-  )
-}
-export default AddGroup;

src/forge/Component/AddMember.jsx

@@ -1,100 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { AutoComplete , Button , Icon } from 'antd';
-import axios from 'axios';
-import { getImageUrl } from 'educoder';
-
-const { Option } = AutoComplete;
-function AddMember({getID,login,showNotification}){
-  const [ id , setID ] = useState(undefined);
-  const [ source , setSource ] = useState(undefined);
-  const [ searchKey , setSearchKey ] = useState(undefined);
-  
-  useEffect(()=>{
-    getUserList();
-  },[searchKey])
-
-  function getUserList(e){
-    const url = `/users/list.json`;
-    axios.get(url, {
-      params: {
-        search: searchKey,
-      },
-    }).then((result) => {
-      if (result) {
-        sourceOptions(result.data.users);
-      }
-    })
-    .catch((error) => {
-      console.log(error);
-    });
-  };
-
-  function sourceOptions(userDataSource){
-    const s = userDataSource && userDataSource.map((item, key) => {
-      return (
-        <Option
-          key={key}
-          value={`${item.user_id}`}
-          login={`${item.login}`}
-          name={item.username}
-        >
-          <img
-            className="user_img radius"
-            width="28"
-            height="28"
-            src={getImageUrl(`/${item && item.image_url}`)}
-            alt=""
-          />
-          <span className="ml10" style={{ verticalAlign: "middle" }}>
-            {item.username}
-            <span className="color-grey ml10">({item.login})</span>
-          </span>
-        </Option>
-      );
-    });
-    setSource(s);
-  }
-
-  function changeInputUser(e){
-    setSearchKey(e);
-  };
-
-  // 选择用户
-  function selectInputUser(e, option){
-    setID(login ? e : option.props.login);
-    setSearchKey(option.props.name);
-  };
-
-  function addCollaborator(){
-    if(source && source.length>0){
-      getID && getID(id);
-      setSearchKey(undefined);
-    }else{
-      showNotification("请选择存在的用户!");
-    }
-  }
-
-  return(
-    <div className="addPanel">
-      <AutoComplete
-        dataSource={source}
-        value={searchKey}
-        style={{ width: 300 }}
-        onChange={changeInputUser}
-        onSelect={selectInputUser}
-        placeholder="搜索需要添加的用户..."
-        allowClear
-      />
-      <Button
-        type="primary"
-        ghost
-        onClick={addCollaborator}
-        className="ml15"
-      >
-        <Icon type="plus" size="16"></Icon>
-        添加成员
-      </Button>
-    </div>
-  )
-}
-export default AddMember;

src/forge/Component/Cards.jsx

@@ -1,23 +1,19 @@
 import React from 'react';
-import { getImageUrl } from 'educoder';
-import { Link } from 'react-router-dom';
 import './Component.scss';
 
-function Cards({img , title, desc , rightBtn , src , bottomInfos}){
+export default (({img , title, desc , rightBtn})=>{
   return(
     <div className="cards">
-      {img &&<div className="img"><img src={getImageUrl(`/${img}`)} alt=""/></div>}
+      <div className="img"><img src={img} alt=""/></div>
       <div className="content">
         <p className="titles">
-          <Link to={src}>{title}</Link>
+          <span>{title}</span>
           {rightBtn}
         </p>
         <div className="desc">
           {desc}
         </div>
-        {bottomInfos}
       </div>
     </div>
   )
-}
+})
-export default Cards;

src/forge/Component/Component.scss

@@ -19,8 +19,6 @@ li.ant-menu-item{
   padding:20px 34px;
   background-color: #fff;
   margin-bottom:18px;
-  min-height: 130px;
-  border:1px solid #eee;
   .img{
     margin-right: 20px;
     width: 190px;
@@ -29,10 +27,8 @@ li.ant-menu-item{
     display: flex;
     justify-content: center;
     align-items: center;
-    overflow: hidden;
     img{
       max-width: 100%;
-      max-height: 100%;
     }
   }
   .content{
@@ -43,9 +39,7 @@ li.ant-menu-item{
       justify-content: space-between;
       margin-bottom: 10px!important;
       align-items: center;
-      height: 22px;
+      &>span{
-      line-height: 22px;;
-      &>a{
         font-size:18px ;
         color: #333;
       }
@@ -56,13 +50,11 @@ li.ant-menu-item{
       display: -webkit-box;
       -webkit-box-orient: vertical;
       -webkit-line-clamp: 2;
-      line-height: 20px;
     }
   }
 }
 // Tabs
 .tabsStyle{
-  border:1px solid #eee;
   .ant-tabs-bar.ant-tabs-top-bar{
     padding-left: 35px;
     margin-bottom: 0px;
@@ -112,16 +104,6 @@ li.ant-menu-item{
   right:240px;
   z-index: 10000;
 }
-.laterest{
-  background-color: #EF3131;
-  color: #fff;
-  font-size: 12px;
-  margin-left: 10px;
-  padding:0px 5px;
-  border-radius: 2px;
-  height: 18px;
-  line-height: 18px;
-}
 
 @media screen and (max-width: 1800px){
   .handleBox{
@@ -147,295 +129,4 @@ li.ant-menu-item{
   .handleBox{
     right:0px;
   }
-}
+}
-.ant-drawer{
-  z-index: 10000!important;
-}
-.ant-drawer-body{
-  padding:0px!important;
-  .drawerHead{
-    background-color: #333;
-    color: #fff;
-    padding:15px 20px;
-  }
-  .ant-tree{
-    margin:0px 20px!important;
-  }
-}
-.hoverA{
-  display:flex;
-  align-items: center;
-  max-width: 78px;
-  &:hover a{
-    color:#2A61FF !important ;
-  }
-}
-.menuPanels{
-  width: 295px;
-  .leftline{
-    position: relative;
-    color: #666;
-    height: 16px;
-    margin-left: 14px;
-    font-size: 12px;
-    &::before{
-      position: absolute;
-      left: -7px;
-      top:3px;
-      height: 12px;
-      width: 1px;
-      background-color: #999;
-      content: "";
-    }
-  }
-  .ant-btn{
-    height: 36px;
-    line-height: 34px;
-    width: 83px;
-    text-align: center;
-    padding:0px ;
-    font-weight: 500;
-    font-size: 14px;
-    &.currentBtn{
-      cursor: default;
-      color: #333;
-      &:hover{
-        color: #333;
-        border-color: #d0d0d0;
-      }
-    }
-  }
-  .ant-btn-default{
-    color: #333;
-    border-color: #d0d0d0;
-    &:hover{
-      background: #F3F4F6;
-    }
-  }
-  .ant-btn{
-    width: 102px;
-    height: 32px;
-    line-height: 30px;
-  }
-  .ant-btn-primary{
-    color: #fff;
-    background-color: #466AFF;
-    border:none;
-    &:hover{
-      background-color: rgba(70,106,255,0.85);
-    }
-  }
-  .focusPanelHeadInfo{
-    padding:14px 16px;
-    border-bottom: 1px solid #eee;
-  }
-  .ant-popover-content,.ant-popover-inner{
-    height: 100%;
-    width: 100%;
-  }
-  .ant-popover-inner-content{
-    padding:0px;
-  }
-}
-.halfs{
-  margin-top: 24px;
-  padding:24px 0px 0px 0px;
-  border-top: 1px solid #e8e8e8;
-}
-.aboutSubTitle{
-  display: flex;
-  align-items: center;
-}
-.menuMaininfos{
-  padding:10px 16px 14px;
-  border-bottom: 1px solid #eee;
-}
-.menuinfos{
-  padding:10px 20px 16px;
-  &>a{
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    flex: 1;
-    & >span:first-child{
-      font-size: 16px;
-      font-weight: 500;
-      color: #333;
-      line-height: 22px;
-    }
-    & >span:last-child{
-      color: #666;
-      font-weight: 400;
-      line-height: 20px;
-      margin-top: 6px;
-    }
-  }
-}
-
-/*-------------------个人主页：右侧提示区域--------------------------*/
-.-task-sidebar {
-  position: fixed;
-  width: 40px;
-  right: 0;
-  bottom: 80px;
-  z-index: 10;
-}
-
-@media screen and (max-width: 1920px){
-  .-task-sidebar{
-    right:220px;
-  }
-}
-@media screen and (max-width: 1750px){
-  .-task-sidebar{
-    right:160px;
-  }
-}
-@media screen and (max-width: 1650px){
-  .-task-sidebar{
-    right:115px;
-  }
-}
-@media screen and (max-width: 1550px){
-  .-task-sidebar{
-    right:90px;
-  }
-}
-@media screen and (max-width: 1450px){
-  .-task-sidebar{
-    right:45px;
-  }
-}
-@media screen and (max-width: 1200px){
-  .-task-sidebar{
-    right:0px;
-    display: none;
-  }
-}
-.-task-sidebar>div {
-  height: 40px;
-  line-height: 40px;
-  box-sizing: border-box;
-  width: 40px;
-  color: #999;
-  font-size: 20px;
-  text-align: center;
-  margin-bottom: 20px;
-  border-radius: 50%;
-  background: #FFFFFF;
-  box-shadow: 0px 0px 10px 1px #F1F1F1;
-}
-
-.-task-sidebar>div i {
-  color: #999;
-}
-
-.-task-sidebar>div:hover i {
-  color: #fff !important;
-}
-.-task-sidebar>div:hover{
-  background: #1890FF;
-  box-shadow: 0px 0px 10px 2px #B6D0FC;
-}
-.helpBox{
-  width: 260px;
-  z-index: 103;
-  &.shareContent{
-    width: 200px;
-  }
-  .ant-popover-inner-content{
-    padding:0px;
-  }
-  p.titlecontent{
-    font-size: 18px;
-    color: #333;
-    line-height: 20px;
-    padding:15px 20px;
-  }
-  .faqUl{
-    padding:0px 20px 10px;
-    max-height: 230px;
-    overflow-y: auto;
-    li{
-      background: #F5F5F5;
-      border-radius: 20px;
-      padding:0px 20px;
-      color: #333;
-      height: 34px;
-      line-height: 34px;
-      margin-bottom: 10px;
-      a{
-        display: block;
-        overflow: hidden;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-      }
-      &:hover{
-        background-color: #D1E9FF;
-        a{
-          color: #333!important;
-        }
-      }
-    }
-  }
-  .shareUl{
-    padding:10px 0px;
-    display: flex;
-    align-items: center;
-    .titlecontent{
-      margin-right: 20px;
-    }
-    li > i{
-      font-size: 32px!important;
-    }
-  }
-}
-
-
-
-.-task-desc {
-  background: #494949;
-  width: 90px;
-  line-height: 36px;
-  text-align: center;
-  position: absolute;
-  color: #fff;
-  font-size: 13px;
-  z-index: 999999;
-  opacity: 0;
-}
-
-.-task-desc div {
-  position: absolute;
-  top: 10px;
-  right: -7px;
-  height: 13px;
-}
-
-.-task-desc div img {
-  float: left
-}
-
-.-task-sidebar .scan_ewm {
-  position: absolute !important;
-  right: 45px !important;
-  bottom: 0px !important;
-  background-color: #494949 !important;
-  -webkit-box-sizing: border-box !important;
-  box-sizing: border-box !important;
-  font-size: 14px !important;
-  line-height: 16px !important;
-  display: none;
-  height: 213px !important;
-}
-
-.trangle_right {
-  position: absolute;
-  right: -5px;
-  bottom: 15px;
-  width: 0;
-  height: 0px;
-  border-top: 6px solid transparent;
-  border-left: 5px solid #494949;
-  border-bottom: 6px solid transparent
-}

src/forge/Component/Contributors.jsx

@@ -1,174 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { AlignCenter , FlexAJ  } from '../Component/layout';
-import { Link } from 'react-router-dom';
-import { Popover , Spin , Button } from 'antd';
-import { getImageUrl } from 'educoder';
-import './Component.scss';
-import { getUser } from '../GetData/getData';
-import axios from 'axios';
-
-function Contributors({contributors,owner,projectsId,currentLogin}){
-  const [ menuList ,setMenuList ]= useState([]);
-  const [ list , setList ]= useState(undefined);
-  const [ total , setTotal ]= useState(0);
-  const [ menu , setMenu ] = useState("");
-  const [ login , setLogin ] = useState(undefined);
-  const [ isSpin , setIsSpin ] = useState(false);
-
-  useEffect(()=>{
-    if(contributors && contributors.total_count>0){
-      setTotal(contributors.total_count);
-      setList(contributors.list);
-    }
-  },[contributors])
-
-  useEffect(()=>{
-    if(login){
-      getUsers(login);
-    }else{
-      setMenu(undefined);
-    }
-  },[login])
-
-  async function getUsers(login){
-    setIsSpin(true);
-    let a = menuList && menuList.filter(i=>i.login === login);
-    if(a.length === 0){
-      let result = await getUser(login);
-      let arr = menuList;
-      arr.push({...result});
-      setMenuList(arr);
-      setMenusFunc(result);
-      setIsSpin(false);
-    }else{
-      setMenusFunc(a[0]);
-      setIsSpin(false);
-    }
-  }
-
-  function renderOrganize(list) {
-    let str = "";
-    list.map(i=>{
-      str = str+i.name + "、";
-    })
-    return str && str.substr(0,str.length - 1);
-  }
-
-  function setMenusFunc(data){
-    if(data){
-      let ele = (
-        <Spin spinning={isSpin}>
-          <FlexAJ className="menuMaininfos">
-            <AlignCenter>
-              <Link to={`/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
-             
-              <div className="ml10">
-                <Link to={`/${data.login}`}>{data.name}</Link>
-                { data.location && <span className="leftline">{data.location}</span> }
-                {
-                  data.organizations && data.organizations.length>0&&
-                  <p className="task-hide" style={{maxWidth:"215px"}}>
-                    所属组织：{renderOrganize(data.organizations)}
-                  </p>
-                }
-              </div>
-            </AlignCenter>
-          </FlexAJ>
-          <AlignCenter className="menuinfos">
-            <Link to={`/${data.login}/projects`}>
-              <span>{data.projects_count}</span>
-              <span>项目数</span>
-            </Link>
-            <Link to={`/${data.login}/followers`}>
-              <span>{data.followers_count}</span>
-              <span>粉丝数</span>
-            </Link>
-            <Link to={`/${data.login}/following`}>
-              <span>{data.following_count}</span>
-              <span>关注数</span>
-            </Link>
-          </AlignCenter>
-          <div className={"pb20"} style={{display:"flex",justifyContent:'center'}}>
-            {
-              currentLogin && (currentLogin === data.login)
-              ?
-              <Button className="currentBtn">当前用户</Button>
-              :
-              data.is_watch ? 
-              <Button type={"default"} onClick={()=>FocusFunc(false,data.login)}>已关注</Button>
-              :
-              <Button type={"primary"} onClick={()=>FocusFunc(true,data.login)}>关注TA</Button>
-            }
-          </div>
-        </Spin>
-      )
-      setMenu(ele);
-    }
-  }
-
-  function FocusFunc(flag,login){
-    axios({
-      method: flag ? 'post' : 'delete',
-      url: `/watchers/${flag ? 'follow' : 'unfollow'}.json`,
-      params: {target_type: "user",id:login}
-    }).then(result => {
-      if (result && (result.data.status === 0 || result.data.status === 2)) {
-        let a = menuList && menuList.filter(i=>i.login === login);
-        if(a){
-          a[0].is_watch = flag;
-        }
-        setMenusFunc(a[0]);
-      }
-    })
-    .catch(error => {
-      console.log(error);
-    });
-  }
-
-  function renderArray(array){
-    let str = "";
-    for(var i = 0;i<array.length;i++){
-      str += array[i].name +"、";
-    }
-    let substr = str.substr(0,str.length-1);
-    return (<span title={substr}>{substr}</span>)
-  }
-
-  function setVisibleFunc(flag,l,index){
-    if(l !== login){
-      setLogin(l);
-    }
-    var lx = list.concat();
-    lx.map(i=>i.visible =false);
-    if(flag){
-      lx[index].visible = flag;
-    }
-    lx.splice();
-    setList(lx);
-  }
-
-  return(
-    <div className="halfs">
-      <Link to={`/${owner}/${projectsId}/contribute`} className="font-16 color-ooo hoverA">
-        <span>贡献者</span>
-        { contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}
-      </Link>
-      <div className="attrPerson" onMouseLeave={()=>setVisibleFunc(false)}>
-        {
-          total > 0 ?
-          list.map((item,key)=>{
-            return(
-              <Popover content={menu} visible={item.visible} overlayClassName="menuPanels" placement="top">
-                <Link key={key} to={`/${item.login}`}>
-                  <img src={getImageUrl(`/${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
-                </Link>
-              </Popover>
-            )
-          })
-          :""
-        }
-      </div>
-    </div>
-  )
-}
-export default Contributors;

src/forge/Component/CopyTool.jsx

@@ -1,51 +0,0 @@
-import React, { useState, useCallback, memo } from 'react';
-import { Tooltip } from 'antd';
-
-CopyTool.defaultProps = {
-  beforeText: '复制链接',     //浮动过去显示的文字
-  afterText: '复制成功',  //点击后显示的文字
-  className: '',         //传给svg的class
-  inputId: 'copyText',    //要复制的文本的ID
-  timeOut:true, //复制后将浮动的文字改为beforeText
-};
-
-
-function CopyTool({ beforeText, afterText, className , inputId , timeOut }) {
-  const [title, setTitle] = useState(() => {
-    return beforeText;
-  });
-
-  // 复制链接
-  const copyUrl = useCallback(() => {
-    const copyEle = document.querySelector(`#${inputId}`); // 获取要复制的节点
-    if (!copyEle) {
-      console.error("您的CopyTool未设置正确的inputId");
-      return;
-    }
-    copyEle.select(); // 执行选中元素
-    if (document.execCommand('copy')) {
-      document.execCommand('copy');
-    }
-    document.getSelection().removeAllRanges();
-    
-    setTitle(afterText);
-    if(timeOut){
-      setTimeout(function(){
-        setTitle(beforeText);
-      },1500)
-    }
-  }, []);
-
-  return (
-    <Tooltip
-      placement="top"
-      title={title}
-      onVisibleChange={() => { setTitle(beforeText) }}
-    >
-      <i className={`iconfont icon-fuzhiicon ${className}`} style={{ color: '#466aff' }} onClick={copyUrl}></i>
-    </Tooltip>
-  );
-}
-
-
-export default memo(CopyTool);

src/forge/Component/DeleteModal/Index.jsx

@@ -1,33 +0,0 @@
-import React from 'react';
-import { AlignCenter } from '../layout';
-import { Button } from 'antd';
-import Modals from '../PublicModal/Index';
-
-function DeleteBox({ 
-  visible , 
-  onCancel ,
-  onSuccess ,
-  title ,
-  subTitle,
-  content
-}) {
-  return(
-    <Modals 
-      title={title} 
-      btn={
-        <div>
-          <Button size={'large'} onClick={onCancel}>取消</Button>
-          <Button type={"danger"} size={"large"} onClick={onSuccess}>确认删除</Button>
-        </div>
-      } 
-      onCancel={onCancel} 
-      visible={visible}
-    >
-      <div className="desc">
-        <AlignCenter className="descMain"><i className="iconfont icon-shanchu_tc_icon mr10"></i>{content}</AlignCenter>
-      <p>{subTitle}</p>
-      </div>
-    </Modals>
-  )
-}
-export default DeleteBox;

src/forge/Component/DrawerPanel.jsx

@@ -1,106 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Drawer , Tree , Spin } from 'antd';
-import './Component.scss';
-import axios from 'axios';
-const { TreeNode , DirectoryTree } = Tree;
-
-function turnbar(str){
-  if(str && str.length>0 && str.indexOf("/")>-1){
-    return str.replaceAll('/','%2F');
-  }
-  return str;
-}
-function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , list}){
-  const [ treeData , setTreeData ] = useState(undefined);
-  const [ isSpin , setIsSpin ] = useState(true);
-  const [first , setFirst ] = useState(true);
-  useEffect(()=>{
-    if(visible && first){
-      if(list){
-        setTreeData(list);
-        setIsSpin(false);
-      }else{
-        getMenulist();
-      }
-      setFirst(false);
-    }
-  },[visible])
-
-  function getMenulist(){
-    const url = `/${owner}/${projectsId}/entries.json`;
-    axios.get(url,{ params: { ref: branch } }).then(result=>{
-      if(result){
-        setTreeData(result.data.entries);
-      }
-      setIsSpin(false);
-    }).catch(error=>{})
-  }
-
-  function renderTreeNodes(data) {
-    return data && data.length > 0 && data.map((item) => {
-      return (
-        <TreeNode title={item.name} key={item.key} dataRef={item} isLeaf={item.type === "file"}>
-          {renderTreeNodes(item.children)}
-        </TreeNode>
-      );
-    });
-  }
-
-  function onLoadData(tr){
-    return new Promise((resolve) => {
-      if (tr.props.children) {
-          resolve();
-          return;
-      }
-      let en = [];
-      const url = `/${owner}/${projectsId}/sub_entries.json`;
-      axios.get(url, { 
-        params:{
-          filepath:tr.props.dataRef.path,
-          ref:branch,
-          type:"dir"
-        }
-      }).then((result) => {
-        if(result){
-          en =  result.data.entries;
-        }
-      }).catch(error=>{})
-      setTimeout(() => {
-        tr.props.dataRef.children = en;
-        setTreeData([...treeData]);
-        resolve();
-      }, 2000);
-    });
-  }
-
-  function selectTree(keys,event){
-    let dataref = event.node.props.dataRef;
-    if(dataref.type==="file"){
-      onClose();
-      let value = turnbar(branch);
-      history.push(`/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
-    }
-  }
-
-  return(
-    <Drawer
-      placement="left"
-      visible={visible}
-      closable={false}
-      onClose={onClose}
-      width={"320px"}
-      maskStyle={{backgroundColor:'rgba(0,0,0,0.09)'}}
-    >
-      <Spin spinning={isSpin}>
-        <div className="drawerHead">
-          <p className="font-20">{name}</p>
-          <p><i class="iconfont icon-fenzhi2 font-18 color-grey-9 mr3"></i>{branch}</p>
-        </div>
-        <DirectoryTree loadData={onLoadData} onSelect={selectTree}>
-          {treeData && renderTreeNodes(treeData)}
-        </DirectoryTree>
-      </Spin>
-    </Drawer>
-  )
-}
-export default DrawerPanel;

src/forge/Component/EAccount.scss

@@ -1,6 +0,0 @@
-.ant-modal-mask{
-  z-index: 1031;
-}
-.ant-modal-wrap{
-  z-index: 1032;
-}

src/forge/Component/EducoderAccount.jsx

@@ -1,60 +0,0 @@
-import React , {forwardRef, useEffect} from 'react';
-import { Modal , Form , Input , Button } from 'antd';
-import './EAccount.scss';
-
-function EducoderAccount({form , visible , onOk , email}){
-  const { getFieldDecorator, validateFields , setFieldsValue } = form;
-
-  useEffect(()=>{
-    if(email){
-      setFieldsValue({email})
-    }
-  },[email])
-
-  function onSure(){
-    validateFields((error,values)=>{
-      if(!error){
-        onOk(values);
-      }
-    })
-  }
-  const layout = {
-    labelCol: { span: 5 },
-    wrapperCol: { span: 18 },
-  };
-  return(
-    <Modal 
-      visible={visible}
-      title="提示"
-      width="500px"
-      closable={false}
-      footer={
-        <Button type="primary" onClick={onSure}>确定</Button>
-      }
-      centered
-    >
-      <div>
-        <p className="mb15 edu-txt-center" style={{maxWidth:"350px",margin:"0px auto"}}>
-        为确保您能正常使用平台功能，请确认以下信息:
-        </p>
-        <Form {...layout}>
-          <Form.Item label="邮箱">
-            {getFieldDecorator("email",{
-              rules:[{required:true,message:"请输入邮箱账号"}]
-            })(
-              <Input placeholder="请输入您的邮箱账号" width="220px"/>
-            )}
-          </Form.Item>
-          <Form.Item label="密码">
-            {getFieldDecorator("password",{
-              rules:[{required:true,message:"请输入邮箱密码"}]
-            })(
-              <Input.Password placeholder="请输入您的邮箱密码" width="220px"/>
-            )}
-          </Form.Item>
-        </Form>
-      </div>
-    </Modal>
-  )
-}
-export default Form.create()(forwardRef(EducoderAccount));

src/forge/Component/Handbook.jsx

@@ -5,7 +5,7 @@ import './Component.scss';
 export default (()=>{
   return(
     <div className="handleBox">
-      <a href="https://forum.trustie.net/forums/3075/detail" target="_blank" >
+      <a href="https://www.trustie.net/forums/82/memos/3075" target="_blank" >
         <img src={Handbook} alt=""/>
       </a>
     </div>

src/forge/Component/HeadSearch.jsx

@@ -1,41 +0,0 @@
-import React, { useState } from "react";
-import { Input ,notification} from "antd";
-
-const { Search } = Input;
-export default ({history}) => {
-  const [openSearch, setOpenSearch] = useState(false);
-
-  function onGlobalSearch(value) {
-    history.push('/search?value=' + value);
-    // window.location.href = `search?value=` + value;
-    // history.push({
-    //   pathname:'/search',
-    //   state:value
-    // })
-  }
-  return (
-    <React.Fragment>
-      {
-        openSearch ?
-          <div
-            onBlur={() => {
-              setTimeout(() => {
-                setOpenSearch(false)
-              }, 500)
-            }}
-          >
-            <Search placeholder="请输入搜索关键字"
-              className={`search-input mr20`}
-              onSearch={onGlobalSearch}
-              autoFocus={true}
-              style={{width:'260px'}}
-            />
-          </div>
-          :
-          <i className="iconfont icon-sousuo font-18 color-grey-6 ml30" onClick={() => {
-            setOpenSearch(true)
-          }} />
-      }
-    </React.Fragment>
-  )
-};

src/forge/Component/Keys.jsx

@@ -1,10 +1,12 @@
 import React from 'react';
 import styled from 'styled-components';
 
+
+
 export default ({title , value , className})=>{
   const Keys = styled.span`
     display:flex;
-    align-items:center;
+    align-item:center;
     & span{
       display:block;
       height:20px;

src/forge/Component/LanguagePower.jsx

@@ -1,54 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { FlexAJ  } from '../Component/layout';
-
-function LanguagePower({languages}){
-  const [ array , setArray ] = useState(undefined);
-
-  useEffect(()=>{
-    if(languages){
-      let arr = [];
-      Object.keys(languages).map((item,key)=>{
-        arr.push({name:item,percent:languages[item],color:getColor()});
-      })
-      setArray(arr);
-    }
-  },[languages])
-
-   function getColor(){
-      let str = "#";
-      let arr = ["1","2","3","4","4","5","6","7","8","9","a","b","c","d","e","f"];
-      for(var i=0;i<6;i++){
-        let num = parseInt(Math.random() * 16);
-        str+=arr[num];
-      }
-      return str;
-    }
-  return(
-    <div>
-      <p className="font-16 color-ooo aboutSubTitle">开发语言</p>
-      <div className="progress">
-        {
-          array && array.map((item,key)=>{
-            return(
-              <span style={{width:item.percent,backgroundColor:item.color}}></span>
-            )
-          })
-        }
-      </div>
-      {
-        array && array.length > 0 &&
-        <FlexAJ className="progresstip">
-          {
-            array.map((item,key)=>{
-              return(
-                <span><i className="zero" style={{backgroundColor:`${item.color}`}}></i><span>{item.name}</span><span>{item.percent}</span></span>
-              )
-            })
-          }
-        </FlexAJ>
-      }
-      
-    </div>
-  )
-}
-export default LanguagePower;

src/forge/Component/ListCount.jsx

@@ -19,7 +19,7 @@ export default (({fork,parise})=>{
   }`;
   const SpanStyleparise = styled.span`{
     display:flex;
-    align-items:center;
+    align-item:center;
     margin-left:30px;
     padding:0px 12px;
     border-radius:13px;

src/forge/Component/MemberCards.jsx

@@ -1,10 +1,6 @@
 import React from 'react';
 import './Component.scss';
-import { Button } from 'antd';
 import styled from 'styled-components';
-import FocusButton from "../UsersList/focus_button";
-import { getImageUrl } from 'educoder';
-import { Link } from 'react-router-dom';
 
 const Img = styled.img`{
   border-radius:50%;
@@ -32,8 +28,26 @@ const I = styled.i`{
   font-size:13px!important;
   color:#60B25E;
   margin-right:2px;
-  height:17px;
+}`
-  line-height:17px;
+const FocusBtn = styled.a`{
+  display:inline-block;
+  height:30px;
+  line-height:26px;
+  padding:0px 12px;
+  background-color:#fafafa;
+  border:1px solid #eee;
+  border-radius:2px;
+  color:#888!important;
+}`
+const Ifocused = styled.i`{
+  font-size:16px!important;
+  color:#FFA802;
+  margin-right:4px;
+}`
+const Ifocus = styled.i`{
+  font-size:16px!important;
+  color:#BBBBBB;
+  margin-right:4px;
 }`
 const Div = styled.div`{
   margin-bottom: 18px;
@@ -42,18 +56,17 @@ const Div = styled.div`{
   align-items: center;
   border:1px solid #eee;
 }`
-export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
+export default (({img,name,time, focusStatus})=>{
-  return (
+  return(
     <Div>
-      <Link to={`/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
+      <Img src={img}/>
       <div className="m-infos">
-        <Link to={`/${user && user.login}`}><Name>{name}</Name></Link>
+        <Name>{name}</Name>
         <Time><I className="iconfont icon-shijian"></I>加入时间:{time}</Time>
         {
-          is_current_user ?
+          focusStatus ? 
-          <Button type="default">当前用户</Button>
+          <FocusBtn><Ifocused className="iconfont icon-shixing"></Ifocused>已关注</FocusBtn> : 
-          : 
+          <FocusBtn><Ifocus className="iconfont icon-kongxing"></Ifocus>关注</FocusBtn>
-          <FocusButton is_watch={focusStatus} id={login} successFunc={successFunc} notReset={true}/>
         }
       </div>
     </Div>

src/forge/Component/ModalFun/index.jsx

@@ -1,125 +0,0 @@
-/* eslint-disable react/jsx-no-duplicate-props */
-import React, { useState } from 'react';
-import * as ReactDOM from 'react-dom';
-import { Modal, Button } from 'antd';
-import './index.scss';
-
-// 函数式调用删除、通知等模态框
-
-InitModal.defaultProps = {
-  okText: '确认',     //确定按钮的文字
-  cancelText: '取消',  //取消按钮的文字
-  className: '',         //传入的模态框类名
-  inputId: 'copyText',    //要复制的文本的ID
-  onCancel:()=>{},        //取消的回调
-  onOk:()=>{},            //确认的回调
-  title:'提示',            //模态框名字
-  contentTitle:'',        //内容标题
-  content:'',             //详细内容
-  afterClose:()=>{},      //关闭模态框以后的回调
-};
-
-// 使用函数调用删除组件
-export default function DelModal(props) {
-  renderModal({ ...props, type: 'delete' })
-}
-
-// 使用函数调用选择模态框组件
-export function Confirm(props) {
-  renderModal({ ...props, type: 'confirm' })
-}
-
-function renderModal(props) {
-  const { type, afterClose } = props;
-  const div = document.createElement('div');
-  document.body.appendChild(div);
-
-  function destroy() {
-    afterClose && afterClose();
-    const unmountResult = ReactDOM.unmountComponentAtNode(div);
-    if (unmountResult && div.parentNode) {
-      div.parentNode.removeChild(div);
-    }
-  }
-
-  function modalType(type) {
-    if (type === 'delete') {
-      return <InitModal
-        title="删除"
-        contentTitle="确定要删除吗？"
-        okText="确认删除"
-        {...props}
-
-        afterClose={destroy}
-        contentTitle={<React.Fragment>
-          <i className="red-circle iconfont icon-shanchu_tc_icon mr3"></i>
-          {props.contentTitle}
-        </React.Fragment>}
-      />
-    } else if (type === 'confirm') {
-      return <InitModal title="选择" afterClose={destroy} {...props} />
-    } else {
-      return <InitModal title="选择" afterClose={destroy} {...props} />
-    }
-  }
-
-  function render() {
-    setTimeout(() => {
-      ReactDOM.render(
-        modalType(type),
-        div,
-      );
-    });
-  }
-  render();
-}
-
-// 选择模态框组件
-function InitModal({
-  onCancel,
-  onOk,
-  title,
-  contentTitle,
-  content,
-  okText,
-  cancelText,
-  afterClose,
-  className,
-}) {
-
-  const [visible, setVisible] = useState(true);
-
-  function onCancelModal() {
-    setVisible(false);
-    onCancel && onCancel()
-  }
-
-  function onSuccess() {
-    setVisible(false);
-    onOk && onOk();
-  }
-
-  return (
-    <Modal
-      visible={visible}
-      onCancel={onCancelModal}
-      afterClose={afterClose}
-      title={title}
-      className={`myself-modal ${className}`}
-      centered
-      footer={[
-        <Button type="default" key="back" onClick={onCancelModal}>
-          {cancelText}
-        </Button>,
-        <Button className="foot-submit" key="submit" onClick={onSuccess}>
-          {okText}
-        </Button>,
-      ]}
-    >
-      <div>
-        {contentTitle && <p className="content-title">{contentTitle}</p>}
-        <p className="content-descibe">{content}</p>
-      </div>
-    </Modal>
-  )
-}

src/forge/Component/ModalFun/index.scss

@@ -1,63 +0,0 @@
-.myself-modal {
-  .ant-modal-header {
-    padding: 9px 24px;
-    background: #f8f8f8;
-    border-bottom: 1px solid #eee;
-  }
-  .ant-modal-title {
-    text-align: left;
-  }
-  .ant-modal-close {
-    top: 0px !important;
-  }
-  .ant-modal-close-x {
-    font-size: 24px;
-  }
-  .ant-modal-body {
-    text-align: center;
-  }
-  .content-title {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin: 2rem 0 1rem !important;
-    font-size: 16px;
-    color: #333;
-    letter-spacing: 0;
-    line-height: 29px;
-    font-weight: 400;
-  }
-  .red-circle {
-    align-self: flex-start;
-    color: #ca0002;
-    font-size: 1.5rem !important;
-  }
-  .content-descibe {
-    font-size: 14px;
-    color: #666;
-    line-height: 33px;
-    font-weight: 400;
-  }
-  .ant-modal-footer {
-    padding: 2rem 0;
-    text-align: center;
-    border: 0;
-    .ant-btn {
-      width: 6rem;
-    }
-  }
-  .foot-submit {
-    margin-left: 3rem;
-    color: #df0002;
-    &:hover {
-      border-color: #df0002;
-    }
-  }
-  .ant-btn-default:hover,
-  .ant-btn-default:active,
-  .ant-btn-default:focus {
-    background: #f3f4f6;
-    color: #333;
-    border-color: #d0d0d0;
-  }
-}

src/forge/Component/Monaco.jsx

@@ -1,62 +0,0 @@
-import React, {useEffect, useRef, useState} from 'react';
-import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
-import './Component.scss';
-
-function Monaco(props) {
-  const {
-    style = { // dom节点样式
-      height: '400px',
-    },
-    value = '', // 代码文本
-    onChange = () => { // 改变的事件
-    },
-    fontSize = 14, // 代码字体大小
-    monacoOptions = {
-      scrollBeyondLastLine: false,
-      lineNumbers: "off",
-      wordWrap: true,
-      overviewRulerBorder: true,
-      lineHeight: 24,
-      readOnly:true
-    }, // monaco 自定义属性
-    language = 'html', // 语言 支持 js ts sql css json html等
-  } = props;
-  const editOrRef = useRef();
-  const ThisEditor = useRef();
-  useEffect(() => {
-    ThisEditor.current = monaco.editor.create(editOrRef.current, {
-      value: value || '',
-      language,
-      theme: "vs-grey",
-      fontSize: fontSize + 'px',
-      minimap: { // 关闭代码缩略图
-        enabled: false,
-      },
-      ...monacoOptions,
-    });
- 
-    ThisEditor.current.onDidChangeModelContent((e) => {
-      let newValue = ThisEditor.current.getValue();
-      onChange(newValue);
-    });
-    return () => {
-      ThisEditor.current.dispose();
-      ThisEditor.current = undefined; // 清除编辑器对象
-    }
-  }, []);
-  useEffect(() => {
-    if (ThisEditor.current) {
-      ThisEditor.current.updateOptions({
-        fontSize: fontSize + 'px',
-      })
-    }
-  }, [fontSize]);
- 
-  return (
-    <div style={style} ref={editOrRef}>
- 
-    </div>
-  );
-}
- 
-export default Monaco;

src/forge/Component/NoticeModal/Index.scss

@@ -1,90 +0,0 @@
-.systemBox{
-  .ant-modal-body{
-    padding:1px 0px 0px 0px;
-    .sysBox{
-      background-image: url('./bg.png');
-      background-repeat: no-repeat;
-      background-size: 100% 334px;
-      margin-top: -55px;
-    }
-    .sysnoticeBox{
-      width: 100%;
-      padding:80px 0px 34px;
-      display: flex;
-      flex-direction: column;
-      width: 780px;
-      margin: 0px auto;
-      p.ntitle{
-        height: 33px;
-        font-size: 24px;
-        font-weight: 500;
-        color: #31FFF7;
-        line-height: 33px;
-        text-align: center;
-      }
-      p.nSubtitle{
-        height: 25px;
-        line-height: 25px;
-        font-size: 18px;
-        font-weight: 500;
-        color: #FFFFFF;
-        margin-top: 60px;
-        padding-left: 20px;
-      }
-      .markdown-body{
-        box-shadow: 0px 0px 17px rgba(0,0,0,0.2);
-        border-radius: 4px;
-        margin-top: 17px!important;
-      }
-      .nContent{
-        padding:20px 34px;
-        background-color: #fff;
-        line-height: 30px;
-        font-size: 15px;
-        font-weight: 400;
-        color: #333;
-        .realmName{
-          margin-top: 20px;
-          display: flex;
-          ul{
-            width: 50%;
-            padding-left: 0px!important;
-            li{
-              font-size: 15px;
-              font-weight: 500;
-              line-height: 32px;
-              text-align: left;
-              color: #000;
-              list-style-type: none!important;
-              &:first-child{
-                color: #E65714;
-              }
-            }
-          }
-        }
-        .nSubdesc{
-          font-size: 15px;
-          font-weight: 400;
-          color: #000000;
-          line-height: 31px;
-          margin-top: 20px;
-        }
-        .nInfo{
-          font-size: 14px;
-          font-weight: 400;
-          color: #333333;
-          text-align: right;
-          margin-top: 25px;
-          p{
-            height: 20px;
-            line-height: 20px;
-          }
-        }
-      }
-      .nBtn{
-        text-align: center;
-        margin-top: 33px;
-      }
-    }
-  }
-}

src/forge/Component/NoticeModal/SystemNotice.jsx

@@ -1,76 +0,0 @@
-import React , { useEffect , useState } from 'react';
-import { Modal , Button } from 'antd';
-import './Index.scss';
-import '../../css/index.scss';
-import RenderHtml from '../../../components/render-html';
-import cookie from 'react-cookies';
-
-function SystemNotice({system_notification,history}){
-  const [ visible , setVisible ] = useState(false);
-
-  useEffect(()=>{
-    if(system_notification && !cookie.load('notice_stage')){
-      setVisible(true);
-    }
-  },[system_notification,history.location])
-
-  function sureContinue() {
-    cookie.remove('notice_stage');
-
-    let inFifteenMinutes = new Date(new Date().getTime() + 24 * 3600 * 1000);//一天
-    // let inFifteenMinutes = new Date(new Date().getTime() + 60 * 1000);//一分钟
-    cookie.save('notice_stage', true,{ expires: inFifteenMinutes,path:"/" });
-
-    setVisible(false);
-  }
-
-  return (
-    <Modal
-      visible = {visible}
-      width="1000px"
-      footer={false}
-      title={false}
-      centered={true}
-      closable={false}
-      wrapClassName={'systemBox'}
-    >
-      <div className="sysBox">
-        <div className="sysnoticeBox">
-          <p className="ntitle">{system_notification && system_notification.subject}</p>
-          <p className="nSubtitle">{system_notification && system_notification.sub_subject}</p>
-          {/* <div className="nContent">
-            <div className="nMaindesc">
-            为了给用户提供更加稳定、优质的服务，我们即将对平台门户首页、平台名称、平台域名进行一次全面升级与变更。原平台名称：Trustie（中文名：确实）将于2021年10月xx日统一更改为Gitlink（中文名：确实开源）。届时平台域名将统一进行更换，更换规则如下
-            </div>
-            <div className="realmName">
-              <ul>
-                <li>原域名：</li>
-                <li>官网顶级域名https://www.trustie.net</li>
-                <li>版本库子域名https://forgeplus.trustie.net</li>
-                <li>论坛子域名https://forum.trustie.net/forums</li>
-              </ul>
-              <ul>
-                <li>更换后域名：</li>
-                <li>官网顶级域名https://www.gitlink.org.cn</li>
-                <li>版本库子域名https://www.git.gitlink.org.cn</li>
-                <li>论坛子域名https://forum.gitlink.org.cn</li>
-              </ul>
-            </div>
-            <div className="nSubdesc">
-            自2021年10月xx日起，旧域名将停止访问。因平台名称与域名变更给您带来的不便，我们深表歉意!非常感谢您一直以来对本平台的信任与支持，我们将一如既往地为您提供优质的服务。 特此通知!
-            </div>
-            <div className="nInfo">
-              <p>Gitlink运营团队</p>
-              <p>2021年10月xx日</p>
-            </div>
-          </div> */}
-          <RenderHtml className="break_word_comments imageLayerParent" value={system_notification && system_notification.content} url={history.location}/>
-          <div className="nBtn">
-            <Button type="primary" className="btnblue" onClick={sureContinue}>确认并继续</Button>
-          </div>
-        </div>
-      </div>
-    </Modal>
-  )
-}
-export default SystemNotice;

src/forge/Component/PasswordAuthority.jsx

@@ -11,7 +11,6 @@ function PasswordAuthority({ authorityValBox , successFunc , cancelFunc }){
 
   // 取消授权-登录密码的输入
   function cancelAuthority(){
-    setAuthorityVal(undefined);
     cancelFunc();
   }
   // 确认授权

src/forge/Component/ProfileModal/Index.jsx

@@ -1,72 +0,0 @@
-import React , { useEffect , useState } from 'react';
-import Modals from '../PublicModal/Index';
-import { Button } from 'antd';
-import axios from 'axios';
-
-import ProfileImg from './images/profile.png';
-import './Index.scss';
-
-function ProfileModal({visible,onCancel,history}) {
-  const [ modalVis , setModalVis ] = useState(visible);
-  const [ addMemberCheck , setAddMemberCheck ] = useState(false);
-
-  useEffect(()=>{
-    axios.interceptors.response.use((response) => {
-      if (response && (response.data.status === 411 || response.data.status === 412)) {
-        setModalVis(true);
-        if(response.data.status === 412){
-          setAddMemberCheck(true);
-        }
-      }
-      return response;
-      }, (error) => {
-    });
-  },[])
-
-  useEffect(()=>{
-    setModalVis(visible);
-  },[visible])
-  
-  function onOk(){
-    onCancel();
-    setModalVis(false);
-    setTimeout(function(){
-      window.open(`/settings/profile`,"_blank");
-    },200)
-  }
-
-  function onNo() {
-    onCancel();
-    setModalVis(false);
-  }
-
-  return(
-    <Modals 
-      title="完善资料" 
-      onCancel={onNo} 
-      visible={modalVis}
-      btn={
-        addMemberCheck?
-        <div>
-          <Button type={'primary'} size={"large"} onClick={onNo}>好的</Button>
-        </div>
-        :
-        <div>
-          <Button size={"large"} onClick={onNo}>暂不补充</Button>
-          <Button type={'primary'} size={"large"} onClick={onOk}>好的</Button>
-        </div>
-      }  
-    >
-      <div className="contents">
-        <img src={ProfileImg} alt=""/> 
-        {
-          addMemberCheck ?
-          <p>目标用户个人资料不完整，需提醒目标用户补充资料后以进行后续操作</p>
-          :
-          <p>您目前的个人资料不完整，需要补充资料以进行后续操作。是否前往补充个人信息？</p>
-        }
-      </div>
-    </Modals>
-  )
-}
-export default ProfileModal;

src/forge/Component/ProfileModal/Index.scss

@@ -1,18 +0,0 @@
-.contents{
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin:10px auto 0px;
-  img{
-    margin-right: 13px;
-    width: 44px;
-  }
-  p{
-    line-height: 29px;
-    max-width: 327px;
-    font-size: 16px!important;
-  }
-}
-.font-44{
-  font-size: 44px!important;
-}

src/forge/Component/ProfileModal/Profile.jsx

@@ -1,17 +0,0 @@
-import React from 'react';
-
-function Profile({children,sureFunc,showCompeleteDialog , completeProfile, className}) {
-
-  function checkProfile() {
-    if(!completeProfile){
-      showCompeleteDialog && showCompeleteDialog();
-    }else{
-      sureFunc();
-    }
-  }
-
-  return(
-    <a className={className} onClick={checkProfile}>{children}</a>
-  )
-}
-export default Profile;

src/forge/Component/PublicModal/Index.jsx

@@ -1,20 +0,0 @@
-import React from 'react';
-import { Modal } from 'antd';
-import './Index.scss';
-
-function Modals({title,children,btn,onCancel,visible}) {
-  return(
-    <Modal
-      visible={visible}
-      onCancel={onCancel}
-      title={title}
-      width={"520px"}
-      footer={btn}
-      centered={true}
-      wrapClassName={"deleteBox"}
-    >
-      {children}
-    </Modal>
-  )
-}
-export default Modals;

src/forge/Component/PublicModal/Index.scss

@@ -1,75 +0,0 @@
-.deleteBox{
-  z-index: 1033;
-  .ant-modal-close-x{
-    font-size: 17px!important;
-  }
-  .ant-modal-header{
-    background-color: #f8f8f8;
-    padding:10px 30px;
-    .ant-modal-title{
-      text-align: left;
-      font-size: 16px;
-      font-weight: bold;
-    }
-  }
-  .ant-modal-close{
-    top:0px !important;
-    font-size: 24px !important;
-  }
-  .ant-modal-body{
-    padding:30px 50px;
-    p{
-      font-size: 14px;
-      line-height: 26px;
-      color:#666;
-      word-break: break-all;
-    }
-    .desc{
-      .descMain{
-        align-items: center;
-        justify-content: center;
-        font-size: 20px;
-        margin-bottom: 10px;
-        i.red{
-          color:#DF0002;
-        }
-      }
-    }
-  }
-  .ant-modal-footer{
-    border-top: none;
-    text-align: center;
-    padding-bottom: 40px;
-    button,a{
-      width: 96px;
-      height: 32px;
-      margin:0px 20px;
-      font-weight: 400;
-      font-size: 14px;
-      &.ant-btn{
-        border-color: #D0D0D0;
-        color: #666;
-        &:hover,&:active,&:focus{
-          background: #f3f4f6;
-        }
-      }
-      &.ant-btn-danger{
-        background-color: #fff;
-        color: #DF0002;
-        border-color: #D0D0D0;
-        &:hover,&:active,&:focus{
-          border-color: #DF0002;
-          background-color: #fff;
-        }
-      }
-      &.ant-btn.ant-btn-primary{
-        background-color: #466AFF;
-        color: #fff;
-        border-color: #466AFF;
-        &:hover,&:focus,&:active{
-          background-color: rgba(70,106,255,0.85);
-        }
-      }
-    }
-  }
-}

src/forge/Component/Releases.jsx

@@ -1,38 +0,0 @@
-import React from 'react';
-import { AlignTop } from '../Component/layout';
-import { Link } from 'react-router-dom';
-
-function Releases({ owner, projectsId, releaseVersions, distribution }) {
-  return(
-    <div>
-      <Link to={`/${owner}/${projectsId}/releases`} className="font-16 color-ooo hoverA">
-        <span>发行版</span>
-      { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
-      </Link>
-      {
-        releaseVersions && releaseVersions.total_count>0 ?
-          releaseVersions.list.map((item,key)=>{
-            return(
-            key === 0 &&<AlignTop className="mt10">
-              <div>
-                <p className="font-16 color-grey-6" style={{display:'flex',alignItems:'center'}}>
-                  {/* 如果是点击最新则发行版列表页只展示最新的一个 */}
-                  <Link to={{pathname:`/${owner}/${projectsId}/releases`,query:{turnFromNew:true}}} style={{maxWidth:'200px',overflow: 'hidden',whiteSpace: 'nowrap',textOverflow:'ellipsis'}}>{item.name}</Link>
-                  <span className="font-12 laterest ml5">最新</span>
-                </p>
-                <p className="color-grey-3 font-12">{item.created_at}</p>
-              </div>
-            </AlignTop>
-            )
-          })
-        :
-        <div className="mt8">
-          您暂未发布任何版本
-          {distribution && <Link className="color-blue ml20" to={{pathname:`/${owner}/${projectsId}/releases/new`,state:{stable:true}}}>创建新版本</Link>}
-        </div>
-      }
-      
-    </div>
-  )
-}
-export default Releases;

src/forge/Component/Search.jsx

@@ -2,15 +2,13 @@ import React from "react";
 import { Input } from "antd";
 
 const { Search } = Input;
-export default ({ placeholder , onSearch , onChange }) => {
+export default ({ placeholder , onSearch }) => {
   return (
     <Search 
-      allowClear
       placeholder={placeholder}
       enterButton={'搜索'}
       onSearch={onSearch}
       width="300px"
-      onChange={onChange}
     ></Search>
   )
 };

src/forge/Component/SearchUser.jsx

@@ -2,53 +2,52 @@ import React , { useState , useEffect } from 'react';
 import { AutoComplete } from 'antd';
 import { getImageUrl } from "educoder";
 import axios from 'axios';
-
 const Option = AutoComplete.Option;
 
-export default ({ getUser , placeholder, width ,value })=>{
+export default ({ getUser })=>{
-  const [ source , setSource ] = useState(undefined);
   const [ searchKey , setSearchKey ] = useState(undefined);
-
+  const [ userDataSource , setUserDataSource ] = useState(undefined);
-  useEffect(()=>{
-    if(!value){
-      setSearchKey(undefined);
-    }
-  },[value])
-  
-  useEffect(()=>{
-    getUserList();
-  },[searchKey])
 
   function getUserList(e){
     const url = `/users/list.json`;
     axios.get(url, {
       params: {
-        search: searchKey,
+        search: e,
       },
-    }).then((result) => {
+    })
+    .then((result) => {
       if (result) {
-        sourceOptions(result.data.users);
+        setUserDataSource(result.data.users);
       }
     })
     .catch((error) => {
       console.log(error);
     });
   };
+  
+  function changeInputUser(value){
+    setSearchKey(value);
+    getUserList(value);
+  }
 
-  function sourceOptions(userDataSource){
+  function selectInputUser(id, option){
-    const s = userDataSource && userDataSource.map((item, key) => {
+    setSearchKey(option.props.searchValue);
+    getUserList(option.props.searchValue);
+    getUser && getUser(id);
+  }
+  const source =
+    userDataSource && userDataSource.map((item, key) => {
       return (
         <Option
           key={key}
           value={`${item.user_id}`}
-          login={`${item.login}`}
+          searchValue={`${item.username}`}
-          name={item.username}
         >
           <img
             className="user_img radius"
             width="28"
             height="28"
-            src={getImageUrl(`/${item && item.image_url}`)}
+            src={getImageUrl(`images/${item && item.image_url}`)}
             alt=""
           />
           <span className="ml10" style={{ "vertical-align": "middle" }}>
@@ -58,31 +57,14 @@ export default ({ getUser , placeholder, width ,value })=>{
         </Option>
       );
     });
-    setSource(s);
-  }
-
-  function changeInputUser(e){
-    setSearchKey(e);
-  };
-
-  // 选择用户
-  function selectInputUser(e, option){
-    setSearchKey(option.props.name);
-    getUser(option.props.login);
-  };
-
   return(
-    <div className="addPanel">
+    <AutoComplete
-      <AutoComplete
+      dataSource={source}
-        getPopupContainer={trigger => trigger.parentNode}
+      value={searchKey}
-        dataSource={source}
+      style={{ width: 300 }}
-        value={searchKey}
+      onChange={changeInputUser}
-        style={{ width: width || 300 }}
+      onSelect={selectInputUser}
-        onChange={changeInputUser}
+      placeholder="搜索需要添加的用户..."
-        onSelect={selectInputUser}
+    />
-        placeholder={placeholder || "搜索需要添加的用户..."}
-        allowClear
-      />
-    </div>
   )
 }

src/forge/Component/SiderBar.js

@@ -1,91 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { Popover , Tooltip } from 'antd';
-import './Component.scss';
-import axios from 'axios';
-import ShareModal from './SiderBarShareModal';
-
-const $ = window.$;
-
-$(window).scroll(function () {
-  if ($(".gotop").length > 0) {
-    if ($(document).scrollTop() > 0) {
-      $(".-task-sidebar .gotop").show();
-      $(".gotop").click(function () {
-        $("html,body").scrollTop(0);
-      });
-    }
-    if ($(document).scrollTop() === 0) {
-      $(".-task-sidebar .gotop").hide();
-    }
-  }
-});
-
-function SiderBar() {
-  const [ data , setData ] = useState([]);
-  const [ visible , setVisible ] = useState(false);
-
-  useEffect(()=>{
-    getFAQ();
-  },[])
-
-  function getFAQ(){
-    const url = `/faqs.json`;
-    axios.get(url).then(result=>{
-      if(result && result.data){
-        setData(result.data);
-      }
-    }).catch(error=>{})
-  }
-  function content(list){
-    return <div>
-      <p className="titlecontent">帮助</p>
-      <ul className="faqUl">
-        {
-          list && list.map((i,k)=>{
-            return(
-              <li key={i.question+k}><a href={`${i.url}`} title={i.question} target="_blank">{i.question}</a></li>
-            )
-          })
-        }
-      </ul>
-    </div>
-  }
-
-  function shareContent(){
-    return <div>
-      <ul className="shareUl">
-        <p className="titlecontent">分享到</p>
-        <li onClick={()=>setVisible(true)}><i className="iconfont icon-weixin2" style={{color:"#62b900"}}></i></li>
-      </ul>
-    </div>
-  }
-  return (
-    <div className={"-task-sidebar"} >
-      <ShareModal visible={visible} urlValue={window.location.href} onCancel={()=>setVisible(false)}/>
-      {
-        data && data.length > 0 && (data[0] && data[0].question) ? 
-        <Popover content={content(data)} overlayClassName="helpBox" placement={"left"}>
-          <div className="feedback">
-            <i className="iconfont icon-bangzhu font-22"></i>
-          </div>
-        </Popover>
-        :""
-      }
-      {/* <div className="scan pr" title="微信扫一扫">
-        <span className="inline erweima"><i className="iconfont icon-erweima color-white font-22 fl"></i></span>
-      </div>*/}
-      <Popover content={shareContent()} overlayClassName="helpBox shareContent" placement={"left"}>
-        <div className="consult">
-          <i className="iconfont icon-fenxiang1"></i>
-        </div> 
-      </Popover>
-      <div className="gotop">
-        <Tooltip title="返回顶部" placement={"right"}>
-          <a><i className="iconfont icon-huidaodingbu1"></i></a>
-        </Tooltip>
-      </div>
-    </div>
-  )
-}
-
-export default SiderBar;

src/forge/Component/SiderBarShareModal.jsx

@@ -1,27 +0,0 @@
-import React from 'react';
-import { Modal } from 'antd';
-import QRCode  from 'qrcode.react';
-
-function SiderBarShareModal({visible,urlValue,onCancel}) {
-  return(
-    <Modal
-      title={"分享到微信"}
-      visible={visible}
-      width="500px"
-      closable={true}
-      footer={false}
-      onCancel={onCancel}
-    >
-      <div style={{textAlign:"center"}}>
-        {urlValue &&<QRCode
-          value={urlValue}
-          size={200}
-          fgColor="#000000"
-          style={{margin:"20px"}}
-        />}
-        <p>打开微信“扫一扫”,点击右上角菜单，即可将网页分享至朋友圈</p>
-      </div>
-    </Modal>
-  )
-}
-export default SiderBarShareModal;

src/forge/Component/Sort.jsx

@@ -2,9 +2,9 @@ import React from 'react';
 import {Popover} from 'antd';
 import './Component.scss';
 
-export default (({menu , children, overlayClassName})=>{
+export default (({menu , children})=>{
   return(
-    <Popover content={menu} trigger={['click']} placement='bottom' overlayClassName={overlayClassName}>
+    <Popover content={menu} trigger={['click']} placement='bottom'>
       {children}
     </Popover>
   )

src/forge/Component/User.jsx

@@ -1,11 +1,10 @@
 import React from 'react';
 import styled from 'styled-components';
-import { Link } from 'react-router-dom';
 
-export default ({ url , name , column  , id , login })=>{
+
+export default ({ url , name , column })=>{
   const Img = styled.span`
     display:flex;
-    font-weight: bold;
     ${column && "flex-direction: column;text-align:center;"}
     align-items: center;
     & img{
@@ -20,16 +19,8 @@ export default ({ url , name , column  , id , login })=>{
     }
   `;
   return(
-    id?
-    <Link to={`/${login}`}>
-      <Img>
-        { url && <img src={url} alt=""/> }
-        <span>{name}</span>
-      </Img>
-    </Link>
-    :
     <Img>
-      { url && <img src={url} alt=""/> }
+      <img src={url} alt=""/>
       <span>{name}</span>
     </Img>
   )

src/forge/Component/layout.jsx

@@ -24,38 +24,18 @@ export const AlignCenter = styled.div`{
   display:flex;
   align-items: center;
 }`
-export const AlignTop = styled.div`{
-  display:flex;
-  align-items: flex-start;
-}`
-export const AlignAJBottom = styled.div`{
-  display:flex;
-  justify-content: space-between;
-  align-items: flex-end;
-}`
 // 左右结构
 export const Box = styled.div`{
   display:flex;
-  align-items:flex-start;
+  align-item:flex-start;
-}`
-export const LongWidth = styled.div`{
-  flex:1;
-  width:0;
-  border-radius:5px;
-  margin-bottom:30px;
 }`
 export const Long = styled.div`{
-  width:78%;
+  width:72%;
-  border-radius:5px;
-  margin-bottom:30px;
-}`
-export const ShortWidth = styled.div`{
-  width:300px;
   border-radius:5px;
   margin-bottom:30px;
 }`
 export const Short = styled.div`{
-  flex:1;
+  width:28%;
   border-radius:5px;
   margin-bottom:30px;
 }`
@@ -81,24 +61,22 @@ export const Redline = styled.a`{
   line-height:28px;
   border-radius:2px;
   border:1px solid #F73030;
-  color:${props => (props.bold ? "#fff" : "#F73030")} !important;
+  color:#F73030;
   padding:0px 12px;
   display:inline-block;
   min-width:80px;
   text-align:center;
-  background:${props => (props.bold ? "#F73030" : "#fff")};
 }`
 export const Greenline = styled.a`{
   height:30px;
   line-height:28px;
   border-radius:2px;
   border:1px solid #28BD6C;
-  color:${props => (props.bold ? "#fff" : "#28BD6C")} !important;
+  color:#28BD6C;
   padding:0px 12px;
   display:inline-block;
   min-width:80px;
   text-align:center;
-  background:${props => (props.bold ? "#28BD6C" : "#fff")};
 }`
 export const Greenback = styled.a`{
   height:30px;
@@ -116,7 +94,7 @@ export const Blueback = styled.a`{
   line-height:30px;
   border-radius:2px;
   background-color:rgba(80,145,255,1);
-  color:#fff!important;
+  color:#fff;
   padding:0px 12px;
   display:inline-block;
   min-width:80px;
@@ -176,9 +154,3 @@ export const Content = styled.div`{
   background-color:#fff;
   justify-content: center;
 }`
-export const GroupProjectBackgroup = styled.div`{
-  background:#fafafa;
-  padding:20px 30px;
-  width:100%;
-}`
-

src/forge/DevOps/About.jsx

@@ -1,15 +1,14 @@
 import React, { forwardRef, useCallback, useState , useEffect } from "react";
 import activate from "../Images/activate.png";
-import { AlignCenter, Blueback } from "../Component/layout";
+import { Blueback , AlignCenter } from "../Component/layout";
 import PasswordAuthority from "../Component/PasswordAuthority";
 import styled from "styled-components";
-import { Form, Input , Spin , Button } from "antd";
+import { Form, Input , Spin , Modal } from "antd";
-import ServiceModal from './ServiceModal';
 import axios from "axios";
 
 const P = styled.p`
    {
-    width: 230px;
+    width: 200px;
     line-height: 30px;
     font-size: 16px;
     color: #333;
@@ -21,23 +20,20 @@ const P = styled.p`
 function About(props, ref) {
   const { form: { getFieldDecorator, validateFields , setFieldsValue } } = props;
   const [isSpining, setIsSpining] = useState(true);
-
+  const [ authorityValBox , setAuthorityValBox ] = useState(false);
-  // 认证密码
   const [ authorityVal , setAuthorityVal ] = useState(undefined);
   const [ authorityValFlag , setAuthorityValFlag ] = useState(false);
-
   //0: 标识未开启devops
   //1: 标识用户已填写了云服务器相关信息，但并未开启认证
-  const [step, setStep] = useState(0);
+  const [step, setStep] = useState(undefined);
-  
+  // step大于1时：为true，不能再修改服务器信息
   const owner = props.match.params.owner;
-  const { user } = props;
   const projectsId = props.match.params.projectsId;
-  const [ disabled, setDisabled ] = useState(false);
-  const [ typeFlag, setTypeFlag] = useState(false);
 
-  const AuthorLogin = props.projectDetail && props.projectDetail.author && props.projectDetail.author.login;
+
+  const AuthorLogin = props.author && props.author.login;
   const CurrentLogin = props.current_user && props.current_user.login;
+
   useEffect(()=>{
     if(CurrentLogin === AuthorLogin){
       auth('get');
@@ -52,12 +48,12 @@ function About(props, ref) {
       method:`${type}`,
       url
     }).then(result=>{
-      setIsSpining(false);
       if(result && result.data ){
+        setIsSpining(false);
         setStep(result.data.step);
+        setFieldsValue({...result.data.cloud_account});
       }
     }).catch(error=>{
-      setIsSpining(false);
       console.log(error);
     })
   }
@@ -77,8 +73,8 @@ function About(props, ref) {
   function goStep() {
     validateFields((error, values) => {
       if (!error) {
-        if(disabled){
+        if(step > 0){
-          setStep(1);
+          setAuthorityValBox(true);
         }else{
           setIsSpining(true);
           const url = `/${owner}/${projectsId}/cloud_accounts.json`;
@@ -87,6 +83,7 @@ function About(props, ref) {
             if (result && result.data.redirect_url) {
               props.showNotification("服务器信息配置完成！");
               setStep(1);
+              setAuthorityValBox(true);
             }
           })
           .catch((error) => {
@@ -98,50 +95,6 @@ function About(props, ref) {
     });
   }
 
-  // 选择服务器后调用接口，点击下一步（1是自有服务器，2是trustie服务器）
-  function sureModal(type){
-    if(type === 2){
-      setTypeFlag(false);
-      setIsSpining(true);
-      const url = `/users/ci/cloud_account/trustie_bind.json`;
-      axios.post(url,{
-        account:user && user.login
-      }).then(result=>{
-        setIsSpining(false);
-        if(result && result.data){
-          setStep(result.data.step);
-        }
-      }).catch(error=>{setIsSpining(false)})
-    }else{
-      setTypeFlag(true);
-    }
-  }
-
-  // 上一步
-  function goUpStep(step){
-    setTypeFlag(false);
-    setStep(step);
-  }
-
-  // 输入用户密码后下一步
-  function authStep(){
-    if(!authorityVal){
-      setAuthorityValFlag(true);
-      return;
-    }
-    setAuthorityValFlag(false);
-    setIsSpining(true);
-    const url = `/users/ci/oauth_grant.json`;
-    axios.get(url,{
-      params:{password:authorityVal}
-    }).then(result=>{
-      setIsSpining(false);
-      if(result){
-        setStep(result.data.step);
-      }
-    }).catch(error=>{setIsSpining(false)});
-  }
-
   // 开始激活
   function startActive(){
     setIsSpining(true);
@@ -149,7 +102,7 @@ function About(props, ref) {
     axios.post(url).then(result=>{
       setIsSpining(false);
       if(result && result.data.status === 0){
-        props.history.push(`/${owner}/${projectsId}/devops`);
+        props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`);
         // 需要将顶部的open_devops修改
         let { changeOpenDevops } = props;
         changeOpenDevops && changeOpenDevops(true);
@@ -159,89 +112,66 @@ function About(props, ref) {
       setIsSpining(false);
     })
   }
-
+  // 取消授权-登录密码的输入
+  function cancelAuthority(){
+    setAuthorityValBox(false);
+  }
+  // 确认授权
+  function okAuthority(step){
+    setAuthorityValBox(false);
+    setStep(step);
+  }
   return (
     <Spin spinning={isSpining}>
-      {/* <PasswordAuthority authorityValBox={authorityValBox} successFunc={okAuthority} cancelFunc={cancelAuthority}></PasswordAuthority> */}
+      <PasswordAuthority authorityValBox={authorityValBox} successFunc={okAuthority} cancelFunc={cancelAuthority}></PasswordAuthority>
       <div className="activatePanel">
         <img src={activate} alt="" width="250px" />
         <P>定义DevOps工作流，帮助您检测bug、发布代码…</P>
-        {
-          CurrentLogin !== AuthorLogin ?
-          <div className="noOperation">DevOps开启功能暂未对项目创建者以外的角色开放，可以联系项目创建者进行开启，开启后便可查看构建信息。</div>:""
-        }
-        <a href={"https://forum.trustie.net/forums/3110/detail"} target="_blank" style={{ color: "#5091FF"}}>
-          了解什么是DevOps？
-        </a>
         <a href={"https://forum.trustie.net/forums/3080/detail"} target="_blank" style={{ color: "#5091FF"}}>
-          如何使用DevOps？
+          了解什么是DevOps？
         </a>
         {
           AuthorLogin === CurrentLogin ?
           <React.Fragment>
-            {
+            { step <=1 ?
-              step === 0 && !typeFlag ?
+            <React.Fragment>
-                <ServiceModal sureModal={sureModal}></ServiceModal>
+              <Input.Password style={{display:'none'}} size="large" />
-              :""
+              <Form style={{marginTop:"20px"}}>
-            }
+                <p className="mb20" style={{width:"370px"}}>请仔细核对您的服务器信息，一旦确认提交将无法修改</p>
-            { step === 0 && typeFlag ?
+                {helper(
-              <React.Fragment>
+                  "服务器IP地址：",
-                <Input.Password style={{display:'none'}} size="large" />
+                  "ip",
-                <Form style={{marginTop:"20px"}}>
+                  [{ required: true, message: "请输入服务器IP地址" }],
-                  <p className="mb20" style={{width:"370px"}}>请仔细核对您的服务器信息，一旦确认提交将无法修改</p>
+                  <Input
-                  {helper(
+                    placeholder="请输入服务器IP地址"
-                    "服务器IP地址：",
+                    style={{ width: "368px" }}
-                    "ip",
+                    size="large"
-                    [{ required: true, message: "请输入服务器IP地址" }],
+                    disabled={step > 0}
-                    <Input
+                  />,
-                      placeholder="请输入服务器IP地址"
+                  true
-                      style={{ width: "368px" }}
+                )}
-                      size="large"
+                {helper(
-                      disabled={disabled}
+                  "服务器用户名：",
-                    />,
+                  "account",
-                    true
+                  [{ required: true, message: "请输入服务器用户名" }],
-                  )}
+                  <Input placeholder="请输入服务器用户名" size="large" disabled={step > 0}/>,
-                  {helper(
+                  true
-                    "服务器用户名：",
+                )}
-                    "account",
+                {helper(
-                    [{ required: true, message: "请输入服务器用户名" }],
+                  "服务器密码：",
-                    <Input placeholder="请输入服务器用户名" size="large" disabled={disabled}/>,
+                  "secret",
-                    true
+                  [{ required: true, message: "请输入服务器密码" }],
-                  )}
+                  <Input.Password placeholder="请输入服务器密码" size="large" disabled={step > 0}/>,
-                  {helper(
+                  true
-                    "服务器密码：",
+                )}
-                    "secret",
+              </Form>
-                    [{ required: true, message: "请输入服务器密码" }],
+              <Blueback onClick={goStep}>下一步</Blueback>
-                    <Input.Password placeholder="请输入服务器密码" size="large" disabled={disabled}/>,
+            </React.Fragment>
-                    true
+            :""}
-                  )}
+            {step > 1 &&
-                </Form>
-                <AlignCenter>
-                  { !disabled && <Button className="mr20" onClick={()=>goUpStep(0)}>上一步</Button>}
-                  <Blueback onClick={goStep}>下一步</Blueback>
-                </AlignCenter>
-              </React.Fragment>
-              :""
-            }
-            {
-              step === 1 ?
-              <div>
-                <AlignCenter style={{justifyContent:"center",marginTop:"20px"}}>
-                  <span style={{marginBottom:"42px"}}>密码：</span>
-                  <div>
-                    <Input.Password value={authorityVal} className={authorityValFlag===true && "flags"} onChange={(e)=>setAuthorityVal(e.target.value)} style={{width:"220px"}}></Input.Password>
-                    <p className="color-grey-9" style={{textAlign:"left",lineHeight:'21px'}}>您已保存相关服务器信息，请输入密码，<br/>确认授权DevOps应用</p>
-                  </div>
-                </AlignCenter>
-                <AlignCenter style={{justifyContent:'center'}}>
-                  <Blueback onClick={authStep} className="mt20">下一步</Blueback>
-                </AlignCenter>
-              </div>:""
-            }
-            { step === 2 ?
               <div style={{textAlign:'center',marginTop:"20px"}}>
                 <Blueback onClick={startActive} className="mt20">开始激活</Blueback>
-              </div>:""
+              </div>
             }
           </React.Fragment>
           :""

src/forge/DevOps/Dispose.jsx

@@ -1,166 +1,117 @@
 import React , { useState , useEffect } from 'react';
-import { Spin , Pagination } from 'antd';
+import { Spin } from 'antd';
 import { Blueback } from '../Component/layout';
-import List from './Dispose/List';
+import Editor from "react-monaco-editor";
-import Head from './Dispose/head';
+import Modals from './DisposeModal';
+import FileLanguage from '../Component/OpsFileLanguage';
 import axios from 'axios';
-import PipelineName from './Dispose/PipelineName';
 
-import styled from 'styled-components';
 
-const Div = styled.div`{
-  padding:24px 30px;
-}`;
-const limit = 15;
 function Dispose(props){
-  const [ spining , setSpining ] =  useState(true);
+  const [ spining , setSpining ] = useState(true);
-  const [ updateInfo , setUpdateInfo ] = useState(undefined);
+  const [ info , setInfo ] = useState('.trustie-pipeline.yml');
-  const [ list , setList ] = useState(undefined);
-  const [ permission , setPermission ] = useState(undefined);
   const [ visible , setVisible ] = useState(false);
-  const [ page , setPage ] = useState(1);
+  const [ ymlValue , setYmlValue ] = useState("");
-  const [ totalCount , setTotalCount ] = useState(0);
+  const [ sha , setSha ] = useState(undefined);
-  const [ branchList , setBranchList ] =useState(undefined);
+  const [ fileLanguage , setFileLanguage ] = useState(undefined);
+  const [ first , setFirst ] = useState(false);
 
-
-  const projectDetail = props.projectDetail;
-  const current_user = props.current_user;
   let projectsId = props.match.params.projectsId; 
   let owner = props.match.params.owner; 
-
-  // 获取用户的身份角色
   useEffect(()=>{
-    if(projectDetail){
+    if(projectsId){
-      setPermission(props.projectDetail.permission);
+      const url = `/${owner}/${projectsId}/get_trustie_pipeline.json`;
-    }
+      axios.get(url,{
-  },[projectDetail])
+        params:{
-
+          project_id:projectsId
-  function Init(){
-    const url = `/ci/pipelines/list.json`;
-    axios.get(url,{
-      params:{
-        identifier:projectsId,owner,
-        page,limit
-      }
-    }).then(result=>{
-      if(result && result.data){
-        setList(result.data.pipelines);
-      }
-      setSpining(false);
-    }).catch(error=>{setSpining(false);})
-  }
-
-  useEffect(()=>{
-    Init();
-  },[page])
-
-  useEffect(()=>{
-    if(owner && projectsId){
-      const url = `/${owner}/${projectsId}/branches.json`;
-      axios.get(url).then(result=>{
-        if(result && result.data){
-          setBranchList(result.data);
         }
-      }).catch(error=>{})
+      }).then(result=>{
+        if(result && result.data.content){
+          setInfo(result.data.name);
+          setYmlValue(result.data.content);
+          setFirst(true);
+          setSha(result.data.sha);
+        }else{
+          setFirst(false);
+        }
+        setSpining(false);
+      }).catch(error=>{
+        console.log(error);
+      })
     }
-  },[owner,projectsId])
+  },[projectsId])
 
-  // 新增/编辑流水线
+  // 修改文件内容
-  function addNew(pipeline_name,id,branch,event){
+  function changeEditor(value){
-    setVisible(true);
+    setYmlValue(value);
-    setUpdateInfo(undefined);
+  }
-    if(pipeline_name){
+
-      let eventA = event.split(",");
+  // 切换语言
-      let l = {pipeline_name,id,branch,event:eventA}
+  function select_language(value,array){
-      setUpdateInfo(l);
+    setFileLanguage(value);
+    setYmlValue( array && array.content);
+  }
+
+  // 确定提交
+  function submit(){
+    let url = '';
+    let params = {
+      branch: "master",
+      content:ymlValue,
+      filepath:info,
+      message:''
+    }
+    if(first){
+      // 为true，则是编辑否则是新建
+      url = `/${owner}/${projectsId}/update_trustie_pipeline.json`;
+      axios.put(url,{
+        ...params,
+        sha
+      }).then(result=>{
+        if(result){
+          setVisible(true);
+        }
+      }).catch(error=>{
+        console.log(error);
+      })
     }else{
-      setUpdateInfo(undefined);
+      url = `/${owner}/${projectsId}/create_file.json`;
+      axios.post(url,params).then(result=>{
+        if(result){
+          setVisible(true);
+        }
+      }).catch(error=>{
+        console.log(error);
+      })
     }
   }
-
+  function suresubmit(){
-  function onOk(pipeline_name,updateId,branch,event){
+    setVisible(false);
-    if(pipeline_name){
+    props.history.push(`/projects/${owner}/${projectsId}/devops/list`);
-      let eventStr = "";
-      for(var i = 0;i<event.length;i++){
-        eventStr +=event[i]+",";
-      }
-      eventStr = eventStr.substring(0,eventStr.length-1);
-      if(!updateId){
-        // 新增
-        const url = `/ci/pipelines.json`;
-        axios.post(url,{
-          pipeline_name,
-          file_name:".trustie-pipeline.yml",
-          repo:projectsId,branch,event:eventStr,owner
-        }).then(result=>{
-          setVisible(false);
-          if(result && result.data){
-            props.showNotification("流水线新增成功，请进行工作流配置！");
-            props.history.push(`/${owner}/${projectsId}/devops/${result.data.id}`);
-          }else{
-            props.showNotification("流水线新增失败，请稍后再试！");
-          }
-        }).catch(error=>{})
-      }else{
-        // 修改
-        const url = `/ci/pipelines/${updateId}.json`;
-        axios.put(url,{
-          pipeline_name,repo:projectsId,branch,event:eventStr,owner
-        }).then(result=>{
-          if(result && result.data){
-            setVisible(false);
-            Init();
-            props.showNotification("流水线名称更新成功！");
-          }else{
-            props.showNotification("流水线名称更新失败，请稍后再试！");
-          }
-        }).catch(error=>{})
-      }
-    }else{
-      props.showNotification("请输入流水线名称！");
-    }
   }
-
+  
-  // 删除
-  function deleteFunc(id){
-    const url = `/ci/pipelines/${id}.json`;
-    axios.delete(url).then(result=>{
-      if(result && result.data){
-        props.showNotification("流水线删除成功！");
-        Init();
-      }
-    }).catch(error=>{})
-  }
-
-  // 模板管理
-  function toModalManage(){
-    props.history.push(`/${owner}/${projectsId}/devops/mould`);
-  }
-
-  // 参数管理
-  function toparameter(){
-    props.history.push(`/${owner}/${projectsId}/devops/params`);
-  }
-
-  const operate = current_user && (permission && permission !== "Reporter");
   return(
     <Spin spinning={spining}>
-      <PipelineName branchList={branchList} visible={visible} value={updateInfo} onCancel={()=>setVisible(false)} onOk={onOk}/>
+      <Modals visible={visible} closeFunc={(flag)=>setVisible(flag)} sureFunc={suresubmit}></Modals>
-      <div className="disposePanel">
+      <p>编程语言：</p>
-        <Head manager={ operate ? toModalManage : undefined} parameter={operate ? toparameter :undefined}/>
+      
-        <Div>
+      <div className="mt20 mb20">
-          { operate &&  <Blueback onClick={()=>addNew(undefined,undefined)}>新增流水线</Blueback> }
+        <FileLanguage language={fileLanguage} select_language={select_language}/>
-          <div className="mt20 disposeList">
-            <List list={list} operate={operate} projectsId={projectsId} owner={owner} showModal={addNew} deleteFunc={deleteFunc}/>
-            {
-              totalCount > limit &&
-              <div className="mt20 pb20" style={{textAlign:'center'}}>
-                <Pagination simple current={page} pageSize={limit} total={totalCount} onChange={(page)=>setPage(page)}/>
-              </div>
-            }
-          </div>
-        </Div>
       </div>
+      <p>配置脚本：</p>
+      <div className="editorBody">
+        <p className="editorHead">{info}</p>
+        <Editor
+          height="300px"
+          language={"yml"}
+          theme={"vs-grey"}
+          defaultValue="请输入内容"
+          value={ymlValue}
+          options={"editor_options"}
+          onChange={changeEditor}
+        ></Editor>
+      </div>
+      <Blueback onClick={submit}>确定提交</Blueback>
     </Spin>
   )
 }

src/forge/DevOps/Dispose/Choosen.jsx

@@ -1,100 +0,0 @@
-import React , { useEffect , useState } from 'react';
-
-function Choosen({ chooseFunc, temp , templateId , category }){
-  const [ tempId, setTemId ] = useState(undefined);
-  const [ cate , setCate ]= useState(undefined);
-  const [ templates , setTemplates ] = useState(undefined);
-  const [ categories , setCategories ] = useState(undefined);
-
-  useEffect(()=>{
-    if(templateId){
-      setTemId(templateId);
-    }
-  },[templateId])
-
-  useEffect(()=>{
-    if(category){
-      setCate(category);
-    }
-  },[category])
-  
-
-  useEffect(()=>{
-    if(temp && temp.length > 0){
-      if(temp[0].category !== "初始化"){
-        setCategories(temp);
-      }else{
-        setCategories(undefined);
-      }
-      if(category && temp[0].category !== "初始化" && category !== "初始化"){
-        let c = temp.filter(item=>item.category === category);
-        let t = c && c.length > 0 && c[0].templates;
-        setTemplates(t);
-        setCate(category);
-      }else{
-        setTemplates(temp[0].templates);
-        setCate(temp[0].category);
-      }
-    }else{
-      setTemplates(undefined);
-      setCate(undefined);
-      setCategories(undefined);
-    }
-  },[temp,category])
-
-  // 选择类别
-  function changeCate(cate){
-    setCate(cate);
-    let c = categories && categories.filter(item=>item.category === cate);
-    let t = c && c[0].templates;
-    setTemplates(t);
-    let m_t_id = t && t.length>0 && t[0].id;
-    let m_t_content = t && t.length>0 && t[0].content;
-    setTemId(m_t_id);
-    chooseFunc && chooseFunc(m_t_content,m_t_id,cate);
-  }
-
-
-  // 选择模板
-  function chooseOption(id){
-    let item = templates.filter(item=>item.id === id);
-    let content = item && item.length >0 && item[0].content;
-    chooseFunc && chooseFunc(content,id,cate);
-    setTemId(id);
-  }
-
-  return(
-    <React.Fragment>
-      {
-        categories && categories.length > 0 &&
-        <div className="choosenList">
-          <span>模板类别：</span>
-          <ul>
-          {
-            categories.map((item,key)=>{
-              return(
-                <li className={cate === item.category ?"active":""} onClick={()=>changeCate(item.category)}>{item.category}</li>)
-              })
-            }
-          </ul>
-        </div>
-      }
-      {
-        templates && templates.length> 0 &&
-        <div className="choosenList">
-          <span>模板选择：</span>
-          <ul>
-            {
-              templates.map((item,key)=>{
-                return(
-                  <li className={tempId === item.id ? "active":""} onClick={()=>chooseOption(item.id)}>{item.template_name}</li>
-                )
-              })
-            }
-          </ul>
-        </div>
-      }
-    </React.Fragment>
-  )
-}
-export default Choosen;

src/forge/DevOps/Dispose/Editors.jsx

@@ -1,37 +0,0 @@
-import React from 'react';
-import Editor from 'react-monaco-editor';
-
-function Editors({value,onChange,theme,height,visible,width="100%",Numbers="on"}){
-  const editor_options = {
-    lineNumbers: Numbers,
-    wordWrap: true, //强制换行
-    selectOnLineNumbers: true,
-    lineHeight: 24,
-    renderLineHighlight: "line",
-    revealHorizontalRightPadding: 5,
-    placeholder:"请输入内容",
-    readOnly: visible,
-    cursorStyle: visible ? "underline-thin" : "line",
-    folding: true,
-    foldingStrategy: "indentation", // 代码可分小段折叠
-    automaticLayout: true, // 自适应布局
-    minimap: {
-      // 不要小地图
-      enabled: false,
-    },
-  }
-  return(
-    <Editor
-      height={height}
-      width={width}
-      language={"yaml"}
-      theme={theme}
-      placeholder="请输入内容"
-      value={value}
-      options={editor_options}
-      onChange={(value)=>onChange(value)}
-      disabled={true}
-    ></Editor>
-  )
-}
-export default Editors;

src/forge/DevOps/Dispose/Init.jsx

@@ -1,66 +0,0 @@
-import React , { useEffect , useState } from 'react';
-import { Button } from 'antd';
-import Choosen from './Choosen';
-import Editors from './Editors';
-
-function Init({ datas , templates , saveFunc , saveDatas}){
-  const [ templateId , setTemplateId ] = useState(undefined);
-  const [ ymlValue , setYmlValue ] = useState(undefined);
-  const [ temp , setTemp ] = useState(undefined);
-
-  useEffect(()=>{
-    if(templates && templates.length > 0){
-      setTemp(templates)
-    }
-  },[templates])
-
-  useEffect(()=>{
-    if(datas && datas.length > 0){
-      setTemplateId(datas[0].template_id);
-      setYmlValue(datas[0].content);
-    }
-  },[datas])
-
-  // 选择模板
-  function chooseFunc(content,id,cate){
-    setTemplateId(id);
-    setYmlValue(content);
-    recieveData(id,content);
-  }
-
-  function recieveData(id,content){
-    let steps = datas;
-    if(datas && datas.length>0){
-      steps[0].content = content || ymlValue;
-      steps[0].template_id = id || templateId ;
-    }else{
-      steps = 
-      [{
-        step_name:"初始化",
-        show_index:1,
-        content:content || ymlValue,
-        template_id:id || templateId
-      }]
-    }
-    saveDatas(steps);
-  }
-
-  // 点击下一步时
-  function nextStep(){
-    recieveData();
-    saveFunc(undefined,undefined,undefined,undefined,"next");
-  }
-
-  return(
-    <div>
-      <Choosen chooseFunc={chooseFunc} templateId={templateId} temp={temp}/>
-      <div className="mt15">
-        <Editors value={ymlValue} onChange={setYmlValue} theme={"vs-dark"} height={"400px"}/>
-      </div>
-      <div className="mt20">
-        <Button type={"primary"} onClick={nextStep}>下一步</Button>
-      </div>
-    </div>
-  )
-}
-export default Init;

src/forge/DevOps/Dispose/List.jsx

@@ -1,138 +0,0 @@
-import React from 'react';
-import { Table , Popconfirm } from 'antd';
-import { Link } from 'react-router-dom';
-
-// const STATUS = {
-//   running:"运行中",
-//   failure:"未通过",
-//   error:"未通过",
-//   success:"已通过",
-//   killed:"已撤销",
-//   pending:"准备中"
-// }
-function turnbar(str){
-  if(str && str.length>0 && str.indexOf("/")>-1){
-    return str.replaceAll('/','%2F');
-  }
-  return str;
-}
-function renderTableStatus(status) {
-  switch (status) {
-    case "running":
-      return (
-        <span className="statusTag running">
-          <i className="iconfont icon-yunhangzhong"></i>运行中
-        </span>
-      );
-    case "failure": case 'error':
-      return (
-        <span className="statusTag failed">
-          <i className="iconfont icon-weitongguo"></i>未通过
-        </span>
-      );
-    case "success":
-      return (
-        <span className="statusTag pass">
-          <i className="iconfont icon-yitongguo"></i>已通过
-        </span>
-      );
-    case 'killed':
-      return (
-        <span className="statusTag killed">
-          <i className="iconfont icon-weitongguo"></i>已撤销
-        </span>
-      );
-    default :
-      return (
-        <span className="statusTag Preparing">
-          <i className="iconfont icon-zhunbeizhong"></i>准备中
-        </span>
-      );
-  }
-}
-function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
-  
-  const columns = [
-    {
-      title:"流水线名称",
-      dataIndex:"pipeline_name",
-      key:1,
-      ellipsis:true,
-      render:(txt,item)=>{
-        return(
-          <span onDoubleClick={()=>showModal(txt,item.id,item.branch,item.event)} style={{display:"block",cursor:"pointer"}}>{txt}</span>
-        )
-      }
-    },
-    {
-      title:"文件名称",
-      dataIndex:"file_name",
-      key:1,
-      width:"15%",
-      ellipsis:true,
-      render:(value,item)=>{
-        let v = turnbar(item.branch);
-        return(
-          <Link to={`/${owner}/${projectsId}/tree/${v}/${value}`} className="color-blue">{value}</Link>
-        )
-      }
-    },
-    {
-      title:"触发分支",
-      dataIndex:"branch",
-      key:1,
-      width:"10%",
-      ellipsis:true
-    },
-    {
-      title:"触发事件",
-      dataIndex:"event",
-      key:1,
-      width:"10%",
-      ellipsis:true
-    },
-    {
-      title:"最近构建时间",
-      dataIndex:"last_build_time",
-      key:1,
-      width:"15%",
-      ellipsis:true
-    },
-    {
-      title:"最近构建状态",
-      dataIndex:"pipeline_status",
-      key:1,
-      width:"12%",
-      ellipsis:true,
-      render:(txt)=>{
-        return renderTableStatus(txt)
-      }
-    },
-    {
-      title:"操作",
-      dataIndex:"operation",
-      key:1,
-      width:"21%",
-      render:(txt,item)=>{
-        return(
-          <span>
-            { operate ? 
-              <Link to={`/${owner}/${projectsId}/devops/${item.id}`} className="mr10 color-grey-6">
-              <i className="iconfont icon-zaibianji font-13 mr3"></i>编辑</Link> :""
-            }
-            { operate ? 
-              <Popconfirm title={"确定要删除此流水线？"} onConfirm={()=>deleteFunc(item.id)} okText="确定" cancelText={"取消"}>
-                <a className="mr10 color-grey-6"><i className="iconfont icon-lajitong font-13 mr3"></i>删除</a>
-              </Popconfirm>:""
-            }
-            <Link to={`/${owner}/${projectsId}/devops/list/${item.branch}`} className="color-grey-6"><i className="iconfont icon-yunhang font-13 mr3"></i>查看运行记录</Link>
-          </span>
-        )
-      }
-    }
-  ]
-  return(
-    <Table size="small" columns={columns} dataSource={list} rowKey={(row)=>row.id} pagination={false}></Table>
-  )
-}
-export default List;

src/forge/DevOps/Dispose/PipelineName.jsx

@@ -1,67 +0,0 @@
-import React , { useEffect , useState } from 'react';
-import { Modal , Input , Select } from 'antd';
-const { Option }= Select;
-
-const EVENT = ["push","pull_request","tag","cron","custom","promote","rollback"]
-function PipelineName({visible,onCancel,onOk,value ,branchList}){
-  const [ name , setName ] = useState(undefined);
-  const [ branchValue , setBranchValue ] = useState(undefined);
-  const [ eventValue , setEventValue ] = useState([EVENT[0]]);
-
-  useEffect(()=>{
-    if(branchList && branchList.length>0){
-      setBranchValue(branchList[0].name);
-    }
-  },[branchList])
-
-  useEffect(()=>{
-    if(value){
-      setName(value.pipeline_name);
-      setBranchValue(value.branch);
-      setEventValue(value.event);
-    }else{
-      setName(undefined);
-    }
-  },[value])
-
-  function onSure(){
-    onOk(name,value && value.id,branchValue,eventValue);
-  }
-  return(
-    <Modal
-      visible={visible}
-      title="流水线名称"
-      width={"500px"}
-      onCancel={onCancel}
-      onOk={onSure}
-      centered={true}
-    >
-      <div className="choosenList">
-        <span>流水线名称:</span>
-        <Input value={name} onChange={(e)=>setName(e.target.value)} placeholder="请输入名称" style={{width:"340px",margin:"6px 0px"}}/>
-      </div>
-      <div className="choosenList mt20">
-        <span>触发条件:</span>
-        <Select value={branchValue} style={{width:"150px"}} dropdownClassName="chooseCon" onChange={(e)=>setBranchValue(e)}>
-          {
-            branchList && branchList.length>0 && branchList.map((item,key)=>{
-              return(
-                <Option value={item.name} key={key}>{item.name}</Option>
-              )
-            })
-          }
-        </Select>
-        <Select mode="multiple" allowClear value={eventValue} dropdownClassName="chooseCon" style={{width:"180px",marginLeft:"10px"}} onChange={(e)=>{setEventValue(e)}}>
-          {
-            EVENT.map((item,key)=>{
-              return(
-                <Option value={item} key={key}>{item}</Option>
-              )
-            })
-          }
-        </Select>
-      </div>
-    </Modal>
-  )
-}
-export default PipelineName;

src/forge/DevOps/Dispose/Stage.jsx

@@ -1,102 +0,0 @@
-import React , { useEffect , useState } from 'react';
-import { Button , Popconfirm } from 'antd';
-import { Cancel } from '../../Component/layout';
-import Item from './StageItem';
-
-function Stage({ 
-  templates , 
-  datas , 
-  saveDatas , 
-  saveFunc , 
-  stepName , 
-  deleteStep , 
-  deleteFunc , 
-  deleteFlag 
-}){
-  const [ stepList , setStepList ] = useState(undefined);
-  const [ temp , setTemp ] = useState(undefined);
-
-  useEffect(()=>{
-    if(templates && templates.length > 0){
-      setTemp(templates);
-    }
-  },[templates])
-
-  useEffect(()=>{
-    if(datas){
-      if(datas.length > 0 && stepList !== datas){
-        setStepList(datas);
-      }else if(datas.length === 0){
-        let list = [];
-        setStepList(list);
-      }
-    }
-  },[datas])
-
-  // 添加步骤
-  function addFunc(){
-    let list = stepList;
-    let length = list ? list.length : 0;
-    let pre = temp && temp.length > 0 && temp[0];
-    let c = pre && pre.category;
-    let child = pre && pre.templates && pre.templates.length > 0 && pre.templates[0];
-    let step = 
-    {
-      "category":c,
-      "step_name": stepName+`${length + 1}`,
-      "show_index": length + 1,
-      "content":child.content,
-      "template_id":child.id,
-      "hide":false
-    }
-    list.push(step);
-    saveDatas(list);
-  }
-
-  // 将修改的对应项保存在数组中
-  function saveItems(content,id,cate,key){
-    let item = stepList;
-    item[key].content = content;
-    item[key].template_id = id;
-    item[key].category = cate;
-    saveDatas([...item]);
-  }
-
-  function slideItems(key,hide){
-    let item = stepList;
-    item[key].hide = !hide;
-    setStepList([...item]);
-    saveDatas(item);
-  }
-
-  function deleteItem(id,key){
-    deleteStep(id,key);
-  }
-  // 点击下一步时
-  function nextStep(btn){
-    saveFunc(undefined,undefined,undefined,undefined,btn);
-  }
-
-  return(
-    <div>
-      {
-        stepList && stepList.length > 0 && stepList.map((item,key)=>{
-          return(
-            <Item item={item} templates={temp} k={key} saveItems={saveItems} slideItems={slideItems} deleteStep={deleteItem}/>
-          )
-        })
-      }
-      <a className="addStageBtn" onClick={addFunc}>+ 添加步骤</a>
-      <div className="mt20">
-        <Button type="primary" onClick={()=>nextStep("last")}>上一步</Button>
-        <Button className="ml20" type="primary" onClick={()=>nextStep("next")}>下一步</Button>
-        {!deleteFlag && 
-          <Popconfirm title={'确定要删除当前阶段吗'} okText="是" cancelText="否" onConfirm={deleteFunc}>
-            <Cancel className="ml20">删除</Cancel>
-          </Popconfirm>
-        }
-      </div>
-    </div>
-  )
-}
-export default Stage;

src/forge/DevOps/Dispose/StageItem.jsx

@@ -1,41 +0,0 @@
-import React from 'react';
-import { FlexAJ } from '../../Component/layout';
-import Editors from './Editors';
-import Choosen from './Choosen';
-import { Popconfirm } from 'antd';
-
-
-function StageItem({item, templates,saveItems,k, slideItems , deleteStep}){
-  
-  function onChangevalue(value){
-    saveItems(value,item.template_id,item.category,k);
-  }
-  // 选择模板
-  function chooseFunc(content,id,cate){
-    saveItems(content,id,cate,k);
-  }
-
-  return(
-    <div className="stepsItem">
-      <FlexAJ className="stepsHead">
-        <span>{item.step_name}</span>
-        <span className="color-grey-9">
-          <Popconfirm
-            title={"确定要删除这个步骤吗?"}
-            okText="是"
-            cancelText="否"
-            onConfirm={() => deleteStep(item.id,k)}
-          ><a>
-            <i className="iconfont icon-lajitong1 font-14"></i></a>
-          </Popconfirm>
-          <a onClick={()=>slideItems(k,item.hide)}><i className={ (!item.hide || item.hide === false) ? "iconfont icon-sanjiaoxing-down font-14" :"iconfont icon-triangle font-14"}></i></a>
-        </span>
-      </FlexAJ>
-      <div className={(!item.hide || item.hide === false) ? "stepsBody active" : "stepsBody"}>
-        <Choosen chooseFunc={chooseFunc} category={item.category} templateId={item.template_id} temp={templates}/>
-        <Editors value={item.content} onChange={onChangevalue} theme="vs-dark" height="270px" />
-      </div>
-    </div>
-  )
-}
-export default StageItem;

src/forge/DevOps/Dispose/Sure.jsx

@@ -1,32 +0,0 @@
-import React ,{useEffect , useState} from 'react';
-import { Button } from 'antd';
-import Editors from './Editors';
-
-function Sure({datas , name , saveFunc , sureSubmit , loading}){
-  const [ value , setValue ] = useState(undefined);
-  useEffect(()=>{
-    if(datas && datas.content){
-      setValue(datas.content)
-    }
-  },[datas]);
-
-  function sure(){
-    sureSubmit();
-  }
-
-  return(
-    <div>
-      <div style={{padding:"0px 15px 15px 15px"}}>
-        工作流名称：{name}
-      </div>
-      <div className="editorBody" style={{marginTop:"0px"}}>
-        <Editors value={value} theme={"vs-grey"} height={"600px"} visible/>
-      </div>
-      <div className="mt20">
-        <Button type={"primary"} onClick={()=>saveFunc(undefined,undefined,undefined,undefined,"last")}>上一步</Button>
-        { value && <Button type={"primary"} loading={loading} className="ml20" onClick={sure}>确定提交</Button> }
-      </div>
-    </div>
-  )
-}
-export default Sure;

src/forge/DevOps/Dispose/head.jsx

@@ -1,21 +0,0 @@
-import React from 'react';
-import { AlignCenterBetween , Blueline , FlexAJ } from '../../Component/layout';
-
-
-function head({manager , parameter}){
-  return(
-    <AlignCenterBetween>
-      <span className="font-20">工作流配置</span>
-      <FlexAJ>
-        {
-          parameter && <Blueline onClick={parameter}>参数管理</Blueline>
-        }
-        {
-          manager && <Blueline style={{marginLeft:"20px"}} onClick={manager}>模板管理</Blueline>
-        }
-        <a href={`https://forum.trustie.net/forums/3111/detail`} target="_blank" className="color-grey-6 ml20"><i className="iconfont icon-tishi1 font-14 mr3"></i>模板使用说明</a>
-      </FlexAJ>
-    </AlignCenterBetween>
-  )
-}
-export default head;

src/forge/DevOps/Dispose/menus.jsx

@@ -1,40 +0,0 @@
-import React from 'react';
-import MenusRename from './menusRename';
-import MenusAdd from './menusAdd';
-
-const typeIcon = {
-  init:"icon-initialize",build:"icon-structure",deploy:"icon-arrange",customize:"icon-newStage",confirm:'icon-sure'
-}
-
-function Menus({step,changeStep, menuList , renameFunc , checkDatas , addFunc }){
-  
-  function InitActive(key,stage_type,stage_id,stage_name){
-    changeStep(key,stage_type,stage_id,stage_name);
-  }
-
-  // 新增阶段
-  function getName(name,index){
-    addFunc && addFunc(name,index);
-  }
-
-  return(
-    <ul className="menus">
-      {
-        menuList && menuList.length > 0 && menuList.map((item,key)=>{
-          return(
-            <React.Fragment key={item.id} >
-              <li onClick={()=>InitActive(item.show_index,item.stage_type,item.id,item.stage_name)} className={item.show_index === step ?"active":""}>
-                <i className={`iconfont ${typeIcon[`${item.stage_type}`]}`}></i>
-                <MenusRename renameFunc={renameFunc} id={item.id} name={item.stage_name} edit={item.stage_type !== "init" && item.stage_type !== "confirm"}/>
-              </li>
-              { key !== (menuList.length-1) && menuList.length < 7 ?
-                <MenusAdd checkDatas={checkDatas} k={key+2} getName={getName}/>:""
-              } 
-            </React.Fragment>
-          )
-        })
-      }
-    </ul>
-  )
-}
-export default Menus;

src/forge/DevOps/Dispose/menusAdd.jsx

@@ -1,55 +0,0 @@
-import React , { useState , useEffect } from 'react';
-import { Input } from 'antd';
-
-function menusAdd ({ getName , checkDatas , k }){
-  const [ show, setShow ] = useState(false);
-  const [ value , setValue ] = useState(undefined);
-  const [ index , setIndex ] = useState(undefined);
-  const [ref, setRef ] = useState(undefined);
-  const [put, setPut ] = useState(false);
-
-  useEffect(() => {
-    if (put && ref) {
-      ref.focus();
-    }
-  })
-  useEffect(() => {
-    if (k) {
-      setIndex(k);
-    }
-  },[k])
-
-
-  function blurInput(){
-    if(value){
-      getName(value , index);
-    }
-    setValue(undefined);
-    setShow(false);
-    setPut(false);
-  }
-
-  function showInput(){
-    let c = checkDatas();
-    if(c || c === "" ){
-      setShow(true);
-      setPut(true);
-    }
-  }
-
-  return(
-    <li className="menuAdd">
-      { !show && <i className="iconfont icon-tianjia" onClick={showInput}></i> }
-      <Input 
-        ref={(el) => setRef(el)} 
-        size={"small"} 
-        maxLength={8} 
-        style={{width:"75px",display : `${show?"block":'none'}`}} 
-        placeholder="新阶段名称" 
-        value={value} 
-        onChange={(e)=>setValue(e.target.value)} onBlur={blurInput} 
-      />
-    </li>
-  )
-}
-export default menusAdd;

src/forge/DevOps/Dispose/menusRename.jsx

@@ -1,53 +0,0 @@
-import React , { useEffect , useState } from 'react';
-import { Input } from 'antd';
-
-function menusRename({ name , edit , id , renameFunc }){
-  const [ n , setN ] = useState(undefined);
-  const [ show , setShow ] = useState(false);
-  const [ref, setRef ] = useState(undefined);
-  const [put, setPut ] = useState(false);
-
-  useEffect(() => {
-    if (edit && ref) {
-      ref.focus();
-    }
-  })
-
-  useEffect(()=>{
-    if(name){
-      setN(name)
-    }
-  },[name])
-
-  // 显示input框编辑
-  function changeShow(e){
-    e.stopPropagation();
-    setShow(true);
-    setPut(true);
-  }
-
-  function blurInput(e){
-    renameFunc(e.target.value,id);
-    setPut(false);
-    setShow(false);
-  }
-  return(
-    <div className="aboutEdit">
-      <span className="operateName">
-        { !show && n }
-        <Input 
-          ref={(el) => setRef(el)} 
-          value={n} 
-          size="small" 
-          maxLength={8} 
-          onClick={(e)=>e.stopPropagation()} 
-          onBlur={blurInput} 
-          style={{width:"75px",display : `${show?"block":'none'}`}} 
-          onChange={(e)=>setN(e.target.value)}
-        />
-        { !show && edit && <i className="iconfont icon-editUnder font-16 color-grey-9" onClick={changeShow}></i> }
-      </span>
-    </div>
-  )
-}
-export default menusRename