diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index db23f07d..00070b84 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -1,12 +1,17 @@
import React, { Component } from "react";
+import { Link } from "react-router-dom";
+import { Avatar, Tag, Button, Pagination, Spin, Dropdown, Menu } from "antd";
+import FocusButton from "../UsersList/focus_button";
+import axios from "axios";
+import { getImageUrl } from "educoder";
import { Route, Switch } from "react-router-dom";
import { withRouter } from "react-router";
import { SnackbarHOC } from "educoder";
import { CNotificationHOC } from "../../modules/courses/common/CNotificationHOC";
import { TPMIndexHOC } from "../../modules/tpm/TPMIndexHOC";
-
+import "./new_user.css";
import "../css/index.css";
import Loadable from "react-loadable";
@@ -19,17 +24,161 @@ const InfosIndex = Loadable({
});
class Infos extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ isSpin: false,
+ user: undefined,
+ };
+ }
+
+ componentDidMount = () => {
+ this.fetchUser();
+ };
+
+ fetchUser = () => {
+ let url = `/users/${this.props.match.params.username}.json`;
+ axios
+ .get(url)
+ .then((result) => {
+ this.setState({
+ user: result.data,
+ });
+ })
+ .catch((error) => {
+ console.log(error);
+ this.setState({
+ isSpin: false,
+ });
+ });
+ };
+
render() {
+ const { current_user, mygetHelmetapi } = this.props;
+ const { user } = this.state;
return (
-
- {
- return ;
- }}
- >
-
+
+
+
+
+
+ {user && user.user_identity && (
+
+ {user && user.user_identity}
+
+ )}
+
+
+ {user && current_user && user.login === current_user.login && (
+
+
+
+ )}
+ {current_user && user && user.login !== current_user.login && (
+
+
+
+ )}
+
+
+
+
我关注的
+
{user && user.watching_count}
+
+
+
关注我的
+
{user && user.watched_count}
+
+
+
+
+ {current_user && user && current_user.id === user.id && (
+
+
+
+
+
+ 待办事项
+
+
+ {user.undo_events}
+
+
+
+
+ )}
+
+
+
+
+
+
+
+
+ 组织
+
+
+ {user && user.undo_events}
+
+
+
+
+
+
+
+ {
+ return ;
+ }}
+ >
+
+
+
);
}
diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js
index 59df0f68..967ca151 100644
--- a/src/forge/users/InfosUser.js
+++ b/src/forge/users/InfosUser.js
@@ -5,9 +5,10 @@ import { Avatar, Tag, Button, Pagination, Spin, Dropdown, Menu } from "antd";
import FocusButton from "../UsersList/focus_button";
import axios from "axios";
-import NoneData from "../Nodata";
import { getImageUrl } from "educoder";
-import "./new_user.css";
+import NoneData from "../Nodata";
+
+// import "./new_user.css";
import "../css/index.css";
class InfosUser extends Component {
@@ -23,79 +24,14 @@ class InfosUser extends Component {
totalCount: undefined,
data: undefined,
isSpin: false,
- user: undefined,
+
};
}
componentDidMount = () => {
- this.fetchUser();
- // this.setState({
- // isSpin:true
- // })
- // let {category, status, page, sort_by, sort_direction} = this.state;
- // this.getCourses(category, status, page, sort_by, sort_direction);
};
- fetchUser = () => {
- let url = `/users/${this.props.match.params.username}.json`;
- axios
- .get(url)
- .then((result) => {
- this.setState({
- user: result.data,
- });
- })
- .catch((error) => {
- console.log(error);
- this.setState({
- isSpin: false,
- });
- });
- };
- getCourses = (category, status, page, sort_by, sort_direction) => {
- let url = `/users/${this.props.match.params.username}/projects.json`;
- axios
- .get(url, {
- params: {
- category,
- status,
- page,
- sort_by,
- sort_direction,
- per_page: this.props.is_current && category && page == 1 ? 17 : 16,
- },
- })
- .then((result) => {
- if (result) {
- if (
- result.data.status === 403 ||
- result.data.status === 401 ||
- result.data.status === 500 ||
- result.data.status === 404
- ) {
- this.setState({
- isSpin: false,
- totalCount: 0,
- });
- } else {
- this.setState({
- totalCount: result.data.count,
- data: result.data,
- sort_by: sort_by,
- sort_direction: sort_direction,
- isSpin: false,
- });
- }
- }
- })
- .catch((error) => {
- console.log(error);
- this.setState({
- isSpin: false,
- });
- });
- };
//切换种类
changeCategory = (cate) => {
@@ -158,134 +94,10 @@ class InfosUser extends Component {
}
render() {
- // let{
- // category,
- // status,
- // page,
- // data,
- // totalCount,
- // isSpin,
- // sort_by,
- // sort_direction
- // } = this.state;
- // let isStudent = this.props.isStudent();
- // let is_current=this.props.is_current;
- const { current_user, mygetHelmetapi } = this.props;
- const { user } = this.state;
-
- console.log(this.props);
return (
-
-
-
-
-
- {user && user.user_identity && (
-
- {user && user.user_identity}
-
- )}
-
-
- {user && current_user && user.login === current_user.login && (
-
-
-
- )}
- {current_user && user && user.login !== current_user.login && (
-
-
-
- )}
-
-
-
-
我关注的
-
{user && user.watching_count}
-
-
-
关注我的
-
{user && user.watched_count}
-
-
-
-
- {current_user && user && current_user.id === user.id && (
-
-
-
-
-
- 待办事项
-
-
- {user.undo_events}
-
-
-
-
- )}
-
-
-
-
-
-
-
-
- 组织
-
-
- {user && user.undo_events}
-
-
-
-
-
+
+ ddddd
);
}