Merge remote-tracking branch 'origin/jupyter' into jupyter

public/react/src/modules/tpm/Audit_situationComponent.js

@@ -212,6 +212,7 @@ class Audit_situationComponent extends Component {
 									user={user}
 									shixun={shixun}
 									{...this.props}
+									is_jupyter={this.props.is_jupyter}
 								></TPMNav>
 
 								<div  className="padding20 edu-back-white mt20" style={{minHeight: '640px'}}>

public/react/src/modules/tpm/TPMChallenge.js

@@ -20,7 +20,7 @@ class TPMChallenge extends Component {
     }
 
     render() {
-      const { loadingContent, shixun, user, match,jupyterbool
+      const { loadingContent, shixun, user, match,jupyterbool,is_jupyter
        } = this.props;
       return (
         <React.Fragment>
@@ -32,13 +32,15 @@ class TPMChallenge extends Component {
                     user={user}
                     shixun={shixun}
                     {...this.props}
+										is_jupyter={this.props.is_jupyter}
                 ></TPMNav>
 							{
-								jupyterbool===true?
+								is_jupyter===true?
 									<Challengesjupyter
 										{...this.props}
 									/>
-									: <Challenges
+									:
+									<Challenges
 										{...this.props}
 									/>
 							}

public/react/src/modules/tpm/TPMChallengeContainer.js

@@ -15,13 +15,16 @@ class TPMChallengeContainer extends Component {
     render() {
         const { tpmLoading } = this.props;
         const user = this.props.current_user;
+        console.log("TPMChallengeContainerTPMChallengeContainer");
+			  console.log(this.props);
 
-        return (
+			return (
           <React.Fragment>
 
               { tpmLoading ? <div style={{ minHeight: '886px'}}></div> :
               <TPMChallenge
                   {...this.props}
+									is_jupyter={this.props.is_jupyter}
               >
               </TPMChallenge>
               }

public/react/src/modules/tpm/TPMCollaborators.js

@@ -31,6 +31,7 @@ class TPMCollaborators extends Component {
                   user={user}
                   shixun={shixun}
                   {...this.props}
+									is_jupyter={this.props.is_jupyter}
               ></TPMNav>
             <Collaborators
              {...this.props}

public/react/src/modules/tpm/TPMCollaboratorsContainer.js

@@ -35,7 +35,7 @@ class TPMChallengeContainer extends Component {
               {...this.state}
               user={user}
               aboutFocus={this.props.aboutFocus}
-
+							is_jupyter={this.props.is_jupyter}
           >
           </TPMCollaborators>
           }

public/react/src/modules/tpm/TPMDataset.js

@@ -400,6 +400,7 @@ class TPMDataset extends Component {
 							user={user}
 							shixun={shixun}
 							{...this.props}
+							is_jupyter={this.props.is_jupyter}
 						></TPMNav>
 
 						<div className="padding20 edu-back-white mt20 " style={{minHeight: '463px'}}>

public/react/src/modules/tpm/TPMFork_listContainer.js

@@ -38,7 +38,7 @@ class TPMRanking_listContainer extends Component {
               {...this.state}
               user={user}
               aboutFocus={this.props.aboutFocus}
-
+							is_jupyter={this.props.is_jupyter}
           >
           </TPMForklist>
           }

public/react/src/modules/tpm/TPMForklist.js

@@ -42,6 +42,7 @@ class TPMForklist extends Component {
                 user={user}
                 shixun={shixun}
                 {...this.props}
+								is_jupyter={this.props.is_jupyter}
             ></TPMNav>
         { loadingContent ?
           <CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '200px', display: 'block' }}/> :

public/react/src/modules/tpm/TPMIndex.js

@@ -29,6 +29,7 @@ import TPMCollaboratorsComponent from './TPMCollaboratorsContainer';
 import Audit_situationComponent from './Audit_situationComponent';
 import TPMDataset from './TPMDataset';
 import '../page/tpiPage.css'
+import TPMNav from "./component/TPMNav";
 
 const $ = window.$
 //任务
@@ -143,6 +144,7 @@ class TPMIndex extends Component {
           TPMRightSectionData:undefined,
           PropaedeuticsList: undefined,
 				  tpmindexjupyterbool:false,
+				  is_jupyter:false,
       }
     }
 
@@ -193,7 +195,7 @@ class TPMIndex extends Component {
                     propaedeutics:response.data.propaedeutics,
                     status: response.data.shixun_status,
                     secret_repository: response.data.secret_repository,
-
+									  is_jupyter:response.data.is_jupyter=== undefined||response.data.is_jupyter===null?false:response.data.is_jupyter,
                 });
             }
         }).catch((error) => {
@@ -205,7 +207,8 @@ class TPMIndex extends Component {
                 power:  undefined,
                 identity:  undefined,
                 status: undefined,
-                propaedeutics:undefined
+                propaedeutics:undefined,
+							  is_jupyter:false,
             });
         });
 
@@ -274,6 +277,7 @@ class TPMIndex extends Component {
 
         let url = window.location.href;
         let flag = url.indexOf("add_file")>-1;
+        console.log(this.state.is_jupyter);
         return (
             <div className="newMain clearfix">
 							  {/*头部*/}
@@ -295,16 +299,16 @@ class TPMIndex extends Component {
                   <Switch {...this.props}>
 
                   <Route path="/shixuns/:shixunId/repository/:repoId/commits" render={
-                      (props) => (<TPMRepositoryCommits {...this.props} {...this.state} {...props}
+                      (props) => (<TPMRepositoryCommits {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
                         />)
                     }></Route>
                  <Route path="/shixuns/:shixunId/secret_repository/:repoId/commits" render={
-                      (props) => (<TPMRepositoryCommits {...this.props} {...this.state} {...props} secret_repository_tab={true}
+                      (props) => (<TPMRepositoryCommits {...this.props} {...this.state} {...props} secret_repository_tab={true} is_jupyter={this.state.is_jupyter}
                         />)
                     }></Route>
-
+                    {/*任务*/}
                     <Route exact path="/shixuns/:shixunId/challenges" render={
-                      (props) => (<TPMChallengeComponent {...this.props} jupyterbool={true} {...this.state} {...props}
+                      (props) => (<TPMChallengeComponent {...this.props}  {...this.state} {...props} is_jupyter={this.state.is_jupyter}
                         />)
                     }></Route>
 
@@ -314,24 +318,24 @@ class TPMIndex extends Component {
                     }></Route>
 
                     <Route path="/shixuns/:shixunId/repository" render={
-                        (props) => (<TPMRepositoryComponent {...this.props} {...this.state} {...props}
+                        (props) => (<TPMRepositoryComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
                         />)
                     }></Route>
                     <Route path="/shixuns/:shixunId/secret_repository" render={
-                        (props) => (<TPMRepositoryComponent {...this.props} {...this.state} {...props} secret_repository_tab={true}
+                        (props) => (<TPMRepositoryComponent {...this.props} {...this.state} {...props} secret_repository_tab={true} is_jupyter={this.state.is_jupyter}
                         />)
                     }></Route>
 
                     {/* <Route exact path="/shixuns/:shixunId/propaedeutics" component={TPMPropaedeuticsComponent}></Route> */}
 
                     <Route exact path="/shixuns/:shixunId/propaedeutics" render={
-                      (props) => (<TPMPropaedeuticsComponent {...this.props} {...this.state} {...props}
+                      (props) => (<TPMPropaedeuticsComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
                         />)
                     }></Route>
 
 
                     <Route exact path="/shixuns/:shixunId/collaborators" render={
-                      (props) => (<TPMCollaboratorsComponent {...this.props} {...this.state} {...props}
+                      (props) => (<TPMCollaboratorsComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
                         />)
                     }></Route>
 
@@ -340,7 +344,7 @@ class TPMIndex extends Component {
 
 
                     <Route path="/shixuns/:shixunId/shixun_discuss" render={
-                      (props) => (<TPMShixunDiscussContainer {...this.props} {...this.state} {...props}
+                      (props) => (<TPMShixunDiscussContainer {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
                         initForumState={(data)=>this.initForumState(data)}
                         setSearchValue={this.setSearchValue}
                         setHotLabelIndex={this.setHotLabelIndex}
@@ -354,17 +358,17 @@ class TPMIndex extends Component {
 
                      {/*实训项目条目塞选*/}
                     <Route exact path="/shixuns/:shixunId/ranking_list" render={
-                      (props) => (<TPMRanking_listComponent {...this.props} {...this.state} {...props}
+                      (props) => (<TPMRanking_listComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
                         />)
                     }></Route>
-
+                    {/*合作者*/}
 										<Route exact path="/shixuns/:shixunId/dataset" render={
-											(props) => (<TPMDataset {...this.props} {...this.state} {...props}
+											(props) => (<TPMDataset {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
 											/>)
 										}></Route>
 
 										<Route exact path="/shixuns/:shixunId/audit_situation" render={
-											(props) => (<Audit_situationComponent {...this.props} {...this.state} {...props}
+											(props) => (<Audit_situationComponent {...this.props} {...this.state} {...props} is_jupyter={this.state.is_jupyter}
 											/>)
 										}></Route>
 
@@ -415,7 +419,7 @@ class TPMIndex extends Component {
                   }></Route>
 
 									<Route exact path="/shixuns/:shixunId" render={
-											(props) => (<TPMChallengeComponent {...this.props} {...this.state} {...props}
+											(props) => (<TPMChallengeComponent {...this.props} {...this.state} {...props} 	is_jupyter={this.state.is_jupyter}
 											/>)
 									}></Route>
 

public/react/src/modules/tpm/TPMPropaedeutics.js

@@ -52,6 +52,7 @@ class TPMPropaedeutics extends Component {
                 shixun={shixun}
                 {...this.state}
                 {...this.props}
+								is_jupyter={this.props.is_jupyter}
             />
 
           <Propaedeutics

public/react/src/modules/tpm/TPMPropaedeuticsComponent.js

@@ -26,6 +26,7 @@ class TPMPropaedeuticsComponent extends Component {
         { tpmLoading ? <div style={{ minHeight: '886px'}}></div> :
         <TPMPropaedeutics
             {...this.props}
+						is_jupyter={this.props.is_jupyter}
         >
         </TPMPropaedeutics>
         }

public/react/src/modules/tpm/TPMRanking_list.js

@@ -38,6 +38,7 @@ class TPMRanking_list extends Component {
                 user={user}
                 shixun={shixun}
                 {...this.props}
+								is_jupyter={this.props.is_jupyter}
             ></TPMNav>
 
             <Ranking_list

public/react/src/modules/tpm/TPMRanking_listContainer.js

@@ -6,6 +6,7 @@ import PropTypes from 'prop-types';
 import TPMRanking_list from './TPMRanking_list'
 
 import axios from 'axios';
+import TPMNav from "./component/TPMNav";
 
 class TPMRanking_listContainer extends Component {
   constructor(props) {
@@ -26,7 +27,9 @@ class TPMRanking_listContainer extends Component {
             {...this.state}
             user={user}
             aboutFocus={this.props.aboutFocus}
-        >
+						is_jupyter={this.props.is_jupyter}
+
+				>
         </TPMRanking_list>
         }
         </React.Fragment>

public/react/src/modules/tpm/TPMRepository.js

@@ -35,6 +35,7 @@ class TPMRepository extends Component {
                 user={user}
                 shixun={shixun}
                 {...this.props}
+								is_jupyter={this.props.is_jupyter}
             ></TPMNav>
             {/* <RepositoryChooseModal {...this.props}></RepositoryChooseModal> */}
         { loadingContent ?

public/react/src/modules/tpm/TPMRepositoryComponent.js

@@ -200,6 +200,7 @@ class TPMRepositoryComponent extends Component {
               {...this.state}
               nameTypeMap={this.nameTypeMap}
               fetchRepo={this.fetchRepo}
+							is_jupyter={this.props.is_jupyter}
           >
           </TPMRepository>
           :

public/react/src/modules/tpm/TPMShixunDiscuss.js

@@ -44,6 +44,7 @@ class TPMShixunDiscuss extends Component {
                 user={user}
                 shixun={shixun}
                 {...this.props}
+								is_jupyter={this.props.is_jupyter}
             ></TPMNav>
         { loadingContent ?
           <CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '200px', display: 'block' }}/> :

public/react/src/modules/tpm/TPMShixunDiscussContainer.js

@@ -33,7 +33,7 @@ class TPMShixunDiscussContainer extends Component {
               {...this.state}
               user={user}
               aboutFocus={this.props.aboutFocus}
-
+							is_jupyter={this.props.is_jupyter}
           >
           </TPMShixunDiscuss>
           }

public/react/src/modules/tpm/component/TPMNav.js

@@ -5,7 +5,7 @@ import { BrowserRouter as Router, Route, Link } from "react-router-dom";
 class TPMNav extends Component {
 
   	render() {
-      const { user, match, shixun, secret_repository } = this.props;
+      const { user, match, shixun, secret_repository,is_jupyter} = this.props;
   		let isAdminOrCreator = false;
       	if (user) {
 	        isAdminOrCreator = user.admin || user.manager
@@ -15,6 +15,8 @@ class TPMNav extends Component {
 		// console.log(this.props.propaedeutics)
 		const challengesPath = `/shixuns/${shixunId}/challenges`;
 		// console.log(match.path)
+			console.log("TPMNavTPMNavTPMNav");
+			console.log(is_jupyter);
 	    return (
 	      	<div className="bor-bottom-greyE clearfix pl20 pr20 pt40 pb20 edu-back-white challengeNav">
 		        <Link
@@ -28,8 +30,15 @@ class TPMNav extends Component {
 						>背景知识</Link>
 				}
 
-						{ this.props.identity >4||this.props.identity===undefined ?"":<Link to={`/shixuns/${shixunId}/repository`}
-                      className={`${match.url.indexOf('/repository') != -1 ? 'active' : ''} fl mr40`}>版本库</Link>}
+						{ this.props.identity >4||this.props.identity===undefined ?"":
+							(this.props.is_jupyter===false?
+								<Link to={`/shixuns/${shixunId}/repository`}
+											className={`${match.url.indexOf('/repository') != -1 ? 'active' : ''} fl mr40`}>版本库</Link>
+							:"")
+						}
+
+
+
 						{this.props.identity >4||this.props.identity===undefined ?"":	secret_repository && <Link to={`/shixuns/${shixunId}/secret_repository`}
                       className={`${match.url.indexOf('secret_repository') != -1 ? 'active' : ''} fl mr40`}>私密版本库</Link>}
 
@@ -37,8 +46,13 @@ class TPMNav extends Component {
 		        	className={`${match.url.indexOf('collaborators') != -1 ? 'active' : ''} fl mr40`}>合作者</Link>
 
 						 {/*jupyter*/}
-						<Link to={`/shixuns/${shixunId}/dataset`}
-									className={`${match.url.indexOf('dataset') != -1 ? 'active' : ''} fl mr40`}>数据集</Link>
+						{
+							this.props.is_jupyter===true?
+								<Link to={`/shixuns/${shixunId}/dataset`}
+											className={`${match.url.indexOf('dataset') != -1 ? 'active' : ''} fl mr40`}>数据集</Link>
+								:""
+						}
+
 
 		        <Link to={`/shixuns/${shixunId}/shixun_discuss`}
 		        	className={`${match.url.indexOf('shixun_discuss') != -1 ? 'active' : ''} fl mr40`}>评论</Link>

public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.css

@@ -3,6 +3,11 @@
     line-height: 30px;
 }
 
+.height28 {
+    height: 30px;
+    line-height:28px;
+}
+
 .line27{
     line-height: 27px;
     vertical-align: 1px;

public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js

@@ -457,7 +457,7 @@ class Collaborators extends Component {
                    style={{display:this.props.identity<5?"flex":"none"}}
                 >
 									<div className="yslwushiwidth">
-										<p  className="edu-default-btn edu-greenback-btn  ml20 height40 yslwushiwidthcolortest">共12人</p>
+										<p  className="edu-default-btn edu-greenback-btn  ml20 height28 yslwushiwidthcolortest">共{collaboratorList&&collaboratorList.length}人</p>
 									</div>
 
 									<div className="yslwushiwidth xaxisreverseorder">
@@ -469,7 +469,13 @@ class Collaborators extends Component {
 										<a onClick={() => this.showCollaboratorsvisible("admin")}
 											 style={{display:this.props.identity===1?"flex":"none"}}
 											 data-remote="true"
-											 className="edu-default-btn edu-greenback-btn  mr20 height40 yslwushiwidthbuton">更换管理员</a>
+											 className="edu-default-btn edu-greenback-btn  mr20 height40 yslwushiwidthbuton">
+											<p style={{
+												textAlign: "center",
+												width:'100%',
+												lineHeight: "29px",
+											}}>更换管理员</p>
+										</a>
 
 									</div>
 

public/react/src/modules/tpm/shixunchild/Repository/TPMRepositoryCommits.js

@@ -67,6 +67,7 @@ class TPMRepositoryCommits extends Component {
                     user={user}
                     shixun={shixun}
                     {...this.props}
+										is_jupyter={this.props.is_jupyter}
                 ></TPMNav>
             { loadingContent ?
             <CircularProgress size={40} thickness={3}