From 15d61227e46056b3fa1b91303453ef34092e94d6 Mon Sep 17 00:00:00 2001 From: Forsyth Creations Date: Sat, 6 Jan 2024 14:03:21 -0500 Subject: [PATCH] Adding MDE documents to the website for Toby (#130) --- docker-compose.yml | 2 +- {markdowns => docs}/about.md | 24 +- {markdowns => docs}/adv_soldering.md | 98 ++-- {markdowns => docs}/archive/faq.md | 10 +- {markdowns => docs}/archive/getinvolved.md | 10 +- {markdowns => docs}/archive/githubTips.md | 30 +- {markdowns => docs}/archive/index.md | 38 +- {markdowns => docs}/archive/joining.md | 32 +- {markdowns => docs}/archive/location.md | 6 +- {markdowns => docs}/archive/openhouse.md | 18 +- {markdowns => docs}/archive/people.md | 58 +-- {markdowns => docs}/archive/resources.md | 0 .../archive/tutorial_depreciated.md | 378 +++++++------- {markdowns => docs}/basic_soldering.md | 48 +- docs/cleaning_standards.md | 31 ++ {markdowns => docs}/getting_started_simple.md | 0 {markdowns => docs}/intermediate_soldering.md | 0 docs/mde_docs/ECE Design Studio Policy.docx | Bin 0 -> 15494 bytes .../ECE Integrated Design Studio Waiver.docx | Bin 0 -> 13976 bytes .../Lab Training Guide Draft Rev. 1.docx | Bin 0 -> 16545 bytes {markdowns => docs}/mentee_checksheet.md | 0 {markdowns => docs}/mentor_checksheet.md | 0 {markdowns => docs}/mentor_steps.md | 228 ++++---- {markdowns => docs}/migration.md | 16 +- {markdowns => docs}/new_members.md | 0 {markdowns => docs}/resources.md | 3 + {markdowns => docs}/returning_members.md | 0 {markdowns => docs}/rules.md | 28 +- {markdowns => docs}/soldering.md | 48 +- {markdowns => docs}/tutorial.md | 490 +++++++++--------- package-lock.json | 110 ++-- src/pages/about.jsx | 2 +- src/pages/clean.jsx | 28 + src/pages/getting_started.jsx | 4 +- src/pages/mde/docs.jsx | 41 ++ src/pages/mentee_checksheet.jsx | 2 +- src/pages/mentor_checksheet.jsx | 2 +- src/pages/mentor_steps.jsx | 2 +- src/pages/migration.jsx | 2 +- src/pages/resources.jsx | 2 +- src/pages/rules.jsx | 2 +- src/pages/soldering.jsx | 2 +- src/pages/soldering/advanced.jsx | 2 +- src/pages/soldering/basic.jsx | 2 +- src/pages/soldering/general.jsx | 2 +- src/pages/tutorial.jsx | 2 +- 46 files changed, 954 insertions(+), 849 deletions(-) rename {markdowns => docs}/about.md (98%) mode change 100755 => 100644 rename {markdowns => docs}/adv_soldering.md (97%) rename {markdowns => docs}/archive/faq.md (91%) mode change 100755 => 100644 rename {markdowns => docs}/archive/getinvolved.md (92%) mode change 100755 => 100644 rename {markdowns => docs}/archive/githubTips.md (91%) mode change 100755 => 100644 rename {markdowns => docs}/archive/index.md (97%) mode change 100755 => 100644 rename {markdowns => docs}/archive/joining.md (97%) mode change 100755 => 100644 rename {markdowns => docs}/archive/location.md (98%) mode change 100755 => 100644 rename {markdowns => docs}/archive/openhouse.md (97%) mode change 100755 => 100644 rename {markdowns => docs}/archive/people.md (96%) mode change 100755 => 100644 rename {markdowns => docs}/archive/resources.md (100%) mode change 100755 => 100644 rename {markdowns => docs}/archive/tutorial_depreciated.md (97%) mode change 100755 => 100644 rename {markdowns => docs}/basic_soldering.md (98%) create mode 100644 docs/cleaning_standards.md rename {markdowns => docs}/getting_started_simple.md (100%) rename {markdowns => docs}/intermediate_soldering.md (100%) create mode 100644 docs/mde_docs/ECE Design Studio Policy.docx create mode 100644 docs/mde_docs/ECE Integrated Design Studio Waiver.docx create mode 100644 docs/mde_docs/Lab Training Guide Draft Rev. 1.docx rename {markdowns => docs}/mentee_checksheet.md (100%) rename {markdowns => docs}/mentor_checksheet.md (100%) rename {markdowns => docs}/mentor_steps.md (96%) rename {markdowns => docs}/migration.md (98%) mode change 100755 => 100644 rename {markdowns => docs}/new_members.md (100%) rename {markdowns => docs}/resources.md (87%) rename {markdowns => docs}/returning_members.md (100%) rename {markdowns => docs}/rules.md (98%) mode change 100755 => 100644 rename {markdowns => docs}/soldering.md (98%) mode change 100755 => 100644 rename {markdowns => docs}/tutorial.md (96%) mode change 100755 => 100644 create mode 100644 src/pages/clean.jsx create mode 100644 src/pages/mde/docs.jsx diff --git a/docker-compose.yml b/docker-compose.yml index dfbaa9f..ee3a9c2 100644 --- a/docker-compose.yml +++ b/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 \ No newline at end of file + - ./docs:/app/docs \ No newline at end of file diff --git a/markdowns/about.md b/docs/about.md old mode 100755 new mode 100644 similarity index 98% rename from markdowns/about.md rename to docs/about.md index 0410570..dfef542 --- a/markdowns/about.md +++ b/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! \ No newline at end of file diff --git a/markdowns/adv_soldering.md b/docs/adv_soldering.md similarity index 97% rename from markdowns/adv_soldering.md rename to docs/adv_soldering.md index 00fe204..63e5b61 100644 --- a/markdowns/adv_soldering.md +++ b/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.) - - amp-lab-leadership-team-g@vt.edu - --------------------------------------------------------------------------- - -#### 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.) + + amp-lab-leadership-team-g@vt.edu + +-------------------------------------------------------------------------- + +#### 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 amp-lab-leadership-team-g@vt.edu with questions or concerns. \ No newline at end of file diff --git a/markdowns/archive/faq.md b/docs/archive/faq.md old mode 100755 new mode 100644 similarity index 91% rename from markdowns/archive/faq.md rename to docs/archive/faq.md index be208e0..090d24a --- a/markdowns/archive/faq.md +++ b/docs/archive/faq.md @@ -1,5 +1,5 @@ ---- -layout: page -title: FAQ -show_sidebar: false ---- +--- +layout: page +title: FAQ +show_sidebar: false +--- diff --git a/markdowns/archive/getinvolved.md b/docs/archive/getinvolved.md old mode 100755 new mode 100644 similarity index 92% rename from markdowns/archive/getinvolved.md rename to docs/archive/getinvolved.md index 0abad6f..7bb4ad0 --- a/markdowns/archive/getinvolved.md +++ b/docs/archive/getinvolved.md @@ -1,5 +1,5 @@ ---- -layout: page -title: Get Involved -show_sidebar: false ---- +--- +layout: page +title: Get Involved +show_sidebar: false +--- diff --git a/markdowns/archive/githubTips.md b/docs/archive/githubTips.md old mode 100755 new mode 100644 similarity index 91% rename from markdowns/archive/githubTips.md rename to docs/archive/githubTips.md index 71955ed..7259ceb --- a/markdowns/archive/githubTips.md +++ b/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 -``` - -
- +# Quick tips for Github and Useful Commands + +```bash +git checkout -b branch_name +``` + + +```bash +git add . +git commit -m "Hello there" +git push +``` + +
+ diff --git a/markdowns/archive/index.md b/docs/archive/index.md old mode 100755 new mode 100644 similarity index 97% rename from markdowns/archive/index.md rename to docs/archive/index.md index 03973d2..b6e0df9 --- a/markdowns/archive/index.md +++ b/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 amp-lab-leadership-team-g@vt.edu \ No newline at end of file diff --git a/markdowns/archive/joining.md b/docs/archive/joining.md old mode 100755 new mode 100644 similarity index 97% rename from markdowns/archive/joining.md rename to docs/archive/joining.md index cb145ff..c94847c --- a/markdowns/archive/joining.md +++ b/docs/archive/joining.md @@ -1,17 +1,17 @@ -
-
-

Please Fill Out the Form Below to Get Started!!

-
-
- -
-
-
- -
-
-
- -
- +
+
+

Please Fill Out the Form Below to Get Started!!

+
+
+ +
+
+
+ +
+
+
+ +
+
\ No newline at end of file diff --git a/markdowns/archive/location.md b/docs/archive/location.md old mode 100755 new mode 100644 similarity index 98% rename from markdowns/archive/location.md rename to docs/archive/location.md index ce78d4c..c69ae8f --- a/markdowns/archive/location.md +++ b/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"} diff --git a/markdowns/archive/openhouse.md b/docs/archive/openhouse.md old mode 100755 new mode 100644 similarity index 97% rename from markdowns/archive/openhouse.md rename to docs/archive/openhouse.md index e8f07f7..7ca8b41 --- a/markdowns/archive/openhouse.md +++ b/docs/archive/openhouse.md @@ -1,9 +1,9 @@ -# Email amp-lab-leadership-team-g@vt.edu 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 amp-lab-leadership-team-g@vt.edu 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"} diff --git a/markdowns/archive/people.md b/docs/archive/people.md old mode 100755 new mode 100644 similarity index 96% rename from markdowns/archive/people.md rename to docs/archive/people.md index c6a3fcc..d1db980 --- a/markdowns/archive/people.md +++ b/docs/archive/people.md @@ -1,30 +1,30 @@ -## Meet Our Team: Student Staff -
- - -Richard Gibbons: Head Mentor/Amp Lab Student Lead - -Richard Gibbons Image - -Josh Sutton: Mentor/Amp Lab Student Leader - -![Josh](/web/img/Headshots/JoshSutton.jpeg){:class="img-responsive" style="width:30rem"} - -Henry Forsyth: Mentor/Amp Lab Student Leader - -![Henry](/web/img/Headshots/HenryForsyth.jpeg){:class="img-responsive" style="width:30rem"} - -## Meet Our Team: Professors -
- -William T Baumann: Head Faculty - -baumann@vt.edu - -![William](/web/img/Headshots/Baumann.jpg){:class="img-responsive" style="width:30rem"} - -Toby Meadows: Head Faculty - -toby88@vt.edu - +## Meet Our Team: Student Staff +
+ + +Richard Gibbons: Head Mentor/Amp Lab Student Lead + +Richard Gibbons Image + +Josh Sutton: Mentor/Amp Lab Student Leader + +![Josh](/web/img/Headshots/JoshSutton.jpeg){:class="img-responsive" style="width:30rem"} + +Henry Forsyth: Mentor/Amp Lab Student Leader + +![Henry](/web/img/Headshots/HenryForsyth.jpeg){:class="img-responsive" style="width:30rem"} + +## Meet Our Team: Professors +
+ +William T Baumann: Head Faculty + +baumann@vt.edu + +![William](/web/img/Headshots/Baumann.jpg){:class="img-responsive" style="width:30rem"} + +Toby Meadows: Head Faculty + +toby88@vt.edu + ![Toby](/web/img/Headshots/Meadows.jpg){:class="img-responsive" style="width:30rem"} \ No newline at end of file diff --git a/markdowns/archive/resources.md b/docs/archive/resources.md old mode 100755 new mode 100644 similarity index 100% rename from markdowns/archive/resources.md rename to docs/archive/resources.md diff --git a/markdowns/archive/tutorial_depreciated.md b/docs/archive/tutorial_depreciated.md old mode 100755 new mode 100644 similarity index 97% rename from markdowns/archive/tutorial_depreciated.md rename to docs/archive/tutorial_depreciated.md index b9b0aaf..f445ade --- a/markdowns/archive/tutorial_depreciated.md +++ b/docs/archive/tutorial_depreciated.md @@ -1,189 +1,189 @@ -PSA: There is a "Frequenty Asked Questions" section at the bottom of this page if any of the concepts are unfamiliar - -## Overview - -Here at the Amp Lab, you are expected to update the website with the latest info for your project. To update the website, you will be using git. This tutorial uses the command line, but if you are comfortable you may use the Github GUI. For now, click one of the buttons below to install git. - - -Install Git for Windows -Install Git for Linux/Apple - -It is also recommended that you install Visual Code Studio, a common IDE used in industry: - -Download Visual Code - -
- -## Step 1: Shoot us an Email -Before going through these steps, make sure to shoot us an email! That way we can get you started on your projects. Here is out email: -``` bash -amp-lab-leadership-team-g@vt.edu -``` - -
- -## Step 2: Get Connected to Our GitHub Website - -### Part A: -Follow the steps below to get your repo all set up. This will make a folder in your home directory. Open a bash terminal to get started: -``` bash -cd -mkdir AmpLab -cd AmpLab -git clone https://github.com/Amp-Lab-at-VT/web.git -cd web -``` -Now that you're in your folder, let's open it in Visual Code and give you the quick overview. Type the following to open Visual Studio Code: -``` bash -code . - This command does not function all the time -``` -From here, you can open a terminal in Visual Studio Code (Also just called VS code). See image below: - -![amp-map]({{ site.baseurl }}/img/TutorialPhotos/Terminal.png){:class="img-responsive"} - -Now we're going to create a branch. It's just like a tree: all core, working code happens on the **main/master** branch. All development happens on **branches**, which can be merged in. See this video for reference: -Learn More About Branching and Merging - -**Note that "Name" can be whatever you want** - -``` bash -git checkout -b “Name” -``` - -As a sanity check, try running the following command - -``` bash -git branch -``` - -You should see "main" and the name of your branch. The fact that your name is green and has a star next to it means you did this step properly! - -Alright, we're done with the CLI for now! Let's start using Visual Code. - -
- -### Part B: - -There are two folders you need to keep track of: **WARNING: DO NOT EDIT ANY OTHER FOLDERS. THESE ARE AUTO-GENERATED, AND SHOULD NOT BE TOUCHED** - - -``` text -img -_posts -``` - -See below: - -![amp-map]({{ site.baseurl }}/img/TutorialPhotos/usefulFolders.png){:class="img-responsive"} - -You will be putting all your files into these two locations. Make a copy of the project template found in **_posts** using the instructions below: - -![amp-map]({{ site.baseurl }}/img/TutorialPhotos/copyTemplate2.png){:class="img-responsive"} - -Now, rename the template. The dating scheme is **year, month, day**. This is critical! Also use a dash ```-``` as your word divider, **instead of spaces**. See below: - -![amp-map]({{ site.baseurl }}/img/TutorialPhotos/renameTemplate.png){:class="img-responsive"} - -Now, edit the top of your project file. Go ahead and update the fields with your info. **Make sure the date in this section matches the name of your file** - -**Do not change the layout type** - -![amp-map]({{ site.baseurl }}/img/TutorialPhotos/makeProjectTheSame.png){:class="img-responsive"} - -Now, fill in your project specs. If you have images to add, that will be covered soon! For tips on markdown, go here: Learn More About Markdown - - -![amp-map]({{ site.baseurl }}/img/TutorialPhotos/filledInExpectations.png){:class="img-responsive"} - -
- -### Part C: - -Next Up, create a folder to store your images in! For this, we will be using the ```img``` folder. See below. Please make a folder that with the same name as your project. Again, **no spaces**! - -![amp-map]({{ site.baseurl }}/img/TutorialPhotos/newFolderInImages2.png){:class="img-responsive"} - -Note, ```MyFirstProject``` is a fake name. Rename it to what you want! - -![amp-map]({{ site.baseurl }}/img/TutorialPhotos/myfirstprojectFolder.png){:class="img-responsive"} - -Great, your're all set up! Now let's go over submiting this to Github. - -## Step 4: Github Submission - -In your terminal, type the following: - -``` bash -pwd -``` - -This will tell you which directory you are in. Type the following to back up to the ```web``` folder: - -```bash -cd .. -``` - -Once there, type the following: - -```bash -git add . -git commit -m "Say whatever you want here! This is a comment for you" -git push -``` - -Wonderful! Now go in and make a pull request. Go here: Amp Lab Website Github Origin - -![amp-map]({{ site.baseurl }}/img/TutorialPhotos/pullRequest1.png){:class="img-responsive"} - -Make sure you are merging from your branch to main before creating the pull request! - -![amp-map]({{ site.baseurl }}/img/TutorialPhotos/pullRequest2.png){:class="img-responsive"} - -Click on the "Pull Request" tab, and ask to merge **your branch** with **master**. This is shown below: - -![amp-map]({{ site.baseurl }}/img/TutorialPhotos/pullRequest3.png){:class="img-responsive"} - -Leave a comment for the mentors, and you're good to go! - -![amp-map]({{ site.baseurl }}/img/TutorialPhotos/pullRequest4.png){:class="img-responsive"} - -
- -## Step 5: Create A Repo Under the Amp Lab -Finally, to store all your project files, you'll need to create a repo under the AmpLabVT GitHub organization. Do so by doing the following: - -**This section is currently under development** - - -## Step 6: Final Notes - -And that's it, you're officially set up! From now on, you'll be responsible for these three things: -> -1. _posts/ - - This is the file that will be publicly available, and is the one you'll send to your mentor -2. img/ - - Store all your images here -3. Project Repo - - All other data for your project gets stored here -> - -For more info on pushing code using **git**, go here: Submitting a Commit to Git - -***TLDR*** all you really need are these three commands for pushing your local data: - -``` bash -git add -u -git commit -m "new message" -git push -``` - -
- -## FAQ - -- What is bash? - - "Bash" is a program interface. When you run a termincal, "bash" is the program connecting and interpretting your commands to make them "machine readible". -- Why are we not using Google Sites? - - Google Sites is a great platform. However, the best sites are still made with a little elbow grease. Besides that, this creates a great opportunity for you to use git, and learn it well. This is greatly looked for by recruiters **cough** put it on your resume that you know git **cough** -- What on earth is a 'CLI'? - - A CLI is a "Command Line Interface". It's the quick way of saying terminal. They mean the same thing +PSA: There is a "Frequenty Asked Questions" section at the bottom of this page if any of the concepts are unfamiliar + +## Overview + +Here at the Amp Lab, you are expected to update the website with the latest info for your project. To update the website, you will be using git. This tutorial uses the command line, but if you are comfortable you may use the Github GUI. For now, click one of the buttons below to install git. + + +Install Git for Windows +Install Git for Linux/Apple + +It is also recommended that you install Visual Code Studio, a common IDE used in industry: + +Download Visual Code + +
+ +## Step 1: Shoot us an Email +Before going through these steps, make sure to shoot us an email! That way we can get you started on your projects. Here is out email: +``` bash +amp-lab-leadership-team-g@vt.edu +``` + +
+ +## Step 2: Get Connected to Our GitHub Website + +### Part A: +Follow the steps below to get your repo all set up. This will make a folder in your home directory. Open a bash terminal to get started: +``` bash +cd +mkdir AmpLab +cd AmpLab +git clone https://github.com/Amp-Lab-at-VT/web.git +cd web +``` +Now that you're in your folder, let's open it in Visual Code and give you the quick overview. Type the following to open Visual Studio Code: +``` bash +code . - This command does not function all the time +``` +From here, you can open a terminal in Visual Studio Code (Also just called VS code). See image below: + +![amp-map]({{ site.baseurl }}/img/TutorialPhotos/Terminal.png){:class="img-responsive"} + +Now we're going to create a branch. It's just like a tree: all core, working code happens on the **main/master** branch. All development happens on **branches**, which can be merged in. See this video for reference: +Learn More About Branching and Merging + +**Note that "Name" can be whatever you want** + +``` bash +git checkout -b “Name” +``` + +As a sanity check, try running the following command + +``` bash +git branch +``` + +You should see "main" and the name of your branch. The fact that your name is green and has a star next to it means you did this step properly! + +Alright, we're done with the CLI for now! Let's start using Visual Code. + +
+ +### Part B: + +There are two folders you need to keep track of: **WARNING: DO NOT EDIT ANY OTHER FOLDERS. THESE ARE AUTO-GENERATED, AND SHOULD NOT BE TOUCHED** + + +``` text +img +_posts +``` + +See below: + +![amp-map]({{ site.baseurl }}/img/TutorialPhotos/usefulFolders.png){:class="img-responsive"} + +You will be putting all your files into these two locations. Make a copy of the project template found in **_posts** using the instructions below: + +![amp-map]({{ site.baseurl }}/img/TutorialPhotos/copyTemplate2.png){:class="img-responsive"} + +Now, rename the template. The dating scheme is **year, month, day**. This is critical! Also use a dash ```-``` as your word divider, **instead of spaces**. See below: + +![amp-map]({{ site.baseurl }}/img/TutorialPhotos/renameTemplate.png){:class="img-responsive"} + +Now, edit the top of your project file. Go ahead and update the fields with your info. **Make sure the date in this section matches the name of your file** + +**Do not change the layout type** + +![amp-map]({{ site.baseurl }}/img/TutorialPhotos/makeProjectTheSame.png){:class="img-responsive"} + +Now, fill in your project specs. If you have images to add, that will be covered soon! For tips on markdown, go here: Learn More About Markdown + + +![amp-map]({{ site.baseurl }}/img/TutorialPhotos/filledInExpectations.png){:class="img-responsive"} + +
+ +### Part C: + +Next Up, create a folder to store your images in! For this, we will be using the ```img``` folder. See below. Please make a folder that with the same name as your project. Again, **no spaces**! + +![amp-map]({{ site.baseurl }}/img/TutorialPhotos/newFolderInImages2.png){:class="img-responsive"} + +Note, ```MyFirstProject``` is a fake name. Rename it to what you want! + +![amp-map]({{ site.baseurl }}/img/TutorialPhotos/myfirstprojectFolder.png){:class="img-responsive"} + +Great, your're all set up! Now let's go over submiting this to Github. + +## Step 4: Github Submission + +In your terminal, type the following: + +``` bash +pwd +``` + +This will tell you which directory you are in. Type the following to back up to the ```web``` folder: + +```bash +cd .. +``` + +Once there, type the following: + +```bash +git add . +git commit -m "Say whatever you want here! This is a comment for you" +git push +``` + +Wonderful! Now go in and make a pull request. Go here: Amp Lab Website Github Origin + +![amp-map]({{ site.baseurl }}/img/TutorialPhotos/pullRequest1.png){:class="img-responsive"} + +Make sure you are merging from your branch to main before creating the pull request! + +![amp-map]({{ site.baseurl }}/img/TutorialPhotos/pullRequest2.png){:class="img-responsive"} + +Click on the "Pull Request" tab, and ask to merge **your branch** with **master**. This is shown below: + +![amp-map]({{ site.baseurl }}/img/TutorialPhotos/pullRequest3.png){:class="img-responsive"} + +Leave a comment for the mentors, and you're good to go! + +![amp-map]({{ site.baseurl }}/img/TutorialPhotos/pullRequest4.png){:class="img-responsive"} + +
+ +## Step 5: Create A Repo Under the Amp Lab +Finally, to store all your project files, you'll need to create a repo under the AmpLabVT GitHub organization. Do so by doing the following: + +**This section is currently under development** + + +## Step 6: Final Notes + +And that's it, you're officially set up! From now on, you'll be responsible for these three things: +> +1. _posts/ + - This is the file that will be publicly available, and is the one you'll send to your mentor +2. img/ + - Store all your images here +3. Project Repo + - All other data for your project gets stored here +> + +For more info on pushing code using **git**, go here: Submitting a Commit to Git + +***TLDR*** all you really need are these three commands for pushing your local data: + +``` bash +git add -u +git commit -m "new message" +git push +``` + +
+ +## FAQ + +- What is bash? + - "Bash" is a program interface. When you run a termincal, "bash" is the program connecting and interpretting your commands to make them "machine readible". +- Why are we not using Google Sites? + - Google Sites is a great platform. However, the best sites are still made with a little elbow grease. Besides that, this creates a great opportunity for you to use git, and learn it well. This is greatly looked for by recruiters **cough** put it on your resume that you know git **cough** +- What on earth is a 'CLI'? + - A CLI is a "Command Line Interface". It's the quick way of saying terminal. They mean the same thing diff --git a/markdowns/basic_soldering.md b/docs/basic_soldering.md similarity index 98% rename from markdowns/basic_soldering.md rename to docs/basic_soldering.md index 67e3037..b20e8a3 100644 --- a/markdowns/basic_soldering.md +++ b/docs/basic_soldering.md @@ -1,25 +1,25 @@ -### Basic Soldering Training - -Basic soldering training will cover operation of the soldering iron and how it works, how to solder some common through hole components, what tools to use when fixing soldering mistakes, and how to clean up the workspace after oneself. You have the option to select one of the following PCB projects for this training: - -- LED Color Organ \ - -> Soldering manual for reference available here (TBD) - -Upon successfully completing the training, you'll not only gain invaluable soldering skills but also get to keep the PCB board you've assembled during the training! - -This training will not cover intermediate soldering techniques (techniques for soldering large surface mount devices). It is highly recomended you sign up for intermediate soldering after completion of basic training. - -Schedule a meeting with one of our mentors for basic training using the following form: - - - - Soldering Training Sign Up Form - - ---- - -#### Objectives -After completing basic soldering training, one can: -- Possess the skills to confidently operate a soldering iron while adhering to safety guidelines. -- Understand and execute basic soldering techniques for soldering standard through holde components on a PCB. +### Basic Soldering Training + +Basic soldering training will cover operation of the soldering iron and how it works, how to solder some common through hole components, what tools to use when fixing soldering mistakes, and how to clean up the workspace after oneself. You have the option to select one of the following PCB projects for this training: + +- LED Color Organ \ + -> Soldering manual for reference available here (TBD) + +Upon successfully completing the training, you'll not only gain invaluable soldering skills but also get to keep the PCB board you've assembled during the training! + +This training will not cover intermediate soldering techniques (techniques for soldering large surface mount devices). It is highly recomended you sign up for intermediate soldering after completion of basic training. + +Schedule a meeting with one of our mentors for basic training using the following form: + + + + Soldering Training Sign Up Form + + +--- + +#### Objectives +After completing basic soldering training, one can: +- Possess the skills to confidently operate a soldering iron while adhering to safety guidelines. +- Understand and execute basic soldering techniques for soldering standard through holde components on a PCB. - Exhibit proper lab etiquette, including maintaining a clean and organized workspace. \ No newline at end of file diff --git a/docs/cleaning_standards.md b/docs/cleaning_standards.md new file mode 100644 index 0000000..899b12c --- /dev/null +++ b/docs/cleaning_standards.md @@ -0,0 +1,31 @@ +# Amp Lab Cleaning Standards + +# Overview: + +"Everything has a place. If you don't know, just ask. If no leadership is around, reach out on Discord or refer to this page for general reference" + +" + + +## For Personal Spaces + +- "We do not have official personal spaces in the lab" +- You should always leave the spaces how you found them +- If you need a space for an extended period of time, please reach out to Amp Lab staff to coordinate +- Tables should be left clean and free of project materials. If you require a bin, please do the following: + + - Find the organization station, and grab yourself a label + - Find a bin that is roughly the size need for your project, and place all project materials in the bin. If there is no bin, reach out to the Amp Lab leadership team through Discord + - Place the bin on the back project wall + +- Parts and tool on the Amp Lab side are specifically for Amp Lab members. MDE students that need parts need to request it from Amp Lab staff +- The Amp Lab and MDE sides are designated, specific areas divided by an iron curtain (the yellow line). This is to enforce cleanliness and accountability to both co-curricular activities. + +# FAQ + +Why the heck do we have to keep things clean? It's my project and my space + News flash: no it's not. This is a shared lab space. If you leave a table in a wreck, then other students won't have the ability to work. + + + + diff --git a/markdowns/getting_started_simple.md b/docs/getting_started_simple.md similarity index 100% rename from markdowns/getting_started_simple.md rename to docs/getting_started_simple.md diff --git a/markdowns/intermediate_soldering.md b/docs/intermediate_soldering.md similarity index 100% rename from markdowns/intermediate_soldering.md rename to docs/intermediate_soldering.md diff --git a/docs/mde_docs/ECE Design Studio Policy.docx b/docs/mde_docs/ECE Design Studio Policy.docx new file mode 100644 index 0000000000000000000000000000000000000000..e4ce2217a332d21d50a4697bad5dd298c8646e5a GIT binary patch literal 15494 zcmeIZgX7eUEN*PRSMD|pr`%*G zlf8+PF1@>rHDMkoFl7z^_`UuAUH=dN1N8}`mVJzfqW3|s0aJ~OQmvGQ{lj_DCOGC# zKw+$MBDX^M?XR6XoJ@tJOsvC$gp;eDlaNdSQ_E@AP)H4KWXBl1Nq+GkEjVbF7JktA z7-NxdB`~fF4zv4Ov$l6&$*==4k~H+ijVnXTXXIxDplLh+qNo$2)kwJqu@Hp3!?7-& zKc4$ZpCdOX6fXzBK`8zIfKRnHEn^HEo}>u4yU7u&$wKb1}+Yk8fb=Oz0} zxY^21sg-}Xo%BiQqdP$*reZ*t)^ZclU&ibnMPcn+yNp4GssyTbIup_8xw*DP?Hc0| zq#nr(`RX@nR6n1I7&;GN-FRKX)lOHAo#l$+Bdkb#h_1Q!%valIwf9ZAIaFUDkGoyE z7VL;aEdg2j+-CfR|9xb=y@3D}{vn?DvDi)L?=^Do(g*V{o_dZZ)=muczv%yo<^RL7 z__v>49@q0Omaqcn0WSel9g536nE7%HM&DO3mmnauC1p@n7A+TEUp_1@0_z?ch>uRs z#DDj2$`EteOwhf+PEv&n>wubn{Me`c-0luY3~DcAa-X-~hE3nQGkqB$k)#?42-idl zo5Ti>eF#Yz??&0B7P;FkhOr=~nw&Kvt;^4HP+hoB@n*?MWty9}l+gBsDCHIH4907n z!19JR<*!L*p^J&`U9Z*cS2>DrW{$L^x~0XoW@I4Ch&3#S#=dBuI`YWxDjo<8qJ_$Z z3T1fyY^sB-^|~LnhsDo+PNZ3{w`GTup(}X(zDWJIeAIP@PV1VA&vG>;hZ(rr{^ z7M5Sj1%XIB7JuBk9doF}^~Rh(_0+`}w);kzYdD;h!8hE5;(ZTH9^|H@l32JBRLiav z?Ua}ybDM$vR>izjiN5K2OHyr!d%?fdXz>KCXVb7?ejo;RFM-N_O{Cn4F4;XSDTIEp z0vTQc$x598jC-r&gN05eIXgZhg#yw0cIArT{oVifFoJ=XITeKg07e`D0HpU8e+;9)51

H6@ZZ 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 z

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 wj_xP_8~QIo;dl7&Te^Pm>mRlM4-&C1umAu6 literal 0 HcmV?d00001 diff --git a/docs/mde_docs/Lab Training Guide Draft Rev. 1.docx b/docs/mde_docs/Lab Training Guide Draft Rev. 1.docx new file mode 100644 index 0000000000000000000000000000000000000000..784a99f46d0f9df82e646ba2c069e9b2a2b72224 GIT binary patch literal 16545 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 Lab Website Github Origin - - -Make sure you are merging from your branch to main before creating the pull request! - -Click on the "Pull Request" tab, and ask to merge **your branch** with **master**. This is shown below: - - -Leave a comment for the mentors, and you're good to go! - - -When you are done with these steps, remember that you are on a branch that has been submitted to master through a PR. Once the PR is accepted, it is wise to just start fresh. Follow these steps to make sure you are always working on the latest code. - -Another mentor will see your PR, and approve it. These is done as a sanity check for the student team - -What follows are clean up steps to get you back on the latest version of master - -**Note that if 'git checkout main' doesn't work, you may need to run 'git checkout master'** -```bash -git checkout main -git branch -``` - -**git branch** will show you a list of your local branches. Delete the one that is not master - -```bash -git branch -d name_of_branch -``` - -Finally, run a git pull to update master - -```bash -git reset --hard origin/master -git pull -``` - -It should say "already up to date". - -## Step 5: Maintaining and Keeping the Submodule updated - -Submodules are always tied to a particular commmit within the history of the project. That means that you will have to update it from time to time to keep the website current. Use the following command from time to time in web/img and web/_posts to keep the submodules current. This is not needed immedaitely after submitting the PR, as it has already been set to a commit. Just run it every week or so and submit a PR for the update! - -``` bash -git pull -git submodule update --remote -git add . -git commit -m "Update Submodules" -git push +### Step 1: Making them a project repo + +Go to [our Github repository](https://github.com/Amp-Lab-at-VT). + +Select 'New" (If this is not visible, ask one of the admins for privalges to create new repos) + +Assign it a name +Make it Public +Give it a blank readme +License MIT +Create Repo + + +### Step 2: Give them access to the repo + +Share access to it with your mentee + + +### Step 3: Adding the submodule of their project to the website + + +Open git and follow the following steps: + +```bash +cd ~ +mkdir AmpLab +cd AmpLab +git clone https://github.com/Amp-Lab-at-VT/web.git +cd web +``` + +In git, make a branch of the repo with the following steps + +```bash +git checkout -b name_of_branch +``` + +No go ahead and update the submodules for the project + +go to web/img and web/_posts and run the following command, putting your mentee's repo in place of the linked repo below. The etps for this process are as follows (assuming your working directory is web): + +``` bash +cd img +git submodule add https://github.com/Amp-Lab-at-VT/SampleProject.git +cd .. +cd _posts +git submodule add https://github.com/Amp-Lab-at-VT/SampleProject.git +cd .. +``` + +### Step 4: Submit a PR to Master + +Commit the branch to master, from the originial working directory (web) + +```bash +git add . +git commit -m "Submmitting a PR to add a student project: Student Project Name" +git push +``` + +You will be promptd with a line to run to push your branch to master. It should look something like this: + +```bash +git push --set-upstream origin Sample_Project +``` + +Wonderful! Now go in and make a pull request. Go here: Amp Lab Website Github Origin + + +Make sure you are merging from your branch to main before creating the pull request! + +Click on the "Pull Request" tab, and ask to merge **your branch** with **master**. This is shown below: + + +Leave a comment for the mentors, and you're good to go! + + +When you are done with these steps, remember that you are on a branch that has been submitted to master through a PR. Once the PR is accepted, it is wise to just start fresh. Follow these steps to make sure you are always working on the latest code. + +Another mentor will see your PR, and approve it. These is done as a sanity check for the student team + +What follows are clean up steps to get you back on the latest version of master + +**Note that if 'git checkout main' doesn't work, you may need to run 'git checkout master'** +```bash +git checkout main +git branch +``` + +**git branch** will show you a list of your local branches. Delete the one that is not master + +```bash +git branch -d name_of_branch +``` + +Finally, run a git pull to update master + +```bash +git reset --hard origin/master +git pull +``` + +It should say "already up to date". + +## Step 5: Maintaining and Keeping the Submodule updated + +Submodules are always tied to a particular commmit within the history of the project. That means that you will have to update it from time to time to keep the website current. Use the following command from time to time in web/img and web/_posts to keep the submodules current. This is not needed immedaitely after submitting the PR, as it has already been set to a commit. Just run it every week or so and submit a PR for the update! + +``` bash +git pull +git submodule update --remote +git add . +git commit -m "Update Submodules" +git push ``` \ No newline at end of file diff --git a/markdowns/migration.md b/docs/migration.md old mode 100755 new mode 100644 similarity index 98% rename from markdowns/migration.md rename to docs/migration.md index e4f9104..e14a3e8 --- a/markdowns/migration.md +++ b/docs/migration.md @@ -1,9 +1,9 @@ -## Step 1: - -Our website works by pulling a very specific markdown file (that's the .md file extension) from your repo. First and foremost, you will need to add this to your project. See step 3 from the standard steps for guidance, then return here. - -Tutorial - -## Step 2: - +## Step 1: + +Our website works by pulling a very specific markdown file (that's the .md file extension) from your repo. First and foremost, you will need to add this to your project. See step 3 from the standard steps for guidance, then return here. + +Tutorial + +## Step 2: + Provide your mentor with the link to your repo, and you're all set! They can now follow step 3 of the mentor steps to get you synced into the site \ No newline at end of file diff --git a/markdowns/new_members.md b/docs/new_members.md similarity index 100% rename from markdowns/new_members.md rename to docs/new_members.md diff --git a/markdowns/resources.md b/docs/resources.md similarity index 87% rename from markdowns/resources.md rename to docs/resources.md index d7c077e..b0c181a 100644 --- a/markdowns/resources.md +++ b/docs/resources.md @@ -17,4 +17,7 @@ [Advanced Solder Training Checksheet](/soldering/advanced) +## For MDE Students: + +[MDE Documents](/mde/docs) diff --git a/markdowns/returning_members.md b/docs/returning_members.md similarity index 100% rename from markdowns/returning_members.md rename to docs/returning_members.md diff --git a/markdowns/rules.md b/docs/rules.md old mode 100755 new mode 100644 similarity index 98% rename from markdowns/rules.md rename to docs/rules.md index e332f88..9121129 --- a/markdowns/rules.md +++ b/docs/rules.md @@ -1,15 +1,15 @@ -```Below are the common rules and expectations of the lab. We enjoy giving students autonomy, but to foster a better lab environment there rules are in place for all students``` - -# Rules: - -- No food or drink in the lab -- No propping the door open -- Desks are shared: keep them clean in between work sessions -- Guests are allowed in the lab, under supervision of an Amp Lab student -- Amp Lab and MDE sides are **seperate**. Please keep all parts, projects, tools seperate and isolated to their respective sides -- Completion of basic or higher soldering training is required to make use of soldering equipment, unsupervised -- All CAM tools (3D printer, CNC, Laser Cutter) can be used and operated by mentors **only**. If you need something made, this will go in as a service request. Note the "get something printed" button on the "Getting Started" page - -``` -If you enjoy working as an AMP lab member, consider giving back to the lab by working as a soldering instructor, helping clean the lab, or reaching out to the leadership team to see what they need! You can reach us on Discord, which you will find a link to on the "Getting Started" page +```Below are the common rules and expectations of the lab. We enjoy giving students autonomy, but to foster a better lab environment there rules are in place for all students``` + +# Rules: + +- No food or drink in the lab +- No propping the door open +- Desks are shared: keep them clean in between work sessions +- Guests are allowed in the lab, under supervision of an Amp Lab student +- Amp Lab and MDE sides are **seperate**. Please keep all parts, projects, tools seperate and isolated to their respective sides +- Completion of basic or higher soldering training is required to make use of soldering equipment, unsupervised +- All CAM tools (3D printer, CNC, Laser Cutter) can be used and operated by mentors **only**. If you need something made, this will go in as a service request. Note the "get something printed" button on the "Getting Started" page + +``` +If you enjoy working as an AMP lab member, consider giving back to the lab by working as a soldering instructor, helping clean the lab, or reaching out to the leadership team to see what they need! You can reach us on Discord, which you will find a link to on the "Getting Started" page ``` \ No newline at end of file diff --git a/markdowns/soldering.md b/docs/soldering.md old mode 100755 new mode 100644 similarity index 98% rename from markdowns/soldering.md rename to docs/soldering.md index 66c15ca..2c9674a --- a/markdowns/soldering.md +++ b/docs/soldering.md @@ -1,25 +1,25 @@ -## Soldering Training -The AMP Lab provides three levels of soldering training for students: -Basic Soldering Training -Intermediate Soldering Training -Advanced Soldering Training - -Completion of basic or higher soldering training allows the use of soldering equipment, unsupervised, in the AMP Lab. Anyone caught using soldering equipment without the basic or higher training will be denied access to the AMP Lab for at least one semester. - -Note: If you have completed general training in the past then you are basic certified and can directly move on to the intermediate training. If you have completed basic training before Fall 2023 you are intermediate certified and can move on to advance soldering training. - -### Soldering Training Signup -Use the following form to sign up for a basic and intermediate soldering training session (Please note that basic training must be completed before starting intermediate soldering training): - - - - Soldering Training Sign Up Form - - -Email the following address to schedule advance soldering training (Please note that intermediate training must be completed before starting advanced soldering training.) - -``` -amp-lab-leadership-team-g@vt.edu -``` -Note: +## Soldering Training +The AMP Lab provides three levels of soldering training for students: +Basic Soldering Training +Intermediate Soldering Training +Advanced Soldering Training + +Completion of basic or higher soldering training allows the use of soldering equipment, unsupervised, in the AMP Lab. Anyone caught using soldering equipment without the basic or higher training will be denied access to the AMP Lab for at least one semester. + +Note: If you have completed general training in the past then you are basic certified and can directly move on to the intermediate training. If you have completed basic training before Fall 2023 you are intermediate certified and can move on to advance soldering training. + +### Soldering Training Signup +Use the following form to sign up for a basic and intermediate soldering training session (Please note that basic training must be completed before starting intermediate soldering training): + + + + Soldering Training Sign Up Form + + +Email the following address to schedule advance soldering training (Please note that intermediate training must be completed before starting advanced soldering training.) + +``` +amp-lab-leadership-team-g@vt.edu +``` +Note: Instructors are student volunteers. If you haven't received a reply, please send a follow-up email. \ No newline at end of file diff --git a/markdowns/tutorial.md b/docs/tutorial.md old mode 100755 new mode 100644 similarity index 96% rename from markdowns/tutorial.md rename to docs/tutorial.md index 2a3bc2f..71c6ed1 --- a/markdowns/tutorial.md +++ b/docs/tutorial.md @@ -1,245 +1,245 @@ -PSA: There is a "Frequenty Asked Questions" section at the bottom of this page if any of the concepts are unfamiliar - -## Overview - -Here at the Amp Lab, you are expected to update the website with the latest info for your project. To update the website, you will be using git. This tutorial uses the command line, but if you are comfortable you may use the Github GUI. For now, click one of the buttons below to install git. - - -Install Git for Windows - -Install Git for Linux/Apple - -It is also recommended that you install Visual Code Studio, a common IDE used in industry: - -Download Visual Code - -


- -## Step 1: Shoot us an Email -Before going through these steps, make sure to shoot us an email! That way we can get you started on your projects. Here is out email: -``` bash -amp-lab-leadership-team-g@vt.edu -``` -We will add you to our Github organization, which can be found below: - -Amp Lab at VT - -Once you are added, you will have access to your own project repo: where you can store all your files. This is directly linked to the website, so this removes the hastle of having to keep up with other docs! All your files, all your documentation, all in one place! - -
- -## Step 2: Maintaining Your Repo: - -Now that you have the link to your repo, let's go through a few things. First, let's clone that repo. - -``` bash -cd ~ -mkdir AmpLab -cd AmpLab -git clone [your_repo_link_here] -cd your_repo_name -``` - -If you prefer to manage your files from a GUI, the commands above actually made a folder in your home directory! Don't believe me? Follow the steps below to check: - -For Linux: Go to your home folder, and look for you AmpLab folder. Open it, and you will find your project! - -For Windows: Go to your C: drive, then go to Users, and then select your user's name. You will see the AmpLab folder there, with your project inside! - -Feel free to put whatever files you need for your project in the assigned project folder (this is the one inside the AmpLab folder). However, there is a key file you will need to add: your post file. - -# Step 3: Updating your Post File - -Your post file is written in markdown script, of which a tutorial is avalible here. - -For now, though, make a file in your project folder with the following naming convention. This can be done in Visual Code very easily, and those instructions **will be avalible soon** - -``` -year-month-day-title.md -``` -Note: there should be no spaces in this file. Here is an example of a good file name: - -``` -2022-9-1-Testing-Submodule-Workflow.md -``` - -Next, copy this text into the file: - -```md ---- -layout: project_template -title: Submodule Test -description: Submodule Test -date: 2020-8-30 09:00:00 -hero_image: /web/img/SampleProject/open_house.png -image: /web/img/SampleProject/open_house.png -hero_height: is-small -hero_darken: true -tags: project -series: amp_lab_project -author: Forsyth Creations -show_sidebar: false ---- - -## Members - -## Repo Link -https://magicmirror.builders/ - -## Photo - -## Mentor - -## Current Status - -## Project Overview - -## Educational Value Added - -## Tasks - -## Design Decisions - -## Design Misc - -## Steps for Documenting Your Design Process - -## BOM + Component Cost - -## Timeline - -## Useful Links - -## Log -``` - -Next, update the file to reflect your project. But do not touch the following fields - -``` -layout -series -show_sidebar -``` - -Here is an example: - -```md ---- -layout: project_template -title: My Awesome New Project -description: The Amp Lab is great -date: 2022-6-2 09:00:00 -hero_image: /web/img/SampleProject/open_house.png -image: /web/img/SampleProject/open_house.png -hero_height: is-small -hero_darken: true -tags: project -series: amp_lab_project -author: Forsyth Creations -show_sidebar: false ---- - -## Members -Henry Forsyth, Computer Engineering Student (2023) -email@vt.edu - -## Repo Link -https://magicmirror.builders/ - -## Photo - -## Mentor -Josh Sutton, Electrical Engineering 2021 - -## Current Status -Complete - -## Project Overview - -Put whatever text you need here - -## Educational Value Added - -Put whatever text you need here - -## Tasks - -Put whatever text you need here - -## Design Decisions - -Put whatever text you need here - -## Design Misc - -Put whatever text you need here - -## Steps for Documenting Your Design Process - -Put whatever text you need here - -## BOM + Component Cost - -Put whatever text you need here - -## Timeline - -Put whatever text you need here - -## Useful Links - -Put whatever text you need here - -## Log - -Put whatever text you need here - -``` - -**The button needs to be updated** -**Make which URL you need more clear** -**Change sample image for post** - -In the repo link, provide the link to your repo as well as the name. Here is what is given in the template: - -```html -https://magicmirror.builders/ -``` - -You can update it to look like the following, where you are only changing the href and the flavor text - -```html -Sample Project -``` - -**Make the naming convention here more clear** - -This code will produce the following on your website. -Just a simple button that will direct people to your work: - - -Sample Project - - -# Step 4: Posting Your Files - -***TLDR*** all you really need are these three commands for pushing your local data to origin (GitHub). Open a terminal at the location of your project folder, and run these commands: - -``` bash -git add . -git commit -m "Put a custom message here" -git push -``` - -That's it, your done! Notify your mentor that you have updated your webpage, and they will take care of making sure the website gets updated! - -
- -## FAQ - -- What is bash? - - "Bash" is a program interface. When you run a termincal, "bash" is the program connecting and interpretting your commands to make them "machine readible". -- Why are we not using Google Sites? - - Google Sites is a great platform. However, the best sites are still made with a little elbow grease. Besides that, this creates a great opportunity for you to use git, and learn it well. This is greatly looked for by recruiters **cough** put it on your resume that you know git **cough** -- What on earth is a 'CLI'? - - A CLI is a "Command Line Interface". It's the quick way of saying terminal. They mean the same thing +PSA: There is a "Frequenty Asked Questions" section at the bottom of this page if any of the concepts are unfamiliar + +## Overview + +Here at the Amp Lab, you are expected to update the website with the latest info for your project. To update the website, you will be using git. This tutorial uses the command line, but if you are comfortable you may use the Github GUI. For now, click one of the buttons below to install git. + + +Install Git for Windows + +Install Git for Linux/Apple + +It is also recommended that you install Visual Code Studio, a common IDE used in industry: + +Download Visual Code + +
+ +## Step 1: Shoot us an Email +Before going through these steps, make sure to shoot us an email! That way we can get you started on your projects. Here is out email: +``` bash +amp-lab-leadership-team-g@vt.edu +``` +We will add you to our Github organization, which can be found below: + +Amp Lab at VT + +Once you are added, you will have access to your own project repo: where you can store all your files. This is directly linked to the website, so this removes the hastle of having to keep up with other docs! All your files, all your documentation, all in one place! + +
+ +## Step 2: Maintaining Your Repo: + +Now that you have the link to your repo, let's go through a few things. First, let's clone that repo. + +``` bash +cd ~ +mkdir AmpLab +cd AmpLab +git clone [your_repo_link_here] +cd your_repo_name +``` + +If you prefer to manage your files from a GUI, the commands above actually made a folder in your home directory! Don't believe me? Follow the steps below to check: + +For Linux: Go to your home folder, and look for you AmpLab folder. Open it, and you will find your project! + +For Windows: Go to your C: drive, then go to Users, and then select your user's name. You will see the AmpLab folder there, with your project inside! + +Feel free to put whatever files you need for your project in the assigned project folder (this is the one inside the AmpLab folder). However, there is a key file you will need to add: your post file. + +# Step 3: Updating your Post File + +Your post file is written in markdown script, of which a tutorial is avalible here. + +For now, though, make a file in your project folder with the following naming convention. This can be done in Visual Code very easily, and those instructions **will be avalible soon** + +``` +year-month-day-title.md +``` +Note: there should be no spaces in this file. Here is an example of a good file name: + +``` +2022-9-1-Testing-Submodule-Workflow.md +``` + +Next, copy this text into the file: + +```md +--- +layout: project_template +title: Submodule Test +description: Submodule Test +date: 2020-8-30 09:00:00 +hero_image: /web/img/SampleProject/open_house.png +image: /web/img/SampleProject/open_house.png +hero_height: is-small +hero_darken: true +tags: project +series: amp_lab_project +author: Forsyth Creations +show_sidebar: false +--- + +## Members + +## Repo Link +https://magicmirror.builders/ + +## Photo + +## Mentor + +## Current Status + +## Project Overview + +## Educational Value Added + +## Tasks + +## Design Decisions + +## Design Misc + +## Steps for Documenting Your Design Process + +## BOM + Component Cost + +## Timeline + +## Useful Links + +## Log +``` + +Next, update the file to reflect your project. But do not touch the following fields + +``` +layout +series +show_sidebar +``` + +Here is an example: + +```md +--- +layout: project_template +title: My Awesome New Project +description: The Amp Lab is great +date: 2022-6-2 09:00:00 +hero_image: /web/img/SampleProject/open_house.png +image: /web/img/SampleProject/open_house.png +hero_height: is-small +hero_darken: true +tags: project +series: amp_lab_project +author: Forsyth Creations +show_sidebar: false +--- + +## Members +Henry Forsyth, Computer Engineering Student (2023) +email@vt.edu + +## Repo Link +https://magicmirror.builders/ + +## Photo + +## Mentor +Josh Sutton, Electrical Engineering 2021 + +## Current Status +Complete + +## Project Overview + +Put whatever text you need here + +## Educational Value Added + +Put whatever text you need here + +## Tasks + +Put whatever text you need here + +## Design Decisions + +Put whatever text you need here + +## Design Misc + +Put whatever text you need here + +## Steps for Documenting Your Design Process + +Put whatever text you need here + +## BOM + Component Cost + +Put whatever text you need here + +## Timeline + +Put whatever text you need here + +## Useful Links + +Put whatever text you need here + +## Log + +Put whatever text you need here + +``` + +**The button needs to be updated** +**Make which URL you need more clear** +**Change sample image for post** + +In the repo link, provide the link to your repo as well as the name. Here is what is given in the template: + +```html +https://magicmirror.builders/ +``` + +You can update it to look like the following, where you are only changing the href and the flavor text + +```html +Sample Project +``` + +**Make the naming convention here more clear** + +This code will produce the following on your website. +Just a simple button that will direct people to your work: + + +Sample Project + + +# Step 4: Posting Your Files + +***TLDR*** all you really need are these three commands for pushing your local data to origin (GitHub). Open a terminal at the location of your project folder, and run these commands: + +``` bash +git add . +git commit -m "Put a custom message here" +git push +``` + +That's it, your done! Notify your mentor that you have updated your webpage, and they will take care of making sure the website gets updated! + +
+ +## FAQ + +- What is bash? + - "Bash" is a program interface. When you run a termincal, "bash" is the program connecting and interpretting your commands to make them "machine readible". +- Why are we not using Google Sites? + - Google Sites is a great platform. However, the best sites are still made with a little elbow grease. Besides that, this creates a great opportunity for you to use git, and learn it well. This is greatly looked for by recruiters **cough** put it on your resume that you know git **cough** +- What on earth is a 'CLI'? + - A CLI is a "Command Line Interface". It's the quick way of saying terminal. They mean the same thing diff --git a/package-lock.json b/package-lock.json index 1226f8a..6c35e94 100644 --- a/package-lock.json +++ b/package-lock.json @@ -39,11 +39,11 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", "dependencies": { - "@babel/highlight": "^7.22.13", + "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" }, "engines": { @@ -126,9 +126,9 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", "engines": { "node": ">=6.9.0" } @@ -142,9 +142,9 @@ } }, "node_modules/@babel/highlight": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", - "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", + "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "dependencies": { "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", @@ -230,11 +230,11 @@ } }, "node_modules/@babel/types": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.0.tgz", - "integrity": "sha512-0oIyUfKoI3mSqMvsxBdclDwxXKXAUA8v/apZbc+iSyARYou1o8ZGDxbUYyLFoW2arqS2jDGqJuZvv1d/io1axg==", + "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.6.tgz", + "integrity": "sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==", "dependencies": { - "@babel/helper-string-parser": "^7.22.5", + "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, @@ -538,21 +538,15 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz", - "integrity": "sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==", + "version": "0.3.20", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz", + "integrity": "sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "3.1.0", - "@jridgewell/sourcemap-codec": "1.4.14" + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@jridgewell/trace-mapping/node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.14", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz", - "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==", - "dev": true - }, "node_modules/@mui/base": { "version": "5.0.0-beta.20", "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.20.tgz", @@ -1516,11 +1510,11 @@ } }, "node_modules/axios": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.4.tgz", - "integrity": "sha512-toYm+Bsyl6VC5wSkfkbbNB6ROv7KY93PEBBL6xyDczaIHasAiv4wPqQ/c4RjoQzipxRD2W5g21cOqQulZ7rHwQ==", + "version": "1.6.5", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz", + "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==", "dependencies": { - "follow-redirects": "^1.15.0", + "follow-redirects": "^1.15.4", "form-data": "^4.0.0", "proxy-from-env": "^1.1.0" } @@ -1591,9 +1585,9 @@ } }, "node_modules/browserslist": { - "version": "4.21.5", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz", - "integrity": "sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==", + "version": "4.22.2", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz", + "integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==", "dev": true, "funding": [ { @@ -1603,13 +1597,17 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], "dependencies": { - "caniuse-lite": "^1.0.30001449", - "electron-to-chromium": "^1.4.284", - "node-releases": "^2.0.8", - "update-browserslist-db": "^1.0.10" + "caniuse-lite": "^1.0.30001565", + "electron-to-chromium": "^1.4.601", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -1648,9 +1646,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001467", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001467.tgz", - "integrity": "sha512-cEdN/5e+RPikvl9AHm4uuLXxeCNq8rFsQ+lPHTfe/OtypP3WwnVVbjn+6uBV7PaFL6xUFzTh+sSCOz1rKhcO+Q==", + "version": "1.0.30001574", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001574.tgz", + "integrity": "sha512-BtYEK4r/iHt/txm81KBudCUcTy7t+s9emrIaHqjYurQ10x71zJ5VQ9x1dYPcz/b+pKSp4y/v1xSI67A+LzpNyg==", "funding": [ { "type": "opencollective", @@ -1659,6 +1657,10 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ] }, @@ -2002,9 +2004,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.365", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.365.tgz", - "integrity": "sha512-FRHZO+1tUNO4TOPXmlxetkoaIY8uwHzd1kKopK/Gx2SKn1L47wJXWD44wxP5CGRyyP98z/c8e1eBzJrgPeiBOg==", + "version": "1.4.623", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.623.tgz", + "integrity": "sha512-lKoz10iCYlP1WtRYdh5MvocQPWVRoI7ysp6qf18bmeBgR8abE6+I2CsfyNKztRDZvhdWc+krKT6wS7Neg8sw3A==", "dev": true }, "node_modules/emoji-regex": { @@ -2013,9 +2015,9 @@ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" }, "node_modules/enhanced-resolve": { - "version": "5.12.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz", - "integrity": "sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz", + "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==", "dependencies": { "graceful-fs": "^4.2.4", "tapable": "^2.2.0" @@ -2710,9 +2712,9 @@ "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "funding": [ { "type": "individual", @@ -4431,9 +4433,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz", - "integrity": "sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==", + "version": "2.0.14", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", "dev": true }, "node_modules/normalize-path": { @@ -5959,9 +5961,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, "funding": [ { diff --git a/src/pages/about.jsx b/src/pages/about.jsx index 1cf6da3..dde570d 100644 --- a/src/pages/about.jsx +++ b/src/pages/about.jsx @@ -19,6 +19,6 @@ export default function About({fileContents}) { } export async function getStaticProps() { const file = 'about.md' - const fileContents = await fs.readFile( process.cwd() + '/markdowns/' + file, 'utf8') + const fileContents = await fs.readFile( process.cwd() + '/docs/' + file, 'utf8') return {props: {fileContents}} } \ No newline at end of file diff --git a/src/pages/clean.jsx b/src/pages/clean.jsx new file mode 100644 index 0000000..e7b9c1b --- /dev/null +++ b/src/pages/clean.jsx @@ -0,0 +1,28 @@ +//https://react-icons.github.io/react-icons/icons?name=bs +import React from "react"; +import Link from 'next/link' +import { promises as fs } from 'fs' +import ReactMarkdown from "react-markdown"; +import rehypeRaw from "rehype-raw"; + +import { Typography } from "@mui/material"; + +export default function Clean({fileContents}) { + return ( +
+
+
+ {fileContents} + + For any more questions, contact the leadership team below! + Leadership Team +
+
+
+ ); +} +export async function getStaticProps() { + const file = 'cleaning_standards.md' + const fileContents = await fs.readFile( process.cwd() + '/docs/' + file, 'utf8') + return {props: {fileContents}} +} \ No newline at end of file diff --git a/src/pages/getting_started.jsx b/src/pages/getting_started.jsx index 674a056..91df4d9 100644 --- a/src/pages/getting_started.jsx +++ b/src/pages/getting_started.jsx @@ -47,10 +47,10 @@ return ( export async function getStaticProps() { const new_members_file = 'new_members.md' - const new_members = await fs.readFile( process.cwd() + '/markdowns/' + new_members_file, 'utf8') + const new_members = await fs.readFile( process.cwd() + '/docs/' + new_members_file, 'utf8') const returning_members_file = 'returning_members.md' - const returning_members = await fs.readFile( process.cwd() + '/markdowns/' + returning_members_file, 'utf8') + const returning_members = await fs.readFile( process.cwd() + '/docs/' + returning_members_file, 'utf8') return {props: {new_members, returning_members}} } diff --git a/src/pages/mde/docs.jsx b/src/pages/mde/docs.jsx new file mode 100644 index 0000000..21a19fd --- /dev/null +++ b/src/pages/mde/docs.jsx @@ -0,0 +1,41 @@ +import React from "react"; +import {Typography, Box, Container, Stack, Paper, Fade, Card, Button} from "@mui/material"; + +export default function Page() { + + const branchName = "master" + + return ( + +
+ Documents for MDE Students + Below are the documents for MDE students. If you have any questions, please contact the leadership team. + + + + + + +
+
+ ); +} + +function SingleDoc(props) +{ + + const {title, description, link, last_updated} = props; + + return ( + + + + {title} + Last Updated: {last_updated} + + {description} + + + + ) +} \ No newline at end of file diff --git a/src/pages/mentee_checksheet.jsx b/src/pages/mentee_checksheet.jsx index b1b96d6..58700f4 100644 --- a/src/pages/mentee_checksheet.jsx +++ b/src/pages/mentee_checksheet.jsx @@ -18,6 +18,6 @@ export default function Mentee_Checksheet({fileContents}) { } export async function getStaticProps() { const file = 'mentee_checksheet.md' - const fileContents = await fs.readFile( process.cwd() + '/markdowns/' + file, 'utf8') + const fileContents = await fs.readFile( process.cwd() + '/docs/' + file, 'utf8') return {props: {fileContents}} } \ No newline at end of file diff --git a/src/pages/mentor_checksheet.jsx b/src/pages/mentor_checksheet.jsx index c70b824..ff3d498 100644 --- a/src/pages/mentor_checksheet.jsx +++ b/src/pages/mentor_checksheet.jsx @@ -18,6 +18,6 @@ export default function Mentor_Checksheet({fileContents}) { } export async function getStaticProps() { const file = 'mentor_checksheet.md' - const fileContents = await fs.readFile( process.cwd() + '/markdowns/' + file, 'utf8') + const fileContents = await fs.readFile( process.cwd() + '/docs/' + file, 'utf8') return {props: {fileContents}} } \ No newline at end of file diff --git a/src/pages/mentor_steps.jsx b/src/pages/mentor_steps.jsx index c6025de..8827d0d 100644 --- a/src/pages/mentor_steps.jsx +++ b/src/pages/mentor_steps.jsx @@ -19,7 +19,7 @@ export default function MentorSteps({fileContents}) { export async function getStaticProps() { const file = 'mentor_steps.md' - const fileContents = await fs.readFile( process.cwd() + '/markdowns/' + file, 'utf8') + const fileContents = await fs.readFile( process.cwd() + '/docs/' + file, 'utf8') return {props: {fileContents}} } diff --git a/src/pages/migration.jsx b/src/pages/migration.jsx index d042283..7217c9e 100644 --- a/src/pages/migration.jsx +++ b/src/pages/migration.jsx @@ -17,7 +17,7 @@ export default function Migration({fileContents}) { } export async function getStaticProps() { const file = 'migration.md' - const fileContents = await fs.readFile( process.cwd() + '/markdowns/' + file, 'utf8') + const fileContents = await fs.readFile( process.cwd() + '/docs/' + file, 'utf8') return {props: {fileContents}} } diff --git a/src/pages/resources.jsx b/src/pages/resources.jsx index b465b70..7404dfc 100644 --- a/src/pages/resources.jsx +++ b/src/pages/resources.jsx @@ -18,7 +18,7 @@ export default function UsefulLinks({fileContents}) { export async function getStaticProps() { const file = 'resources.md' - const fileContents = await fs.readFile( process.cwd() + '/markdowns/' + file, 'utf8') + const fileContents = await fs.readFile( process.cwd() + '/docs/' + file, 'utf8') return {props: {fileContents}} } diff --git a/src/pages/rules.jsx b/src/pages/rules.jsx index e25c287..bd57010 100644 --- a/src/pages/rules.jsx +++ b/src/pages/rules.jsx @@ -15,7 +15,7 @@ export default function Rules({fileContents}) { export async function getStaticProps() { const file = 'rules.md' - const fileContents = await fs.readFile( process.cwd() + '/markdowns/' + file, 'utf8') + const fileContents = await fs.readFile( process.cwd() + '/docs/' + file, 'utf8') return {props: {fileContents}} } diff --git a/src/pages/soldering.jsx b/src/pages/soldering.jsx index 5860ac0..3f378d9 100644 --- a/src/pages/soldering.jsx +++ b/src/pages/soldering.jsx @@ -17,7 +17,7 @@ export default function Soldering({fileContents}) { export async function getStaticProps() { const file = 'soldering.md' - const fileContents = await fs.readFile( process.cwd() + '/markdowns/' + file, 'utf8') + const fileContents = await fs.readFile( process.cwd() + '/docs/' + file, 'utf8') return {props: {fileContents}} } diff --git a/src/pages/soldering/advanced.jsx b/src/pages/soldering/advanced.jsx index 4bd7c8f..74b5821 100644 --- a/src/pages/soldering/advanced.jsx +++ b/src/pages/soldering/advanced.jsx @@ -17,7 +17,7 @@ export default function BeginnersGuide({fileContents}) { export async function getStaticProps() { const file = 'adv_soldering.md' - const fileContents = await fs.readFile( process.cwd() + '/markdowns/' + file, 'utf8') + const fileContents = await fs.readFile( process.cwd() + '/docs/' + file, 'utf8') return {props: {fileContents}} } diff --git a/src/pages/soldering/basic.jsx b/src/pages/soldering/basic.jsx index b9303b6..7ec17e8 100644 --- a/src/pages/soldering/basic.jsx +++ b/src/pages/soldering/basic.jsx @@ -17,7 +17,7 @@ export default function BeginnersGuide({fileContents}) { export async function getStaticProps() { const file = 'basic_soldering.md' - const fileContents = await fs.readFile( process.cwd() + '/markdowns/' + file, 'utf8') + const fileContents = await fs.readFile( process.cwd() + '/docs/' + file, 'utf8') return {props: {fileContents}} } diff --git a/src/pages/soldering/general.jsx b/src/pages/soldering/general.jsx index b9303b6..7ec17e8 100644 --- a/src/pages/soldering/general.jsx +++ b/src/pages/soldering/general.jsx @@ -17,7 +17,7 @@ export default function BeginnersGuide({fileContents}) { export async function getStaticProps() { const file = 'basic_soldering.md' - const fileContents = await fs.readFile( process.cwd() + '/markdowns/' + file, 'utf8') + const fileContents = await fs.readFile( process.cwd() + '/docs/' + file, 'utf8') return {props: {fileContents}} } diff --git a/src/pages/tutorial.jsx b/src/pages/tutorial.jsx index 3fc181b..92b8bf2 100644 --- a/src/pages/tutorial.jsx +++ b/src/pages/tutorial.jsx @@ -18,7 +18,7 @@ export default function Tutorial({fileContents}) { export async function getStaticProps() { const file = 'tutorial.md' - const fileContents = await fs.readFile( process.cwd() + '/markdowns/' + file, 'utf8') + const fileContents = await fs.readFile( process.cwd() + '/docs/' + file, 'utf8') return {props: {fileContents}} }