diff --git a/src/AppConfig.js b/src/AppConfig.js index a5a063b0..31f39150 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -27,7 +27,7 @@ if (isDev) { } debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' : window.location.search.indexOf('debug=s') !== -1 ? 'student' : - window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin' + window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || '' } function clearAllCookie() { cookie.remove('_educoder_session', { path: '/' }); diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js index 5b101e7a..6b3d3564 100644 --- a/src/common/UrlTool.js +++ b/src/common/UrlTool.js @@ -162,7 +162,7 @@ export function getmyUrl(geturl) { } export function getUploadActionUrl(path, goTest) { - return `${getUrl()}/api/attachments.json?debug=${window._debugType || 'admin'}`; + return `${getUrl()}/api/attachments.json`; } export function getUploadLogoActionUrl() { diff --git a/src/forge/Branch/Select.jsx b/src/forge/Branch/Select.jsx index 0f0b0de4..f33a716f 100644 --- a/src/forge/Branch/Select.jsx +++ b/src/forge/Branch/Select.jsx @@ -102,7 +102,7 @@ export default (({ projectsId , branch , owner , changeBranch , branchList , tag ); return( - setFlag(!flag)} overlayClassName="branch-tagBox-list"> + setFlag(!flag)} overlayClassName="branch-tagBox-list">
{/* {nav === 0 ?"分支":"标签"} */} diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss index d27d4aae..bfd5e961 100644 --- a/src/forge/Component/Component.scss +++ b/src/forge/Component/Component.scss @@ -112,6 +112,9 @@ li.ant-menu-item{ right:240px; z-index: 10000; } +.laterest{ + color: #05690d; +} @media screen and (max-width: 1800px){ .handleBox{ diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx index b3b0a774..3dc8cf02 100644 --- a/src/forge/Component/Releases.jsx +++ b/src/forge/Component/Releases.jsx @@ -20,10 +20,13 @@ function Releases({owner,projectsId,releaseVersions}){ releaseVersions && releaseVersions.total_count>0 ? releaseVersions.list.map((item,key)=>{ return( - + key === 0 &&
-

{item.name}

+

+ {item.name} + 最新 +

{item.created_at}

diff --git a/src/forge/Component/User.jsx b/src/forge/Component/User.jsx index 8701e607..4d22c77b 100644 --- a/src/forge/Component/User.jsx +++ b/src/forge/Component/User.jsx @@ -1,8 +1,8 @@ import React from 'react'; import styled from 'styled-components'; +import { Link } from 'react-router-dom'; - -export default ({ url , name , column })=>{ +export default ({ url , name , column , id , login })=>{ const Img = styled.span` display:flex; ${column && "flex-direction: column;text-align:center;"} @@ -19,6 +19,14 @@ export default ({ url , name , column })=>{ } `; return( + id? + + + { url && } + {name} + + + : { url && } {name} diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 58e941d2..2e4f82da 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -92,7 +92,7 @@ function CoderDepot(props){ setZip_url(result.data.zip_url); let c = result.data.last_commit setLastCommit(c && c.commit); - setLastCommitAuthor(c && (c.author || (c.commit && c.commit.author))); + setLastCommitAuthor(c && c.committer); setMainFlag(true); } setTimeout(function(){setIsSpin(false);},500); @@ -133,7 +133,7 @@ function CoderDepot(props){ } let c = result.data.last_commit setLastCommit(c && c.commit); - setLastCommitAuthor(c && (c.author || (c.commit && c.commit.author))); + setLastCommitAuthor(c && c.committer); setMainFlag(false); } setTimeout(function(){setIsSpin(false);},500) @@ -306,7 +306,7 @@ function CoderDepot(props){ { lastCommit &&
- +

{lastCommit && lastCommit.message}

{ hideBtn && changeHide(hide)}> } diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 1deeba36..93e49c71 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -496,9 +496,11 @@ class Detail extends Component { } - - 复刻 (Fork) - + + + 复刻 + + { forked_count > 0 ? platform ? diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx index fbdf5541..1361acb0 100644 --- a/src/forge/Main/sub/DetailBanner.jsx +++ b/src/forge/Main/sub/DetailBanner.jsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import { Skeleton } from 'antd'; +import { Skeleton , Tooltip} from 'antd'; import { Link } from 'react-router-dom'; function DetailBanner({ list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){ @@ -39,11 +39,13 @@ function DetailBanner({ list , owner , projectsId , isManager , url , pathname , { item.menu_name === "issues" &&
  • - - - 易修 (Issue) - {projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} : ""} - + + + + 易修 + {projectDetail && projectDetail.issues_count ? {projectDetail.issues_count} : ""} + +
  • } { diff --git a/src/modules/login/LoginDialog.js b/src/modules/login/LoginDialog.js index 44197524..86ba57b6 100644 --- a/src/modules/login/LoginDialog.js +++ b/src/modules/login/LoginDialog.js @@ -580,8 +580,8 @@ class LoginDialog extends Component {
    - this.getloginurl("https://www.trustie.net/account/lost_password")} - className="mr3 color-grey-9">找回密码 + this.getloginurl("https://www.trustie.net/account/lost_password")} className="mr3 color-grey-9">找回密码 + this.getloginurl("https://www.trustie.net/login?login=false")} className="color-grey-9">注册