Merge branch 'main' of https://gitlab.igem.org/2024/smu-gdmu-china

merge

src/contents/human-practices.tsx

@@ -11,7 +11,7 @@ const SideNavbar: React.FC<SideNavbarProps> = ({ activeLink }) => {
     <div className="side-navbar">
       <Nav className="flex-column">
         <Nav.Link as={Link} to="section1" smooth={true} duration={500} className={activeLink === 'section1' ? 'active' : 'notActive'}>1.Overview</Nav.Link>
-        <Nav.Link as={Link} to="section2" smooth={true} duration={500} className={activeLink === 'section2' ? 'active' : 'notActive'}>2.Ethical considerations</Nav.Link>
+        <Nav.Link as={Link} to="section2" smooth={true} duration={500} className={activeLink === 'section2' ? 'active' : 'notActive'}>2.Ethical Considerations</Nav.Link>
         <Nav.Link as={Link} to="section3" smooth={true} duration={500} className={activeLink === 'section3' ? 'active' : 'notActive'}>3.Collaboration</Nav.Link>
         <Nav.Link as={Link} to="section4" smooth={true} duration={500} className={activeLink === 'section4' ? 'active' : 'notActive'}>4.Questionnaire</Nav.Link>
         <Nav.Link as={Link} to="section5" smooth={true} duration={500} className={activeLink === 'section5' ? 'active' : 'notActive'}>5.STAKEHOLDER</Nav.Link>
@@ -112,7 +112,7 @@ export function HumanPractices() {
 
 
 <Element name="section2" className="element rounded-border" id='section2'>
-            <h2>2. Ethical considerations</h2>
+            <h2>2. Ethical Considerations</h2>
             <p>Informed consent, privacy, fairness, non-harm, responsibility.</p>
   <div className="rounded-border">
   <h3 className="center-text">2.1Ethical and Safe Biotechnology Research</h3>
@@ -306,20 +306,3 @@ export function HumanPractices() {
 </Element>
 
 
-      <Element name="section7" className="element rounded-border" id='section7'>
-        <h2>Section 7</h2>
-        <p>Content for section 7.</p>
-        <div className="rounded-border">
-          <h4 className="center-text">我是大帅B</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>
-
-
-
-    </div>
-    </div>
-    </>
-  );
-}

src/contents/parts.tsx

@@ -95,8 +95,9 @@ export function parts() {
           <div className="col-10">
             
                 <Element name="section1" className="element rounded-border" id='section1'>
-                   <h2>1. Basic Parts</h2>
-                   <p>Content for section 1.</p>
+                <p className="indent">We have built several BioBricks, which cover all aspects throughout our projects, constituting our sensory module, metabolic module, and safety module.</p>
+                   <h2>1.Our Basic Parts</h2>
+                   <p>We designed six basic parts in total this year,you can click on the part to see details.</p>
                    <table className="three-line-table">
                       <thead>
                             <tr className='table-head-line'>
@@ -116,15 +117,10 @@ export function parts() {
                         </tbody>
                     </table>
                  </Element>
-            
-  
-                 <div className="bd-callout bd-callout-info bg-gray">
-                  <h1>What do we do to ...? See...</h1>
-                </div>
-                
+
                 <Element name="section2" className="element rounded-border" id='section2'>
-                  <h2>2. Composite Parts</h2>
-                  <p>Content for section 2.</p>
+                  <h2>2.Our Composite Parts</h2>
+                  <p>We designed seven composite parts in total this year,you can click on the part to see details.</p>
                   <table className="three-line-table">
                       <thead>
                             <tr className='table-head-line'>
@@ -147,7 +143,7 @@ export function parts() {
             
   
                 <Element name="section3" className="element rounded-border" id='section3'>
-                <h2>Section 3</h2>
+                <h2>Contribution</h2>
                 <p>Content for section 3.</p>
                 <div className="rounded-border">
                 <h4 className="center-text">Section 3</h4>
@@ -156,26 +152,6 @@ export function parts() {
                 </div>
                 </Element>
 
-                <Element name="section4" className="element rounded-border" id='section4'>
-              <h2>Section 4</h2>
-              <p>Content for section 4.</p>
-              <div className="rounded-border">
-              <h4 className="center-text">我是大帅B</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>
-
-              <Element name="section5" className="element rounded-border" id='section5'>
-              <h2>Section 5</h2>
-              <p>Content for section 5.</p>
-              <div className="rounded-border">
-              <h4 className="center-text">我是大帅B</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>
-
               
           </div>
         </div>