+
+ }
+ return (
+ 帮助
+-
+ {
+ list && list.map((i,k)=>{
+ return(
+
- {i.question} + ) + }) + } +
+ {
+ data && data.length > 0 && (data[0] && data[0].question) ?
+
+
+ :""
+ }
+ {/*
+ )
+}
+
+export default SiderBar;
diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js
index 043e5323..4d55f824 100644
--- a/src/forge/Head/Header.js
+++ b/src/forge/Head/Header.js
@@ -51,7 +51,6 @@ class NewHeader extends Component {
}
}
componentDidMount() {
- // this.getAppdata();
this.geturlsdata();
window._header_componentHandler = this;
@@ -130,120 +129,6 @@ class NewHeader extends Component {
old_url = newProps.Headertop.old_url
}
}
- getCookie = (key) => {
- var arr, reg = RegExp('(^| )' + key + '=([^;]+)(;|$)');
- if (arr === document.cookie.match(reg))
- return decodeURIComponent(arr[2]);
- else
- return null;
- }
-
- delCookie = (name) => {
- var exp = new Date();
- exp.setTime(exp.getTime() - 1);
- var cval = this.getCookie(name);
- if (cval != null) {
- document.cookie = name + "=" + cval + ";expires=" + exp.toGMTString();
- }
- }
- onLogout = () => {
- const url = `/accounts/logout.json`
- this.delCookie("autologin_trustie")
- axios.get(url, {
- }).then((response) => {
- if (response.data.status === 1) {
- this.setState({
- user: undefined
- })
- window.location.href = "/login"
- message.success('退出成功');
- }
- });
- }
-
- tojoinclass = () => {
- let { user } = this.state;
- if (user === undefined) {
- this.setState({
- isRender: true
- })
- return
- }
- if (user && user.login === "") {
- this.setState({
- isRender: true
- })
- return;
- }
- if (user && user.profile_completed === false) {
- this.setState({
- AccountProfiletype: true
- })
- return;
- }
- this.setState({
- Addcoursestypes: true,
- })
- }
-
- tojoinitem = () => {
- if (this.props.user && this.props.user.email === undefined || this.props.user && this.props.user.email === null || this.props.user && this.props.user.email === "") {
- this.openNotification("请先绑定邮箱，谢谢");
- return
- }
- let { user } = this.state;
- if (user === undefined) {
- this.setState({
- isRender: true
- })
- return
- }
- if (user && user.login === "") {
- this.setState({
- isRender: true
- })
- return;
- }
-
- if (user && user.profile_completed === false) {
- this.setState({
- AccountProfiletype: true
- })
- return;
- }
-
- this.setState({
- tojoinitemtype: true
- })
- }
-
-
- submitstatevalue = (sum, value, data) => {
- this.setState({
- Addcoursestypes: false,
- tojoinitemtype: false,
- tojoinclasstitle: undefined,
- rolearr: ["", ""],
- Checkboxteacherchecked: false,
- Checkboxstudentchecked: false,
- Checkboxteachingchecked: false,
- Checkboxteachertype: false,
- Checkboxteachingtype: false,
- code_notice: false,
- checked_notice: false,
- submitapplicationssum: sum,
- submitapplications: true,
- submitapplicationsvalue: value,
- submitapplicationsvaluedata: data,
- RadioGroupvalue: undefined
- })
- }
-
- onChangeRadioGroup = (e) => {
- this.setState({
- RadioGroupvalue: e.target.value,
- });
- }
submitsubmitapplications = () => {
let {
@@ -402,39 +287,13 @@ class NewHeader extends Component {
})
}
- getAppdata = () => {
- try {
- var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
- var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
- this.setState({
- settings: chromesettingArray
- });
- if (chromesettingArray.tab_logo_url) {
- this.gettablogourldata(chromesettingresponseArray);
- } else {
- this.gettablogourlnull();
- }
- } catch (e) {
- this.geturlsdata();
- }
- };
-
geturlsdata = () => {
let url = "/setting.json";
axios.get(url).then((response) => {
if (response && response.data) {
this.setState({ settings: 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) {
- this.gettablogourlnull();
- }
+ localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
+ localStorage.setItem('chromesettingresponse', JSON.stringify(response));
} else {
this.gettablogourlnull();
}
@@ -555,7 +414,7 @@ class NewHeader extends Component {
let shixun = "/shixuns";
let paths = "/paths";
let courses = "/courses";
- this.props.mygetHelmetapi.navbar.map((item, key) => {
+ this.props.mygetHelmetapi && this.props.mygetHelmetapi.navbar && this.props.mygetHelmetapi.navbar.map((item, key) => {
var reg = RegExp(item.link);
if (shixun.match(reg)) {
if (item.hidden === true) {
@@ -593,19 +452,19 @@ class NewHeader extends Component {
{...this.props}
{...this.state}
/> : ""}
- {
- goshowqqgtounp === true ?
-
+
+
+
+
+
+
+
+
+
+
*/}
+
+
{
settings && settings.navbar && settings.navbar.length > 0 ?
diff --git a/src/forge/Index.js b/src/forge/Index.js
index aa0219aa..533530b0 100644
--- a/src/forge/Index.js
+++ b/src/forge/Index.js
@@ -31,6 +31,14 @@ const Infos = Loadable({
loading: Loading,
});
class Index extends Component {
+
+ componentDidUpdate=()=>{
+ this.props.history.listen(()=>{
+ if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
+ window.scrollTo(0, 0)
+ }
+ })
+ }
render() {
return (
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 9fa5603d..f446ebb4 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -389,7 +389,7 @@ function CoderDepot(props){
website &&
}
+ {
+ recommendOriList.map((i,k)=>{
+ return(
+ } "{i.name}")
+ :""
+ } */}
{
recommendList && recommendList.length>0 &&
-
@@ -397,13 +397,13 @@ function CoderDepot(props){ README.md
- + {projectDetail && projectDetail.size}
{ projectDetail && projectDetail.license_name &&- + {projectDetail.license_name}
} diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js index 64a55ed2..e58ec0c0 100644 --- a/src/forge/Main/Index.js +++ b/src/forge/Main/Index.js @@ -1,7 +1,10 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; import { Menu, Input , Spin, Pagination , Popover , Select } from 'antd'; +import Slider from "react-slick"; import { getImageUrl } from 'educoder'; +import "slick-carousel/slick/slick.css"; +import "slick-carousel/slick/slick-theme.css"; import '../css/index.scss' import './list.css'; import './Index.scss'; @@ -30,6 +33,8 @@ class Index extends Component { categoryList: undefined, recommendList:undefined, + recommendOriList:undefined, + languageList:undefined, languageId:undefined } @@ -47,6 +52,8 @@ class Index extends Component { this.getRecommand(); this.getLanguage(); + + // this.getRecommandOri(); } // 获取语言列表 @@ -72,6 +79,17 @@ class Index extends Component { }).catch(error=>{}) } + getRecommandOri=()=>{ + const url = `/organizations/recommend.json`; + axios.get(url).then(result=>{ + if(result){ + this.setState({ + recommendOriList:result.data.organizations + }) + } + }).catch(error=>{}) + } + // 获取列表 getListData = (page, limit, search, sort, project_type, category_id,languageId) => { const { current_user } = this.props; @@ -256,22 +274,56 @@ class Index extends Component { const { current_user } = this.props; const { projectsList , recommendList , languageList , languageId , - isSpin, total, search, limit, page, typeList, categoryList } = this.state; + isSpin, total, search, limit, page, typeList, categoryList , recommendOriList } = this.state; + + const setting={ + dots: true, + infinite: true, + speed: 500, + slidesToShow: 5, + slidesToScroll: 5, + autoplay:false, + arrows:false, + adaptiveHeight:true + } + const settings={ + dots: true, + infinite: true, + speed: 500, + slidesToShow: 6, + slidesToScroll: 6, + autoplay:false, + arrows:false, + adaptiveHeight:true + } return (
+ 5 ? "recommandProjects":"recommandProjects mb20"}>
{
recommendList.map((item,key)=>{
return(
-
this.getoDetail(item.author && item.author.login,item.identifier)}>
+
this.getoDetail(item.author && item.author.login,item.identifier)}>
+
}
-
- 
+
@@ -283,9 +335,8 @@ class Index extends Component {
)
})
}
- {item.name}
{item.author && item.author.name}
-
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index 58ea6446..89d3023e 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -1,57 +1,53 @@
+.recommandOri.slick-slider{
+ width: 1300px;
+ margin:20px auto 40px;
+ .slick-track{
+ margin-left: 0px;
+ }
+ .slick-slide{
+ li > a{
+
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
+ }
+}
/* recommandProjects */
-.recommandProjects{
- display: flex;
- max-width: 1200px;
- margin:20px auto;
-}
-.recommandProjects >div{
- background-color: #fff;
- border-radius: 10px;
- width: 220px;
- margin-right: 25px;
- cursor: pointer;
- border: 1px solid #eee;
- &:last-child{
- margin-right: 0px;
+.recommandProjects.slick-slider{
+ width: 1230px;
+ margin:20px auto 40px;
+ .slick-track{
+ margin-left: 0px;
}
-}
-.recommandProjects > div:hover{
- box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.1);
-}
-.recommandProjects > div .mainInfo{
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- min-height: 160px;
- border-bottom: 1px solid #eee;
- padding:20px;
- box-sizing: border-box;
- img{
- height: 50px;
- width:50px;
- border-radius: 50%;
+ .slick-arrow.slick-prev,.slick-arrow.slick-next{
+ &:before{
+ color: #999;
+ }
+ li.slick-active button:before{
+ color: #999;
+ }
}
- .name{
- font-size: 13px;
- color: #666;
- height: 18px;
- line-height: 18px;
- margin-top:12px;
+ .slick-dots{
+ bottom: -29px;
+ li button:before{
+ color: #909090;
+ }
}
- .school{
- margin-top:12px;
- color: #333;
- font-size: 16px;
- height: 22px;
- line-height: 22px;
- overflow: hidden;
- white-space: nowrap;
- text-overflow: ellipsis;
- max-width:100%;
+ .slick-slide{
+ padding:0px 15px;
+ box-sizing: border-box;
+ & > div{
+ background-color: #fff;
+ border-radius: 10px;
+ width: 100%;
+ cursor: pointer;
+ border: 1px solid #eee;
+ &:hover{
+ box-shadow: 0px 2px 20px 0px rgba(0, 0, 0, 0.1);
+ }
+ }
}
-}
-.recommandProjects{
.baseInfo{
padding:18px 15px;
display: flex;
@@ -72,6 +68,39 @@
text-align: right;
}
}
+ .mainInfo{
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ min-height: 160px;
+ border-bottom: 1px solid #eee;
+ padding:20px;
+ box-sizing: border-box;
+ img{
+ height: 50px;
+ width:50px;
+ border-radius: 50%;
+ }
+ .name{
+ font-size: 13px;
+ color: #666;
+ height: 18px;
+ line-height: 18px;
+ margin-top:12px;
+ }
+ .school{
+ margin-top:12px;
+ color: #333;
+ font-size: 16px;
+ height: 22px;
+ line-height: 22px;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ max-width:100%;
+ }
+ }
}
// coderDepot
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js
index 9b6a78c1..49b19185 100644
--- a/src/forge/Main/IndexItem.js
+++ b/src/forge/Main/IndexItem.js
@@ -46,11 +46,13 @@ class IndexItem extends Component {
: ""
}
{
- item.type && item.type !== 0 ?
- item.type === 2 ?
+ item.type && item.type === 2 ?
- {/* {item.visits} */}
- {/* {item.category && item.category.id && {item.category.name}} */}
{item.last_update_time ? {item.time_ago} : ""}
{item.language && item.language.id ? {item.language.name} : ""}
diff --git a/src/forge/Main/sub/Contribute.jsx b/src/forge/Main/sub/Contribute.jsx
index a41cb3ed..f65b4524 100644
--- a/src/forge/Main/sub/Contribute.jsx
+++ b/src/forge/Main/sub/Contribute.jsx
@@ -42,7 +42,7 @@ function Contribute(props){
-
贡献者列表
+贡献者列表
{ list && list.length > 0 ?
diff --git a/src/forge/Main/sub/sub.scss b/src/forge/Main/sub/sub.scss
index 362b9f4e..7c146044 100644
--- a/src/forge/Main/sub/sub.scss
+++ b/src/forge/Main/sub/sub.scss
@@ -1,11 +1,13 @@
.boxPanel{
width: 1200px;
- margin:0px auto;
- padding:20px 0px;
+ margin:20px auto;
+ border-radius: 4px;
+ border:1px solid #eee;
min-height: 500px;
.contrbuteList{
display: flex;
flex-wrap: wrap;
+ padding:20px;
& > div{
width: 20%;
}
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index f7a1d887..a812a6d7 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -67,6 +67,11 @@ class Infos extends Component {
if(prevUser && username && prevUser !== username){
this.fetchUser();
}
+ this.props.history.listen(()=>{
+ if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
+ window.scrollTo(0, 0)
+ }
+ })
}
fetchUser = () => {
diff --git a/src/index.js b/src/index.js
index eb757a2a..d6c14281 100644
--- a/src/index.js
+++ b/src/index.js
@@ -13,6 +13,7 @@ configureUrlQuery({ history });
window.__useKindEditor = false;
+
const render = (Component) => {
ReactDOM.render(
diff --git a/src/modules/tpm/SiderBar.js b/src/modules/tpm/SiderBar.js
deleted file mode 100644
index 8f0faac6..00000000
--- a/src/modules/tpm/SiderBar.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React, { Component } from 'react';
-import './TPMIndex.css';
-
-const $ = window.$;
-
-$(window).resize(function () {
- rightSlider();
-});
-
-$(window).scroll(function () {
- if ($(".gotop").length > 0) {
- if ($(document).scrollTop() > 0) {
- $(".-task-sidebar .gotop").show();
- $(".gotop").click(function () {
- $("html,body").scrollTop(0);
- });
- }
- if ($(document).scrollTop() == 0) {
- $(".-task-sidebar .gotop").hide();
- }
- }
-});
-
-function rightSlider() {
- var poi = parseInt((parseInt($(window).width()) - 1200) / 2) - 81;
- // console.log(parseInt($(window).width())+" "+poi);
- if (poi > 0) {
- $(".-task-sidebar").css("right", poi);
- } else {
- $(".-task-sidebar").css("right", "0px");
- }
- $(".-task-sidebar").show();
-}
-
-
-class SiderBar extends Component {
- constructor(props) {
- super(props)
-
- }
-
- render() {
- return (
-
-
- );
- }
-}
-
-export default SiderBar;
diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css
index 82dcfa24..859ddcf9 100644
--- a/src/modules/tpm/TPMIndex.css
+++ b/src/modules/tpm/TPMIndex.css
@@ -135,88 +135,6 @@ body>.-task-title {
height: 60px !important;
}
-/*-------------------个人主页：右侧提示区域--------------------------*/
-.-task-sidebar {
- position: fixed;
- width: 40px;
- height: 180px;
- right: 0;
- bottom: 20px !important;
- z-index: 10;
-}
-
-.-task-sidebar>div {
- height: 40px;
- line-height: 40px;
- box-sizing: border-box;
- width: 40px;
- background: #4CACFF;
- color: #fff;
- font-size: 20px;
- text-align: center;
- margin-bottom: 5px;
- border-radius: 4px;
-}
-
-.-task-sidebar>div i {
- color: #fff;
-}
-
-.-task-sidebar>div i:hover {
- color: #fff !important;
-}
-
-.gotop {
- background-color: rgba(208, 207, 207, 0.5) !important;
- padding: 0px !important;
-}
-
-.-task-desc {
- background: #494949;
- width: 90px;
- line-height: 36px;
- text-align: center;
- position: absolute;
- color: #fff;
- font-size: 13px;
- z-index: 999999;
- opacity: 0;
-}
-
-.-task-desc div {
- position: absolute;
- top: 10px;
- right: -7px;
- height: 13px;
-}
-
-.-task-desc div img {
- float: left
-}
-
-.-task-sidebar .scan_ewm {
- position: absolute !important;
- right: 45px !important;
- bottom: 0px !important;
- background-color: #494949 !important;
- -webkit-box-sizing: border-box !important;
- box-sizing: border-box !important;
- font-size: 14px !important;
- line-height: 16px !important;
- display: none;
- height: 213px !important;
-}
-
-.trangle_right {
- position: absolute;
- right: -5px;
- bottom: 15px;
- width: 0;
- height: 0px;
- border-top: 6px solid transparent;
- border-left: 5px solid #494949;
- border-bottom: 6px solid transparent
-}
.HeaderSearch {
margin-top: 18px;