Gitlink
/
forgeplus-react
39
0
Fork 30
Code Issues Pull Requests Releases 1 Wiki Activity

需求+设计+bug修改

This commit is contained in:
caishi 2021-10-29 14:18:30 +08:00
parent 015296e065
commit 743dabd553
16 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/css/edu-purge.css
View File

@ -3947,7 +3947,7 @@ html>body #ajax-indicator {
}
.head-nav {
text-align: center;
height: 70px;
height: 58px;
box-sizing: border-box;
overflow: hidden;
text-overflow: ellipsis;
@ -3959,14 +3959,14 @@ html>body #ajax-indicator {
position: absolute;
top: 0px;
z-index: 3;
height: 70px;
height: 58px;
box-sizing: border-box;
}
.head-nav ul#header-nav li {
float: left;
height: 70px;
line-height: 70px;
height: 58px;
line-height: 58px;
cursor: pointer;
position: relative;
font-size: 16px;
@ -3992,10 +3992,6 @@ html>body #ajax-indicator {
margin-right: 0px
}
.head-nav ul#header-nav li.active{
/* background-color: #3B3B3B; */
}
.head-nav ul#header-nav li p:hover {
color: #cccccc;
@ -6714,13 +6710,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
}

4
src/forge/Head/Header.js
View File

@ -279,7 +279,7 @@ class NewHeader extends Component {
};
render() {
const { match ,resetUserInfo ,showNotification} = this.props;
const { match ,resetUserInfo ,showNotification,publicNav} = this.props;
let current_user = this.props.user;
let {
AccountProfiletype,
@ -368,7 +368,7 @@ class NewHeader extends Component {
let search_url = settings && settings.common && settings.common.search;
return (
<div className="newHeaders" id="nHeader">
<div className={publicNav ? `newHeaders publicNav`:`newHeaders`} id="nHeader">
<div className="headerContent">
{isRender === true ?
<LoginDialog

BIN
src/forge/Main/img/index/banner.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 240 KiB

After

Width:  |  Height:  |  Size: 50 KiB

BIN
src/forge/Main/img/index/icon-delete.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

15
src/forge/Main/projecthome/Index.jsx
View File

@ -74,7 +74,7 @@ function Index() {
<div className="leftLists">
<div className="leftTitles">
<span>开源项目</span>
<Link to={`/explore/all`}>更多<i className="iconfont icon-triangle font-12"></i></Link>
<Link to={`/explore/all`} target="_blank">更多<i className="iconfont icon-triangle font-12"></i></Link>
</div>
<Spin spinning={isSpin}>
<div style={{minHeight:"400px"}}>
@ -85,10 +85,10 @@ function Index() {
projectsList.map((i,k)=>{
return(
<li>
<Link to={`/${i.author && i.author.login}`}><img src={getImageUrl(`/${i.author && i.author.image_url}`)} alt="" /></Link>
<Link to={`/${i.author && i.author.login}`} target="_blank"><img src={getImageUrl(`/${i.author && i.author.image_url}`)} alt="" /></Link>
<div className="itemTitle">
<div className="item-title-infos">
<Link to={`/${i.author && i.author.login}/${i.identifier}`} className="infotitle">{i.author && i.author.name}/{i.name}</Link>
<Link to={`/${i.author && i.author.login}/${i.identifier}`} target="_blank" className="infotitle">{i.author && i.author.name}/{i.name}</Link>
{i.praises_count > 0 ? <span><i className="iconfont icon-dianzan11 mr3 font-16"></i>{i.praises_count}</span> :"" }
{i.forked_count > 0 ? <span><i className="iconfont icon-fork2 mr3 font-13"></i>{i.forked_count}</span>:""}
</div>
@ -113,9 +113,12 @@ function Index() {
}
</div>
</Spin>
<div className="left-bottom-btn">
<Link to={`/explore/all`}>查看更多开源项目<img src={more} alt="" /></Link>
</div>
{
projectsList && projectsList.length > 0 &&
<div className="left-bottom-btn">
<Link to={`/explore/all`} target="_blank">查看更多开源项目<img src={more} alt="" /></Link>
</div>
}
</div>
</div>
<SubList />

5
src/forge/Main/projecthome/Index.scss
View File

@ -318,7 +318,6 @@
background: url('../img/index/typebg.png');
background-size: 100% 100%;
box-shadow: 0px 0px 4px 5px rgba(0, 0, 0, 0.02);
padding:12px 0px;
a{
padding:0px 20px;
height: 44px;
@ -413,7 +412,7 @@
height: 20px;
line-height: 20px;
display: flex;
align-items: flex-end;
align-items: center;
.category{
position: relative;
padding-left: 11px;
@ -439,7 +438,7 @@
height: 10px;
border-radius: 50%;
border-left: 1px solid #9e9e9e;
bottom: 4px;
bottom: 5px;
left: 0px;
}
}

2
src/forge/Main/projecthome/SubBanner.jsx
View File

@ -52,7 +52,7 @@ function SubBanner() {
<div className="banners">
<div className="bannersCenter">
<p className="bTitle"><span>新一代开源创新服务平台</span></p>
<p className="bSubTitle">Gitlink（确实开源）-CCF官网指定的产学研融合面向软件开源创新的开源社区</p>
<p className="bSubTitle">GitLink（确实开源）-CCF官网指定的产学研融合面向软件开源创新的开源社区</p>
<div className="bannerBox">
{
list && list.length > 0 ?

10
src/forge/Main/projecthome/SubList.jsx
View File

@ -56,11 +56,11 @@ function SubList() {
return(
<li>
<div>
<Link to={`/${i.login}`}><img src={getImageUrl(`/${i.avatar_url}`)} alt=""/></Link>
<Link target="_blank" to={`/${i.login}`}><img src={getImageUrl(`/${i.avatar_url}`)} alt=""/></Link>
<div>
<Link to={`/${i.login}`} className="font-15">{i.name}</Link>
<Link target="_blank" to={`/${i.login}`} className="font-15">{i.name}</Link>
<p className="task-hide" style={{maxWidth:"260px"}}>
<Link to={`/${i.login}/${i.project && i.project.identifier}`}><i className="iconfont icon-daimakuicon1 font-14 mr8"></i>{i.project && i.project.name}</Link>
<Link target="_blank" to={`/${i.login}/${i.project && i.project.identifier}`}><i className="iconfont icon-daimakuicon1 font-14 mr8"></i>{i.project && i.project.name}</Link>
</p>
</div>
</div>
@ -84,7 +84,7 @@ function SubList() {
<li>
<div className="mInfos">
<span className="num">{k+1}</span>
<Link to={`/${i.owner && i.owner.login}/${i.identifier}`} className="name task-hide">{i.owner && i.owner.name}/{i.name}</Link>
<Link target="_blank" to={`/${i.owner && i.owner.login}/${i.identifier}`} className="name task-hide">{i.owner && i.owner.name}/{i.name}</Link>
<span>
<i className="iconfont icon-dianzan11 font-16 mr4"></i>{i.praises}
</span>
@ -113,7 +113,7 @@ function SubList() {
<li>
<div className="mInfos">
<span className="num">{k+1}</span>
<Link to={`/${i.owner && i.owner.login}/${i.identifier}`} className="name task-hide">{i.owner && i.owner.name}/{i.name}</Link>
<Link target="_blank" to={`/${i.owner && i.owner.login}/${i.identifier}`} className="name task-hide">{i.owner && i.owner.name}/{i.name}</Link>
<span>
<i className="iconfont icon-dianzan11 font-16 mr4"></i>{i.praises}
</span>

3
src/forge/New/Index.js
View File

@ -289,7 +289,8 @@ class Index extends Component {
let second = first.split('.')[0];
if(!second)return;
this.props.form.setFieldsValue({
repository_name:second
repository_name:second,
name:second
})
}else{
this.props.form.setFieldsValue({

2
src/forge/Team/Setting/TeamSettingCommon.jsx
View File

@ -181,7 +181,7 @@ export default Form.create()(
)}
<p>选择头像:</p>
<UploadImage url={getImageUrl(`/${image}`)} getImage={getImage}/>
<Button type={"primary"} onClick={updateDetail}>更新仓库设置</Button>
<Button type={"primary"} onClick={updateDetail}>更新组织设置</Button>
</Form>
</Div>
</WhiteBack>

4
src/home/FifthEdition.jsx
View File

@ -99,7 +99,7 @@ function FifthEdition() {
{
list && list.map((i,k)=>{
return(
<li><a href={i.src}><img src={i.image_url} alt={i.name}/></a></li>
<li><a href={i.src} target="_blank"><img src={i.image_url} alt={i.name}/></a></li>
)
})
}
@ -109,7 +109,7 @@ function FifthEdition() {
{
list && list.map((i,k)=>{
return(
<li><a href={i.src}><img src={i.image_url} alt={i.name}/></a></li>
<li><a href={i.src} target="_blank"><img src={i.image_url} alt={i.name}/></a></li>
)
})
}

9
src/home/Index.jsx
View File

@ -50,7 +50,7 @@ function Index(props) {
return(
<div className="homePage">
<div className="topEdition">
<HeadNav {...props}/>
{/* <HeadNav {...props}/> */}
<TopEdition register={register}/>
<ul className="topEditionUl">
<a href="https://forum.trustie.net/forums/4666/detail" target="_blank" className="font-18">
@ -72,7 +72,7 @@ function Index(props) {
</div>
<div className="secondEdition">
<p className="theTitle">Gitlink，新一代开源创新服务平台</p>
<p className="theTitle">GitLink，新一代开源创新服务平台</p>
{
flag &&
<Anchor>
@ -90,7 +90,7 @@ function Index(props) {
</div>
<div className="forthEdition">
<p className="theTitle">加入Gitlink，和社区伙伴们一起踏上开源创新的辉煌旅程！</p>
<p className="theTitle">加入GitLink，和社区伙伴们一起踏上开源创新的辉煌旅程！</p>
<a className="qulikyreg" href={register}>快速注册</a>
<ul className="forthUl">
<li>
@ -118,10 +118,9 @@ function Index(props) {
<div className="fifthEdition">
<p className="title">开源生态</p>
<p className="subtitle">Gitlink与各大企业、高校、科研机构开展广泛的技术合作，推动我国开源软件生态的快速构建与发展</p>
<p className="subtitle">GitLink与各大企业、高校、科研机构开展广泛的技术合作，推动我国开源软件生态的快速构建与发展</p>
<FifthEdition />
</div>
<Footnav />
</div>
)
}

18
src/home/Index.scss
View File

@ -1026,13 +1026,13 @@ body{
}
}
}
.copyrightDesc{
font-size: 12px;
font-weight: 400;
color: #BDC2D1;
line-height: 28px;
padding:15px 0px;
text-align: center;
background-color: #1B212C;
}
}
.copyrightDesc{
font-size: 12px;
font-weight: 400;
color: #BDC2D1;
line-height: 28px;
padding:15px 0px;
text-align: center;
background-color: #1B212C;
}

10
src/home/ThirdEdition.jsx
View File

@ -16,7 +16,7 @@ import './Index.scss';
const list1 = [
{name:"CCF开源发展委员会首批执行委员名单发布",src:"https://forum.trustie.net/forums/4666/detail",count:32,time:"2021-09-22"},
{name:"Gitlink项目协同开发模块使用说明及问题反馈",src:"https://forum.trustie.net/forums/4665/detail",count:4,time:"2021-09-22"},
{name:"GitLink项目协同开发模块使用说明及问题反馈",src:"https://forum.trustie.net/forums/4665/detail",count:4,time:"2021-09-22"},
{name:"MindSpore框架介绍及赛题说明",src:"https://forum.trustie.net/forums/4664/detail",count:3,time:"2021-09-22"},
{name:"OpenHarmony系统介绍及赛题说明",src:"https://forum.trustie.net/forums/4663/detail",count:4,time:"2021-09-22"},
{name:"openGauss系统介绍及赛题说明",src:"https://forum.trustie.net/forums/4662/detail",count:5,time:"2021-09-22"},
@ -114,10 +114,10 @@ function ThirdEdition() {
<img src={active === 1 ? bg3 : active===2 ? bg32 :active===3 ? bg33 :bg34 } alt="" width="336px"/>
<div className="listbox">
<p className="listTitle">
{active === 1 ? "Gitlink分享最新平台资讯、社区活动通知、开源竞赛信息，把握开源生态发展脉搏"
: active===2 ? "Gitlink汇聚精英企业仓库、前沿技术仓库、人气热门仓库，孵化优质开源创新成果"
:active===3 ? "Gitlink集萃社区精选项目介绍、平台使用技巧等优秀文章，助力开源开放协同创新"
:"Gitlink甄选技术研究、心得体会、经验交流等高质量内容，推动社区健康稳定发展"}
{active === 1 ? "GitLink分享最新平台资讯、社区活动通知、开源竞赛信息，把握开源生态发展脉搏"
: active===2 ? "GitLink汇聚精英企业仓库、前沿技术仓库、人气热门仓库，孵化优质开源创新成果"
:active===3 ? "GitLink集萃社区精选项目介绍、平台使用技巧等优秀文章，助力开源开放协同创新"
:"GitLink甄选技术研究、心得体会、经验交流等高质量内容，推动社区健康稳定发展"}
</p>
{
active === 1&&

9
src/modules/tpm/TPMIndex.css
View File

@ -25,14 +25,17 @@ body>.-task-title {
.newHeaders{
max-width: unset;
width: 100%;
height:70px;
height:58px;
min-width: 1200px;
z-index: 1000;
box-shadow: 0px 2px 4px 0px rgb(0 0 0 / 50%);
position: fixed;
background-image: linear-gradient(to right, #0F141F, #0C2A5B,#101417);
background: #1B2440;
color: #fff;
}
.newHeaders.publicNav{
position: absolute;
background: rgba(27, 36, 64,0.2);
}
.headerContent{
margin:0px auto;
padding:0px 30px;

10
src/modules/tpm/TPMIndexHOC.js
View File

@ -153,11 +153,11 @@ export function TPMIndexHOC(WrappedComponent) {
console.log(this.props.match)
if (this.props.match.path === "/") {
this.setState({
publicNav:false
publicNav:true
})
}else{
this.setState({
publicNav:true
publicNav:false
})
}
let url = `/users/get_user_info.json`;
@ -256,12 +256,12 @@ export function TPMIndexHOC(WrappedComponent) {
{...this.props}
{...this.state}
/> : ""}
{ publicNav && <Header {...this.state} {...this.props} {...common}></Header>}
<Header {...this.state} {...this.props} {...common} publicNav={publicNav}></Header>
<Spin spinning={this.state.globalLoading} delay={0} className="globalSpin"
size="large" tip={this._gLoadingTip || "加载中..."}
>
<div className="newContainer newContainers">
{ publicNav && <div style={{height:"70px"}}></div> }
{!publicNav && <div style={{height:"58px"}}></div> }
{
current_user &&
<WrappedComponent initCommonState={(user) => this.initCommonState(user)}
@ -270,7 +270,7 @@ export function TPMIndexHOC(WrappedComponent) {
}
</div>
</Spin>
{ publicNav && <NewFooter {...this.state} {...this.props} />}
<NewFooter {...this.state} {...this.props} />
</div>
);
}