![]({getUrl("/images/educoder/nodata.png")}/)
- {searchtypes===true?"抱歉没有您要搜索的内容，请换个词语试试看":"暂时还没有相关数据哦!"}
+{searchtypes===true?"抱歉没有您要搜索的内容，请换个词语试试看":"暂时还没有相关数据!"}
{showImage ?
diff --git a/src/modules/page/layers/TaskResultLayer.css b/src/modules/page/layers/TaskResultLayer.css
index 962aed0d..38ae0bbc 100644
--- a/src/modules/page/layers/TaskResultLayer.css
+++ b/src/modules/page/layers/TaskResultLayer.css
@@ -1,147 +1,149 @@
.taskResultLayer {
- color: #666666;
- z-index: 99999999999999;
- width: 100%;
- height: 100%;
- position: fixed;
- background:rgba(0,0,0,0.8);
- top: 0px;
- overflow: hidden;
+ color: #666666;
+ z-index: 99999999999999;
+ width: 100%;
+ height: 100%;
+ position: fixed;
+ background: rgba(0, 0, 0, 0.8);
+ top: 0px;
+ overflow: hidden;
+}
+.taskResultLayer .closeIcon {
+ position: absolute;
+ right: 100px;
+ top: 46px;
+ font-size: 28px;
+ z-index: 999999;
+ color: rgb(255, 255, 255, 0.7);
+ cursor: pointer;
+}
+.taskResultLayer .closeIcon:hover {
+ color: #4cacff;
+}
+.taskResultLayer .expGold {
+ color: #b27919;
+}
+.taskResultLayer .rateLabel {
+ color: #fff;
+ font-size: 14px;
+}
+.taskResultLayer .rc-rate-star {
+ font-size: 24px;
+ color: rgb(192, 192, 192);
+}
+.taskResultLayer .rc-rate-star:nth-child(5) {
+ margin-right: 0px;
}
- .taskResultLayer .closeIcon{
- position: absolute;
- right: 100px;
- top: 46px;
- font-size: 28px;
- z-index: 999999;
- color: rgb(255,255,255,0.7);
- cursor: pointer;
- }
- .taskResultLayer .closeIcon:hover {
- color: #4CACFF;
- }
- .taskResultLayer .expGold {
- color: #b27919 ;
- }
- .taskResultLayer .rateLabel {
- color: #fff ;
- font-size: 14px;
- }
- .taskResultLayer .rc-rate-star {
- font-size: 24px;
- color: rgb(192, 192, 192);
- }
- .taskResultLayer .rc-rate-star:nth-child(5) {
- margin-right: 0px;
- }
/* ImageLayer ----------------- Start */
-.passContent{
- justify-content: center;
- align-items: center;
- display: -webkit-flex;
- height: 90%;
- text-align: center;
+.passContent {
+ justify-content: center;
+ align-items: center;
+ display: -webkit-flex;
+ height: 100%;
+ text-align: center;
+ position: absolute;
+ width: 100%;
+ z-index: 4;
}
-.passImg{
- max-width: 86%;
- max-height: 100%;
- user-select: none;
- min-width: 300px;
+.closePanel {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ z-index: 5;
+}
+.passImg {
+ max-width: 86%;
+ max-height: 100%;
+ user-select: none;
+ min-width: 300px;
}
/* ImageLayer ----------------- End */
-
-.passTaskContent{
- width: 652px;
- height:100%;
- margin:0px auto;
- margin-top: 4%;
+.passTaskContent {
+ width: 652px;
+ height: 100%;
+ margin: 0px auto;
+ margin-top: 4%;
}
-.passTaskImg{
- position: absolute;
- z-index: 2;
- user-select: none;
+.passTaskImg {
+ position: absolute;
+ z-index: 2;
+ user-select: none;
}
-
-.winpPerson{
- position: absolute;
- width: 100%;
- z-index: 3;
- color: #D1A448;
- text-align: center;
- margin-top:304px;
- font-size: 18px;
+.winpPerson {
+ position: absolute;
+ width: 100%;
+ z-index: 3;
+ color: #d1a448;
+ text-align: center;
+ margin-top: 304px;
+ font-size: 18px;
}
-.winPanel{
- position: absolute;
- width: 308px;
- z-index: 5;
- height: 356px;
- border-radius: 10px;
- margin:0px auto;
- top:435px;
- left: 50%;
- margin-left: -154px;
- text-align: center;
+.winPanel {
+ position: absolute;
+ width: 308px;
+ z-index: 5;
+ height: 356px;
+ border-radius: 10px;
+ margin: 0px auto;
+ top: 435px;
+ left: 50%;
+ margin-left: -154px;
+ text-align: center;
}
-.inlines{
- display: inline-block;
- width: auto;
- line-height: 26px;
- font-size: 16px;
+.inlines {
+ display: inline-block;
+ width: auto;
+ line-height: 26px;
+ font-size: 16px;
}
.inline.exp {
- margin-left: 18px;
+ margin-left: 18px;
}
- /*.inline img{*/
- /*margin-right: 8px;*/
- /*}*/
-.goldring{
- margin-right: 8px;
- width: 17px;
- height: 17px;
- border-radius: 50%;
- background-color: #FFD633;
- display: block;
- float: left;
- margin-top: 5px;
+.goldring {
+ margin-right: 8px;
+ width: 17px;
+ height: 17px;
+ border-radius: 50%;
+ background-color: #ffd633;
+ display: block;
+ float: left;
+ margin-top: 5px;
}
-.passNext{
- width:120px;
- height:30px;
- line-height:30px;
- border-radius: 2px;
- display: block;
- background-color:#CCC;
- color:#fff!important;
- margin: 0px auto;
+.passNext {
+ width: 120px;
+ height: 30px;
+ line-height: 30px;
+ border-radius: 2px;
+ display: block;
+ background-color: #ccc;
+ color: #fff !important;
+ margin: 0px auto;
}
-.passed{
- width:120px;
- height:30px;
- line-height:30px;
- border-radius: 2px;
- display: block;
- color:#fff!important;
- margin: 0px auto;
- margin-top: 12px;
- background-color: #CCCCCC;
+.passed {
+ width: 120px;
+ height: 30px;
+ line-height: 30px;
+ border-radius: 2px;
+ display: block;
+ color: #fff !important;
+ margin: 0px auto;
+ margin-top: 12px;
+ background-color: #cccccc;
}
.passed.stared {
- background-color:#4CACFF;
- opacity: 0.8;
+ background-color: #4cacff;
+ opacity: 0.8;
}
.passed.stared:hover {
- opacity: 1;
+ opacity: 1;
}
-
-.vertical4{
- vertical-align: -4px;
+.vertical4 {
+ vertical-align: -4px;
+}
+.ImageLayerbutton {
+ position: absolute;
+ top: 0px;
+ right: 10px;
+ z-index: 10;
}
-
-.ImageLayerbutton{
- position: absolute;
- top: 0px;
- right: 10px;
- z-index: 10;
-}
\ No newline at end of file
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index 843ecdf6..3ba3e2c5 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -1,377 +1,873 @@
-import React, { Component } from "react";
-import axios from "axios";
-// import '../../modules/tp-forums/css/NewHeader.css'
-import { getImageUrl } from "../../common/educoder";
-import "./css/header.css";
-import "./css/NewHeader.css";
-import { Modal, Input, message, notification } from "antd";
+import React, { Component } from 'react';
+import { Link } from "react-router-dom";
+import AccountProfile from "../user/AccountProfile";
+import { getImageUrl } from 'educoder'
+import axios from 'axios';
+import { Modal, Input, message, notification } from 'antd';
-import LoginDialog from "../login/LoginDialog";
-const $ = window.$;
-// import { getImageUrl } from "educoder";
+import LoginDialog from '../login/LoginDialog';
+import GotoQQgroup from '../../modal/GotoQQgroup'
+import 'antd/lib/modal/style/index.css';
+import 'antd/lib/checkbox/style/index.css';
+import 'antd/lib/radio/style/index.css';
+import 'antd/lib/input/style/index.css';
+import './TPMIndex.css';
+import logo from './images/logo.png';
+const $ = window.$
+// TODO 这部分脚本从公共脚本中直接调用
+const { Search } = Input;
+let old_url;
+
+window._header_componentHandler = null;
+// 非trustie链接则新开页跳转
+const str = ['www.trustie.net','forgeplus.trustie.net','forum.trustie.net','testforgeplus.trustie.net']
class NewHeader extends Component {
constructor(props) {
- super(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,
- headtypess: null,
- headtypesonClickbool: null,
- };
+ goshowqqgtounp: false,
+ visiblemyss: false,
+ }
}
componentDidMount() {
- this.set_header();
+ // this.getAppdata();
+ this.geturlsdata();
+ window._header_componentHandler = this;
+
+ //下拉框的显示隐藏
+ var hoverTimeout;
+ var hoveredPanel;
+ $(".edu-menu-panel").hover(function () {
+ if (hoverTimeout) { // 一次只显示一个panel
+ if (hoveredPanel && hoveredPanel !== this) {
+ $(hoveredPanel).find(".edu-menu-list").hide()
+ }
+ clearTimeout(hoverTimeout);
+ hoverTimeout = null;
+ }
+ hoveredPanel = this;
+ $(this).find(".edu-menu-list").show();
+ }, function () {
+ var that = this;
+ // 延迟hide
+ hoverTimeout = setTimeout(function () {
+ $(that).find(".edu-menu-list").hide();
+ }, 800)
+
+ });
+ //获取游览器地址
+ try {
+ window.sessionStorage.setItem("yslgeturls", JSON.stringify(window.location.href))
+ } catch (e) {}
}
- set_header = () => {
- const { mygetHelmetapi } = this.props;
- if (mygetHelmetapi) {
- this.setState({
- mygetHelmetapi2: mygetHelmetapi,
- });
- } else {
- this.geturlsdata();
- }
+
+ openNotification = (messge) => {
+ notification.open({
+ message: "提示",
+ description:
+ messge,
+ });
};
- geturlsdata = () => {
- let url = "/setting.json";
- axios
- .get(url)
- .then((response) => {
- if (response && response.data) {
- this.setState({
- mygetHelmetapi2: response.data.setting,
- });
- try {
- if (response.data.setting.tab_logo_url) {
- this.gettablogourldata(response);
- } else {
- this.gettablogourlnull();
- }
- } catch (e) {
- this.gettablogourlnull();
+
+ componentWillReceiveProps(newProps, oldProps) {
+ this.setState({
+ user: newProps.user
+ })
+ if (newProps.Headertop !== undefined) {
+ old_url = newProps.Headertop.old_url
+ }
+
+ }
+ getCookie = (key) => {
+ var arr, reg = RegExp('(^| )' + key + '=([^;]+)(;|$)');
+ if (arr === document.cookie.match(reg))
+ return decodeURIComponent(arr[2]);
+ else
+ return null;
+ }
+
+ 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();
+ }
+ }
+ onLogout = () => {
+ const url = `/accounts/logout.json`
+ this.delCookie("autologin_trustie")
+ axios.get(url, {
+ }).then((response) => {
+ if (response.data.status === 1) {
+ this.setState({
+ user: undefined
+ })
+ window.location.href = "/login"
+ message.success('退出成功');
+ }
+ });
+ }
+
+ tojoinclass = () => {
+ 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({
+ 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
+ })
+ }
+
+ onChangeRadioGroup = (e) => {
+ this.setState({
+ RadioGroupvalue: e.target.value,
+ });
+ }
+
+ submitsubmitapplications = () => {
+ let {
+ submitapplicationssum,
+ submitapplicationsvaluedata
+ } = this.state;
+ this.setState({
+ submitapplications: false,
+ RadioGroupvalue: undefined
+ })
+ if (submitapplicationssum === 0) {
+ if (submitapplicationsvaluedata !== undefined) {
+ window.location.href = "/courses/" + submitapplicationsvaluedata;
+ }
+ } else if (submitapplicationssum === 1) {
+ if (submitapplicationsvaluedata !== undefined) {
+ window.location.href = "/projects/" + submitapplicationsvaluedata;
+ }
+ }
+ }
+
+ 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
+ })
+ }
+ educoderlogin = () => {
+ //登录账号
+ this.setState({
+ isRender: true
+ })
+ }
+ educoderloginysl = () => {
+ //退出账号
+ var url = `/accounts/logout.json`;
+ axios.get((url)).then((result) => {
+ if (result !== undefined) {
+ window.location.href = "/";
+ }
+ }).catch((error) => {
+ console.log(error);
+ })
+ }
+
+ hideAddcoursestypes = () => {
+ this.setState({
+ Addcoursestypes: false
+ })
+ };
+ HideAddcoursestypess = (i) => {
+ console.log("调用了");
+ this.setState({
+ Addcoursestypes: false,
+ mydisplay: true,
+ occupation: i,
+ })
+ };
+ ModalCancelsy = () => {
+ this.setState({
+ mydisplay: false,
+ })
+ };
+
+
+ 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
+ })
+ }
+
+ submittojoinclass = (value) => {
+ let { tojoinclasstitle, rolearr, RadioGroupvalue } = this.state;
+
+ if (tojoinclasstitle === undefined) {
+ this.setState({
+ code_notice: true
+ })
+ return
+ }
+ let newrolearr = rolearr;
+ if (tojoinclasstitle.length < 6) {
+ this.setState({
+ 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 < newrolearr.length; i++) {
+ if (newrolearr[i] !== "") {
+ pamst.push(newrolearr[i])
+ } else {
+ num = num + 1
+ }
+ }
+
+ if (num === 2 && value === 0) {
+ this.setState({
+ checked_notice: true
+ })
+ return
+ }
+
+ if (value === 1 && RadioGroupvalue === undefined) {
+ this.setState({
+ checked_notice: true
+ })
+ return
+ }
+ if (value === 1) {
+ let url = "/project_applies.json";
+ axios.post(url, {
+ code: tojoinclasstitle,
+ role: RadioGroupvalue
+ }
+ ).then((response) => {
+ if (response.data.status === 1) {
+ this.submitstatevalue(1, "您输入的邀请码错误")
+ } else if (response.data.status === 2) {
+ this.submitstatevalue(1, "您已经是该项目成员", response.data.project)
+ } else if (response.data.status === 3) {
+ this.submitstatevalue(1, "请选择一个角色")
+ } else if (response.data.status === 4) {
+ this.submitstatevalue(1, "您的申请已提交，请等待项目管理员审批")
+ } else if (response.data.status === 5) {
+ this.submitstatevalue(1, "您已经申请加入该项目了，请耐心等待")
+ } else if (response.data.status === 6) {
+ this.submitstatevalue(1, "您已成功加入项目", response.data.project)
+ } else if (response.data.status === 0) {
+ if (RadioGroupvalue === "reporter") {
+ this.openNotification("您加入项目成功!");
+ window.location.href = `/projects/${response.data.project_id}`;
+ } else {
+ this.openNotification("您的申请已提交，请等待项目管理员审批!");
}
- } else {
- this.gettablogourlnull();
}
})
- .catch((error) => {
- this.gettablogourlnull();
- });
- };
- //获取数据的时候
- gettablogourldata = (response) => {
- document.title = response.data.setting.name;
- var link = document.createElement("link"),
- oldLink = document.getElementById("dynamic-favicon");
- link.id = "dynamic-favicon";
- link.rel = "shortcut icon";
- link.href = "/" + response.data.setting.tab_logo_url;
- if (oldLink) {
- document.head.removeChild(oldLink);
}
- document.head.appendChild(link);
+ this.hidetojoinclass()
+ }
+ // 关闭
+ cancelModulationModels = () => {
+ this.setState({ isRenders: false })
+ }
+
+ inputjoinclassvalue = (e) => {
+ console.log(e.target.value.length);
+ if (e.target.value.length >= 7) {
+ this.openNotification("请输入6位项目邀请码!");
+ return
+ }
+ this.setState({
+ tojoinclasstitle: e.target.value
+ })
+ }
+
+ showSearchOpen = (e) => {
+ this.setState({
+ showSearchOpentype: true
+ })
+ }
+
+ hideshowSearchOpen = (e) => {
+ let { setevaluatinghides } = this.state;
+ if (setevaluatinghides === true) {
+ this.setState({
+ showSearchOpentype: false,
+ setevaluatinghides: false
+ })
+ }
+ }
+
+ onKeywordSearchKeyDown = (value) => {
+ let url = `/search?value=${value}`;
+ this.props.history.push(url)
+ }
+
+ onKeywordSearchKeyDowns = () => {
+ this.setState({
+ setevaluatinghides: false
+ })
+ }
+
+ setevaluatinghides = () => {
+ this.setState({
+ setevaluatinghides: true
+ })
+ }
+ //头部获取是否已经登录了
+ getUser = (url, type) => {
+ if (type === "projects") {
+ 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;
+ }
+ if (type === "newshixuns") {
+ if (this.props && this.props.current_user && this.props.current_user.is_shixun_marker === false) {
+ this.setgoshowqqgtounp(true);
+ return;
+ }
+ }
+ if (url !== undefined || url !== "") {
+ window.location.href = url;
+ }
+ }
+
+ //修改登录方法
+ Modifyloginvalue = () => {
+ this.setState({
+ isRender: false,
+ })
+ }
+
+ hideAccountProfile = () => {
+ this.setState({
+ AccountProfiletype: false
+ })
};
+ headtypesonClick = (url, bool) => {
+ this.setState({
+ headtypess: url,
+ headtypesonClickbool: bool,
+ })
+ }
//获取数据为空的时候
gettablogourlnull = () => {
this.setState({
- mygetHelmetapi2: undefined,
+ mygetHelmetapi2: undefined
});
- var link = document.createElement("link"),
- oldLink = document.getElementById("dynamic-favicon");
- link.id = "dynamic-favicon";
- link.rel = "shortcut icon";
+ var link = document.createElement('link'),
+ oldLink = document.getElementById('dynamic-favicon');
+ link.id = 'dynamic-favicon';
+ link.rel = 'shortcut icon';
link.href = "/react/build/./favicon.ico";
if (oldLink) {
document.head.removeChild(oldLink);
}
document.head.appendChild(link);
};
- educoderlogin = () => {
- //登录账号
+
+ //获取数据的时候
+ gettablogourldata = (response) => {
+ document.title = response.data.setting.name;
+ var link = document.createElement('link'),
+ oldLink = document.getElementById('dynamic-favicon');
+ link.id = 'dynamic-favicon';
+ link.rel = 'shortcut icon';
+ link.href = '/' + response.data.setting.tab_logo_url;
+ if (oldLink) {
+ document.head.removeChild(oldLink);
+ }
+ document.head.appendChild(link);
+ }
+
+ handleVisibleChanges = (boll) => {
this.setState({
- isRender: true,
- });
- };
- //修改登录方法
- Modifyloginvalue = () => {
- this.setState({
- isRender: false,
- });
- };
- educoderloginysl = () => {
- //退出账号
- var url = `/accounts/logout.json`;
- axios
- .get(url)
- .then((result) => {
- if (result !== undefined) {
- window.location.href = "/";
- }
- })
- .catch((error) => {
- console.log(error);
+ visiblemyss: boll,
+ })
+ }
+
+ getAppdata = () => {
+ try {
+ var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
+ var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
+ this.setState({
+ mygetHelmetapi2: chromesettingArray
});
- };
- matchpaths = (url) => {
- const { match } = this.props;
- if (url) {
- if (url === "/forums" && match.path === "/forums") {
- return true;
- } else if (
- url.startsWith("/projects") &&
- match.path.startsWith("/projects")
- ) {
- return true;
- } else if (url.startsWith("/paths") && match.path.startsWith("/paths")) {
- return true;
- } else if (
- url.startsWith("/courses") &&
- match.path.startsWith("/courses")
- ) {
- return true;
- } else if (
- url.startsWith("/competitions") &&
- match.path.startsWith("/competitions")
- ) {
- return true;
- } else if (
- url.startsWith("/statistics") &&
- match.path.startsWith("/statistics")
- ) {
- return true;
- } else if (url.startsWith("/users") && match.path.startsWith("/users")) {
- return true;
+ if (chromesettingArray.tab_logo_url) {
+ this.gettablogourldata(chromesettingresponseArray);
} else {
- return false;
+ this.gettablogourlnull();
}
+ } catch (e) {
+ this.geturlsdata();
}
};
- headtypesonClick = (url, bool) => {
- this.setState({
- headtypess: url,
- headtypesonClickbool: bool,
+
+ geturlsdata = () => {
+ let url = "/setting.json";
+ axios.get(url).then((response) => {
+ if (response && response.data) {
+ this.setState({ mygetHelmetapi2: response.data.setting }, () => {
+ console.log('');
+ });
+ // localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
+ // localStorage.setItem('chromesettingresponse', JSON.stringify(response));
+ try {
+ if (response.data.setting.tab_logo_url) {
+ this.gettablogourldata(response);
+ } else {
+ this.gettablogourlnull();
+ }
+ } catch (e) {
+ this.gettablogourlnull();
+ }
+ } else {
+ this.gettablogourlnull();
+ }
+ }).catch((error) => {
+ this.gettablogourlnull();
});
- };
+ }
+
+ matchpaths = (url) => {
+ const { match } = this.props;
+ if(url){
+ if (url.indexOf('forums') > -1 && match.path.indexOf('forums') > -1) {
+ return true
+ } else if (url.indexOf('projects') > -1 && match.path.indexOf('projects') > -1) {
+ return true
+ } else if (url.indexOf('users') > -1 && match.path.indexOf('users') > -1) {
+ return true
+ } else {
+ return false
+ }
+ }
+ }
+
+
+ // 处理弹框
+ setgoshowqqgtounp = (bool) => {
+ this.setState({
+ goshowqqgtounp: bool
+ })
+ }
render() {
- const { user, match } = this.props;
- const isLogin = !!user; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
+ const { match } = this.props;
- let { mygetHelmetapi2, isRender } = this.state;
+ let { Addcoursestypes,
+ tojoinitemtype,
+ tojoinclasstitle,
+ code_notice,
+ checked_notice,
+ AccountProfiletype,
+ submitapplications,
+ submitapplicationsvalue,
+ user,
+ isRender,
+ showSearchOpentype,
+ headtypesonClickbool,
+ headtypess,
+ mygetHelmetapi2,
+ goshowqqgtounp,
+ } = this.state;
+ /*用户名称 用户头像url*/
+ let activeIndex = false;
+ let activeForums = false;
+ let activeShixuns = false;
+ let activePaths = false;
+ let coursestype = false;
+ let activePackages = false;
+ let activeMoopCases = false;
+ let activeCompetitions = false;
+
+ if (match.path === '/forums') {
+ activeForums = true;
+ } else if (match.path.startsWith('/shixuns')) {
+ activeShixuns = true;
+ } else if (match.path.startsWith('/paths')) {
+ activePaths = true;
+ } else if (match.path.startsWith('/courses')) {
+ coursestype = true;
+ } else if (match.path.startsWith('/crowdsourcing')) {
+ activePackages = true;
+ } else if (match.path.startsWith('/moop_cases')) {
+ activeMoopCases = true;
+ } else if (match.path.startsWith('/competitions')) {
+ activeCompetitions = true;
+ } else {
+ activeIndex = true;
+ }
+
+ let headtypes = '/';
+ if (mygetHelmetapi2) {
+ if (mygetHelmetapi2.navbar) {
+ if (mygetHelmetapi2.navbar.length > 0) {
+ if (match.path === '/') {
+ if (headtypesonClickbool === false) {
+ headtypes = undefined;
+ } else {
+ headtypes = headtypess;
+ }
+ } else {
+ for (var i = 0; i < mygetHelmetapi2.navbar.length; i++) {
+ if (match.path === mygetHelmetapi2.navbar[i].link) {
+ headtypes = mygetHelmetapi2.navbar[i].link;
+ break;
+ }
+ }
+ }
+ }
+ }
+ }
+ 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
+ }
+ }
+ })
+ }
return (
-
+
-
-
:
diff --git a/src/modules/page/layers/ImageLayerOfCommentHOC.js b/src/modules/page/layers/ImageLayerOfCommentHOC.js
index 7745c2d6..a2482612 100644
--- a/src/modules/page/layers/ImageLayerOfCommentHOC.js
+++ b/src/modules/page/layers/ImageLayerOfCommentHOC.js
@@ -7,8 +7,6 @@ export function ImageLayerOfCommentHOC(options = {}) {
return class Wrapper extends Component {
constructor(props) {
super(props);
-
-
this.state = {
showImage: false,
imageSrc: ''
@@ -16,7 +14,6 @@ export function ImageLayerOfCommentHOC(options = {}) {
}
onDelegateClick = (event) => {
- console.log("imgclick",event);
const imageSrc = event.target.src || event.target.getAttribute('src') || event.target.getAttribute('href')
// 判断imageSrc是否是图片
const fileName = event.target.innerHTML.trim()
@@ -38,7 +35,6 @@ export function ImageLayerOfCommentHOC(options = {}) {
componentDidMount() {
this.props.wrappedComponentRef && this.props.wrappedComponentRef(this.refs['wrappedComponentRef'])
-
setTimeout(() => {
$(options.parentSelector || ".commentsDelegateParent")
.delegate(options.imgSelector || ".J_Comment_Reply .comment_content img, .J_Comment_Reply .childrenCommentsView img", "click", this.onDelegateClick);
@@ -70,13 +66,11 @@ export function ImageLayerOfCommentHOC(options = {}) {
}
}
-
render() {
this.MdifHasAnchorJustScorll();
return (
this.props.onImageLayerClose()}>
- {isRender === true ? (
- this.Modifyloginvalue()}
- />
- ) : (
- ""
- )}
-
- this.headtypesonClick("/", false)}
- className={"mr20"}
- >
- {mygetHelmetapi2 &&
- mygetHelmetapi2.nav_logo_url &&
- mygetHelmetapi2.nav_logo_url ? (
- })
- ) : (
- ![可控开源社区]({getImageUrl("images/educoder/headNavLogo.png?1526520218")})
- )}
-
-
- )}
-
-
- {mygetHelmetapi2 &&
- mygetHelmetapi2.navbar &&
- mygetHelmetapi2.navbar.length > 0 ? (
-
- ) : (
- ""
- )}
-
+
+ 恢复 ? / 不恢复';
$("#e_tips_" + id).html(h)
@@ -56,15 +56,15 @@ function md_elocalStorage(editor, mdu, id) {
m = m < 10 ? '0' + m : m;
s = s < 10 ? '0' + s : s;
- if (editor.getValue().trim() != "") {
+ if (editor.getValue().trim() !== "") {
md_add_data("content", mdu, editor.getValue());
let id2 = "#e_tips_" + id;
- let textStart = " 数据已于 "
+ let textStart = " 数据已于 ";
let text = textStart + h + ':' + m + ':' + s + " 保存 ";
// 占位符
let oldHtml = $(id2).html();
- if (oldHtml && oldHtml != ' ' && oldHtml.startsWith(textStart) == false) {
+ if (oldHtml && oldHtml !== ' ' && oldHtml.startsWith(textStart) === false) {
$(id2).html(oldHtml.split(' (')[0] + ` (${text})`);
} else {
$(id2).html(text);
@@ -75,30 +75,30 @@ function md_elocalStorage(editor, mdu, id) {
}
-export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, className = '', noStorage = false, imageExpand = true, placeholder = '', width = '100%', height = 400, initValue = '', emoji, watch, showNullButton = false, showResizeBar = false, startInit = true }) => {
+export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, className = '', noStorage = false, imageExpand = true, placeholder = '', width = '100%', height = 400, initValue = '', emoji, watch, showNullButton = false, showResizeBar = false, startInit = true , forMember = true }) => {
- const editorEl = useRef()
- const resizeBarEl = useRef()
- const [editorInstance, setEditorInstance] = useState()
- const containerId = `mdEditor_${mdID}`
- const editorBodyId = `mdEditors_${mdID}`
- const tipId = `e_tips_mdEditor_${mdID}`
+ const editorEl = useRef();
+ const resizeBarEl = useRef();
+ const [editorInstance, setEditorInstance] = useState();
+ const containerId = `mdEditor_${mdID}`;
+ const editorBodyId = `mdEditors_${mdID}`;
+ const tipId = `e_tips_mdEditor_${mdID}`;
function onLayout() {
- let ro
+ let ro;
if (editorEl.current) {
ro = new ResizeObserver(entries => {
for (let entry of entries) {
if (entry.target.offsetHeight > 0 || entry.target.offsetWidth > 0) {
- editorInstance.resize()
- editorInstance.cm.refresh()
- editorInstance.cm.focus()
+ editorInstance.resize();
+ editorInstance.cm.refresh();
+ editorInstance.cm.focus();
}
}
})
- ro.observe(editorEl.current)
+ ro.observe(editorEl.current);
}
- return ro
+ return ro;
}
useEffect(() => {
@@ -194,6 +194,14 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
}
if (onChange) {
editorInstance.cm.on('change', (cm) => {
+ // if(forMember){
+ // document.onkeydown = (e) => {
+ // if (e.key === "@") {
+ // // 输入@键后在对应的位置显示可选的项目成员
+
+ // }
+ // };
+ // }
onChange(cm.getValue())
})
}
@@ -211,7 +219,7 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
useEffect(() => {
if (editorInstance && initValue !== undefined) {
- if (initValue != null && initValue != editorInstance.getValue()) {
+ if (initValue !== null && initValue !== editorInstance.getValue()) {
editorInstance.setValue(initValue.toString())
}
}
@@ -265,7 +273,7 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
{showResizeBar ? : null}
+ {isRender === true ?
+ this.Modifyloginvalue()}
+ /> : ""}
-
);
diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css
index dac2908b..98260caf 100644
--- a/src/modules/tpm/TPMIndex.css
+++ b/src/modules/tpm/TPMIndex.css
@@ -21,37 +21,24 @@ body>.-task-title {
height: 100%;
min-height: 100%;
overflow: hidden;
+ padding-top:70px;
}
-.newHeader{
- background: #fff;
- width: 100%;
- height: 60px;
- min-width: 1200px;
- position: fixed;
- top: 0;
- left: 0;
- z-index: 99;
- -webkit-box-shadow: 0 0 12px rgba(0,0,0,.1);
- box-shadow: 0 0 12px rgba(0,0,0,.1);
-}
-.head-navnew{
- width:97%;
- display: flex;
-}
-.newHeader .logoimg {
- margin-top: 12px;
- float: left;
- width: 48px;
-}
-.headerLeft{
- flex: 1 1;
+.newHeaders{
+ max-width: unset;
+ width: 100%;
+ height:70px;
+ min-width: 1200px;
+ z-index: 10000;
+ background:rgba(255,255,255,1);
+ position: fixed;
}
.headerContent{
- width:1200px;
+ width:100%;
+ padding:0px 70px;
margin:0px auto;
display: flex;
align-items: center;
- height: 100%
+ height: 100%;
}
.globalSpin {
max-height: 700px !important;
@@ -72,11 +59,11 @@ body>.-task-title {
background-color: #fff;
}
/*Header START*/
-/* .newHeader .logoimg {
+.newHeader .logoimg {
margin-top: 16px;
float: left;
width: 97px;
-} */
+}
.headIcon,
#header_keyword_search {
@@ -144,11 +131,6 @@ body>.-task-title {
color: #000 !important;
}
-/* .newHeader {
- background: #24292D !important;
- height: 60px !important;
-} */
-
/*-------------------个人主页：右侧提示区域--------------------------*/
.-task-sidebar {
position: fixed;
@@ -318,11 +300,11 @@ body>.-task-title {
margin-left: 18%;
}
-/* .logoimg {
+.logoimg {
float: left;
min-width: 40px;
height: 40px;
-} */
+}
.headwith100b {
width: 100%;
@@ -425,4 +407,4 @@ body>.-task-title {
.progress-container {
flex: 1 0 0;
margin-left: 20px;
-}
+}
\ No newline at end of file
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index 4886031a..0084c333 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -8,7 +8,6 @@ import './TPMIndex.css';
import LoginDialog from '../login/LoginDialog';
import AccountProfile from '../user/AccountProfile';
import AccountPhoneemail from '../user/AccountPhoneemail';
-import cookies from 'react-cookies';
export function TPMIndexHOC(WrappedComponent) {
return class II extends React.Component {
@@ -82,7 +81,7 @@ export function TPMIndexHOC(WrappedComponent) {
this.setState({
mygetHelmetapi: undefined
});
- document.title = "EduCoder";
+ document.title = "Forge";
var link = document.createElement('link'),
oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon';
@@ -154,7 +153,7 @@ export function TPMIndexHOC(WrappedComponent) {
this.gettablogourlnull();
});
}
-
+
fetchUsers = () => {
let url = `/users/get_user_info.json`;
axios.get(url).then((response) => {
@@ -163,6 +162,9 @@ export function TPMIndexHOC(WrappedComponent) {
this.setState({
tpmLoading: false
})
+ if (this.props.match.path === "/" && response.data.login) {
+ this.props.history.push(`/users/${response.data.login}`);
+ }
}
}).catch((error) => {
console.log(error)
@@ -184,15 +186,16 @@ export function TPMIndexHOC(WrappedComponent) {
json[key] = value;
}
} while (arr);
-
return json;
};
+
hideLoginDialog = () => {
this.setState({
isRender: false,
isloginCancel: undefined
})
}
+
showLoginDialog = () => {
this.setState({
isRender: true,
@@ -209,6 +212,7 @@ export function TPMIndexHOC(WrappedComponent) {
AccountProfiletype: false
})
}
+
showProfileCompleteDialog = () => {
this.dialogObj = {}
this.setState({
@@ -393,11 +397,15 @@ export function TPMIndexHOC(WrappedComponent) {
tip={this._gLoadingTip || "加载中..."}
>
- this.hideAccountProfile()}
+ {...this.props}
+ {...this.state}
+ /> : ""}
+ {
+ goshowqqgtounp === true ?
+ this.setgoshowqqgtounp(bool)}>
+ :""
+ }
+
+ {
+ mygetHelmetapi2 && mygetHelmetapi2.nav_logo_url ?
+
+ :
+ 
+ }
+
+
+
- {
- user && user.login ?
-
+ {AccountProfiletype === true ?
+
-
-
- : ""
- }
-
- {/* -
-
- - - 新建镜像项目 - - -
- - - 新建托管项目 - - -
- - 新建帖子 - -
-
-
-
-
*/}
- {user && user.login ? (
-
- {user && (
-
-
-
- )}
- {user && user.login && user.tidding_count > 0 && (
-
- {user.tidding_count > 99 ? "99+" : user.tidding_count}
-
- )}
- {user && user.login && user.tidding_count > 0 && (
-
- )}
-
- ) : (
-
- )}
- {user && user.login ? (
- user.username && (
-
-
-
- )
- ) : (
-
- this.educoderlogin()}>
- 登录
-
- {mygetHelmetapi2 &&
- mygetHelmetapi2.new_course &&
- mygetHelmetapi2.new_course.register_url && (
-
-
-
- 注册
-
-
- )}
-
- )}
-
+ {this.props.user && this.props.user.login &&
+
+
+
+
+ {user === undefined ?
+
+ this.educoderlogin()} className="mr5 color-grey-6">登录
+ {
+ mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url &&
+ 注册
+ }
+
+ : user.login === "" ?
+
+ this.educoderlogin()} className="mr5 color-grey-6">登录
+ {
+ mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url &&
+ 注册
+ }
+
+ :
+
+ }
+
+
+ }
+ {this.props.user && this.props.user.login &&
+
+
+ {
+ coursestypes === true && this.props.user && this.props.user.main_site === false ? "" :
+
+ -
+
- 新建镜像项目 +
- 新建托管项目 +
+ {user && user.login &&
+
+
+
+
+
+ }
+
+ }
+
- this.initCommonState(user)}
- {...this.props} {...this.state}
- {...common}
- >
-
+ {
+ current_user &&
+ this.initCommonState(user)}
+ {...this.props} {...this.state}
+ {...common}
+ >
+
+ }
+
- {noStorage == true ? null : }
+ {noStorage === true ? null : }
)
diff --git a/src/modules/tpm/css/NewHeader.css b/src/modules/tpm/css/NewHeader.css
index ccaf3c2f..8c9baab8 100644
--- a/src/modules/tpm/css/NewHeader.css
+++ b/src/modules/tpm/css/NewHeader.css
@@ -38,8 +38,8 @@
}
.headRightpan,.headRightwrite,.headRighthint{
width: 48px;
- height: 60px;
- line-height: 60px;
+ height: 70px;
+ line-height: 70px;
}
.headRighthint-font{
color:#666 !important;
diff --git a/src/modules/tpm/css/header.css b/src/modules/tpm/css/header.css
index eda01308..f618963f 100644
--- a/src/modules/tpm/css/header.css
+++ b/src/modules/tpm/css/header.css
@@ -1,7 +1,7 @@
.newHeader {
background: #fff;
width: 100%;
- height: 60px;
+ height: 70px;
min-width: 1200px;
position: fixed;
top: 0px;
@@ -34,13 +34,13 @@
position: absolute;
top: 0px;
z-index: 3;
- height: 60px;
+ height: 70px;
box-sizing: border-box;
}
.head-nav ul#header-nav li {
float: left;
- height: 60px;
- line-height: 60px;
+ height: 70px;
+ line-height: 70px;
padding: 0px 24px;
cursor: pointer;
position: relative;
diff --git a/src/modules/tpm/images/logo.png b/src/modules/tpm/images/logo.png
new file mode 100644
index 00000000..961f3052
Binary files /dev/null and b/src/modules/tpm/images/logo.png differ
diff --git a/src/modules/user/LCCountDownButton.js b/src/modules/user/LCCountDownButton.js
index da379471..cce1db23 100644
--- a/src/modules/user/LCCountDownButton.js
+++ b/src/modules/user/LCCountDownButton.js
@@ -60,7 +60,7 @@ export default class LCCountDownButton extends Component {
const {id,changeWithCount} = this.props;
for(var i = 0 ; i