Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改pr的详情页

This commit is contained in:
sylor_huang@126.com 2020-06-05 16:24:37 +08:00
parent cc280f1597
commit 20e75b1606
22 changed files with 794 additions and 639 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/Activity/ActivityItem.js
View File

@ -32,7 +32,7 @@ class ActivityItem extends Component{
</p >
}
<p className="itemLine mt15">
<Link to={`/users/${item && item.login}/projects`} className="show-user-link">
<Link to={`/users/${item && item.login}`} className="show-user-link">
<img alt="" src={getImageUrl(`images/${item.user_avatar}`)} className="createImage"/>
<span className="mr20">{item.user_name}</span>
</Link>

2
src/forge/Main/CoderRootCommit.js
View File

@ -122,7 +122,7 @@ class CoderRootCommit extends Component{
{/* <Link to={''} className="color-blue">浏览代码</Link> */}
</p>
<p className="f-wrap-alignCenter mt15">
<Link to={`/users/${item.login}/projects`} className="show-user-link">
<Link to={`/users/${item.login}`} className="show-user-link">
{item.image_url?<img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
<label className="font-14 color-grey-6" style={{'verticalAlign':'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
</Link>

2
src/forge/Main/CoderRootDirectory.js
View File

@ -376,7 +376,7 @@ class CoderRootDirectory extends Component {
<React.Fragment>
{lastCommitAuthor.login ? (
<Link
to={`/users/${lastCommitAuthor.login}/projects`}
to={`/users/${lastCommitAuthor.login}`}
className="show-user-link"
>
<img

4
src/forge/Main/Detail.js
View File

@ -315,7 +315,7 @@ class Detail extends Component {
projectDetail && projectDetail.forked_from_project_id && projectDetail.fork_info ?
<React.Fragment>
<span>forked from </span>
<Link to={`/users/${projectDetail.fork_info.fork_project_user_login}/projects`} className="show-user-link color-grey-ccc">{projectDetail.fork_info.fork_project_user_name}</Link>
<Link to={`/users/${projectDetail.fork_info.fork_project_user_login}`} className="show-user-link color-grey-ccc">{projectDetail.fork_info.fork_project_user_name}</Link>
<span> / </span>
<Link to={`/projects/${projectDetail.forked_from_project_id}/coders`} className="color-grey-ccc">{projectDetail.fork_info.fork_form_name}</Link>
</React.Fragment> : ""
@ -338,7 +338,7 @@ class Detail extends Component {
<div className="f-wrap-between mb15" style={{ position: "relative" }}>
<p className="font-18 color-white df flex-1 lineH2 mt15" style={{ alignItems: "center" }}>
{projectDetail && projectDetail.author &&
<Link to={`/users/${projectDetail.author.login}/projects`} className="show-user-link color-white">
<Link to={`/users/${projectDetail.author.login}`} className="show-user-link color-white">
{projectDetail.author.name}
</Link>
}

2
src/forge/Main/IndexItem.js
View File

@ -18,7 +18,7 @@ class IndexItem extends Component {
projects && projects.length > 0 ? projects.map((item, key) => {
return (
<div className="p-r-Item" key={key}>
<Link to={`/users/${item.author.login}/projects`} className="show-user-link">
<Link to={`/users/${item.author.login}`} className="show-user-link">
<img className="p-r-photo" alt="" src={getImageUrl(`images/${item.author && item.author.image_url}`)} ></img>
</Link>
<div className="p-r-Infos">

2
src/forge/Merge/MergeItem.js
View File

@ -90,7 +90,7 @@ class MergeItem extends Component {
<li>
{item.assign_user_name ? (
<Link
to={`/users/${item.assign_user_login}/projects`}
to={`/users/${item.assign_user_login}`}
className="show-user-link"
>
{item.assign_user_name}

2
src/forge/Merge/MergeSubmit.js
View File

@ -92,7 +92,7 @@ class MergeSubmit extends Component{
width:"10%",
render: (text,item) => (
<span className="f-wrap-alignCenter">
<Link to={`/users/${item.login}/projects`} className="show-user-link">
<Link to={`/users/${item.login}`} className="show-user-link">
<img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
<label className="hide-1" style={{maxWidth:"75px",'vertical-align':'middle'}}>{text}</label>
</Link>

1327
src/forge/Merge/MessageCount.js
View File

File diff suppressed because it is too large Load Diff

4
src/forge/Merge/NewMerge.js
View File

@ -263,7 +263,7 @@ class NewMerge extends Component {
width: "10%",
render: (text, item) => (
<span className="f-wrap-alignCenter">
<Link to={`/users/${item.login}/projects`} className="show-user-link">
<Link to={`/users/${item.login}`} className="show-user-link">
<img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius" />
<label className="hide-1" style={{ maxWidth: "75px", 'vertical-align': 'middle' }}>{text}</label>
</Link>
@ -343,7 +343,7 @@ class NewMerge extends Component {
<Form>
<div className="f-wrap-between mt20" style={{ alignItems: "flex-start" }}>
<div className="list-right df" style={{ padding: "0px", paddingTop: "10px" }}>
<Link to={`/users/${current_user && current_user.login}/projects`} className="show-user-link">
<Link to={`/users/${current_user && current_user.login}`} className="show-user-link">
<img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt="" />
</Link>

2
src/forge/Merge/UpdateMerge.js
View File

@ -176,7 +176,7 @@ class UpdateMerge extends Component {
<Form>
<div className="f-wrap-between mt20" style={{ alignItems: "flex-start" }}>
<div className="list-right df" >
<Link to={`/users/${current_user && current_user.login}/projects`} className="show-user-link">
<Link to={`/users/${current_user && current_user.login}`} className="show-user-link">
<img className="user_img" src={getImageUrl(`images/${current_user && current_user.image_url}`)} alt="" />
</Link>
<div className="new_context">

2
src/forge/Newfile/UserSubmitComponent.js
View File

@ -143,7 +143,7 @@ class UserSubmitComponent extends Component {
<div>
<span className="df mt30" style={{ alignItems: "center" }}>
<Link
to={`/users/${current_user && current_user.login}/projects`}
to={`/users/${current_user && current_user.login}`}
className="show-user-link"
>
<img

44
src/forge/Order/Detail.js
View File

@ -7,7 +7,7 @@ import { Modal, Form, Tooltip, Popconfirm, Pagination, Spin, Tag } from "antd";
import Attachments from "../Upload/attachment";
// import MDEditor from "../../modules/tpm/challengesnew/tpm-md-editor";
import RenderHtml from "../../components/render-html";
import Comments from "../comments/comments"
import Comments from "../comments/comments";
import "./order.css";
// import AmplifyImg from "./AmplifyImg";
@ -74,7 +74,6 @@ class Detail extends Component {
});
};
//删除任务信息
deletedetail = (id) => {
const { projectsId, orderId } = this.props.match.params;
@ -190,9 +189,7 @@ class Detail extends Component {
render() {
const { projectsId, orderId } = this.props.match.params;
const {
data,
} = this.state;
const { data } = this.state;
const get_color = (type) => {
if (type === "高") {
return "#e67e22";
@ -210,7 +207,7 @@ class Detail extends Component {
<div className="list-right">
<div className="grid-item pd20 border-1f">
<Link
to={`/users/${data && data.author_login}/projects`}
to={`/users/${data && data.author_login}`}
className="show-user-link"
>
<img
@ -243,7 +240,7 @@ class Detail extends Component {
<div className="mt10">
<span className="color-grey-9 mr5">由</span>
<Link
to={`/users/${data && data.author_login}/projects`}
to={`/users/${data && data.author_login}`}
className="show-user-link color-blue"
>
{data && data.author_name}
@ -301,7 +298,11 @@ class Detail extends Component {
""
)}
</div>
<Comments order_id={orderId} showNotification={this.props.showNotification} {...this.props} />
<Comments
order_id={orderId}
showNotification={this.props.showNotification}
{...this.props}
/>
</div>
<div className="list-left list-left-padding">
<div className="list-right-item-padding background-f">
@ -320,21 +321,18 @@ class Detail extends Component {
<span>{data && data.token ? data.token : "--"}</span>
</p>
} */}
<p className="grid-item-left pb15">
<span className="issue_detail_info">标签:</span>
<span>
{data && data.issue_tags ? (
<span className="grid-item">
<span
className="tagColor"
style={{ background: data.issue_tags[0].color }}
>
<span
className="tagColor"
style={{ background: data.issue_tags[0].color }}
></span>
{data.issue_tags[0].name}
</span>
{data.issue_tags[0].name}
</span>
) : (
"--"
)}
@ -346,32 +344,32 @@ class Detail extends Component {
{data && data.version ? data.version : "--"}
</span>
</p>
<p className="grid-item-left pb15">
<p className="grid-item-left pb15">
<span className="issue_detail_info">状态:</span>
<span>
{data && data.issue_status ? data.issue_status : "--"}
</span>
</p>
<p className="grid-item-left pb15">
<p className="grid-item-left pb15">
<span className="issue_detail_info">分类:</span>
<span>{data && data.tracker ? data.tracker : "--"}</span>
</p>
<p className="grid-item-left pb15">
<p className="grid-item-left pb15">
<span className="issue_detail_info">负责人:</span>
<span>
{data && data.assign_user_name ? data.assign_user_name : "--"}
</span>
</p>
<p className="grid-item-left pb15">
<p className="grid-item-left pb15">
<span className="issue_detail_info">开始日期:</span>
<span>{data && data.start_date ? data.start_date : "--"}</span>
</p>
<p className="grid-item-left pb15">
<p className="grid-item-left pb15">
<span className="issue_detail_info">结束日期:</span>
<span>{data && data.due_date ? data.due_date : "--"}</span>
</p>
<p className="grid-item-left pb15">
<p className="grid-item-left pb15">
<span className="issue_detail_info">完成度:</span>
<span>{data && data.done_ratio ? data.done_ratio : "--"}</span>
</p>

6
src/forge/Order/OrderItem.js
View File

@ -56,7 +56,7 @@ class OrderItem extends Component {
<div className="flex-1">
<p className="mb15 df" style={{alignItems:"center"}}>
<Link to={`/projects/${projectsId}/orders/${item.id}/detail`} className="hide-1 font-16 color-grey-3 lineh-30" style={{maxWidth:"300px"}}>{item.name}</Link>
{TagInfo(item.priority,"ml10")}
{TagInfo(item.priority,"ml10 mr10")}
</p>
<p className="color-grey-6 font-12">
<span>{item.format_time}</span><span className="ml5">发布</span>
@ -71,7 +71,7 @@ class OrderItem extends Component {
<li>
{
item.author_name ?
<Link to={`/users/${item.author_login}/projects`} className="show-user-link">
<Link to={`/users/${item.author_login}`} className="show-user-link">
{item.author_name}
</Link>
: "--"
@ -80,7 +80,7 @@ class OrderItem extends Component {
<li>
{
item.assign_user_name ?
<Link to={`/users/${item.assign_user_login}/projects`} className="show-user-link">
<Link to={`/users/${item.assign_user_login}`} className="show-user-link">
{item.assign_user_name}
</Link>
: "--"

4
src/forge/Settings/Collaborator.js
View File

@ -313,7 +313,7 @@ class Collaborator extends Component {
render: (text, item) => (
<span className="f-wrap-alignCenter">
<Link
to={`/users/${item.login}/projects`}
to={`/users/${item.login}`}
className="show-user-link"
>
<img
@ -331,7 +331,7 @@ class Collaborator extends Component {
title: "用户名",
dataIndex: "name",
render: (text, item) => (
<Link to={`/users/${item.login}/projects`} className="show-user-link">
<Link to={`/users/${item.login}`} className="show-user-link">
{text}
</Link>
),

2
src/forge/UsersList/fork_users.js
View File

@ -88,7 +88,7 @@ class ForkUsers extends Component {
<div className="pbt25 grid-item mlr10 border-b-line">
<div>
<Link
to={`/users/${item.login}/projects`}
to={`/users/${item.login}`}
className="show-user-link"
>
<img

4
src/forge/comments/children_comments.js
View File

@ -123,7 +123,7 @@ class children_comments extends Component {
<div className="width100">
<div className="grid-item pb10">
<Link
to={`/users/${item && item.user_login}/projects`}
to={`/users/${item && item.user_login}`}
className="show-user-link"
>
<img
@ -137,7 +137,7 @@ class children_comments extends Component {
<span className="grid-item">
<span>
<Link
to={`/users/${item && item.user_login}/projects`}
to={`/users/${item && item.user_login}`}
className="show-user-link color-blue ml10"
>
{item && item.user_name}

4
src/forge/comments/children_journals.js
View File

@ -91,7 +91,7 @@ class children_journals extends Component {
<div className="width100">
<div className="grid-item pb10">
<Link
to={`/users/${item && item.user_login}/projects`}
to={`/users/${item && item.user_login}`}
className="show-user-link"
>
<img
@ -105,7 +105,7 @@ class children_journals extends Component {
<span className="grid-item">
<span>
<Link
to={`/users/${item && item.user_login}/projects`}
to={`/users/${item && item.user_login}`}
className="show-user-link color-blue ml10"
>
{item && item.user_name}

10
src/forge/comments/comments.js
View File

@ -300,7 +300,7 @@ class comments extends Component {
<div>
<div className="grid-item pb10">
<Link
to={`/users/${current_user && current_user.login}/projects`}
to={`/users/${current_user && current_user.login}`}
className="show-user-link"
>
<img
@ -314,7 +314,7 @@ class comments extends Component {
/>
</Link>
<Link
to={`/users/${current_user && current_user.login}/projects`}
to={`/users/${current_user && current_user.login}`}
className="show-user-link color-blue ml10"
>
{current_user && current_user.real_name}
@ -385,7 +385,7 @@ class comments extends Component {
<div className="width100">
<div className="grid-item pb10">
<Link
to={`/users/${item && item.user_login}/projects`}
to={`/users/${item && item.user_login}`}
className="show-user-link"
>
<img
@ -399,7 +399,7 @@ class comments extends Component {
<span className="grid-item">
<span>
<Link
to={`/users/${item && item.user_login}/projects`}
to={`/users/${item && item.user_login}`}
className="show-user-link color-blue ml10"
>
{item && item.user_name}
@ -462,7 +462,7 @@ class comments extends Component {
) : (
<div className="grid-item mt15">
<Link
to={`/users/${current_user && current_user.login}/projects`}
to={`/users/${current_user && current_user.login}`}
className="show-user-link mr10"
>
<img

2
src/forge/comments/new.js
View File

@ -335,7 +335,7 @@ class comments extends Component {
)}
<div className="df">
<Link
to={`/users/${item && item.user_login}/projects`}
to={`/users/${item && item.user_login}`}
className="show-user-link"
>
<img

2
src/modules/tpm/NewHeader.js
View File

@ -935,7 +935,7 @@ class NewHeader extends Component {
}
{/* {
mygetHelmetapi2 && mygetHelmetapi2.new_course && mygetHelmetapi2.new_course.my_projects &&
<li><Link to={`/users/${this.props.current_user.login}/projects`} >我的项目</Link></li>
<li><Link to={`/users/${this.props.current_user.login}`} >我的项目</Link></li>
} */}
{

2
src/modules/user/usersInfo/InfosBanner.js
View File

@ -154,7 +154,7 @@ class InfosBanner extends Component{
<li className={`${moduleName === 'projects' ? 'active' : '' }`}>
<Link
onClick={() => this.setState({moduleName: 'projects'})}
to={`/users/${username}/projects`}>开发项目</Link>
to={`/users/${username}`}>开发项目</Link>
</li>

2
src/modules/user/usersInfo/banner_out.js
View File

@ -168,7 +168,7 @@ class banner_out extends Component {
<li className={`${moduleName == 'projects' ? 'active' : ''}`}>
<Link
onClick={() => this.setState({ moduleName: 'projects' })}
to={`/users/${username}/projects`}>开发项目</Link>
to={`/users/${username}`}>开发项目</Link>
</li>
<li className={`${moduleName == 'package' ? 'active' : ''}`}>