-
- })
-
+
+
+
-
+
}
diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss
index 0ae8f48e..a2c11b7a 100644
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@@ -1,7 +1,6 @@
.dropdownFlex{
display:flex;
- padding:5px;
background:#fff;
border-radius: 3px;
.ant-menu-vertical > .ant-menu-item{
@@ -9,11 +8,57 @@
height: 35px;
line-height: 35px;
margin:0px;
+ &.ant-menu-item-selected{
+ background-color: #fff;
+ a{color: rgba(0, 0, 0, 0.65)!important;}
+ }
+ &.ant-menu-item-active{
+ a{color: #4cacff!important;}
+ }
}
.ant-menu-vertical{
border:none;
}
}
+.currentImg{
+ width: 34px;
+ height: 34px;
+ border-radius: 50%;
+ margin-left: 30px;
+}
+.currentMenu{
+ width: 120px;
+ text-align: center;
+ padding:0px;
+ li{
+ height: 40px;
+ line-height: 40px;
+ padding:0px;
+ cursor: default;
+ &:hover{
+ background-color: #fff;
+ }
+ &:first-child{
+ border-bottom: 1px solid #eee;
+ }
+ &:last-child{
+ border-top: 1px solid #eee;
+ a{
+ border-radius: 0px 0px 4px 4px;
+ }
+ }
+ a{
+ padding:0px;
+ margin:0px;
+ display: block;
+ color: #666;
+ &:hover{
+ color: #fff;
+ background: #4CACFF;
+ }
+ }
+ }
+}
.newFooter {
position: absolute;
@@ -65,4 +110,13 @@
}
}
}
+}
+.inviteForm{
+ .ant-form-item{
+ margin-right: 0px;
+ }
+ .ant-form-item-label{
+ width: 110px;
+ text-align: right;
+ }
}
\ No newline at end of file
diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx
index 56ea54fa..b1c38465 100644
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@@ -239,9 +239,11 @@ function CoderDepot(props){
}
})
}
-
let n = fileInfo && fileInfo.name;
const mdFlag = n && n.substring(n.length-3,n.length) === ".md";
+
+ const { current_user } = props;
+ const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && (projectDetail.permission !=="Reporter" || (current_user && current_user.admin));
return(
-
-
- {this.props.current_user.username} - { - settings && settings.personal && settings.personal.length > 0 && settings.personal.map((item,key)=>{ - return( -
- {item.name} - ) - }) - } -
- - this.educoderloginysl()}>退出 - -
+ forked from
+ {fork_info.fork_project_user_name}
+ /
+ {fork_info.fork_form_name}
+
: ""
+ }
render() {
@@ -401,20 +411,11 @@ class Detail extends Component {
const urlFlag = (urlArr.length === 3);
const { projectsId , owner } = this.props.match.params;
+ const { current_user } = this.props;
let pathname = checkPathname(projectsId,owner,url);
const { state } = this.props.history.location;
- const text = (
- projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
-
-
+
+
+
{
firstSync ? "" :
{/* 新建合并请求 */}
+ (
(
{project && project.author &&
@@ -434,15 +435,7 @@ class Detail extends Component {
/
{project && project.name}
- {
- projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
-
+ {
+ projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
+ this.textFunc(projectDetail.forked_from_project_id,projectDetail.fork_info)
+ :""
+ }
+
+ {
+ projectDetail && projectDetail.invite_code &&
+
+
{ projects && projects.length > 0 ? projects.map((item, key) => {
return (
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index 9854a0a3..bdf93163 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -91,6 +91,7 @@
display: flex;
border-bottom:1px solid rgba(238,238,238,1);
padding:22px 0px;
+ justify-content: flex-start;
}
.boxShandow{
box-shadow:0px 2px 20px 10px rgba(0,0,0,0.03);
@@ -100,6 +101,7 @@
height: 60px;
border-radius: 50%;
margin-right: 22px;
+ margin-top: 8px;
}
.p-r-Infos{
flex: 1;
@@ -108,6 +110,7 @@
.p-r-name{
display: flex;
justify-content: space-between;
+ align-items: center;
}
.p-r-name > p{
flex: 1;
diff --git a/src/forge/Main/sub/Invite.jsx b/src/forge/Main/sub/Invite.jsx
new file mode 100644
index 00000000..bda40b33
--- /dev/null
+++ b/src/forge/Main/sub/Invite.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { Tooltip , message } from 'antd';
+
+function Invite({code}) {
+
+ function jsCopy(id) {
+ const copyEle = document.querySelector(id); // 获取要复制的节点
+ const range = document.createRange(); // 创造range
+ window.getSelection().removeAllRanges(); //清除页面中已有的selection
+ range.selectNode(copyEle); // 选中需要复制的节点
+ window.getSelection().addRange(range); // 执行选中元素
+ document.execCommand("Copy"); // 执行copy操作
+ message.success('复制成功');
+ }
+ return(
+
通知
- {messages ? {messages}:""}
+ {messagesCount ? {messagesCount}:""}
接收仓库
- {transferProjects ? {transferProjects}:""}
+ {transferCount ? {transferCount}:""}
+
+
+
+
+ 成员申请
+ {applyCount ? {applyCount}:""}
+ {
+ return ;
+ }}
+ >
{
- return ;
+ return ;
}}
>
{
- return ;
+ return ;
}}
>
diff --git a/src/forge/Notice/Index.scss b/src/forge/Notice/Index.scss
index c7bb50eb..b00e18a5 100644
--- a/src/forge/Notice/Index.scss
+++ b/src/forge/Notice/Index.scss
@@ -1,31 +1,20 @@
.noticeMenu{
- padding:0px 20px;
+ padding:0px 30px;
display: flex;
border-bottom: 1px solid #eee;
- height: 54px;
- line-height: 54px;
li{
font-size: 16px;
padding:0px;
- margin:0px 30px 0px 20px!important;
- height: 54px;
- line-height: 54px;
+ margin-right:30px;
+ height: 70px;
+ line-height: 70px;
position: relative;
transform: none;
a{
display: flex;
- &>span{
- position: relative;
- }
}
- &.active a span:first-child::after{
- position: absolute;
- bottom: 0px;
- height: 2px;
- left: 0px;
- content: "";
- background-color: #1890ff;
- width: 100%;
+ &.active a span{
+ color: #1890ff;
}
.unNum{
color: #d38900;
@@ -37,15 +26,14 @@
min-width: 23px;
text-align: center;
background-color: #ffe4b3;
- margin-top: 19px;
+ margin-top: 27px;
margin-left: 10px;
display: block;
}
}
}
.notifyList{
- padding:0px 20px;
- min-height: 400px;
+ padding:0px 30px;
li{
display: flex;
border-bottom: 1px solid #eee;
diff --git a/src/forge/Notice/Notify.jsx b/src/forge/Notice/Notify.jsx
index d927f56f..761366d3 100644
--- a/src/forge/Notice/Notify.jsx
+++ b/src/forge/Notice/Notify.jsx
@@ -1,6 +1,6 @@
import React, { useEffect, useState } from "react";
import Nodata from '../Nodata';
-import {Pagination } from 'antd';
+import { Pagination , Spin } from 'antd';
import { Link } from 'react-router-dom';
import { getImageUrl } from 'educoder';
import Axios from "axios";
@@ -11,9 +11,15 @@ function Notify(props){
const [ list , setList ] = useState(undefined);
const [ page , setPage ] = useState(1);
const [ total , setTotal ] = useState(0);
+ const [ isSpin , setIsSpin ] = useState(true);
+
+ useEffect(()=>{
+ props && props.deleteEvent("notify",0);
+ },[])
useEffect(()=>{
if(username){
+ setIsSpin(true);
getList();
}
},[username,page])
@@ -28,6 +34,7 @@ function Notify(props){
if(result){
setList(result.data.applied_messages);
setTotal(result.data.total_count);
+ setIsSpin(false);
}
}).catch(error=>{})
}
@@ -40,12 +47,25 @@ function Notify(props){
return
+ 邀请码: {code}
+ 可以通过邀请码邀请成员加入项目
点击复制邀请码。} placement={"bottom"}> + jsCopy("#devitecode")}> +
+
+ )
+}
+export default Invite;
\ No newline at end of file
diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index 3cbe4ddc..1ba7960a 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -9,13 +9,14 @@ const Option = Select.Option;
class NewMerge extends Component {
constructor(props) {
super(props);
+ const { branch } = this.props.match.params;
this.state = {
data: undefined,
branches: undefined,
merge_branches: undefined,
merge_projects: undefined,
merge: "master",
- pull: "master",
+ pull: branch,
id: undefined,
is_fork: false,
projects_names: undefined,
@@ -113,16 +114,19 @@ class NewMerge extends Component {
}
set_default_pull = (branches) => {
- if(branches && branches.length>0){
- let default_pull = branches.filter((e) => e.name === "master")
- if (default_pull.length > 0){
- this.setState({
- pull:default_pull[0].name
- })
- }else{
- this.setState({
- pull:"master"
- })
+ const { branch } = this.props.match.params;
+ if(!branch){
+ if(branches && branches.length>0){
+ let default_pull = branches.filter((e) => e.name === "master")
+ if (default_pull.length > 0){
+ this.setState({
+ pull:default_pull[0].name
+ })
+ }else{
+ this.setState({
+ pull:"master"
+ })
+ }
}
}
}
@@ -163,10 +167,12 @@ class NewMerge extends Component {
};
selectBrach = (type, value) => {
+ const { projectsId , owner } = this.props.match.params;
this.state[type] = value;
this.ischeckmerge();
let { id ,merge , pull } = this.state;
if(type==="pull"){
+ this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new/${pull}`)
this.compareProject(id,value,merge);
}else{
this.compareProject(id,pull,value);
diff --git a/src/forge/Notice/Apply.jsx b/src/forge/Notice/Apply.jsx
new file mode 100644
index 00000000..3c77edfa
--- /dev/null
+++ b/src/forge/Notice/Apply.jsx
@@ -0,0 +1,114 @@
+import React, { useEffect , useState } from 'react';
+import Axios from 'axios';
+import { Pagination , Spin , Popconfirm }from 'antd';
+import { Link } from 'react-router-dom';
+import { getImageUrl } from 'educoder';
+import Nodata from '../Nodata';
+import { FlexAJ } from '../Component/layout';
+
+const limit = 15;
+function Apply(props) {
+ const username = props.match.params.username;
+ const [ list , setList ] = useState(undefined);
+ const [ page , setPage ] = useState(1);
+ const [ total , setTotal ] = useState(0);
+ const [ isSpin , setIsSpin ] = useState(true);
+
+ useEffect(()=>{
+ if(username){
+ setIsSpin(true);
+ getList();
+ }
+ },[username])
+
+ function getList() {
+ const url = `/users/${username}/applied_projects.json`;
+ Axios.get(url).then(result=>{
+ if(result){
+ setList(result.data.applied_projects);
+ setTotal(result.data.total_count);
+ setIsSpin(false);
+ }
+ }).catch(error=>{})
+ }
+
+ // 接受
+ function acceptDivert(id){
+ const url = `/users/${username}/applied_projects/${id}/accept.json`;
+ Axios.post(url).then(result=>{
+ if(result && result.data){
+ getList();
+ props && props.deleteEvent("apply",1);
+ }
+ }).catch(error=>{})
+ }
+
+ // 拒绝
+ function revertDivert(id){
+ const url = `/users/${username}/applied_projects/${id}/refuse.json`;
+ Axios.post(url).then(result=>{
+ if(result && result.data){
+ getList();
+ props && props.deleteEvent("apply",1);
+ }
+ }).catch(error=>{})
+ }
+ return(
+ 点击复制邀请码。} placement={"bottom"}> + jsCopy("#devitecode")}> +
+
+
+
+ )
+}
+export default Apply;
\ No newline at end of file
diff --git a/src/forge/Notice/Index.jsx b/src/forge/Notice/Index.jsx
index d9d04d59..94c63804 100644
--- a/src/forge/Notice/Index.jsx
+++ b/src/forge/Notice/Index.jsx
@@ -6,6 +6,10 @@ import Loadable from "react-loadable";
import Loading from "../../Loading";
import { Route, Switch } from "react-router-dom";
+const Apply = Loadable({
+ loader: () => import("./Apply"),
+ loading: Loading,
+});
const Notify = Loadable({
loader: () => import("./Notify"),
loading: Loading,
@@ -18,38 +22,62 @@ function Index(props){
const username = props.match.params.username;
const pathname = props.history.location.pathname;
const user = props.user;
- const undo_messages = props.undo_messages;
const [ menu , setMenu ] = useState("notify");
- const [ messages , setMessages ] = useState(0);
- const [ transferProjects , setTransferProjects ] = useState(0);
+ const [ messagesCount , setMessagesCount ] = useState(0);
+ const [ transferCount , setTransferCount ] = useState(0);
+ const [ applyCount , setApplyCount ] = useState(0);
+
+ const [ flag , setFlag ] = useState(true);
+ const { current_user } = props;
+
+ useEffect(()=>{
+ if((username && current_user && (current_user.login !== username))){
+ props.history.push(`/users/${username}`);
+ }
+ },[current_user,username])
useEffect(()=>{
if(user){
- setTransferProjects(user.undo_transfer_projects);
+ setTransferCount(user.undo_transfer_projects);
+ setApplyCount(user.undo_join_projects);
+ setMessagesCount(user.undo_messages);
}
- if(undo_messages){
- setMessages(undo_messages);
- }
- },[user,undo_messages])
+ },[user])
useEffect(()=>{
if(pathname && username){
if(pathname === `/users/${username}/notice`){
setMenu("notify");
+ changeNum(user.undo_messages);
}
if(pathname === `/users/${username}/notice/undo`){
setMenu("undo");
}
+ if(pathname === `/users/${username}/notice/apply`){
+ setMenu("apply");
+ }
}
- },[pathname])
-
- function fetchUser(){
- props && props.fetchUser();
- }
+ },[pathname,user])
function changeNum(){
- fetchUser();
+ if(flag){
+ messagesCount && props.deleteUndoEvent(messagesCount);
+ setFlag(false);
+ }
+ }
+
+ function deleteEvent(type,count) {
+ let c = count;
+ if(type==="apply"){
+ setApplyCount(applyCount-count);
+ }else if(type==="undo"){
+ setTransferCount(applyCount-count);
+ }else{
+ setMessagesCount(0);
+ c = messagesCount;
+ }
+ (c || c===0) && props.deleteUndoEvent(c);
}
return (
@@ -58,27 +86,39 @@ function Index(props){
+ {
+ list && list.length > 0 ?
+
+ -
+ {
+ list.map((i,k)=>{
+ return(
+
-
+
+
+++ {i.user && i.user.name} + {i.time_ago} +
++ +申请以【{i.role === "developer" ?"开发者":i.role === "manager" ? "管理者":"报告者"}】身份加入【{i.project && i.project.name}】项目。是否同意？
+ { + i.status === "common" && + +acceptDivert(i.id)}> + 同意 + +revertDivert(i.id)}> + 拒绝 + + + } + { + i.status === "accepted" && 已接受 + } + { + i.status === "refused" && 已拒绝 + } +
+ )
+ })
+ }
+
+ {setPage(p)}}/>
+
+ }
+ 取消转移【{project && project.name}】仓库
case 'common': return正在将【{project && project.name}】仓库转移给【{owner && owner.name}】
- case 'successed': + case 'successed': return【{project && project.name}】仓库成功转移给【{owner && owner.name}】
default: return拒绝转移【{project && project.name}】仓库
} + }else{ + return "" + } + } + function renderApplyStatus(status,applied) { + let { project } = applied; + if(status){ + switch(status){ + case 'successed': + return已通过你加入【{project && project.name}】项目的申请
+ default: + return已拒绝你加入【{project && project.name}】项目的申请
+ } }else{ return "" } @@ -53,38 +73,40 @@ function Notify(props){ return(
- {
- list && list.length > 0 ?
-
-
+
)
}
diff --git a/src/forge/Notice/UndoEvent.jsx b/src/forge/Notice/UndoEvent.jsx
index afb5c706..c8c579dc 100644
--- a/src/forge/Notice/UndoEvent.jsx
+++ b/src/forge/Notice/UndoEvent.jsx
@@ -1,7 +1,7 @@
import React, { useEffect, useState } from "react";
import Nodata from '../Nodata';
import { FlexAJ } from '../Component/layout';
-import { Pagination , Popconfirm } from 'antd';
+import { Pagination , Popconfirm , Spin } from 'antd';
import { Link } from 'react-router-dom';
import { getImageUrl } from 'educoder';
import Axios from 'axios';
@@ -12,9 +12,11 @@ function UndoEvent(props){
const [ list , setList ] = useState(undefined);
const [ page , setPage ] = useState(1);
const [ total , setTotal ] = useState(0);
+ const [ isSpin , setIsSpin ] = useState(true);
useEffect(()=>{
if(username){
+ setIsSpin(true);
getList();
}
},[username,page])
@@ -29,6 +31,7 @@ function UndoEvent(props){
if(result){
setList(result.data.applied_transfer_projects);
setTotal(result.data.total_count);
+ setIsSpin(false);
}
}).catch(error=>{})
}
@@ -39,7 +42,7 @@ function UndoEvent(props){
Axios.post(url).then(result=>{
if(result && result.data){
getList();
- props && props.fetchUser();
+ props && props.deleteEvent("undo",1);
}
}).catch(error=>{})
}
@@ -50,16 +53,17 @@ function UndoEvent(props){
Axios.post(url).then(result=>{
if(result && result.data){
getList();
- props && props.fetchUser();
+ props && props.deleteEvent("undo",1);
}
}).catch(error=>{})
}
return(
-
- {
- list.map((i,k)=>{
- return(
-
-
-
-
--- {i.applied_user && i.applied_user.name} - {i.time_ago} -
- {renderStatus(i.status,i.applied)} -
- )
- })
- }
-
+ {
+ list && list.length > 0 ?
+
- :
- ""
- }
- {list && list.length === 0 && -
+ {
+ list.map((i,k)=>{
+ return(
+
-
+ ++
+ {i.applied_user && i.applied_user.name} + {i.time_ago} +
+ { i.applied_type === "AppliedProject" ? renderApplyStatus(i.status,i.applied):renderStatus(i.status,i.applied)} +
+ )
+ })
+ }
+
+ {setPage(p)}}/>
+
+ }
- {setPage(p)}}/>
-
- }
+
- {
- list && list.length > 0 ?
-
+
+
{list && list.length === 0 &&
:
}
diff --git a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
index 847dd6ef..a0d8ec78 100644
--- a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
+++ b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx
@@ -146,7 +146,7 @@ export default ((props) => {
<span>团队成员管理</span>
- <AddMember getID={getID}/>
+ <AddMember getID={getID} showNotification={props.showNotification}/>
)
diff --git a/src/forge/UsersList/fork_users.js b/src/forge/UsersList/fork_users.js
index aaaa9b62..e38f4619 100644
--- a/src/forge/UsersList/fork_users.js
+++ b/src/forge/UsersList/fork_users.js
@@ -97,7 +97,9 @@ class ForkUsers extends Component {
+ {
+ list && list.length > 0 ?
- :
- ""
- }
+ -
{
list.map((i,k)=>{
@@ -73,7 +77,7 @@ function UndoEvent(props){
请求将仓库【{i.project && i.project.name}】 - 转移给【{i.owner && i.owner.name}】,是否接受？
+ 转移给【{i.owner && i.owner.name}】，是否接受？ { i.status === "common" && @@ -101,10 +105,11 @@ function UndoEvent(props){ }) }
diff --git a/src/forge/Team/New.jsx b/src/forge/Team/New.jsx
index f4a9880b..1f06dc22 100644
--- a/src/forge/Team/New.jsx
+++ b/src/forge/Team/New.jsx
@@ -144,7 +144,7 @@ export default Form.create()(
- +
{item.name}
diff --git a/src/forge/UsersList/user_list.js b/src/forge/UsersList/user_list.js
index 592e9806..c3324dc5 100644
--- a/src/forge/UsersList/user_list.js
+++ b/src/forge/UsersList/user_list.js
@@ -1,5 +1,6 @@
import React, { Component } from "react";
import { getImageUrl } from "educoder";
+import { Link } from 'react-router-dom';
import FocusButton from "./focus_button";
import { Button } from "antd";
import "./list.css";
@@ -25,12 +26,14 @@ class UserList extends Component {
-
{item.name}
-
+
diff --git a/src/forge/Utils/locData.js b/src/forge/Utils/locData.js
index f1d38dbf..5ebba6cc 100644
--- a/src/forge/Utils/locData.js
+++ b/src/forge/Utils/locData.js
@@ -5338,10 +5338,10 @@ export const locData = Array.from(province.keys()).map(p=>({
label:p,
children:Array.from(province.get(p).keys()).map((c,key)=>({
value:c,
- label:c,
- children:Array.from(area.keys())[key].map(a=>({
- value:a,
- label:a,
- }))
+ label:c,
+ // children:Array.from(area.keys())[key].map(a=>({
+ // value:a,
+ // label:a,
+ // }))
}))
}));
\ No newline at end of file
diff --git a/src/forge/users/Echart/Calendar.jsx b/src/forge/users/Echart/Calendar.jsx
new file mode 100644
index 00000000..743a0a55
--- /dev/null
+++ b/src/forge/users/Echart/Calendar.jsx
@@ -0,0 +1,145 @@
+import React ,{ useEffect, useState } from 'react';
+import * as echarts from 'echarts';
+import moment from 'moment';
+import Axios from 'axios';
+
+function Calendar({ userLogin , time , chooseTime }) {
+ const [ endT, setEndT ] = useState("");
+ const [ baginT, setBaginT ] = useState("");
+
+ useEffect(()=>{
+ if(time){
+ let e,b = "";
+ if(parseInt(time,0) === parseInt(moment().get('year'),0)){
+ let y = moment().get('year');
+ let m = moment().get('month');
+ let d = moment().get('date');
+ e = `${y}-${m+1}-${d}`;
+ b = `${y-1}-${m+1}-${d}`;
+ }else{
+ e = `${time}-12-31`;
+ b = `${time}-01-01`;
+ }
+ setEndT(e);
+ setBaginT(b);
+ }
+ },[time])
+
+ useEffect(()=>{
+ if(baginT && endT){
+ getData();
+ }
+ },[baginT,endT])
+
+ function getData() {
+ const url = `/users/${userLogin}/headmaps.json`;
+ Axios.get(url).then(result=>{
+ if(result && result.data){
+ let m = result.data.headmaps;
+ m.sort(compare('contributions'));
+ let max = m[m.length -1].contributions;
+ Init(m,max);
+ }
+ }).catch(error=>{})
+ }
+
+ function compare(property){
+ return function(a,b){
+ var value1 = a[property];
+ var value2 = b[property];
+ return value1 - value2;
+ }
+ }
+
+ function getVirtulData(data) {
+ var date = +echarts.number.parseDate(baginT);
+ var end = +echarts.number.parseDate(endT);
+ var dayTime = 3600 * 24 * 1000;
+ var array = [];
+ for (var time = date; time <= end; time += dayTime) {
+ let stamp = timestampToTime(time);
+ let stampFilter = data.filter(i=>i.date === stamp);
+ if(stampFilter && stampFilter.length > 0){
+ array.push([stampFilter[0].date,stampFilter[0].contributions]);
+ }else{
+ array.push([stamp,0]);
+ }
+ }
+ return array;
+ }
+
+ function timestampToTime(timestamp) {
+ var date = new Date(timestamp);
+ var Y = date.getFullYear() + '-';
+ var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-';
+ var D = date.getDate() < 10 ? '0' + date.getDate() : date.getDate();
+ return Y+M+D;
+ }
+
+ function Init(data,max) {
+ var huan_val = document.getElementById("Calendar");
+ var myEcharts = echarts.init(huan_val);
+ let option = {
+ title: {
+ show:false
+ },
+ tooltip: {
+ formatter:function(params){
+ return params.data[0] + ': ' + params.data[1] + '个贡献';
+ }
+ },
+ visualMap: {
+ min: 0,
+ max: max,
+ type: 'piecewise',
+ orient: 'horizontal',
+ left: 'center',
+ bottom: 40,
+ inRange:{
+ color:['#fafafa', '#216e39']
+ }
+ },
+ calendar: {
+ top: 50,
+ left: 40,
+ right: 30,
+ cellSize: ['auto', 13],
+ range: [baginT, endT],
+ splitLine:{
+ show:false,
+ lineStyle:{
+ color:"#fff",
+ width:1,
+ type:"solid"
+ }
+ },
+ itemStyle: {
+ borderWidth: 0.5
+ },
+ yearLabel: {show: false},
+ monthLabel:{
+ nameMap:"cn"
+ },
+ dayLabel:{
+ nameMap:"cn",
+ firstDay:1
+ }
+ },
+ series: {
+ type: 'heatmap',
+ coordinateSystem: 'calendar',
+ data: getVirtulData(data)
+ }
+ };
+ myEcharts.setOption(option);
+ myEcharts.on('click', function (params) {
+ chooseTime(params.data);
+ });
+ }
+
+
+ return(
+
+ )
+}
+export default Calendar;
\ No newline at end of file
diff --git a/src/forge/users/Echart/Cloud.jsx b/src/forge/users/Echart/Cloud.jsx
index cbe182a2..778b30e7 100644
--- a/src/forge/users/Echart/Cloud.jsx
+++ b/src/forge/users/Echart/Cloud.jsx
@@ -4,41 +4,48 @@ import Js2WordCloud from 'js2wordcloud/dist/js2wordcloud.js'
function Cloud({data}) {
useEffect(()=>{
- optionChart1();
- },[])
+ if(data){
+ optionChart1(data);
+ }
+ },[data])
- function optionChart1(){
+ function optionChart1(d){
var div = new Js2WordCloud(document.getElementById('cloud'))
- let textList=[
- ['服务'], ['细致'], ['意识'], ['踏实'],['开发'], ['反馈'], ['协助'],['使用'],['谈判']
- ]
+ let textList= d.categories;
let cyList=[]
- for(let i=0;i<60;i++){
- cyList.push([textList[parseInt(Math.random()*textList.length)],Math.round(Math.random()*10)+1])
+ for(let i=0;i=12 && fontSize<=20) {
- return 'rgb(29,227,250,0.3)';
- } else if(fontSize>20 && fontSize<=30){
- return 'rgb(29,227,250,0.6)';
- }else if(fontSize>30 && fontSize<=40){
- return 'rgb(29,227,250)';
+ switch(fontSize){
+ case 21:
+ return "#f8e367"
+ case 20:
+ return "#99dfff"
+ case 19:
+ return "#ff9e48"
+ case 18:
+ return "#5ea6ff"
+ case 17:
+ return "#58c0f0"
+ default:
+ return "#bcbcbc"
}
},
})
}
return(
-
+
)
}
export default Cloud;
\ No newline at end of file
diff --git a/src/forge/users/Echart/Line.jsx b/src/forge/users/Echart/Line.jsx
index 2092b87c..e8c9ac64 100644
--- a/src/forge/users/Echart/Line.jsx
+++ b/src/forge/users/Echart/Line.jsx
@@ -2,88 +2,75 @@ import React ,{ useEffect } from 'react';
import * as echarts from 'echarts';
function Line({data}) {
- useEffect(()=>{
- Init();
- },[])
useEffect(()=>{
if(data){
- Init();
+ Init(data);
}
},[data])
- function Init() {
+ function Init(d) {
var huan_val = document.getElementById("Line");
var myEcharts = echarts.init(huan_val);
let option = {
- color: ["#f8e367", "#99dfff", "#58c0f0", "#5ea6ff", "#ff9e48", "#bcbcbc"],
+ color: ["#f8e367", "#58c0f0", "#ff9e48"],
title: {
- text: '近期活动统计',
- left: '3%'
+ show:false
},
tooltip: {
trigger: 'axis'
},
legend: {
- data: ['邮件营销', '联盟广告', '视频广告', '直接访问', '搜索引擎'],
- right: '3%'
+ data: ['提交数', '易修数', '合并请求数'],
+ right: 'center',
+ bottom: '4%',
},
grid: {
- left: '3%',
- right: '4%',
- bottom: '3%',
+ left: '4%',
+ right: '5%',
+ bottom: '16%',
containLabel: true
},
toolbox: {
- feature: {
- // saveAsImage: {}
- }
+ feature: {
+ // saveAsImage: {}
+ }
},
xAxis: {
- type: 'category',
- boundaryGap: false,
- data: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
+ type: 'category',
+ boundaryGap: false,
+ data: d.dates,
+ axisTick:{
+ show:false
+ }
},
yAxis: {
- type: 'value',
- axisLine:{
- show:false
- },
- axisTick:{
- show:false
- }
+ type: 'value',
+ axisLine:{
+ show:false
+ },
+ axisTick:{
+ show:false
+ },
+ minInterval:1,
+ splitNumber: 5,
},
series: [
- {
- name: '邮件营销',
- type: 'line',
- stack: '总量',
- data: [120, 132, 101, 134, 90, 230, 210]
- },
- {
- name: '联盟广告',
- type: 'line',
- stack: '总量',
- data: [220, 182, 191, 234, 290, 330, 310]
- },
- {
- name: '视频广告',
- type: 'line',
- stack: '总量',
- data: [150, 232, 201, 154, 190, 330, 410]
- },
- {
- name: '直接访问',
- type: 'line',
- stack: '总量',
- data: [320, 332, 301, 334, 390, 330, 320]
- },
- {
- name: '搜索引擎',
- type: 'line',
- stack: '总量',
- data: [820, 932, 901, 934, 1290, 1330, 1320]
- }
+ {
+ name: '提交数',
+ type: 'line',
+ data: d.commits_count
+ },
+ {
+ name: '易修数',
+ type: 'line',
+ data: d.issues_count
+ },
+ {
+ name: '合并请求数',
+ type: 'line',
+ data: d.pull_requests_count
+ }
]
};
myEcharts.setOption(option);
diff --git a/src/forge/users/Echart/Pie.jsx b/src/forge/users/Echart/Pie.jsx
index 460d7f00..d5489b98 100644
--- a/src/forge/users/Echart/Pie.jsx
+++ b/src/forge/users/Echart/Pie.jsx
@@ -3,32 +3,27 @@ import echarts from 'echarts/lib/echarts';
import 'echarts/lib/chart/pie';
function Pie({data}) {
- useEffect(()=>{
- Init();
- },[])
useEffect(()=>{
if(data){
- Init();
+ Init(data);
}
},[data])
- function Init() {
+ function Init(d) {
var huan_val = document.getElementById("Pie");
var chart = echarts.init(huan_val);
let option = {
- color: ["#f8e367", "#99dfff", "#58c0f0", "#5ea6ff", "#ff9e48", "#bcbcbc"],
+ color: ["#f8e367", "#5ea6ff", "#ff9e48", "#99dfff"],
title: {
- text: '角色定位',
- top:"5%",
- left:"3%"
+ show:false
},
tooltip: {
trigger: 'item'
},
legend: {
top: '5%',
- right: '3%'
+ right: 'center'
},
series: [
{
@@ -56,11 +51,10 @@ function Pie({data}) {
show: false
},
data: [
- {value: 1048, name: '搜索引擎'},
- {value: 735, name: '直接访问'},
- {value: 580, name: '邮件营销'},
- {value: 484, name: '联盟广告'},
- {value: 300, name: '视频广告'}
+ {value: d.developer && d.developer.count, name: '开发者'},
+ {value: d.manager && d.manager.count, name: '管理员'},
+ {value: d.owner && d.owner.count, name: '创建者'},
+ {value: d.reporter && d.reporter.count, name: '报告者'}
]
}
]
diff --git a/src/forge/users/Echart/Radar.jsx b/src/forge/users/Echart/Radar.jsx
index f427442e..5a75f2c8 100644
--- a/src/forge/users/Echart/Radar.jsx
+++ b/src/forge/users/Echart/Radar.jsx
@@ -3,58 +3,55 @@ import echarts from 'echarts/lib/echarts'
import 'echarts/lib/chart/radar';
function Radar({data}) {
- useEffect(()=>{
- Init();
- },[])
useEffect(()=>{
if(data){
- Init();
+ Init(data);
}
},[data])
- function Init() {
+ function Init(d) {
var huan_val = document.getElementById("radar");
var myEcharts = echarts.init(huan_val);
let option = {
color: ["#f8e367", "#99dfff", "#58c0f0", "#5ea6ff", "#ff9e48", "#bcbcbc"],
title: {
- text: '开发能力',
- top:"0",
- left:"3%"
+ show:false
},
legend: {
- data: ['预算分配', '实际开销'],
- top:"0",
+ data: ['个人能力(personal)', '社区平均(average)'],
+ top:"3%",
right:"center"
},
+ tooltip: {
+ trigger: 'item'
+ },
radar: {
// shape: 'circle',
indicator: [
- { name: '销售', max: 6500},
- { name: '管理', max: 16000},
- { name: '信息技术', max: 30000},
- { name: '客服', max: 38000},
- { name: '研发', max: 52000},
- { name: '市场', max: 25000}
+ { name: '影响力', max: 100},
+ { name: '贡献度', max: 100},
+ { name: '活跃度', max: 100},
+ { name: '项目经验', max: 100},
+ { name: '语言能力', max: 100},
],
center:["50%","55%"]
},
series: [{
- name: '预算 vs 开销',
+ name: '',
type: 'radar',
data: [
{
- value: [4200, 3000, 20000, 35000, 50000, 18000],
- name: '预算分配'
+ value: d.user && [d.user.influence, d.user.contribution, d.user.activity, d.user.experience, d.user.language],
+ name: '个人能力(personal)'
},
{
- value: [5000, 14000, 28000, 26000, 42000, 21000],
- name: '实际开销'
+ value: d.platform && [d.platform.influence, d.platform.contribution, d.platform.activity, d.platform.experience, d.platform.language],
+ name: '社区平均(average)'
}
]
}]
- };
+ };
myEcharts.setOption(option);
}
diff --git a/src/forge/users/Echart/Round.jsx b/src/forge/users/Echart/Round.jsx
new file mode 100644
index 00000000..ebcb1367
--- /dev/null
+++ b/src/forge/users/Echart/Round.jsx
@@ -0,0 +1,26 @@
+import React from 'react';
+import './style.scss';
+
+
+function Round({num,color,name}) {
+ return(
+ j.id === c[i]);
+ if(filter && filter.length>0){
+ l.push(filter[0]);
+ }
+ }
+ setCopyList(l);
+ }
+ }
+
+ function onOk() {
+ onSure && onSure(value);
+ setValue([]);
+ }
+
+ function chooseProject(e) {
+ setValue(e);
+ }
+
+ // 搜索
+ function onSearch(params) {
+ setCopyAllList(list);
+ value && value.length > 0 ? saveList(value) : setCopyList([]);
+ setPage(1);
+ setSearch(params);
+ getProjectList(1,params);
+ }
+
+
+ return(
+
+
+
+
+ )
+}
+export default ConcentrateBox;
\ No newline at end of file
diff --git a/src/forge/users/GeneralView/ConcentrateProject.jsx b/src/forge/users/GeneralView/ConcentrateProject.jsx
new file mode 100644
index 00000000..bfcf290d
--- /dev/null
+++ b/src/forge/users/GeneralView/ConcentrateProject.jsx
@@ -0,0 +1,83 @@
+import React, { useEffect, useState } from 'react';
+import { FlexAJ , AlignCenter } from '../../Component/layout';
+import { Link } from 'react-router-dom';
+import axios from 'axios';
+import Box from './ConcentrateBox';
+
+function ConcentrateProject({userLogin,current}) {
+ const [ list , setList ] = useState(undefined);
+ const [ visible , setVisible ] = useState(false);
+ const [ value , setValue ] = useState([]);
+
+ useEffect(()=>{
+ getList();
+ },[])
+
+ function getList() {
+ const url = `/users/${userLogin}/is_pinned_projects.json`;
+ axios.get(url).then(result=>{
+ if(result && result.data){
+ let p = result.data.projects;
+ setList(p);
+ if(p && p.length > 0){
+ let array = p.map(i=>{
+ return i.project_id
+ })
+ setValue(array);
+ }
+ }
+ }).catch(erroer=>{})
+ }
+
+ function onSure(is_pinned_project_ids) {
+ if(is_pinned_project_ids && is_pinned_project_ids.length===0){
+ setValue([]);
+ }
+ const url = `/users/${userLogin}/is_pinned_projects/pin.json`;
+ axios.post(url,{
+ is_pinned_project_ids
+ }).then(result=>{
+ if(result && result.data){
+ setVisible(false);
+ getList();
+ }
+ }).catch(error=>{})
+ }
+ return(
+
+ setVisible(false)} onSure={onSure} username={userLogin} choosed={value}/>
+ {
+ list && list.length>0 &&
+
+ )
+}
+export default ConcentrateProject;
\ No newline at end of file
diff --git a/src/forge/users/GeneralView/Index.jsx b/src/forge/users/GeneralView/Index.jsx
index 9a76e9aa..ded43582 100644
--- a/src/forge/users/GeneralView/Index.jsx
+++ b/src/forge/users/GeneralView/Index.jsx
@@ -1,22 +1,127 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
import './Index.scss';
import 'echarts/lib/component/tooltip';
import 'echarts/lib/component/title';
import 'echarts/lib/component/legend'
import 'echarts/lib/component/markPoint';
-import Pie from '../Echart/Pie';
-import Line from '../Echart/Line';
-import Radar from '../Echart/Radar';
-import Cloud from '../Echart/Cloud';
+import { Select , Pagination } from 'antd';
+import { FlexAJ } from '../../Component/layout';
+import Line from '../Echart/Line';
+import Calendar from '../Echart/Calendar';
+import ConcentrateProject from './ConcentrateProject';
+import Activity from './Activity';
+import moment from 'moment';
+import Axios from 'axios';
+import Nodata from '../../Nodata';
+
+const { Option } = Select;
+const aLimit = 5;
function Index(props) {
+ const [ page , setPage ] = useState(1);
+ const [ total , setTotal ] = useState(0);
+ const [ projectTrends , setProjectTrends ] = useState(undefined);
+
+ const [ year , setYear ] = useState(moment().get('year'));
+ const [ yearList , setYearList ] = useState(undefined);
+ const [ activityDate , setActivityDate ] = useState(undefined);
+
+ const [ statisticData , setStatisticData ] = useState(undefined);
+
+ const username = props.match.params.username;
+ const current_user = props.current_user;
+ const user = props.user;
+
+ useEffect(()=>{
+ if(user){
+ let c = user.created_time && user.created_time.split("-")[0];
+ let y = moment().get('year');
+ let array = []
+ for(var i = y ; i >= parseInt(c,0);i--){
+ array.push(i);
+ }
+ setYearList(array);
+ }
+ },[user])
+
+ // 在贡献度日历表中选择一个时间
+ function chooseTime(data) {
+ if(data){
+ setPage(1);
+ setActivityDate(data[0]);
+ }
+ }
+
+ // 年份下拉框option
+ function renderYear(list){
+ return list.map((i,k)=>{
+ return(
+
+ )
+ })
+ }
+
+ useEffect(()=>{
+ getActivity();
+ },[activityDate,page])
+
+ // 获取动态列表
+ function getActivity() {
+ const url = `/users/${username}/project_trends.json`;
+ Axios.get(url,{
+ params:{
+ date:activityDate,
+ limit:aLimit,page
+ }
+ }).then(result=>{
+ if(result && result.data){
+ setProjectTrends(result.data.project_trends);
+ setTotal(result.data.total_count);
+ }
+ }).catch(error=>{})
+ }
+
+ // 获取近期活动统计
+ useEffect(()=>{
+ getStatistics();
+ },[])
+
+ function getStatistics() {
+ const url = `/users/${username}/statistics/activity.json`;
+ Axios.get(url).then(result=>{
+ if(result && result.data){
+ setStatisticData(result.data);
+ }
+ }).catch(error=>{})
+ }
+
return(
);
diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js
index 3a185a78..e79e1021 100644
--- a/src/forge/users/InfosUser.js
+++ b/src/forge/users/InfosUser.js
@@ -100,9 +100,6 @@ class InfosUser extends Component {
const {is_public} = this.state
const new_is_public = is_public === check_is_public ? undefined : check_is_public
- // this.setState({
- // is_public: new_is_public
- // })
this.state.is_public = new_is_public
this.get_projects(new_is_public);
}
@@ -176,7 +173,7 @@ class InfosUser extends Component {
return (
-
+
+ )
+}
+export default Round;
\ No newline at end of file
diff --git a/src/forge/users/Echart/style.scss b/src/forge/users/Echart/style.scss
new file mode 100644
index 00000000..5a2aae38
--- /dev/null
+++ b/src/forge/users/Echart/style.scss
@@ -0,0 +1,69 @@
+.annulusBasics {
+ width : 74px;
+ height : 74px;
+ position : relative;
+ overflow : hidden;
+ border-radius: 50%;
+ text-align : center;
+ z-index : 1;
+}
+//圆环中间的白色
+.centerCircle {
+ position : absolute;
+ z-index : 10;
+ border-radius: 50%;
+ width : 60px;
+ height : 60px;
+ background : #fff;
+ transform : translate(7px, 7px);
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ line-height: 20px;
+ font-size: 12px;
+ .score{
+ font-size: 18px;
+ }
+}
+ //圆环百分比时出现圆环边框的颜色
+.annulusOuter {
+ position : absolute;
+ top : 0;
+ left : 0;
+ width : 74px;
+ height : 74px;
+ border : 12px solid #FF7F69;
+ border-radius: 50%;
+}
+//左边遮住圆环颜色的长方形
+.leftRectangle {
+ position : absolute;
+ background : #EBEEF5;
+ width : 37px;
+ height : 74px;
+ transform-origin: right;
+}
+//右边遮住圆环颜色的长方形
+.rightRectangle {
+ position : absolute;
+ background : #EBEEF5;
+ transform-origin: left;
+ left : 37px;
+ width : 37px;
+ height : 74px;
+ transform : rotate(0deg);
+}
+//弥补hidde在移动端失效的圆环
+.repairAnnulus{
+ position : absolute;
+ width : 74px;
+ height : 74px;
+ z-index : 20;
+ border-radius: 50%;
+ box-sizing : content-box;
+//改外边框的时候，位置也要改下
+ border : 20px solid #ffffff;
+ top : -20px;
+ left : -20px;
+}
\ No newline at end of file
diff --git a/src/forge/users/GeneralView/Activity.jsx b/src/forge/users/GeneralView/Activity.jsx
new file mode 100644
index 00000000..ce09e885
--- /dev/null
+++ b/src/forge/users/GeneralView/Activity.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+import { Link } from 'react-router-dom';
+import { AlignCenter } from '../../Component/layout';
+import { TagInfo } from '../../Utils/TagColor';
+import { getImageUrl } from 'educoder';
+
+function Activity({list}) {
+ return(
+
+ {num}分
+ {name}
+
+
+ {num > 50 ?
+
+ :
+
+ }
+ {num < 50 ?
+
+ :
+
+ }
+ -
+ {
+ list.map((i,k)=>{
+ return(
+
-
+
})
+ +++ {i.user_name} + {i.action_time} + {i.priority && TagInfo(`${i.priority}`,"")} + {i.issue_status && {i.issue_status} } + +{i.action_type}：{i.name}
+
+ )
+ })
+ }
+
+ setSearch(e.target.value)}
+ />
+
+ 最多可选取6个公开仓库
+
+
+ {
+ copyList && copyList.length >0 && copyList.map((i,k)=>{
+ return(
+ j === i.id).length===0)}>{i.author && i.author.name}/{i.name}
+ )
+ })
+ }
+ {
+ list && list.length > 0 && list.map((i,k)=>{
+ let c = copyList && copyList.length >0 && copyList.filter(j=>j.id === i.id).length !== 0;
+ return(
+ !c && j === i.id).length===0)}>{i.author && i.author.name}/{i.name}
+ )
+ })
+ }
+
+
+ { total > limit && page < pageSize && setPage(page+1)}>查看更多
}
+ { (list && list.length === 0) && (copyList && copyList.length === 0) && 您还没有公开的{search && `“${search}”`}项目，先去新建项目
}
+
+
+ 精选项目
+ { current && setVisible(true)}>自定义精选项目 }
+
+
+ }
+ {
+ list && list.length === 0 && current &&
+
+ -
+ {
+ list.map((i,k)=>{
+ return(
+
-
+ {i.name}
+
{i.description}
++ { i.category && {i.category.name} } + {i.watchers_count} + {i.forked_count} + +
+ )
+ })
+ }
+
你还没有设置精选项目，setVisible(true)}>点击设置
+ }
+
-
)
}
diff --git a/src/forge/users/GeneralView/Index.scss b/src/forge/users/GeneralView/Index.scss
index e69de29b..e79f6858 100644
--- a/src/forge/users/GeneralView/Index.scss
+++ b/src/forge/users/GeneralView/Index.scss
@@ -0,0 +1,146 @@
+.concentrate{
+ padding:20px 0px 0px;
+ .concentrateUl{
+ display: flex;
+ flex-wrap: wrap;
+ li{
+ width: 48.5%;
+ margin-right: 3%;
+ margin-top: 20px;
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ border:1px solid #dedede;
+ padding:15px 20px;
+ cursor: default ;
+ &:nth-child(2n){
+ margin-right: 0px;
+ }
+ .name{
+ font-size: 16px;
+ color: #4CACFF;
+ }
+ .desc{
+ color: #999;
+ }
+ .tagName{
+ display: block;
+ background-color: #f7f5f5;
+ border-radius: 3px;
+ color: #666;
+ padding:0px 10px;
+ height: 22px;
+ line-height: 22px;
+ font-size: 13px;
+ }
+ .pariseCount,.forkCount{
+ i{
+ font-size: 14px!important;
+ margin-right: 4px;
+ }
+ color: #999;
+ margin-left: 20px;
+ }
+ }
+ }
+}
+.ConcentrateTip{
+ margin:20px 20px 0px;
+ padding:5px 20px;
+ border:1px solid rgb(248, 56, 56);
+ border-radius: 4px;
+ background-color: rgba(248, 56, 56,0.1);
+ color: rgb(248, 56, 56);
+ display: flex;
+ align-items: center;
+ a{
+ color: #4cacff;
+ }
+ i{
+ font-size: 15px!important;
+ margin-right: 5px;
+ }
+}
+.ConcentrateBox{
+ .ant-modal-body{
+ min-height: 258px;
+ padding:0px;
+ padding-bottom: 15px;
+ }
+ .listbox{
+ max-height: 210px;
+ overflow-y: auto;
+ padding-left: 30px;
+ }
+ .operateDiv{
+ padding:20px 30px
+ }
+ .morelist{
+ text-align: center;
+ padding-top:15px;
+ cursor: pointer;
+ }
+ .ant-checkbox-group{
+ display: flex;
+ flex-wrap: wrap;
+ .ant-checkbox-wrapper{
+ width: 50%;
+ margin-left: 0px!important;
+ display: flex;
+ .ant-checkbox{
+ padding-top: 3px;
+ }
+ span:last-child{
+ flex:1;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ }
+ }
+}
+.recentStatic{
+ padding: 30px 0px;
+}
+.calendarStatic,.activeStatic{
+ .infosActivity{
+ padding-bottom: 30px;
+ &>li{
+ display: flex;
+ border-bottom:1px solid #eee;
+ align-items: center;
+ padding:20px 0px;
+ .aImg{
+ width: 48px;
+ height: 48px;
+ margin-right: 20px;
+ border-radius: 50%;
+ }
+ .aInfos{
+ flex: 1;
+ span{
+ margin-left: 20px;
+ margin-right: 0px;
+ }
+ .name{
+ font-size: 16px;
+ color:#333;
+ }
+ .time,.status{
+ color: #999;
+ }
+ .aDesc{
+ color: #666;
+ margin-top: 5px;
+ line-height: 20px;
+ }
+ }
+ &:last-child{
+ border-bottom:none;
+ }
+ }
+ }
+}
+.activeStatic{
+ padding-top: 20px;
+}
\ No newline at end of file
diff --git a/src/forge/users/Index.scss b/src/forge/users/Index.scss
index d8d4ecd4..fa8bc294 100644
--- a/src/forge/users/Index.scss
+++ b/src/forge/users/Index.scss
@@ -1,6 +1,6 @@
$flex:flex;
.headerbox{
- padding:20px 40px;
+ padding:20px;
border-bottom: 1px solid #E0E0E0;
display: $flex;
align-items: center;
@@ -24,8 +24,17 @@ $flex:flex;
margin-right: -1px;
}
}
+
+.echartBox{
+ border:1px solid #DEDEDE;
+ &>p{
+ color: #999;
+ padding:15px 20px;
+ text-align: center;
+ }
+}
.contentBox{
- padding:20px 40px 0px 40px;
+ padding:20px 20px 0px 20px;
& > div{
margin-bottom: 20px;
display: $flex;
@@ -60,7 +69,7 @@ $flex:flex;
}
}
.infosType{
- padding:20px 30px 0px 30px;
+ padding:20px 30px 0px 20px;
display: flex;
justify-content: space-between;
.infoStatus{
@@ -88,7 +97,67 @@ $flex:flex;
}
}
}
-
+.userDescription{
+ color: #666666;
+ line-height: 18px;
+ text-align: left;
+ margin:10px 0px;
+ word-break: break-all;
+ text-align: justify;
+ font-size: 16px;
+}
+.focusBox,.infoBox{
+ width: 100%!important;
+ display: inline-block;
+ margin-top: 30px;
+ padding-top: 30px;
+ border-top: 1px solid #f1f1f1;
+}
+.infoBox{
+ padding-bottom: 10px;
+ text-align: left;
+ line-height: 28px;
+ color: #666;
+ margin-top: 20px;
+ &>div{
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ i{
+ color: #DEDEDE;
+ font-size: 15px!important;
+ }
+ span{
+ margin-left:10px ;
+ }
+}
+.headimg{
+ position: relative;
+ display: block;
+ img{
+ width: 110px;
+ height: 110px;
+ border-radius: 50%;
+ }
+ span{
+ position: absolute;
+ bottom: -6px;
+ right: 0px;
+ left: 65px;
+ i{
+ font-size: 25px!important;
+ border-radius: 50%;
+ background-color: #fff;
+ &.icon-nan{
+ color: #1890FF;
+ }
+ &.icon-nv{
+ color: pink;
+ }
+ }
+ }
+}
ul.ant-menu.menuStyle{
padding:0px 30px;
font-size: 16px;
@@ -97,6 +166,7 @@ ul.ant-menu.menuStyle{
line-height: 70px;
padding:0px;
margin-right: 30px!important;
+ border-bottom:transparent!important;
}
}
.disposeInfo{
@@ -135,4 +205,36 @@ ul.ant-menu.menuStyle{
padding:28px 0px;
border-bottom: 1px solid #eee;
}
+}
+
+.infosRightMenu{
+ .ant-menu-item{
+ padding:0px;
+ margin:0px 20px!important;
+ font-size: 17px;
+ height: 32px;
+ line-height: 0px;
+ border-bottom: 2px solid transparent!important;
+ position: relative;
+ a{
+ & >i{
+ font-size: 15px!important;
+ margin-right: 8px;
+ }
+ }
+ .menuNum{
+ font-size: 12px;
+ margin-left: 3px;
+ color: #FF6E21;
+ }
+ &.ant-menu-item-selected::before{
+ position: absolute;
+ width: 100%;
+ bottom: -1px;
+ height: 2px;
+ left: 0px;
+ background-color: #1890ff;
+ content:"";
+ }
+ }
}
\ No newline at end of file
diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js
index 7e4e660a..9b292d2e 100644
--- a/src/forge/users/Infos.js
+++ b/src/forge/users/Infos.js
@@ -1,6 +1,6 @@
import React, { Component } from "react";
import { Link } from "react-router-dom";
-import { Avatar, Tag, Button, Spin } from "antd";
+import { Button, Spin , Menu } from "antd";
import FocusButton from "../UsersList/focus_button";
import axios from "axios";
@@ -14,7 +14,10 @@ import './Index.scss';
import Loadable from "react-loadable";
import Loading from "../../Loading";
-
+const UpdateInfo = Loadable({
+ loader: () => import("./Material/Index"),
+ loading: Loading,
+});
const InfosDevOps = Loadable({
loader: () => import("./devOpsCI"),
loading: Loading,
@@ -24,6 +27,10 @@ const InfosDevOpsCD = Loadable({
loading: Loading,
});
+const Statistics = Loadable({
+ loader: () => import("./Statistics/Index"),
+ loading: Loading,
+});
const GeneralView = Loadable({
loader: () => import("./GeneralView/Index"),
loading: Loading,
@@ -59,19 +66,50 @@ class Infos extends Component {
project_type: undefined,
route_type: undefined,
undo_events:0,
- undo_messages:0
+ menuKey:"0"
};
}
+ renderPath=(pathname)=>{
+ const { username } = this.props.match.params;
+ if(pathname === `/users/${username}`){
+ this.setState({menuKey:"0",route_type:undefined});
+ }else if(pathname === `/users/${username}/statistics`){
+ this.setState({menuKey:"1",route_type:undefined});
+ }else if(pathname.indexOf(`/users/${username}/projects`)>-1){
+ this.setState({menuKey:"2",route_type:undefined});
+ }else if(pathname.indexOf(`/users/${username}/notice`)>-1){
+ this.setState({menuKey:"3",route_type:undefined});
+ }else if(pathname.indexOf(`/users/${username}/devops`)>-1){
+ this.setState({menuKey:"4",route_type:undefined});
+ }else if(pathname === `/users/${username}/organizes`){
+ this.setState({menuKey:"5",route_type:undefined});
+ }else if(pathname === `/users/${username}/watchers`){
+ this.setState({menuKey:undefined,route_type:"watchers"});
+ }else if(pathname === `/users/${username}/fan_users`){
+ this.setState({menuKey:undefined,route_type:"fan_users"});
+ }else{
+ this.setState({menuKey:undefined,route_type:undefined});
+ }
+ }
+
componentDidMount = () => {
this.fetchUser();
+ const { pathname } = this.props.location;
+ this.renderPath(pathname);
};
+
componentDidUpdate=(prevProps)=>{
const { username } = this.props.match.params;
const prevUser = prevProps.match.params.username;
if(prevUser && username && prevUser !== username){
this.fetchUser();
}
+ const { pathname } = this.props.location;
+ const prevPath = prevProps.location.pathname;
+ if(prevPath && pathname && prevPath !== pathname){
+ this.renderPath(pathname);
+ }
this.props.history.listen(()=>{
if (document.body.scrollTop || document.documentElement.scrollTop > 0) {
window.scrollTo(0, 0)
@@ -85,43 +123,21 @@ class Infos extends Component {
});
const { current_user } = this.props;
const { username } = this.props.match.params;
- const { pathname } = this.props.location;
- const { notice } = this.state;
let url = `/users/${username || (current_user && current_user.login)}.json`;
- axios
- .get(url)
- .then((result) => {
- let e = result.data && result.data.undo_events;
- let p = result.data && result.data.undo_messages;
- let n = notice || pathname === `/users/${username}/notice` ;
- this.setState({
- user: result.data,
- isSpin: false,
- undo_events:n ? (e-p) : e,
- undo_messages:0,
- notice:n
- });
- })
- .catch((error) => {
- this.setState({
- isSpin: false,
- });
+ axios.get(url).then((result) => {
+ let e = result.data && result.data.undo_events;
+ this.setState({
+ user: result.data,
+ isSpin: false,
+ undo_events:e
});
- };
-
- change_project_type = (type) => {
- const {user} = this.state
- this.setState({
- project_type: type ,
- route_type: undefined
})
- let url = `/users/${user && user.login}`
- if (type){
- url = `/users/${user && user.login}/projects/${type}`
- }
- this.props.history.push(url)
-
+ .catch((error) => {
+ this.setState({
+ isSpin: false,
+ });
+ });
};
change_devops_type=(type)=>{
@@ -138,7 +154,6 @@ class Infos extends Component {
this.setState({
route_type: undefined,
project_type:"notice",
- notice:true
},()=>{
this.props.history.push(`/users/${user && user.login}/notice`);
this.fetchUser();
@@ -160,43 +175,59 @@ class Infos extends Component {
this.props.history.push(`/users/${user && user.login}/organizes`)
}
+ resetUser=()=>{
+ const { resetUserInfo } = this.props;
+
+ this.fetchUser();
+ resetUserInfo && resetUserInfo();
+ }
+
+ // 修改待办事项右侧的数量
+ deleteUndoEvent=(count)=>{
+ let { undo_events } = this.state;
+ let undo = undo_events - count;
+ this.setState({
+ undo_events:undo
+ })
+ }
render() {
- const { current_user, mygetHelmetapi } = this.props;
+ const { current_user } = this.props;
const { username } = this.props.match.params;
-
- const { user, isSpin, project_type, route_type , undo_events , undo_messages } = this.state;
+ const { user, isSpin, route_type , undo_events , menuKey } = this.state;
return (
+
+
+
+ 近期活动统计
+
+
+ 贡献度
+
+
+
+
+
+
+
+ 动态
+ { projectTrends && projectTrends.length > 0 && }
+ { projectTrends && projectTrends.length === 0 && setPage(p)}/> }
+
-
-
+
- {user && user.user_identity}
-
- )}
-
+
+
+ 
+
+ {
+ user && user.gender===1?
+
+ :
+
+ }
+
+
+
+
- {current_user && user && user.login === current_user.login ? (
-
{user && user.username}
-
+
+ {user && user.description}
+
{user && current_user && user.login === current_user.login && (
)}
-
+
-
{user && user.watched_count}
-
-
- ):""}
-
-
-
-
-
- this.undo_link()}> - - - 待办事项 - - - {undo_events} - -
-
-
- {
- current_user && current_user.login && current_user.login === username &&
- -
-
- this.change_project_type(undefined)}> - - 项目类型 - - -
- this.change_project_type("common")}>
-
- 开源托管项目 - - {user && user.common_projects_count} - -
-
- - this.change_project_type("mirror")}>
-
- 开源镜像项目 - - {user && user.mirror_projects_count} - -
-
- - this.change_project_type("sync_mirror")}>
-
- 镜像托管项目 - - {user && user.sync_mirror_projects_count} - -
-
-
-
- }
- -
-
- - - DevOps工作流 - - -
- this.change_devops_type("CIService")}>
-
- CI服务 -
-
- {/* - this.change_devops_type("CDService")}>
-
- CD服务 - - {user && user.common_projects_count} - -
- */}
-
-
-
-
+ {
+ user && (user.province || user.custom_department || user.email) ?
+
this.organize_link()} > - - - 组织 - - - {user && user.user_org_count} - -
-
+ { user.province &&
+ :""
+ }
{user.province}{user.city}
}
+ { user.custom_department && {user.custom_department}
}
+ { user.email && {user.email}
}
+
+ { !route_type && menuKey &&
+
+ }
{user && (
- ;
+ }}
+ >
+ {
+ return ;
+ }}
+ >
+ {
+ return
+ {
+ return
+ {
+ return
+ {
+ return
+ {
+ return ;
+ }}
+ >
+ {
+ return
+
+ {
+ return
+ {
+ return
+ {
+ return
+
)}
-
-
+
+ {
+ return ;
+ }}
+ >
{
- return
- {
- return ;
- }}
- >
- {
- return
- {
- return
- {
- return
- {
- return
- {
- return
- {
- return
- {
- return
-
-
+ path="/users/:username/notice"
+ render={() => {
+ return
+
{
+ const { getFieldDecorator, validateFields , setFieldsValue } = props && props.form;
+ const { username } = props && props.match && props.match.params;
+ const { user , resetUser , current_user } = props;
+
+ useEffect(()=>{
+ if(current_user && current_user.login){
+ setFieldsValue({
+ ...current_user,
+ location:current_user.province && [current_user.province,current_user.city]
+ })
+ }
+ },[current_user])
+
+ function submit() {
+ validateFields((error,values)=>{
+ if(!error){
+ submitFunc(values);
+ }
+ })
+ }
+
+ function submitFunc(values) {
+ const url = `/users/${username}.json`;
+ const params={
+ user: {
+ nickname: values.real_name,
+ user_extension_attributes: {
+ province: values.location && values.location[0],
+ city: values.location && values.location[1],
+ ...values
+ }
+ }
+ }
+ Axios.put(url,params).then(result=>{
+ if(result && result.data){
+ props.showNotification("资料修改成功！")
+ resetUser && resetUser(result.data);
+ props.history.push(`/users/${username}`)
+ }
+ }).catch(error=>{})
+ }
+
+ return(
+