first

package.json

@@ -187,7 +187,7 @@
   "eslintConfig": {
     "extends": "react-app"
   },
-  "proxy": "http://localhost:3000",
+  "proxy": "http://localhost:3001",
   "port": "3007",
   "devDependencies": {
     "@babel/runtime": "7.0.0-beta.51",

public/css/edu-purge.css

@@ -6705,13 +6705,10 @@ p{
   right: 0px;
   top:4px;
   color: #999;
-<<<<<<< HEAD
-=======
 }
 .ant-input, .ant-input .ant-input-suffix{
   background-color: #fff!important;
 }
 .has-error .ant-input{
   background-color: #FEF1F0!important;
->>>>>>> pre_develop
 }

src/App.js

@@ -10,7 +10,7 @@ import {
 import axios from 'axios';
 import LoginDialog from './modules/login/LoginDialog';
 import 'babel-polyfill';
-import Loading from './Loading';
+import Loading from './Loading'
 
 import Loadable from 'react-loadable';
 import marked from './common/marked';

src/forge/Main/CoderDepot.jsx

@@ -23,6 +23,7 @@ import Nodata from '../Nodata';
 import Invite from './sub/Invite';
 import CheckProfile from '../Component/ProfileModal/Profile';
 import RenderHtml from '../../components/render-html';
+import Badge from "./sub/Badge";
 /**
  * projectDetail.type:0是托管项目，1是镜像项目，2是同步镜像项目(为2时不支持在线创建、在线上传、在线修改、在线删除、创建合并请求等功能)
  */
@@ -80,6 +81,12 @@ function CoderDepot(props){
   const distribution = details && details.type != 2 && (details.permission === "Admin" || details.permission === "Owner" || details.permission === "Manager");
   const { bannerList } = props;
 
+
+  // test data
+  const badges = {badge:[{ "login": "many_stars", "image_url": "https://www.gitlink.org.cn/system/lets/letter_avatars/2/J/236_194_58/120.png", "description": "test description1"}, {"login": "many_stars", "image_url": "https://www.gitlink.org.cn/system/lets/letter_avatars/2/X/181_166_38/120.png", "description": "test description2"}], total_count: 3}
+  console.log(badges.badge)
+  console.log(badges.total_count)
+
   useEffect(()=>{
     if(bannerList && bannerList.length>0){
       let a = bannerList.filter(i=>i.menu_name === "pulls");
@@ -346,6 +353,7 @@ function CoderDepot(props){
   const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && ((projectDetail.permission && projectDetail.permission !=="Reporter") || (current_user && current_user.admin));
 
   return(
+
     <WhiteBack>
       <UpdateDescModal desc={desc} website={website} lesson_url={lesson_url} visible={openModal} onCancel={()=>setOpenModal(false)} onOk={okUpdate}/>
       <Spin spinning={isSpin}>
@@ -369,7 +377,8 @@ function CoderDepot(props){
           </React.Fragment>
         }
         <div style={{minHeight:"500px"}}>
-          { 
+          {
+
             projectDetail &&
             <Box className="Panels">
               <LongWidth>
@@ -550,6 +559,19 @@ function CoderDepot(props){
                         <Invite code={inviteCode}/>
                       </div>
                     }
+                    {/*{*/}
+                    {/*    inviteCode &&*/}
+                    {/*    <div>*/}
+                    {/*      <Badge code={inviteCode}/>*/}
+                    {/*    </div>*/}
+                    {/*}*/}
+
+                    {/* 徽章 */}
+                    {
+                        badges && badges.total_count >0 &&
+                        <Badge badges={badges} owner={owner} />
+                    }
+
                     {
                       lesson_url &&
                       <div>

src/forge/Main/CoderRootBranch.js

@@ -73,6 +73,7 @@ export default ((props)=>{
       <Menu.Item key={'1'}><a href={tar_url}>TAR.GZ</a></Menu.Item>
     </Menu>
   )
+
   return(
     <React.Fragment>
       <div className="main">

src/forge/Main/Index.scss

@@ -200,6 +200,26 @@
       }
     }
   }
+
+  .attrBadge{
+    padding-top: 12px;
+    display: flex;
+    flex-wrap: wrap;
+    padding-bottom: 2px;
+    a{
+      margin: 0px 17px 10px 0px;
+      img{
+        border-radius: 50%;
+        width: 40px;
+        height: 40px;
+      }
+      &:nth-child(5n){
+        margin-right: 0px;
+      }
+    }
+  }
+
+
   .progress{
     display: flex;
     border-radius: 2px;

src/forge/Main/sub/Badge.jsx

@@ -0,0 +1,103 @@
+import React, { useEffect, useState } from 'react';
+import { AlignCenter , FlexAJ  } from '/home/gitlink/forgeplus/public/react/forgeplus-react/src/forge/Component/layout';
+import { Link } from 'react-router-dom';
+import { Popover , Spin , Button } from 'antd';
+import { getImageUrl } from 'educoder';
+import '/home/gitlink/forgeplus/public/react/forgeplus-react/src/forge/Component/Component.scss';
+
+
+
+
+// projectDetail && projectDetail.contributors && projectDetail.contributors.total_count >0 &&
+// <Badge contributors={projectDetail.contributors} owner={owner} projectsId={projectsId} />?
+
+function Badge({badges,owner}){
+    const [ list , setList ]= useState(undefined);
+    const [ total , setTotal ]= useState(0);
+    const [ menu , setMenu ] = useState("");
+    const [ login , setLogin ] = useState(undefined);
+    const [ badge , setBadge ] = useState(undefined);
+
+    useEffect(()=>{
+        if(badges && badges.total_count>0){
+            setTotal(badges.total_count);
+            setList(badges.badge);
+        }
+    },[badges])
+
+    useEffect(()=>{
+        setMenusFunc(badge);
+    },[badge])
+
+
+    function setMenusFunc(data){
+        if(data){
+            let ele = (
+                <AlignCenter>
+                    <Link to={`/${data.login}`}><img src={data.image_url} alt="" className="radius" width="38px" height="38px"/></Link>
+                    <div className="ml10">
+                        <Link to={`/${data.login}`}>{data.name}</Link>
+                        { data.description && <span className="leftline">{data.description}</span> }
+                    </div>
+                </AlignCenter>
+            )
+            setMenu(ele);
+        }
+    }
+
+
+    function setVisibleFunc(flag,l,index){
+        if(l !== badge){
+            setBadge(l);
+        }
+        var lx = list.concat();
+        lx.map(i=>i.visible =false);
+        if(flag){
+            lx[index].visible = flag;
+        }
+        lx.splice();
+        setList(lx);
+    }
+
+    // {
+    //     "list": [
+    //     {
+    //         "login": "many_stars",
+    //         "image_url": "User",
+    //         "description": "test description"
+    //     },
+    //     {
+    //         "login": "many_stars",
+    //         "image_url": "User",
+    //         "description": "test description"
+    //     }
+    // ],
+    //     "total_count": 2
+    // }
+    return(
+        <div className="halfs">
+            <Link to={`/${owner}/badge`} className="font-16 color-ooo hoverA">
+                <span>徽章</span>
+                { badges && badges.total_count > 0 && <span className="infoCount">{badges.total_count}</span>}
+            </Link>
+
+            <div className="attrBadge" onMouseLeave={()=>setVisibleFunc(false)}>
+                {
+                    total > 0 ?
+                        list.map((item,key)=>{
+                            return(
+                                <Popover content={menu} visible={item.visible} overlayClassName="menuPanels" placement="top">
+                                    <Link key={key} to={`/${item.login}`}>
+                                        <img src={item.image_url} alt="" onMouseOver={()=>setVisibleFunc(true,item,key)}/>
+                                    </Link>
+                                </Popover>
+                            )
+                        })
+                        :""
+                }
+            </div>
+        </div>
+    )
+}
+//{getImageUrl(`/${item.image_url}`)}
+export default Badge;

src/forge/Team/Group/GroupForm.jsx

@@ -157,17 +157,6 @@ export default Form.create()(
       setAuth(params.target.value)
     }
 
-    function checkname(rule, value, callback){
-      if(!value){
-        callback();
-      }
-      if(value && !value.match(/^[a-zA-Z][a-zA-Z\d]{3,14}$/)){
-        callback("只能使用英文字母和数字，以字母开头，长度为4到15个字符");
-      }
-      callback();
-    }
-
-
     function checkname(rule, value, callback){
       if(!value){
         callback();

src/forge/Version/version.js

@@ -1,122 +0,0 @@
-import React, { Component } from "react";
-import { Link } from 'react-router-dom';
-import { Spin } from 'antd';
-import NoneData from '../Nodata';
-import './version.css';
-import axios from 'axios';
-import RenderHtml from '../../components/render-html';
-
-/**
- * issue_chosen:下拉的筛选列表,
- * data:列表接口返回的所有数据,
- * issues:列表数组,
- * isSpin:加载中,
- */
-class version extends Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      issue_chosen: undefined,
-      data: undefined,
-      releases:undefined,
-      issues: undefined,
-      isSpin: true,
-      search: undefined,
-      search_count: undefined,
-    }
-  }
-
-  componentDidMount = () => {
-    this.getIssueList();
-  }
-  // 获取列表数据
-  getIssueList = () => {
-    const { projectsId, owner } = this.props.match.params;
-    const url = `/${owner}/${projectsId}/releases.json`;
-    axios.get(url).then((result) => {
-      if (result) {
-        this.setState({
-          data: result.data,
-          releases:result.data.releases,
-          issues: result.data.issues,
-          isSpin: false
-        })
-      }
-    }).catch((error) => {
-      console.log(error);
-    })
-  }
-
-  // 显示版本描述
-  showBody=(key,flag)=>{
-    let { releases } = this.state;
-    releases[key].bodyshow = !flag;
-    this.setState({
-      releases
-    })
-  }
-
-  renderList = (releases) => {
-    const { projectsId , owner } = this.props.match.params;
-    if (releases && releases.length > 0) {
-      return (
-        releases.map((item, key) => {
-          return (
-            <div className="versionInfo" key={key}>
-              <span className="versionInfo_left">
-                <span className={`${item.draft === "稳定" ?"versionTag green":"versionTag yellow"}`}>{item.draft}</span>
-                <span className="mt10">{item.created_at}</span>
-                <span className="color-grey-8">
-                  <i className="iconfont icon-biaoqian3 mr3 font-14"></i>
-                  {item.tag_name}
-                </span>
-              </span>
-              <div className="versionInfo_right">
-                <span className="versionName">
-                  <span className="task-hide">{item.name}</span>
-                  <Link to={`/projects/${owner}/${projectsId}/releases/${item.version_id}/update`} className="color-blue ml3 font-12">（编辑）</Link>
-                </span>
-                <span className="color-grey-3">
-                  <i className={`${item.bodyshow ? "iconfont icon-sanjiaoxing-down color-grey-8 mr3 font-14":"iconfont icon-triangle color-grey-8 mr3 font-14"}`} onClick={()=>this.showBody(key,item.bodyshow)}></i>
-                  {item.user_name}:<span className="color-grey-8">发布了这个版本，并在发布后提交给{item.target_commitish}</span>
-                </span>
-                {
-                  item.bodyshow && <RenderHtml className="break_word_comments imageLayerParent" value={item.body} url={this.props.history.location}/>
-                }
-                <RenderHtml />
-                <p className="mt10 pl3">
-                  <a href={item.tarball_url} style={{color:"#4CC1DA"}} className="mr30"><i className="iconfont icon-TAR font-18 mr5"></i>TAR</a>
-                  <a href={item.zipball_url} style={{color:"#28BD6C"}}><i className="iconfont icon-ZIP font-18 mr5"></i>ZIP</a>
-                </p>
-              </div>
-            </div>
-          )
-        })
-      )
-    } else if (releases && releases.length === 0) {
-      return ( <NoneData _html="暂时还没有相关数据!" /> )
-    }
-  }
-
-  render() {
-    const { projectsId ,owner } = this.props.match.params;
-    const { data , releases , isSpin } = this.state
-
-    return (
-      <div className="main" style={{padding:"0px"}}>
-        <div className="topWrapper" style={{padding:"15px 20px"}}>
-          <span className="font-18 color-grey-3">版本发布</span>
-          {
-            data && data.user_permission ?
-              <Link to={`/projects/${owner}/${projectsId}/releases/new`} className="topWrapper_btn_new">+ 发布新版</Link>
-              : ''
-          }
-        </div>
-        <div className="releasesVersion">
-          <Spin spinning={isSpin}><div>{this.renderList(releases)}</div></Spin>
-        </div>
-      </div>
-    )
-  }
-}
-export default version;

src/forge/users/Index.scss

@@ -239,4 +239,59 @@ ul.ant-menu.menuStyle{
       content:"";
     }
   }
-}
+}
+
+.attrBadge{
+  padding-top: 12px;
+  display: flex;
+  flex-wrap: wrap;
+  padding-bottom: 2px;
+  a{
+    margin: 0px 17px 10px 0px;
+    img{
+      border-radius: 50%;
+      width: 40px;
+      height: 40px;
+    }
+    &:nth-child(5n){
+      margin-right: 0px;
+    }
+  }
+}
+
+
+.attrBadge{
+  padding-top: 12px;
+  display: flex;
+  flex-wrap: wrap;
+  padding-bottom: 2px;
+  a{
+    margin: 0px 17px 10px 0px;
+    img{
+      border-radius: 50%;
+      width: 40px;
+      height: 40px;
+    }
+    &:nth-child(5n){
+      margin-right: 0px;
+    }
+  }
+}
+
+
+.infoCount{
+  display: inline-block;
+  width: 24px;
+  text-align: center;
+  height: 24px;
+  line-height: 24px;
+  background-color:rgba(153, 153, 153, 0.13);;
+  color:#666;
+  border-radius: 12px;
+  margin-left: 6px;
+  font-size: 12px;
+}
+
+
+
+

src/forge/users/Infos.js

@@ -1,6 +1,6 @@
 import React, { Component } from "react";
 import { Link } from "react-router-dom";
-import { Button, Spin , Menu } from "antd";
+import { Button, Spin , Menu, Popover } from "antd";
 import FocusButton from "../UsersList/focus_button";
 
 import axios from "axios";
@@ -13,6 +13,10 @@ import './Index.scss';
 
 import Loadable from "react-loadable";
 import Loading from "../../Loading";
+import Badge from "../Main/sub/Badge";
+
+//test data
+const badges = {badge:[{ "login": "many_stars", "image_url": "https://testforgeplus.trustie.net//system/lets/letter_avatars/2/G/178_217_57/120.png", "description": "test description1"}, {"login": "many_stars", "image_url": "https://testforgeplus.trustie.net//images/avatars/User/36480?t=1686645429", "description": "test description2"}], total_count: 3}
 
 const UpdateInfo = Loadable({
   loader: () => import("./Material/Index"),
@@ -70,6 +74,7 @@ class Infos extends Component {
     };
   }
 
+
   renderPath=(pathname)=>{
     const { username } = this.props.match.params;
     if(pathname === `/${username}`){
@@ -123,8 +128,6 @@ 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) => {
@@ -132,7 +135,9 @@ class Infos extends Component {
       this.setState({
         user: result.data,
         isSpin: false,
-        undo_events:e
+        undo_events:e,
+        //测试数据
+        badges : {badge:[1, 2, 3], total_count: 3}
       });
     })
     .catch((error) => {
@@ -196,7 +201,7 @@ class Infos extends Component {
   render() {
     const { current_user } = this.props;
     const { username } = this.props.match.params;
-    const { user, isSpin, route_type , undo_events , menuKey } = this.state;
+    const { user, isSpin, route_type , undo_events , menuKey} = this.state;
     return (
       <div className="newMain clearfix">
         <Spin spinning={isSpin}>
@@ -277,7 +282,35 @@ class Infos extends Component {
                     </div>
                     :""
                   }
+
+
                 </div>
+
+                {
+                    badges && badges.total_count >0 &&
+                    <Badge badges={badges} />
+                }
+                {/*{*/}
+                {/*    badges && badges.total_count >0 &&*/}
+                {/*    <div className="list-l-Menu text-center">*/}
+                {/*        {*/}
+                {/*          badges.total_count > 0 ?   owner={owner} projectsId={projectsId} */}
+                {/*              badges.badge.map((item,key)=>{*/}
+                {/*                return(*/}
+                {/*                    <Popover content={menu} visible={item.visible} overlayClassName="menuPanels" placement="top">*/}
+                {/*                      <div>*/}
+                {/*                        <span>{item}</span>*/}
+                {/*                        <img src={getImageUrl(`/${item.image_url}`)} />*/}
+                {/*                      </div>*/}
+                {/*                    </Popover>*/}
+                {/*                )*/}
+                {/*              })*/}
+                {/*              :""*/}
+                {/*        }*/}
+                {/*    </div>*/}
+
+                {/*}*/}
+
               </div>
             </div>
             <div className="list-right">

src/forge/users/Team.jsx

@@ -48,6 +48,7 @@ function Team(props){
     </Menu>
   )
 
+
   return(
     <div>
       <div className="headerbox">

src/modules/login/EducoderLogin.js

@@ -1,11 +1,11 @@
-import React, { Component } from "react";
+import React, {Component} from "react";
 import moment from 'moment';
 import { getImageUrl } from 'educoder';
 import '../courses/css/members.css';
 import "../courses/common/formCommon.css";
 import '../courses/css/Courses.css';
 import beijintulogontwo from '../../../src/images/login/beijintulogontwo.png';
-import educodernet from '../../../src/images/login/logo.png';
+import educodernet from '../../../src/images/login/educodernet.png';
 import LoginRegisterComponent from '../user/LoginRegisterComponent';
 import FindPasswordComponent from '../user/FindPasswordComponent';
 //educoder登入页面
@@ -47,6 +47,7 @@ class EducoderLogin extends Component {
 
                 }
             }else if(props.match.url === "/register"){
+                // showbool: 1,
                   this.state = {
                     showbool: 1,
                     loginstatus:false,
@@ -63,14 +64,18 @@ class EducoderLogin extends Component {
                     loginstatus:true,
                 }
             }
+
         }
 
     }
 
     Setlogins=(i)=>{
+        console.log("96ye");
+        console.log(i)
         this.setState({
             logini:i
         })
+
     }
     gohome=()=>{
         window.location.href="/"
@@ -89,39 +94,84 @@ class EducoderLogin extends Component {
 
 
     render() {
-        let { showbool } = this.state;
-        const { mygetHelmetapi } = this.props;
+        let {showbool,loginstatus,logini} = this.state;
         return (
             <div style={newContainer} className=" clearfix" >
-                <div style={{"justify-content": "center","align-items": "center","width": "100%",textAlign:"center"}}>
-                    <div style={{cursor:"pointer"}}>
-                        {
-                            mygetHelmetapi && mygetHelmetapi.login_logo_url ?
-                            <img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} width="80px" src={getImageUrl(mygetHelmetapi.login_logo_url)}/>
-                            :
-                            <img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} src={educodernet} width="80px"/>
-                        }
+
+                <div >
+                    <div style={{
+                        "display": "flex",
+                        "justify-content": "center",
+                        "align-items": "center",
+                        "width": "100%"
+                    }}>
+                        <div style={{cursor:"pointer"}}>
+                            {this.props.mygetHelmetapi === null ? ""
+                              :
+                                this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.login_logo_url===null|| this.props.mygetHelmetapi.login_logo_url===undefined?
+                                  <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={educodernet}/>
+                                  :
+                                  <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={getImageUrl(this.props.mygetHelmetapi.login_logo_url)}/>
+                            }
+
+                        </div>
+
+
                     </div>
                     {
                         showbool === 1 ?
-                        <div style={{
-                            display: "flex",
-                            justifyContent: "center",
-                            width: "100%",
-                            marginTop: "25px",
-                        }}>
-                            <div>
-                                <LoginRegisterComponent {...this.props} {...this.state} Setshowbool={(e)=>this.Setshowbool(e)} ></LoginRegisterComponent>
+                            <div style={{
+                                display: "flex",
+                                justifyContent: "center",
+                                width: "100%",
+                                marginTop: "25px",
+                            }}>
+                                <div>
+
+                                    <LoginRegisterComponent {...this.props} {...this.state}
+                                                            Setshowbool={(e)=>this.Setshowbool(e)} ></LoginRegisterComponent>
+
+                                </div>
+
                             </div>
-                        </div>
                         :
-                        <div style={{display: "flex",justifyContent: "center",width: "100%",marginTop: "25px",}}>
-                            <div>
-                                <FindPasswordComponent {...this.props} {...this.state} Setshowbool={(e)=>this.Setshowbool(e)}></FindPasswordComponent>
-                            </div>
-                        </div>
+                          <div style={{
+                              display: "flex",
+                              justifyContent: "center",
+                              width: "100%",
+                              marginTop: "25px",
+                          }}>
+                              <div >
+                                  <FindPasswordComponent {...this.props} {...this.state}
+                                                         Setshowbool={(e)=>this.Setshowbool(e)}></FindPasswordComponent>
+
+                              </div>
+                          </div>
                     }
-                    <div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;Trustie<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+									{this.props.mygetHelmetapi === null ? 	<div style={{
+										display: "flex",
+										justifyContent: "center",
+										width: "100%",
+									}}>
+										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+									</div>:
+									this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.main_site===null|| this.props.mygetHelmetapi.main_site===undefined?	<div style={{
+										display: "flex",
+										justifyContent: "center",
+										width: "100%",
+									}}>
+										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+									</div>:this.props.mygetHelmetapi.main_site===true?
+										<div style={{
+											display: "flex",
+											justifyContent: "center",
+											width: "100%",
+										}}>
+											<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
+										</div>
+										:""
+									}
+
                 </div>
             </div>
         )

src/modules/tpm/TPMIndexHOC.js

@@ -169,14 +169,6 @@ export function TPMIndexHOC(WrappedComponent) {
 							})
 						}
 					}
-					if(response.data && response.data.login){
-						if(response.data.need_edit_info){
-							this.setState({
-								giteaVisible:true,
-								email:response.data.email
-							})
-						}
-					}
 				}
 			}).catch((error) => {
 				console.log(error)