diff --git a/package.json b/package.json
index fa1ccd59d90acaa98b1709ca4886ca3f37a45cde..63cdbd41aa7577460ac0bd54a7bac7157e72dbea 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
"react-scroll": "^1.9.0"
},
"devDependencies": {
+ "@types/mathjax": "^0.0.40",
"@types/node": "^20.12.10",
"@types/react": "^18.2.66",
"@types/react-dom": "^18.2.22",
diff --git a/src/asset/img/miami.jpg b/src/asset/img/miami.jpg
deleted file mode 100644
index e28211a51966fb08dbcd1ba564ebd7ef7f760906..0000000000000000000000000000000000000000
Binary files a/src/asset/img/miami.jpg and /dev/null differ
diff --git a/src/containers/App/App.css b/src/containers/App/App.css
index 8bfe1a6ccb95d67cab713f75a2cda60cd56ac589..557e886a4223af4a42a12077499d96d96d3eb30a 100644
--- a/src/containers/App/App.css
+++ b/src/containers/App/App.css
@@ -18,13 +18,6 @@ body {
background-color: rgb(245, 245, 220);
}
-.bg-miami {
- background-image: url('/src/asset/miami.jpg'); /* 背景图片路径 */
- background-size: cover; /* 使背景图片覆盖整个容器 */
- background-position: center; /* å±…ä¸å¯¹é½èƒŒæ™¯å›¾ç‰‡ */
- background-repeat: no-repeat; /* 防æ¢èƒŒæ™¯å›¾ç‰‡é‡å¤ */
- background-attachment: fixed; /* 固定背景图片，使其在滚动时ä¸ç§»åŠ¨ */
-}
/* CALLOUT */
.bd-callout {
@@ -95,19 +88,10 @@ footer a:hover {
}
/* header */
-.bg-miami {
- background-image: url('/src/asset/img/miami.jpg'); /* 背景图片路径 */
- background-size: cover; /* 使背景图片覆盖整个容器 */
- background-position: center; /* å±…ä¸å¯¹é½èƒŒæ™¯å›¾ç‰‡ */
- background-repeat: no-repeat; /* 防æ¢èƒŒæ™¯å›¾ç‰‡é‡å¤ */
- background-attachment: fixed; /* 固定背景图片，使其在滚动时ä¸ç§»åŠ¨ */
-}
-
-
.custom-header-home {
width: 100vw;
height: 100vh;
- background-image: url('/src/asset/img/miami.jpg'); /* 背景图片路径 */
+ background-image: url('https://static.igem.wiki/teams/5378/image/zxa-tp.webp'); /* 背景图片路径 */
background-size: cover; /* 使背景图片覆盖整个容器 */
background-position: center; /* å±…ä¸å¯¹é½èƒŒæ™¯å›¾ç‰‡ */
background-repeat: no-repeat; /* 防æ¢èƒŒæ™¯å›¾ç‰‡é‡å¤ */
diff --git a/src/contents/home.tsx b/src/contents/home.tsx
index 96fae70ecc719fd4628c3d370de4a91c3841cb64..80418be2855635e79463443ee3d9971333351a2e 100644
--- a/src/contents/home.tsx
+++ b/src/contents/home.tsx
@@ -15,7 +15,7 @@ export function Home() {
<div className="row justify-content-center h1 full-height-element">
Section 1
<img
- src="https://img0.baidu.com/it/u=351821279,2605385406&fm=253&fmt=auto&app=138&f=PNG?w=600&h=335"
+ src="https://static.igem.wiki/teams/5378/image/zxa-tp.webp"
alt="dungreed"
className="responsive-img"
/>
@@ -23,7 +23,7 @@ export function Home() {
<div className="row justify-content-center h1 full-height-element">
Section 2
<img
- src="https://pic.3h3.com/up/2023/0915/20230915100746929.png"
+ src="https://static.igem.wiki/teams/5378/image/zxa-tp.webp"
alt="dungreed"
className="responsive-img"
/>
@@ -31,7 +31,7 @@ export function Home() {
<div className="row justify-content-center h1 full-height-element">
Section 3
<img
- src="https://img0.baidu.com/it/u=3750079665,4155589639&fm=253&fmt=auto&app=138&f=PNG?w=600&h=338"
+ src="https://static.igem.wiki/teams/5378/image/zxa-tp.webp"
alt="dungreed"
className="responsive-img"
/>
diff --git a/src/contents/model.tsx b/src/contents/model.tsx
index 257ab9811e4309c2cb9b4eb70a9da1b86f285fbc..09aada405f9ee1c7a9269a1a0e500d6e49609c48 100644
--- a/src/contents/model.tsx
+++ b/src/contents/model.tsx
@@ -2,6 +2,7 @@ import { Nav } from 'react-bootstrap';
import { Link,Element } from 'react-scroll';
import React,{useEffect,useState} from 'react';
+
// sidenavbar begin
interface SideNavbarProps {
activeLink: string;
@@ -86,7 +87,9 @@ export function Model() {
<h4 className="center-text">Section 3</h4>
<p className="indent">las ijffs aiskfd fskj iiwls asd.aass ffas awssd awus iisal fask.aisisad ksjdfkaf iwjasifjakdshf wijdfalksjf wiksjkfjksalhf, gsahfjhgejkfh uhaejkfh sjdihgfuqiw jh sjiafhjsaj fh asd.</p>
<p className="indent">las ijffs aiskfd fskj iiwls asd.aass ffas awssd awus iisal fask.aisisad ksjdfkaf iwjasifjakdshf wijdfalksjf wiksjkfjksalhf, gsahfjhgejkfh uhaejkfh sjdihgfuqiw jh sjiafhjsaj fh asd.</p>
+
</div>
+
</Element>
diff --git a/src/contents/team.tsx b/src/contents/team.tsx
index 7ffc19be535d1a6faf7dfe1cebf1dbf0b9dd310b..9921410648eaf408896e73a6331320fc70e1f6f1 100644
--- a/src/contents/team.tsx
+++ b/src/contents/team.tsx
@@ -3,11 +3,13 @@ import React, { useState } from 'react';
interface CardProps {
image1: string;
image2: string;
- title: string;
- description: string;
+ title1: string;
+ title2: string;
+ description1: string;
+ description2: string;
}
-const Card: React.FC<CardProps> = ({ image1, image2, title, description }) => {
+const Card: React.FC<CardProps> = ({ image1, image2, title1,title2, description1,description2 }) => {
const [hover, setHover] = useState(false);
return (
@@ -19,12 +21,14 @@ const Card: React.FC<CardProps> = ({ image1, image2, title, description }) => {
<div className="card">
<img
src={hover ? image2 : image1}
- alt={title}
+ alt={title1}
className="card-img-top"
/>
<div className="card-body">
- <h5 className="card-title">{title}</h5>
- <p className="card-text">{description}</p>
+
+ <h5 className="card-title">{hover? title2:title1}</h5>
+ <p className="card-text">{hover?description2:description1}</p>
+
</div>
</div>
</div>
@@ -44,17 +48,21 @@ export function Team() {
<div className="col-2">
<div className='row-custom-height-card-space'></div>
<Card
- image1= "https://img0.baidu.com/it/u=45513050,3171194851&fm=253&fmt=auto&app=138&f=JPEG?w=885&h=500"
- image2= "https://img1.baidu.com/it/u=455465338,4231697526&fm=253&fmt=auto&app=120&f=JPEG?w=800&h=500"
- title="yujiro"
- description="Strongest man."
+ image1= "https://static.igem.wiki/teams/5378/school-badge/smu.webp"
+ image2= "https://static.igem.wiki/teams/5378/school-badge/gdmu.webp"
+ title1="SMU"
+ title2='GDMU'
+ description1="SMU Description."
+ description2='GDMU Description'
/>
<div className='row-custom-height-card-space'></div>
<Card
- image1="https://via.placeholder.com/300x200.png?text=Image+1"
- image2="https://via.placeholder.com/300x200.png?text=Image+2"
- title="Card Title"
- description="Card description goes here."
+ image1= "https://static.igem.wiki/teams/5378/school-badge/smu.webp"
+ image2= "https://static.igem.wiki/teams/5378/school-badge/gdmu.webp"
+ title1="SMU"
+ title2='GDMU'
+ description1="SMU Description."
+ description2='GDMU Description'
/>
<div className='row-custom-height-card-space'></div>
</div>
@@ -64,17 +72,21 @@ export function Team() {
<div className="col-2">
<div className='row-custom-height-card-space'></div>
<Card
- image1="https://via.placeholder.com/300x200.png?text=Image+1"
- image2="https://via.placeholder.com/300x200.png?text=Image+2"
- title="Card Title"
- description="Card description goes here."
+ image1= "https://static.igem.wiki/teams/5378/school-badge/smu.webp"
+ image2= "https://static.igem.wiki/teams/5378/school-badge/gdmu.webp"
+ title1="SMU"
+ title2='GDMU'
+ description1="SMU Description."
+ description2='GDMU Description'
/>
<div className='row-custom-height-card-space'></div>
<Card
- image1="https://via.placeholder.com/300x200.png?text=Image+1"
- image2="https://via.placeholder.com/300x200.png?text=Image+2"
- title="Card Title"
- description="Card description goes here."
+ image1= "https://static.igem.wiki/teams/5378/school-badge/smu.webp"
+ image2= "https://static.igem.wiki/teams/5378/school-badge/gdmu.webp"
+ title1="SMU"
+ title2='GDMU'
+ description1="SMU Description."
+ description2='GDMU Description'
/>
<div className='row-custom-height-card-space'></div>
</div>
@@ -84,17 +96,21 @@ export function Team() {
<div className="col-2">
<div className='row-custom-height-card-space'></div>
<Card
- image1="https://via.placeholder.com/300x200.png?text=Image+1"
- image2="https://via.placeholder.com/300x200.png?text=Image+2"
- title="Card Title"
- description="Card description goes here."
+ image1= "https://static.igem.wiki/teams/5378/school-badge/smu.webp"
+ image2= "https://static.igem.wiki/teams/5378/school-badge/gdmu.webp"
+ title1="SMU"
+ title2='GDMU'
+ description1="SMU Description."
+ description2='GDMU Description'
/>
<div className='row-custom-height-card-space'></div>
<Card
- image1="https://via.placeholder.com/300x200.png?text=Image+1"
- image2="https://via.placeholder.com/300x200.png?text=Image+2"
- title="Card Title"
- description="Card description goes here."
+ image1= "https://static.igem.wiki/teams/5378/school-badge/smu.webp"
+ image2= "https://static.igem.wiki/teams/5378/school-badge/gdmu.webp"
+ title1="SMU"
+ title2='GDMU'
+ description1="SMU Description."
+ description2='GDMU Description'
/>
<div className='row-custom-height-card-space'></div>
</div>
diff --git a/yarn.lock b/yarn.lock
index 6b3ec65004bec66f6370893069a2873f56fa5c4d..ef65099680e8f7c18a9b1bdf3476b421a81b752e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -604,6 +604,11 @@
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+"@types/mathjax@^0.0.40":
+ version "0.0.40"
+ resolved "https://registry.yarnpkg.com/@types/mathjax/-/mathjax-0.0.40.tgz#11b015fc3dc709766c1b162da364d14aa1b03051"
+ integrity sha512-rHusx08LCg92WJxrsM3SPjvLTSvK5C+gealtSuhKbEOcUZfWlwigaFoPLf6Dfxhg4oryN5qP9Sj7zOQ4HYXINw==
+
"@types/node@^20.12.10":
version "20.12.10"
resolved "https://registry.yarnpkg.com/@types/node/-/node-20.12.10.tgz#8f0c3f12b0f075eee1fe20c1afb417e9765bef76"