diff --git a/LocalReadMe.md b/LocalReadMe.md index cff986d60..52be20ea5 100644 --- a/LocalReadMe.md +++ b/LocalReadMe.md @@ -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 - - \ No newline at end of file + 5、启动服务用 bundle exec rails s \ No newline at end of file diff --git a/public/react/src/modules/forums/RightMyPublish.js b/public/react/src/modules/forums/RightMyPublish.js index fc101ae30..eb381a73a 100644 --- a/public/react/src/modules/forums/RightMyPublish.js +++ b/public/react/src/modules/forums/RightMyPublish.js @@ -1,76 +1,76 @@ -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 { getImageUrl, toPath, LinkAfterLogin } from 'educoder' - -import match_adImg from '../../images/ad/match_ad.jpg' -const $ = window.$ - -class RightMyPublish extends Component { - constructor(props) { - super(props) - - this.state = { - - } - } - - handleKeyPress = (event) => { - if(event.type !== 'keypress' || event.key == 'Enter'){ - this.props.setSearchValue( this.props.searchValue, true); - // $(window).trigger('setSearchValue', $('#shixun_search_input').val()) - } - } - handleInput = (event) => { - this.props.setSearchValue(event.target.value); - } - - render() { - const { match, history, currentPage, my_memos_count, setSearchValue, searchValue } = this.props - - return ( - -
- {/*
-
- - - × -
- -
*/} - -
- - - - - - -
- 发布话题 - {/*

- 我的发布
- {my_memos_count} -

*/} -
- -
- -
- - ); - } -} - -export default RightMyPublish; +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 { getImageUrl, toPath, LinkAfterLogin } from 'educoder' + +import match_adImg from '../../images/ad/match_ad.jpg' +const $ = window.$ + +class RightMyPublish extends Component { + constructor(props) { + super(props) + + this.state = { + + } + } + + handleKeyPress = (event) => { + if(event.type !== 'keypress' || event.key == 'Enter'){ + this.props.setSearchValue( this.props.searchValue, true); + // $(window).trigger('setSearchValue', $('#shixun_search_input').val()) + } + } + handleInput = (event) => { + this.props.setSearchValue(event.target.value); + } + + render() { + const { match, history, currentPage, my_memos_count, setSearchValue, searchValue } = this.props + + return ( + +
+ {/*
+
+ + + × +
+ +
*/} + +
+ + + + + + +
+ 发布话题 + {/*

+ 我的发布
+ {my_memos_count} +

*/} +
+ + {/*
*/} + {/* */} + {/*
*/} + + ); + } +} + +export default RightMyPublish; diff --git a/public/react/src/modules/tpm/NewFooter.js b/public/react/src/modules/tpm/NewFooter.js index a85b35ccf..ee2fbb0e7 100644 --- a/public/react/src/modules/tpm/NewFooter.js +++ b/public/react/src/modules/tpm/NewFooter.js @@ -27,15 +27,15 @@ class NewFooter extends Component { EduCoder.net */} - + {/**/}

diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 1e1b16615..061275c2f 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -759,20 +759,21 @@ submittojoinclass=(value)=>{ {/*

  • 教学案例
    • */} -
  • - 在线竞赛 - -
    • -
  • 教学案例
    • -
  • - 众包创新 -
    • + {/*
  • */} + {/* 在线竞赛*/} + {/* */} + {/*
    • */} + {/*
  • 教学案例
    • */} + {/*
  • */} + {/* 众包创新*/} + {/*
    • */}
  • 交流问答
    • -
  • 工程认证
    • + {/**/} + {/*工程认证*/} @@ -864,11 +865,11 @@ submittojoinclass=(value)=>{ {/* p 老师 l 学生 */}
  • 我的实训项目
  • 我的实践课程
    • -
  • 我的开发项目
    • -
  • 我的众包
    • -
  • - 客户管理 -
    • + {/*
  • 我的开发项目
    • */} + {/*
  • 我的众包
    • */} + {/*
  • */} + {/* 客户管理*/} + {/*
    • */}
  • 账号管理
    • {/*
  • this.educoderlogin()} >登入测试接口
    • */} {/*
  • this.trialapplications()} >试用申请
    • */} @@ -907,7 +908,7 @@ submittojoinclass=(value)=>{ {this.props.Headertop===undefined?"":
  • this.getUser("/paths/new")} >新建实践课程
    • } -
  • this.getUser("/projects/new")} target="_blank">新建开发项目
    • + {/*
  • this.getUser("/projects/new")} target="_blank">新建开发项目
    • */}
    - ) - } -} +import React, { Component } from 'react'; + +import {Link} from 'react-router-dom'; +import {Tooltip,Menu} from 'antd'; +import {getImageUrl} from 'educoder'; + +import "./usersInfo.css" +import "../../courses/css/members.css" +import "../../courses/css/Courses.css" + +import { LinkAfterLogin } from 'educoder' + +class InfosBanner extends Component{ + constructor(props){ + super(props); + } + render(){ + let { + data , + id, + login, + moduleName, + current_user, + }=this.props; + let is_current=this.props.is_current; + let {username}= this.props.match.params; + let {pathname}=this.props.location; + moduleName=pathname.split("/")[3]; + + console.log(is_current) + return( +
    +
    +
    +

    头像

    +
    +

    + {data && data.name} + { + data && is_current == false && data.identity =="学生" ? "" : + + } +

    +

    + + + + + + +

    +
    +
    +
    + {is_current ? "我":"TA"}的经验值 + {data && data.experience} +
    +
    + {is_current ? "我":"TA"}的金币 + {data && data.grade} +
    + { + is_current ? + + { + data && data.attendance_signed ? + 已签到 + : + 签到 + } + + : + + + 私信 + + + } +
    +
    +
    +
  • + this.setState({moduleName: 'courses'})} + to={`/users/${username}/courses`}>翻转课堂 +
    • +
  • + this.setState({moduleName: 'shixuns'})} + to={`/users/${username}/shixuns`}>开发社区 +
    • +
  • + this.setState({moduleName: 'paths'})} + to={`/users/${username}/paths`}>实践课程 +
    • + {/*
  • */} + {/* this.setState({moduleName: 'projects'})}*/} + {/* to={`/users/${username}/projects`}>项目*/} + {/*
    • */} + {/*
  • */} + {/* this.setState({moduleName: 'package'})}*/} + {/* to={`/users/${username}/package`}>众包*/} + {/*
    • */} + {/*{((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin) */} + {/*&&
  • */} + {/* this.setState({moduleName: 'videos'})}*/} + {/* to={`/users/${username}/videos`}>视频*/} + {/*
    • }*/} + + {/*{((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)*/} + {/*&&
  • */} + {/* this.setState({moduleName: 'videos'})}*/} + {/* to={`/users/${username}/videos`}>题库*/} + {/*
    • }*/} + +
    +
    +
    + ) + } +} export default InfosBanner; \ No newline at end of file diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js index 5aea5117b..708601bc9 100644 --- a/public/react/src/modules/user/usersInfo/InfosProject.js +++ b/public/react/src/modules/user/usersInfo/InfosProject.js @@ -120,10 +120,10 @@ class InfosProject extends Component{ 时间最新

    - { - page == 1 && is_current && this.props.current_user && !category && this.props.current_user.user_identity != "学生" ? - :"" - } + {/*{*/} + {/* page == 1 && is_current && this.props.current_user && !category && this.props.current_user.user_identity != "学生" ? */} + {/* :""*/} + {/*}*/} { (!data || (data && data.projects.length==0)) && category && }