Gitlink
/
forgeplus-react
0
0
Fork 37
Code Issues Pull Requests 5 Releases 1 Wiki Activity

增加长城云OAuth2登录、头像兼容本地和远端地址 #4

Closed
cutototo wants to merge 21 commits from cutototo/forgeplus-react:standalone into standalone
pull from: cutototo/forgeplus-react:standalone
merge into: Gitlink:standalone
Conversation 0 Commits 21 Files Changed 46 +302 -63
46 changed files with 302 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.ccyun.yml Normal file
View File

@ -0,0 +1,15 @@
kind: pipeline
type: docker
name: 确实社区前端自动化编译部署脚本
platform:
os: linux
arch: arm64
steps:
- name: 编译
image: node
commands:
- npm install -g cnpm --registry=https://registry.npm.taobao.org
- cnpm install
- npm run build

13
package-lock.json generated
View File

@ -1,5 +1,5 @@
{
"name": "educoder",
"name": "forge",
"version": "0.1.0",
"lockfileVersion": 1,
"requires": true,
@ -870,7 +870,6 @@
"antd": {
"version": "3.26.20",
"resolved": "https://registry.nlark.com/antd/download/antd-3.26.20.tgz",
"integrity": "sha1-8/Vw76qllQoUSULyHrKqqgiOlAc=",
"requires": {
"@ant-design/create-react-context": "^0.2.4",
"@ant-design/icons": "~2.1.1",
@ -3893,11 +3892,6 @@
"randomfill": "^1.0.3"
}
},
"crypto-js": {
"version": "4.0.0",
"resolved": "https://registry.npm.taobao.org/crypto-js/download/crypto-js-4.0.0.tgz",
"integrity": "sha1-KQSrJnep0EKFai6i74DekuSjbcw="
},
"crypto-random-string": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
@ -9186,8 +9180,7 @@
},
"is-mobile": {
"version": "2.2.2",
"resolved": "https://registry.nlark.com/is-mobile/download/is-mobile-2.2.2.tgz",
"integrity": "sha1-9snF1Q7gElTOBec5vdg18e1OmVQ="
"resolved": "https://registry.nlark.com/is-mobile/download/is-mobile-2.2.2.tgz"
},
"is-npm": {
"version": "1.0.0",
@ -14506,7 +14499,6 @@
"rc-table": {
"version": "6.10.15",
"resolved": "https://registry.nlark.com/rc-table/download/rc-table-6.10.15.tgz",
"integrity": "sha1-GB9McMT9dPZX7o8jGW5+sIoDZco=",
"requires": {
"classnames": "^2.2.5",
"component-classes": "^1.2.6",
@ -15252,7 +15244,6 @@
"react-slick": {
"version": "0.25.2",
"resolved": "https://registry.nlark.com/react-slick/download/react-slick-0.25.2.tgz",
"integrity": "sha1-VjMbZ9R9i8/i3OtqyrHI/VvR9rw=",
"requires": {
"classnames": "^2.2.5",
"enquire.js": "^2.1.6",

17
src/App.js
View File

@ -10,7 +10,7 @@ import {
import axios from 'axios';
import LoginDialog from './modules/login/LoginDialog';
import 'babel-polyfill';
import Loading from './Loading';
import Loading from './Loading'
import Loadable from 'react-loadable';
import marked from './common/marked';
@ -75,6 +75,11 @@ const EducoderLogin = Loadable({
loading: Loading,
})
const Otherloginxc = Loadable({
loader: () => import('./modules/login/Otherloginxc'),
loading: Loading,
})
class App extends Component {
constructor(props) {
super(props);
@ -206,6 +211,7 @@ class App extends Component {
});
};
render() {
return (
<Provider store={store}>
@ -214,6 +220,15 @@ class App extends Component {
<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
<Router>
<Switch>
{/*xc登录*/}
<Route
path={"/loginxc"}
render={
(props) => {
return (<Otherloginxc {...this.props} {...props} {...this.state} />)
}
}>
</Route>
{/*项目*/}
<Route
path={"/projects/:owner/:projectId/devops/:opsId/detail"}

8
src/common/UrlTool.js
View File

@ -15,7 +15,13 @@ export function getImageUrl(path) {
if (isDev) {
return `${local}/${path}`
}
return `${path}`;
var url = `${path}`
if (url.indexOf("http") > -1) {
return `${path}`;
} else {
return `/${path}`;
}
}
export function getImage(path) {

2
src/common/components/comment/CommentItem.js
View File

@ -64,7 +64,7 @@ function CommentItem({
const commentAvatar = (author) => (
<img
className="item-flex flex-image"
src={author.image_url ? getImageUrl(`/${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
src={author.image_url ? getImageUrl(`${author.image_url}`) : 'https://b-ssl.duitang.com/uploads/item/201511/13/20151113110434_kyReJ.jpeg'}
alt=""
/>
);

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

@ -33,7 +33,7 @@ class ActivityItem extends Component {
}
<p className="itemLine mt10">
<Link to={`/users/${item && item.user_login}`} className="show-user-link">
<img alt="" src={getImageUrl(`/${item.user_avatar}`)} className="createImage" />
<img alt="" src={getImageUrl(`${item.user_avatar}`)} className="createImage" />
<span className="mr20">{item.user_name}</span>
</Link>
{item.created_at && <span className="color-grey-9">创建于<span className="ml2 color-grey-6">{item.created_at}</span></span>}

2
src/forge/Component/AddMember.jsx
View File

@ -42,7 +42,7 @@ function AddMember({getID,login}){
className="user_img radius"
width="28"
height="28"
src={getImageUrl(`/${item && item.image_url}`)}
src={getImageUrl(`${item && item.image_url}`)}
alt=""
/>
<span className="ml10" style={{ "vertical-align": "middle" }}>

2
src/forge/Component/Cards.jsx
View File

@ -6,7 +6,7 @@ import './Component.scss';
function Cards({img , title, desc , rightBtn , src}){
return(
<div className="cards">
{img &&<div className="img"><img src={getImageUrl(`/${img}`)} alt=""/></div>}
{img &&<div className="img"><img src={getImageUrl(`${img}`)} alt=""/></div>}
<div className="content">
<p className="titles">
<Link to={src}>{title}</Link>

4
src/forge/Component/Contributors.jsx
View File

@ -52,7 +52,7 @@ function Contributors({contributors,owner,projectsId}){
<Spin spinning={isSpin}>
<FlexAJ>
<AlignCenter>
<Link to={`/users/${data.login}`}><img src={getImageUrl(`/${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
<Link to={`/users/${data.login}`}><img src={getImageUrl(`${data.image_url}`)} alt="" className="radius" width="38px" height="38px"/></Link>
<Link to={`/users/${data.login}`} className="ml10">{data.name}</Link>
</AlignCenter>
{
@ -146,7 +146,7 @@ function Contributors({contributors,owner,projectsId}){
return(
<Popover content={menu} visible={item.visible} overlayClassName="menuPanels" placement="top">
<Link key={key} to={`/users/${item.login}`}>
<img src={getImageUrl(`/${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
<img src={getImageUrl(`${item.image_url}`)} alt="" onMouseOver={()=>setVisibleFunc(true,item.login,key)}/>
</Link>
</Popover>
)

2
src/forge/Component/MemberCards.jsx
View File

@ -45,7 +45,7 @@ const Div = styled.div`{
export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
return (
<Div>
<Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`/${img}`)} /></Link>
<Link to={`/users/${user && user.login}`}><Img src={getImageUrl(`${img}`)} /></Link>
<div className="m-infos">
<Link to={`/users/${user && user.login}`}><Name>{name}</Name></Link>
<Time><I className="iconfont icon-shijian"></I>加入时间:{time}</Time>

2
src/forge/Component/SearchUser.jsx
View File

@ -44,7 +44,7 @@ export default ({ getUser })=>{
className="user_img radius"
width="28"
height="28"
src={getImageUrl(`/${item && item.image_url}`)}
src={getImageUrl(`${item && item.image_url}`)}
alt=""
/>
<span className="ml10" style={{ "vertical-align": "middle" }}>

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

@ -570,7 +570,7 @@ class NewHeader extends Component {
<a href={settings && settings.new_course.default_url} className={"fl mr30"} style={{minWidth:"45px"}}>
{
settings && settings.nav_logo_url ?
<img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl(`/${settings.nav_logo_url}`)}></img>
<img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={getImageUrl(`${settings.nav_logo_url}`)}></img>
:
<img alt="可控开源社区" className="logoimg" style={{ heigth: "40px" }} src={logo}></img>
}
@ -670,7 +670,7 @@ class NewHeader extends Component {
:
<div className="ml30 edu-menu-panel" style={{ height: "70px", lineHeight: "70px" }}>
<a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`}>
<img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image" src={getImageUrl(`/${user.image_url}`)} width="34">
<img alt="头像" className="radius" height="34" id="nh_user_logo" name="avatar_image" src={getImageUrl(`${user.image_url}`)} width="34">
</img>
</a>
<ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>

2
src/forge/Main/CoderDepot.jsx
View File

@ -321,7 +321,7 @@ function CoderDepot(props){
{
lastCommit &&
<div className="listtablehead">
<User url={getImageUrl(`/${lastCommitAuthor && lastCommitAuthor.image_url}`)} name={lastCommitAuthor && lastCommitAuthor.name} id={lastCommitAuthor && lastCommitAuthor.id} login={lastCommitAuthor && lastCommitAuthor.login}/>
<User url={getImageUrl(`${lastCommitAuthor && lastCommitAuthor.image_url}`)} name={lastCommitAuthor && lastCommitAuthor.name} id={lastCommitAuthor && lastCommitAuthor.id} login={lastCommitAuthor && lastCommitAuthor.login}/>
<div className={hideBtn && hide ? "ellipsistxt hide" :"ellipsistxt"}><pre id="ptxt">{lastCommit && lastCommit.message}</pre></div>
{ hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> }

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

@ -140,11 +140,11 @@ class CoderRootCommit extends Component{
{
item.id ?
<Link to={`/users/${item.login}`} className="show-user-link">
{item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
{item.image_url?<img src={getImageUrl(`${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>:
<span className="show-user-link">
{item.image_url?<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
{item.image_url?<img src={getImageUrl(`${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>
</span>
}

2
src/forge/Main/Diff.jsx
View File

@ -65,7 +65,7 @@ export default ({ match , history }) => {
<div className="f-wrap-between" style={{ alignItems: "center" }}>
<ul className="df">
<User
url={(committer && getImageUrl(`/${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
url={(committer && getImageUrl(`${committer.image_url}`))|| "https://dss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=3025493530,1989042357&fm=26&gp=0.jpg"}
name={committer && committer.name}
/>
{committer && committer.time_from_now && <li className="ml20 mt2">{committer.time_from_now}</li>}

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

@ -271,7 +271,7 @@ class Index extends Component {
return(
<div onClick={()=>this.getoDetail(item.author && item.author.login,item.identifier)}>
<div className="mainInfo">
<img src={getImageUrl(`/${item.author && item.author.image_url}`)} alt=""/>
<img src={getImageUrl(`${item.author && item.author.image_url}`)} alt=""/>
<p className="school">{item.name}</p>
<p className="name">{item.author && item.author.name}</p>
</div>

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

@ -29,7 +29,8 @@ class IndexItem extends Component {
</a>
:
<Link to={item.author && (item.author.type === "Organization" ? `/organize/${item.author.login}`:`/users/${item.author.login}`)} className="show-user-link">
<img className="p-r-photo" alt="" src={getImageUrl(`/${item.author && item.author.image_url}`)} ></img>
<img className="p-r-photo" alt=""
src={getImageUrl(`${item.author && item.author.image_url}`)} ></img>
</Link>
}
<div className="p-r-Infos">

2
src/forge/Main/sub/Contribute.jsx
View File

@ -50,7 +50,7 @@ function Contribute(props){
list.map((item,key)=>{
return(
<AlignCenter>
<img alt="" style={{borderRadius:"50%",marginRight:"10px"}} src={getImageUrl(`/${item.image_url}`)} width="50px" height="50px"/>
<img alt="" style={{borderRadius:"50%",marginRight:"10px"}} src={getImageUrl(`${item.image_url}`)} width="50px" height="50px"/>
<div>
<Link to={`/users/${item.login}`} className="font-16">{item.name}</Link>
<p className="font-12 color-grey-9">提交{item.contributions}次</p>

2
src/forge/Merge/Commits.jsx
View File

@ -22,7 +22,7 @@ function Commits({ commits , projectsId , owner }){
<Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(item.sha)}`} className="color-blue">浏览代码</Link>
</FlexAJ>
<AlignCenter className="mt15">
<User url={getImageUrl(`/${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span>
<User url={getImageUrl(`${item.committer && item.committer.image_url}`)} name={`${item.committer && item.committer.name}`}></User><span>：提交于{item.time_from_now}</span>
</AlignCenter>
</div>
</div>

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

@ -75,7 +75,7 @@ class MergeItem extends Component {
>
<img
className="radius"
src={getImageUrl(`/${item && item.avatar_url}`)}
src={getImageUrl(`${item && item.avatar_url}`)}
alt=""
width="24"
height="24"

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

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

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

@ -332,7 +332,7 @@ class MessageCount extends Component {
<div className="mt15">
<Link to={`/users/${data.issue.author_login}`} className="show-user-link">
<img className="mr5" src={getImageUrl(`/${data.issue.author_picture}`)}
<img className="mr5" src={getImageUrl(`${data.issue.author_picture}`)}
alt="" width="24" height="24" style={{borderRadius:"50%"}}
/>
</Link>

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

@ -117,7 +117,7 @@ class UserSubmitComponent extends Component {
<span className="df" style={{ alignItems: "center" }}>
<Link to={`/users/${current_user && current_user.login}`} className="show-user-link" >
<img
src={getImageUrl(`/${current_user && current_user.image_url}`)}
src={getImageUrl(`${current_user && current_user.image_url}`)}
alt=""
className="screwImg"
/>

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

@ -212,7 +212,7 @@ class Detail extends Component {
>
<img
className="user_img"
src={getImageUrl(`/${data && data.author_picture}`)}
src={getImageUrl(`${data && data.author_picture}`)}
alt=""
width="50"
height="50"

2
src/forge/Settings/CollaboratorMember.jsx
View File

@ -188,7 +188,7 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification
className="show-user-link"
>
<img
src={getImageUrl(`/${text}`)}
src={getImageUrl(`${text}`)}
alt=""
width="32px"
height="32px"

2
src/forge/Source/Index.jsx
View File

@ -217,7 +217,7 @@ function Index(props){
data.map((item,key)=>{
return(
<li>
<Link to= {`/users/${item.login}`} className="infoImg"><img src={getImageUrl(`/${item.imageUrl}`)} alt="" /></Link>
<Link to= {`/users/${item.login}`} className="infoImg"><img src={getImageUrl(`${item.imageUrl}`)} alt="" /></Link>
<div style={{flex:'1',width:"0"}}>
<FlexAJ>
<AlignCenter>

2
src/forge/Team/Group/GroupDetailProject.jsx
View File

@ -30,7 +30,7 @@ export default (({projects}) => {
projects.map((item, key) => {
return (
<Div>
<Imgs src={item.project && getImageUrl(`/${item.project.owner_image_url}`)}/>
<Imgs src={item.project && getImageUrl(`${item.project.owner_image_url}`)}/>
<Link to={`/projects/${item.project.owner_login}/${item.project.identifier}`}>{item.project.name}</Link>
</Div>
)

2
src/forge/Team/Group/Setting/GroupMemberSetting.jsx
View File

@ -76,7 +76,7 @@ export default ((props) => {
width: "7%",
render: (value, item) => {
return (
<Img src={getImageUrl(`/${item.user.image_url}`)}></Img>
<Img src={getImageUrl(`${item.user.image_url}`)}></Img>
)
}
},

2
src/forge/Team/RightBox.jsx
View File

@ -72,7 +72,7 @@ function RightBox({ OIdentifier , history , admin }) {
memberData.organization_users.map((item,key)=>{
return(
<div className="teammembers" key={key}>
<Link to={`/users/${item.user && item.user.login}`}><Img src={getImageUrl(`/${item.user && item.user.image_url}`)} alt="" className="m-img"/></Link>
<Link to={`/users/${item.user && item.user.login}`}><Img src={getImageUrl(`${item.user && item.user.image_url}`)} alt="" className="m-img"/></Link>
<div>
<Link to={`/users/${item.user && item.user.login}`}><ListName>{item.user && item.user.name}</ListName></Link>
<Align><i className="iconfont icon-shijian color-green mr3 font-13"></i><Span>加入时间：{item.created_at}</Span></Align>

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

@ -178,7 +178,7 @@ export default Form.create()(
<Input value="-1" style={{width:"350px"}}/>
)}
<p>选择头像:</p>
<UploadImage url={getImageUrl(`/${image}`)} getImage={getImage}/>
<UploadImage url={getImageUrl(`${image}`)} getImage={getImage}/>
<Button type={"primary"} onClick={updateDetail}>更新仓库设置</Button>
</Form>
</Div>

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

@ -64,7 +64,7 @@ export default (({organizeDetail})=>{
width:"5%",
render:(value)=>{
return(
value && <Link to={`/users/${value && value.login}`}><Img src={getImageUrl('/'+value.image_url)}></Img> </Link>
value && <Link to={`/users/${value && value.login}`}><Img src={getImageUrl(value.image_url)}></Img> </Link>
)
}
},

2
src/forge/Team/TeamGroupItems.jsx
View File

@ -86,7 +86,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){
{
item.users && item.users.map((i,k)=>{
return(
k < count ? <Link to={`/users/${i.login}`}><ImgContent title={i.name} key={k} src={getImageUrl(`/${i.image_url}`)}/></Link>
k < count ? <Link to={`/users/${i.login}`}><ImgContent title={i.name} key={k} src={getImageUrl(`${i.image_url}`)}/></Link>
:
k === count ?
<Link to={`/organize/${organizeDetail && organizeDetail.name}/group/${item.id}`} className="moreMember" title="查看更多" ><i className="iconfont icon-zhunbeizhong"></i></Link>

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

@ -88,7 +88,7 @@ class ForkUsers extends Component {
>
<img
className="avatar-60"
src={getImageUrl(`/${item.image_url}`)}
src={getImageUrl(`${item.image_url}`)}
alt=""
/>
</Link>

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

@ -18,7 +18,7 @@ class UserList extends Component {
>
<img
className="avatar-60"
src={getImageUrl(`/${item.image_url}`)}
src={getImageUrl(`${item.image_url}`)}
alt=""
/>
</a>

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

@ -118,7 +118,7 @@ class children_comments extends Component {
>
<img
className="radius"
src={getImageUrl(`/${item && item.user_picture}`)}
src={getImageUrl(`${item && item.user_picture}`)}
alt=""
width="30"
height="30"

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

@ -82,7 +82,7 @@ class children_journals extends Component {
>
<img
className="radius"
src={getImageUrl(`/${item && item.user_picture}`)}
src={getImageUrl(`${item && item.user_picture}`)}
alt=""
width="30"
height="30"

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

@ -375,7 +375,7 @@ class comments extends Component {
>
<img
className="radius"
src={getImageUrl(`/${item && item.user_picture}`)}
src={getImageUrl(`${item && item.user_picture}`)}
alt=""
width="30"
height="30"
@ -471,7 +471,7 @@ class comments extends Component {
className="radius"
src={
current_user && current_user.image_url
? getImageUrl(`/${current_user.image_url}`)
? getImageUrl(`${current_user.image_url}`)
: "images/avatars/User/b"
}
alt=""
@ -528,7 +528,7 @@ class comments extends Component {
className="radius"
src={
current_user && current_user.image_url
? getImageUrl(`/${current_user.image_url}`)
? getImageUrl(`${current_user.image_url}`)
: "images/avatars/User/b"
}
alt=""

28
src/forge/users/Infos.js
View File

@ -52,12 +52,26 @@ class Infos extends Component {
isSpin: false,
user: undefined,
project_type: undefined,
route_type: undefined
route_type: undefined,
update_profile_uri:""
};
}
componentDidMount = () => {
this.fetchUser();
try {
var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
for(var i=0; i<chromesettingArray.third_party.length; i++){
if ("ccyun" === chromesettingArray.third_party[i].name) {
this.setState({update_profile_uri:chromesettingArray.third_party[i].profile_url})
}
}
} catch (e) {
console.log("获取配置失败");
}
};
componentDidUpdate=(prevProps)=>{
const { username } = this.props.match.params;
@ -150,7 +164,7 @@ class Infos extends Component {
<div className="list-l-Menu text-center pd20 ">
<Avatar
size={110}
src={getImageUrl(`/${user && user.image_url}`)}
src={getImageUrl(`${user && user.image_url}`)}
/>
{user && user.user_identity && (
<div className="mt-n15 position-relative">
@ -167,10 +181,12 @@ class Infos extends Component {
<Button
block
className="text-button-grey"
href={`${
mygetHelmetapi &&mygetHelmetapi.new_course&&
mygetHelmetapi.new_course.edit_account
}`}
// href={`${
// mygetHelmetapi &&mygetHelmetapi.new_course&&
// mygetHelmetapi.new_course.edit_account
// }`}
href={this.state.update_profile_uri}
// onclick={()=>{props.history.push(`/users/${user && user.login}/editor_user`)}}
target="_blank"
>
{" "}

2
src/forge/users/Team-item.jsx
View File

@ -4,7 +4,7 @@ import { getImageUrl } from 'educoder';
function TeamItem({item,history}){
return(
<div onClick={()=>{history.push(`/organize/${item.name}`)}} style={{cursor:"pointer"}}>
<div className="imgBox"><img alt="" src={getImageUrl(`/${item.avatar_url}`)}/></div>
<div className="imgBox"><img alt="" src={getImageUrl(`${item.avatar_url}`)}/></div>
<div style={{flex:'1'}}>
<span className="mb5 font-18 color-grey-3 task-hide">{item.name}</span>
<div className="task-hide-2 teamdesc">

2
src/modules/404/Shixunnopage.js
View File

@ -16,7 +16,7 @@ class http500 extends Component {
<div className="newMain clearfix">
<div className=" edu-txt-center mt60 mb60">
{/*mt100 mb100*/}
<img src={getImageUrl("/images/warn/pic_404.jpg")} />
<img src={getImageUrl("images/warn/pic_404.jpg")} />
<p className="font-18 mt40">
您可以稍后尝试&nbsp;<a href="/"
className="color-blue">返回首页</a>

4
src/modules/courses/competitions/Competitioncommon/CompetitionCommon.js
View File

@ -358,10 +358,10 @@ class CompetitionCommon extends Component{
data && data.permission.editable === true ? "" :
<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div> : ""}
<img className={"Commonimg"}
src={data.competition_status === "ended" ? getImageUrl(`/images/educoder/competitions/groups1.png`) : data.competition_status === "nearly_published" ? getImageUrl(`images/educoder/competitions/groups2.png`) : data.competition_status === "progressing" ? getImageUrl(`images/educoder/competitions/groups3.png`) : ""}/>
src={data.competition_status === "ended" ? getImageUrl(`images/educoder/competitions/groups1.png`) : data.competition_status === "nearly_published" ? getImageUrl(`images/educoder/competitions/groups2.png`) : data.competition_status === "progressing" ? getImageUrl(`images/educoder/competitions/groups3.png`) : ""}/>
<Col span={15} className={"Commonimgbox"}>
<img className={"image_urlbox"}
src={data === undefined ? getImageUrl(`/images/educoder/competitions/mainbanner.jpg`) : data.avatar_url === null ? getImageUrl(`/images/educoder/competitions/mainbanner.jpg`) : getImageUrl(data.avatar_url)}/>
src={data === undefined ? getImageUrl(`images/educoder/competitions/mainbanner.jpg`) : data.avatar_url === null ? getImageUrl(`images/educoder/competitions/mainbanner.jpg`) : getImageUrl(data.avatar_url)}/>
</Col>
<Col className={"CompetitionCommonbannerfont"} span={9}>

2
src/modules/courses/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentsChart.js
View File

@ -253,7 +253,7 @@ class CompetitionContents extends Component{
<div className={"mt10"}>
<a href={`/users/${item.user_login}`} target={"_blank"} className="color-dark">
<div className={"relativef"}>
<img className={"rankingimg"} src={getImageUrl(`/images/${item.user_image===null?`avatars/User/0?1442652658`:item.user_image}`)} />
<img className={"rankingimg"} src={getImageUrl(`images/${item.user_image===null?`avatars/User/0?1442652658`:item.user_image}`)} />
<div className={"competimgabsolute"}><Badge count={item.competition_prize} style={{ backgroundColor: '#459BE5' }} title={item.competition_prize}/></div>
</div>
<p className="task-hide rankName mt5 jinshaifont">{personal===undefined||personal===null?item.record_user_name:personal===true?item.record_user_name:item.team_name}</p>

2
src/modules/courses/shixunHomework/ShixunWorkReport.js
View File

@ -514,7 +514,7 @@ class ShixunWorkReport extends Component {
<div className="fl edu-back-white ml10 ">
<img alt="头像" className="radius" height="91" id="nh_user_logo" name="avatar_image"
src={ getImageUrl(`/${data&&data.image_url}`)}
src={ getImageUrl(`${data&&data.image_url}`)}
width="91"/>
</div>

24
src/modules/login/LoginDialog.js
View File

@ -459,6 +459,21 @@ class LoginDialog extends Component {
)
}
openccyunlogin = () => {
try {
var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
for(var i=0; i<chromesettingArray.third_party.length; i++){
if ("ccyun" === chromesettingArray.third_party[i].name) {
if (typeof window !== 'undefined') {
window.location.href = chromesettingArray.third_party[i].url;
}
}
}
} catch (e) {
console.log("信创登录信息获取失败 重新请求开始读取配置");
}
}
getTContainer = () => {
return document.body;
}
@ -582,6 +597,15 @@ class LoginDialog extends Component {
</span>
</p>
<p className="clearfix mt20">
<span className={"startlogin"}>———————— 快速登录 ————————</span>
<div className={"mt10"}>
<a onClick={() => this.openccyunlogin()}>
<img src={require('./ccyun.png')} alt="信创登录" />
</a>
</div>
</p>
{this.props.user && this.props.user.main_site === true ? this.state.isphone === true ? <p className="clearfix mt20">
<span className={"startlogin"}>———————— 快速登录 ————————</span>
<div className={"mt10"}>

171
src/modules/login/Otherloginxc.js Normal file
View File

@ -0,0 +1,171 @@
import React, { Component } from 'react';
import { BrowserRouter as Router, Route, Link } from "react-router-dom";
import {notification, Spin} from 'antd';
import axios from 'axios';
import Dialog from "material-ui/Dialog";
class Otherloginxc extends Component {
constructor() {
super();
this.state = {
needChangePassword: false,
pass: "",
repass: "",
message: ""
};
this.changeBtnClick = this.changeBtnClick.bind(this);
this.handlePassChange = this.handlePassChange.bind(this);
this.handleRePassChange = this.handleRePassChange.bind(this);
}
handlePassChange(event) {
this.setState({pass: event.target.value});
}
handleRePassChange(event) {
this.setState({repass: event.target.value});
}
componentDidMount() {
debugger
let query=this.props.location.search;
if(query!= ""){
const type = query.split('?code=');
const types = type[1].split('&state=');
const typeshref = types[1].split('%2C');
let codeurl = `/auth/ccyun/callback.json`;
axios.get(codeurl,{params:{
code:types[0],
//https://test-newweb.educoder.net/
//https://www.educoder.net/otherloginqq
}}).then((result)=> {
if(result){
if(result.data.status===0){
window.location.href=`/`;
} else if(result.data.status===10001) {
this.setState({needChangePassword:true})
}
}
}).catch((error)=>{
})
}
}
openNotification = (messge) => {
notification.open({
message: "提示",
description:
messge,
onClick: () => {
console.log('Notification Clicked!');
},
});
}
changeBtnClick() {
if (this.state.pass === undefined || this.state.pass.length ===0 || this.state.pass === "") {
this.openNotification("密码不能为空");
}
if (this.state.repass === undefined || this.state.repass.length ===0 || this.state.repass === "") {
this.openNotification("二次密码不能为空");
return
}
if (this.state.pass !== this.state.repass==="") {
this.openNotification(`两次输入的密码不一致`);
return
}
else if (this.state.pass !==undefined&&this.state.pass.length>0&&this.state.pass.length<8){
this.openNotification("密码不能少于8位");
return
} else if (this.state.pass !==undefined&&this.state.pass.length>0&&this.state.pass.length>16){
this.openNotification("密码不能超过16位");
return
}
else if (this.state.repass !==undefined&&this.state.repass.length>0&&this.state.repass.length<8){
this.openNotification("二次密码不能少于8位");
return
} else if (this.state.repass !==undefined&&this.state.repass.length>0&&this.state.repass.length>16){
this.openNotification("二次密码不能超过16位");
return
}
var url = "/auth/ccyun/init.json";
axios.post(url, {
pass: this.state.pass,
repass: this.state.repass,
}).then((result) => {
if(result.data.status===0){
this.openNotification("密码初始化成功")
setInterval(function() {
window.location.href=`/`;
}, 500);
} else {
this.openNotification(result.data.message);
}
}).catch((error) => {
})
}
render() {
// Loading
let needChangePassword = this.state.needChangePassword;
return (
<div>
{
needChangePassword === false ?
<div className="App" style={{minHeight: '800px',width:"100%"}}>
<div>
<style>
{
`
.margintop{
margin-top:20%;
}
`
}
</style>
<Spin size="large" className={"margintop"}/>
</div>
</div>
:
<div style={{minHeight: '800px',width:"100%",textAlign: "center"}}>
<div style={{width:"480px",display: "inline-block"}}>
<div style={{height: "3rem",lineHeight: "3rem",background: "#f1f8ff",
textAlign: "center",borderRadius: "4px 4px 0 0",fontSize: "1.6em",
borderBottom:" 1px solid #f0f0f0"}}>初始化仓库账号密码</div>
<input type="password" id="password_loggin_input"
name="pass"
className="input-100-45 mt5"
value={this.state.pass}
onChange={this.handlePassChange}
placeholder="请输入密码" />
<input type="password" id="password_loggin_input"
name="repass"
value={this.state.repass}
onChange={this.handleRePassChange}
className="input-100-45 mt5"
placeholder="请重复输入密码" />
<div className={"bluebutton edu-back-blue"}
style={{width:"100px",display:"inline-block"}}
onClick={this.changeBtnClick}>
确认修改
</div>
</div>
</div>
}
</div>
);
}
}
export default Otherloginxc;

BIN
src/modules/login/ccyun.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.6 KiB