diff --git a/package-lock.json b/package-lock.json index 65734943b..9472c0f5f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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", diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js index 6ccea6a92..c442c85f3 100644 --- a/src/common/UrlTool.js +++ b/src/common/UrlTool.js @@ -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) { diff --git a/src/common/components/comment/CommentItem.js b/src/common/components/comment/CommentItem.js index e577c3bce..f0696d09d 100644 --- a/src/common/components/comment/CommentItem.js +++ b/src/common/components/comment/CommentItem.js @@ -64,7 +64,7 @@ function CommentItem({ const commentAvatar = (author) => ( ); diff --git a/src/forge/Activity/ActivityItem.js b/src/forge/Activity/ActivityItem.js index b726a4af0..0e1a7e02b 100644 --- a/src/forge/Activity/ActivityItem.js +++ b/src/forge/Activity/ActivityItem.js @@ -33,7 +33,7 @@ class ActivityItem extends Component { }

- + {item.user_name} {item.created_at && 创建于{item.created_at}} diff --git a/src/forge/Component/AddMember.jsx b/src/forge/Component/AddMember.jsx index 0548e52da..9620bcf62 100644 --- a/src/forge/Component/AddMember.jsx +++ b/src/forge/Component/AddMember.jsx @@ -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="" /> diff --git a/src/forge/Component/Cards.jsx b/src/forge/Component/Cards.jsx index 498b375c1..45620dfb1 100644 --- a/src/forge/Component/Cards.jsx +++ b/src/forge/Component/Cards.jsx @@ -6,7 +6,7 @@ import './Component.scss'; function Cards({img , title, desc , rightBtn , src}){ return(

- {img &&
} + {img &&
}

{title} diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx index 1e26354a5..fc4696637 100644 --- a/src/forge/Component/Contributors.jsx +++ b/src/forge/Component/Contributors.jsx @@ -52,7 +52,7 @@ function Contributors({contributors,owner,projectsId}){ - + {data.name} { @@ -146,7 +146,7 @@ function Contributors({contributors,owner,projectsId}){ return( - setVisibleFunc(true,item.login,key)}/> + setVisibleFunc(true,item.login,key)}/> ) diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx index 393ddbb17..d994e61ab 100644 --- a/src/forge/Component/MemberCards.jsx +++ b/src/forge/Component/MemberCards.jsx @@ -45,7 +45,7 @@ const Div = styled.div`{ export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => { return (

- +
{name} diff --git a/src/forge/Component/SearchUser.jsx b/src/forge/Component/SearchUser.jsx index 0203d24f5..97e802aae 100644 --- a/src/forge/Component/SearchUser.jsx +++ b/src/forge/Component/SearchUser.jsx @@ -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="" /> diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index e76fc8147..d9e68b53d 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -570,7 +570,7 @@ class NewHeader extends Component { { settings && settings.nav_logo_url ? - 可控开源社区 + 可控开源社区 : 可控开源社区 } @@ -670,7 +670,7 @@ class NewHeader extends Component { :
- +
    diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 9fa5603d0..1dc120d95 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -321,7 +321,7 @@ function CoderDepot(props){ { lastCommit &&
    - + 
    {lastCommit && lastCommit.message}
    { hideBtn && changeHide(hide)}> } diff --git a/src/forge/Main/CoderRootCommit.js b/src/forge/Main/CoderRootCommit.js index fc64aa012..4809d09f4 100644 --- a/src/forge/Main/CoderRootCommit.js +++ b/src/forge/Main/CoderRootCommit.js @@ -140,11 +140,11 @@ class CoderRootCommit extends Component{ { item.id ? - {item.image_url?:""} + {item.image_url?:""} : - {item.image_url?:""} + {item.image_url?:""} } diff --git a/src/forge/Main/Diff.jsx b/src/forge/Main/Diff.jsx index d8db5f008..f225fc3b9 100644 --- a/src/forge/Main/Diff.jsx +++ b/src/forge/Main/Diff.jsx @@ -65,7 +65,7 @@ export default ({ match , history }) => {
      {committer && committer.time_from_now &&
    • {committer.time_from_now}
      • } diff --git a/src/forge/Main/Index.js b/src/forge/Main/Index.js index 64a55ed26..7d53e7b45 100644 --- a/src/forge/Main/Index.js +++ b/src/forge/Main/Index.js @@ -271,7 +271,7 @@ class Index extends Component { return(
      this.getoDetail(item.author && item.author.login,item.identifier)}>
      - +

      {item.name}

      {item.author && item.author.name}

      diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 9b6a78c1d..3df50d549 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -29,7 +29,8 @@ class IndexItem extends Component { : - + }
      diff --git a/src/forge/Main/sub/Contribute.jsx b/src/forge/Main/sub/Contribute.jsx index a41cb3ed6..25f00233f 100644 --- a/src/forge/Main/sub/Contribute.jsx +++ b/src/forge/Main/sub/Contribute.jsx @@ -50,7 +50,7 @@ function Contribute(props){ list.map((item,key)=>{ return( - +
      {item.name}

      提交{item.contributions}次

      diff --git a/src/forge/Merge/Commits.jsx b/src/forge/Merge/Commits.jsx index 37c254cc9..f2bddec2d 100644 --- a/src/forge/Merge/Commits.jsx +++ b/src/forge/Merge/Commits.jsx @@ -22,7 +22,7 @@ function Commits({ commits , projectsId , owner }){ 浏览代码 - ：提交于{item.time_from_now} + ：提交于{item.time_from_now}
      diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js index 0873f5da9..0d80f9aa8 100644 --- a/src/forge/Merge/MergeItem.js +++ b/src/forge/Merge/MergeItem.js @@ -75,7 +75,7 @@ class MergeItem extends Component { > ( - + diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js index 85333aaf3..a781db5fc 100644 --- a/src/forge/Merge/MessageCount.js +++ b/src/forge/Merge/MessageCount.js @@ -332,7 +332,7 @@ class MessageCount extends Component {
      - diff --git a/src/forge/Newfile/UserSubmitComponent.js b/src/forge/Newfile/UserSubmitComponent.js index 6c921c9fc..07afab47e 100644 --- a/src/forge/Newfile/UserSubmitComponent.js +++ b/src/forge/Newfile/UserSubmitComponent.js @@ -117,7 +117,7 @@ class UserSubmitComponent extends Component { diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index 277f5d4ab..7b3aeab11 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -212,7 +212,7 @@ class Detail extends Component { > { return(
    • - +
      diff --git a/src/forge/Team/Group/GroupDetailProject.jsx b/src/forge/Team/Group/GroupDetailProject.jsx index 0c843f0af..483fb380e 100644 --- a/src/forge/Team/Group/GroupDetailProject.jsx +++ b/src/forge/Team/Group/GroupDetailProject.jsx @@ -30,7 +30,7 @@ export default (({projects}) => { projects.map((item, key) => { return (
      - + {item.project.name}
      ) diff --git a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx index 847dd6ef4..22e537675 100644 --- a/src/forge/Team/Group/Setting/GroupMemberSetting.jsx +++ b/src/forge/Team/Group/Setting/GroupMemberSetting.jsx @@ -76,7 +76,7 @@ export default ((props) => { width: "7%", render: (value, item) => { return ( - + ) } }, diff --git a/src/forge/Team/RightBox.jsx b/src/forge/Team/RightBox.jsx index 0603a4548..f92a561aa 100644 --- a/src/forge/Team/RightBox.jsx +++ b/src/forge/Team/RightBox.jsx @@ -72,7 +72,7 @@ function RightBox({ OIdentifier , history , admin }) { memberData.organization_users.map((item,key)=>{ return(
      - +
      {item.user && item.user.name} 加入时间：{item.created_at} diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx index 5be03db09..bfe4a4e60 100644 --- a/src/forge/Team/Setting/TeamSettingCommon.jsx +++ b/src/forge/Team/Setting/TeamSettingCommon.jsx @@ -178,7 +178,7 @@ export default Form.create()( )}

      选择头像:

      - +
      diff --git a/src/forge/Team/Setting/TeamSettingMember.jsx b/src/forge/Team/Setting/TeamSettingMember.jsx index 34f0e28ed..68f030d7d 100644 --- a/src/forge/Team/Setting/TeamSettingMember.jsx +++ b/src/forge/Team/Setting/TeamSettingMember.jsx @@ -64,7 +64,7 @@ export default (({organizeDetail})=>{ width:"5%", render:(value)=>{ return( - value && + value && ) } }, diff --git a/src/forge/Team/TeamGroupItems.jsx b/src/forge/Team/TeamGroupItems.jsx index e96a310d3..7d6763935 100644 --- a/src/forge/Team/TeamGroupItems.jsx +++ b/src/forge/Team/TeamGroupItems.jsx @@ -86,7 +86,7 @@ function TeamGroupItems({organizeDetail,limit, count , history}){ { item.users && item.users.map((i,k)=>{ return( - k < count ? + k < count ? : k === count ? diff --git a/src/forge/UsersList/fork_users.js b/src/forge/UsersList/fork_users.js index aaaa9b627..6446b2412 100644 --- a/src/forge/UsersList/fork_users.js +++ b/src/forge/UsersList/fork_users.js @@ -88,7 +88,7 @@ class ForkUsers extends Component { > diff --git a/src/forge/UsersList/user_list.js b/src/forge/UsersList/user_list.js index 592e98068..2f8e9f3a3 100644 --- a/src/forge/UsersList/user_list.js +++ b/src/forge/UsersList/user_list.js @@ -18,7 +18,7 @@ class UserList extends Component { > diff --git a/src/forge/comments/children_comments.js b/src/forge/comments/children_comments.js index 8a8ccbc80..c4331b27d 100644 --- a/src/forge/comments/children_comments.js +++ b/src/forge/comments/children_comments.js @@ -118,7 +118,7 @@ class children_comments extends Component { > { this.fetchUser(); + + try { + var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting')); + for(var i=0; i{ const { username } = this.props.match.params; @@ -150,7 +164,7 @@ class Infos extends Component {
      {user && user.user_identity && (
      @@ -167,10 +181,12 @@ class Infos extends Component {