Merge pull request '解决冲突以及issue' (#289) from caishi/forgeplus-react:gitlink_server into gitlink_server

package-lock.json

@@ -2060,7 +2060,7 @@
     },
     "babel-plugin-transform-runtime": {
       "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-plugin-transform-runtime/download/babel-plugin-transform-runtime-6.23.0.tgz",
       "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
       "requires": {
         "babel-runtime": "^6.22.0"
@@ -2179,7 +2179,7 @@
     },
     "babel-preset-react": {
       "version": "6.24.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.24.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/babel-preset-react/download/babel-preset-react-6.24.1.tgz",
       "integrity": "sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=",
       "requires": {
         "babel-plugin-syntax-jsx": "^6.3.13",
@@ -3507,7 +3507,7 @@
     },
     "code-prettify": {
       "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/code-prettify/-/code-prettify-0.1.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/code-prettify/download/code-prettify-0.1.0.tgz",
       "integrity": "sha1-RocMyMGlDQm61TmzOpg9vUqjSx4="
     },
     "codemirror": {
@@ -7291,7 +7291,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -7312,12 +7313,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+          "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -7332,17 +7335,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
+          "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+          "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
-          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4="
+          "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -7459,7 +7465,8 @@
         "inherits": {
           "version": "2.0.4",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -7471,6 +7478,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -7485,6 +7493,7 @@
           "version": "3.0.4",
           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -7492,12 +7501,14 @@
         "minimist": {
           "version": "1.2.5",
           "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+          "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+          "optional": true
         },
         "minipass": {
           "version": "2.9.0",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
           "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==",
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -7516,6 +7527,7 @@
           "version": "0.5.3",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz",
           "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==",
+          "optional": true,
           "requires": {
             "minimist": "^1.2.5"
           }
@@ -7577,7 +7589,8 @@
         "npm-normalize-package-bin": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz",
-          "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
+          "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==",
+          "optional": true
         },
         "npm-packlist": {
           "version": "1.4.8",
@@ -7605,7 +7618,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0="
+          "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -7617,6 +7631,7 @@
           "version": "1.4.0",
           "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -7694,7 +7709,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -7730,6 +7746,7 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -7749,6 +7766,7 @@
           "version": "3.0.1",
           "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -7792,12 +7810,14 @@
         "wrappy": {
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
+          "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+          "optional": true
         },
         "yallist": {
           "version": "3.1.1",
           "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
-          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g=="
+          "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+          "optional": true
         }
       }
     },

src/AppConfig.js

@@ -25,7 +25,7 @@ if (isDev) {
   }
   debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
   window.location.search.indexOf('debug=s') !== -1 ? 'student' :
-  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'student'
+  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
 }                 
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {

src/forge/users/Echart/Calendar.jsx

@@ -35,12 +35,23 @@ function Calendar({ userLogin , time , chooseTime }) {
     const url = `/users/${userLogin}/headmaps.json`;
     Axios.get(url).then(result=>{
       if(result && result.data){
-        // result.data.headmaps
         let m = [];
+        let flag = true;
+        if(result.data.headmaps && result.data.headmaps.length>0){
+          m = result.data.headmaps;
+          flag = true;
+        }else{
+          var date = +echarts.number.parseDate(baginT);
+          let d = timestampToTime(date);
+          m=[{
+            contributions:"",date:d
+          }]
+          flag = false;
+        }
         m.sort(compare('contributions'));
         let max = m[m.length -1].contributions;
 
-        Init(m,max);
+        Init(m,max,flag);
       }
     }).catch(error=>{})
   }
@@ -54,7 +65,6 @@ function Calendar({ userLogin , time , chooseTime }) {
   }
 
   function getVirtulData(data) {
-    debugger;
     var date = +echarts.number.parseDate(baginT);
     var end = +echarts.number.parseDate(endT);
     var dayTime = 3600 * 24 * 1000;
@@ -79,7 +89,7 @@ function Calendar({ userLogin , time , chooseTime }) {
     return Y+M+D;
   }
 
-  function Init(data,max) {
+  function Init(data,max,flag) {
     var huan_val = document.getElementById("Calendar");
     var myEcharts = echarts.init(huan_val);
     let option = {
@@ -99,8 +109,9 @@ function Calendar({ userLogin , time , chooseTime }) {
         left: 'center',
         bottom: 40,
         inRange:{
-          color:['#fafafa', '#216e39']
+          color:flag ? ['#fafafa', '#216e39'] :['#fff','#fff']
-        }
+        },
+        show:flag
       },
       calendar: {
         top: 50,

src/modules/403/Shixunauthority.js

@@ -1,38 +1,11 @@
-<<<<<<< HEAD
 import React, { Component } from 'react';
-=======
-import React, { Component, useReducer } from 'react';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import Loading from '../../Loading';
-
-import Loadable from 'react-loadable';
-
->>>>>>> develop
 import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
 import { SnackbarHOC, getImageUrl } from 'educoder';
 
 class Shixunauthority extends Component {
-    constructor(props) {
-        super(props);
-    }
     render() {
-        console.log(this.props);
         const { current_user } = this.props;
         return (
-<<<<<<< HEAD
-            <div className="newMain clearfix">
-                <div className=" edu-txt-center mt60 mb60">
-                    <img src={getImageUrl("images/warn/pic_403.jpg")} alt="" />
-                    <p className="font-18 mt40">
-                        您可以稍后尝试&nbsp;<a href="/" className="color-blue">返回首页</a>
-                        ，或者&nbsp;
-                        <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi"
-                            className="color-blue">QQ反馈&gt;&gt;</a>
-                    </p>
-                </div>
-=======
             <div className="newMain newTable clearfix">
                     <div className="edu-txt-center mt60 mb60">
                         {/*mt100 mb100*/}
@@ -53,14 +26,8 @@ class Shixunauthority extends Component {
                     {/*<div style="clear:both;"></div>*/}
                     {/*<div id="ajax-indicator" style="display:none;"><span>载入中...</span></div>*/}
                     {/*<div id="ajax-modal" style="display:none;"></div>*/}
->>>>>>> develop
             </div>
         );
     }
 }
-<<<<<<< HEAD
-
 export default SnackbarHOC() (TPMIndexHOC  ( Shixunauthority ));
-=======
-export default SnackbarHOC() (TPMIndexHOC  ( Shixunauthority ));
->>>>>>> develop

src/modules/404/Shixunnopage.js

@@ -3,25 +3,9 @@ import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
 import { SnackbarHOC, getImageUrl } from 'educoder';
 
 class http500 extends Component {
-    constructor(props) {
-        super(props);
-    }
     render() {
-        console.log(this.props);
         const { current_user } = this.props;
         return (
-<<<<<<< HEAD
-            <div className="newMain clearfix">
-                <div className=" edu-txt-center mt60 mb60">
-                    <img src={getImageUrl("/images/warn/pic_404.jpg")} alt="" />
-                    <p className="font-18 mt40">
-                        您可以稍后尝试&nbsp;<a href="/" className="color-blue">返回首页</a>
-                        ，或者&nbsp;
-                        <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi"
-                            className="color-blue">QQ反馈&gt;&gt;</a>
-                    </p>
-                </div>
-=======
             <div className="newMain newTable clearfix">
                     <div className=" edu-txt-center mt60">
                         {/*mt100 mb100*/}
@@ -43,7 +27,6 @@ class http500 extends Component {
                     {/*<div style="clear:both;"></div>*/}
                     {/*<div id="ajax-indicator" style="display:none;"><span>载入中...</span></div>*/}
                     {/*<div id="ajax-modal" style="display:none;"></div>*/}
->>>>>>> develop
             </div>
         );
     }

src/modules/500/http500.js

@@ -4,18 +4,6 @@ import { SnackbarHOC, getImageUrl } from 'educoder';
 class Shixunnopage extends Component {
     render() {
         return (
-<<<<<<< HEAD
-            <div className="newMain clearfix">
-                <div className=" edu-txt-center mt60 mb60">
-                    <img src={getImageUrl("images/warn/pic_500.jpg")} alt="" />
-                    <p className="font-18 mt40">
-                        您可以稍后尝试&nbsp;<a href="/" className="color-blue">返回首页</a>
-                        ，或者&nbsp;
-                        <a target="_blank" href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi"
-                            className="color-blue">QQ反馈&gt;&gt;</a>
-                    </p>
-                </div>
-=======
             <div className="newMain newTable clearfix">
                     <div className=" edu-txt-center mt60 mb60">
                         {/*mt100 mb100*/}
@@ -30,10 +18,6 @@ class Shixunnopage extends Component {
                                    className="color-blue">QQ</a>向我们反馈
                             </p>
                     </div>
-                    {/*<div style="clear:both;"></div>*/}
-                    {/*<div id="ajax-indicator" style="display:none;"><span>载入中...</span></div>*/}
-                    {/*<div id="ajax-modal" style="display:none;"></div>*/}
->>>>>>> develop
             </div>
         );
     }