- {isRender===true ? this.hideLoginDialog()}
{...this.props}
{...this.state}
From 8dc47a215785dd0428b35c0e1e61dc14c20f3530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 14 Oct 2019 15:45:03 +0800
Subject: [PATCH 03/43] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/App.js | 46 +++++++++++++++++---
public/react/src/modules/tpm/TPMIndexHOC.js | 48 +++++++++++++++++----
2 files changed, 80 insertions(+), 14 deletions(-)
diff --git a/public/react/src/App.js b/public/react/src/App.js
index bf9e98c79..8a1986cc8 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -357,15 +357,40 @@ class App extends Component {
let url = "/setting.json";
axios.get(url).then((response) => {
if(response){
- this.setState({
- getHelmetapi:response.data.setting
- });
- document.title = response.data.setting.name;
+ if(response.data){
+ this.setState({
+ getHelmetapi:response.data.setting
+ });
+ 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.nav_logo_url;
+ if (oldLink) {
+ document.head.removeChild(oldLink);
+ }
+ document.head.appendChild(link);
+ }else {
+ document.title = "EduCoder";
+ 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);
+ }
+
+ }else{
+ document.title = "EduCoder";
var link = document.createElement('link'),
oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon';
link.rel = 'shortcut icon';
- link.href = response.data.setting.nav_logo_url;
+ link.href = "/react/build/./favicon.ico";
if (oldLink) {
document.head.removeChild(oldLink);
}
@@ -373,7 +398,16 @@ class App extends Component {
}
}).catch((error) => {
-
+ document.title = "EduCoder";
+ 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);
});
};
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 1646e2b87..f0dacf2be 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -285,17 +285,40 @@ export function TPMIndexHOC(WrappedComponent) {
let url = "/setting.json";
axios.get(url).then((response) => {
if(response){
- this.setState({
- mygetHelmetapi:response.data.setting,
- });
- // console.log("获取当前定制信息");
- // console.log(response.data.setting);
- document.title = response.data.setting.name;
+ if(response.data){
+ this.setState({
+ getHelmetapi:response.data.setting
+ });
+ 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.nav_logo_url;
+ if (oldLink) {
+ document.head.removeChild(oldLink);
+ }
+ document.head.appendChild(link);
+ }else {
+ document.title = "EduCoder";
+ 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);
+ }
+
+ }else{
+ document.title = "EduCoder";
var link = document.createElement('link'),
oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon';
link.rel = 'shortcut icon';
- link.href = response.data.setting.nav_logo_url;
+ link.href = "/react/build/./favicon.ico";
if (oldLink) {
document.head.removeChild(oldLink);
}
@@ -303,7 +326,16 @@ export function TPMIndexHOC(WrappedComponent) {
}
}).catch((error) => {
-
+ document.title = "EduCoder";
+ 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);
});
};
/**
From 7191fb89f8c602ca0ba407331f8f38d60250adbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 14 Oct 2019 15:49:33 +0800
Subject: [PATCH 04/43] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../react/src/modules/login/EducoderLogin.js | 2 +
public/react/src/modules/tpm/TPMIndexHOC.js | 13 ----
.../src/modules/user/LoginRegisterPage.js | 60 +++++++++----------
3 files changed, 32 insertions(+), 43 deletions(-)
diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index eed3a9add..8a85de374 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -138,6 +138,8 @@ class EducoderLogin extends Component {
render() {
let {showbool,loginstatus,logini} = this.state;
+ console.log("EducoderLogingetHelmetapi");
+ console.log(this.props.getHelmetapi);
return (
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index f0dacf2be..f83834a33 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -594,19 +594,6 @@ export function TPMIndexHOC(WrappedComponent) {
hideGlobalLoading = () => {
this.setState({ globalLoading: false })
}
- getAppdata=()=>{
- let url = "/setting.json";
- axios.get(url).then((response) => {
- if(response){
- this.setState({
- getHelmetapi:response.data.setting
- })
- }
-
- }).catch((error) => {
-
- });
- };
render() {
let{Headertop,Footerdown, isRender, AccountProfiletype}=this.state;
const common = {
diff --git a/public/react/src/modules/user/LoginRegisterPage.js b/public/react/src/modules/user/LoginRegisterPage.js
index 1990f118f..8990f1d78 100644
--- a/public/react/src/modules/user/LoginRegisterPage.js
+++ b/public/react/src/modules/user/LoginRegisterPage.js
@@ -1,30 +1,30 @@
-import React, { Component } from 'react';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import Loading from '../../Loading';
-
-import Loadable from 'react-loadable';
-
-// import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
-
-import { SnackbarHOC, getImageUrl } from 'educoder';
-import LoginRegisterComponent from './LoginRegisterComponent';
-import FindPasswordComponent from './FindPasswordComponent';
-
-class LoginRegisterPage extends Component {
- render() {
- // newMain clearfix
- return (
-
{
+
+ return ( {
+
+ return ( {
+
+ return (
@@ -151,7 +153,16 @@ class EducoderLogin extends Component {
"width": "100%"
}}>
- login
-
-
-
- );
- }
-}
-
-export default SnackbarHOC() ( ( LoginRegisterPage ));
+import React, { Component } from 'react';
+
+import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+
+import Loading from '../../Loading';
+
+import Loadable from 'react-loadable';
+
+// import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
+
+import { SnackbarHOC, getImageUrl } from 'educoder';
+import LoginRegisterComponent from './LoginRegisterComponent';
+import FindPasswordComponent from './FindPasswordComponent';
+
+class LoginRegisterPage extends Component {
+ render() {
+ // newMain clearfix
+ return (
+ -
-
+
+
+
+
+ );
+ }
+}
+
+export default SnackbarHOC() ( ( LoginRegisterPage ));
From 89782ffabde12b3d07db370305d86e275b5fe853 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 14 Oct 2019 16:04:24 +0800
Subject: [PATCH 05/43] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/competitions/competitions/index.json.jbuilder | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/competitions/competitions/index.json.jbuilder b/app/views/competitions/competitions/index.json.jbuilder
index f0d70f69e..400f17379 100644
--- a/app/views/competitions/competitions/index.json.jbuilder
+++ b/app/views/competitions/competitions/index.json.jbuilder
@@ -20,7 +20,7 @@ json.competitions do
if section
json.current_stage do
- json.name = section.competition_stage.name
+ json.name section.competition_stage.name
json.start_time section.display_start_time
json.end_time section.display_end_time
end
From d39b6071dc2042314cf86e677b21915209dc2e19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Mon, 14 Oct 2019 16:07:47 +0800
Subject: [PATCH 06/43] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/App.js | 26 ++++++++++++++++---
.../react/src/modules/login/EducoderLogin.js | 17 +++++++++---
public/react/src/modules/tpm/NewHeader.js | 11 +++++++-
public/react/src/modules/tpm/TPMIndexHOC.js | 6 ++---
4 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/public/react/src/App.js b/public/react/src/App.js
index 8a1986cc8..1c13dfa3d 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -366,7 +366,7 @@ class App extends Component {
oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon';
link.rel = 'shortcut icon';
- link.href = response.data.setting.nav_logo_url;
+ link.href = response.data.setting.tab_logo_url;
if (oldLink) {
document.head.removeChild(oldLink);
}
@@ -463,10 +463,22 @@ class App extends Component {
+
+
- ![]()
this.gohome()} src={educodernet}/>
+ {
+ this.props.getHelmetapi===undefined?
+ ![]()
this.gohome()} src={educodernet}/>
+ :
+ this.props.getHelmetapi.login_logo_url===undefined?
+ ![]()
this.gohome()} src={educodernet}/>
+ :
+ ![]()
this.gohome()} src={getImageUrl(this.props.getHelmetapi.login_logo_url)}/>
+ }
+
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index d5119245b..019726296 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -687,6 +687,8 @@ submittojoinclass=(value)=>{
activeIndex = true;
}
+ console.log("NewHeader");
+ console.log(this.props);
return (
@@ -703,7 +705,14 @@ submittojoinclass=(value)=>{
{...this.state}
/>:""}
- ![高校智能化教学与实训平台]({getImageUrl("images/educoder/headNavLogo.png?1526520218")})
+ {
+ this.props.getHelmetapi===undefined?
+
+ :this.props.getHelmetapi.nav_logo_url===undefined?
+
+ :
+ })
+ }
-
+ {
+ this.props.getHelmetapi===undefined?
+
+ :this.props.getHelmetapi.nav_logo_url===undefined?
+
+ :
+
- {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
-
-
- {
- this.props.getHelmetapi===undefined||this.props.getHelmetapi.navbar===null||this.props.getHelmetapi.navbar===undefined||this.props.getHelmetapi.navbar.length===0?
-
{
- this.props.mygetHelmetapi!==undefined&&this.props.mygetHelmetapi.navbar!==null&&this.props.mygetHelmetapi.navbar!==undefined&&this.props.mygetHelmetapi.navbar.length>0?
+ mygetHelmetapi2!==undefined&&mygetHelmetapi2.navbar!==null&&mygetHelmetapi2.navbar!==undefined&&mygetHelmetapi2.navbar.length>0?
- :this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.navbar===null||this.props.mygetHelmetapi.navbar===undefined||this.props.mygetHelmetapi.navbar.length===0?
-
-
- :
- -
- {/*
- 首页 */} - - {/*
- 实训路径 */} - - -
- - 实践课程 - - - {/*
- 课堂 */} - -
- - - {/*课堂*/} - - 翻转课堂 - - -
-
- 实训项目
-
![]({getImageUrl("images/educoder/hot-h.png")})
-
-
-
- - 0 ? 'block' : 'none'}}>
- 职业路径
- 0 ? 'block' : 'none'}}> --
-
- {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
- return(
-
- {item.name} - ) - }) - } -
-
- {/* - 教学案例 */} -
-
- 在线竞赛
-
})
-
- - 教学案例 - {/*
- */} - {/*众包创新*/} - {/* */} -
- 交流问答 -
- 工程认证 -
-
- }
- -
- {/*
- 首页 */} - - {/*
- 实训路径 */} - - {/*{*/} - {/* this.props.getHelmetapi.navbar && this.props.getHelmetapi.navbar.map((item,key)=>{*/} - - {/* return(*/} - - {/* )*/} - {/* })*/} - {/*}*/} -
- - 实践课程 - - - {/*
- 课堂 */} + { + this.props.mygetHelmetapi!==undefined&&this.props.mygetHelmetapi.navbar!==null&&this.props.mygetHelmetapi.navbar!==undefined&&this.props.mygetHelmetapi.navbar.length>0? +
- 首页 */} + {/*
- 实训路径 */} + { + this.props.mygetHelmetapi.navbar && this.props.mygetHelmetapi.navbar.map((item,key)=>{ + // console.log("headtypes"); + // console.log(headtypes); + return( +
- + this.headtypesonClick(item.link,true)}>{item.name} + + ) + }) + } + {/*
- */} + {/* 实践课程*/} + {/* */} + + {/*
- 课堂 */} + {/*
- */} + {/* /!*课堂*!/*/} + {/* 翻转课堂*/} + {/* */} + + {/*
- */}
+ {/* 实训项目*/}
+ {/* */}
+ {/* */}
+ {/* */}
+
+
+ {/*
- 教学案例 */} + {/*
- */}
+ {/* 在线竞赛*/}
+ {/*
}*/})
*/}
+ {/* */}
+ {/* - 教学案例 */} + {/*
- */} + {/*众包创新*/} + {/* */} + {/*
- 交流问答 */} + {/*
- 0 ? 'block' : 'none'}}>
+ 职业路径
+ 0 ? 'block' : 'none'}}> ++
-
+ {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
+ return(
+
- {item.name} + ) + }) + } +
+ - 首页 */} + + {/*
- 实训路径 */} +
- + 实践课程 + -
- + {/*
- 课堂 */} +
- + {/*课堂*/} + 翻转课堂 + - {/*课堂*/} +
-
+ 实训项目
+ {/**/}
+ {/**/}
+
- 翻转课堂
-
+
- 0 ? 'block' : 'none'}}>
+ 职业路径
+ 0 ? 'block' : 'none'}}> ++
-
+ {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
+ return(
+
- {item.name} + ) + }) + } +
- -
- 实训项目
-
-
-
- {/*
- 教学案例 */} -
-
- 在线竞赛
-
-
-
- 教学案例 - {/*
- */} - {/*众包创新*/} - {/* */} -
- 交流问答 -
- 工程认证 - - - - -
- 0 ? 'block' : 'none'}}>
- 职业路径
- 0 ? 'block' : 'none'}}> --
-
- {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
- return(
-
- {item.name} - ) - }) - } -
+ {/* - 教学案例 */} +
-
+ 在线竞赛
+ {/**/}
+
+
- 教学案例 + {/*
- */} + {/*众包创新*/} + {/* */} +
- 交流问答 +
- 工程认证 +
- 首页 */} + + {/*
- 实训路径 */} +
- + 实践课程 + + + {/*
- 课堂 */} +
- + {/*课堂*/} + 翻转课堂 + + +
-
+ 实训项目
+ {/**/}
+ {/**/}
+
+
+
- 0 ? 'block' : 'none'}}>
+ 职业路径
+ 0 ? 'block' : 'none'}}> ++
-
+ {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
+ return(
+
- {item.name} + ) + }) + } +
+
+ {/* - 教学案例 */} +
-
+ 在线竞赛
+ {/**/}
+
+
- 教学案例 + {/*
- */} + {/*众包创新*/} + {/* */} +
- 交流问答 +
- 工程认证 +
+
+ :this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.navbar===null||this.props.mygetHelmetapi.navbar===undefined||this.props.mygetHelmetapi.navbar.length===0?
+ -
+ {/*
+
+
+ :
+ -
+ {/*
+
+
+ }
- -
+ {/*
-
-
+ // :mygetHelmetapi2===undefined||mygetHelmetapi2.navbar===null||mygetHelmetapi2.navbar===undefined||mygetHelmetapi2.navbar.length===0?
+ // -
- {/*
- 首页 */} - - {/*
- 实训路径 */} -
- - 实践课程 - - - {/*
- 课堂 */} -
- - {/*课堂*/} - 翻转课堂 - - -
-
- 实训项目
- {/**/}
- {/**/}
-
-
-
- 0 ? 'block' : 'none'}}>
- 职业路径
- 0 ? 'block' : 'none'}}> --
-
- {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
- return(
-
- {item.name} - ) - }) - } -
-
- {/* - 教学案例 */} -
-
- 在线竞赛
- {/**/}
-
-
- 教学案例 - {/*
- */} - {/*众包创新*/} - {/* */} -
- 交流问答 -
- 工程认证 -
+ //
+ //
:
-
+ // {/*
- 首页 */} + // + // {/*
- 实训路径 */} + //
- + // 实践课程 + // + // + // {/*
- 课堂 */} + //
- + // {/*课堂*/} + // 翻转课堂 + // + // + //
-
+ // 实训项目
+ // {/**/}
+ // {/**/}
+ //
+ //
+ //
- 0 ? 'block' : 'none'}}>
+ // 职业路径
+ // 0 ? 'block' : 'none'}}> + //+ //
-
+ // {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
+ // return(
+ //
- {item.name} + // ) + // }) + // } + //
+ //
+ // {/* - 教学案例 */} + //
-
+ // 在线竞赛
+ // {/**/}
+ //
+ //
- 教学案例 + // {/*
- */} + // {/*众包创新*/} + // {/* */} + //
- 交流问答 + //
- 工程认证 + //
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 31bbba3ec..dc76b67d1 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -148,8 +148,8 @@ export function TPMIndexHOC(WrappedComponent) {
}
componentDidMount() {
- console.log("TPMIndexHOC========");
- console.log(this.props);
+ // console.log("TPMIndexHOC========");
+ // console.log(this.props);
window.addEventListener('keyup', this.keyupListener)
if(this.props.match.path==="/"){
From c6222714946b0cb214ca2910cdd096c64ef5350a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 15 Oct 2019 09:10:25 +0800
Subject: [PATCH 10/43] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/tpm/NewHeader.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 844610e54..f77a831fb 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -876,9 +876,9 @@ submittojoinclass=(value)=>{
this.headtypesonClick("/",false)} className={"fl mr30 ml25 mt10"}>
{
mygetHelmetapi2===undefined||mygetHelmetapi2.nav_logo_url===null||mygetHelmetapi2.nav_logo_url===undefined?
-
+
:
- })
+
}
From 5169a3682cb73817dd4cde1218d93ce326ef7b36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 15 Oct 2019 09:13:15 +0800
Subject: [PATCH 11/43] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/AppConfig.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index af00842f2..7867791cf 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -94,10 +94,10 @@ export function initAxiosInterceptors(props) {
}
}
- if (requestMap[config.url] === true) { // 避免重复的请求 导致页面f5刷新 也会被阻止
- console.log("被阻止了是重复请求=================================");
- return false;
- }
+ // if (requestMap[config.url] === true) { // 避免重复的请求 导致页面f5刷新 也会被阻止
+ // console.log("被阻止了是重复请求=================================");
+ // return false;
+ // }
// 非file_update请求
if (config.url.indexOf('update_file') === -1) {
requestMap[config.url] = true;
From 5537c1e622bff6b5f299bb9743a790fdc822cfd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 15 Oct 2019 09:15:39 +0800
Subject: [PATCH 12/43] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/App.js | 2 +-
public/react/src/modules/tpm/NewHeader.js | 6 +++---
public/react/src/modules/tpm/TPMIndexHOC.js | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/public/react/src/App.js b/public/react/src/App.js
index d3a753617..c771021bf 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -378,7 +378,7 @@ class App extends Component {
oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon';
link.rel = 'shortcut icon';
- link.href = response.data.setting.tab_logo_url;
+ link.href = '/'+response.data.setting.tab_logo_url;
if (oldLink) {
document.head.removeChild(oldLink);
}
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index f77a831fb..cb0e571cd 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -657,8 +657,8 @@ submittojoinclass=(value)=>{
console.log("开始刷新数据了")
let url = "/setting.json";
axios.get(url).then((response) => {
- console.log("axios.get");
- console.log(response);
+ // console.log("axios.get");
+ // console.log(response);
if(response){
if(response.data){
@@ -670,7 +670,7 @@ submittojoinclass=(value)=>{
oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon';
link.rel = 'shortcut icon';
- link.href = response.data.setting.tab_logo_url;
+ link.href = '/'+response.data.setting.tab_logo_url;
if (oldLink) {
document.head.removeChild(oldLink);
}
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index dc76b67d1..18caee33c 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -294,7 +294,7 @@ export function TPMIndexHOC(WrappedComponent) {
oldLink = document.getElementById('dynamic-favicon');
link.id = 'dynamic-favicon';
link.rel = 'shortcut icon';
- link.href = response.data.setting.tab_logo_url;
+ link.href = '/'+response.data.setting.tab_logo_url;
if (oldLink) {
document.head.removeChild(oldLink);
}
From 5a9b1645217f051a23a9432d537336d4db4bc75f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 15 Oct 2019 10:00:42 +0800
Subject: [PATCH 13/43] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/tpm/NewHeader.js | 20 ++++++++++----------
public/react/src/modules/tpm/TPMIndexHOC.js | 2 ++
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index cb0e571cd..a7391509a 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -76,8 +76,8 @@ class NewHeader extends Component {
// console.log(this.props);
}
componentDidUpdate = (prevProps) => {
- console.log("componentDidMount2");
- console.log(this.state.mygetHelmetapi2);
+ // console.log("componentDidMount2");
+ // console.log(this.state.mygetHelmetapi2);
if(this.state.mygetHelmetapi2===undefined){
this.getAppdata();
}
@@ -771,14 +771,14 @@ submittojoinclass=(value)=>{
let headtypes='/';
- console.log("mygetHelmetapi2");
- console.log(mygetHelmetapi2);
+ // console.log("mygetHelmetapi2");
+ // console.log(mygetHelmetapi2);
if(mygetHelmetapi2){
if(mygetHelmetapi2.navbar){
if(mygetHelmetapi2.navbar.length>0){
- console.log("mygetHelmetapi2.navbar.length>0====-=-=--=-=-=-=");
-
- console.log(match.path);
+ // console.log("mygetHelmetapi2.navbar.length>0====-=-=--=-=-=-=");
+ //
+ // console.log(match.path);
if(match.path==='/'){
if(headtypesonClickbool===false){
headtypes=undefined;
@@ -855,9 +855,9 @@ submittojoinclass=(value)=>{
// console.log("NewHeadergetHelmetapi432423423423");
// console.log(mygetHelmetapi2);
- console.log("NewHeadermygetHelmetapi123123123123");
- console.log(mygetHelmetapi2);
- console.log(this.props);
+ // console.log("NewHeadermygetHelmetapi123123123123");
+ // console.log(mygetHelmetapi2);
+ // console.log(this.props);
return (
+
:
-
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 18caee33c..3cfba64f6 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -201,6 +201,8 @@ export function TPMIndexHOC(WrappedComponent) {
axios.get(url, {
}).then((response) => {
+ console.log("开始请求/get_navigation_info.json");
+ console.log(response);
if(response!=undefined){
if(response.status===200){
this.setState({
From f35bc5f18d06478b2d66247816067d1e9347bcff Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 15 Oct 2019 10:20:30 +0800
Subject: [PATCH 14/43] =?UTF-8?q?=E7=AB=9E=E8=B5=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/models/competition_mode_setting.rb | 3 +++
.../20191015013924_add_new_column_to_competitions.rb | 6 ++++++
...20191015015723_create_competition_mode_settings.rb | 11 +++++++++++
spec/models/competition_mode_setting_spec.rb | 5 +++++
4 files changed, 25 insertions(+)
create mode 100644 app/models/competition_mode_setting.rb
create mode 100644 db/migrate/20191015013924_add_new_column_to_competitions.rb
create mode 100644 db/migrate/20191015015723_create_competition_mode_settings.rb
create mode 100644 spec/models/competition_mode_setting_spec.rb
diff --git a/app/models/competition_mode_setting.rb b/app/models/competition_mode_setting.rb
new file mode 100644
index 000000000..b6bafa7c3
--- /dev/null
+++ b/app/models/competition_mode_setting.rb
@@ -0,0 +1,3 @@
+class CompetitionModeSetting < ApplicationRecord
+ belongs_to :course
+end
diff --git a/db/migrate/20191015013924_add_new_column_to_competitions.rb b/db/migrate/20191015013924_add_new_column_to_competitions.rb
new file mode 100644
index 000000000..616a46059
--- /dev/null
+++ b/db/migrate/20191015013924_add_new_column_to_competitions.rb
@@ -0,0 +1,6 @@
+class AddNewColumnToCompetitions < ActiveRecord::Migration[5.2]
+ def change
+ add_column :competitions, :bonus, :integer, default: 0
+ add_column :competitions, :mode, :integer, default: 0
+ end
+end
diff --git a/db/migrate/20191015015723_create_competition_mode_settings.rb b/db/migrate/20191015015723_create_competition_mode_settings.rb
new file mode 100644
index 000000000..5d170eeab
--- /dev/null
+++ b/db/migrate/20191015015723_create_competition_mode_settings.rb
@@ -0,0 +1,11 @@
+class CreateCompetitionModeSettings < ActiveRecord::Migration[5.2]
+ def change
+ create_table :competition_mode_settings do |t|
+ t.references :course
+ t.datetime :start_time
+ t.datetime :end_time
+
+ t.timestamps
+ end
+ end
+end
diff --git a/spec/models/competition_mode_setting_spec.rb b/spec/models/competition_mode_setting_spec.rb
new file mode 100644
index 000000000..535767880
--- /dev/null
+++ b/spec/models/competition_mode_setting_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CompetitionModeSetting, type: :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
From 1ac84425e294b1b78280f9f6e6356940278cda89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 15 Oct 2019 10:36:37 +0800
Subject: [PATCH 15/43] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/AppConfig.js | 3 +
.../react/src/modules/forums/MemoTechShare.js | 232 +++++++++---------
.../react/src/modules/login/EducoderLogin.js | 7 +-
public/react/src/modules/tpm/TPMIndexHOC.js | 15 +-
4 files changed, 133 insertions(+), 124 deletions(-)
diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 7867791cf..0510cd293 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -95,6 +95,9 @@ export function initAxiosInterceptors(props) {
}
// if (requestMap[config.url] === true) { // 避免重复的请求 导致页面f5刷新 也会被阻止
+ // console.log(config);
+ // console.log(JSON.parse(config));
+ // console.log(config.url);
// console.log("被阻止了是重复请求=================================");
// return false;
// }
diff --git a/public/react/src/modules/forums/MemoTechShare.js b/public/react/src/modules/forums/MemoTechShare.js
index de6ba074c..d32bd2e2f 100644
--- a/public/react/src/modules/forums/MemoTechShare.js
+++ b/public/react/src/modules/forums/MemoTechShare.js
@@ -1,116 +1,116 @@
-import React, { Component } from 'react';
-import { Redirect } from 'react-router';
-
-import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
-
-import PropTypes from 'prop-types';
-
-import classNames from 'classnames'
-
-import Pagination from 'rc-pagination';
-
-import { postPaginationHOC } from './PostPaginationHOC'
-
-import PostItem from './PostItem'
-
-import ForumsNavTab from './ForumsNavTab'
-
-// import queryString from 'query-string'
-import { queryString } from 'educoder'
-
-import MemoList from './MemoList'
-
-
-class MemoTechShare extends Component {
- constructor(props) {
- super(props)
-
- this.handleLocationChange = this.handleLocationChange.bind(this);
-
- this.state = {
-
- }
- }
-
- onPaginationChange(pageNum, pageSize) {
- this.props.onPaginationChange(pageNum, pageSize)
- }
-
- componentDidMount() {
- // this.handleLocationChange(this.props.history.location);
- // this.unlisten = this.props.history.listen(this.handleLocationChange);
- }
-
- componentWillUnmount() {
- // this.unlisten();
- }
- componentDidUpdate(prevProps) {
- if(this.props.match.params.memoType !== prevProps.match.params.memoType) {
- // do something
- console.log(`memoType changed`)
- this.props.fetchMemos();
- }
- }
-
- componentWillReceiveProps(newProps, newContext) {
- if (newProps.match.url === this.props.match.url) {
- const oldParsed = queryString.parse(this.props.location.search);
- const newParsed = queryString.parse(newProps.location.search);
- if (!newParsed.page && oldParsed.page ||
- (oldParsed.order && newParsed.order && oldParsed.order != newParsed.order)) {
- this.props.fetchMemos();
- }
- console.log('componentWillReceiveProps...')
- }
- }
-
- handleLocationChange(location) {
- console.log(`- - - location: '${location.pathname}'`);
- if (location.pathname) {
- if (location.pathname.indexOf('/forums/categories/all') != -1
- && this.props.location.search && this.props.location.search.indexOf('order=') != -1
- && location.search.indexOf('order=') != -1) {
- const oldParsed = queryString.parse(this.props.location.search);
- const newParsed = queryString.parse(location.search);
- if (oldParsed.order != newParsed.order) { // 只有在热门和最新间跳转时，才需要处理
- this.props.fetchMemos();
- }
- }
- }
- }
-
- renderMemoList() {
-
-
- // const { memo_list, user } = this.props;
- // if (!memo_list) {
- // return ''
- // }
- // return memo_list.map( (item, index) => {
-
- // return (
- // this.setTop(memo)}
- // setDown={(memo)=>this.setDown(memo)} memo={item}
- // >
- // )
- // })
- return this.props.renderMemoList();
- }
-
- render() {
- const { match, history, currentPage, memo_count ,memo_list } = this.props
-
- return (
-
- this.renderMemoList()}
- onPaginationChange={ (pageNum, pageSize) => this.props.onPaginationChange(pageNum, pageSize) }
- >
-
-
- );
- }
-}
-
-export default postPaginationHOC() ( MemoTechShare );
+import React, { Component } from 'react';
+import { Redirect } from 'react-router';
+
+import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+
+import PropTypes from 'prop-types';
+
+import classNames from 'classnames'
+
+import Pagination from 'rc-pagination';
+
+import { postPaginationHOC } from './PostPaginationHOC'
+
+import PostItem from './PostItem'
+
+import ForumsNavTab from './ForumsNavTab'
+
+// import queryString from 'query-string'
+import { queryString } from 'educoder'
+
+import MemoList from './MemoList'
+
+
+class MemoTechShare extends Component {
+ constructor(props) {
+ super(props)
+
+ this.handleLocationChange = this.handleLocationChange.bind(this);
+
+ this.state = {
+
+ }
+ }
+
+ onPaginationChange(pageNum, pageSize) {
+ this.props.onPaginationChange(pageNum, pageSize)
+ }
+
+ componentDidMount() {
+ // this.handleLocationChange(this.props.history.location);
+ // this.unlisten = this.props.history.listen(this.handleLocationChange);
+ }
+
+ componentWillUnmount() {
+ // this.unlisten();
+ }
+ componentDidUpdate(prevProps) {
+ if(this.props.match.params.memoType !== prevProps.match.params.memoType) {
+ // do something
+ console.log(`memoType changed`)
+ this.props.fetchMemos();
+ }
+ }
+
+ componentWillReceiveProps(newProps, newContext) {
+ if (newProps.match.url === this.props.match.url) {
+ const oldParsed = queryString.parse(this.props.location.search);
+ const newParsed = queryString.parse(newProps.location.search);
+ if (!newParsed.page && oldParsed.page ||
+ (oldParsed.order && newParsed.order && oldParsed.order != newParsed.order)) {
+ this.props.fetchMemos();
+ }
+ // console.log('componentWillReceiveProps...')
+ }
+ }
+
+ handleLocationChange(location) {
+ console.log(`- - - location: '${location.pathname}'`);
+ if (location.pathname) {
+ if (location.pathname.indexOf('/forums/categories/all') != -1
+ && this.props.location.search && this.props.location.search.indexOf('order=') != -1
+ && location.search.indexOf('order=') != -1) {
+ const oldParsed = queryString.parse(this.props.location.search);
+ const newParsed = queryString.parse(location.search);
+ if (oldParsed.order != newParsed.order) { // 只有在热门和最新间跳转时，才需要处理
+ this.props.fetchMemos();
+ }
+ }
+ }
+ }
+
+ renderMemoList() {
+
+
+ // const { memo_list, user } = this.props;
+ // if (!memo_list) {
+ // return ''
+ // }
+ // return memo_list.map( (item, index) => {
+
+ // return (
+ // this.setTop(memo)}
+ // setDown={(memo)=>this.setDown(memo)} memo={item}
+ // >
+ // )
+ // })
+ return this.props.renderMemoList();
+ }
+
+ render() {
+ const { match, history, currentPage, memo_count ,memo_list } = this.props
+
+ return (
+
+ this.renderMemoList()}
+ onPaginationChange={ (pageNum, pageSize) => this.props.onPaginationChange(pageNum, pageSize) }
+ >
+
+
+ );
+ }
+}
+
+export default postPaginationHOC() ( MemoTechShare );
diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index 393c1cf3c..c7a5a0cbf 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -28,6 +28,7 @@ import educodernet from '../../../src/images/login/educodernet.png';
import LoginRegisterComponent from '../user/LoginRegisterComponent';
import FindPasswordComponent from '../user/FindPasswordComponent';
import passopen from "../../images/login/passopen.png";
+import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
//educoder登入页面
var sectionStyle = {
"height": "100%",
@@ -109,7 +110,8 @@ class EducoderLogin extends Component {
}
componentDidMount() {
-
+ console.log("EducoderLogin");
+ console.log(this.props);
}
Setlogins=(i)=>{
@@ -206,8 +208,7 @@ class EducoderLogin extends Component {
}
}
-
-export default EducoderLogin;
+export default SnackbarHOC() (TPMIndexHOC ( EducoderLogin ));
// showbool === 2 ?
//
{
let url = "/setting.json";
- axios.get(url).then((response) => {
- if(response){
- if(response.data){
+ axios.get(url,{
+
+ }).then((response) => {
+ console.log("开始请求/setting.json");
+ console.log("获取当前定制信息");
+ console.log(response);
+ if(response!=undefined){
+ if(response.status===200){
this.setState({
mygetHelmetapi:response.data.setting
});
@@ -301,7 +306,7 @@ export function TPMIndexHOC(WrappedComponent) {
document.head.removeChild(oldLink);
}
document.head.appendChild(link);
- }else {
+ }else{
document.title = "EduCoder";
var link = document.createElement('link'),
oldLink = document.getElementById('dynamic-favicon');
@@ -313,7 +318,6 @@ export function TPMIndexHOC(WrappedComponent) {
}
document.head.appendChild(link);
}
-
}else{
document.title = "EduCoder";
var link = document.createElement('link'),
@@ -328,6 +332,7 @@ export function TPMIndexHOC(WrappedComponent) {
}
}).catch((error) => {
+ console.log(error);
document.title = "EduCoder";
var link = document.createElement('link'),
oldLink = document.getElementById('dynamic-favicon');
From 5642586feb6048d0c5a8bbc6af14bb203c1364ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 15 Oct 2019 11:13:01 +0800
Subject: [PATCH 16/43] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/App.js | 6 +-
public/react/src/AppConfig.js | 14 +-
.../react/src/modules/login/EducoderLogin.js | 6 +-
public/react/src/modules/tpm/NewHeader.js | 138 +++++++++---------
public/react/src/modules/tpm/TPMIndexHOC.js | 6 +-
5 files changed, 87 insertions(+), 83 deletions(-)
diff --git a/public/react/src/App.js b/public/react/src/App.js
index c771021bf..6aa615c3b 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -337,7 +337,7 @@ class App extends Component {
});
initAxiosInterceptors(this.props);
- this.getAppdata();
+ // this.getAppdata();
//
// axios.interceptors.response.use((response) => {
// // console.log("response"+response);
@@ -368,6 +368,8 @@ class App extends Component {
getAppdata=()=>{
let url = "/setting.json";
axios.get(url).then((response) => {
+ console.log("app.js开始请求/setting.json");
+ console.log("获取当前定制信息");
if(response){
if(response.data){
this.setState({
@@ -710,4 +712,4 @@ moment.defineLocale('zh-cn', {
doy: 4 // The week that contains Jan 4th is the first week of the year.
}
});
-export default SnackbarHOC()(App);
\ No newline at end of file
+export default SnackbarHOC()(App) ;
\ No newline at end of file
diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 0510cd293..aa986d867 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -94,13 +94,13 @@ export function initAxiosInterceptors(props) {
}
}
- // if (requestMap[config.url] === true) { // 避免重复的请求 导致页面f5刷新 也会被阻止
- // console.log(config);
- // console.log(JSON.parse(config));
- // console.log(config.url);
- // console.log("被阻止了是重复请求=================================");
- // return false;
- // }
+ if (requestMap[config.url] === true) { // 避免重复的请求 导致页面f5刷新 也会被阻止
+ console.log(config);
+ console.log(JSON.parse(config));
+ console.log(config.url);
+ console.log("被阻止了是重复请求=================================");
+ return false;
+ }
// 非file_update请求
if (config.url.indexOf('update_file') === -1) {
requestMap[config.url] = true;
diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index c7a5a0cbf..4e35eb7e3 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -20,6 +20,7 @@ import {
} from "antd";
import {Link, Switch, Route, Redirect} from 'react-router-dom';
import { SnackbarHOC,getImageUrl } from 'educoder';
+import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
import '../courses/css/members.css';
import "../courses/common/formCommon.css"
import '../courses/css/Courses.css';
@@ -28,7 +29,6 @@ import educodernet from '../../../src/images/login/educodernet.png';
import LoginRegisterComponent from '../user/LoginRegisterComponent';
import FindPasswordComponent from '../user/FindPasswordComponent';
import passopen from "../../images/login/passopen.png";
-import {TPMIndexHOC} from "../tpm/TPMIndexHOC";
//educoder登入页面
var sectionStyle = {
"height": "100%",
@@ -208,7 +208,9 @@ class EducoderLogin extends Component {
}
}
-export default SnackbarHOC() (TPMIndexHOC ( EducoderLogin ));
+// export default EducoderLogin ;
+export default TPMIndexHOC ( EducoderLogin );
+// SnackbarHOC() (TPMIndexHOC ( EducoderLogin ));
// showbool === 2 ?
//
{
// console.log("componentDidMount2");
- // console.log(this.state.mygetHelmetapi2);
- if(this.state.mygetHelmetapi2===undefined){
- this.getAppdata();
- }
+ // console.log(this.props.mygetHelmetapi);
+ // if(this.props.mygetHelmetapi===undefined){
+ // this.getAppdata();
+ // }
}
componentDidMount() {
console.log("componentDidMount1");
- this.getAppdata();
+ // this.getAppdata();
window._header_componentHandler = this;
//下拉框的显示隐藏
@@ -653,70 +653,70 @@ submittojoinclass=(value)=>{
headtypesonClickbool:bool,
})
}
- getAppdata=()=>{
- console.log("开始刷新数据了")
- let url = "/setting.json";
- axios.get(url).then((response) => {
- // console.log("axios.get");
- // console.log(response);
-
- if(response){
- if(response.data){
- this.setState({
- mygetHelmetapi2:response.data.setting
- });
- 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);
- }else {
- document.title = "EduCoder";
- 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);
- }
-
- }else{
- document.title = "EduCoder";
- 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);
- }
-
- }).catch((error) => {
- console.log("开始刷新数据了但报错了");
- console.log(error);
-
- document.title = "EduCoder";
- 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);
- });
- };
+ // getAppdata=()=>{
+ // console.log("开始刷新数据了")
+ // let url = "/setting.json";
+ // axios.get(url).then((response) => {
+ // // console.log("axios.get");
+ // // console.log(response);
+ //
+ // if(response){
+ // if(response.data){
+ // this.setState({
+ // mygetHelmetapi2:response.data.setting
+ // });
+ // 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);
+ // }else {
+ // document.title = "EduCoder";
+ // 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);
+ // }
+ //
+ // }else{
+ // document.title = "EduCoder";
+ // 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);
+ // }
+ //
+ // }).catch((error) => {
+ // console.log("开始刷新数据了但报错了");
+ // console.log(error);
+ //
+ // document.title = "EduCoder";
+ // 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);
+ // });
+ // };
render() {
const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
const {match,} = this.props;
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index ba94bbcc3..598ef4892 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -148,8 +148,8 @@ export function TPMIndexHOC(WrappedComponent) {
}
componentDidMount() {
- // console.log("TPMIndexHOC========");
- // console.log(this.props);
+ console.log("TPMIndexHOC========");
+ console.log(this.props);
window.addEventListener('keyup', this.keyupListener)
if(this.props.match.path==="/"){
@@ -212,7 +212,7 @@ export function TPMIndexHOC(WrappedComponent) {
}
}
});
- this.getAppdata();
+ this.getAppdata();
}
/**
课堂权限相关方法，暂时写这里了 ----------------------------------------START
From 0667d239b395b7f11071f0294f49f63a6b177f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 15 Oct 2019 11:16:14 +0800
Subject: [PATCH 17/43] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/AppConfig.js | 16 +--
.../react/src/modules/login/EducoderLogin.js | 4 +-
public/react/src/modules/tpm/NewHeader.js | 100 +++---------------
3 files changed, 26 insertions(+), 94 deletions(-)
diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index aa986d867..cddea79a6 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -93,14 +93,14 @@ export function initAxiosInterceptors(props) {
config.url = url;
}
}
-
- if (requestMap[config.url] === true) { // 避免重复的请求 导致页面f5刷新 也会被阻止
- console.log(config);
- console.log(JSON.parse(config));
- console.log(config.url);
- console.log("被阻止了是重复请求=================================");
- return false;
- }
+ //
+ // if (requestMap[config.url] === true) { // 避免重复的请求 导致页面f5刷新 也会被阻止 显示这个方法会影响到定制信息
+ // console.log(config);
+ // console.log(JSON.parse(config));
+ // console.log(config.url);
+ // console.log("被阻止了是重复请求=================================");
+ // return false;
+ // }
// 非file_update请求
if (config.url.indexOf('update_file') === -1) {
requestMap[config.url] = true;
diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index 4e35eb7e3..617dc2d8a 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -208,9 +208,7 @@ class EducoderLogin extends Component {
}
}
-// export default EducoderLogin ;
-export default TPMIndexHOC ( EducoderLogin );
-// SnackbarHOC() (TPMIndexHOC ( EducoderLogin ));
+export default EducoderLogin ;
// showbool === 2 ?
//
{
headtypesonClickbool:bool,
})
}
- // getAppdata=()=>{
- // console.log("开始刷新数据了")
- // let url = "/setting.json";
- // axios.get(url).then((response) => {
- // // console.log("axios.get");
- // // console.log(response);
- //
- // if(response){
- // if(response.data){
- // this.setState({
- // mygetHelmetapi2:response.data.setting
- // });
- // 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);
- // }else {
- // document.title = "EduCoder";
- // 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);
- // }
- //
- // }else{
- // document.title = "EduCoder";
- // 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);
- // }
- //
- // }).catch((error) => {
- // console.log("开始刷新数据了但报错了");
- // console.log(error);
- //
- // document.title = "EduCoder";
- // 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);
- // });
- // };
render() {
const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
const {match,} = this.props;
@@ -739,7 +674,6 @@ submittojoinclass=(value)=>{
showSearchOpentype,
headtypesonClickbool,
headtypess,
- mygetHelmetapi2,
}=this.state;
/*
用户名称 用户头像url
@@ -771,12 +705,12 @@ submittojoinclass=(value)=>{
let headtypes='/';
- // console.log("mygetHelmetapi2");
- // console.log(mygetHelmetapi2);
- if(mygetHelmetapi2){
- if(mygetHelmetapi2.navbar){
- if(mygetHelmetapi2.navbar.length>0){
- // console.log("mygetHelmetapi2.navbar.length>0====-=-=--=-=-=-=");
+ // console.log("this.props.mygetHelmetapi");
+ // console.log(this.props.mygetHelmetapi);
+ if(this.props.mygetHelmetapi){
+ if(this.props.mygetHelmetapi.navbar){
+ if(this.props.mygetHelmetapi.navbar.length>0){
+ // console.log("this.props.mygetHelmetapi.navbar.length>0====-=-=--=-=-=-=");
//
// console.log(match.path);
if(match.path==='/'){
@@ -787,9 +721,9 @@ submittojoinclass=(value)=>{
}
}else {
- for(var i=0;i{
}
// console.log("NewHeadergetHelmetapi432423423423");
- // console.log(mygetHelmetapi2);
+ // console.log(this.props.mygetHelmetapi);
// console.log("NewHeadermygetHelmetapi123123123123");
- // console.log(mygetHelmetapi2);
+ // console.log(this.props.mygetHelmetapi);
// console.log(this.props);
return (
@@ -875,10 +809,10 @@ submittojoinclass=(value)=>{
/>:""}
this.headtypesonClick("/",false)} className={"fl mr30 ml25 mt10"}>
{
- mygetHelmetapi2===undefined||mygetHelmetapi2.nav_logo_url===null||mygetHelmetapi2.nav_logo_url===undefined?
+ this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.nav_logo_url===null||this.props.mygetHelmetapi.nav_logo_url===undefined?
:
-
+ })
}
@@ -894,13 +828,13 @@ submittojoinclass=(value)=>{
}
{
- mygetHelmetapi2!==undefined&&mygetHelmetapi2.navbar!==null&&mygetHelmetapi2.navbar!==undefined&&mygetHelmetapi2.navbar.length>0?
+ this.props.mygetHelmetapi!==undefined&&this.props.mygetHelmetapi.navbar!==null&&this.props.mygetHelmetapi.navbar!==undefined&&this.props.mygetHelmetapi.navbar.length>0?
- // :mygetHelmetapi2===undefined||mygetHelmetapi2.navbar===null||mygetHelmetapi2.navbar===undefined||mygetHelmetapi2.navbar.length===0?
+ // :this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.navbar===null||this.props.mygetHelmetapi.navbar===undefined||this.props.mygetHelmetapi.navbar.length===0?
//
:
-
//
//
-
From 775b33ad4b5739d3bed06685b8957182504cf7bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 15 Oct 2019 11:24:05 +0800
Subject: [PATCH 18/43] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/App.js | 2 +-
.../react/src/modules/login/EducoderLogin.js | 8 +-
public/react/src/modules/tpm/NewHeader.js | 106 ++++++++++++++----
3 files changed, 91 insertions(+), 25 deletions(-)
diff --git a/public/react/src/App.js b/public/react/src/App.js
index 6aa615c3b..c1cba8a2d 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -337,7 +337,7 @@ class App extends Component {
});
initAxiosInterceptors(this.props);
- // this.getAppdata();
+ this.getAppdata();
//
// axios.interceptors.response.use((response) => {
// // console.log("response"+response);
diff --git a/public/react/src/modules/login/EducoderLogin.js b/public/react/src/modules/login/EducoderLogin.js
index 617dc2d8a..680c4bbc7 100644
--- a/public/react/src/modules/login/EducoderLogin.js
+++ b/public/react/src/modules/login/EducoderLogin.js
@@ -110,8 +110,8 @@ class EducoderLogin extends Component {
}
componentDidMount() {
- console.log("EducoderLogin");
- console.log(this.props);
+ // console.log("EducoderLogin");
+ // console.log(this.props);
}
Setlogins=(i)=>{
@@ -140,8 +140,8 @@ class EducoderLogin extends Component {
render() {
let {showbool,loginstatus,logini} = this.state;
- // console.log("EducoderLogingetHelmetapi");
- // console.log(this.props);
+ console.log("EducoderLogingetHelmetapi");
+ console.log(this.props);
// console.log(this.props.mygetHelmetapi);
return (
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 26e7ede7a..a7391509a 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -68,6 +68,7 @@ class NewHeader extends Component {
mydisplay:false,
headtypesonClickbool:false,
headtypess:"/",
+ mygetHelmetapi2:undefined,
}
console.log("176")
// console.log(props);
@@ -76,10 +77,10 @@ class NewHeader extends Component {
}
componentDidUpdate = (prevProps) => {
// console.log("componentDidMount2");
- // console.log(this.props.mygetHelmetapi);
- // if(this.props.mygetHelmetapi===undefined){
- // this.getAppdata();
- // }
+ // console.log(this.state.mygetHelmetapi2);
+ if(this.state.mygetHelmetapi2===undefined){
+ this.getAppdata();
+ }
}
componentDidMount() {
console.log("componentDidMount1");
@@ -652,6 +653,70 @@ submittojoinclass=(value)=>{
headtypesonClickbool:bool,
})
}
+ getAppdata=()=>{
+ console.log("开始刷新数据了")
+ let url = "/setting.json";
+ axios.get(url).then((response) => {
+ // console.log("axios.get");
+ // console.log(response);
+
+ if(response){
+ if(response.data){
+ this.setState({
+ mygetHelmetapi2:response.data.setting
+ });
+ 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);
+ }else {
+ document.title = "EduCoder";
+ 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);
+ }
+
+ }else{
+ document.title = "EduCoder";
+ 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);
+ }
+
+ }).catch((error) => {
+ console.log("开始刷新数据了但报错了");
+ console.log(error);
+
+ document.title = "EduCoder";
+ 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);
+ });
+ };
render() {
const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
const {match,} = this.props;
@@ -674,6 +739,7 @@ submittojoinclass=(value)=>{
showSearchOpentype,
headtypesonClickbool,
headtypess,
+ mygetHelmetapi2,
}=this.state;
/*
用户名称 用户头像url
@@ -705,12 +771,12 @@ submittojoinclass=(value)=>{
let headtypes='/';
- // console.log("this.props.mygetHelmetapi");
- // console.log(this.props.mygetHelmetapi);
- if(this.props.mygetHelmetapi){
- if(this.props.mygetHelmetapi.navbar){
- if(this.props.mygetHelmetapi.navbar.length>0){
- // console.log("this.props.mygetHelmetapi.navbar.length>0====-=-=--=-=-=-=");
+ // console.log("mygetHelmetapi2");
+ // console.log(mygetHelmetapi2);
+ if(mygetHelmetapi2){
+ if(mygetHelmetapi2.navbar){
+ if(mygetHelmetapi2.navbar.length>0){
+ // console.log("mygetHelmetapi2.navbar.length>0====-=-=--=-=-=-=");
//
// console.log(match.path);
if(match.path==='/'){
@@ -721,9 +787,9 @@ submittojoinclass=(value)=>{
}
}else {
- for(var i=0;i{
}
// console.log("NewHeadergetHelmetapi432423423423");
- // console.log(this.props.mygetHelmetapi);
+ // console.log(mygetHelmetapi2);
// console.log("NewHeadermygetHelmetapi123123123123");
- // console.log(this.props.mygetHelmetapi);
+ // console.log(mygetHelmetapi2);
// console.log(this.props);
return (
@@ -809,10 +875,10 @@ submittojoinclass=(value)=>{
/>:""}
this.headtypesonClick("/",false)} className={"fl mr30 ml25 mt10"}>
{
- this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.nav_logo_url===null||this.props.mygetHelmetapi.nav_logo_url===undefined?
+ mygetHelmetapi2===undefined||mygetHelmetapi2.nav_logo_url===null||mygetHelmetapi2.nav_logo_url===undefined?
:
-
+
}
@@ -828,13 +894,13 @@ submittojoinclass=(value)=>{
}
{
- this.props.mygetHelmetapi!==undefined&&this.props.mygetHelmetapi.navbar!==null&&this.props.mygetHelmetapi.navbar!==undefined&&this.props.mygetHelmetapi.navbar.length>0?
+ mygetHelmetapi2!==undefined&&mygetHelmetapi2.navbar!==null&&mygetHelmetapi2.navbar!==undefined&&mygetHelmetapi2.navbar.length>0?
- // :this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.navbar===null||this.props.mygetHelmetapi.navbar===undefined||this.props.mygetHelmetapi.navbar.length===0?
+ // :mygetHelmetapi2===undefined||mygetHelmetapi2.navbar===null||mygetHelmetapi2.navbar===undefined||mygetHelmetapi2.navbar.length===0?
//
:
-