-
+
-
+
+ 项目类别++
+
+
-
+
+ 点赞++
+
+
-
+
+ 项目类型++
+
+
-
+
+ 选中++
+
+
-
+
+ 未选中++
+
+
-
+
+ 复制++
+
+
-
+
+ 设置++
+
+
-
+
+ 编辑-优化icon++
+
-
多行公式@@ -2180,6 +2228,78 @@
-
+
-
+
+ + 项目类别 ++.icon-xiangmuleibie ++
+
+
-
+
+ + 点赞 ++.icon-ziyuan1 ++
+
+
-
+
+ + 项目类型 ++.icon-xiangmuleixing ++
+
+
-
+
+ + 选中 ++.icon-xuanzhong ++
+
+
-
+
+ + 未选中 ++.icon-weixuanzhong ++
+
+
-
+
+ + 复制 ++.icon-fuzhi4 ++
+
+
-
+
+ + 设置 ++.icon-shezhi4 ++
+
+
-
+
+ + 编辑-优化icon ++.icon-bianji2X ++
+
-
@@ -5359,6 +5479,70 @@: "" ) - - return ( -
-
+
-
+
+ 项目类别+#icon-xiangmuleibie+
+
+
-
+
+ 点赞+#icon-ziyuan1+
+
+
-
+
+ 项目类型+#icon-xiangmuleixing+
+
+
-
+
+ 选中+#icon-xuanzhong+
+
+
-
+
+ 未选中+#icon-weixuanzhong+
+
+
-
+
+ 复制+#icon-fuzhi4+
+
+
-
+
+ 设置+#icon-shezhi4+
+
+
-
+
+ 编辑-优化icon+#icon-bianji2X+
+
+- ---
-
- 项目类型 +
- 项目类型 {typeList}
-
-
- 项目类别 +
- 项目类别 {categoryList}
+diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css index d25c0f36..64df09f7 100644 --- a/src/forge/Main/list.css +++ b/src/forge/Main/list.css @@ -1,6 +1,4 @@ -body,#root{ - background: #fff!important; -} + .lineH2{line-height:2} .t_project_banner { height: 260px; @@ -24,26 +22,27 @@ body,#root{ padding:10px; } .list-l-Menu{ - border:1px solid #f4f4f4; - background: #fff; - border-radius: 4px; - margin-bottom: 20px; + margin-bottom: 12px; + border-radius:2px; + border:1px solid rgba(221,221,221,1); + background-color: #fff; } .list-l-Menu>li{ font-size: 1rem; - padding:0px 20px; + padding:0px 0px 0px 20px; box-sizing: border-box; color: #333; position: relative; } .list-l-Menu>li > p{ - height: 50px; - line-height: 50px; + height: 62px; + line-height: 62px; width: 100%; border-bottom: 1px solid #eee; display: flex; justify-content: space-between; cursor: pointer; + padding-right: 20px; } .list-l-Menu>li:last-child > p{ border-bottom: none; @@ -53,18 +52,15 @@ body,#root{ } .list-l-Menu .MenuTitle{ font-size: 16px; - background:url(../Images/dir.png) no-repeat; - background-size: 100% 100%; - color: #fff!important; - height: 50px; - line-height: 50px; -} -.list-l-Menu:nth-child(2) .MenuTitle{ - background:url(../Images/type.png) no-repeat; background-size: 100% 100%; + color: #333!important; + height: 62px; + line-height: 62px; + border-bottom: 1px solid #E0E0E0; + font-weight: 400; } .list-l-Menu > li:not(.MenuTitle):hover{ - background-color: #ECF6FF; + background-color: #fafafa; } /* 左侧menu */ @@ -77,13 +73,34 @@ body,#root{ .list-l-Menu .ant-menu-item-group-title{ padding:0px; } +.list-l-Menu li.active{ + background-color: #fafafa; +} + +/* 首页列表的新建和排序的下拉列表 */ +.ant-menu-inline, .ant-menu-vertical, .ant-menu-vertical-left{ + border-right: none!important; +} +.ant-menu-vertical > .ant-menu-item{ + margin:0px!important; + height: 35px; + line-height: 35px; + border-bottom: 1px solid #eee; + font-size: 14px!important; +} +.ant-menu-vertical > .ant-menu-item:last-child{ + border-bottom: none; +} + + + .list-l-Menu li.active::before{ position: absolute; left: 0px; - top: 8px; - width: 2px; + top: 10px; + width: 6px; content: ''; - height: 34px; + height: 33px; background: #4CACFF; } .list-r-operation{ @@ -91,7 +108,8 @@ body,#root{ justify-content: space-between; flex-wrap: wrap; align-items: center; - padding:25px 0px; + padding:25px 30px; + border-bottom: 1px solid #E0E0E0; } .list-r-Search{ width: 400px; @@ -114,23 +132,22 @@ body,#root{ } /* 列表 */ +.project-list{ + padding:0px 30px; +} .p-r-Item{ display: flex; - padding:15px 0px; - box-shadow:0px 2px 20px 0px rgba(0,0,0,0.05); - border-radius:2px; - border:1px solid rgba(238,238,238,1); - margin-bottom: 15px; - padding:20px; + border-bottom:1px solid rgba(238,238,238,1); + padding:22px 0px; } .boxShandow{ box-shadow:0px 2px 20px 10px rgba(0,0,0,0.03); } .p-r-photo{ - width: 42px; - height: 42px; + width: 60px; + height: 60px; border-radius: 50%; - margin-right: 15px; + margin-right: 22px; } .p-r-Infos{ flex: 1; @@ -223,8 +240,8 @@ body,#root{ display: flex; } .p-r-detail > span{ - margin-right: 15px; - color: #666; + margin-right: 22px; + color: #888; } .p-r-detail > span > label{ color: #999; diff --git a/src/forge/css/index.css b/src/forge/css/index.css index ec8f7412..f323ac01 100644 --- a/src/forge/css/index.css +++ b/src/forge/css/index.css @@ -1,12 +1,16 @@ ul,ol,dl{ - margin-bottom: 0px!important; + margin-bottom: 0px; } .newMain{ background-color: #fff; } .main{ width: 1200px; - margin:20px auto; + padding:20px 0px; + margin:0px auto; +} +.radius-2{ + border-radius: 2px; } .normal{ width: 1200px; diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js index bba3fee3..6461a666 100644 --- a/src/modules/login/LoginDialog.js +++ b/src/modules/login/LoginDialog.js @@ -139,43 +139,6 @@ class LoginDialog extends Component { Phonenumberisnotco:undefined, }) } - // let reg = /^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/; - // let reg1 = /^1\d{10}$/; - // let reg2=/^[a-zA-z]\w{3,14}$/; - // // let reg3=/^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/; - // let value=this.refs.loginPassText.value; - // let valuenum= value.length; - // if(valuenum>0){ - // if(!reg.test(value)&&!reg1.test(value)&&!reg2.test(value)){ - // this.setState({regular:1}) - // return - // }else{ - // // this.setState({loginValue:value}); - // this.setState({regular:0}); - // var stirngt; - // if(value.length>0){ - // var str= value.replace(/\s*/g,"") - // stirngt=str; - // }else{ - // stirngt= value; - // } - // this.setState({ - // loginValue:stirngt, - // }); - // } - // }else{ - // this.setState({loginValue:value}); - // var stirngt; - // if(value.length>0){ - // var str= value.replace(/\s*/g,"") - // stirngt=str; - // }else{ - // stirngt= value; - // } - // this.setState({ - // loginValue:stirngt, - // }); - // } }; //邮箱手机号验证 Emailphonenumberverification = (value, id) => { @@ -374,13 +337,6 @@ class LoginDialog extends Component { isRender:this.props.isRender }) } - - // $(document).on("showLoginDialog", (e, args)=>{ - // this.setState({ - // isRender: true - // }) - // }) - this.dragWrapper(); axios.interceptors.response.use((response) => { @@ -393,64 +349,13 @@ class LoginDialog extends Component { } return response; }, (error) => { - // // if (error.response && error.response.data.error === '401 Unauthorized') { - // // this.back_url = window.location.href; - // // this.setState({ - // // isRender: true - // // }) - // // // TODO 这里如果样式变了会出现css不加载的情况 - // // const $ = window.$; - // // const isCssLoaded = window.getComputedStyle($('.log_nav li.active')[0], null) - // // .getPropertyValue('border-bottom') - // // == "2px solid rgb(69, 155, 229)" - // // if (!isCssLoaded) { - // // const isPort3007 = window.location.port == 3007; - // // let _url_origin = isPort3007 ? 'http://localhost:3000' : '' - // // - // // $('head').append( $('') - // // .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css`) ); - // // $('head').append( $('') - // // .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css`) ); - // // } - // // } - // // return Promise.reject(error); }); } handleDialogClose = () => { - // if(this.props.match.path==='/'){ - // this.setState({ - // isRender: false - // }) - // this.props.Modifyloginvalue(); - // }else{ - // if(this.props.isloginCancel===undefined){ - // window.location.href="/"; - // this.props.Modifyloginvalue(); - // // this.setState({ - // // isRender: false - // // }) - // // this.props.Modifyloginvalue(); - // }else{ - // this.setState({ - // isRender: false - // }) - // this.props.Modifyloginvalue(); - // } - this.setState({ isRender: false }) this.props.Modifyloginvalue(); - - - // this.setState({ - // isRender: false - // }) - // try { - // this.props.Modifyloginvalue(); - // }catch (e) { - // - // } } loginEDU=()=>{ @@ -501,8 +406,6 @@ class LoginDialog extends Component { }); } }else{ - - broadcastChannelPostMessage('refreshPage') this.setState({ isRender:false @@ -559,9 +462,7 @@ class LoginDialog extends Component { this.setState({ qqlogin:true }) - //window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2otherloginqq&response_type=code` window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code` - // window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginstart&tp=qq&response_type=code` } openphoneqqlogin=()=>{ @@ -600,19 +501,6 @@ class LoginDialog extends Component { modalsType={this.state.MyEduCoderModals} setNotcompleteds={()=>{this.setNotcompleteds()}} /> - - {/*{this.state.isphone===false||this.props.user&&this.props.user.main_site===false?:""}*/} {isRender===true? ---+ {pagination} diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index efea56ad..255aa657 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -4,7 +4,7 @@ import { Link } from 'react-router-dom'; import '../css/index.css' import './list.css'; import img_parise from '../Images/parise.png'; -import img_fork from '../Images/fork.png'; + class IndexItem extends Component { TurnToDetail = (login, url) => { this.props.history.push({ @@ -28,7 +28,7 @@ class IndexItem extends Component { { item.forked_from_project_id ? - + : "" } @@ -37,19 +37,19 @@ class IndexItem extends Component { item.is_public ? "" : 私有 } -
-+{item.description}
赞 ({item.praises_count}) - {item.language && item.language.id ? : ""} + fork ({item.forked_count})
{item.description}
+{item.visits} {item.category && item.category.id && {item.category.name}} {item.last_update_time ? {item.time_ago} : ""} + {item.language && item.language.id ? {item.language.name} : ""}-- ); } } diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index 7ced4806..dde8c34c 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -15,7 +15,49 @@ body>.-task-title { #root .search-all { width: 219px; } +.newContainers{ + min-width: 1200px; + max-width: unset; + height: 100%; + min-height: 100%; + overflow: hidden; +} +.newHeaders{ + max-width: unset; + background: #fff !important; + width: 100%; + height:70px; + min-width: 1200px; + z-index: 1000; + -moz-box-shadow: 0px 2px 10px 0px rgba(0,0,0,0.1); + background:rgba(255,255,255,1); + box-shadow:0px 2px 10px 0px rgba(0,0,0,0.1); +} +.headerContent{ + width:1200px; + margin:0px auto; + display: flex; + align-items: center; + height: 100% +} +.globalSpin { + max-height: 700px !important; +} +.indexHOC > .ant-spin-nested-loading { + background: #000; + height: 100%; +} +.indexHOC > .ant-spin-nested-loading > div > .ant-spin .ant-spin-dot { + top: 50% !important; +} +.globalSpin .ant-spin-text { + text-shadow: none !important; + color: #fff; +} +.globalSpin .ant-spin-dot-item { + background-color: #fff; +} /*Header START*/ .newHeader .logoimg { margin-top: 16px; @@ -23,11 +65,6 @@ body>.-task-title { width: 97px; } -.head-right i { - font-size: 20px; - float: none !important; -} - .headIcon, #header_keyword_search { padding-top: 13px !important; diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index c8c7b27b..19db1c1a 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -1,7 +1,6 @@ import React from 'react'; import NewHeader from './NewHeader' import NewFooter from './NewFooter' -import SiderBar from './SiderBar' import { downloadFile } from 'educoder' import axios from 'axios'; import { Spin } from 'antd'; @@ -662,49 +661,6 @@ export function TPMIndexHOC(WrappedComponent) { {...this.dialogObj} /> : ""} - - -{this.handleDialogClose()}}> - +++ :""} + + ); +} } export default LoginDialog ; diff --git a/src/modules/question/Question.js b/src/modules/question/Question.js index 35b8518b..02d64a50 100644 --- a/src/modules/question/Question.js +++ b/src/modules/question/Question.js @@ -988,15 +988,6 @@ class Question extends Component { } return ({this.handleDialogClose()}}> + +++ {weixinlogin===true?"":+-
+
- {this.enter(0)}}>登录 +
+ {weixinlogin===true?"":} + {weixinlogin===true?:""} + {weixinlogin===true?:""} ++ {/*快捷登录*/} +- { mydisplay === true ?+ {user === undefined ? + + this.educoderlogin()} className="mr5 color-grey-3">登录 + { + mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url && + 注册 + } + + : user.login === "" ? + + this.educoderlogin()} className="mr5 color-grey-3">登录 + { + mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url && + 注册 + } + + : +diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js index c3318e44..c132384d 100644 --- a/src/modules/tpm/NewHeader.js +++ b/src/modules/tpm/NewHeader.js @@ -1,9 +1,9 @@ import React, { Component } from 'react'; import { Link } from "react-router-dom"; -import AccountProfile from"../user/AccountProfile"; +import AccountProfile from "../user/AccountProfile"; import { getImageUrl } from 'educoder' import axios from 'axios'; -import { Modal , Input , message , notification } from 'antd'; +import { Modal, Input, message, notification } from 'antd'; import LoginDialog from '../login/LoginDialog'; import GotoQQgroup from '../../modal/GotoQQgroup' @@ -22,38 +22,38 @@ window._header_componentHandler = null; class NewHeader extends Component { constructor(props) { super(props) - this.state={ - Addcoursestypes:false, - tojoinitemtype:false, - tojoinclasstitle:undefined, - rolearr:["",""], - Checkboxteacherchecked:false, - Checkboxstudentchecked:false, - Checkboxteachingchecked:false, - Checkboxteachertype:false, - Checkboxteachingtype:false, - code_notice:false, - checked_notice:false, - RadioGroupvalue:undefined, - submitapplications:false, - isRender:false, - showSearchOpentype:false, - showTrial:false, - setevaluatinghides:false, - occupation:0, - mydisplay:false, - headtypesonClickbool:false, - headtypess:"/", - mygetHelmetapi2: null, - goshowqqgtounp:false, - visiblemyss:false, + this.state = { + Addcoursestypes: false, + tojoinitemtype: false, + tojoinclasstitle: undefined, + rolearr: ["", ""], + Checkboxteacherchecked: false, + Checkboxstudentchecked: false, + Checkboxteachingchecked: false, + Checkboxteachertype: false, + Checkboxteachingtype: false, + code_notice: false, + checked_notice: false, + RadioGroupvalue: undefined, + submitapplications: false, + isRender: false, + showSearchOpentype: false, + showTrial: false, + setevaluatinghides: false, + occupation: 0, + mydisplay: false, + headtypesonClickbool: false, + headtypess: "/", + mygetHelmetapi2: null, + goshowqqgtounp: false, + visiblemyss: false, + } + } + componentDidUpdate = (prevProps) => { + if (this.state.mygetHelmetapi2 === undefined) { + this.getAppdata(); } } - componentDidUpdate = (prevProps) => { - if(this.state.mygetHelmetapi2===undefined){ - this.getAppdata(); - } - } componentDidMount() { this.getAppdata(); window._header_componentHandler = this; @@ -61,7 +61,7 @@ class NewHeader extends Component { //下拉框的显示隐藏 var hoverTimeout; var hoveredPanel; - $(".edu-menu-panel").hover(function(){ + $(".edu-menu-panel").hover(function () { if (hoverTimeout) { // 一次只显示一个panel if (hoveredPanel && hoveredPanel !== this) { $(hoveredPanel).find(".edu-menu-list").hide() @@ -71,54 +71,54 @@ class NewHeader extends Component { } hoveredPanel = this; $(this).find(".edu-menu-list").show(); - },function(){ - var that =this; + }, function () { + var that = this; // 延迟hide - hoverTimeout = setTimeout(function() { + hoverTimeout = setTimeout(function () { $(that).find(".edu-menu-list").hide(); }, 800) }); //获取游览器地址 - try { - window.sessionStorage.setItem("yslgeturls", JSON.stringify(window.location.href)) - } catch (e) { + try { + window.sessionStorage.setItem("yslgeturls", JSON.stringify(window.location.href)) + } catch (e) { - } + } } openNotification = (messge) => { notification.open({ message: "提示", description: - messge, + messge, }); }; componentWillReceiveProps(newProps, oldProps) { this.setState({ - user:newProps.user + user: newProps.user }) - if(newProps.Headertop!==undefined){ - old_url=newProps.Headertop.old_url + if (newProps.Headertop !== undefined) { + old_url = newProps.Headertop.old_url } } - getCookie=(key)=>{ - var arr,reg = RegExp('(^| )'+key+'=([^;]+)(;|$)'); - if (arr === document.cookie.match(reg)) + getCookie = (key) => { + var arr, reg = RegExp('(^| )' + key + '=([^;]+)(;|$)'); + if (arr === document.cookie.match(reg)) return decodeURIComponent(arr[2]); else return null; } - delCookie=(name)=>{ + delCookie = (name) => { var exp = new Date(); exp.setTime(exp.getTime() - 1); - var cval=this.getCookie(name); - if(cval!=null){ - document.cookie= name + "="+cval+";expires="+exp.toGMTString(); + var cval = this.getCookie(name); + if (cval != null) { + document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString(); } } onLogout = () => { @@ -127,93 +127,93 @@ class NewHeader extends Component { axios.get(url, { }) .then((response) => { - if(response.data.status===1){ + if (response.data.status === 1) { this.setState({ - user:undefined + user: undefined }) - window.location.href ="/login" + window.location.href = "/login" message.success('退出成功'); } }); } - tojoinclass=()=>{ - let{user} =this.state; - if(user===undefined){ + tojoinclass = () => { + let { user } = this.state; + if (user === undefined) { this.setState({ - isRender:true + isRender: true }) return } - if(user&&user.login===""){ + if (user && user.login === "") { this.setState({ - isRender:true + isRender: true }) return; } - if(user&&user.profile_completed===false){ - this.setState({ - AccountProfiletype:true - }) - return; - } - - this.setState({ - Addcoursestypes:true, - }) - } - - tojoinitem=()=>{ - if(this.props.user && this.props.user.email===undefined || this.props.user && this.props.user.email===null || this.props.user && this.props.user.email===""){ - this.openNotification("请先绑定邮箱，谢谢"); - return - } - let{user} =this.state; - if(user===undefined){ + if (user && user.profile_completed === false) { this.setState({ - isRender:true - }) - return - } - if(user&&user.login===""){ - this.setState({ - isRender:true + AccountProfiletype: true }) return; } - if(user&&user.profile_completed===false){ - this.setState({ - AccountProfiletype:true - }) - return; - } - - this.setState({ - tojoinitemtype:true - }) - } - - - submitstatevalue=(sum,value,data)=>{ this.setState({ - Addcoursestypes:false, - tojoinitemtype:false, - tojoinclasstitle:undefined, - rolearr:["",""], - Checkboxteacherchecked:false, - Checkboxstudentchecked:false, - Checkboxteachingchecked:false, - Checkboxteachertype:false, - Checkboxteachingtype:false, - code_notice:false, - checked_notice:false, - submitapplicationssum:sum, - submitapplications:true, - submitapplicationsvalue:value, - submitapplicationsvaluedata:data, - RadioGroupvalue:undefined + Addcoursestypes: true, + }) + } + + tojoinitem = () => { + if (this.props.user && this.props.user.email === undefined || this.props.user && this.props.user.email === null || this.props.user && this.props.user.email === "") { + this.openNotification("请先绑定邮箱，谢谢"); + return + } + let { user } = this.state; + if (user === undefined) { + this.setState({ + isRender: true + }) + return + } + if (user && user.login === "") { + this.setState({ + isRender: true + }) + return; + } + + if (user && user.profile_completed === false) { + this.setState({ + AccountProfiletype: true + }) + return; + } + + this.setState({ + tojoinitemtype: true + }) + } + + + submitstatevalue = (sum, value, data) => { + this.setState({ + Addcoursestypes: false, + tojoinitemtype: false, + tojoinclasstitle: undefined, + rolearr: ["", ""], + Checkboxteacherchecked: false, + Checkboxstudentchecked: false, + Checkboxteachingchecked: false, + Checkboxteachertype: false, + Checkboxteachingtype: false, + code_notice: false, + checked_notice: false, + submitapplicationssum: sum, + submitapplications: true, + submitapplicationsvalue: value, + submitapplicationsvaluedata: data, + RadioGroupvalue: undefined }) } @@ -223,54 +223,54 @@ class NewHeader extends Component { }); } - submitsubmitapplications=()=>{ + submitsubmitapplications = () => { let { submitapplicationssum, submitapplicationsvaluedata - }=this.state; + } = this.state; this.setState({ - submitapplications:false, - RadioGroupvalue:undefined + submitapplications: false, + RadioGroupvalue: undefined }) - if(submitapplicationssum===0){ - if(submitapplicationsvaluedata!==undefined){ - window.location.href = "/courses/"+submitapplicationsvaluedata; + if (submitapplicationssum === 0) { + if (submitapplicationsvaluedata !== undefined) { + window.location.href = "/courses/" + submitapplicationsvaluedata; } - }else if(submitapplicationssum===1){ - if(submitapplicationsvaluedata!==undefined){ - window.location.href = "/projects/"+submitapplicationsvaluedata; + } else if (submitapplicationssum === 1) { + if (submitapplicationsvaluedata !== undefined) { + window.location.href = "/projects/" + submitapplicationsvaluedata; } } } - hidesubmitapplications=()=>{ + hidesubmitapplications = () => { this.setState({ - Addcoursestypes:false, - tojoinitemtype:false, - tojoinclasstitle:undefined, - rolearr:["",""], - Checkboxteacherchecked:false, - Checkboxstudentchecked:false, - Checkboxteachingchecked:false, - Checkboxteachertype:false, - Checkboxteachingtype:false, - code_notice:false, - checked_notice:false, - submitapplications:false, - RadioGroupvalue:undefined + Addcoursestypes: false, + tojoinitemtype: false, + tojoinclasstitle: undefined, + rolearr: ["", ""], + Checkboxteacherchecked: false, + Checkboxstudentchecked: false, + Checkboxteachingchecked: false, + Checkboxteachertype: false, + Checkboxteachingtype: false, + code_notice: false, + checked_notice: false, + submitapplications: false, + RadioGroupvalue: undefined }) } - educoderlogin=()=>{ + educoderlogin = () => { //登录账号 this.setState({ - isRender:true + isRender: true }) } - educoderloginysl=()=>{ + educoderloginysl = () => { //退出账号 var url = `/accounts/logout.json`; axios.get((url)).then((result) => { - if(result!==undefined){ + if (result !== undefined) { window.location.href = "/"; } }).catch((error) => { @@ -278,411 +278,411 @@ class NewHeader extends Component { }) } - hideAddcoursestypes=()=>{ + hideAddcoursestypes = () => { this.setState({ - Addcoursestypes:false + Addcoursestypes: false }) }; - HideAddcoursestypess=(i)=>{ + HideAddcoursestypess = (i) => { console.log("调用了"); this.setState({ - Addcoursestypes:false, - mydisplay:true, - occupation:i, + Addcoursestypes: false, + mydisplay: true, + occupation: i, }) }; - ModalCancelsy=()=>{ + ModalCancelsy = () => { this.setState({ - mydisplay:false, + mydisplay: false, }) }; - hidetojoinclass=()=>{ + hidetojoinclass = () => { this.setState({ - tojoinclasstype:false, - tojoinitemtype:false, - tojoinclasstitle:undefined, - rolearr:["",""], - Checkboxteacherchecked:false, - Checkboxstudentchecked:false, - Checkboxteachingchecked:false, - Checkboxteachertype:false, - Checkboxteachingtype:false, - code_notice:false, - checked_notice:false, - RadioGroupvalue:undefined + tojoinclasstype: false, + tojoinitemtype: false, + tojoinclasstitle: undefined, + rolearr: ["", ""], + Checkboxteacherchecked: false, + Checkboxstudentchecked: false, + Checkboxteachingchecked: false, + Checkboxteachertype: false, + Checkboxteachingtype: false, + code_notice: false, + checked_notice: false, + RadioGroupvalue: undefined }) } -submittojoinclass=(value)=>{ - let {tojoinclasstitle,rolearr,RadioGroupvalue}=this.state; + submittojoinclass = (value) => { + let { tojoinclasstitle, rolearr, RadioGroupvalue } = this.state; - if(tojoinclasstitle===undefined){ - this.setState({ - code_notice:true - }) - return - } - let newrolearr=rolearr; - if(tojoinclasstitle.length<6){ + if (tojoinclasstitle === undefined) { this.setState({ - code_notice:true + code_notice: true }) return } - if(tojoinclasstitle===""||tojoinclasstitle===undefined){ - this.setState({ - code_notice:true - }) - return - }else{ - this.setState({ - code_notice:false - }) - } - - let pamst=[]; - let num=0; - for(var i = 0 ; i - - - {isRender===true?-this.Modifyloginvalue()} - {...this.props} - {...this.state} - />:""} - - {AccountProfiletype===true? this.hideAccountProfile()} - {...this.props} - {...this.state} - />:""} - - { - goshowqqgtounp===true? - this.setgoshowqqgtounp(bool)}> - : - "" - } - - this.headtypesonClick("/",false)} className={"fl mr30 ml25 mt10"}> - { - mygetHelmetapi2 === null ? - "" - : - mygetHelmetapi2===undefined||mygetHelmetapi2.nav_logo_url===null||mygetHelmetapi2.nav_logo_url===undefined? -![高校智能化教学与实训平台]({getImageUrl("images/educoder/headNavLogo.png?1526520218")})
- :
- + let shixuntype = false; + let pathstype = false; + let coursestypes = false; + if (this.props && this.props.mygetHelmetapi != null) { + let shixun = "/shixuns"; + let paths = "/paths"; + let courses = "/courses"; + this.props.mygetHelmetapi.navbar.map((item, key) => { + var reg = RegExp(item.link); + if (shixun.match(reg)) { + if (item.hidden === true) { + shixuntype = true } - + } + if (paths.match(reg)) { + if (item.hidden === true) { + pathstype = true + } + } + if (courses.match(reg)) { + if (item.hidden === true) { + coursestypes = true + } + } + }) + } - - { - mygetHelmetapi2 === null ? - "" : - mygetHelmetapi2!==undefined&&mygetHelmetapi2.navbar!==null&&mygetHelmetapi2.navbar!==undefined&&mygetHelmetapi2.navbar.length>0? - - : - - } - - -
- -- { user===undefined? - - this.educoderlogin()} className="mr5 color-white">登录 - { - mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url && - 注册 - } - :user.login===""? - this.educoderlogin()} className="mr5 color-white">登录 - { - mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url && - 注册 - } - : -- -- - -
-
- {
- mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.edit_account &&
-
- 修改资料 - } - { - mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_courses && -
- 我的课程 - } - { - mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_projects && -
- 我的项目 - } + + { + mygetHelmetapi2 && mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.length > 0 ? + - } -
- 新建课程 - } - { - mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.new_course && -
- 新建班级 - } -
- 新建镜像项目 -
- 新建托管项目 -
- this.headtypesonClick(item.link, true)} className={`${this.matchpaths(item.link) === true ? 'pr active' : 'pr'}`} style={!is_hidden ? { display: 'flex' } : { display: 'none' }}>
+ {
+ strbool ?
+
+ {item.name} + { + mygetHelmetapi2.old_projects_url ? + （进入老版本） + : "" + } + + : + {item.name} + } +
+ )
+ })
+ }
+
+ - 新建课程 + } + { + mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.new_course && +
- 新建班级 + } +
- 新建镜像项目 +
- 新建托管项目 +
- 取消 + onClick={this.hidesubmitapplications}>取消 确定 -
- {showSearchOpentype===true?"":this.props.user&&this.props.user.main_site===true?this.showSearchOpen(e)}> - - - :""} - { - this.props.user&&this.props.user.login ? -+ : "" + } + ++ if (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1) { + if (user_login) { + if (new_link.indexOf("courses") > -1) { + new_link = new_link.replace(/courses/g, "users/" + user_login + "/courses") + } else if (new_link.indexOf("contests") > -1) { + new_link = new_link.replace(/contests/g, "users/" + user_login + "/contests") + } + } else { + is_hidden = true + } + } - - -- : "" - } - - - {this.props.user&&this.props.user.login?- ---
- {
- mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.new_syllabuses &&
-
-
-
- { user===undefined?"":user.login===""?"": - - - - - } - -:""} - + var str = new RegExp("projects"); + var strbool = false; + if (item.link) { + if (str.test(item.link) === true) { + strbool = true + } else { + strbool = false + } + } + return ( ++ { + this.props.user && this.props.user.login ? ++ ++ : "" + } + { + this.props.user && this.props.user.login ? ++ ++-
+ {
+ mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.new_syllabuses &&
+
-
+
+ {user && user.login && + + + + + + } ++ : "" + }{ + ++ } ++ + +
-
+ {
+ mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.edit_account &&
+
- 修改资料 + } + { + mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_courses && +
- 我的课程 + } + { + mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_projects && +
- 我的项目 + } + { + mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_organ && +
- 我的组织 + } +
- + this.educoderloginysl()}>退出 + +
- - {videoModalObj.visible && } + {/* {videoModalObj.visible && } */} -
+
+
-
+
+