m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

Browse Source
dev_forum
hjm 5 years ago
parent fc3a63d4c4 551bebf5cf
commit d7782a577f
11 changed files with 742 additions and 663 deletions
Show Stats Download Patch File Download Diff File

7
public/react/src/App.js
Unescape View File

@ -209,7 +209,7 @@ const UsersInfo = Loadable({
// 兴趣页面
const Interestpage = Loadable({
loader: () => import('./modules/user/Interestpage'),
loader: () => import('./modules/login/EducoderInteresse'),
loading: Loading,
})
@ -274,7 +274,7 @@ class App extends Component {
<Switch>
{/*<Route path="/login" component={LoginRegisterPage}/>*/}
{/*认证*/}
<Route path="/profile" component={AccountPage}/>
<Route path="/account" component={AccountPage}/>
{/*403*/}
<Route path="/403" component={Shixunauthority}/>
@ -301,7 +301,10 @@ class App extends Component {
<Route
path="/changepassword" component={EducoderLogin}
/>
<Route
path="/interesse" component={Interestpage}
/>
<Route path="/shixuns/new" component={Newshixuns}>
</Route>

6
public/react/src/AppConfig.js
Unescape View File

@ -21,6 +21,7 @@ function locationurl(list){
const debugType =window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
window._debugType = debugType;
// const debugType ="";
export function initAxiosInterceptors(props) {
// TODO 避免重复的请求 https://github.com/axios/axios#cancellation
@ -145,7 +146,10 @@ export function initAxiosInterceptors(props) {
}
if (response.data.status === 402) {
locationurl(response.data.url);
debugger
console.log(response.data.status);
console.log(response.data);
locationurl(response.data.message);
}

86
public/react/src/modules/login/EducoderInteresse.js
Unescape View File

@ -0,0 +1,86 @@
import React, {Component} from "react";
import '../courses/css/members.css';
import "../courses/common/formCommon.css"
import '../courses/css/Courses.css';
import beijintulogontwo from '../../../src/images/login/beijintulogontwo.png';
import educodernet from '../../../src/images/login/educodernet.png';
import InterestpageComponent from '../user/Interestpage'
//educoder登入页面
var newContainer={
background: `url(${beijintulogontwo})`,
backgroundPosition: "center" ,
backgroundRepeat: "no-repeat",
backgroundAttachment: "fixed",
backgroundSize: "100% 100%",
height:" 100%",
width:" 100%",
position: "absolute",
top: "0px",
bottom: "0px",
minHeight: "100%",
overflow:"hidden",
paddingTop: "40px",
}
class EducoderInteresse extends Component {
constructor(props) {
super(props);
}
componentDidMount() {
}
render() {
return (
<div style={newContainer} className=" clearfix" >
<div >
<div style={{
"display": "flex",
"justify-content": "center",
"align-items": "center",
"width": "100%"
}}>
<div >
<img src={educodernet}/>
</div>
</div>
<div style={{
display: "flex",
justifyContent: "center",
width: "100%",
height: "630px",
marginTop: "44px",
}}>
<InterestpageComponent {...this.props} {...this.state}>
</InterestpageComponent>
</div>
<div style={{
display: "flex",
justifyContent: "center",
width: "100%",
bottom:"0",
position: "fixed"
}}>
<div className="font-14 color-grey-9 " style={{ bottom:"0",position: "absolute",marginBottom: "20px"}}><span className="font-18">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
</div>
</div>
</div>
)
}
}
export default EducoderInteresse;

114
public/react/src/modules/login/EducoderLogin.js
Unescape View File

@ -43,17 +43,27 @@ var imgback = {
backgroundImage: `url(${beijintulogontwo})`,
}
var imgmian ={
"width": "100%",
"background": `url(${beijintulogontwo})`,
"height": "100%",
"position": "relative",
width: "100%",
background: `url(${beijintulogontwo})`,
position: "relative",
}
var newContainer={
"min-height": "100%",
"background": `url(${beijintulogontwo})`,
"height": "auto !important",
"position": "relative",
background: `url(${beijintulogontwo})`,
backgroundPosition: "center" ,
backgroundRepeat: "no-repeat",
backgroundAttachment: "fixed",
backgroundSize: "100% 100%",
height:" 100%",
width:" 100%",
position: "absolute",
top: "0px",
bottom: "0px",
minHeight: "100%",
overflow:"hidden",
paddingTop: "40px",
}
class EducoderLogin extends Component {
constructor(props) {
@ -76,7 +86,8 @@ class EducoderLogin extends Component {
}
}else if(props.match.url === "/register"){
this.state = {
// showbool: 1,
this.state = {
showbool: 1,
loginstatus:false,
logini:2,
@ -114,13 +125,7 @@ class EducoderLogin extends Component {
this.setState({
showbool: 1
})
} else if(e===2) {
this.setState({
namezh:name,
passmm:pass,
showbool: 2,
})
}else if(e===3){
} else if(e===3){
this.setState({
showbool: 3
})
@ -131,24 +136,16 @@ class EducoderLogin extends Component {
render() {
let {showbool,loginstatus,logini} = this.state;
return (
<div style={newContainer} >
<style>
{
`
html, body, {
height: 100%;
}
`
}
</style>
<div style={imgmian}>
<div style={newContainer} className=" clearfix" >
<div >
<div style={{
"display": "flex",
"justify-content": "center",
"align-items": "center",
"width": "100%"
}}>
<div style={{"margin-top": "20px"}}>
<div >
<img src={educodernet}/>
</div>
@ -157,12 +154,13 @@ class EducoderLogin extends Component {
{
showbool === 1 ?
<div style={{
"display": "flex",
"justify-content": "center",
"align-items": "center",
"width": "100%",
display: "flex",
justifyContent: "center",
width: "100%",
height: "550px",
marginTop: "44px",
}}>
<div style={{"margin-top": "40px","height":"580px"}}>
<div>
<LoginRegisterComponent {...this.props} {...this.state}
Setshowbool={(e,name,pass)=>this.Setshowbool(e,name,pass)} ></LoginRegisterComponent>
@ -170,39 +168,31 @@ class EducoderLogin extends Component {
</div>
</div>
:showbool === 2 ?
<div style={{
"display": "flex",
"justify-content": "center",
"align-items": "center",
"width": "100%",
}}>
<InterestpageComponent {...this.props} {...this.state}>
</InterestpageComponent>
</div>
:
<div style={{
"display": "flex",
"justify-content": "center",
"align-items": "center",
"width": "100%",
display: "flex",
justifyContent: "center",
width: "100%",
height: "550px",
marginTop: "44px",
}}>
<div style={{"margin-top": "40px","height":"580px"}}>
<div >
<FindPasswordComponent {...this.props} {...this.state}
Setshowbool={(e)=>this.Setshowbool(e)}></FindPasswordComponent>
</div>
</div>
}
<div style={{"height":"125px",
"display": "flex",
"justify-content": "center",
"align-items": "center",
"width": "100%",
<div style={{
display: "flex",
justifyContent: "center",
width: "100%",
bottom:"0",
position: "fixed"
}}>
<div className="font-14 color-grey-9 " style={{marginTop:"15px"}}><span className="font-18">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
<div className="font-14 color-grey-9 " style={{ bottom:"0",position: "absolute",marginBottom: "20px"}}><span className="font-18">©</span>&nbsp;2019&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
</div>
<div style={{"height":"100px"}}></div>
</div>
</div>
)
@ -210,4 +200,16 @@ class EducoderLogin extends Component {
}
export default EducoderLogin;
export default EducoderLogin;
// showbool === 2 ?
// <div style={{
// display: "flex",
// justifyContent: "center",
// width: "100%",
// height: "630px",
// marginTop: "44px",
// }}>
// <InterestpageComponent {...this.props} {...this.state}>
// </InterestpageComponent>
// </div>
// :

2
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -754,7 +754,7 @@ submittojoinclass=(value)=>{
<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训</Link></li>
<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>我的实践课程</Link></li>
<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的项目</Link></li>
<li><a href={`/profile/basic`}>账号管理</a></li>
<li><a href={`/account/profile`}>账号管理</a></li>
{/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
{/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}
{/*<li><Link to={`/interest`}>兴趣页</Link></li>*/}

12
public/react/src/modules/user/AccountPage.js
Unescape View File

@ -55,7 +55,7 @@ class AccountPage extends Component {
axios.get(url).then((result)=>{
if(result.data){
if(result.data && result.data.base_info_completed == false){
this.props.history.push(`/profile/basic/edit`);
this.props.history.push(`/account/profile/edit`);
}
this.setState({
basicInfo: Object.assign({}, {...result.data}, { avatar_url: `${result.data.avatar_url}?t=${new Date().getTime()}`})
@ -79,30 +79,30 @@ class AccountPage extends Component {
<AccountNav {...this.props} {...common}></AccountNav>
<div className="basicFormWrap">
<Switch {...this.props}>
<Route exact path="/profile/basic"
<Route exact path="/account/profile"
render={
(props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
<Route exact path="/profile/basic/edit"
<Route exact path="/account/profile/edit"
render={
(props) => (<AccountBasicEdit {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
<Route exact path="/profile/certification"
<Route exact path="/account/certification"
render={
(props) => (<AccountCertification {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
<Route exact path="/profile/secure"
<Route exact path="/account/secure"
render={
(props) => (<AccountSecure {...this.props} {...props} {...this.state} {...common} />)
}
></Route>
<Route exact path="/profile"
<Route exact path="/account"
render={
(props) => (<AccountBasic {...this.props} {...props} {...this.state} {...common} />)
}

27
public/react/src/modules/user/LoginRegisterComponent.js
Unescape View File

@ -116,23 +116,6 @@ class LoginRegisterComponent extends Component {
console.log('Notification Clicked!');
},
});
// if(type === 1){
// notification['success']({
// message: "提示",
// description: messge,
// });
// }else if(type === 2){
// notification['warning']({
// message: "提示",
// description: messge,
// });
//
// }else{
// notification['error']({
// message: "提示",
// description: messge,
// });
// }
}
@ -344,8 +327,8 @@ class LoginRegisterComponent extends Component {
passwords: "",
Agreetotheterms: "",
})
// this.props.history.push(result.data.redirect_uri);
this.props.Setshowbool(2,this.state.logins,this.state.passwords);
this.props.history.push("/interesse");
// this.props.Setshowbool(2,this.state.logins,this.state.passwords);
} catch (e) {
}
@ -464,6 +447,8 @@ class LoginRegisterComponent extends Component {
this.SMSverification();
}
}
//滑动验证手机号
//获取登入
loginInputonChange = (e) => {
// console.log(e.target.value);
@ -593,8 +578,8 @@ class LoginRegisterComponent extends Component {
<div>
<Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}>
<Menu.Item key="0" className="font-18" style={{color:"#05101A"}}> 登录</Menu.Item>
<Menu.Item key="1" className="font-18" style={{color:"#05101A"}}>注册</Menu.Item>
<Menu.Item key="0" className={tab===0?"active font-18":"font-18"} > 登录</Menu.Item>
<Menu.Item key="1" className={tab===1?"active font-18":"font-18"} >注册</Menu.Item>
</Menu>
{

2
public/react/src/modules/user/account/AccountBasic.js
Unescape View File

@ -54,7 +54,7 @@ class AccountBasicEdit extends Component {
<div className="titleWrap">
<div className="title">基本信息</div>
<Button type="primary" style={{ marginRight: '16px'}}
ghost onClick={() => this.props.history.push('/profile/basic/edit')}>修改</Button>
ghost onClick={() => this.props.history.push('/account/profile/edit')}>修改</Button>
</div>
<Form onSubmit={this.handleSubmit}>

1140
public/react/src/modules/user/account/AccountBasicEdit.js
View File

File diff suppressed because it is too large Load Diff

8
public/react/src/modules/user/account/AccountNav.js
Unescape View File

@ -4,19 +4,19 @@ import { SnackbarHOC, getImageUrl } from 'educoder';
import AccountImg from './AccountImg'
class AccountNav extends Component {
toBasic = () => {
this.props.history.push(`/profile/basic`)
this.props.history.push(`/account/profile`)
}
toCertification = () => {
this.props.history.push(`/profile/certification`)
this.props.history.push(`/account/certification`)
}
toSecure = () => {
this.props.history.push(`/profile/secure`)
this.props.history.push(`/account/secure`)
}
render() {
let { basicInfo } = this.props
console.log(this.props);
const path = window.location.pathname
const isBasic = path.indexOf('basic') != -1 || path == "/profile"
const isBasic = path.indexOf('basic') != -1 || path == "/account"
const isCertification = path.indexOf('certification') != -1
const isSecure = path.indexOf('secure') != -1
return (

1
public/react/src/modules/user/common.css
Unescape View File

@ -101,7 +101,6 @@
}
.ysllogin_register_contents{
display: flex;
margin-top: 30px;
justify-content: center;
box-shadow:3px 10px 21px 0px rgba(76,76,76,0.15);
border-radius:6px;

Write Preview
Loading…
Cancel
Save