Merge branch 'develop'

# Conflicts:
#	public/css/edu-purge.css

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "forge",
-  "version": "3.0.0",
+  "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -2065,8 +2065,9 @@
     },
     "babel-polyfill": {
       "version": "6.26.0",
-      "resolved": "https://registry.nlark.com/babel-polyfill/download/babel-polyfill-6.26.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-polyfill/download/babel-polyfill-6.26.0.tgz",
       "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
+      "dev": true,
       "requires": {
         "babel-runtime": "^6.26.0",
         "core-js": "^2.5.0",
@@ -2075,8 +2076,9 @@
       "dependencies": {
         "regenerator-runtime": {
           "version": "0.10.5",
-          "resolved": "https://registry.nlark.com/regenerator-runtime/download/regenerator-runtime-0.10.5.tgz",
+          "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.10.5.tgz?cache=0&sync_timestamp=1595456367497&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fregenerator-runtime%2Fdownload%2Fregenerator-runtime-0.10.5.tgz",
-          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg="
+          "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=",
+          "dev": true
         }
       }
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "forge",
-  "version": "3.0.0",
+  "version": "0.1.0",
   "private": true,
   "dependencies": {
     "@monaco-editor/react": "^2.3.0",
@@ -113,8 +113,7 @@
     "whatwg-fetch": "2.0.3",
     "wrap-md-editor": "^0.2.20",
     "xterm": "4.8.1",
-    "xterm-addon-fit": "0.4.0",
+    "xterm-addon-fit": "0.4.0"
-    "babel-polyfill": "^6.26.0"
   },
   "scripts": {
     "start": "node --max_old_space_size=15360 scripts/start.js",

src/App.js

@@ -124,6 +124,12 @@ class App extends Component {
 	componentDidMount() {
 		document.title = "loading...";
 		this.disableVideoContextMenu();
+		history.listen(() => {
+			this.forceUpdate()
+			const $ = window.$
+			$("html").animate({ scrollTop: $('html').scrollTop() - 0 })
+		});
+
 		initAxiosInterceptors(this.props);
 		this.getAppdata();
 

src/forge/Index.js

@@ -31,14 +31,6 @@ const Infos = Loadable({
   loading: Loading,
 });
 class Index extends Component {
-
-  componentDidUpdate=()=>{
-    this.props.history.listen(()=>{
-      if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
-        window.scrollTo(0, 0)
-      }
-    })
-  }
   render() {
     return (
       <div className="newMain clearfix">

src/forge/Main/CoderDepot.jsx

@@ -389,7 +389,7 @@ function CoderDepot(props){
                         website &&
                         <p className="color-grey-6 df">
                           <i className="iconfont icon-lianjie2 font-15 mr10 color-grey-9"></i>
-                          <a href={website} className="color-grey-6" target="_blank" style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px",textDecoration:"underline"}}>{website}</a>
+                          <a href={website} target="_blank" style={{wordBreak:"break-all",lineHeight:"20px",marginTop:"5px",textDecoration:"underline"}}>{website}</a>
                         </p>
                       }
                       <p>
@@ -397,13 +397,13 @@ function CoderDepot(props){
                         <a href="#readme" className="color-grey-6">README.md</a>
                       </p>
                       <p className="color-grey-6">
-                        <i className="iconfont icon-dataBase font-15 mr10 color-grey-6"></i>
+                        <i className="iconfont icon-dataBase font-15 mr10 color-grey-9"></i>
                         <span>{projectDetail && projectDetail.size}</span>
                       </p>
                       {
                         projectDetail && projectDetail.license_name &&
                         <p className="color-grey-6">
-                          <i className="iconfont icon-tianping font-16 mr10 color-grey-3"></i>
+                          <i className="iconfont icon-tianping font-16 mr10 color-grey-9"></i>
                           <span>{projectDetail.license_name}</span>
                         </p>
                       }

src/forge/Main/IndexItem.js

@@ -46,13 +46,11 @@ class IndexItem extends Component {
                         : ""
                     }
                     {
-                      item.type && item.type === 2 ?
+                      item.type && item.type !== 0 ? 
+                      item.type === 2 ?
                       <Tooltip title="该项目是一个镜像" className="ml5">
                         <i className="iconfont icon-banbenku font-18 color-green" />
-                      </Tooltip>:""
+                      </Tooltip>:
-                    }
-                    {
-                      item.type && item.type === 1 ?
                       <span className="ml5">
                         <i className="iconfont icon-jingxiang font-18 color-green" />
                       </span>:""
@@ -67,6 +65,8 @@ class IndexItem extends Component {
 
                 <div className="p-r-about">
                   <span className="p-r-detail">
+                    {/* <span><label>浏览量：</label>{item.visits}</span> */}
+                    {/* {item.category && item.category.id && <span>{item.category.name}</span>} */}
                     {item.last_update_time ? <span><label>更新于</label>{item.time_ago}</span> : ""}
                     {item.language && item.language.id ? <span className="color-grey-3">{item.language.name}</span> : ""}
                   </span>

src/forge/Main/sub/Contribute.jsx

@@ -42,7 +42,7 @@ function Contribute(props){
     <WhiteBack>
       <Spin spinning={isSpin}>
         <div className="boxPanel">
-          <p className="font-18 padding10-20" style={{borderBottom:"1px solid #eee"}}>贡献者列表</p>
+          <p className="font-18 mb20">贡献者列表</p>
           {
             list && list.length > 0 ?
             <div className="contrbuteList">

src/forge/Main/sub/DetailBanner.jsx

@@ -75,7 +75,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                     </li>
                     :""
                   }
-                  {
+                  {/* {
                     item.menu_name === "resources" &&
                     <li className={pathname==="source" ? "active" : ""}>
                       <Link to={{ pathname: `/projects/${owner}/${projectsId}/source`, state }}>
@@ -84,7 +84,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                           {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
                       </Link>
                     </li>
-                  }
+                  } */}
                   {
                     item.menu_name === "versions" &&
                     <li className={pathname==="milestones" ? "active" : ""}>

src/forge/Main/sub/sub.scss

@@ -1,13 +1,11 @@
 .boxPanel{
   width: 1200px;
-  margin:20px auto;
+  margin:0px auto;
-  border-radius: 4px;
+  padding:20px 0px;
-  border:1px solid #eee;
   min-height: 500px;
   .contrbuteList{
     display: flex;
     flex-wrap: wrap;
-    padding:20px;
     & > div{
       width: 20%;
     }

src/forge/Settings/Setting.js

@@ -15,7 +15,7 @@ const menu = [
   {name:"易修 (Issue)",index:"issues"},
   {name:"合并请求",index:"pulls"},
   {name:"工作流(beta版)",index:"devops"},
-  {name:"资源库",index:"resources"},
+  // {name:"资源库",index:"resources"},
   {name:"里程碑",index:"versions"},
   {name:"动态",index:"activity"},
 ]

src/forge/users/Infos.js

@@ -67,11 +67,6 @@ class Infos extends Component {
     if(prevUser && username && prevUser !== username){
       this.fetchUser();
     }
-    this.props.history.listen(()=>{
-      if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
-        window.scrollTo(0, 0)
-      }
-    })
   }
 
   fetchUser = () => {

src/index.js

@@ -13,7 +13,6 @@ configureUrlQuery({ history });
 window.__useKindEditor = false;
 
 
-
 const render = (Component) => {
   ReactDOM.render(
     <AppContainer >