Merge branch 'master' into task/JiviSolderBookings

docker-compose.yml

@@ -9,4 +9,4 @@ services:
       - ./package.json:/app/package.json
       - ./package-lock.json:/app/package-lock.json
       - ./public:/app/public
-      - ./markdowns:/app/markdowns
+      - ./docs:/app/docs

markdowns/about.md → docs/about.md

@@ -1,13 +1,13 @@
-## About Us
-The Autonomous Mastery Prototyping Laboratory or "AMP Lab" is a co-curricular educational lab within the Electrical and Computer Engineering department of Virginia Tech. The AMP lab is student-run and student-led.
-
-Our purpose is to provide a creative, hands-on learning environment for ECE students, staff, and faculty. Through projects, members are able to create anything they can think of and gain important skills for the future.
-
-## How does it work?
-AMP Lab members create their own projects that they want to do. Members find a mentor in the lab that has the skills to assist them in the design, construction, and testing of the project. Most of the parts and services are paid for by the ECE department; these are justified using the Educational Value Added by each project.
-
-Many of our members have received internship and full-time positions because of their experiences in the AMP Lab.
-
-## Leadership Team
-
+## About Us
+The Autonomous Mastery Prototyping Laboratory or "AMP Lab" is a co-curricular educational lab within the Electrical and Computer Engineering department of Virginia Tech. The AMP lab is student-run and student-led.
+
+Our purpose is to provide a creative, hands-on learning environment for ECE students, staff, and faculty. Through projects, members are able to create anything they can think of and gain important skills for the future.
+
+## How does it work?
+AMP Lab members create their own projects that they want to do. Members find a mentor in the lab that has the skills to assist them in the design, construction, and testing of the project. Most of the parts and services are paid for by the ECE department; these are justified using the Educational Value Added by each project.
+
+Many of our members have received internship and full-time positions because of their experiences in the AMP Lab.
+
+## Leadership Team
+
 Want to hear more about our leadership team? Click below to learn more!

markdowns/adv_soldering.md → docs/adv_soldering.md

@@ -1,50 +1,50 @@
-### Advanced Soldering Training
-
-Welcome to the realm of Advanced Soldering Training at the AMP Lab. If you're seeking to elevate your soldering skills and master intricate surface-mount soldering techniques, you're in the right place. There is an exceptional facility tailored at the lab to help you conquer the world of surface-mount soldering with finesse.
-
-**Prerequisites:**
-
-- Intermediate soldering certification.
-
-- Steady hands. Good eye-hand coordination. Ability to coordinate your fingers' motions with the results displayed on a large monitor connected to a microscope. 
-
-- Patience and good attention to detail.
-
-Email the following address to schedule advance soldering training (Please note that intermediate training must be completed before starting advanced soldering training.)
-
-        [email protected]
-
---------------------------------------------------------------------------
-
-#### Objectives
-Upon completing the Advanced Soldering Training, you'll confidently master soldering the following components:
-
-- SOIC-8, 1.27 mm pitch
-
-- TSSOP-8, 0.65 mm pitch
-
-- VSSOP-8, 0.5 mm pitch
-
-- SOT-23-5, 0.95 mm pitch
-
-- QFP-44-10x10, 0.8 mm pitch
-
-- QFP-100-12x12, 0.4 mm pitch
-
-- QFN-20-5x5, 0.65 mm pitch
-
-- QFN-20-4x4, 0.5 mm pitch
-
-- QFN-20-3x3, 0.4 mm pitch
-
-- 1206 resistors (3216 metric) 3.2 x 1.6 mm
-
-- 0805 resistors (2012 metric) 2.0 x 1.25 mm
-
-- 0603 resistors (1608 metric) 1.6 x 0.8 mm
-
-- 0402 resistors (1005 metric) 1.0 x 0.5 mm
-
-Those who complete the advanced surface-mount certification will be strongly encouraged to mentor others who wish to learn surface-mount prototype soldering. 
-
+### Advanced Soldering Training
+
+Welcome to the realm of Advanced Soldering Training at the AMP Lab. If you're seeking to elevate your soldering skills and master intricate surface-mount soldering techniques, you're in the right place. There is an exceptional facility tailored at the lab to help you conquer the world of surface-mount soldering with finesse.
+
+**Prerequisites:**
+
+- Intermediate soldering certification.
+
+- Steady hands. Good eye-hand coordination. Ability to coordinate your fingers' motions with the results displayed on a large monitor connected to a microscope. 
+
+- Patience and good attention to detail.
+
+Email the following address to schedule advance soldering training (Please note that intermediate training must be completed before starting advanced soldering training.)
+
+        [email protected]
+
+--------------------------------------------------------------------------
+
+#### Objectives
+Upon completing the Advanced Soldering Training, you'll confidently master soldering the following components:
+
+- SOIC-8, 1.27 mm pitch
+
+- TSSOP-8, 0.65 mm pitch
+
+- VSSOP-8, 0.5 mm pitch
+
+- SOT-23-5, 0.95 mm pitch
+
+- QFP-44-10x10, 0.8 mm pitch
+
+- QFP-100-12x12, 0.4 mm pitch
+
+- QFN-20-5x5, 0.65 mm pitch
+
+- QFN-20-4x4, 0.5 mm pitch
+
+- QFN-20-3x3, 0.4 mm pitch
+
+- 1206 resistors (3216 metric) 3.2 x 1.6 mm
+
+- 0805 resistors (2012 metric) 2.0 x 1.25 mm
+
+- 0603 resistors (1608 metric) 1.6 x 0.8 mm
+
+- 0402 resistors (1005 metric) 1.0 x 0.5 mm
+
+Those who complete the advanced surface-mount certification will be strongly encouraged to mentor others who wish to learn surface-mount prototype soldering. 
+
 Please email [email protected] with questions or concerns.

markdowns/archive/faq.md → docs/archive/faq.md

@@ -1,5 +1,5 @@
----
-layout: page
-title: FAQ
-show_sidebar: false
----
+---
+layout: page
+title: FAQ
+show_sidebar: false
+---

markdowns/archive/getinvolved.md → docs/archive/getinvolved.md

@@ -1,5 +1,5 @@
----
-layout: page
-title: Get Involved
-show_sidebar: false
----
+---
+layout: page
+title: Get Involved
+show_sidebar: false
+---

markdowns/archive/githubTips.md → docs/archive/githubTips.md

@@ -1,15 +1,15 @@
-# Quick tips for Github and Useful Commands
-
-```bash
-git checkout -b branch_name
-```
-
-
-```bash
-git add .
-git commit -m "Hello there"
-git push
-```
-
-<hr>
-
+# Quick tips for Github and Useful Commands
+
+```bash
+git checkout -b branch_name
+```
+
+
+```bash
+git add .
+git commit -m "Hello there"
+git push
+```
+
+<hr>
+

markdowns/archive/index.md → docs/archive/index.md

@@ -1,20 +1,20 @@
-# Have an idea for a ECE project and want to build it for free?
-
-The Autonomous Mastery Prototyping (AMP) Lab is a lab space that gives electrical and computer engineering students the opportunity to gain hands-on experience and apply what they've learned in class with fun, hands-on projects. 
-
-Projects are chosen and created by the student, and are funded completely by the department! 
-
-## Any ECE student of any grade level can join!
-
-Come join us for a fun time in the Amp Lab:
-Open House
-Soldering Training Request Form
-
-
-## Want to see what we're all about? 
-
-Come see us at one of our open house events -- Open House
-
-## If you can't make it to the Open House,
-
+# Have an idea for a ECE project and want to build it for free?
+
+The Autonomous Mastery Prototyping (AMP) Lab is a lab space that gives electrical and computer engineering students the opportunity to gain hands-on experience and apply what they've learned in class with fun, hands-on projects. 
+
+Projects are chosen and created by the student, and are funded completely by the department! 
+
+## Any ECE student of any grade level can join!
+
+Come join us for a fun time in the Amp Lab:
+Open House
+Soldering Training Request Form
+
+
+## Want to see what we're all about? 
+
+Come see us at one of our open house events -- Open House
+
+## If you can't make it to the Open House,
+
 Contact us to schedule a meeting at [email protected] 

markdowns/archive/joining.md → docs/archive/joining.md

@@ -1,17 +1,17 @@
-<div class="level-item has-text-centered">
-    <div>
-        <h1 id="joining-header">Please Fill Out the Form Below to Get Started!!</h1>
-    </div>
-</div>
-
-<div class="columns is-mobile is-centered">
-    <div class="column is-half">
-        <figure class="image">
-            <img class="is-square" src="/web/img/flowchart.png">
-        </figure>
-    </div>
-</div>
-
-<figure class="image is-16by9">
-  <iframe class="has-ratio" width="640" height="360" src="https://forms.gle/XouNMtJfDvBRrEuw9" frameborder="0" allowfullscreen></iframe>
+<div class="level-item has-text-centered">
+    <div>
+        <h1 id="joining-header">Please Fill Out the Form Below to Get Started!!</h1>
+    </div>
+</div>
+
+<div class="columns is-mobile is-centered">
+    <div class="column is-half">
+        <figure class="image">
+            <img class="is-square" src="/web/img/flowchart.png">
+        </figure>
+    </div>
+</div>
+
+<figure class="image is-16by9">
+  <iframe class="has-ratio" width="640" height="360" src="https://forms.gle/XouNMtJfDvBRrEuw9" frameborder="0" allowfullscreen></iframe>
 </figure>

markdowns/archive/location.md → docs/archive/location.md

@@ -1,3 +1,3 @@
-We are located in Whittemore 236, inside of the design studio entrance (brown doors and trim).
-
-![amp-map]({{ site.baseurl }}/img/amp_map.jpg){:class="img-responsive"}
+We are located in Whittemore 236, inside of the design studio entrance (brown doors and trim).
+
+![amp-map]({{ site.baseurl }}/img/amp_map.jpg){:class="img-responsive"}

markdowns/archive/openhouse.md → docs/archive/openhouse.md

@@ -1,9 +1,9 @@
-# Email [email protected] if you would like to join or ask questions about the AMP Lab.
-
-The AMP Lab hosts an open house every Tuesday from 5pm to 6pm.
-
-The open house provides an opportunity to socialize, to show, and to work on projects in the lab.
-
-Not a member? Feel free to drop in and ask questions (or take a tour).
-
-![amp-map](/web/img/open_house.png){:class="img-responsive"}
+# Email [email protected] if you would like to join or ask questions about the AMP Lab.
+
+The AMP Lab hosts an open house every Tuesday from 5pm to 6pm.
+
+The open house provides an opportunity to socialize, to show, and to work on projects in the lab.
+
+Not a member? Feel free to drop in and ask questions (or take a tour).
+
+![amp-map](/web/img/open_house.png){:class="img-responsive"}

markdowns/archive/people.md → docs/archive/people.md

@@ -1,30 +1,30 @@
-## Meet Our Team: Student Staff
-<hr>
-
-
-<em>Richard Gibbons: Head Mentor/Amp Lab Student Lead</em>
-
-<img src={} alt="Richard Gibbons Image"></img>
-
-<em>Josh Sutton: Mentor/Amp Lab Student Leader</em>
-
-![Josh](/web/img/Headshots/JoshSutton.jpeg){:class="img-responsive" style="width:30rem"}
-
-<em>Henry Forsyth: Mentor/Amp Lab Student Leader</em>
-
-![Henry](/web/img/Headshots/HenryForsyth.jpeg){:class="img-responsive" style="width:30rem"}
-
-## Meet Our Team: Professors
-<hr>
-
-<em>William T Baumann: Head Faculty</em>
-
-<a href="mailto:[email protected]" >[email protected]</a>
-
-![William](/web/img/Headshots/Baumann.jpg){:class="img-responsive" style="width:30rem"}
-
-<em>Toby Meadows: Head Faculty</em>
-
-<a href="mailto:[email protected]" >[email protected]</a>
-
+## Meet Our Team: Student Staff
+<hr>
+
+
+<em>Richard Gibbons: Head Mentor/Amp Lab Student Lead</em>
+
+<img src={} alt="Richard Gibbons Image"></img>
+
+<em>Josh Sutton: Mentor/Amp Lab Student Leader</em>
+
+![Josh](/web/img/Headshots/JoshSutton.jpeg){:class="img-responsive" style="width:30rem"}
+
+<em>Henry Forsyth: Mentor/Amp Lab Student Leader</em>
+
+![Henry](/web/img/Headshots/HenryForsyth.jpeg){:class="img-responsive" style="width:30rem"}
+
+## Meet Our Team: Professors
+<hr>
+
+<em>William T Baumann: Head Faculty</em>
+
+<a href="mailto:[email protected]" >[email protected]</a>
+
+![William](/web/img/Headshots/Baumann.jpg){:class="img-responsive" style="width:30rem"}
+
+<em>Toby Meadows: Head Faculty</em>
+
+<a href="mailto:[email protected]" >[email protected]</a>
+
 ![Toby](/web/img/Headshots/Meadows.jpg){:class="img-responsive" style="width:30rem"}