diff --git a/public/react/package.json b/public/react/package.json index b9807f354..d74700482 100644 --- a/public/react/package.json +++ b/public/react/package.json @@ -104,7 +104,7 @@ "wrap-md-editor": "^0.2.20" }, "scripts": { - "start": "node --max_old_space_size=15360 scripts/start.js", + "start": "node --max_old_space_size=20000 scripts/start.js", "build": "node --max_old_space_size=15360 scripts/build.js", "concat": "node scripts/concat.js", "gen_stats": "NODE_ENV=production webpack --profile --config=./config/webpack.config.prod.js --json > stats.json", diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 0c8e8d357..93dee83f5 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -45,7 +45,8 @@ export function initAxiosInterceptors(props) { // https://github.com/axios/axios/issues/1497 // TODO 读取到package.json中的配置? - var proxy = "http://localhost:3000" + var proxy = "http://123.59.135.93:56666" + //var proxy = "http://localhost:3000" // proxy = "http://testbdweb.trustie.net" // proxy = "http://testbdweb.educoder.net" // proxy = "https://testeduplus2.educoder.net" diff --git a/public/react/src/forge/Index.js b/public/react/src/forge/Index.js index 0db8b4cdf..eee8da28a 100644 --- a/public/react/src/forge/Index.js +++ b/public/react/src/forge/Index.js @@ -70,7 +70,7 @@ class Index extends Component{ render={ (props) => () } - > + > ) } diff --git a/public/react/src/forge/Main/CoderRootIndex.js b/public/react/src/forge/Main/CoderRootIndex.js index dc954bcd7..011486fb6 100644 --- a/public/react/src/forge/Main/CoderRootIndex.js +++ b/public/react/src/forge/Main/CoderRootIndex.js @@ -3,7 +3,8 @@ import { Route , Switch , Link} from 'react-router-dom'; import Loadable from 'react-loadable'; import Loading from '../../Loading'; - +/*空数据页面 */ +import NullData from './NullData'; import axios from 'axios'; diff --git a/public/react/src/forge/Main/NullData.js b/public/react/src/forge/Main/NullData.js new file mode 100644 index 000000000..205e3ab9a --- /dev/null +++ b/public/react/src/forge/Main/NullData.js @@ -0,0 +1,58 @@ +import React, { Component } from 'react'; +import "../Branch/branch.css" + + + + +class NullData extends Component { + + render() { + return ( +
+

快速帮助

+
+
+

克隆当前仓库不知道如何克隆?查看帮助

+
+ HTTP + + +
+ +
+
+

从命令行创建一个新的仓库

+
+
+                            
+                                touch README.md
+ git init
+ git add README.md
+ git commit -m "first commit"
+ git remote add origin +
+ git push -u origin master +
+
+
+
+
+

从命令行推送已创建的仓库

+
+
+                            
+                                 git remote add origin 
+                                
+ git push -u origin master +
+
+
+ +
+
+
+ ); + }; +} + +export default NullData; \ No newline at end of file diff --git a/public/react/src/forge/Main/list.css b/public/react/src/forge/Main/list.css index dbf75010a..1fee6fb46 100644 --- a/public/react/src/forge/Main/list.css +++ b/public/react/src/forge/Main/list.css @@ -429,3 +429,45 @@ body,#root{ width: 100%; } } +.null_data_box{ + width: 100%; + border: 1px solid #d4d4d5; + border-radius:3px ; +} +.title{ + font-weight: bold; + background: #f4f4f4; + padding: 10px 15px; + box-sizing: border-box; + border-bottom: 1px solid #d4d4d5; +} +.item_title{ + font-size:18px; + font-weight: bold; + margin-bottom: 15px; +} +.item{ + padding: 15px; + border-bottom: 1px solid #dededf; +} +.item:last-child{ + border-bottom:none; +} +.gitAddressClone{ + margin: 0 !important; +} +.item_title small{ + font-weight: 400; + margin-left: 10px; + +} +.item_title small a{ + color: #4183c6; +} +.Markdown{ + background: #f7f7f7; + padding: 10px 20px; +} +.item .gitAddressClone input:focus{ +border: 1px solid #2185d0; +} \ No newline at end of file