From 9cc8ba2bdd305cba89c2f71bfb9b63f41f71a3bb Mon Sep 17 00:00:00 2001
From: Wayne Zhu <way87767@gmail.com>
Date: Thu, 27 Feb 2020 17:59:56 -0500
Subject: [PATCH] fixed navbar/linkbar alignment issues

---
 .../advanced-proj-div/AdvancedProjDiv.js      |  75 +++---
 .../ApplyForPositionDiv.js                    |  90 ++++---
 .../cortical-apps-div/CorticalAppsDiv.js      | 117 +++++----
 .../initiatives-div/InitiativesDiv.js         |  22 +-
 src/components/team-div/TeamDiv.js            | 248 +++++++++---------
 src/components/updates-div/UpdatesDiv.js      |  19 +-
 6 files changed, 298 insertions(+), 273 deletions(-)

diff --git a/src/components/advanced-proj-div/AdvancedProjDiv.js b/src/components/advanced-proj-div/AdvancedProjDiv.js
index 86f23b3..24e9c33 100644
--- a/src/components/advanced-proj-div/AdvancedProjDiv.js
+++ b/src/components/advanced-proj-div/AdvancedProjDiv.js
@@ -10,51 +10,54 @@ import LinksBar from "../links-bar/LinksBar";
 
 function AdvancedProjDiv() {
   return(
-    <div className="advanced-proj-div">
-      <Helmet>
-        <title>Projects | NeurotechUofT</title>
-      </Helmet>
-
-      <NavBar/>
-
-      <CurrProjDiv/>
-      <Link to="/opportunities">Apply for a Project Position</Link>
-
-      <div className="on-hold-div">
-        <h1>On Hold</h1>
-
-        <div className="on-hold-projects">
-          <div className="on-hold-proj">
-            <a href="https://github.com/neurotechuoft/Biosignals-Board">Biosignals Board</a>
-            <p>
-              A board that can pick up biosignals (like EEG and ECG), convert
-              them to digital values, and stream them to a computer. This will
-              be our submission for Part 1 of the NeuroTechX Student Competition.
-            </p>
-          </div>
+    <div>
+      <div className="advanced-proj-div">
+        <Helmet>
+          <title>Projects | NeurotechUofT</title>
+        </Helmet>
 
-          <div className="on-hold-proj">
-            <a href="https://github.com/neurotechuoft/Vitreous">VitReous</a>
-            <p>
-              An eye-based gesture system for virtual and augmented reality devices!
-              Using EOG, it allows the user to perform actions such as taking pictures
-              and looking through emails without needing to use their hands.
-            </p>
-          </div>
+        <NavBar/>
+
+        <CurrProjDiv/>
+        <Link to="/opportunities">Apply for a Project Position</Link>
+
+        <div className="on-hold-div">
+          <h1>On Hold</h1>
 
-          <div className="on-hold-proj">
-            <a href="https://github.com/neurotechuoft/Mindfulness-Study">Mindfulness Study</a>
-            <p>
-              A research project looking into and designing a product for feedback-based meditation.
-            </p>
+          <div className="on-hold-projects">
+            <div className="on-hold-proj">
+              <a href="https://github.com/neurotechuoft/Biosignals-Board">Biosignals Board</a>
+              <p>
+                A board that can pick up biosignals (like EEG and ECG), convert
+                them to digital values, and stream them to a computer. This will
+                be our submission for Part 1 of the NeuroTechX Student Competition.
+              </p>
+            </div>
+
+            <div className="on-hold-proj">
+              <a href="https://github.com/neurotechuoft/Vitreous">VitReous</a>
+              <p>
+                An eye-based gesture system for virtual and augmented reality devices!
+                Using EOG, it allows the user to perform actions such as taking pictures
+                and looking through emails without needing to use their hands.
+              </p>
+            </div>
+
+            <div className="on-hold-proj">
+              <a href="https://github.com/neurotechuoft/Mindfulness-Study">Mindfulness Study</a>
+              <p>
+                A research project looking into and designing a product for feedback-based meditation.
+              </p>
+            </div>
           </div>
-        </div>
 
+        </div>
       </div>
 
       <LinksBar/>
 
     </div>
+    
   )
 }
 
diff --git a/src/components/apply-for-position-div/ApplyForPositionDiv.js b/src/components/apply-for-position-div/ApplyForPositionDiv.js
index 4c23c68..3839e6b 100644
--- a/src/components/apply-for-position-div/ApplyForPositionDiv.js
+++ b/src/components/apply-for-position-div/ApplyForPositionDiv.js
@@ -11,58 +11,62 @@ import LinksBar from "../links-bar/LinksBar";
 function ApplyForPostionDiv() {
 
   return(
-    <div className="apply-for-position-div">
-      <Helmet>
-        <title>Opportunities | NeurotechUofT</title>
-      </Helmet>
+    <div>
+      <div className="apply-for-position-div">
+        <Helmet>
+          <title>Opportunities | NeurotechUofT</title>
+        </Helmet>
 
-      <NavBar/>
+        <NavBar/>
 
-      <h1>OPPORTUNITIES</h1>
-      <div className="available-positions">
+        <h1>OPPORTUNITIES</h1>
+        <div className="available-positions">
 
-        <div className="executive-positions">
-          <h1>Executive Positions</h1>
-          <h3>First years and up :)</h3>
-          <h3><b>Due:</b> Rolling application</h3>
-          <h4>(interviews are first-come first-serve)</h4>
-          {positionsList[0]}
-          {positionsList[1]}
-          {positionsList[2]}
-          {positionsList[3]}
-          {positionsList[4]}
-          {positionsList[5]}
-          {positionsList[6]}
-          <h2>Workshops</h2>
-          <p>
-          Development of a two-coures series aimed at helping people with
-          no experience to learn BCI develpment.
-          </p>
-          <p>
-          <b>Topics:</b> machine learning, neuroscience, physiology, software development,
-          cognitive sciences, psychology, analog electronics
-          </p>
-          {positionsList[7]}
-          {positionsList[8]}
+          <div className="executive-positions">
+            <h1>Executive Positions</h1>
+            <h3>First years and up :)</h3>
+            <h3><b>Due:</b> Rolling application</h3>
+            <h4>(interviews are first-come first-serve)</h4>
+            {positionsList[0]}
+            {positionsList[1]}
+            {positionsList[2]}
+            {positionsList[3]}
+            {positionsList[4]}
+            {positionsList[5]}
+            {positionsList[6]}
+            <h2>Workshops</h2>
+            <p>
+            Development of a two-coures series aimed at helping people with
+            no experience to learn BCI develpment.
+            </p>
+            <p>
+            <b>Topics:</b> machine learning, neuroscience, physiology, software development,
+            cognitive sciences, psychology, analog electronics
+            </p>
+            {positionsList[7]}
+            {positionsList[8]}
+          </div>
+
+          {/* <div className="advanced-project-positions">
+            <h1>Advanced Project Positions</h1>
+            <h3>Second years and up :)</h3>
+            <h3><b>Due:</b> Rolling application</h3>
+            <h4>(interviews are first-come first-serve)</h4>
+            {positionsList[34]}
+            {projectsList[0]}
+            {projectsList[1]}
+            {projectsList[2]}
+            {projectsList[3]}
+            {projectsList[4]}
+          </div> */}
         </div>
 
-        {/* <div className="advanced-project-positions">
-          <h1>Advanced Project Positions</h1>
-          <h3>Second years and up :)</h3>
-          <h3><b>Due:</b> Rolling application</h3>
-          <h4>(interviews are first-come first-serve)</h4>
-          {positionsList[34]}
-          {projectsList[0]}
-          {projectsList[1]}
-          {projectsList[2]}
-          {projectsList[3]}
-          {projectsList[4]}
-        </div> */}
       </div>
 
       <LinksBar/>
-
+      
     </div>
+    
   )
 }
 
diff --git a/src/components/cortical-apps-div/CorticalAppsDiv.js b/src/components/cortical-apps-div/CorticalAppsDiv.js
index c0d4b33..157efe9 100644
--- a/src/components/cortical-apps-div/CorticalAppsDiv.js
+++ b/src/components/cortical-apps-div/CorticalAppsDiv.js
@@ -12,82 +12,87 @@ import LinksBar from "../links-bar/LinksBar";
 
 function CorticalAppsDiv() {
   return(
-    <div className="cortical-apps-div">
-      <Helmet>
-        <title>Cortical Apps | NeurotechUofT</title>
-      </Helmet>
-
-      <NavBar/>
+    <div>
       
-      <img src={corticalapps} alt="NeurotechUofT Cortical Apps Cover"/>
-      <h1>Make an epic neurotech idea, and bring it to life</h1>
-
-      <div className="idea-making">
-        <h1>PART 1: IDEA MAKING</h1>
-        <p>
-        Meet fellow neurotech enthusiasts, make teams of 3-4, and come up with an
-        awesome neurotech project! Our challenge to you is to come up with a simple,
-        yet meaningful (to you :) ) idea that can be completed in a semester. Our
-        mentors will be there to help you with the tech and neuro stuff, so let
-        your imaginations fly!
-        </p>
-      </div>
-
-      <div className="steps-to-idea">
-        <div>
-          <h2>Step 1: Think of an idea</h2>
-          <p>Saturday Feb 10, 5--8PM: OISE 3311</p>
-          <p>Sunday Feb 11, 5--8PM: OISE 5150</p>
+      <NavBar/>
 
-          <h2>Step 2: Get advice from mentors</h2>
-          <p>Tuesday Feb 13, 6--9PM: BF 315</p>
+      <div className="cortical-apps-div">
+        <Helmet>
+          <title>Cortical Apps | NeurotechUofT</title>
+        </Helmet>
+        
+        <img src={corticalapps} alt="NeurotechUofT Cortical Apps Cover"/>
+        <h1>Make an epic neurotech idea, and bring it to life</h1>
+
+        <div className="idea-making">
+          <h1>PART 1: IDEA MAKING</h1>
+          <p>
+          Meet fellow neurotech enthusiasts, make teams of 3-4, and come up with an
+          awesome neurotech project! Our challenge to you is to come up with a simple,
+          yet meaningful (to you :) ) idea that can be completed in a semester. Our
+          mentors will be there to help you with the tech and neuro stuff, so let
+          your imaginations fly!
+          </p>
+        </div>
 
-          <h2>Step 3: Pitch time!</h2>
-          <p>Sunday Feb 18, 3--5PM: OISE 3311</p>
+        <div className="steps-to-idea">
+          <div>
+            <h2>Step 1: Think of an idea</h2>
+            <p>Saturday Feb 10, 5--8PM: OISE 3311</p>
+            <p>Sunday Feb 11, 5--8PM: OISE 5150</p>
+
+            <h2>Step 2: Get advice from mentors</h2>
+            <p>Tuesday Feb 13, 6--9PM: BF 315</p>
+
+            <h2>Step 3: Pitch time!</h2>
+            <p>Sunday Feb 18, 3--5PM: OISE 3311</p>
+          </div>
+
+          <div>
+            <h1>Simple.</h1>
+            <h2>Follow your passions.</h2>
+            <h2>It does <b>not</b> have to be 'useful'!</h2>
+            <h2>A team of 3 can finish project in a semester</h2>
+          </div>
         </div>
 
-        <div>
-          <h1>Simple.</h1>
-          <h2>Follow your passions.</h2>
-          <h2>It does <b>not</b> have to be 'useful'!</h2>
-          <h2>A team of 3 can finish project in a semester</h2>
+        <div className="brain-hacking">
+          <h1>PART 2: BRAIN HACKING</h1>
+          <p>
+          Congrats, you have an epic idea! Make it come to life in a semester with
+          your team :D . We'll meet up every week to hack away at our ideas.
+          More info coming soon.
+          </p>
         </div>
-      </div>
 
-      <div className="brain-hacking">
-        <h1>PART 2: BRAIN HACKING</h1>
-        <p>
-        Congrats, you have an epic idea! Make it come to life in a semester with
-        your team :D . We'll meet up every week to hack away at our ideas.
-        More info coming soon.
-        </p>
-      </div>
+        <div className="dev-time">
+          <div>
+            <h1>~5 hours dev time per week</h1>
+            <h2>Weekly 2 hour hack session</h2>
+            <h2>2-4 hours of your own time</h2>
+          </div>
 
-      <div className="dev-time">
-        <div>
-          <h1>~5 hours dev time per week</h1>
-          <h2>Weekly 2 hour hack session</h2>
-          <h2>2-4 hours of your own time</h2>
+          <img src={ninja} alt="Neurotech Ninja"/>
         </div>
 
-        <img src={ninja} alt="Neurotech Ninja"/>
-      </div>
+        <div className="cortical-div-btns">
 
-      <div className="cortical-div-btns">
+            <a href="http://bit.ly/cortical-apps-participate">Join</a>
 
-          <a href="http://bit.ly/cortical-apps-participate">Join</a>
+            <a href="https://1drv.ms/w/s!AsCan96xnCd9xRVaqkqkyujNXzFR">Participation Details</a>
 
-          <a href="https://1drv.ms/w/s!AsCan96xnCd9xRVaqkqkyujNXzFR">Participation Details</a>
+            <a href="https://join.slack.com/t/ntuoft-cortical-apps/shared_invite/enQtMzEyNzk2ODQzNjY0LWVhMGI2YTJkN2ExMWEyZTEzZGU4MzY0MjRjOWE3YmI3MzEzMGUzNjU2NGU4MGFlYWMzYWY2MGQ0OGM4YjBkYjM">
+              <img src={slack} alt="Slack"/>
+            </a>
 
-          <a href="https://join.slack.com/t/ntuoft-cortical-apps/shared_invite/enQtMzEyNzk2ODQzNjY0LWVhMGI2YTJkN2ExMWEyZTEzZGU4MzY0MjRjOWE3YmI3MzEzMGUzNjU2NGU4MGFlYWMzYWY2MGQ0OGM4YjBkYjM">
-            <img src={slack} alt="Slack"/>
-          </a>
+        </div>
 
       </div>
 
       <LinksBar/>
 
     </div>
+    
   )
 }
 
diff --git a/src/components/initiatives-div/InitiativesDiv.js b/src/components/initiatives-div/InitiativesDiv.js
index a0cdeef..402f12f 100644
--- a/src/components/initiatives-div/InitiativesDiv.js
+++ b/src/components/initiatives-div/InitiativesDiv.js
@@ -10,19 +10,23 @@ import LinksBar from "../links-bar/LinksBar";
 
 function InitiativesDiv() {
   return (
-    <div className="initiatives-div">
-      <Helmet>
-        <title>Initiatives | NeurotechUofT</title>
-      </Helmet>
+    <div>
+      <div className="initiatives-div">
+        <Helmet>
+          <title>Initiatives | NeurotechUofT</title>
+        </Helmet>
 
-      <NavBar/>
-      
-      <h1>INITIATIVES</h1>
-      <NinjaEvolution/>
+        <NavBar/>
+        
+        <h1>INITIATIVES</h1>
+        <NinjaEvolution/>
 
-      <LinksBar/>
+      </div>
 
+      <LinksBar/>
+      
     </div>
+
   )
 }
 
diff --git a/src/components/team-div/TeamDiv.js b/src/components/team-div/TeamDiv.js
index 9709080..f6e3308 100644
--- a/src/components/team-div/TeamDiv.js
+++ b/src/components/team-div/TeamDiv.js
@@ -28,131 +28,133 @@ import Avatar from '../../assets/team/Profile_avatar_placeholder_large.png';
 
 function TeamDiv() {
   return(
-    <div className="team-div">
-      <Helmet>
-        <title>Our Team | NeurotechUofT</title>
-      </Helmet>
-
-      <NavBar/>
-      
-      <div className="team-banner">
-        <h1>TEAM</h1>
-        <h3>
-          (Want to be a part of our team?
-          <Link to="/opportunities"><b> Apply here :)</b></Link> )
-        </h3>
-      </div>
-
-      <div className="team-photos">
-
-        <div className="profile">
-          <h2>Taha Morshedzadeh</h2>
-          <h3>Co-President, Operations</h3>
-          <img src={Taha} alt="Taha Morshedzadeh"/>
-        </div>
-
-        <div className="profile">
-          <h2>Sayan Faraz</h2>
-          <h3>Co-President, Innovation</h3>
-          <img src={Sayan} alt="Sayan Faraz"/>
-        </div>
-
-        <div className="profile">
-          <h2>Karl Cui</h2>
-          <h3>EEG Research Co-Lead</h3>
-          <img src={Karl} alt="Photo coming soon"/>
-        </div>
-
-        <div className="profile">
-          <h2>Lauren Levy</h2>
-          <h3>EEG Research Co-Lead</h3>
-          <img src={Lauren} alt="Photo coming soon"/>
-        </div>
+    <div>
+      <div className="team-div">
+        <Helmet>
+          <title>Our Team | NeurotechUofT</title>
+        </Helmet>
+
+        <NavBar/>
+        
+        <div className="team-banner">
+          <h1>TEAM</h1>
+          <h3>
+            (Want to be a part of our team?
+            <Link to="/opportunities"><b> Apply here :)</b></Link> )
+          </h3>
+        </div>
+
+        <div className="team-photos">
+
+          <div className="profile">
+            <h2>Taha Morshedzadeh</h2>
+            <h3>Co-President, Operations</h3>
+            <img src={Taha} alt="Taha Morshedzadeh"/>
+          </div>
+
+          <div className="profile">
+            <h2>Sayan Faraz</h2>
+            <h3>Co-President, Innovation</h3>
+            <img src={Sayan} alt="Sayan Faraz"/>
+          </div>
+
+          <div className="profile">
+            <h2>Karl Cui</h2>
+            <h3>EEG Research Co-Lead</h3>
+            <img src={Karl} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Lauren Levy</h2>
+            <h3>EEG Research Co-Lead</h3>
+            <img src={Lauren} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Lucy Ma</h2>
+            <h3>Headset Lead</h3>
+            <img src={Lucy} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Tarriq Purivatra</h2>
+            <h3>Biomechanics Lead</h3>
+            <img src={Tarriq} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Reza Mohammadi</h2>
+            <h3>Biosignals Board Co-Lead</h3>
+            <img src={Reza} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Bing Li</h2>
+            <h3>Biosignals Board Co-Lead</h3>
+            <img src={Bing} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Diadem Shoukralla</h2>
+            <h3>Front End Co-Lead</h3>
+            <img src={Diadem} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Dakota McInnis</h2>
+            <h3>Front End Co-Lead</h3>
+            <img src={Dakota} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Melanie Davie</h2>
+            <h3>Workshops Co-Director</h3>
+            <img src={Melanie} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Nora Lehmann</h2>
+            <h3>Workshops Co-Director</h3>
+            <img src={Nora} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Parry Chan</h2>
+            <h3>Innovation Co-Director</h3>
+            <img src={Avatar} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Matthew Lee</h2>
+            <h3>Innovation Co-Director</h3>
+            <img src={Avatar} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Yosi Hatekar</h2>
+            <h3>HackTernoons Director</h3>
+            <img src={Yosi} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Sai Kumar</h2>
+            <h3>Marketing Director</h3>
+            <img src={Sai} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Soaad Hossain</h2>
+            <h3>Ideas Exchange Director</h3>
+            <img src={Soaad} alt="Photo coming soon"/>
+          </div>
+
+          <div className="profile">
+            <h2>Amelia Zhang</h2>
+            <h3>Sponsorship Director</h3>
+            <img src={Amelia} alt="Photo coming soon"/>
+          </div>
 
-        <div className="profile">
-          <h2>Lucy Ma</h2>
-          <h3>Headset Lead</h3>
-          <img src={Lucy} alt="Photo coming soon"/>
         </div>
-
-        <div className="profile">
-          <h2>Tarriq Purivatra</h2>
-          <h3>Biomechanics Lead</h3>
-          <img src={Tarriq} alt="Photo coming soon"/>
-        </div>
-
-        <div className="profile">
-          <h2>Reza Mohammadi</h2>
-          <h3>Biosignals Board Co-Lead</h3>
-          <img src={Reza} alt="Photo coming soon"/>
-        </div>
-
-        <div className="profile">
-          <h2>Bing Li</h2>
-          <h3>Biosignals Board Co-Lead</h3>
-          <img src={Bing} alt="Photo coming soon"/>
-        </div>
-
-        <div className="profile">
-          <h2>Diadem Shoukralla</h2>
-          <h3>Front End Co-Lead</h3>
-          <img src={Diadem} alt="Photo coming soon"/>
-        </div>
-
-        <div className="profile">
-          <h2>Dakota McInnis</h2>
-          <h3>Front End Co-Lead</h3>
-          <img src={Dakota} alt="Photo coming soon"/>
-        </div>
-
-        <div className="profile">
-          <h2>Melanie Davie</h2>
-          <h3>Workshops Co-Director</h3>
-          <img src={Melanie} alt="Photo coming soon"/>
-        </div>
-
-        <div className="profile">
-          <h2>Nora Lehmann</h2>
-          <h3>Workshops Co-Director</h3>
-          <img src={Nora} alt="Photo coming soon"/>
-        </div>
-
-        <div className="profile">
-          <h2>Parry Chan</h2>
-          <h3>Innovation Co-Director</h3>
-          <img src={Avatar} alt="Photo coming soon"/>
-        </div>
-
-        <div className="profile">
-          <h2>Matthew Lee</h2>
-          <h3>Innovation Co-Director</h3>
-          <img src={Avatar} alt="Photo coming soon"/>
-        </div>
-
-        <div className="profile">
-          <h2>Yosi Hatekar</h2>
-          <h3>HackTernoons Director</h3>
-          <img src={Yosi} alt="Photo coming soon"/>
-        </div>
-
-        <div className="profile">
-          <h2>Sai Kumar</h2>
-          <h3>Marketing Director</h3>
-          <img src={Sai} alt="Photo coming soon"/>
-        </div>
-
-        <div className="profile">
-          <h2>Soaad Hossain</h2>
-          <h3>Ideas Exchange Director</h3>
-          <img src={Soaad} alt="Photo coming soon"/>
-        </div>
-
-        <div className="profile">
-          <h2>Amelia Zhang</h2>
-          <h3>Sponsorship Director</h3>
-          <img src={Amelia} alt="Photo coming soon"/>
-        </div>
-
       </div>
 
       <LinksBar/>
diff --git a/src/components/updates-div/UpdatesDiv.js b/src/components/updates-div/UpdatesDiv.js
index 51e22cc..3c3bb2e 100644
--- a/src/components/updates-div/UpdatesDiv.js
+++ b/src/components/updates-div/UpdatesDiv.js
@@ -10,20 +10,27 @@ import LinksBar from "../links-bar/LinksBar";
 
 function UpdatesDiv() {
   return(
-    <div className='updates-resources-div'>
-      <Helmet>
-        <title>Updates | NeurotechUofT</title>
-      </Helmet>
+    <div>
 
       <NavBar/>
 
-      <div className="updates updates-full">
-        {updatesList}
+      <div className='updates-resources-div'>
+        <Helmet>
+          <title>Updates | NeurotechUofT</title>
+        </Helmet>
+
+
+
+        <div className="updates updates-full">
+          {updatesList}
+        </div>
+
       </div>
 
       <LinksBar/>
 
     </div>
+
   )
 }