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

remove

This commit is contained in:
caishi 2023-05-12 11:17:04 +08:00
parent 5ede49c311
commit 7f3697d9d5
13 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/App.js
View File

@ -323,13 +323,21 @@ class App extends Component {
render() {
const { pathType, pathName, mygetHelmetapi } = this.state;
console.log("dsf:",pathName);
return (
<Provider store={store}>
<ConfigProvider locale={zhCN}>
<MuiThemeProvider theme={theme}>
<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
{/* <GlccModal /> */}
{!pathName || (pathName && pathName.toLowerCase().indexOf("glcc") === -1) ? <SiderBar {...this.props}/> : <SiderBarHelp/>}
{
((pathName && pathName.toLowerCase()!=="explore") || !pathName) ?
(!pathName || (pathName && pathName.toLowerCase().indexOf("glcc") === -1 )) ?
<SiderBar {...this.props}/>
:
<SiderBarHelp/>
:""
}
{/* <Router> */}
<Switch>
{/* wiki预览 */}

11
src/forge/Component/ProfileModal/Profile.jsx
View File

@ -9,11 +9,12 @@ function Profile({children,sureFunc,showCompeleteDialog , completeProfile, class
return;
}
}
if(!completeProfile){
showCompeleteDialog && showCompeleteDialog();
}else{
sureFunc();
}
// if(!completeProfile){
// showCompeleteDialog && showCompeleteDialog();
// }else{
// sureFunc();
// }
sureFunc();
}
return(

2
src/forge/Component/ProfileModal/SupplyPhone.jsx
View File

@ -18,7 +18,7 @@ function SupplyPhoneModal({visible}) {
function onOk(){
setModalVis(false);
setTimeout(function(){
window.open(`/settings/phone`,"_blank");
window.open(`/settings/password`,"_blank");
},200)
}

10
src/forge/Main/Index.js
View File

@ -394,7 +394,7 @@ class Index extends Component {
/>
</div>
<div>
{
{/* {
current_user && current_user.login &&
<Popover
overlayClassName="newPopUl"
@ -404,9 +404,15 @@ class Index extends Component {
className="mr50"
>
<a className="ant-dropdown-link">
<span className="color-blue font-16"><i className="iconfont icon-xinjian1 font-14"></i> 新建</span>
<span className="color-blue font-16"><i className="iconfont icon-xinjian1 font-14"></i> 新建项目</span>
</a>
</Popover>
} */}
{
current_user && current_user.login &&
<CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>
<span className="color-blue font-16 mr20"><i className="iconfont icon-xinjian1 font-14"></i> 新建项目</span>
</CheckProfile>
}
<Popover content={this.menu()} trigger={['click']} placement='bottom'>

4
src/forge/SecuritySetting/Index.jsx
View File

@ -106,7 +106,7 @@ function Index(props){
<ul className="securityUl ul-border-buttom">
<li>个人信息</li>
<li className={pathname.indexOf("/settings/profile")>-1 ?"active":""}><Link to={`/settings/profile`}><i className="iconfont icon-gerenziliao mr5 font-14"></i><span className="text-shodow-bold">基本资料</span></Link></li>
<li className={(pathname.indexOf("/settings/emails")>-1 || pathname.indexOf("/settings/phone")>-1 || pathname.indexOf("/settings/password")>-1 || pathname.indexOf("/settings/cancel")>-1) ?"active":""}><Link to={`/settings/phone`}><i className="iconfont icon-xuanzhonganquanshezhi_icon mr5 font-14"></i><span className="text-shodow-bold">账号管理</span></Link></li>
<li className={(pathname.indexOf("/settings/emails")>-1 || pathname.indexOf("/settings/phone")>-1 || pathname.indexOf("/settings/password")>-1 || pathname.indexOf("/settings/cancel")>-1) ?"active":""}><Link to={`/settings/password`}><i className="iconfont icon-xuanzhonganquanshezhi_icon mr5 font-14"></i><span className="text-shodow-bold">账号管理</span></Link></li>
</ul>
{notice_url && <ul className="securityUl ul-border-buttom">
<li>消息通知</li>
@ -175,7 +175,7 @@ function Index(props){
)}
></Route>
<Route
path="/settings/phone"
path="/settings/password"
render={(p) => (
<Password {...props} {...p}/>
)}

2
src/forge/SecuritySetting/sub/SSH.jsx
View File

@ -93,7 +93,7 @@ function SSH(props) {
</div>
}
{ (!list || (list && list.length === 0)) && <p className="mt30 pl20">您还没有添加任何SSH密钥</p> }
<p className="questionLink"><a href={`https://docs.github.com/en/github/authenticating-to-github/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent`} target="_blank">如何生成SSH密钥？</a></p>
{/* <p className="questionLink"><a href={`https://docs.github.com/en/github/authenticating-to-github/connecting-to-github-with-ssh/generating-a-new-ssh-key-and-adding-it-to-the-ssh-agent`} target="_blank">如何生成SSH密钥？</a></p> */}
</div>
)
}

3
src/forge/Settings/Webhooks/Index.jsx
View File

@ -122,7 +122,8 @@ function Index(props) {
<Button type="primary" size="large" onClick={addFunc}>添加Webhook</Button>
</Banner>
<div className="hookpanel">
<p className="color-grey-3">每当特定事件（如push代码，合并请求被编辑）发生时，我们将通过webhook给您提供的远程URL发送post请求。您可以在我们的<a className="color-blue hoverLine" target="_blank" href="https://forum.trustie.net/forums/3408/detail">webhooks指南</a>中了解更多信息</p>
{/* 您可以在我们的<a className="color-blue hoverLine" target="_blank" href="https://forum.trustie.net/forums/3408/detail">webhooks指南</a>中了解更多信息 */}
<p className="color-grey-3">每当特定事件（如push代码，合并请求被编辑）发生时，我们将通过webhook给您提供的远程URL发送post请求。</p>
{
data && data.length> 0 &&
<List>

3
src/forge/Settings/Webhooks/New.jsx
View File

@ -199,7 +199,8 @@ function New({ form , match , showNotification , history, projectDetail }) {
</span>
</Banner>
<div>
<p className="deschead mg"><span>当webhook被触发时，我们将向以下URL发送通知，包括已选择事件的详细信息。更多信息可查阅<a className="color-blue hoverLine" target="_blank" href="https://forum.trustie.net/forums/3408/detail">webhooks指南</a>。</span></p>
{/* 更多信息可查阅<a className="color-blue hoverLine" target="_blank" href="https://forum.trustie.net/forums/3408/detail">webhooks指南</a> */}
<p className="deschead mg"><span>当webhook被触发时，我们将向以下URL发送通知，包括已选择事件的详细信息。</span></p>
<Form>
<input type="password" style={{display:"none"}} />
<Form.Item label="目标URL" colon={false}>

5
src/forge/Team/List.jsx
View File

@ -184,10 +184,13 @@ function List(props){
<Search placeholder="输入仓库名称进行搜索" onSearch={onSearch}/>
</div>
<p>
{ organizeDetail && organizeDetail.can_create_project ?
{/* { organizeDetail && organizeDetail.can_create_project ?
<Sort menu={menu_new} overlayClassName={"newPopUl"}>
<a className="addBtn mr30">+&nbsp;新建项目</a>
</Sort>
:""} */}
{ organizeDetail && organizeDetail.can_create_project ?
<CheckProfile {...props} sureFunc={()=>{props.history.push(`/projects/deposit/new/${OIdentifier}`)}} className="addBtn mr30">+&nbsp;新建项目</CheckProfile>
:""}
<Dropdown overlay={menu}>
<a className="color-blue">排序<i className="iconfont icon-sanjiaoxing-down ml3 font-14"></i></a>

9
src/forge/users/InfosUser.js
View File

@ -203,7 +203,7 @@ class InfosUser extends Component {
onChange={this.changeSearchValue}
/>
<div>
{current_user && user && current_user.login === user.login && (
{/* {current_user && user && current_user.login === user.login && (
<Popover
content={this.newItem()}
trigger={["hover"]}
@ -217,7 +217,12 @@ class InfosUser extends Component {
</span>
</a>
</Popover>
)}
)} */}
<CheckProfile {...this.props} sureFunc={()=>{this.props.history.push('/projects/deposit/new')}}>
<span className="color-blue font-16 mr50">
<i className="iconfont icon-xinjian1 font-14"></i> 新建项目
</span>
</CheckProfile>
<Popover content={this.menu()} trigger={["click"]} placement="bottom">
<a className="ant-dropdown-link">
<span className="color-blue font-16" style={{display: 'inline-flex'}}>

4
src/forge/users/Material/Base.jsx
View File

@ -63,7 +63,7 @@ export default Form.create()(
<Input placeholder="请点击右侧更改手机号按钮绑定手机" disabled style={{width:"400px"}}/>
)}
</Form.Item>
<Link className='gotoUpdateEmail mr30' to='/settings/phone'><i className='iconfont icon-bianji1 font-15 mr5'></i>更改手机号</Link>
{/* <Link className='gotoUpdateEmail mr30' to='/settings/phone'><i className='iconfont icon-bianji1 font-15 mr5'></i>更改手机号</Link> */}
<Form.Item label="邮箱">
{getFieldDecorator("email",{
rules:[{required:true,message:"请输入邮箱账号"}]
@ -71,7 +71,7 @@ export default Form.create()(
<Input placeholder="请点击右侧更改邮箱按钮绑定邮箱" disabled style={{width:"400px"}}/>
)}
</Form.Item>
<Link className='gotoUpdateEmail mr30' to='/settings/emails'><i className='iconfont icon-bianji1 font-15 mr5'></i>更改邮箱</Link>
{/* <Link className='gotoUpdateEmail mr30' to='/settings/emails'><i className='iconfont icon-bianji1 font-15 mr5'></i>更改邮箱</Link> */}
<Form.Item label="">
{getFieldDecorator("show_email",{
rules:[],

8
src/forge/users/Material/Index.jsx
View File

@ -9,7 +9,7 @@ function Index(props){
const { pathname } = props && props.location;
const [ key , setKey ] = useState("0");
const [ type, setType] = useState('0');
const [ type, setType] = useState('1');
useEffect(()=>{
if(pathname){
@ -40,10 +40,10 @@ function Index(props){
{key === "0" ? <Menu mode={'horizontal'} className="infosRightMenu">
<Menu.Item key="0" className="font-16">基本资料</Menu.Item>
</Menu> : <Menu mode={'horizontal'} className="infosRightMenu" selectedKeys={type}>
<Menu.Item key="3" className="font-16" onClick={()=>{props.history.push('/settings/phone')}}>手机号管理</Menu.Item>
<Menu.Item key="0" className="font-16" onClick={()=>{props.history.push('/settings/emails')}}>邮箱管理</Menu.Item>
{/* <Menu.Item key="3" className="font-16" onClick={()=>{props.history.push('/settings/phone')}}>手机号管理</Menu.Item> */}
{/* <Menu.Item key="0" className="font-16" onClick={()=>{props.history.push('/settings/emails')}}>邮箱管理</Menu.Item> */}
<Menu.Item key="1" className="font-16" onClick={()=>{props.history.push('/settings/password')}}>密码管理</Menu.Item>
<Menu.Item key="2" className="font-16" onClick={()=>{props.history.push('/settings/cancel')}}>账号注销</Menu.Item>
{/* <Menu.Item key="2" className="font-16" onClick={()=>{props.history.push('/settings/cancel')}}>账号注销</Menu.Item> */}
</Menu>}
</div>
<div>

2
src/softbot/softBotList/index.jsx
View File

@ -68,7 +68,7 @@ function SoftBot(props){
return <div className="softbotBox">
<div className="softbotHead">
<div className="softheadContent">
<img src={getImageUrl(mygetHelmetapi.login_logo_url)} alt="" width={180}/>
{/* <img src={getImageUrl(mygetHelmetapi.login_logo_url)} alt="" width={180}/> */}
<div className="bigTit mt30">欢迎来到Bot市场</div>
<div className="bigTit">快来挑选一个心仪的Bot加入到您的项目吧!</div>
<Button type="primary" style={{width: '152px', height:'40px'}} className="font-18 gotoRegister" onClick={registerBot}>立即注册<i className="iconfont icon-youjiantou font-15"></i></Button>