From f4cc610de7a3c3ebb6667a69b5c28d0ecad21c4c Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 16 Apr 2024 09:35:20 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Information/Pages/dataset/index.jsx | 2 +- src/forge/Information/index.scss | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/forge/Information/Pages/dataset/index.jsx b/src/forge/Information/Pages/dataset/index.jsx index 89510cd03..2392baaed 100644 --- a/src/forge/Information/Pages/dataset/index.jsx +++ b/src/forge/Information/Pages/dataset/index.jsx @@ -53,7 +53,7 @@ function Index(props){

{item.dataSetName}

{item.dataSetDescription}

{/* 2023-09-08 15:54:23 */} - {item.repositoryName} + {item.repositoryName} ) diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss index 3cb622392..99db8b030 100644 --- a/src/forge/Information/index.scss +++ b/src/forge/Information/index.scss @@ -1787,10 +1787,13 @@ line-height: 24px; margin-bottom: 15px!important; height: 48px; + word-break: break-all; } .time{ font-size: 14px; color: #5E6685; + word-break: break-all; + display: block; i{ font-size: 14px!important; margin-right: 5px; From ac6802169cbda2f2592f1658676ef687d07401b9 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 18 Apr 2024 15:19:58 +0800 Subject: [PATCH 02/10] =?UTF-8?q?issue=E5=BC=95=E5=85=A5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Component/Releases.jsx | 3 ++- src/forge/Upload/Index.js | 3 ++- src/home/TopEdition.jsx | 2 +- src/modules/tpm/challengesnew/tpm-md-editor.js | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx index fa7312e92..8fa92eb79 100644 --- a/src/forge/Component/Releases.jsx +++ b/src/forge/Component/Releases.jsx @@ -28,7 +28,8 @@ function Releases({ owner, projectsId, releaseVersions, distribution }) { :
暂无发行版 - {distribution && 发布新版本} + {distribution && 发布新版本}
} diff --git a/src/forge/Upload/Index.js b/src/forge/Upload/Index.js index e548250c1..526af68ac 100644 --- a/src/forge/Upload/Index.js +++ b/src/forge/Upload/Index.js @@ -136,7 +136,8 @@ class Index extends Component { action: actionUrl || `${getUploadActionUrl()}`, onChange: this.handleChange, onRemove: this.onAttachmentRemove, - beforeUpload: this.beforeUpload + beforeUpload: this.beforeUpload, + multiple:true }; return ( diff --git a/src/home/TopEdition.jsx b/src/home/TopEdition.jsx index 37c48efaf..527502295 100644 --- a/src/home/TopEdition.jsx +++ b/src/home/TopEdition.jsx @@ -32,7 +32,7 @@ function TopEdition({register,current_user}) { const url = `/topics.json?topic_type=banner`; axios.get(url,{ params:{ - limit:5 + limit:6 } }).then(result=>{ if(result){ diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js index 630f0c276..d96674cda 100644 --- a/src/modules/tpm/challengesnew/tpm-md-editor.js +++ b/src/modules/tpm/challengesnew/tpm-md-editor.js @@ -158,7 +158,7 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla const ch = cursor.ch;//列 const startIndex = cm.getRange({line,ch:0},{line,ch}).lastIndexOf("#"); //替换内容 - cm.replaceRange(`[#${i.project_issues_index}](/${owner}/${projectsId}/issues/${i.project_issues_index}) `,{line,ch:startIndex},{line,ch}); + cm.replaceRange(`[#${i.subject}](/${owner}/${projectsId}/issues/${i.project_issues_index}) `,{line,ch:startIndex},{line,ch}); //鼠标聚焦 cm.focus(); // 保存引用的issue From 5d046966e7ccc4d3ed0d061f5936c135e525ab8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 19 Apr 2024 10:15:45 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/glcc/home/award/index.jsx | 8 ++++---- src/glcc/home/index.jsx | 2 +- src/glcc/home/partner/index.jsx | 21 +++++++++++++++++++++ src/glcc/img/70.png | Bin 0 -> 24349 bytes 4 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 src/glcc/img/70.png diff --git a/src/glcc/home/award/index.jsx b/src/glcc/home/award/index.jsx index 70626de65..5907fd5ed 100644 --- a/src/glcc/home/award/index.jsx +++ b/src/glcc/home/award/index.jsx @@ -2,7 +2,7 @@ import React from 'react'; import './index.scss'; -function Award() { +function Award({round}) { return (
@@ -21,14 +21,14 @@ function Award() {
-
毕业证书或奖杯
-
通过结项考核的学生获得毕业证书，优秀同学还可获得单项奖奖杯
+
{round === 3 ? "荣誉证书或奖杯" : "毕业证书或奖杯"}
+
{round === 3 ? "通过结项考核的学生获得夏令营毕业证书。优秀同学还可获得开源之星等单项奖杯，项目及导师将有机会评选优秀社区、明星导师等奖项" : "通过结项考核的学生获得毕业证书，优秀同学还可获得单项奖奖杯"}
夏令营大礼包
-
夏令营纪念文化衫、帆布包、鼠标垫，开源系列图书，社区周边等。此外，还会评选出若干优秀社区、明星导师、最佳课题、开源之星等单项奖
+
{round === 3 ? "所有入选学生将领取到夏令营纪念文化衫、帆布包、鼠标垫，开源系列图书，社区周边等" : "夏令营纪念文化衫、帆布包、鼠标垫，开源系列图书，社区周边等。此外，还会评选出若干优秀社区、明星导师、最佳课题、开源之星等单项奖"}
diff --git a/src/glcc/home/index.jsx b/src/glcc/home/index.jsx index 234faa9e5..92e912765 100644 --- a/src/glcc/home/index.jsx +++ b/src/glcc/home/index.jsx @@ -201,7 +201,7 @@ export default (props) => { : } - + diff --git a/src/glcc/home/partner/index.jsx b/src/glcc/home/partner/index.jsx index 45921fa0c..6a477161f 100644 --- a/src/glcc/home/partner/index.jsx +++ b/src/glcc/home/partner/index.jsx @@ -35,6 +35,7 @@ import log63 from '../../img/63@2x.png'; import log65 from '../../img/65@2x.png'; import log67 from '../../img/67@2x.png'; import log69 from '../../img/69@2x.png'; +import log71 from '../../img/70.png'; import log70 from '../../img/浙江大学.png'; import logo1 from '../../img/logo1.png'; import logo2 from '../../img/logo2.png'; @@ -44,6 +45,26 @@ function Partner({round}) {

组织方及合作伙伴

+ {round === 3 &&
+
+ 主办方 +
{ window.open("https://www.ccf.org.cn/") }} className='div8b9'>
+
+
+ 承办方 +
+
{ window.open("https://www.zhejianglab.com/home") }} className='div8b9 mr20'>之江实验室
+
{ window.open("https://www.gitlink.org.cn/zone/CCF-ODC") }} className='div8b9'>ccf开源发展委员会
+
+
+
+ 协办方 +
+
{ window.open("https://www.gitlink.org.cn/") }} className='div8b9 mr35'>
+
+
+
} + {round === 2 &&
主办方 diff --git a/src/glcc/img/70.png b/src/glcc/img/70.png new file mode 100644 index 0000000000000000000000000000000000000000..e69658e3ff3c24a253d5edc62ca6cbad4d3c6bac GIT binary patch literal 24349 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 Date: Fri, 19 Apr 2024 10:30:34 +0800 Subject: [PATCH 04/10] =?UTF-8?q?CCF=E4=B8=93=E5=8C=BA=E7=AE=80=E4=BB=8Blo?= =?UTF-8?q?go=E6=8E=92=E7=89=88=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Information/Pages/headerPage.jsx | 10 +++++----- src/forge/Information/index.scss | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/forge/Information/Pages/headerPage.jsx b/src/forge/Information/Pages/headerPage.jsx index dcb312ad8..cc21f1535 100644 --- a/src/forge/Information/Pages/headerPage.jsx +++ b/src/forge/Information/Pages/headerPage.jsx @@ -74,13 +74,13 @@ function HeaderPage(props){ // 专区简介 data && (data.introductionTitle || data.introductionContent || data.introductionImage) &&
-
- {data.introductionTitle &&

{data.introductionTitle}

} -

-
+
+ {data.introductionTitle &&

{data.introductionTitle}

} +

+
{ data.introductionImage && - + }
} diff --git a/src/forge/Information/index.scss b/src/forge/Information/index.scss index 99db8b030..3a32f3e9d 100644 --- a/src/forge/Information/index.scss +++ b/src/forge/Information/index.scss @@ -770,7 +770,7 @@ display: flex; align-items: center; margin-top: 54px; - padding:27px 24px; + padding:40px 24px; &>img{ border-radius: 4px; object-fit: contain; @@ -783,7 +783,7 @@ font-size:20px; height: 28px; line-height: 28px; - margin-bottom: 35px!important; + margin-bottom: 30px!important; } .z_desc{ color:#3d485d; From 351fd7deae6f274a8daabaeb789a042601591cd7 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 19 Apr 2024 11:39:35 +0800 Subject: [PATCH 05/10] ccf logo width --- src/forge/Information/Pages/headerPagebyCCF.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Information/Pages/headerPagebyCCF.jsx b/src/forge/Information/Pages/headerPagebyCCF.jsx index 919320e57..1e3b10b11 100644 --- a/src/forge/Information/Pages/headerPagebyCCF.jsx +++ b/src/forge/Information/Pages/headerPagebyCCF.jsx @@ -237,7 +237,7 @@ function HeaderPageCCF(props) {
{ data.introductionImage && - + }
} From 282cd855b3113f351224d57eead3b88f85f0dfb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 19 Apr 2024 13:49:08 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E6=A1=88?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/glcc/home/timerShaft/index.jsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/glcc/home/timerShaft/index.jsx b/src/glcc/home/timerShaft/index.jsx index 67d15bc4a..37a1bf372 100644 --- a/src/glcc/home/timerShaft/index.jsx +++ b/src/glcc/home/timerShaft/index.jsx @@ -5,6 +5,7 @@ import { formatParsedResult } from '../../api'; function TimerShaft(props) { const {current_user, period, history, showLoginDialog, id, glccSettings} = props; + let repoApplyEnd = undefined const step = [{ title: "Step1", date: "4.22", @@ -71,6 +72,9 @@ function TimerShaft(props) { const repoApply = glccSettings.filter(item=>item.name === "repoApply"); repoApply[0] && (step[0].date = formatParsedResult(repoApply, "startMonthDay")) repoApply[0] && (step[1].date = formatParsedResult(repoApply, "rangeConcatDot")) + if(repoApply[0]){ + repoApplyEnd = new Date(repoApply[0].value.split(",")[1]).getTime()-new Date().getTime() < 0 + } // 学生报名 const stuApply = glccSettings.filter(item=>item.name === "stuApply"); stuApply[0] && (step[3].date = formatParsedResult(stuApply, "rangeConcatDot")) @@ -93,12 +97,12 @@ function TimerShaft(props) {

有兴趣成为GLCC的导师吗？

想要扩大项目知名度和影响力，为开源项目吸引新鲜血液，培养长期开发者。通过GitLink平台，与高校建立连接，指导开源新人传授他们的开源文化，享受开源的乐趣
- {period === "repoApply" ?
立即报名
:
项目报名已结束
} + {period === "repoApply" ?
立即报名
:
项目报名{repoApplyEnd ? "已结束" : "敬请期待"}
}

你是开源新手，有兴趣参加GLCC吗？

想要参与一线开源项目开发，熟悉开源社区运作流程，接受资深开源软件专家指导，获得丰厚奖金和实习机会。参加GLCC，开启全新的开源之旅。
- {(period === "stuApply" || period === "stuApply1") ?
学生报名
:
学生报名{period === "repoApply" ? "敬请期待" : "已结束"}
} + {(period === "stuApply" || period === "stuApply1") ?
学生报名
:
学生报名{(period === "repoApply" || !period) ? "敬请期待" : "已结束"}
}
From 84de647213312b4b2e86471b43538bf1a3ded699 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Fri, 19 Apr 2024 15:21:38 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/UrlTool.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js index cc82ec16b..e45ae6ba2 100644 --- a/src/common/UrlTool.js +++ b/src/common/UrlTool.js @@ -144,7 +144,7 @@ export function getUrl(path, goTest) { // if (isDev) { // return `${local}${path?path:''}` // } - return `${path ? path: TEST_HOST}`; + return `${path ? path: ''}`; } export function getZoneUrl(path) { From 7a2580f51f2bb3435e92435716797335896b4faf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=BF=83=E5=AE=87?= Date: Thu, 25 Apr 2024 09:14:05 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=88=86=E4=BA=ABtest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- public/index.html | 1 + src/common/util/ShareUtil.js | 22 ++++++++++++++++------ src/forge/Information/Pages/newsDetail.jsx | 3 ++- src/forge/Information/index.jsx | 2 ++ 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 420fac00d..a6fe11241 100644 --- a/package.json +++ b/package.json @@ -177,7 +177,7 @@ "eslintConfig": { "extends": "react-app" }, - "proxy": "http://172.20.32.202:4000", + "proxy": "https://testforgeplus.trustie.net", "port": "3007", "devDependencies": { "@babel/runtime": "7.0.0-beta.51", diff --git a/public/index.html b/public/index.html index 06d38434c..7508cce5a 100755 --- a/public/index.html +++ b/public/index.html @@ -50,6 +50,7 @@ + <%= htmlWebpackPlugin.tags.bodyTags %> - + <%= htmlWebpackPlugin.tags.bodyTags %>