From a35e9f162375b6a99f139fed457fce224de8ff25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com> Date: Mon, 29 Apr 2024 11:49:34 +0800 Subject: [PATCH] =?UTF-8?q?glcc=E5=A2=9E=E5=8A=A0=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/glcc/apply/editInfo.jsx | 25 +++++++++++++++++-------- src/glcc/apply/index.jsx | 2 +- src/glcc/apply/index.scss | 11 +++++++++++ src/glcc/apply/taskApply.jsx | 25 +++++++++++++++++-------- 4 files changed, 46 insertions(+), 17 deletions(-) diff --git a/src/glcc/apply/editInfo.jsx b/src/glcc/apply/editInfo.jsx index 86ecbf46f..528f78fc4 100644 --- a/src/glcc/apply/editInfo.jsx +++ b/src/glcc/apply/editInfo.jsx @@ -1,5 +1,5 @@ import React , { useCallback, useEffect , useState } from 'react'; -import { Button, Form, Input, Select, Upload, message, Popconfirm, Checkbox } from 'antd'; +import { Button, Form, Input, Select, Upload, message, Popconfirm, Checkbox, Icon, Tooltip } from 'antd'; import {getUploadActionUrl} from 'educoder'; import {applyGlcc, findStudentTaskByTaskId, updateApplyGlcc} from '../api'; import TextArea from 'antd/lib/input/TextArea'; @@ -231,13 +231,22 @@ function EditRepoApplyInfo(props) { {cateList && cateList.map(item=> {return })} )} - {helper('GitLink地址', - '', - 'gitlinkUrl', - [{ required: true, message: "请输入GitLink项目地址" }, - { max: 252, message: '超出限制长度252位字符，请重新编辑' }], - {verify("gitlink")}}/> - )} + +
+ {helper('GitLink地址', + '', + 'gitlinkUrl', + [{ required: true, message: "请输入GitLink项目地址" }, + { max: 252, message: '超出限制长度252位字符，请重新编辑' }], + {verify("gitlink")}}/> + )} + + 指项目在GitLink的托管地址，详见迁移说明文档 +
} + > + + + {getFieldDecorator("contactName", { rules: [{ required: true, message: "请输入项目联系人姓名" }, { max: 32, message: '超出限制长度32位字符，请重新编辑' }], validateFirst: true, initialValue: current_user.username })( diff --git a/src/glcc/apply/index.jsx b/src/glcc/apply/index.jsx index fd70553c8..aaba59455 100644 --- a/src/glcc/apply/index.jsx +++ b/src/glcc/apply/index.jsx @@ -85,7 +85,7 @@ function Apply(props) {

申请说明

1、项目报名时间为{formatParsedResult(applyTime, "rangeDay")}，请在报名截止时间（北京时间{formatParsedResult(applyTime, "end")}）前提交报名信息。
2、本次GLCC夏令营建议使用GitLink为代码托管平台，学生基于GitLink上项目完成编程任务。同时也欢迎使用其他代码托管平台的项目参与活动。目前GLCC只对夏令营期间使用GitLink托管的项目提供部分奖励支持。
-
3、如果您的项目还未迁移到GitLink上，迁移事项请查看迁移说明文档。如在迁移过程中遇到问题，请加qq群: 1071514693 联系qq群管理员。
+
3、如果您的项目还未迁移到GitLink上，迁移事项请查看迁移说明文档。如在迁移过程中遇到问题，请加qq群: 1071514693 联系qq群管理员。
4、提交社区和题目信息后，欢迎与组委会联系沟通宣传推广和后续合作工作。联系人微信: _TigerWang（备注GitLink编程夏令营）
5、在项目报名期间（{formatParsedResult(applyTime, "rangeDay")}），您可以随时进入当前页调整项目或课题报名信息
6、课题奖励默认由项目方支持，可提供现金或者实习机会等其他形式的奖励，请根据课题难度设定奖励内容。若您可能无法支撑本课题奖励，GLCC组委会将进行资助评审，择优资助。如未获得资助，将下线该课题
diff --git a/src/glcc/apply/index.scss b/src/glcc/apply/index.scss index 6a52017c5..1a7810d62 100644 --- a/src/glcc/apply/index.scss +++ b/src/glcc/apply/index.scss @@ -57,6 +57,17 @@ max-height: 100px; } } + + .hasQuestionBox{ + width: 50%; + display: inline-flex; + .question{ + color: $primary-color; + } + .ant-row.ant-form-item{ + width: 100%; + } + } } .introArea{ width: 100%; diff --git a/src/glcc/apply/taskApply.jsx b/src/glcc/apply/taskApply.jsx index 8fe90d38a..e828b09cf 100644 --- a/src/glcc/apply/taskApply.jsx +++ b/src/glcc/apply/taskApply.jsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react'; -import {Form, Input, Radio, Select } from 'antd'; +import {Form, Icon, Input, Radio, Select, Tooltip } from 'antd'; import TextArea from 'antd/lib/input/TextArea'; import { rewardMoney } from '../api'; const Option = Select.Option; @@ -36,13 +36,22 @@ function TaskApply(props) { { max: 32, message: '超出限制长度32位字符，请重新编辑' }], )} - {helper('课题链接', - '', - `taskUrl${taskKey}`, - [{ required: true, message: "请输入课题链接" }, - { max: 252, message: '超出限制长度252位字符，请重新编辑' }], - - )} +
+ {helper('课题链接', + '', + `taskUrl${taskKey}`, + [{ required: true, message: "请输入课题链接" }, + { max: 252, message: '超出限制长度252位字符，请重新编辑' }], + + )} + + 您可用issue的形式来发布课题，详见课题样例 +
} + > + + + + {helper('课题难度', '', `taskDifficulty${taskKey}`,