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

删除调整

Browse Source
dev_local_2
杨树林 5 years ago
parent c5c2dfb372
commit 8cc179a90f
6 changed files with 244 additions and 244 deletions
Show Stats Download Patch File Download Diff File

3
LocalReadMe.md
Unescape View File

@ -5,5 +5,4 @@
3. 链接mysql，执行导入数据库：source /Users/jingquanhuang/eduplus2/db/structure.sql
4. 导入基础数据： source /Users/jingquanhuang/eduplus2/db/init.sql
4. 初始化种子数据 bundle exec rake db:seed
5、启动服务用 bundle exec rails s

6
public/react/src/modules/forums/RightMyPublish.js
Unescape View File

@ -65,9 +65,9 @@ class RightMyPublish extends Component {
</p>*/}
</div>
<div className="clearfix edu-back-white advertisement" >
<a href="/competitions" target="_blank"><img src={match_adImg}></img></a>
</div>
{/*<div className="clearfix edu-back-white advertisement" >*/}
{/* <a href="/competitions" target="_blank"><img src={match_adImg}></img></a>*/}
{/*</div>*/}
</React.Fragment>
);
}

18
public/react/src/modules/tpm/NewFooter.js
Unescape View File

@ -27,15 +27,15 @@ class NewFooter extends Component {
</a>
<span className="fl color-grey-c cdefault font-28 ml22" style={{lineHeight:'74px'}}>EduCoder.net</span>
</div> */}
<ul className="clearfix inner-footernav">
<li><a href="/" className="fl" target="_blank">网站首页</a></li>
<li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.about_us} className="fl" target="_blank">关于我们</a></li>
<li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.connect_us} className="fl" target="_blank">联系我们</a></li>
<li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.cooperation_partner} className="fl" target="_blank">合作伙伴</a></li>
<li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.service_agreement} className="fl" target="_blank">服务协议</a></li>
<li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.help_center} className="fl" target="_blank">帮助中心</a></li>
<li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.feedback} className="fl" target="_blank">意见反馈</a></li>
</ul>
{/*<ul className="clearfix inner-footernav">*/}
{/* <li><a href="/" className="fl" target="_blank">网站首页</a></li>*/}
{/* <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.about_us} className="fl" target="_blank">关于我们</a></li>*/}
{/* <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.connect_us} className="fl" target="_blank">联系我们</a></li>*/}
{/* <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.cooperation_partner} className="fl" target="_blank">合作伙伴</a></li>*/}
{/* <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.service_agreement} className="fl" target="_blank">服务协议</a></li>*/}
{/* <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.help_center} className="fl" target="_blank">帮助中心</a></li>*/}
{/* <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.feedback} className="fl" target="_blank">意见反馈</a></li>*/}
{/*</ul>*/}
</div>
<div>
<p className="footer_con-p inline lineh-30 font-14">

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

@ -759,20 +759,21 @@ submittojoinclass=(value)=>{
</li>
{/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
<li className="">
<a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>
<img className="roundedRectangles"
src={require('./roundedRectangle.png')}
/>
</li>
<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li>
<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>
<Link to={'/crowdsourcing'}>众包创新</Link>
</li>
{/*<li className="">*/}
{/* <a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>*/}
{/* <img className="roundedRectangles"*/}
{/* src={require('./roundedRectangle.png')}*/}
{/* />*/}
{/*</li>*/}
{/*<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li>*/}
{/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/}
{/* <Link to={'/crowdsourcing'}>众包创新</Link>*/}
{/*</li>*/}
<li className={`${activeForums === true ? 'active' : ''}`}> <Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li>
<li
style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth===null? 'none' : 'block'}}
><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li>
{/*<li*/}
{/* style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth===null? 'none' : 'block'}}*/}
{/*><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}></a></li>*/}
{/*工程认证*/}
</ul>
@ -864,11 +865,11 @@ submittojoinclass=(value)=>{
{/* p 老师 l 学生 */}
<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><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>
<li style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.customer_management_url===null || this.props.Headertop.customer_management_url===""? 'none' : 'block'}}>
<a href={this.props.Headertop === undefined ? '' : this.props.Headertop.customer_management_url}>客户管理</a>
</li>
{/*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的开发项目</Link></li>*/}
{/*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>*/}
{/*<li style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.customer_management_url===null || this.props.Headertop.customer_management_url===""? 'none' : 'block'}}>*/}
{/* <a href={this.props.Headertop === undefined ? '' : this.props.Headertop.customer_management_url}>客户管理</a>*/}
{/*</li>*/}
<li><a href={`/account/profile`}>账号管理</a></li>
{/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
{/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}
@ -907,7 +908,7 @@ submittojoinclass=(value)=>{
{this.props.Headertop===undefined?"":
<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>
}
<li><a onClick={(url)=>this.getUser("/projects/new")} target="_blank">新建开发项目</a></li>
{/*<li><a onClick={(url)=>this.getUser("/projects/new")} target="_blank">新建开发项目</a></li>*/}
</ul>
<ul className="fl with50 edu-txt-center">
@ -924,9 +925,9 @@ submittojoinclass=(value)=>{
{/* /courses/join_course_multi_role */}
<li>
<a onClick={this.tojoinitem}>加入开发项目</a>
</li>
{/*<li>*/}
{/*<a onClick={this.tojoinitem}>加入开发项目</a>*/}
{/*</li>*/}
{tojoinitemtype===true?<Modal
keyboard={false}
title="加入项目"

44
public/react/src/modules/user/usersInfo/InfosBanner.js
Unescape View File

@ -99,29 +99,29 @@ class InfosBanner extends Component{
onClick={() => this.setState({moduleName: 'paths'})}
to={`/users/${username}/paths`}>实践课程</Link>
</li>
<li className={`${moduleName == 'projects' ? 'active' : '' }`}>
<Link
onClick={() => this.setState({moduleName: 'projects'})}
to={`/users/${username}/projects`}>项目</Link>
</li>
<li className={`${moduleName == 'package' ? 'active' : '' }`}>
<Link
onClick={() => this.setState({moduleName: 'package'})}
to={`/users/${username}/package`}>众包</Link>
</li>
{((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
&& <li className={`${moduleName == 'videos' ? 'active' : '' }`}>
<Link
onClick={() => this.setState({moduleName: 'videos'})}
to={`/users/${username}/videos`}>视频</Link>
</li>}
{/*<li className={`${moduleName == 'projects' ? 'active' : '' }`}>*/}
{/* <Link*/}
{/* onClick={() => this.setState({moduleName: 'projects'})}*/}
{/* to={`/users/${username}/projects`}>项目</Link>*/}
{/*</li>*/}
{/*<li className={`${moduleName == 'package' ? 'active' : '' }`}>*/}
{/* <Link*/}
{/* onClick={() => this.setState({moduleName: 'package'})}*/}
{/* to={`/users/${username}/package`}>众包</Link>*/}
{/*</li>*/}
{/*{((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin) */}
{/*&& <li className={`${moduleName == 'videos' ? 'active' : '' }`}>*/}
{/* <Link*/}
{/* onClick={() => this.setState({moduleName: 'videos'})}*/}
{/* to={`/users/${username}/videos`}>视频</Link>*/}
{/*</li>}*/}
{((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
&& <li className={`${moduleName == 'videos' ? 'active' : '' }`}>
<Link
onClick={() => this.setState({moduleName: 'videos'})}
to={`/users/${username}/videos`}>题库</Link>
</li>}
{/*{((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)*/}
{/*&& <li className={`${moduleName == 'videos' ? 'active' : '' }`}>*/}
{/* <Link*/}
{/* onClick={() => this.setState({moduleName: 'videos'})}*/}
{/* to={`/users/${username}/videos`}>题库</Link>*/}
{/*</li>}*/}
</div>
</div>

8
public/react/src/modules/user/usersInfo/InfosProject.js
Unescape View File

@ -120,10 +120,10 @@ class InfosProject extends Component{
<span className="fr color-grey-9">时间最新</span>
</p>
<div className="square-list clearfix">
{
page == 1 && is_current && this.props.current_user && !category && this.props.current_user.user_identity != "学生" ?
<Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={"新建开发项目"} index="4"></Create>:""
}
{/*{*/}
{/* page == 1 && is_current && this.props.current_user && !category && this.props.current_user.user_identity != "学生" ? */}
{/* <Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={"新建开发项目"} index="4"></Create>:""*/}
{/*}*/}
{
(!data || (data && data.projects.length==0)) && category && <NoneData></NoneData>
}

Write Preview
Loading…
Cancel
Save