Merge pull request #76 from neurotechuoft/neurostack-docs

Add documentation page for Neurostack
neurotechuoft · Feb 27, 2020 · ef27a68 · ef27a68
2 parents 059d3e8 + 9cc8ba2
commit ef27a68
Show file tree

Hide file tree

Showing 24 changed files with 10,731 additions and 7,553 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -5,13 +5,15 @@
   "private": true,
   "dependencies": {
     "bootstrap": "^4.3.1",
-    "node-sass": "^4.12.0",
+    "node-sass": "^4.13.1",
     "react": "^16.8.6",
     "react-bootstrap": "^1.0.0-beta.9",
     "react-dom": "^16.8.6",
     "react-helmet": "^5.2.1",
     "react-router-dom": "^5.0.1",
-    "react-scripts": "3.0.1"
+    "react-scripts": "^3.4.0",
+    "react-scroll": "^1.7.16",
+    "react-syntax-highlighter": "^12.2.1"
   },
   "scripts": {
     "predeploy": "npm run build",

diff --git a/src/components/advanced-proj-div/AdvancedProjDiv.js b/src/components/advanced-proj-div/AdvancedProjDiv.js
@@ -5,48 +5,59 @@ import './AdvancedProjDiv.scss';
 
 import CurrProjDiv from "../currproj-div/CurrProjDiv";
 
+import NavBar from "../nav-bar/NavBar";
+import LinksBar from "../links-bar/LinksBar";
+
 function AdvancedProjDiv() {
   return(
-    <div className="advanced-proj-div">
-      <Helmet>
-        <title>Projects | NeurotechUofT</title>
-      </Helmet>
-
-      <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-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/Mindfulness-Study">Mindfulness Study</a>
-            <p>
-              A research project looking into and designing a product for feedback-based meditation.
-            </p>
+            <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/app/App.js b/src/components/app/App.js
@@ -14,29 +14,17 @@ import CorticalAppsDiv from "../cortical-apps-div/CorticalAppsDiv";
 import AdvancedProjDiv from "../advanced-proj-div/AdvancedProjDiv";
 import ApplyForPostionDiv from "../apply-for-position-div/ApplyForPositionDiv";
 import UpdatesDiv from "../updates-div/UpdatesDiv";
-<<<<<<< HEAD
 import NeurostackDiv from "../neurostack-div/NeurostackDiv";
-=======
->>>>>>> master
+import NeurostackDocs from '../neurostack-docs/NeurostackDocs';
 
-import NavBar from "../nav-bar/NavBar";
-import LinksBar from "../links-bar/LinksBar";
-
-
-<<<<<<< HEAD
-
-=======
->>>>>>> master
 function App() {
   return (
     <Router>
     <ScrollToTop>
       <div className="App">
 
-      <NavBar/>
-
       <Switch>
-        <Route path="/" exact component={HomePage}/>
+        <Route exact path="/" component={HomePage}/>
         <Route path="/join" component={JoinPage}/>
         <Route path="/team" component={TeamDiv}/>
         <Route path="/initiatives" component={InitiativesDiv}/>
@@ -47,14 +35,10 @@ function App() {
         <Route path="/advanced-projects" component={AdvancedProjDiv}/>
         <Route path="/opportunities" component={ApplyForPostionDiv}/>
         <Route path="/updates" component={UpdatesDiv}/>
-<<<<<<< HEAD
-        <Route path="/neurostack" component={NeurostackDiv}/>
-=======
->>>>>>> master
+        <Route exact path="/neurostack" component={NeurostackDiv}/>
+        <Route exact path="/neurostack/docs" component={NeurostackDocs}/>
       </Switch>
 
-      <LinksBar/>
-
       </div>
     </ScrollToTop>
     </Router>

diff --git a/src/components/app/HomePage.js b/src/components/app/HomePage.js
@@ -9,20 +9,28 @@ import CurrProjDiv from '../currproj-div/CurrProjDiv';
 import OpportunitiesDiv from '../opportunities-div/OpportunitiesDiv';
 import UpdatesResourcesDiv from '../updates-resources-div/UpdatesResourcesDiv';
 
+import NavBar from "../nav-bar/NavBar";
+import LinksBar from "../links-bar/LinksBar";
+
 function HomePage() {
   return (
     <div>
       <Helmet>
         <title>NeurotechUofT</title>
       </Helmet>
 
+      <NavBar/>
+
       <LandingDiv/>
       <NinjaDiv/>
       <JoinUsDiv/>
       <CurrProjDiv/>
       <OpportunitiesDiv/>
       <UpdatesResourcesDiv/>
       <Sponsors/>
+
+      <LinksBar/>
+
     </div>
   );
 }

diff --git a/src/components/app/JoinPage.js b/src/components/app/JoinPage.js
@@ -5,6 +5,9 @@ import JoinUsDiv from '../joinus-div/JoinUsDiv';
 import NinjaDiv from '../ninja-div/NinjaDiv';
 import OpportunitiesDiv from '../opportunities-div/OpportunitiesDiv';
 
+import NavBar from "../nav-bar/NavBar";
+import LinksBar from "../links-bar/LinksBar";
+
 import { Helmet } from 'react-helmet';
 
 function JoinPage() {
@@ -13,11 +16,16 @@ function JoinPage() {
       <Helmet>
         <title>Join | NeurotechUofT</title>
       </Helmet>
+
+      <NavBar/>
 
       <HelloDiv/>
       <JoinUsDiv/>
       <NinjaDiv/>
       <OpportunitiesDiv/>
+
+      <LinksBar/>
+
     </div>
   );
 }

diff --git a/src/components/apply-for-position-div/ApplyForPositionDiv.js b/src/components/apply-for-position-div/ApplyForPositionDiv.js
@@ -5,56 +5,68 @@ import './ApplyForPositionDiv.scss';
 
 import {positionsList, projectsList} from './collapseList';
 
+import NavBar from "../nav-bar/NavBar";
+import LinksBar from "../links-bar/LinksBar";
+
 function ApplyForPostionDiv() {
 
   return(
-    <div className="apply-for-position-div">
-      <Helmet>
-        <title>Opportunities | NeurotechUofT</title>
-      </Helmet>
-
-      <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>
+      <div className="apply-for-position-div">
+        <Helmet>
+          <title>Opportunities | NeurotechUofT</title>
+        </Helmet>
+
+        <NavBar/>
+
+        <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>
+
+          {/* <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>
+
   )
 }