![]({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 962aed0db..38ae0bbc1 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 2ead4e4f3..d2f77f3e3 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -12,6 +12,7 @@ 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 这部分脚本从公共脚本中直接调用
@@ -19,6 +20,8 @@ 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)
@@ -50,7 +53,8 @@ class NewHeader extends Component {
}
}
componentDidMount() {
- this.getAppdata();
+ // this.getAppdata();
+ this.geturlsdata();
window._header_componentHandler = this;
//下拉框的显示隐藏
@@ -547,23 +551,19 @@ class NewHeader extends Component {
geturlsdata = () => {
let url = "/setting.json";
axios.get(url).then((response) => {
- if (response) {
- if (response.data) {
- this.setState({
- mygetHelmetapi2: response.data.setting
- });
- 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) {
+ 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();
}
- } else {
+ } catch (e) {
this.gettablogourlnull();
}
} else {
@@ -571,29 +571,21 @@ class NewHeader extends Component {
}
}).catch((error) => {
this.gettablogourlnull();
-
});
}
-
matchpaths = (url) => {
const { match } = this.props;
- 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
- } else {
- return false
+ 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
+ }
}
}
@@ -605,10 +597,8 @@ class NewHeader extends Component {
})
}
render() {
- const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
const { match } = this.props;
-
let { Addcoursestypes,
tojoinitemtype,
tojoinclasstitle,
@@ -625,9 +615,7 @@ class NewHeader extends Component {
mygetHelmetapi2,
goshowqqgtounp,
} = this.state;
- /*
- 用户名称 用户头像url
- */
+ /*用户名称 用户头像url*/
let activeIndex = false;
let activeForums = false;
let activeShixuns = false;
@@ -673,7 +661,6 @@ class NewHeader extends Component {
}
}
}
-
}
}
}
@@ -724,24 +711,24 @@ class NewHeader extends Component {
this.setgoshowqqgtounp(bool)}>
:""
}
- this.headtypesonClick("/", false)} className={"fl mr30"}>
+
{
- mygetHelmetapi2 && mygetHelmetapi2.nav_logo_url && mygetHelmetapi2.nav_logo_url ?
- })
+ mygetHelmetapi2 && mygetHelmetapi2.nav_logo_url ?
+
:
- ![高校智能化教学与实训平台]({getImageUrl("images/educoder/headNavLogo.png?1526520218")})
+ 
}
- {
- mygetHelmetapi2 && mygetHelmetapi2.navbar && mygetHelmetapi2.navbar.length > 0 ?
-
+
-
-
:
diff --git a/src/modules/page/layers/ImageLayerOfCommentHOC.js b/src/modules/page/layers/ImageLayerOfCommentHOC.js
index 34fc6a791..a2482612f 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: ''
@@ -37,8 +35,7 @@ export function ImageLayerOfCommentHOC(options = {}) {
componentDidMount() {
this.props.wrappedComponentRef && this.props.wrappedComponentRef(this.refs['wrappedComponentRef'])
-
- setTimeout(() => {
+ setTimeout(() => {
$(options.parentSelector || ".commentsDelegateParent")
.delegate(options.imgSelector || ".J_Comment_Reply .comment_content img, .J_Comment_Reply .childrenCommentsView img", "click", this.onDelegateClick);
}, 1200)
@@ -69,13 +66,11 @@ export function ImageLayerOfCommentHOC(options = {}) {
}
}
-
render() {
this.MdifHasAnchorJustScorll();
return (
this.props.onImageLayerClose()}>
+
- {this.props.user && this.props.user.login ?
+ {this.props.user && this.props.user.login &&
-
-
{user === undefined ?
- this.educoderlogin()} className="mr5 color-grey-3">登录
+ this.educoderlogin()} className="mr5 color-grey-6">登录
{
mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url &&
- 注册
+ 注册
}
: user.login === "" ?
- this.educoderlogin()} className="mr5 color-grey-3">登录
+ this.educoderlogin()} className="mr5 color-grey-6">登录
{
mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.register_url &&
- 注册
+ 注册
}
:
@@ -858,8 +833,9 @@ class NewHeader extends Component {
src={getImageUrl(`images/` + user.image_url)} width="34">
-
+
+
- : ""
}
- {this.props.user && this.props.user.login ?
+ {this.props.user && this.props.user.login &&
-
-
- {
- mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.new_syllabuses &&
-
- 新建课程 - } - { - mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.new_course && -
- 新建班级 - } -
-
+
- 新建镜像项目
- 新建托管项目
{user && user.login &&
-
+
}
- : ""
}
-
-
-
+
-
+
- {this.props.current_user.username} +
- 个人中心 { @@ -883,4 +859,3 @@ class NewHeader extends Component { } export default NewHeader; - diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css index 1f40ed793..8ee4561dd 100644 --- a/src/modules/tpm/TPMIndex.css +++ b/src/modules/tpm/TPMIndex.css @@ -21,24 +21,23 @@ body>.-task-title { height: 100%; min-height: 100%; overflow: hidden; + padding-top:70px; } .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); + z-index: 10000; background:rgba(255,255,255,1); - box-shadow:0px 2px 10px 0px rgba(0,0,0,0.1); + position: fixed; } .headerContent{ width:1200px; margin:0px auto; display: flex; align-items: center; - height: 100% + height: 100%; } .globalSpin { max-height: 700px !important; diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index 4886031a6..0084c3334 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.initCommonState(user)} - {...this.props} {...this.state} - {...common} - > - + { + current_user && +this.initCommonState(user)} + {...this.props} {...this.state} + {...common} + > + + } +{ +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 }) => { 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 tipId = `e_tips_mdEditor_${mdID}` function onLayout() { let ro @@ -92,10 +92,7 @@ export default ({ mdID,onChange,autoFocus,onCMBeforeChange, onCMBlur, error = fa if (entry.target.offsetHeight > 0 || entry.target.offsetWidth > 0) { editorInstance.resize() editorInstance.cm.refresh() - // if(autofocus){ - // editorInstance.cm.focus() - // } - + editorInstance.cm.focus() } } }) @@ -105,7 +102,6 @@ export default ({ mdID,onChange,autoFocus,onCMBeforeChange, onCMBlur, error = fa } useEffect(() => { - if (editorInstance) { return } @@ -124,7 +120,7 @@ export default ({ mdID,onChange,autoFocus,onCMBeforeChange, onCMBlur, error = fa searchReplace: true, htmlDecode: "style,script,iframe", sequenceDiagram: true, - autoFocus: autoFocus === undefined ? false : autoFocus, + autoFocus: false, watch: watch === undefined ? true : watch, saveHTMLToTextarea: true, @@ -256,8 +252,8 @@ export default ({ mdID,onChange,autoFocus,onCMBeforeChange, onCMBlur, error = fa } } }, [ - editorInstance, resizeBarEl - ]) + editorInstance, resizeBarEl + ]) return ( diff --git a/src/modules/tpm/images/logo.png b/src/modules/tpm/images/logo.png new file mode 100644 index 000000000..961f30521 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 da379471a..cce1db233 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