@@ -82,7 +79,12 @@ class CommonUsers extends Component {
""
)}
- );
+ )
+ };
+
+ render() {
+ const { users, count , isSpin, type_title } = this.state;
+
return (
diff --git a/src/forge/UsersList/focus_button.js b/src/forge/UsersList/focus_button.js
index cb0511b41..74d1c8200 100644
--- a/src/forge/UsersList/focus_button.js
+++ b/src/forge/UsersList/focus_button.js
@@ -52,14 +52,14 @@ class FocusButton extends Component {
}
})
.catch((error) => {
- this.setState({isSpin: false})
+ this.setState({ isSpin: false })
console.log(error);
});
};
render() {
- const { is_watch, isSpin,fontClass,starText,is_block } = this.state;
-
+ const { is_watch, isSpin, fontClass, starText, is_block } = this.state;
+
return (
);
}
diff --git a/src/forge/UsersList/fork_users.js b/src/forge/UsersList/fork_users.js
index 29236935e..6446b94df 100644
--- a/src/forge/UsersList/fork_users.js
+++ b/src/forge/UsersList/fork_users.js
@@ -5,7 +5,6 @@ import { getImageUrl } from "educoder";
import { Spin, Pagination } from "antd";
import "./list.css";
import NoneData from "../Nodata";
-// import FocusButton from "./focus_button";
class ForkUsers extends Component {
constructor(props) {
super(props);
@@ -60,65 +59,64 @@ class ForkUsers extends Component {
this.getUsersList(page, limit);
};
- render() {
- const { users, count, page, limit, isSpin } = this.state;
- const Paginations = (
-
@@ -97,7 +99,7 @@ class CommonUsers extends Component {
)}
- {Paginations}
+ {this.Paginations()}
-
- ) : (
- ""
- )}
-
-
+ Paginations =()=> {
+ const { count, page, limit } = this.state;
+ if(count > limit){
+ return(
+
diff --git a/src/forge/UsersList/praise_users.js b/src/forge/UsersList/praise_users.js
index ed8bca595..0feb03328 100644
--- a/src/forge/UsersList/praise_users.js
+++ b/src/forge/UsersList/praise_users.js
@@ -24,7 +24,6 @@ class PraiseUsers extends Component {
+
+ )
+ }
+ };
+ renderList = (users) => {
+ if (users && users.length > 0) {
+ return users.map((item, key) => {
+ return (
+
+
+
- );
- });
- }
- };
+
+ );
+ });
+ }
+ }
+
+ render() {
+ const { users, count, isSpin } = this.state;
+
return (
+
+ })
+
+
+
-
+ {item.name}
-
-
-
- {item.name}
-
-
-
-
- fork时间：{item.format_time}
-
- {/*
+
+ fork时间：{item.format_time}
@@ -129,11 +127,11 @@ class ForkUsers extends Component {
{count === 0 ? (
- {Paginations}
+ {this.Paginations()}
{projectId &&
-
);
}
}
diff --git a/src/forge/UsersList/user_list.js b/src/forge/UsersList/user_list.js
index 0e53f88dd..a214173de 100644
--- a/src/forge/UsersList/user_list.js
+++ b/src/forge/UsersList/user_list.js
@@ -4,58 +4,56 @@ import FocusButton from "./focus_button";
import { Button } from "antd";
import "./list.css";
class UserList extends Component {
- constructor(props) {
- super(props);
- }
- render() {
- const { users, userClass, current_user } = this.props;
- const renderList = () => {
- if (users && users.length > 0) {
- return users.map((item, key) => {
- return (
-
-
+ renderList = (users, userClass, current_user) => {
+ if (users && users.length > 0) {
+ return users.map((item, key) => {
+ return (
+
);
}
diff --git a/src/forge/users/fan_users.js b/src/forge/users/fan_users.js
index b487a687a..cf93cdb41 100644
--- a/src/forge/users/fan_users.js
+++ b/src/forge/users/fan_users.js
@@ -1,20 +1,13 @@
import React, { Component } from "react";
-// import { Input, Spin, Pagination } from "antd";
import CommonLists from "./common_lists"
class FanUsers extends Component {
- constructor(props) {
- super(props);
- this.state = {
-
- };
- }
render() {
const {user, current_user} = this.props
return (
);
}
}
diff --git a/src/forge/users/undo_events.js b/src/forge/users/undo_events.js
index e414a4f87..cea2792a9 100644
--- a/src/forge/users/undo_events.js
+++ b/src/forge/users/undo_events.js
@@ -1,11 +1,6 @@
import React, { Component } from "react";
import Nodata from "../Nodata";
class UndoEvents extends Component {
- constructor(props) {
- super(props);
- this.state = {
- };
- }
render() {
return (
diff --git a/src/forge/users/watch_users.js b/src/forge/users/watch_users.js
index 624c2b046..8f40834ae 100644
--- a/src/forge/users/watch_users.js
+++ b/src/forge/users/watch_users.js
@@ -1,13 +1,6 @@
import React, { Component } from "react";
import CommonLists from "./common_lists"
class WatcherUsers extends Component {
- constructor(props) {
- super(props);
- this.state = {
-
- };
- }
-
render() {
const {user, current_user} = this.props
return (
+
diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js
index 7197bef32..88be56556 100644
--- a/src/forge/users/InfosUser.js
+++ b/src/forge/users/InfosUser.js
@@ -99,147 +99,147 @@ class InfosUser extends Component {
})
this.get_projects(is_public);
}
+ menu =()=> (
+
+ );
+
+ newItem =()=> (
+
+ );
+
+ category_button=(category)=>{
+ const { current_user, user } = this.props;
+ const button_lists =
+ user && current_user && user.login === current_user.login
+ ? [
+ { type: undefined, name: "所有" },
+ { type: "manage", name: "我创建的" },
+ { type: "join", name: "我参与的" },
+ { type: "watched", name: "我关注的" },
+ { type: "forked", name: "我Fork的" },
+ ]
+ :
+ [
+ { type: undefined, name: "所有" },
+ { type: "manage", name: "TA创建的" },
+ { type: "join", name: "TA参与的" },
+ { type: "watched", name: "TA关注的" },
+ { type: "forked", name: "TAFork的" },
+ ];
+
+ let list = button_lists.map((item, key) => {
+ return (
+
+
+
+ );
+ })
+ return list;
+ }
render() {
const { current_user, user } = this.props;
const { category , is_public } = this.state;
- const menu = (
-
- );
- const newItem = (
-
- );
- const button_lists =
- user && current_user && user.login === current_user.login
- ? [
- { type: undefined, name: "所有" },
- { type: "manage", name: "我创建的" },
- { type: "join", name: "我参与的" },
- { type: "watched", name: "我关注的" },
- { type: "forked", name: "我Fork的" },
- // { type: "public", name: "公开的" },
- // { type: "private", name: "私有的" },
- ]
- : [
- { type: undefined, name: "所有" },
- { type: "manage", name: "TA创建的" },
- { type: "join", name: "TA参与的" },
- { type: "watched", name: "TA关注的" },
- { type: "forked", name: "TAFork的" },
- // { type: "public", name: "公开的" },
- ];
-
- const category_button = button_lists.map((item, key) => {
- return (
-
-
-
- );
- });
-
const { projectsList, isSpin, total, search, limit, page } = this.state;
- const pagination =
- total && total > limit ? (
-
+
+ );
+ });
+ }
+ }
+ render() {
+ const { users, userClass, current_user } = this.props;
+
return (
- renderList()
+ this.renderList(users, userClass, current_user)
);
}
}
diff --git a/src/forge/UsersList/watch_users.js b/src/forge/UsersList/watch_users.js
index 7817d639a..da4a1d7ab 100644
--- a/src/forge/UsersList/watch_users.js
+++ b/src/forge/UsersList/watch_users.js
@@ -20,12 +20,10 @@ class WatchUsers extends Component {
render() {
const { projectId } = this.state;
- console.log("watcher_users", this.props.current_user)
return (
+
+
+
+
+
-
- );
- });
- }
- };
+
-
-
- {item.name}
-
-
-
-
- 加入时间：{item.format_time}
-
- {
- current_user && current_user.login === item.login ?
-
- :
-
+
+ 加入时间：{item.format_time}
+ {
+ current_user && current_user.login === item.login ?
+
+ :
+
{projectId &&
-
);
}
}
diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js
index 081918d54..dc5dc4931 100644
--- a/src/forge/Version/version.js
+++ b/src/forge/Version/version.js
@@ -55,55 +55,56 @@ class version extends Component {
})
}
+ renderList = (releases) => {
+ const { projectsId } = this.props.match.params;
+ if (releases && releases.length > 0) {
+ return (
+
+ {
+ releases.map((item, key) => {
+ return (
+
+ )
+ })
+ }
+
+ )
+ } else {
+ return (
+
- {
- releases.map((item, key) => {
- return (
-
- )
- })
- }
-
- )
- } else {
- return (
-
@@ -116,7 +117,7 @@ class version extends Component {
}
- {renderList()}
+ {this.renderList(releases)}
-
- ) : (
- ""
- );
-
return (
-
+
- {current_user && user && current_user.login === user.login && (
-
-
-
- 
新建
-
-
-
- )}
-
-
+
-
+ {current_user && user && current_user.login === user.login && (
+
- 排序 
+ 新建
-
-
-
+ )}
- {projectsList && projectsList.length > 0 ? (
- {category_button}
- {
- user && current_user && user.login === current_user.login ?
- - this.changeStatus("public")}>公有 - this.changeStatus("private")}>私有 -
- :"" - } -
-
+
+
+ 排序
+
+
+
+
+
+
+
+ {projectsList && projectsList.length > 0 ? (
+ {this.category_button(category)}
+ {
+ user && current_user && user.login === current_user.login ?
+ + this.changeStatus("public")}>公有 + this.changeStatus("private")}>私有 +
+ :"" + } +
+
) : (
-
- {user && user.login &&
+ {user && user.login &&