Skip to content

Commit

Permalink
fixed navbar/linkbar alignment issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@waynezhu6
waynezhu6 committed Feb 27, 2020
1 parent 9974b1c commit 9cc8ba2
Show file tree
Hide file tree
Showing 6 changed files with 298 additions and 273 deletions.
75 changes: 39 additions & 36 deletions src/components/advanced-proj-div/AdvancedProjDiv.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

)
}

Expand Down
90 changes: 47 additions & 43 deletions src/components/apply-for-position-div/ApplyForPositionDiv.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

)
}

Expand Down
117 changes: 61 additions & 56 deletions src/components/cortical-apps-div/CorticalAppsDiv.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

)
}

Expand Down
22 changes: 13 additions & 9 deletions src/components/initiatives-div/InitiativesDiv.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>

)
}

Expand Down
Loading

0 comments on commit 9cc8ba2

Please sign in to comment.