Merge branch 'main' into kelin-lab00-getting-started

Author: brucestull

.gitignore

@@ -1,3 +1,6 @@
+# Ignore any user's VSCode workspace file
+*code-workspace
+
 # Created by https://www.toptal.com/developers/gitignore/api/python,windows,macos
 # Edit at https://www.toptal.com/developers/gitignore?templates=python,windows,macos
 

0 General/00 Getting Started.md

@@ -8,10 +8,15 @@
 
 * NOTE: When some text below is placed between `<` and `>`, that means the user should provide their own text in the command and the user should not include the `<` and `>`.
 
+* To follow the guide, keep the two points in mind:
+    * At each "**Execute the following commmand**" statement below, Type the command into your CLI and press enter.
+        * Replace any part of the command within the `<` and `>` with your specific text.
+    * The statement folling the "Sample command and output" statement is just an example of what the CLI might display on the line you execute the command and the following lines which display the reponse output of your command.
+
 
 1. Open CLI.
 
-1. Make sure we are in correct folder (directory). We should be inside <class_name> folder (directory). `pwd` shows the current 'working directory':  
+1. Make sure we are in correct folder (directory). We should be inside <class_name> folder (directory). `pwd` shows the current 'working directory'. **Execute the following commmand**:  
     ```
     pwd
     ```
@@ -26,7 +31,7 @@
         PS C:\Users\Bruce\Programming\class_name>
         ```
 
-1. Verify we are in a directory that is a git repository:  
+1. Verify we are in a directory that is a git repository. **Execute the following commmand**:  
     ```
     git status
     ```
@@ -46,7 +51,7 @@
         * lab-name: `getting-started`
         * My name is 'Bruce' so my branch name would be `bruce-lab00-getting-started`.
     * The command we will use (where `<branch-name>` is replaced by your branch name decided above):  
-        * This command creates a new branch named `<branch-name>` from the current state of the `main` branch.
+        * This command creates a new branch named `<branch-name>` from the current state of the `main` branch. **Execute the following commmand**:
             ```
             git checkout -b <branch-name>
             ```
@@ -57,7 +62,7 @@
                 PS C:\Users\Bruce\Programming\class_name>
                 ```
 
-1. We can verify current git branch and list local branches using `git branch`:  
+1. We can verify current git branch and list local branches using `git branch`. **Execute the following commmand**:  
     ```
     git branch
     ```
@@ -70,7 +75,7 @@
         PS C:\Users\Bruce\Programming\class_name>
         ```
 
-1. Verify contents of current directory:  
+1. Verify contents of current directory. **Execute the following commmand**:  
     ```
     ls
     ```
@@ -89,7 +94,7 @@
 
         PS C:\Users\Bruce\Programming\class_name>
         ```
-1. Change directory (folder) into the `code` directory:  
+1. Change directory (folder) into the `code` directory. **Execute the following commmand**:  
     ```
     cd code
     ```
@@ -99,7 +104,7 @@
         PS C:\Users\Bruce\Programming\class_name\code>
         ```
 
-1. Verify we are in `code` directory:  
+1. Verify we are in `code` directory. **Execute the following commmand**:  
     ```
     pwd
     ```
@@ -114,7 +119,7 @@
         PS C:\Users\Bruce\Programming\class_name\code>
         ```
 
-1. Create your directory inside the `code` directory. Use the lowercase version or your name:  
+1. Create your directory inside the `code` directory. Use the lowercase version or your name. **Execute the following commmand**:  
     ```
     mkdir <studentdirectoryname>
     ```
@@ -132,7 +137,7 @@
         PS C:\Users\Bruce\Programming\class_name\code>
         ```
 
-1. Change directory into your personal directory:  
+1. Change directory into your personal directory. **Execute the following commmand**:  
     ```
     cd <studentdirectoryname>
     ```
@@ -147,7 +152,7 @@
     * This markdown file named `README.md` will hold your name, your directory name, and your GitHub username.
     * You can also add any other information or links to the file later if you choose.
     * The '#' below will make that line render as a heading in the markdown file.
-    * We will use something like this, where `Firstname Lastname` is replaced by your first and last name:  
+    * We will use something like this, where `Firstname Lastname` is replaced by your first and last name. **Execute the following commmand**:  
         ```
         echo "# Firstname Lastname" > README.md
         ```
@@ -171,7 +176,7 @@
         brucestull
         ```
 
-1. Use `git status` to get the status of our branch:  
+1. Use `git status` to get the status of our branch. **Execute the following commmand**:  
     ```
     git status
     ```
@@ -186,8 +191,20 @@
         nothing added to commit but untracked files present (use "git add" to track)
         PS C:\Users\Bruce\Programming\class_name\code\bruce>
         ```
+    * Sample command and output:  
+        ```
+        PS C:\Users\Bruce\Programming\class_HB2\code\bruce> git status
+        On branch bruce-lab00-getting-started
+        Changes not staged for commit:
+            (use "git add <file>..." to update what will be committed)
+            (use "git restore <file>..." to discard changes in working directory)
+                modified:   README.md
+
+        no changes added to commit (use "git add" and/or "git commit -a")
+        PS C:\Users\Bruce\Programming\class_HB2\code\bruce>
+        ```
 
-1. Let's now add the files and directories we created to be tracked by git:  
+1. Let's now add the files and directories we created to be tracked by git. **Execute the following commmand**:  
     ```
     git add -A
     ```
@@ -206,7 +223,7 @@
             git add <directorypath>
             ```
 
-1. Let's use `git status` again to verify we are tracking the proper files:  
+1. Let's use `git status` again to verify we are tracking the proper files. **Execute the following commmand**:  
     ```
     git status
     ```
@@ -224,7 +241,7 @@
 1. We can now `commit` our changes to the branch `<studentname-labnumber-lab-name>` git history.
     * The `<commit message>` below is used to describe the changes this commit includes.
     * The `<commit message>` may be something like "Added directory for storing labs and included personal README.md"
-    * We will use the command `git commit -m "<commit message>"`:  
+    * We will use the command `git commit -m "<commit message>"`. **Execute the following commmand**:  
         ```
         git commit -m "<commit message>"
         ```
@@ -237,7 +254,7 @@
             PS C:\Users\Bruce\Programming\class_name\code\bruce>
             ```
 
-1. Finally we can push our code to remote repository hosted on Github. This will allow the instructor and TAs to see the code changes and grade the labs:  
+1. Finally we can push our code to remote repository hosted on Github. This will allow the instructor and TAs to see the code changes and grade the labs. **Execute the following commmand**:  
     ```
     git push origin <branch-name>
     ```
@@ -253,9 +270,9 @@
         remote: Resolving deltas: 100% (1/1), completed with 1 local object.
         remote:
         remote: Create a pull request for 'bruce-lab00-getting-started' on GitHub by visiting:
-        remote:      https://github.com/PdxCodeGuild/class_062722/pull/new/bruce-lab00-getting-started
+        remote:      https://github.com/PdxCodeGuild/class_HB2/pull/new/bruce-lab00-getting-started
         remote:
-        To https://github.com/PdxCodeGuild/class_062722.git
+        To https://github.com/PdxCodeGuild/class_HB2.git
          * [new branch]      bruce-lab00-getting-started -> bruce-lab00-getting-started
         PS C:\Users\Bruce\Programming\class_name\code\bruce>
         ```

0 General/10 GitHub Pull Request.md

@@ -33,4 +33,4 @@
 1. TAs will review pull request and evaluate the lab.
 
 * Example pull request for `brucestull`:
-    * [#3](https://github.com/PdxCodeGuild/class_062722/pull/3)
+    * [#3](https://github.com/PdxCodeGuild/class_HB2/pull/3)

0 General/11 Git Lab Workflow.md

@@ -5,48 +5,76 @@
 * Replace the `<new-branch-name>` items below with your appropriate formed `<studentdirectoryname-labnumber-lab-name>` branch name.
 * An example `<new-branch-name>` would be `bruce-lab01-python-exercise`
 
+1. It's good practice to get the current git status to see what branch is current, what files have been changed, and other details:  
+    `git status`
+
+1. Reminder, git branch can be used to see our current branch and other available local branches:  
+    `git branch`
+
 1. Checkout the `main` branch since we want to keep it syncronized with remote:  
     `git checkout main`
+
 1. Retrieve the remote changes to `main` branch and sync them to local repository:  
     `git pull origin main`
+
 1. Create a new branch `<new-branch-name>` from current state of `main` branch:  
     `git checkout -b <new-branch-name>`
+
 1. Do some code changes.
+
 1. Add all the changes made to git tracking (or add only `<filename>` or `<directoryname>` changes):  
     `git add -A`
+
 1. Commit the changes made to the branch:  
     `git commit -m <commit message>`
+
 1. Push local changes to branch `<new-branch-name>` to the remote repository `origin`:  
     `git push origin <new-branch-name>`
+
 1. Do some more code changes.
+
 1. Add all the changes made to git tracking:  
     `git add -A`
+
 1. Commit the changes made to the branch:  
     `git commit -m <commit message>`
+
 1. Push local changes to branch `<new-branch-name>` to the remote repository `origin`:  
     `git push origin <new-branch-name>`
-1. When lab is completed, create pull request on GitHub.
+
+1. When lab is completed, [create pull request on GitHub](10%20GitHub%20Pull%20Request.md).
+
+1. After lab has been graded and pull request approved, perform the following two commands to remove the reference to the remote branch, and then delete your local branch:  
+    1. `git remote update origin --prune`
+    1. `git branch -d <graded-and-merged-branch-name>`
+
 1. Repeat process for new labs.
 
 ## Use the following to switch between multiple in-process lab branches.
 
 1. Git `add` and `commit` changes to current branch:  
     1. `git add -A`
     1. `git commit -m <commit message>`
-1. Checkout the branch we want to work on:  
+
+1. Checkout the different branch we want to work on:  
     * `git checkout <a-branch-name>`
+
 1. Do the code changes for this branch.
+
 1. Git `add` and `commit` changes to the new current branch `<a-branch-name>`:  
     1. `git add -A`
     1. `git commit -m <commit message>`
+
 1. Checkout some other branch we want to work on:  
     * `git checkout <some-other-branch-name>`
+
 1. Repeat process as needed.
 
 ## Use the following to delete branches for labs which have already been graded.
 * NOTE: We delete the branches after they have been merged into `main` since the work has been completed and all the changes have been recorded in the `commit`s. We no longer need the branches.
 
 1. Sync our local record of remote branches. This will remove local references to branches which have been deleted on remote:  
     * `git remote update origin --prune`
+
 1. Delete the local copy of the branch:  
     * `git branch -d <lab-branch-which-has-been-graded>`

1 Python/labs/00 Average Numbers renamed to 1 Python/labs/01 Average Numbers

@@ -1,4 +1,4 @@
-Lab 2: Average Numbers
+Lab 01: Average Numbers
 
 We're going to average a list of numbers. Start with the following list, iterate through it, keeping a 'running sum', then divide that sum by the number of elements in that list. Remember len will give you the length of a list.
 

1 Python/labs/02 Unit Converter

@@ -0,0 +1,51 @@
+Lab 02: Unit Converter
+This lab will involve writing a program that allows the user to convert a number between units.
+
+Version 1
+Ask the user for the number of feet, and print out the equivalent distance in meters. Hint: 1 ft is 0.3048 m. So we can get the output in meters by multiplying the input distance by 0.3048. Below is some sample input/output.
+
+> what is the distance in feet? 12
+> 12 ft is 3.6576 m
+Version 2
+Allow the user to also enter the units. Then depending on the units, convert the distance into meters. The units we'll allow are feet, miles, meters, and kilometers.
+
+1 ft is 0.3048 m
+1 mi is 1609.34 m
+1 m is 1 m
+1 km is 1000 m
+Below is some sample input/output:
+
+> what is the distance? 100
+> what are the units? mi
+> 100 mi is 160934 m
+Version 3
+Add support for yards, and inches.
+
+1 yard is 0.9144 m
+1 inch is 0.0254 m
+Version 4 - optional
+Now we'll ask the user for the distance, the starting units, and the units to convert to.
+
+You can think of the values for the conversions as elements in a matrix, where the rows will be the units you're converting from, and the columns will be the units you're converting to. Along the horizontal, the values will be 1 (1 meter is 1 meter, 1 foot is 1 foot, etc).
+
+ft	mi	m	km
+ft	1		0.3048	
+mi		1	1609.34	
+m	1/0.3048	1/1609.34	1	1/1000
+km			1000	1
+But instead of filling out that matrix, and checking for each pair of units (if from_units == 'mi' and to_units == 'km'), we can just convert any unit to meters, then convert the distance in meters to any other unit.
+
+Furthermore you can convert them from meters by dividing a distance (in meters) by those same values used above. So first convert from the input units to meters, then convert from meters to the output units.
+
+Below is some sample input/output:
+
+> what is the distance? 100
+> what are the input units? ft
+> what are the output units? mi
+100 ft is 0.0189394 mi
+Turning in your lab
+Make sure you are still on your lab branch with git status. This will also show you a list of files that have been modified.
+Add any files you want git to keep track of using git add filename. Replace filename with the name of your file. You can also use git add . to add everything within the current folder.
+Commit your work using git commit -m "Your commit message". Make sure your commit message is descriptive and describes what has been changed during this commit.
+Finally we can run the command git push to send our files up to Github. This may throw an error, but worry not, there will be a suggested command to run, simply copy and paste that command and you should be good to go.
+Don't forget to visit Github and create a pull request to submit your work for review.

README.md

@@ -29,7 +29,7 @@ Presentation Day: November 4th, 2022
 
 | Lab | Name                   | Date Assigned | Due By Start Of Class | Hard Due Date |
 | --- | ---------------------- | ------------- | --------------------- | ------------- |
-| 01  | Lab                    | 00 Jun        | 00 Jun                | 00 Jun        |
+| 01  | Lab Average Numbers    | 28 Jun        | 05 Jul                | 12 Jul        |
 | 02  | Lab                    | 00 Jun        | 00 Jun                | 00 Jun        |
 | 03  | Lab                    | 00 Jun        | 00 Jun                | 00 Jun        |
 | 04  | Lab                    | 00 Jun        | 00 Jun                | 00 Jun        |

code/Andy/README.md

@@ -0,0 +1,6 @@
+# Andy Roblero
+Directory Name:
+Andy
+
+Github Username:
+andy2124