-
-
- {this.props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目
- {/*
{props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目 */} + -
+
{props.history.push(`/projects/deposit/new/${OIdentifier}`)}}>新建项目
- - {this.props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目
- {/*
{props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目 */} + -
+
{props.history.push(`/projects/mirror/new/${OIdentifier}`)}}>导入项目
拖动文件或点击此处上传
-+ {/*
暂仅支持文件格式，不支持图片,excel等不可以txt读取的文件 -
+ */}文件名请使用英文且不得超过{size}MB
diff --git a/src/forge/users/InfosUser.js b/src/forge/users/InfosUser.js index f26338b7..e3b39fee 100644 --- a/src/forge/users/InfosUser.js +++ b/src/forge/users/InfosUser.js @@ -115,11 +115,11 @@ class InfosUser extends Component { newItem =()=> (-
-
- {this.props.history.push('/projects/deposit/new')}}>新建项目
- {/*
{this.props.history.push('/projects/deposit/new')}}>新建项目 */} + -
+
{this.props.history.push('/projects/deposit/new')}}>新建项目
- - {this.props.history.push('/projects/mirror/new')}}>导入项目
- {/*
{this.props.history.push('/projects/mirror/new')}}>导入项目 */} + -
+
{this.props.history.push('/projects/mirror/new')}}>导入项目
{/* -
{this.props.history.push('/projects/deposit/new')}} >新建项目 diff --git a/src/forge/users/Material/Index.jsx b/src/forge/users/Material/Index.jsx index dc0da8ce..ad2e0e6f 100644 --- a/src/forge/users/Material/Index.jsx +++ b/src/forge/users/Material/Index.jsx @@ -8,8 +8,8 @@ import '../../SecuritySetting/notice/manager/Index.scss'; function Index(props){ const { pathname } = props && props.location; - const [ key , setKey ] = useState("0"); + const [ type, setType] = useState('0'); useEffect(()=>{ if(pathname){ @@ -24,24 +24,22 @@ function Index(props){ return(-- ++ {key === "0" ? : }-+) diff --git a/src/forge/users/Material/Index.scss b/src/forge/users/Material/Index.scss index f4e79a52..d78e1e94 100644 --- a/src/forge/users/Material/Index.scss +++ b/src/forge/users/Material/Index.scss @@ -27,4 +27,141 @@ color: #333333; } } +} +.personalInfo{ + .ant-menu-item{ + color:#333333; + line-height: 20px; + } + .ant-menu-item-selected{ + color:#2a61ff; + } +} +.tipsBox{ + height: 45px; + color:#ffa13a; + background-color:#fff5eb; + border:1px solid #ffa13a; + border-radius:2px; + padding: 7px 20px; + letter-spacing: 1.5px; + display: flex; + align-items: center; + &.emailBox{ + background-image: url('../../Images/personalInfo2.png'); + background-size: 100% 100%; + border: none; + color:#181818; + .email{color:#666666;} + } + .spanTil{ + letter-spacing: normal; + } +} +.tipCont{ + min-height: 330px; + background-image: url('../../Images/personalInfo1.png'); + background-size: 100% 100%; + color: rgba(24, 24, 24, 1); + padding: 20px 23px; + .orange{ + color: rgba(255, 161, 58, 1); + } + .oneTipBox{ + color: rgba(102, 102, 102, 1); + display: block; + position: relative; + padding-left: 15px; + &::before{ + content: ''; + position: absolute; + top: 11px; + left: 0px; + width:6px; + height:6px; + background-color:#8f8f8f; + border-radius: 50%; + } + } +} +.updateEmail{ + font-weight:700; + color:#181818; + position: relative; + padding-left: 8px; + &::before{ + content: ''; + position: absolute; + top: 7px; + left: 0px; + width:3px; + height:15px; + background-color:#466aff; + border-radius:2px; + } +} +.personalUpdateInfoForm{ + .ant-input{ + height: 38px; + } + .ant-row.ant-form-item{ + margin-bottom: 20px; + } + .ant-form-item-control{ + left: 12px; + } + .ant-form-item-label > label{ + color: #181818; + } + .ant-form-explain{ + position: relative; + margin-top: 10px; + color: #FF4C4C; + &::before{ + content: '!'; + width:18px; + height:18px; + border-radius: 50%; + display: inline-block; + line-height: 18px; + text-align: center; + font-size: 12px; + color: #FF4C4C; + background-color: #FFDADA; + margin-right: 8px; + } + } + .has-error .ant-input{ + border-color: #ff4c4c; + background-color: rgba(102, 102, 102, 0) !important; + } + .has-error::after{ + content: '\e6e9'; + color: #FF4C4C; + font-size: 19px; + position: absolute; + right: -32px; + top: 0; + } + .hasSuccess .ant-form-item-control::after{ + content: '\e892'; + color: #1FD148; + font-size: 19px; + position: absolute; + right: -32px; + top: 0; + } +} +.getCaptchaBut{ + height:38px; + border-color: #466aff; + color: #466aff; + &:hover { + border-color: #5d7cff; + color: #5d7cff; + } + &:focus { + border-color: #1140ff; + color: #1140ff; + } } \ No newline at end of file diff --git a/src/forge/users/Material/Password.jsx b/src/forge/users/Material/Password.jsx index cb18a8e3..694dee21 100644 --- a/src/forge/users/Material/Password.jsx +++ b/src/forge/users/Material/Password.jsx @@ -1,102 +1,359 @@ -import React , { forwardRef, useState } from 'react'; -import { Form , Input , Button } from 'antd'; +import React , { forwardRef, Fragment, useState } from 'react'; +import { Form , Input , Button, message } from 'antd'; import { AlignCenter } from '../../Component/layout'; +import Modals from '../../Component/PublicModal/Index'; import Axios from 'axios'; - +import img1 from '../../Images/personalInfo3.png'; +import { setmiyah } from '../../../common/Component'; +import { useEffect } from 'react'; export default Form.create()( forwardRef((props)=>{ - const { getFieldDecorator, validateFields , setFieldsValue } = props && props.form; - const { current_user} = props; + const { getFieldDecorator, validateFields, resetFields, getFieldsValue } = props && props.form; + const { current_user, type, resetUserInfo} = props; const [ NewPass , setNewPass ] = useState(undefined); const [ NewPassRepeat , setNewPassRepeat ] = useState(undefined); + const [ countDown, setCountDown] = useState(undefined); + const [ emailValue, setEmailValue] = useState(undefined); + const [ passMap, setPassMap] = useState({password: undefined, email: undefined, code: undefined}); + const [ updatePsdMap, setUpdatePsdMap] = useState({oldPassword: undefined, password: undefined, password1: undefined}); + const [ visible, setVisible] = useState(false); + + useEffect(()=>{ + setPassMap({password: undefined, email: undefined, code: undefined}); + setUpdatePsdMap({oldPassword: undefined, password: undefined, password1: undefined}); + }, type) function submit() { validateFields((error,values)=>{ if(!error){ - submitFunc(values); + setVisible(true); } }) } - function submitFunc(values) { - const url = `/accounts/change_password.json`; - Axios.post(url,{ - login:current_user && current_user.login, - ...values - }).then(result=>{ - if(result && result.data){ - props.showNotification("密码重置成功！") - } - }).catch(error=>{}) - } - // 判断两次输入的密码是否一致 - var reg = /(?!.*\s)(?!^[\u4e00-\u9fa5]+$)^.{8,16}$/; + var reg = /(?!.*\s)(?!^[\u4e00-\u9fa5]+$)^.{8,16}$/; function checkIdentifier(rule, value, callback , inputValue){ - if(!value){ + const map = updatePsdMap; + if (value && !inputValue && !reg.test(value)) { + map.password1 = undefined; + setUpdatePsdMap(map); + callback("请输入8-16位密码，区分大小写、不能使用空格"); + }else if (value && inputValue && value !== inputValue) { + map.password1 = undefined; + setUpdatePsdMap(map); + callback("两次输入的密码不一致"); + }else{ + map.password1 = value; + setUpdatePsdMap(map); callback(); } - if (value && !inputValue && !reg.test(value)) { - callback("请输入8-16位密码，区分大小写、不能使用空格"); - } - if (value && inputValue && value !== inputValue) { - callback("两次输入的密码不一致"); - } - callback(); - } + } function checkNewPass(rule, value, callback,newpassrepeat) { - if(!value){ + const map = updatePsdMap; + if (!reg.test(value)) { + map.password = undefined; + setUpdatePsdMap(map); + callback("请输入8-16位密码，区分大小写、不能使用空格"); + }else if(newpassrepeat && newpassrepeat!==value){ + map.password = undefined; + setUpdatePsdMap(map); + callback("两次输入的密码不一致"); + }else{ + map.password = value; + setUpdatePsdMap(map); callback(); } - if (!reg.test(value)) { - callback("请输入8-16位密码，区分大小写、不能使用空格"); - } - if(value && newpassrepeat && newpassrepeat!==value){ - callback("两次输入的密码不一致"); - } - callback(); } - - return( - :{ key === "0" ?: - + } - +} ++请您谨慎操作，注销后帐号内所有数据都会被清空，且无法恢复帐号!
+ GitLink目前提供邮件渠道帐号注销服务。如需注销帐号，请通过发送邮件注销申请邮件到 gitlink@ccf.org.cn。+
+ 相关注意事项如下:
+ 必须使用要注销的 GitLink 帐号所绑定的邮箱地址发送邮件。 + 发送注销申请邮件之前确认帐号下无创建/加入组织，帐号名下无仓库信息。 + 邮件标题: 注销 GitLink 帐号，邮件正文请注明要注销帐号的邮箱和昵称。 + 发送邮件后，我们会积极处理，请耐心等候我们的邮件回复。 +{setVisible(false)}} + title={type==='0'? '更改邮箱' : '更改密码'} + btn={ + + + )}) ) \ No newline at end of file diff --git a/src/home/Img/2-3-2.png b/src/home/Img/2-3-2.png index 49f1e3c4..d1bbc673 100755 Binary files a/src/home/Img/2-3-2.png and b/src/home/Img/2-3-2.png differ diff --git a/src/home/Img/2-3-3.png b/src/home/Img/2-3-3.png index 4038afa7..b11b0c80 100644 Binary files a/src/home/Img/2-3-3.png and b/src/home/Img/2-3-3.png differ diff --git a/src/home/Img/2-3-4.png b/src/home/Img/2-3-4.png index e5204c06..ac636dac 100644 Binary files a/src/home/Img/2-3-4.png and b/src/home/Img/2-3-4.png differ+ + ++ } + > ++++ 确认更改{type === '0' ? '邮箱' : '密码'}？ +{type === '0' ? '更改邮箱后，您在GitLink的登录账号、接收通知的邮件地址将同步变更。请再次确认。' : '更改密码后，您在GitLink的登录密码将同步变更。请再次确认。'}
+