Skip to content

Commit

Permalink
feat: update image
Browse files Browse the repository at this point in the history
  • Loading branch information
QhdJiaYou committed May 17, 2024
1 parent 28b756d commit 348739a
Show file tree
Hide file tree
Showing 22 changed files with 153 additions and 75 deletions.
2 changes: 1 addition & 1 deletion docs/zh/_meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"link": "https://bio-os.gitbook.io/userguide"
},
{
"text": "活动",
"text": "大赛",
"link": "/activity/",
"activeMatch": "/activity/"
},
Expand Down
64 changes: 44 additions & 20 deletions src/components/arrange/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,51 @@ const Step = Steps.Step;
const arrangeInfo = [
{
title: "赛程一",
time: "即日起 - 2024.8.30",
name: "大赛报名",
time: "即日 - 8月30日",
name: "参赛报名",
content:
"大赛以 1~5 人小组为单位组队参加,欢迎大家加入赛事交流群寻找队友。",
},
{
title: "赛程二",
time: "2024.6.14 - 2024.9.13",
name: "初赛",
time: "5月 - 6月",
name: "线上培训",
content: "初赛开始,竞争激烈",
},
{
title: "赛程三",
time: "2024.9.14 - 2024.10.12",
name: "初赛评审",
time: "6月14日-9月13日",
name: "初赛阶段",
content: "公布决赛入围名单,各赛道前10进入决赛。",
},
{
title: "赛程四",
time: "2024.11",
name: "线下总决赛&颁奖典礼",
time: "9月13日",
name: "提交作品",
content: "现场答辩,分享你的解题思路; 国赛证书等你拿,瓜分30万奖金池。",
},
{
title: "赛程五",
time: "9月14日-10月12日",
name: "初赛评审",
content: "现场答辩,分享你的解题思路; 国赛证书等你拿,瓜分30万奖金池。",
},
{
title: "赛程五",
time: "10月14日",
name: "公示决赛名单",
content: "现场答辩,分享你的解题思路; 国赛证书等你拿,瓜分30万奖金池。",
},
{
title: "赛程五",
time: "11月",
name: "线下总决赛",
content: "现场答辩,分享你的解题思路; 国赛证书等你拿,瓜分30万奖金池。",
},
{
title: "赛程五",
time: "11月",
name: "颁奖典礼",
content: "现场答辩,分享你的解题思路; 国赛证书等你拿,瓜分30万奖金池。",
},
];
Expand All @@ -35,7 +59,8 @@ const activeIndex = getCurrentStep();
const Arrange = () => {
return (
<div className="w-full">
<div className="w-full flex arrange-wrapper px-[80px]">
<img src={require("../../images/arrange.svg")}/>
{/* <div className="w-full flex arrange-wrapper px-[80px]">
<div className="h-[6px] bg-[#77b9fa] w-[120px] step-before"></div>
<Steps
className="flex-1"
Expand All @@ -50,25 +75,24 @@ const Arrange = () => {
</div>
<div className="flex justify-between items-center">
{arrangeInfo.map((item, index) => (
<div
className={classNames("rounded-[8px] card-wrapper", {
active: index < activeIndex,
})}
key={index}
>
// <div
// className={classNames("rounded-[8px] card-wrapper", {
// active: index < activeIndex,
// })}
// key={index}
// >
<div
className={classNames("flex flex-col items-center title-card", {
active: index < activeIndex,
})}
key={index}
>
<div className="text-[18px] font-bold">{item.title}</div>
<div className="text-[18px] font-bold">{item.name}</div>
<div>{item.time}</div>
</div>
<div className="font-bold mt-2 mb-4">{item.name}</div>
<div>{item.content}</div>
</div>
// </div>
))}
</div>
</div> */}
</div>
);
};
Expand Down
3 changes: 2 additions & 1 deletion src/components/award/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { tosDomain } from "../const";
import { JoinButton } from "../home";
const feishu = require("../../images/qrcode/feishuGroup.png");
const weixin = require("../../images/qrcode/weixin.png");
const weixin = `${tosDomain}bioos_weixinGroup.png`;
const zhushou = require("../../images/qrcode/zhushou.png");

import "./index.scss";
Expand Down
7 changes: 5 additions & 2 deletions src/components/comment/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const SlideWide = ({ imageSrc, dir }) => {
<div
key={index}
className="rounded-[16px] h-full"
style={{ width: "50%" }}
style={{ width: "46%" }}
>
<img
src={require(`../../images/${dir}/${name}.png`)}
Expand All @@ -54,7 +54,10 @@ const imageCommentSrc = getIncrementArray(10);
const imageFirstBioOSSrc = getIncrementArray(81);

export const CommentCard = () => (
<Slide imageSrc={imageCommentSrc} dir={"teacher"} />
// <Slide imageSrc={imageCommentSrc} dir={"teacher"} />
<div className="w-full">
<img src={require('../../images/allTeacher.svg')}/>
</div>
);
export const AnswerCard = () => (
<SlideWide imageSrc={imageFirstBioOSSrc} dir={"bioosFirst"} />
Expand Down
1 change: 1 addition & 0 deletions src/components/const.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const tosDomain = 'https://lf-opensource.bytetos.com/obj/opensource-cn/';
4 changes: 2 additions & 2 deletions src/components/faq/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ const faqInfo: FAQItem[] = [
{
question: "1. 每支队伍有几人?",
answer:
"Q. 每支队伍1-5人参赛。想找队友的小伙伴可以 加入赛事交流群 寻找队友喔。",
"Q. 每支队伍1-3人参赛。想找队友的小伙伴可以加入赛事交流群寻找队友喔。",
},
{
question: "2. 我可以报名多个赛道吗?",
answer:
"Q. 不可以,一支队伍仅可报名一个赛道,如果报名多个赛道并同时参赛将被取消成绩。",
"Q. 不可以,一名参赛者仅可加入一直团队且仅可报名一个赛道,如果报名多个赛道并同时参赛将被会被取消成绩。",
},
{
question: "3. 没有好的想法怎么办?",
Expand Down
1 change: 1 addition & 0 deletions src/components/home/index.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.home {
position: relative;
width: 1344px;
height: 630px;
padding-top: 200px;
padding-left: 112px;
.logo {
Expand Down
17 changes: 9 additions & 8 deletions src/components/home/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const huoshanIntel = require("../../images/logo/huoshanIntel.png");
const introFinger = require("../../images/introFinger.png");

import "./index.scss";
import { tosDomain } from "../const";

const info = [
{
Expand All @@ -21,7 +22,7 @@ const info = [
imgSrc: require("../../images/buttonBg/group.png"),
iconSrc: require("../../images/icon/group.png"),
jumpUrl: "",
hoverUrl: require("../../images/qrcode/weixin.png"),
hoverUrl: `${tosDomain}bioos_weixinGroup.png`,
},
{
name: "赛前辅导",
Expand All @@ -30,7 +31,7 @@ const info = [
jumpUrl: "",
},
];
const mainContent = `2023年火山引擎联合广州实验室举办第一届Bio-OS开源开放大赛,在短时间筹备期内,取得丰硕成果。2024年,火山引擎和intel联合举办第二届Bio-OS开源开放大赛,本次大赛主要面向全国生信领域的高校师生、相关企业组织、以及科研机构等,大赛以“开源共赢,科学无限”为宗旨,将有效构建Bio-OS社区的开源生态,推动生信领域的交流与合作,为火山引擎和intel构建一个“开放、创新、合作、共赢”的技术和商业氛围;同时,通过大赛牵引,将围绕Bio-OS建立了技术社区(SIG组),为行业成功发掘一批优秀人才。`;
const mainContent = `CCF开源创新大赛暨第二届Bio-OS开源开放大赛是在中国计算机学会和广州实验室指导下,由火山引擎和Intel联合主办的一项生物信息领域的全国性公益大赛,协办单位包括中国计算机学会开源发展委员会、中国生物信息学学会(筹)、上海生物信息学会、广东省生物信息学会,公益支持单位是中国光华科技基金。大赛以“开源共赢,科学无限”为宗旨,面向全国生物信息领域的高校师生、科研工作者、以及相关企业和组织等邀请参赛,希望通过大赛牵引和开源开放的Bio-OS平台支撑,推动国内生物信息领域的交流与合作,共建一个“开放、创新、合作、共赢”的新生态。`;
const HomeCard = ({ item }) => {
const { imgSrc, iconSrc, name, jumpUrl, hoverUrl } = item;
return (
Expand Down Expand Up @@ -89,11 +90,11 @@ const Home = () => {
<div className="logo">
<img src={huoshanIntel} />
</div>
<img src={openTitle} width={"50%"} />
<div className="mt-[20px] mb-[50px]">
<img src={openTitle} width={"60%"} />
{/* <div className="mt-[20px] mb-[50px]">
<JoinButton />
</div>
<img width={"60%"} src={require("../../images/logoGroup.svg")} />
</div> */}
{/* <img width={"60%"} src={require("../../images/logoGroup.svg")} /> */}
{/* <div className="flex flex-col justify-between">
<div className="flex items-center">
<div className="text-[18px] font-bold">指导单位:</div>
Expand Down Expand Up @@ -146,8 +147,8 @@ const Home = () => {
})}
</div>
<div className="flex flex-col items-center text-[#213547]">
<div className="text-[28px] font-medium mb-[30px]">
Bio-OS开源开放大赛
<div className="text-[36px] font-medium mb-[30px]">
大赛介绍
</div>
<div className="flex items-center py-[24px] px-[32px] rounded-[12px] desc-bg">
<div>{mainContent}</div>
Expand Down
31 changes: 31 additions & 0 deletions src/images/allTeacher.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions src/images/arrange.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/images/money.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/images/teacher/1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/images/teacher/10.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 1 addition & 29 deletions src/images/teacher/2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/images/teacher/3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/images/teacher/4.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/images/teacher/5.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/images/teacher/6.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/images/teacher/7.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/images/teacher/8.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/images/teacher/9.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 14 additions & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import Award, { Community } from "./components/award";
import { AnswerCard, CommentCard } from "./components/comment";
import FAQ from "./components/faq";
import { Divider } from "@arco-design/web-react";
import { tosDomain } from "./components/const";

const CompetitionPage = () => {
return (
Expand All @@ -18,7 +19,7 @@ const CompetitionPage = () => {
backgroundImage: `url(${introBg})`,
backgroundSize: "100% auto",
backgroundRepeat: "no-repeat",
backgroundColor: '#F4F4FE'
backgroundColor: "#F4F4FE",
}}
>
<div>
Expand Down Expand Up @@ -50,7 +51,19 @@ const CompetitionPage = () => {
<div className="w-[1344px]">
<Title title={"赛事交流"} />
<Community />
<Title title={"组织体系&合作伙伴"} />
<div>
<img src={`${tosDomain}bioos_co.svg`}/>
</div>
<Divider className="mt-[90px] mb-[50px]" />
<div
className="rounded-[12px] px-[50px] py-[5px] cursor-pointer text-[20px] font-bold w-fit button-bg"
style={{
color: "white",
}}
>
Bio-OS开源开放大赛
</div>
</div>
</div>
</div>
Expand Down

0 comments on commit 348739a

Please sign in to comment.