Merge pull request 'wip' (#235) from pre_develop_dev into pre_develop

src/forge/Main/Detail.js

@@ -508,11 +508,6 @@ class Detail extends Component {
                       this.textFunc(projectDetail.forked_from_project_id, projectDetail.fork_info)
                       : ""
                   }
-                  {
-                    projectDetail && projectDetail.type && projectDetail.type !== 0 ?
-                      <span className="color-grey-9">导入于 <a className="color-grey-6" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
-                      : ""
-                  }
                 </div>
               </div>
               <div>

src/forge/Main/IndexItem.js

@@ -52,12 +52,6 @@ class IndexItem extends Component {
                         <i className="iconfont icon-banbenku font-18 color-green" />
                       </Tooltip>:""
                     }
-                    {
-                      item.type && item.type === 1 ?
-                      <Tooltip title="该项目是一个导入于其他网站的仓库" className="ml5">
-                        <i className="iconfont icon-jingxiang font-18 color-green" />
-                      </Tooltip>:""
-                    }
                   </AlignCenter>
                   <span className="p-r-tags">
                     {

src/forge/Settings/Setting.js

@@ -267,6 +267,11 @@ class Setting extends Component {
                     },
                   ],
                 })(<Input placeholder="请输入项目名称" />)}
+                {
+                    projectDetail && projectDetail.type && projectDetail.type !== 0 ?
+                      <span className="color-grey-9">该项目导入于 <a className="color-grey-6" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
+                      : ""
+                }
               </Form.Item>
               <div className="df" style={{ alignItems: "center" }}>
                 <span className="mr20 mb15 font-16">可见性</span>

src/forge/Team/ListItem.jsx

@@ -10,14 +10,10 @@ function ListItem({item,key,OIdentifier}) {
           <Link to={`/${OIdentifier}/${item.identifier}`} className="name">{item.name}</Link>
           { item.forked_from_project_id && <i className="iconfont icon-fork font-18 color-orange ml8" /> }
           {
-            item.type && item.type !== 0 ? 
+            item.type && item.type === 2 ? 
-            item.type === 2 ?
             <Tooltip title="该项目是一个镜像" className="ml8">
               <i className="iconfont icon-banbenku font-18 color-green" />
-            </Tooltip>:
+            </Tooltip>:""
-            <span className="ml8">
-              <i className="iconfont icon-jingxiang font-18 color-green" />
-            </span>:""
           }
         </span>
         <ListCount fork={item.forked_count} parise={item.praises_count}/>

src/modules/login/EducoderLogin.js

@@ -153,21 +153,21 @@ class EducoderLogin extends Component {
 										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 className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;GitLink | 确实开源<span className="ml15 mr15">京ICP备13000930号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">GitLink</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 className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;GitLink | 确实开源<span className="ml15 mr15">京ICP备13000930号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">GitLink</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 className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;GitLink | 确实开源<span className="ml15 mr15">京ICP备13000930号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">GitLink</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
 										</div>
 										:""
 									}

src/modules/login/Trialapplication.js

@@ -142,12 +142,12 @@ class Trialapplication extends Component {
 		if (this.state.Phonenumberisnotcobool === false) {
 			if (this.state.login.length === 0) {
 				this.setState({
-					Phonenumberisnotco: "请输入正确的手机号或邮箱",
+					Phonenumberisnotco: "请输入正确的邮箱账号",
 				})
 				return
 			} else {
 				this.setState({
-					Phonenumberisnotco: "请输入正确的手机号或邮箱",
+					Phonenumberisnotco: "请输入正确的邮箱账号",
 				})
 			}
 			return;

src/modules/login/Trialapplicationysl.js

@@ -158,12 +158,12 @@ class Trialapplicationysl extends Component {
 		if (this.state.Phonenumberisnotcobool === false) {
 			if (this.state.login.length === 0) {
 				this.setState({
-					Phonenumberisnotco: "请输入正确的手机号或邮箱",
+					Phonenumberisnotco: "请输入正确的邮箱账号",
 				})
 				return
 			} else {
 				this.setState({
-					Phonenumberisnotco: "请输入正确的手机号或邮箱",
+					Phonenumberisnotco: "请输入正确的邮箱账号",
 				})
 			}
 			return;

src/modules/user/FindPasswordComponent.js

@@ -699,7 +699,7 @@ class LoginRegisterComponent extends Component {
 						{/*onBlur={(e) => this.inputOnBlur(e)}*/}
 						<Input style={loginInputsyl} type="text" autoComplete="off" onClick={this.changeTypey}
 									 className={Phonenumberisnotco && Phonenumberisnotco !== "" ?" color-grey-9 loginInputzhucheyslass bor-reds":" color-grey-9 loginInputzhuche"}
-									 placeholder="输入注册手机号或邮箱" value={this.state.login}
+									 placeholder="输入注册的邮箱账号" value={this.state.login}
 									 // onBlur={(e) => this.inputOnBlurzhuche(e)}
 									 onChange={this.loginInputonChange} style={{marginTop: '10px', height: "38px"}}></Input>
 						{

src/modules/user/LoginRegisterComponent.js

@@ -7,6 +7,7 @@ import axios from 'axios';
 import CheckInputysl1 from './CheckInputysl';
 import CheckInputysl2 from './CheckInputysl';
 import Notcompletedysl from './Notcompletedysl';
+import Educoder from '../login/educoder.png';
 import './common.css'
 import './commontwo.css'
 const { TabPane } = Tabs;
@@ -1039,7 +1040,7 @@ class LoginRegisterComponent extends Component {
                               }
                           </style>
 
-                          <Input placeholder="请输入登录手机号码或邮箱" value={this.state.login}
+                          <Input placeholder="请输入邮箱账号" value={this.state.login}
                                  onChange={this.loginInputonChange}
                                  name="username"
                                  className={Phonenumberisnotco && Phonenumberisnotco !== "" ?" color-grey-9 loginInputzhucheyslass bor-reds":" color-grey-9 loginInputzhuche"}
@@ -1085,28 +1086,14 @@ class LoginRegisterComponent extends Component {
 
                           <Button className="login_btn font-16" type="primary" style={{height:"46px"}} onClick={() => this.postLogin()}
                                   size={"large"}>登录</Button>
-												{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?this.state.isphone===true?<p className="clearfix mb10 textcenter">
+                            <p className="clearfix mb10 textcenter">
-
+                                <span className={"startlogin"}>————————  快速登录  ————————</span>
-												<span className={"startlogin"}>————————  快速登录  ————————</span>
+                                <div className={"mt10"}>
-													<div className={"mt10"}>
+                                    <a href="https://data.educoder.net/oauth2?call_url=/oauth/authorize?client_id=d060ea87615f6f731880857bccc73f2620b0421b6780532cdf0df33583dbab4d&redirect_uri=https%3A%2F%2Fforgeplus.trustie.net%2Fapi%2Fauth%2Feducoder%2Fcallback&response_type=code">
-														<a onClick={()=>this.openweixinlogin()}>
+                                        <img src={Educoder}  alt="educoder登录" width="46px"/>
-															<img src={require('./img/WeChat.png')}  alt="微信登录"/>
+                                    </a>
-														</a>
+                                </div>
-														<a onClick={()=>this.openqqlogin()} className={"ml10"}>
+                            </p>
-															<img src={require('./img/qq.png')}  alt="qq登录"/>
-														</a>
-													</div>
-												</p>:<p className="clearfix mb10 textcenter">
-													<span className={"startlogin"}>————————  快速登录  ————————</span>
-													<div className={"mt10"}>
-														{/*<a onClick={()=>this.openweixinlogin()}>*/}
-														{/*<img src={require('./WeChat.png')}  alt="微信登录"/>*/}
-														{/*</a>*/}
-														<a onClick={()=>this.openphoneqqlogin()}>
-															<img src={require('./img/qq.png')}  alt="qq登录"/>
-														</a>
-													</div>
-												</p>:""}
                       </div>
                   }
 
@@ -1115,7 +1102,7 @@ class LoginRegisterComponent extends Component {
                   {
 										weixinlogin===false&&parseInt(tab[0])==1 &&
                       <div style={{width: '340px'}}>
-                          <Input  placeholder="请使用手机号/邮箱账号进行注册"
+                          <Input  placeholder="请使用邮箱账号进行注册"
                                   className={Phonenumberisnotcos && Phonenumberisnotcos !== "" ?" color-grey-9 loginInputzhucheyslass bor-reds":" color-grey-9 loginInputzhuche"}
                                   value={this.state.logins}
                                   type="text" autoComplete="off"
@@ -1255,34 +1242,19 @@ class LoginRegisterComponent extends Component {
                               color: '#676767',
                           }}>我已阅读并同意
 															<span>
-																<a href={'https://forge.educoder.net/help?index=4'} target="_blank" className={"color-blue"}>《服务协议条款》</a>
+																<a href={'https://gitlink.org.cn/forums/5029/detail'} target="_blank" className={"color-blue"}>《服务协议条款》</a>
 															</span></span></Checkbox>:""}
                           <Button className=" font-16 mb20" type="primary" style={this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?{height:"46px", width: "100%",marginTop:"26px"}:{height:"46px", width: "100%"}} onClick={() => this.postregistered()}
                                   size={"large"}>{this.props.weixinlogin?"注册并绑定":"注册"}</Button>
 
-												{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?this.state.isphone===true?<p className="clearfix mb10 textcenter">
+                            <p className="clearfix mb10 textcenter">
-
+                                <span className={"startlogin"}>————————  快速登录  ————————</span>
-													<span className={"startlogin"}>————————  快速登录  ————————</span>
+                                <div className={"mt10"}>
-													<div className={"mt10"}>
+                                    <a href="https://data.educoder.net/oauth2?call_url=/oauth/authorize?client_id=d060ea87615f6f731880857bccc73f2620b0421b6780532cdf0df33583dbab4d&redirect_uri=https%3A%2F%2Fforgeplus.trustie.net%2Fapi%2Fauth%2Feducoder%2Fcallback&response_type=code">
-														<a onClick={()=>this.openweixinlogin()}>
+                                        <img src={Educoder}  alt="educoder登录" width="46px"/>
-															<img src={require('./img/WeChat.png')}  alt="微信登录"/>
+                                    </a>
-														</a>
+                                </div>
-														<a onClick={()=>this.openqqlogin()} className={"ml10"}>
+                            </p>
-															<img src={require('./img/qq.png')}  alt="qq登录"/>
-														</a>
-													</div>
-												</p>:<p className="clearfix mb10 textcenter">
-													<span className={"startlogin"}>————————  快速登录  ————————</span>
-													<div className={"mt10"}>
-														{/*<a onClick={()=>this.openweixinlogin()}>*/}
-														{/*<img src={require('./WeChat.png')}  alt="微信登录"/>*/}
-														{/*</a>*/}
-														<a onClick={()=>this.openphoneqqlogin()}>
-															<img src={require('./img/qq.png')}  alt="qq登录"/>
-														</a>
-													</div>
-												</p>:""
-												}
                       </div>
                   }