diff --git a/src/glcc/home/award/index.jsx b/src/glcc/home/award/index.jsx index ffa1c758..4e8c1e47 100644 --- a/src/glcc/home/award/index.jsx +++ b/src/glcc/home/award/index.jsx @@ -10,7 +10,7 @@ function Award() {
丰厚现金奖励
-
根据项目难度设置高、中、低三个阶梯课题，对应奖金为12000 元、9000 元和 6000 元
+
根据课题开发耗时，对应奖金从6000元至12000元不等。详细可以课题详情中具体奖金标准
@@ -28,7 +28,7 @@ function Award() {
夏令营大礼包
-
夏令营纪念文化衫、帆布包、鼠标垫，开源系列图书，社区周边等。此外，还会评选出若干优秀社区、明星导师、最佳课题、开源之星等单项奖。
+
夏令营纪念文化衫、帆布包、鼠标垫，开源系列图书，社区周边等。此外，还会评选出若干优秀社区、明星导师、最佳课题、开源之星等单项奖
diff --git a/src/glcc/home/timerShaft/index.jsx b/src/glcc/home/timerShaft/index.jsx index 98b51944..a4f6b12a 100644 --- a/src/glcc/home/timerShaft/index.jsx +++ b/src/glcc/home/timerShaft/index.jsx @@ -5,32 +5,32 @@ import './index.scss'; const stepArr = [{ title: "Step1", date: "4.15", - content: "GLCC发布" + content: "GLCC夏令营活动发布" }, { title: "Step2", - date: "4.15-5.20", - content: "社区启动报名" + date: "4.15-5.19", + content: "社区项目报名，提交课题" }, { title: "Step2", - date: "5.20", - content: "公示社区名单" + date: "5.20-5.25", + content: "公示社区项目名单" }, { title: "Step2", - date: "5.21-6.19", - content: "学生提交proposal" + date: "5.26-6.24", + content: "学生报名，提交Proposal" }, { title: "Step2", date: "7.1", - content: "公示项目申请审核结果", + content: "公示入选学生名单", noArrow: true, }, { title: "Step2", - date: "7.4-8.12", + date: "7.1-8.12", content: "项目开发第一阶段", }, { @@ -40,13 +40,13 @@ const stepArr = [{ }, { title: "Step2", - date: "10.1-10.14", - content: "结项审核", + date: "10.1-10.21", + content: "结项审核，并公示考核结果", }, { title: "Step2", - date: "11.11", - content: "公布优秀项目&学员", + date: "10.21-11.11", + content: "评选公布优秀项目和学员&学员", noArrow: true, } ] diff --git a/src/glcc/img/banner.png b/src/glcc/img/banner.png index 3fe2e801..3806f08b 100644 Binary files a/src/glcc/img/banner.png and b/src/glcc/img/banner.png differ diff --git a/src/glcc/img/studentProject.png b/src/glcc/img/studentProject.png index f72cd4a5..45539509 100644 Binary files a/src/glcc/img/studentProject.png and b/src/glcc/img/studentProject.png differ diff --git a/src/glcc/project/component/projectDetail.jsx b/src/glcc/project/component/projectDetail.jsx index d6e7cf94..b52ebe06 100644 --- a/src/glcc/project/component/projectDetail.jsx +++ b/src/glcc/project/component/projectDetail.jsx @@ -1,12 +1,28 @@ import React, { useState } from 'react'; -import { Button } from 'antd'; +import { Button, message } from 'antd'; import Nodata from '../../../forge/Nodata'; import { useEffect } from 'react'; import { getProjectById } from '../../api'; -export default ({ detail, projectId, applyTaskId }) => { +export default ({ detail, projectId, applyTaskId, current_user, showLoginDialog, isStudentApplyDate, studentApplyEnd }) => { const [info, setInfo] = useState(detail); + // 申请课题按钮点击函数 + function applyTask(id){ + // 判断用户是否已经登录 + if(current_user && current_user.login){ + // 判断用户是否已经报名两个课题 + if(applyTaskId && Object.keys(applyTaskId).length >= 2){ + message.error('最多只能同时报名两个课题'); + }else{ + // 跳转到学生报名页 + window.location.href=`/glcc/student/apply/${id}`; + } + }else{ + showLoginDialog(); + } + } + useEffect(()=>{ if(!detail && projectId){ // 通过项目Id查询项目详情 @@ -40,22 +56,22 @@ export default ({ detail, projectId, applyTaskId }) => {
{info.projectName} {info.projectType && {info.projectType}} -

{info.gitlinkUrl}

-
{info.officialWebsiteUrl}
+

GitLink项目地址: {info.gitlinkUrl}

+
项目简介: {info.projectIntro}
{info.registrationTaskList && info.registrationTaskList.length > 0 ? info.registrationTaskList.map(item=>{ return
{item.taskName}
-
导师姓名:   {item.tutorName}
-
邮箱地址:   {item.tutorMail}
+
导师姓名:   {item.tutorName}
+
邮箱地址:   {item.tutorMail}
{item.taskDesc}
课题链接:   {item.taskUrl}
-
{applyTaskId && item.id && Object.keys(applyTaskId).includes(item.id.toString()) ? : }
+
{(isStudentApplyDate || studentApplyEnd) && (applyTaskId && item.id && Object.keys(applyTaskId).includes(item.id.toString()) ? : isStudentApplyDate && )}
-
￥ {item.taskReward}
+
￥ {item.taskReward}
}) : } :
diff --git a/src/glcc/project/index.jsx b/src/glcc/project/index.jsx index 74b4bc62..29024186 100644 --- a/src/glcc/project/index.jsx +++ b/src/glcc/project/index.jsx @@ -20,8 +20,12 @@ const TaskList = Loadable({ }); function Project(propsF) { - const {location, current_user} = propsF; + const {location, current_user, showLoginDialog} = propsF; const {pathname} = location; + const isStudentApplyDate = Date.parse(new Date()) > 1653494400000 && Date.parse(new Date()) < 1656086400000; + const studentApplyEnd = Date.parse(new Date()) > 1656086400000; + // const studentApplyEnd = false; + // const isStudentApplyDate = true; // 用户已报名课题id数组 const [applyTaskId, setApplyTaskId] = useState({}); @@ -57,13 +61,13 @@ function Project(propsF) { ( - + )} > ( - + )} > diff --git a/src/glcc/project/index.scss b/src/glcc/project/index.scss index 8dc06173..a2cddac0 100644 --- a/src/glcc/project/index.scss +++ b/src/glcc/project/index.scss @@ -76,7 +76,7 @@ padding: 30px 30px 50px; .taskItem{ .center{ - width: 60%; + // width: 60%; } .right{padding-right: 10px;} } @@ -104,10 +104,15 @@ .taskItem { display: flex; justify-content: space-between; - background-color: #ffffff; - box-shadow: 0px 0px 12px rgba(71, 105, 198, 0.4); + border:1px solid #ffffff; + &:hover{ box-shadow: 0px 0px 12px rgba(71, 105, 198, 0.4);} + .oneLine{ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } .left{ - width: 250px; + width: 316px; background-image: url('../img/projectDetailTaskBg.png'); background-size: 100% 100%; padding: 22px 20px; @@ -117,9 +122,10 @@ font-size:18px; } .email span{color:#466aff;} + .leftWidth{width: 270px;} } .center{ - width: 66%; + width: 650px; text-align: left; padding: 20px; display: flex; @@ -141,6 +147,7 @@ } } .right{ + min-width: 150px; font-weight:700; color:#ff8800; font-size:24px; @@ -148,8 +155,14 @@ } } } -.projectItemPopover{width: 1200px;} +.projectItemPopover{ + width: 1200px; + .ant-popover-content .ant-popover-arrow{ + border-width: 12px; + } +} .projectItemPopover .ant-popover-inner{ + transform: translateY(8px); background-image:linear-gradient(180deg,#f1f5ff 0%,#ffffff 100%); border:1px solid #ffffff; border-radius:4px; @@ -157,4 +170,8 @@ .ant-popover-inner-content{ padding: 30px 30px 50px; } +} +.lookDetail:hover, .lookDetail:focus{ + border-color: #466aff; + color: #466aff; } \ No newline at end of file diff --git a/src/glcc/project/projectList/index.jsx b/src/glcc/project/projectList/index.jsx index 067873ad..5f130a6e 100644 --- a/src/glcc/project/projectList/index.jsx +++ b/src/glcc/project/projectList/index.jsx @@ -1,5 +1,5 @@ import React , { useEffect , useState } from 'react'; -import { Input, Popover, Table, Tooltip } from 'antd'; +import { Input, Popover, Spin, Table, Tooltip } from 'antd'; import { main_site_url } from '../../fetch'; import './index.scss'; import { projectList } from '../../api'; @@ -7,12 +7,14 @@ import ProjectDetail from '../component/projectDetail'; const {Search} = Input; // 项目列表 -function ProjectList({applyTaskId}) { +function ProjectList({applyTaskId, current_user, showLoginDialog, isStudentApplyDate, studentApplyEnd}) { // 输入搜索框 const [keyword, setKeyword] = useState(undefined); const [data, setData] = useState([]); + const [loading, setLoading] = useState(false); useEffect(()=>{ + setLoading(true); const params = { curPage: 1, keyword, @@ -22,6 +24,7 @@ function ProjectList({applyTaskId}) { if(response && response.message === "success"){ setData(response.data.rows); } + setLoading(false); }) },[keyword]) @@ -29,18 +32,20 @@ function ProjectList({applyTaskId}) {
{setKeyword(value)}}/>
-
- {data && data.map((item, index)=>{ - return } trigger='click' overlayClassName='projectItemPopover'> -
-
-
-
{item.projectName}
-
{item.projectIntro}
-
- - })} -
+ +
+ {data && data.map((item, index)=>{ + return } trigger='click' overlayClassName='projectItemPopover' autoAdjustOverflow={false} isStudentApplyDate={isStudentApplyDate} studentApplyEnd={studentApplyEnd}> +
+
+
+
{item.projectName}
+
{item.projectIntro}
+
+ + })} +
+
) diff --git a/src/glcc/project/projectList/index.scss b/src/glcc/project/projectList/index.scss index 511b1f8b..581af5ff 100644 --- a/src/glcc/project/projectList/index.scss +++ b/src/glcc/project/projectList/index.scss @@ -1,15 +1,3 @@ -.actionBox{ - display: flex; - align-items: center; - color: #466aff; - cursor: pointer; - .iconfont{ - margin: 0 10px 0 14px; - } - .applyTask{ - color:#eb9350; - } -} .projectListBox{ display: flex; flex-wrap: wrap; diff --git a/src/glcc/project/taskList/index.jsx b/src/glcc/project/taskList/index.jsx index df2d2202..687b2341 100644 --- a/src/glcc/project/taskList/index.jsx +++ b/src/glcc/project/taskList/index.jsx @@ -6,7 +6,7 @@ import ProjectDetail from '../component/projectDetail'; const { Search } = Input; // 课题列表 -function TaskList({applyTaskId, setStudentInfoReset}) { +function TaskList({applyTaskId, setStudentInfoReset, current_user, showLoginDialog, isStudentApplyDate, studentApplyEnd}) { const [visible, setVisible] = useState(false); const [deleteTaskId, setDeleteTaskId] = useState(undefined); // 输入搜索框 @@ -16,21 +16,22 @@ function TaskList({applyTaskId, setStudentInfoReset}) { const [current, setCurrent] = useState(1); const [total, setTotal] = useState(0); const [pageSize, setPageSize] = useState(20); + const [loading, setLoading] = useState(false); const columns = [ - { title: '序号', dataIndex: 'index', align: 'center', className:"taskTableColumns", render: (text, item, index) => index + 1 }, - { title: '课题名称', dataIndex: 'taskName', className:"taskTableColumns taskName", width: '28%', render: (text, item) => {window.location.href=item.taskUrl}}>{text} }, - { title: '项目名称', dataIndex: 'tutorName', className:"taskTableColumns", width: '28%', render: (text) => {text} }, - { title: '课题奖金', dataIndex: 'taskReward', className:"taskTableColumns", render: (text) => ￥ {text} }, + { title: '序号', dataIndex: 'index', align: 'center', className:"taskTableColumns", width: '6%', render: (text, item, index) => index + 1 }, + { title: '课题名称', dataIndex: 'taskName', className:"taskTableColumns taskName", width: '28%', ellipsis: true, render: (text, item) => {window.location.href=item.taskUrl}}>{text} }, + { title: '项目名称', dataIndex: 'projectName', className:"taskTableColumns", width: '28%', ellipsis: true, render: (text) => {text} }, + { title: '课题奖金', dataIndex: 'taskReward', className:"taskTableColumns", width: `${isStudentApplyDate || studentApplyEnd ? '15%' : ''}`, render: (text) => ￥ {text} }, { title: '操作', dataIndex: 'action', align: 'center', className:"actionColumns taskTableColumns", render: ((text, item, index) => { return (
- {applyTaskId && Object.keys(applyTaskId).includes(item.id.toString()) ? + {(isStudentApplyDate || studentApplyEnd) && (applyTaskId && Object.keys(applyTaskId).includes(item.id.toString()) ? {window.location.href=`/glcc/student/apply/${item.id}`}}>报名详情 {setDeleteTaskId(item.id);setVisible(true)}}> - : - {window.location.href=`/glcc/student/apply/${item.id}`}}>{applyTask(item.id)}}>申请课题} + :isStudentApplyDate && + {applyTask(item.id)}}>申请课题)}
) }) @@ -50,17 +51,22 @@ function TaskList({applyTaskId, setStudentInfoReset}) { } const expandRow = (record) => { - return + return } // 申请课题按钮点击函数 function applyTask(id){ - // 判断用户是否已经报名两个课题 - if(applyTaskId.length >= 2){ - message.error('最多只能同时报名两个课题'); + // 判断用户是否已经登录 + if(current_user && current_user.login){ + // 判断用户是否已经报名两个课题 + if(applyTaskId && Object.keys(applyTaskId).length >= 2){ + message.error('最多只能同时报名两个课题'); + }else{ + // 跳转到学生报名页 + window.location.href=`/glcc/student/apply/${id}`; + } }else{ - // 跳转到学生报名页 - window.location.href=`/glcc/student/apply/${id}`; + showLoginDialog(); } } @@ -90,7 +96,15 @@ function TaskList({applyTaskId, setStudentInfoReset}) { setCurrent(page); } + // 数组元素置顶方法 + function toFirst(data, index){ + if(index != 0){ + data.unshift(data.splice(index,1)[0]); + } + } + useEffect(() => { + setLoading(true); const params = { curPage: current, keyword, @@ -98,9 +112,16 @@ function TaskList({applyTaskId, setStudentInfoReset}) { } taskList(params).then(response => { if (response && response.message === "success") { + // 将已报名task任务置顶 + const ids = Object.keys(applyTaskId); + const data = response.data.rows; + data.map((item, index)=>{ + ids.includes(item.id.toString()) && toFirst(data, index); + }) setData(response.data.rows); setTotal(response.data.total) } + setLoading(false); }) }, [keyword, current, pageSize]) @@ -109,6 +130,7 @@ function TaskList({applyTaskId, setStudentInfoReset}) {
{ setKeyword(value) }} />
{ - // 进入此页面置顶 - window.scrollTo(0, 0); + // 进入此页面到填写页面 + // setTimeout(()=>{ + let clientWidth = document.body.clientWidth; + let scrollHeight = 500 * clientWidth / 1920; + window.scrollTo(0, scrollHeight); + if (!isGlccApplyDate) { // 不在开源夏令营报名时间之内 window.location.href = "/glcc"; @@ -55,6 +60,7 @@ function Apply(props) { } }, []) + useEffect(() => { const params = { curPage: 1, @@ -94,13 +100,13 @@ function Apply(props) { applyInfo['memoAttachmentId' + i] = item.memoAttachmentId; if (i == 0) { - setFiles([{ + item.memoAttachment && setFiles([{ name: item.memoAttachment && item.memoAttachment.fileName || '已上传文件', id: item.memoAttachmentId, uid: item.memoAttachmentId }]); } else { - setFiles1([{ + item.memoAttachment && setFiles1([{ name: item.memoAttachment && item.memoAttachment.fileName || '已上传文件', id: item.memoAttachmentId, uid: item.memoAttachmentId, @@ -205,15 +211,29 @@ function Apply(props) { ); - // 检查文件上传是否符合规定 + // 检查图片文件上传是否符合规定 function beforeUpload(file) { + const isLittle = file.size / 1024 / 1024 < 5; + if (!isLittle) { + showNotification(`文件大小必须小于${5}MB!`); + } const isType = file.type === "image/png" || file.type === "image/jpg" || file.type === "image/jpeg"; if (!isType) { showNotification("只能上传png、jpg、jpeg格式文件"); } - return isType; + return isLittle && isType; } + // 检查文件上传是否符合规定 + function beforeUpload2(file) { + const isLittle = file.size / 1024 / 1024 < 5; + if (!isLittle) { + showNotification(`文件大小必须小于${5}MB!`); + } + return isLittle; + } + + function getBase64(img, callback) { const reader = new FileReader(); reader.addEventListener('load', () => callback(reader.result)); @@ -313,6 +333,8 @@ function Apply(props) { setMyTaskList(taskListNew); } + const chooseArr = myTaskList.map(i => { return i.taskId }); + return (
@@ -321,12 +343,12 @@ function Apply(props) { 开源夏令营 查看项目 - 学生报名 + 学生报名

申请说明：

-
1、学生报名时间为2022年5月21日-6月19日，请在报名截止时间（北京时间2022年6月19日18点）前提交报名信息。
+
1、学生报名时间为2022年5月26日-6月24日，请在报名截止时间（北京时间2022年6月24日24点）前提交报名信息。
2、本次GLCC夏令营基于GitLink代码托管平台完成编程任务，若您没有平台账户，请先注册后完成课题申请
3、每位学员最多可申请2个课题，至多有且仅有1个课题可以入选
4、建议在提交课题申请，与课题导师邮件沟通，详细了解课题描述、编码任务、技能要求&编程语言、预期产出结果等信息，以便您能够选择最适合的课题
@@ -335,140 +357,148 @@ function Apply(props) {
学生报名
-
申请课题
-
-

基本信息

- {helper('学生姓名', - '', - 'studentName', - [{ required: true, message: "请正确输入学生姓名" }, - { max: 32, message: '超出限制长度32位字符，请重新编辑' }], - { verify("studentName") }} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} /> - )} - {helper('所在高校', - '', - 'school', - [{ required: true, message: "请正确输入所在高校" }, - { max: 32, message: '超出限制长度32位字符，请重新编辑' }], - { verify("school") }} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} /> - )} - {helper('所学专业', - '', - 'profession', - [{ max: 32, message: '超出限制长度32位字符，请重新编辑' }], - { verify("profession") }} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} /> - )} - - {getFieldDecorator("location", { - rules: [] - })( - +
+
申请课题
+ +

基本信息

+ {helper('学生姓名', + '', + 'studentName', + [{ required: true, message: "请正确输入学生姓名" }, + { max: 32, message: '超出限制长度32位字符，请重新编辑' }], + { verify("studentName") }} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} /> + )} + {helper('所在高校', + '', + 'school', + [{ required: true, message: "请正确输入所在高校" }, + { max: 32, message: '超出限制长度32位字符，请重新编辑' }], + { verify("school") }} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} /> + )} + {helper('所学专业', + '', + 'profession', + [{ max: 32, message: '超出限制长度32位字符，请重新编辑' }], + { verify("profession") }} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} /> + )} + + {getFieldDecorator("location", { + rules: [] + })( + + )} + + {helper('所在年级', + '', + 'grade', + [], + + )} + {helper('联系电话', + '', + 'phone', + [{ required: true, message: "请正确输入联系电话" }, + { max: 14, message: '超出限制长度14位字符，请重新编辑' }, + { pattern: /^(^(\d{3,4}-)?\d{7,8})$|(13[0-9]{9})$/, message: '请正确输入联系电话' }], + { verify("phone") }} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} /> + )} + {helper('邮箱地址', + '', + 'mail', + [ + { type: 'email', message: '请输入正确的邮箱地址', }, + { required: true, message: "请输入邮箱地址" }, + { max: 50, message: '超出限制长度50位字符，请重新编辑' }, + ], + { verify("mail") }} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} /> )} - - {helper('所在年级', - '', - 'grade', - [], - - )} - {helper('联系电话', - '', - 'phone', - [{ required: true, message: "请正确输入联系电话" }], - { verify("phone") }} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} /> - )} - {helper('邮箱地址', - '', - 'mail', - [{ required: true, message: "请正确输入邮箱地址" }], - { verify("mail") }} className={editable ? "" : "disabledInput"} disabled={editable ? false : true} /> - )} -
{helper('学生证明', - '请以图片的形式上传学生证明，格式为png、jpg、jpeg', - 'proveAttachmentId', - [{ required: true, message: "请正确上传学生证明" }], - userApplyInfo && userApplyInfo.proveAttachmentId ?
- : - {imageUrl ? avatar :
- -
请上传学生证明
-
} - - )}
+
{helper('学生证明', + '请以图片的形式上传学生证明，大小不超过5M，格式为png、jpg、jpeg', + 'proveAttachmentId', + [{ required: true, message: "请正确上传学生证明" }], + userApplyInfo && userApplyInfo.proveAttachmentId ?
+ : + {imageUrl ? avatar :
+ +
请上传学生证明
+
} + + )}
- { - myTaskList.map((item, i) => { - return ( - -

课题信息（{i + 1}/2) {myTaskList.length > 1 && { deleteTask(i) }}>}

- {helper('课题名称', - '', - 'taskId' + i, - [{ required: true, message: "请选择课题名称" }], - - )} -
{helper('自荐书', - '', - 'memo' + i, - [{ required: true, message: "请正确输入自荐书" }, - { max: 500, message: '超出限制长度500位字符，请重新编辑' }], -