diff --git a/src/forge/Branch/branch.css b/src/forge/Branch/branch.css
index ff65db541..962b01970 100644
--- a/src/forge/Branch/branch.css
+++ b/src/forge/Branch/branch.css
@@ -51,7 +51,7 @@
display: flex;
align-items: center;
cursor: pointer;
- min-width: 240px;
+ min-width: 140px;
}
.branch-tagBox-list .ant-popover-arrow{
display: none;
diff --git a/src/forge/Component/AddGroup.jsx b/src/forge/Component/AddGroup.jsx
new file mode 100644
index 000000000..656175d5f
--- /dev/null
+++ b/src/forge/Component/AddGroup.jsx
@@ -0,0 +1,83 @@
+import React, { useEffect, useState } from 'react';
+import { AutoComplete , Button , Icon } from 'antd';
+import axios from 'axios';
+
+const { Option } = AutoComplete;
+function AddGroup({organizeId,getGroupID}){
+ const [ id , setID ] = useState(undefined);
+ const [ source , setSource ] = useState(undefined);
+ const [ searchKey , setSearchKey ] = useState("");
+
+ useEffect(()=>{
+ getUserList();
+ },[searchKey])
+
+ function getUserList(e){
+ const url = `/organizations/${organizeId}/teams/search.json`;
+ axios.get(url, {
+ params: {
+ search: searchKey,
+ },
+ }).then((result) => {
+ if (result) {
+ sourceOptions(result.data.teams);
+ }
+ })
+ .catch((error) => {
+ console.log(error);
+ });
+ };
+
+ function sourceOptions(userDataSource){
+ const s = userDataSource && userDataSource.map((item, key) => {
+ return (
+
+ );
+ });
+ setSource(s);
+ }
+
+ function changeInputUser(e){
+ setSearchKey(e || "");
+ };
+
+ // 选择用户
+ function selectInputUser(e, option){
+ setID(e);
+ setSearchKey(option.props.name);
+ };
+
+ function addCollaborator(){
+ getGroupID && getGroupID(id);
+ }
+
+ return(
+
+ )
+}
+export default AddGroup;
\ No newline at end of file
diff --git a/src/forge/Component/AddMember.jsx b/src/forge/Component/AddMember.jsx
new file mode 100644
index 000000000..a41882295
--- /dev/null
+++ b/src/forge/Component/AddMember.jsx
@@ -0,0 +1,95 @@
+import React, { useEffect, useState } from 'react';
+import { AutoComplete , Button , Icon } from 'antd';
+import axios from 'axios';
+import { getImageUrl } from 'educoder';
+
+const { Option } = AutoComplete;
+function AddMember({getID,login}){
+ const [ id , setID ] = useState(undefined);
+ const [ source , setSource ] = useState(undefined);
+ const [ searchKey , setSearchKey ] = useState(undefined);
+
+ useEffect(()=>{
+ getUserList();
+ },[searchKey])
+
+ function getUserList(e){
+ const url = `/users/list.json`;
+ axios.get(url, {
+ params: {
+ search: searchKey,
+ },
+ }).then((result) => {
+ if (result) {
+ sourceOptions(result.data.users);
+ }
+ })
+ .catch((error) => {
+ console.log(error);
+ });
+ };
+
+ function sourceOptions(userDataSource){
+ const s = userDataSource && userDataSource.map((item, key) => {
+ return (
+
+ );
+ });
+ setSource(s);
+ }
+
+ function changeInputUser(e){
+ setSearchKey(e);
+ };
+
+ // 选择用户
+ function selectInputUser(e, option){
+ setID(login ? e : option.props.login);
+ setSearchKey(option.props.name);
+ };
+
+ function addCollaborator(){
+ getID && getID(id);
+ }
+
+ return(
+
+ )
+}
+export default AddMember;
\ No newline at end of file
diff --git a/src/forge/Component/Cards.jsx b/src/forge/Component/Cards.jsx
index f35d890ad..1c9706c3f 100644
--- a/src/forge/Component/Cards.jsx
+++ b/src/forge/Component/Cards.jsx
@@ -1,13 +1,15 @@
import React from 'react';
+import { getImageUrl } from 'educoder';
+import { Link } from 'react-router-dom';
import './Component.scss';
-export default (({img , title, desc , rightBtn})=>{
+function Cards({img , title, desc , rightBtn , src}){
return(
-
+ {img &&
}
- {title}
+ {title}
{rightBtn}
@@ -16,4 +18,5 @@ export default (({img , title, desc , rightBtn})=>{
)
-})
\ No newline at end of file
+}
+export default Cards;
\ No newline at end of file
diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss
index 202cdd0db..d27d4aae4 100644
--- a/src/forge/Component/Component.scss
+++ b/src/forge/Component/Component.scss
@@ -19,6 +19,8 @@ li.ant-menu-item{
padding:20px 34px;
background-color: #fff;
margin-bottom:18px;
+ min-height: 130px;
+ border:1px solid #eee;
.img{
margin-right: 20px;
width: 190px;
@@ -27,8 +29,10 @@ li.ant-menu-item{
display: flex;
justify-content: center;
align-items: center;
+ overflow: hidden;
img{
max-width: 100%;
+ max-height: 100%;
}
}
.content{
@@ -39,7 +43,9 @@ li.ant-menu-item{
justify-content: space-between;
margin-bottom: 10px!important;
align-items: center;
- &>span{
+ height: 22px;
+ line-height: 22px;;
+ &>a{
font-size:18px ;
color: #333;
}
@@ -50,11 +56,13 @@ li.ant-menu-item{
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
+ line-height: 20px;
}
}
}
// Tabs
.tabsStyle{
+ border:1px solid #eee;
.ant-tabs-bar.ant-tabs-top-bar{
padding-left: 35px;
margin-bottom: 0px;
@@ -129,4 +137,18 @@ li.ant-menu-item{
.handleBox{
right:0px;
}
+}
+.ant-drawer{
+ z-index: 10000!important;
+}
+.ant-drawer-body{
+ padding:0px!important;
+ .drawerHead{
+ background-color: #333;
+ color: #fff;
+ padding:15px 20px;
+ }
+ .ant-tree{
+ margin:0px 20px!important;
+ }
}
\ No newline at end of file
diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx
new file mode 100644
index 000000000..7848f9fc5
--- /dev/null
+++ b/src/forge/Component/Contributors.jsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { AlignCenter , FlexAJ } from '../Component/layout';
+import { Link } from 'react-router-dom';
+import { getImageUrl } from 'educoder';
+
+function Contributors({contributors,owner,projectsId}){
+ return(
+
+
+ 贡献者{ contributors && contributors.total_count > 0 && {contributors.total_count}}
+ 全部
+
+
+ {
+ contributors && contributors.total_count > 0 ?
+ contributors.list.map((item,key)=>{
+ return(
+
})
+ )
+ })
+ :""
+ }
+
+
+ )
+}
+export default Contributors;
\ No newline at end of file
diff --git a/src/forge/Component/DrawerPanel.jsx b/src/forge/Component/DrawerPanel.jsx
new file mode 100644
index 000000000..8070f3fa3
--- /dev/null
+++ b/src/forge/Component/DrawerPanel.jsx
@@ -0,0 +1,99 @@
+import React, { useEffect, useState } from 'react';
+import { Drawer , Tree , Spin } from 'antd';
+import './Component.scss';
+import axios from 'axios';
+const { TreeNode , DirectoryTree } = Tree;
+
+function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , list}){
+ const [ treeData , setTreeData ] = useState(undefined);
+ const [ isSpin , setIsSpin ] = useState(true);
+ const [first , setFirst ] = useState(true);
+ useEffect(()=>{
+ if(visible && first){
+ if(list){
+ setTreeData(list);
+ setIsSpin(false);
+ }else{
+ getMenulist();
+ }
+ setFirst(false);
+ }
+ },[visible])
+
+ function getMenulist(){
+ const url = `/${owner}/${projectsId}/entries.json`;
+ axios.get(url,{ params: { ref: branch } }).then(result=>{
+ if(result){
+ setTreeData(result.data.entries);
+ }
+ setIsSpin(false);
+ }).catch(error=>{})
+ }
+
+ function renderTreeNodes(data) {
+ return data && data.length > 0 && data.map((item) => {
+ return (
+
+ {renderTreeNodes(item.children)}
+
+ );
+ });
+ }
+
+ function onLoadData(tr){
+ return new Promise((resolve) => {
+ if (tr.props.children) {
+ resolve();
+ return;
+ }
+ let en = [];
+ const url = `/${owner}/${projectsId}/sub_entries.json`;
+ axios.get(url, {
+ params:{
+ filepath:tr.props.dataRef.path,
+ ref:branch,
+ type:"dir"
+ }
+ }).then((result) => {
+ if(result){
+ en = result.data.entries;
+ }
+ }).catch(error=>{})
+ setTimeout(() => {
+ tr.props.dataRef.children = en;
+ setTreeData([...treeData]);
+ resolve();
+ }, 2000);
+ });
+ }
+
+ function selectTree(keys,event){
+ let dataref = event.node.props.dataRef;
+ if(dataref.type==="file"){
+ onClose();
+ history.push(`/projects/${owner}/${projectsId}/tree/${branch}/${dataref.path}`);
+ }
+ }
+
+ return(
+
+
+
+
+ {treeData && renderTreeNodes(treeData)}
+
+
+
+ )
+}
+export default DrawerPanel;
diff --git a/src/forge/Component/Handbook.jsx b/src/forge/Component/Handbook.jsx
index bcb381873..d26c0a8f7 100644
--- a/src/forge/Component/Handbook.jsx
+++ b/src/forge/Component/Handbook.jsx
@@ -5,7 +5,7 @@ import './Component.scss';
export default (()=>{
return(
diff --git a/src/forge/Component/LanguagePower.jsx b/src/forge/Component/LanguagePower.jsx
new file mode 100644
index 000000000..3197309c4
--- /dev/null
+++ b/src/forge/Component/LanguagePower.jsx
@@ -0,0 +1,54 @@
+import React, { useEffect, useState } from 'react';
+import { FlexAJ } from '../Component/layout';
+
+function LanguagePower({languages}){
+ const [ array , setArray ] = useState(undefined);
+
+ useEffect(()=>{
+ if(languages){
+ let arr = [];
+ Object.keys(languages).map((item,key)=>{
+ arr.push({name:item,percent:languages[item],color:getColor()});
+ })
+ setArray(arr);
+ }
+ },[languages])
+
+ function getColor(){
+ let str = "#";
+ let arr = ["1","2","3","4","4","5","6","7","8","9","a","b","c","d","e","f"];
+ for(var i=0;i<6;i++){
+ let num = parseInt(Math.random() * 16);
+ str+=arr[num];
+ }
+ return str;
+ }
+ return(
+
+
开发语言
+
+ {
+ array && array.map((item,key)=>{
+ return(
+
+ )
+ })
+ }
+
+ {
+ array && array.length > 0 &&
+
+ {
+ array.map((item,key)=>{
+ return(
+ {item.name}{item.percent}
+ )
+ })
+ }
+
+ }
+
+
+ )
+}
+export default LanguagePower;
\ No newline at end of file
diff --git a/src/forge/Component/ListCount.jsx b/src/forge/Component/ListCount.jsx
index 5a88dd430..d8bedbc6c 100644
--- a/src/forge/Component/ListCount.jsx
+++ b/src/forge/Component/ListCount.jsx
@@ -19,7 +19,7 @@ export default (({fork,parise})=>{
}`;
const SpanStyleparise = styled.span`{
display:flex;
- align-item:center;
+ align-items:center;
margin-left:30px;
padding:0px 12px;
border-radius:13px;
diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx
index 78dd78d04..c0bd12c1f 100644
--- a/src/forge/Component/MemberCards.jsx
+++ b/src/forge/Component/MemberCards.jsx
@@ -1,6 +1,10 @@
import React from 'react';
import './Component.scss';
+import { Button } from 'antd';
import styled from 'styled-components';
+import FocusButton from "../UsersList/focus_button";
+import { getImageUrl } from 'educoder';
+import { Link } from 'react-router-dom';
const Img = styled.img`{
border-radius:50%;
@@ -28,26 +32,8 @@ const I = styled.i`{
font-size:13px!important;
color:#60B25E;
margin-right:2px;
-}`
-const FocusBtn = styled.a`{
- display:inline-block;
- height:30px;
- line-height:26px;
- padding:0px 12px;
- background-color:#fafafa;
- border:1px solid #eee;
- border-radius:2px;
- color:#888!important;
-}`
-const Ifocused = styled.i`{
- font-size:16px!important;
- color:#FFA802;
- margin-right:4px;
-}`
-const Ifocus = styled.i`{
- font-size:16px!important;
- color:#BBBBBB;
- margin-right:4px;
+ height:17px;
+ line-height:17px;
}`
const Div = styled.div`{
margin-bottom: 18px;
@@ -56,17 +42,18 @@ const Div = styled.div`{
align-items: center;
border:1px solid #eee;
}`
-export default (({img,name,time, focusStatus})=>{
- return(
+export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
+ return (
-
+
})
- {name}
+ {name}
{
- focusStatus ?
- 已关注 :
- 关注
+ is_current_user ?
+
+ :
+
}
diff --git a/src/forge/Component/PasswordAuthority.jsx b/src/forge/Component/PasswordAuthority.jsx
index 9951f32e0..e15cb53fe 100644
--- a/src/forge/Component/PasswordAuthority.jsx
+++ b/src/forge/Component/PasswordAuthority.jsx
@@ -11,6 +11,7 @@ function PasswordAuthority({ authorityValBox , successFunc , cancelFunc }){
// 取消授权-登录密码的输入
function cancelAuthority(){
+ setAuthorityVal(undefined);
cancelFunc();
}
// 确认授权
diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx
new file mode 100644
index 000000000..b3b0a774a
--- /dev/null
+++ b/src/forge/Component/Releases.jsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { AlignCenter , AlignTop , FlexAJ } from '../Component/layout';
+import { Link } from 'react-router-dom';
+
+function Releases({owner,projectsId,releaseVersions}){
+
+ return(
+
+
+ 发行版
+ { releaseVersions && releaseVersions.total_count > 0 && {releaseVersions.total_count}}
+
+ { releaseVersions && releaseVersions.total_count > 0 ?
+ 全部
+ :
+ 新建
+ }
+
+ {
+ releaseVersions && releaseVersions.total_count>0 ?
+ releaseVersions.list.map((item,key)=>{
+ return(
+
+
+
+
{item.name}
+
{item.created_at}
+
+ )
+ })
+ :""
+ }
+
+
+ )
+}
+export default Releases;
\ No newline at end of file
diff --git a/src/forge/Component/Search.jsx b/src/forge/Component/Search.jsx
index 676006c53..19111ec21 100644
--- a/src/forge/Component/Search.jsx
+++ b/src/forge/Component/Search.jsx
@@ -2,13 +2,15 @@ import React from "react";
import { Input } from "antd";
const { Search } = Input;
-export default ({ placeholder , onSearch }) => {
+export default ({ placeholder , onSearch , onChange }) => {
return (
)
};
diff --git a/src/forge/Component/SearchUser.jsx b/src/forge/Component/SearchUser.jsx
index 1df7ec64e..43b45e85c 100644
--- a/src/forge/Component/SearchUser.jsx
+++ b/src/forge/Component/SearchUser.jsx
@@ -1,7 +1,8 @@
-import React , { useState , useEffect } from 'react';
+import React , { useState } from 'react';
import { AutoComplete } from 'antd';
import { getImageUrl } from "educoder";
import axios from 'axios';
+
const Option = AutoComplete.Option;
export default ({ getUser })=>{
@@ -31,18 +32,14 @@ export default ({ getUser })=>{
}
function selectInputUser(id, option){
- setSearchKey(option.props.searchValue);
- getUserList(option.props.searchValue);
+ setSearchKey(option.props.value);
+ getUserList(option.props.value);
getUser && getUser(id);
}
const source =
userDataSource && userDataSource.map((item, key) => {
return (
-
+ {img &&
-
- :
-
- 
-
- }
- 
赞 ({item.praises_count})
- fork ({item.forked_count})
-
-