diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..25c114d
Binary files /dev/null and b/.DS_Store differ
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..e7e9d11
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml
diff --git a/.idea/IntroToProgramming.iml b/.idea/IntroToProgramming.iml
new file mode 100644
index 0000000..8b8c395
--- /dev/null
+++ b/.idea/IntroToProgramming.iml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..8656114
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..5834ea1
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/documentation/distance.md b/documentation/distance.md
index 7dc3f4f..254540f 100644
--- a/documentation/distance.md
+++ b/documentation/distance.md
@@ -10,33 +10,29 @@ After getting Sheri's approval to do Programming 101 remotely, you will receive
- dates
- times
- - Twitch link
+ - [Twitch link](https://www.twitch.tv/pdxcodeguild)
## Video
-We currently use Twitch to live stream lectures. Live streams will start and end with class times; usually 6:30pm - 9:30pm.
+We currently use [Twitch](https://www.twitch.tv/pdxcodeguild) to live stream lectures. Live streams will start and end with class times; usually 6:30pm - 9:30pm.
## Audio
Twitch streams include audio but you might have an easier time listening with a headset.
-## Some helpful tips
-- subscribe to get alerted when streams start
-
-
-
## Support
-### Questions
+- subscribe to get alerted when streams start
+- If you find that you have a question during class, please use the chatroom feature to the right of the video.
-If you find that you have a question during class, please use Slack to message Al Burns. [Please see this doc on how to use Slack](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/slack.md)
+
## Homework
-Homework should be turned in at the end of class via Slack ([Please see this doc on how to use Slack](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/slack.md)). If you need more time, the next day will be fine. Distance learners will send their homework via Slack direct message to Al:
+Homework should be turned in at the end of class via Slack ([Please see this doc on how to use Slack](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/slack.md)). If you need more time, the next day will be fine. Distance learners will send their homework via Slack direct message to Anthony Wallace:
- Create a new direct message
-- search "Al"
-- his avatar is a cat playing the piano
+- search "Anthony Wallace"
+- his profile pic is him and his pup!
-
+
diff --git a/documentation/python_mac.md b/documentation/python_mac.md
new file mode 100644
index 0000000..cdf2fb8
--- /dev/null
+++ b/documentation/python_mac.md
@@ -0,0 +1,65 @@
+# Installing Python 3 - Mac
+##### Start by heading to the Python [dowload page](https://www.python.org/downloads/)
+
+Click the yellow download button to download the latest version of Python:
+
+You should see something like this at the bottom of your browser:
+
+Once the download completes open the downloaded file.
+
+You should see the following window:
+
+Just click continue.
+
+And continue again:
+
+
+Continue once more.
+
+
+Agree to the terms.
+
+
+Finally click install.
+
+
+And done! You can exit the installer now.
+
+
+Now let's verify everything is working properly.
+Start by opening your terminal. You can do this by pressing ```command + space``` at the same time. You will see a search box pop up.
+
+
+
+Type ```terminal``` and press ```enter```
+
+
+
+You should see the following window:
+
+This is your terminal. We will be using this to run your python programs.
+
+Let's start by typing ```python3``` and pressing enter:
+
+
+Now we can see our Python version
+
+
+You should also see ```>>>```
+This means you are in your python interpreter
+
+
+Now we can run Python commands right from our Terminal!
+Let's try ```print("Hello World")``` and press ```enter```
+
+
+Now we can see that it gave us the output "Hello World"
+
+
+To exit the Python interpreter type ```exit()``` and press ```enter```
+
+
+Now we are back to our normal Terminal
+
+
+Congratulations you have successfully installed Python!
diff --git a/documentation/python_windows.md b/documentation/python_windows.md
new file mode 100644
index 0000000..acbe451
--- /dev/null
+++ b/documentation/python_windows.md
@@ -0,0 +1,71 @@
+# Installing Python 3 - Windows
+Start by heading to the Python [dowload page](https://www.python.org/downloads/)
+
+Click the yellow download button to download the latest version of Python:
+
+
+
+You should see something like this at the bottom of your browser:
+
+
+
+Once the download completes open the downloaded file.
+
+This is the first window you should see. Our first step is to click the "Add Python to PATH" checkbox.
+
+
+
+Next we want to click on install now.
+
+
+
+Wait for the installation process to do its thing
+
+
+
+Finally we should see a window like this. You can click close now.
+
+
+
+
+
+Now let's verify everything is working properly.
+Open your powershell by opening your start menu and typing ```powershell```.
+You should see something similar to this:
+
+
+
+After clicking on PowerShell we should see a window like this one:
+
+
+
+Now lets type the command ```py``` and press enter:
+
+
+
+You should see something similar to this with your python version displayed.
+
+
+
+You should also see ```>>>``` towards the bottom. This means you are now inside your python interpreter.
+
+
+
+Now that we are inside our python interpreter we can run python commands. Let's try one.
+Type: ```print("Hello World")``` inside your PowerShell and press enter:
+
+
+
+Your PowerShell should output the message "Hello World"
+
+
+
+To exit out of your Python interpreter just type ```exit()``` and press enter:
+
+
+
+Now you are back in your normal PowerShell
+
+
+
+Congratulations you have successfully installed Python!
diff --git a/documentation/resources.md b/documentation/resources.md
index 5e011b3..7368506 100644
--- a/documentation/resources.md
+++ b/documentation/resources.md
@@ -6,7 +6,12 @@ Below are is a list of resources for additional study.
- [Mac](https://www.codecademy.com/learn/learn-the-command-line)
- [Mac & Windows](https://learnrubythehardway.org/book/appendixa.html)
+## Python in the command line
+- [Python Introduction by Django Girls](https://tutorial.djangogirls.org/en/python_introduction)
+
## Python
+[Intro to Python by Scrimba](https://scrimba.com/g/gpython) (free)
+
[W3School](https://www.w3schools.com/python/python_intro.asp)
- Breaks down basic Python concepts really well
@@ -16,7 +21,6 @@ Below are is a list of resources for additional study.
- the first few chapters are free
- This is what I used when I first started learning Python
-
Python for Everybody by Freecodecamp ([video](https://www.youtube.com/watch?v=8DvywoWv6fI))
- Freecodecamp is a great resource for web development
@@ -28,7 +32,11 @@ Python for Everybody by Freecodecamp ([video](https://www.youtube.com/watch?v=8D
[LinkedIn Learning - FKA Lynda.com](https://www.lynda.com/portal/patron?org=multcolib.org)
- learning videos on programming and other professional skills
+- [Free with a Multnomah Library card](https://multcolib.org/resource/lyndacom)
[Project Euler](https://projecteuler.net/)
- Project Euler is a series of challenging mathematical/computer programming problems that will require more than just mathematical insights to solve. Although mathematics will help you arrive at elegant and efficient methods, the use of a computer and programming skills will be required to solve most problems. The motivation for starting Project Euler, and its continuation, is to provide a platform for the inquiring mind to delve into unfamiliar areas and learn new concepts in a fun and recreational context.
- recommended by Google
+
+[Grasshopper by Google](https://learn.grasshopper.app/)
+- Grasshopper is the coding app for beginners. With fun, quick lessons on your phone, the app teaches adult learners to write real JavaScript.
diff --git a/documentation/slack.md b/documentation/slack.md
index 4abdd8f..659412b 100644
--- a/documentation/slack.md
+++ b/documentation/slack.md
@@ -3,7 +3,7 @@
Slack is a communication tool we will be using in Intro to Programming. By the first day of class, you will be added to a channel, or chatroom, for your cohort. The cohort will be named after the start date. For example, if your cohort starts on Aug 20, 2019, the channel name will be 190820 (YYMMDD).
## Class Notes
-In the cohort channel is where I will sending out class notes and hint files. This chatroom will keep chat history for about 6 months.
+In the cohort channel is where I will sending out class notes and hint files. The channel name is the start date of your cohort (ex: YYMMDD). This chatroom will keep chat history for about 6 months.
@@ -12,43 +12,17 @@ In the cohort channel is where I will sending out class notes and hint files. Th
Under **Direct Messages**, click on the **+** button.
-
+
On the next page, type in the recipient's name. Select the correct recipient.
-
-
-### 2. Attach file
-
-Selecting a recipient will start a direct chat with them. You will see their username at the top.
-
-To attach your homework, click on the **paperclip** button at the bottom left and select **From Your Computer**.
-
-Navigate to the file, select it, and hit **Enter** on your keyboard to send.
-
-Alternatively, you can drag the file into the direct message to upload.
-
-
+
+### 2. Paste your code into the input box.
+Before sending, highlight the code and click on "Code Block". This will make it easier for your teachers to copy the code and grade it.
+
## Support
-If you find that you have questions and need more support, you can message your teacher or TA.
-
-### 1. Search for recipient
-Under **Direct Messages**, click on the **+** button.
-
-
-
-On the next page, type in the recipient's name. Select the correct recipient.
-
-
-
-### 2. Ask your question
-
-Selecting a recipient will start a direct chat with them. You will see their username at the top.
-
-Here you can speak directly to your teacher or TA about any questions regarding the class.
-
-
+If you find that you have questions and need more support, you can message your teacher or TA on Slack. We are happy to help!
diff --git a/labs/lab00-newfolder.md b/labs/lab00-newfolder.md
index a3b2648..3cd6ed1 100644
--- a/labs/lab00-newfolder.md
+++ b/labs/lab00-newfolder.md
@@ -1,3 +1,16 @@
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
# Lab 00: Navigating the Terminal
- [Back to Syllabus](https://github.com/PdxCodeGuild/IntroToProgramming#top)
diff --git a/labs/lab01-hello.md b/labs/lab01-hello.md
index 46ef288..4efa4e5 100644
--- a/labs/lab01-hello.md
+++ b/labs/lab01-hello.md
@@ -1,4 +1,21 @@
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
# Lab 4: Grading
Let's convert a number grade to a letter grade, using `if` and `elif` statements and comparisons.
diff --git a/labs/lab05-emoticon.md b/labs/lab05-emoticon.md
index c55ed2a..6c5c97e 100644
--- a/labs/lab05-emoticon.md
+++ b/labs/lab05-emoticon.md
@@ -1,6 +1,20 @@
# Lab 5: Random Emoticon Generator
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
+
Let's generate emoticons by assembling a randomly choosing a set of eyes, a nose, and a mouth.
1. Define a list of eyes
@@ -11,6 +25,8 @@ Let's generate emoticons by assembling a randomly choosing a set of eyes, a nose
6. Randomly pick a mouth
7. Assemble and display the emoticon
+You can find examples of emoticons [here](https://en.wikipedia.org/wiki/List_of_emoticons)
+
```python
import random
@@ -22,7 +38,7 @@ print(fruit)
## Advanced Version 1
-Use a `for` loop to generate 5 emoticons.
+Use a `for` loop to generate 5 random emoticons.
## Advanced Version 2
diff --git a/labs/lab06-rock_paper_scissors.md b/labs/lab06-rock_paper_scissors.md
index cad3463..2eacc8f 100644
--- a/labs/lab06-rock_paper_scissors.md
+++ b/labs/lab06-rock_paper_scissors.md
@@ -1,3 +1,15 @@
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
# Lab 6: Rock Paper Scissors
diff --git a/labs/lab08-guess_the_number.md b/labs/lab07-guess_the_number.md
similarity index 70%
rename from labs/lab08-guess_the_number.md
rename to labs/lab07-guess_the_number.md
index 7a445c2..fae1002 100644
--- a/labs/lab08-guess_the_number.md
+++ b/labs/lab07-guess_the_number.md
@@ -1,5 +1,17 @@
+
-# Lab 8: Guess the Number
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
+# Lab 7: Guess the Number
Let's play 'Guess the Number', the computer will choose a `random int` between 1 and 10. The user will then try to guess the number, and the program will tell them whether they're right or wrong.
diff --git a/labs/lab07-password_generator.md b/labs/lab08-password_generator.md
similarity index 60%
rename from labs/lab07-password_generator.md
rename to labs/lab08-password_generator.md
index e184c76..15998dc 100644
--- a/labs/lab07-password_generator.md
+++ b/labs/lab08-password_generator.md
@@ -1,5 +1,17 @@
+
-# Lab 7: Password Generator
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
+# Lab 8: Password Generator
Let's generate a password ten characters long using a loop (`while` loop or `for` loop) and `random.choice`, this will be a string of random characters.
diff --git a/labs/lab09-make_change.md b/labs/lab09-make_change.md
index 53b3358..daf0a02 100644
--- a/labs/lab09-make_change.md
+++ b/labs/lab09-make_change.md
@@ -1,3 +1,16 @@
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
# Lab 09: Make Change
Let the user enter how many pennies they have, and convert their pennies into larger coins and leftover pennies.
diff --git a/labs/lab10-anagram_checker.md b/labs/lab10-anagram_checker.md
index 3735d80..36733ce 100644
--- a/labs/lab10-anagram_checker.md
+++ b/labs/lab10-anagram_checker.md
@@ -1,10 +1,24 @@
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
# Lab 10: Anagram Checker
+
Let's write an anagram checker.
## Anagram
-Two words are anagrams of each other if the letters of one can be rearranged to fit the other. e.g. `dormitory` and `dirty room`.
+Two words are anagrams of each other if the letters of one can be rearranged to fit the other. e.g. `dormitory` and `dirtyroom`.
Write a program that lets the user enter two strings, and tells them if they are anagrams of each other.
diff --git a/labs/lab11-wall_painting.md b/labs/lab11-wall_painting.md
index 9a9c122..0a75812 100644
--- a/labs/lab11-wall_painting.md
+++ b/labs/lab11-wall_painting.md
@@ -1,5 +1,19 @@
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
# Lab 11: Wall Painting
+
Create a new file `wall-painting.py`.
All our friends are re-painting one wall of their rooms. They want us to figure out how much it's going to cost. Assume one gallon of paint covers 400 square feet.
diff --git a/labs/lab12-unit_converter.md b/labs/lab12-unit_converter.md
index 40f445a..ba4e6b6 100644
--- a/labs/lab12-unit_converter.md
+++ b/labs/lab12-unit_converter.md
@@ -1,3 +1,15 @@
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
# Lab 12: Unit Converter
@@ -46,12 +58,12 @@ Now we'll ask the user for the distance, the starting units, and the units to co
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).
-(the table below only renders correctly with [Markdown Navigator](https://plugins.jetbrains.com/plugin/7896-markdown-navigator))
-| - |ft|mi|m|km|
-|-|-|-|-|
+
+| | ft | mi | m | km |
+|---|----|----|----|---|
|ft|1||0.3048||
-|mi||1|1609.34|
+|mi||1|1609.34||
|m|1/0.3048|1/1609.34|1|1/1000|
|km|||1000|1|
diff --git a/labs/lab13-rot13.md b/labs/lab13-rot13.md
index cacfcef..dd6dfb1 100644
--- a/labs/lab13-rot13.md
+++ b/labs/lab13-rot13.md
@@ -1,5 +1,19 @@
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
# Lab 13: Encode/ROT
+
Write a program that prompts the user for a character, and encodes it with ROT13. Notice that there are 26 letters in the English language, so encryption is the same as decryption.
Hint: Keep numbers in the 0 through 25 range using `%`.
diff --git a/labs/lab14-turtle.md b/labs/lab14-turtle.md
index f77fed8..baf3aec 100644
--- a/labs/lab14-turtle.md
+++ b/labs/lab14-turtle.md
@@ -1,3 +1,16 @@
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
# Lab 1: Turtle
## Explanation
diff --git a/readme.md b/readme.md
index c1b8c17..48e20d3 100644
--- a/readme.md
+++ b/readme.md
@@ -1,61 +1,49 @@
-# Intro to Programming
-
-**Distance Learners**: Please read [this document](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/documentation/distance.md) before starting class.
-
-## Table of Contents
-- [Unit 00: Intro Course Prep](#unit-0)
-- [Unit 01](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/units/unit_01.md)
-- [Unit 02](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/units/unit_02.md)
-- [Unit 03](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/units/unit_03.md)
-- [Unit 04](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/units/unit_04.md)
-- [Unit 05](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/units/unit_05.md)
-- [Unit 06](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/units/unit_06.md)
-
-## Quick Links
-- [Class Communication - Slack](https://app.slack.com/client/TH5A28SJ0/CH6DE8QK1)
- - for enrolled students only
- - [directions on how to use slack](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/documentation/slack.md)
-- [Command Prompt/Terminal/Powershell Cheatsheet](https://docs.google.com/spreadsheets/d/18WWrry7RI2zzJlTsUHQLCsElNjiVVuMGjowBKZ5DPH8/edit#gid=0)
-- [Stuck? Debugging Errors Guide](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/documentation/troubleshooting.md)
-- [Python Tutor](http://pythontutor.com/visualize.html#mode=edit)
- - online debugging Tool
- - [Repl](https://repl.it)
- - cloud based editor and interpreter
-- [DiffChecker](https://www.diffchecker.com/)
- - great tool to compare 2 files of code side by side
-- [Additional Resources for Learning](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/documentation/resources.md)
+
-## Unit 0
-Welcome to Intro to Programming! To have a successful start in the class, please prep for the class by doing the following:
+## *******************************************************
-### Download
-- latest version of Python
- - [instructions for Mac](https://www.py4e.com/software-mac.php)
- - [instructions for Windows](https://www.py4e.com/software-win.php)
-- [Atom](https://atom.io/)
- - Atom is where we will be writing our code. Some other alternatives are Sublime, PyCharm, and VSCode. However, we'll be using Atom in class.
+## This syllabus is **deprecated**.
-Can't or don't want to install software on your computer? Check out [Repl.it](repl.it). It's a cloud based editor and interpreter that will allow you to run Python without downloading any software.
+### Intro to Programming has become Programming 101 and Programming 102.
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
-### Practice
-The terminal will be a vital tool for running our code. Complete [Lab 0](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab00-newfolder.md) to get a quick understanding of how the terminal works.
-
-#### Want a deeper dive?
-
-Get some additional practice by working through the introduction and exercises 1-6 of the [Command Line Crash Course](https://learnrubythehardway.org/book/appendixa.html).
+# Intro to Programming
-#### Putting it together
+**Distance Learners**: Please read [this document](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/documentation/distance.md) before starting class.
-On the first day of class, you will see how Atom and the terminal work together to run your python code. If you'd like to see for yourself, please see [Lab 1](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab00-interpreter.md)
+## Syllabus Overview
+While we don't expect you to complete all the advance versions of the labs, we expect you to give it a try and ask questions if you're stuck.
-### Lastly
-Read up on our communication tool, [Slack](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/documentation/slack.md). This is how the instructors will share notes and how you will turn in your labs. You will get an invite to Slack on the first day of class.
+| Unit | Concepts | Labs | Video |
+| ---- |----------| -----| ------|
+| [Unit 00](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/units/unit_00.md) | Software Install | Lab [0](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab00-newfolder.md)
+| [Unit 01](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/units/unit_01.md) | comments, variables, print(), fstrings, Strings, concatentate, input() | Lab [1](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab01-hello.md), [2](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab02-madlib.md) | [video](https://www.youtube.com/watch?v=hV8EVnVCAs4)
+| [Unit 02](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/units/unit_02.md) | Lists, Random module, integers, operators, conditional statements (if/else) | Lab [3](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab03-magic_8_ball.md), [4](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab04-grading.md) | [video](https://www.youtube.com/watch?v=RRv3ynskWm0)
+| [Unit 03](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/units/unit_03.md) | loops: while, break, else, for each, for x in range(), continue | Lab [5](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab05-emoticon.md), [6](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab06-rock_paper_scissors.md) | [video](https://www.youtube.com/watch?v=lSykW7worZc)
+| [Unit 04](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/units/unit_04.md) | Review of Units 1-3, String Module | Lab [7](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab07-guess_the_number.md), [8](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab08-password_generator.md) | [video](https://youtu.be/XJaSQdTQ6VE)
+| [Unit 05](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/units/unit_05.md) | Dictionaries, Functions | Lab [12](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab12-unit_converter.md) | [video](https://youtu.be/U47-2E9izvE)
+| [Unit 06](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/units/unit_06.md) | built-in functions, string methods, list methods, functions (review) | Lab [10](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab10-anagram_checker.md) | [video](https://youtu.be/NvRxXklmx3s)
-### Extra
-- Why Programming?
- - [article](https://www.py4e.com/html3/01-intro)
- - [slides](https://www.py4e.com/lectures3/Pythonlearn-01-Intro.pptx)
- - [video](https://www.youtube.com/watch?v=8DvywoWv6fI) (0:00:00 - 0:56:54)
+## Quick Links
+Below is a list of helpful links.
+
+| Resource | Link | Comment |
+| ------- |----------| -----|
+W3 Schools | [W3Schools](https://www.w3schools.com/python/default.asp)|Useful resource for learning python
+Live stream | [Twich](https://www.twitch.tv/pdxcodeguild/videos)| Only when class is in session
+Class Chatroom | [Slack](https://app.slack.com/client/TH5A28SJ0/CH6DE8QK1) | for enrolled Intro students only. [directions on how to use slack](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/documentation/slack.md)
+Terminal Cheatsheet | [Google Sheets](https://docs.google.com/spreadsheets/d/18WWrry7RI2zzJlTsUHQLCsElNjiVVuMGjowBKZ5DPH8/edit#gid=0) | Command Prompt/Terminal/Powershell
+VS Code Keyboard ShortCuts | [For Windows](https://code.visualstudio.com/shortcuts/keyboard-shortcuts-windows.pdf) |
+VS Code Keyboard ShortCuts | [For macOS](https://code.visualstudio.com/shortcuts/keyboard-shortcuts-macos.pdf) |
+Python Tutor | [Python Tutor](http://pythontutor.com/visualize.html#mode=edit) | online debugging tool
+Stuck? | [Debugging Errors Guide](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/documentation/troubleshooting.md) |
+Online Code Editor | [Repl](https://repl.it) | cloud based editor and interpreter
+Compare two code snippets | [DiffChecker](https://www.diffchecker.com/) | great tool to compare 2 files of code side by side|
+Learning Resources | [Guide](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/documentation/resources.md)
+Future Intro Classes | [Eventbrite](https://www.eventbrite.com/o/pdx-code-guild-17959456298) |
[Back to top](#top)
diff --git a/resources/.DS_Store b/resources/.DS_Store
new file mode 100644
index 0000000..7635b5e
Binary files /dev/null and b/resources/.DS_Store differ
diff --git a/resources/python_mac/.DS_Store b/resources/python_mac/.DS_Store
new file mode 100644
index 0000000..6315bc5
Binary files /dev/null and b/resources/python_mac/.DS_Store differ
diff --git a/resources/python_mac/python1.png b/resources/python_mac/python1.png
new file mode 100644
index 0000000..81d8897
Binary files /dev/null and b/resources/python_mac/python1.png differ
diff --git a/resources/python_mac/python10.png b/resources/python_mac/python10.png
new file mode 100644
index 0000000..852851f
Binary files /dev/null and b/resources/python_mac/python10.png differ
diff --git a/resources/python_mac/python11.png b/resources/python_mac/python11.png
new file mode 100644
index 0000000..7758c45
Binary files /dev/null and b/resources/python_mac/python11.png differ
diff --git a/resources/python_mac/python12.png b/resources/python_mac/python12.png
new file mode 100644
index 0000000..9e06c4a
Binary files /dev/null and b/resources/python_mac/python12.png differ
diff --git a/resources/python_mac/python13-2.png b/resources/python_mac/python13-2.png
new file mode 100644
index 0000000..ad3e061
Binary files /dev/null and b/resources/python_mac/python13-2.png differ
diff --git a/resources/python_mac/python13.png b/resources/python_mac/python13.png
new file mode 100644
index 0000000..cc5e022
Binary files /dev/null and b/resources/python_mac/python13.png differ
diff --git a/resources/python_mac/python14.png b/resources/python_mac/python14.png
new file mode 100644
index 0000000..45c2e8f
Binary files /dev/null and b/resources/python_mac/python14.png differ
diff --git a/resources/python_mac/python15.png b/resources/python_mac/python15.png
new file mode 100644
index 0000000..54c68f4
Binary files /dev/null and b/resources/python_mac/python15.png differ
diff --git a/resources/python_mac/python16.png b/resources/python_mac/python16.png
new file mode 100644
index 0000000..178e527
Binary files /dev/null and b/resources/python_mac/python16.png differ
diff --git a/resources/python_mac/python17.png b/resources/python_mac/python17.png
new file mode 100644
index 0000000..412195b
Binary files /dev/null and b/resources/python_mac/python17.png differ
diff --git a/resources/python_mac/python2.png b/resources/python_mac/python2.png
new file mode 100644
index 0000000..557eb2d
Binary files /dev/null and b/resources/python_mac/python2.png differ
diff --git a/resources/python_mac/python3.png b/resources/python_mac/python3.png
new file mode 100644
index 0000000..ae1ea34
Binary files /dev/null and b/resources/python_mac/python3.png differ
diff --git a/resources/python_mac/python4.png b/resources/python_mac/python4.png
new file mode 100644
index 0000000..d84dfc8
Binary files /dev/null and b/resources/python_mac/python4.png differ
diff --git a/resources/python_mac/python5.png b/resources/python_mac/python5.png
new file mode 100644
index 0000000..0085db5
Binary files /dev/null and b/resources/python_mac/python5.png differ
diff --git a/resources/python_mac/python6.png b/resources/python_mac/python6.png
new file mode 100644
index 0000000..98e42f9
Binary files /dev/null and b/resources/python_mac/python6.png differ
diff --git a/resources/python_mac/python7.png b/resources/python_mac/python7.png
new file mode 100644
index 0000000..4ba603b
Binary files /dev/null and b/resources/python_mac/python7.png differ
diff --git a/resources/python_mac/python8.png b/resources/python_mac/python8.png
new file mode 100644
index 0000000..0b6cab6
Binary files /dev/null and b/resources/python_mac/python8.png differ
diff --git a/resources/python_mac/python9.png b/resources/python_mac/python9.png
new file mode 100644
index 0000000..f9f0898
Binary files /dev/null and b/resources/python_mac/python9.png differ
diff --git a/resources/python_win/.DS_Store b/resources/python_win/.DS_Store
new file mode 100644
index 0000000..58242a3
Binary files /dev/null and b/resources/python_win/.DS_Store differ
diff --git a/resources/python_win/python1.PNG b/resources/python_win/python1.PNG
new file mode 100755
index 0000000..c9a9a72
Binary files /dev/null and b/resources/python_win/python1.PNG differ
diff --git a/resources/python_win/python10.PNG b/resources/python_win/python10.PNG
new file mode 100755
index 0000000..4e076a8
Binary files /dev/null and b/resources/python_win/python10.PNG differ
diff --git a/resources/python_win/python11.PNG b/resources/python_win/python11.PNG
new file mode 100755
index 0000000..bfcba57
Binary files /dev/null and b/resources/python_win/python11.PNG differ
diff --git a/resources/python_win/python12.PNG b/resources/python_win/python12.PNG
new file mode 100755
index 0000000..a5d0d9e
Binary files /dev/null and b/resources/python_win/python12.PNG differ
diff --git a/resources/python_win/python13.PNG b/resources/python_win/python13.PNG
new file mode 100755
index 0000000..e15422d
Binary files /dev/null and b/resources/python_win/python13.PNG differ
diff --git a/resources/python_win/python2.PNG b/resources/python_win/python2.PNG
new file mode 100755
index 0000000..72f8483
Binary files /dev/null and b/resources/python_win/python2.PNG differ
diff --git a/resources/python_win/python3-2.PNG b/resources/python_win/python3-2.PNG
new file mode 100755
index 0000000..f6c34b9
Binary files /dev/null and b/resources/python_win/python3-2.PNG differ
diff --git a/resources/python_win/python3.PNG b/resources/python_win/python3.PNG
new file mode 100755
index 0000000..a0fae2d
Binary files /dev/null and b/resources/python_win/python3.PNG differ
diff --git a/resources/python_win/python4.PNG b/resources/python_win/python4.PNG
new file mode 100755
index 0000000..8c66664
Binary files /dev/null and b/resources/python_win/python4.PNG differ
diff --git a/resources/python_win/python5.PNG b/resources/python_win/python5.PNG
new file mode 100755
index 0000000..b246606
Binary files /dev/null and b/resources/python_win/python5.PNG differ
diff --git a/resources/python_win/python6.png b/resources/python_win/python6.png
new file mode 100755
index 0000000..2502a16
Binary files /dev/null and b/resources/python_win/python6.png differ
diff --git a/resources/python_win/python7.PNG b/resources/python_win/python7.PNG
new file mode 100755
index 0000000..ca0df16
Binary files /dev/null and b/resources/python_win/python7.PNG differ
diff --git a/resources/python_win/python8.PNG b/resources/python_win/python8.PNG
new file mode 100755
index 0000000..dff0d21
Binary files /dev/null and b/resources/python_win/python8.PNG differ
diff --git a/resources/python_win/python9-2.PNG b/resources/python_win/python9-2.PNG
new file mode 100755
index 0000000..821e558
Binary files /dev/null and b/resources/python_win/python9-2.PNG differ
diff --git a/resources/python_win/python9.PNG b/resources/python_win/python9.PNG
new file mode 100755
index 0000000..bb6d884
Binary files /dev/null and b/resources/python_win/python9.PNG differ
diff --git a/resources/slack-anthony.PNG b/resources/slack-anthony.PNG
new file mode 100644
index 0000000..86aaefb
Binary files /dev/null and b/resources/slack-anthony.PNG differ
diff --git a/resources/slack-attach.png b/resources/slack-attach.png
deleted file mode 100644
index 74aa347..0000000
Binary files a/resources/slack-attach.png and /dev/null differ
diff --git a/resources/slack-channel.png b/resources/slack-channel.png
index a7fc274..7701aa0 100644
Binary files a/resources/slack-channel.png and b/resources/slack-channel.png differ
diff --git a/resources/slack-codeblock.png b/resources/slack-codeblock.png
new file mode 100644
index 0000000..05b28b3
Binary files /dev/null and b/resources/slack-codeblock.png differ
diff --git a/resources/slack-direct.png b/resources/slack-direct.png
index 8142a69..7701aa0 100644
Binary files a/resources/slack-direct.png and b/resources/slack-direct.png differ
diff --git a/resources/twitch_notifications.PNG b/resources/twitch_notifications.PNG
deleted file mode 100644
index 8ffb4ae..0000000
Binary files a/resources/twitch_notifications.PNG and /dev/null differ
diff --git a/resources/twitch_stream.PNG b/resources/twitch_stream.PNG
new file mode 100644
index 0000000..be35a12
Binary files /dev/null and b/resources/twitch_stream.PNG differ
diff --git a/units/unit_00.md b/units/unit_00.md
new file mode 100644
index 0000000..75a4aa2
--- /dev/null
+++ b/units/unit_00.md
@@ -0,0 +1,39 @@
+
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
+# Unit 0
+
+Welcome to Intro to Programming! To have a successful start in the class, please prep for the class by doing the following:
+
+## Download
+- latest version of Python
+ - [Instructions for Windows](https://github.com/PdxCodeGuild/IntroToProgramming/tree/master/documentation/python_windows.md)
+ - [Instructions for Mac](https://github.com/PdxCodeGuild/IntroToProgramming/tree/master/documentation/python_mac.md)
+ - [Instructions for all other operating systems](https://realpython.com/installing-python/)
+- [VS Code](https://code.visualstudio.com/download)
+ - Visual Studio Code (VS Code) is where we will be writing our code. Some other alternatives are Sublime, PyCharm, and Atom. However, we'll be using VS Code in class.
+
+Can't or don't want to install software on your computer? Check out [Repl.it](repl.it). It's a cloud based editor and interpreter that will allow you to run Python without downloading any software. Please note, you will need to create an account. Check out this tutorial on [Youtube](https://www.youtube.com/watch?v=GSAf97ROes4).
+
+
+## Practice
+The terminal will be a vital tool for running our code. Complete [Lab 0](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab00-newfolder.md) to get a quick understanding of how the terminal works.
+
+## Want a deeper dive?
+
+Get some additional practice by working through the introduction and exercises 1-6 of the [Command Line Crash Course](https://www.vikingcodeschool.com/web-development-basics/a-command-line-crash-course). Stop at **Super User**.
+
+## Putting it together
+
+On the first day of class, you will see how Visual Studio Code and the terminal work together to run your python code. If you'd like to see for yourself, please see [Lab 0](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab00-newfolder.md)
diff --git a/units/unit_01.md b/units/unit_01.md
index 94bf669..1dd02c0 100644
--- a/units/unit_01.md
+++ b/units/unit_01.md
@@ -1,4 +1,18 @@
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
# Unit 01
+
[Back to Syllabus](https://github.com/PdxCodeGuild/IntroToProgramming#top)
## Table of Contents
@@ -12,18 +26,25 @@
### Comments
- [Quick overview](https://www.w3schools.com/python/python_comments.asp)
- Complete [Exercise 2](https://shop.learncodethehardway.org/paid/python3/ex2.html) of Learn Python the Hard Way
+- [Quiz - Comments](https://docs.google.com/forms/d/1y5x15V0XnH3TtDemyq-Gnq6zxFiscr2Kr2PztM9rPjA/viewform?edit_requested=true)
### Variables
- Complete [Exercise 4](https://learnpythonthehardway.org/python3/ex4.html) of Learn Python the Hard Way
+- [Quiz - Variables](https://docs.google.com/forms/d/1v-tghS7GvDnSCypUbola929_DQWiQG5K_p-zWgWN-bE/viewform?edit_requested=true)
### print() / f-strings
-- [Quick overview](https://www.w3schools.com/python/ref_func_print.asp)
+- [print() - Quick overview](https://www.w3schools.com/python/ref_func_print.asp)
+- [fstring() overview](https://realpython.com/python-f-strings/#f-strings-a-new-and-improved-way-to-format-strings-in-python)
- Complete [Exercise 5](https://learnpythonthehardway.org/python3/ex5.html) of Learn Python the Hard Way
### Datatype: Strings
- [Quick overview](https://www.w3schools.com/python/python_strings.asp)
- Complete [Exercise 6](https://learnpythonthehardway.org/python3/ex6.html) of Learn Python the Hard Way
+### Quizzes
+- [print() & Strings](https://docs.google.com/forms/d/1PFc1P77FJpQImQ3GKxnKFzYcK_iGSX7RZAzWSN2i3WM/viewform?edit_requested=true)
+- [fstrings](https://forms.gle/56GKErtdRAYPFquh9)
+
### String Concatenation
To concatenate, or combine, two strings you can use the + operator.
@@ -47,6 +68,7 @@ print(c) # outcome: "Hello World"
### input()
- [Quick overview](https://www.w3schools.com/python/ref_func_input.asp)
+- [Quiz - input()](https://forms.gle/HXFK2HZ58ApGLN6t9)
Example 1:
```python
diff --git a/units/unit_02.md b/units/unit_02.md
index cf9172e..4bf82c9 100644
--- a/units/unit_02.md
+++ b/units/unit_02.md
@@ -1,3 +1,16 @@
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
# Unit 02
[Back to Syllabus](https://github.com/PdxCodeGuild/IntroToProgramming#top)
@@ -6,11 +19,12 @@
- [Datatype: Lists](#lists)
- [Modules](#modules)
- [Integers & Operators](#integers)
-- [Conditional Statements](conditions)
+- [Conditional Statements](#conditions)
### Lists
- [List Overview](https://www.w3schools.com/python/python_lists.asp)
- [List Methods](https://www.w3schools.com/python/python_ref_list.asp)
+- [Quiz: Lists](https://forms.gle/dwgvYsHkvUSTMCiWA)
A list is a collection which is ordered and changeable. In Python lists are written with square brackets.
@@ -30,7 +44,7 @@ for fruit in fruits:
```
### Modules
-Modules are sources of code; similar to a library. It is a file containing a set of functions you want to include in your application. (For a list of all modules, you can check out the offical [Python docs](https://docs.python.org/3/py-modindex.html)). For this lesson, we will be looking at the [random module](https://pynative.com/python-random-module/). And specifically, we will be looking at the choice() function of the random module: [random.choice()](https://www.w3schools.com/python/ref_random_choice.asp). Please see the example below:
+Modules are a Python object that are sources of related code; think of if as a library of information. A code library, if you will! It is a file containing a set of functions you want to include in your application. (For a list of all modules, you can check out the offical [Python docs](https://docs.python.org/3/py-modindex.html)). For this lesson, we will be looking at the [random module](https://pynative.com/python-random-module/). And specifically, we will be looking at the choice() function of the random module: [random.choice()](https://www.w3schools.com/python/ref_random_choice.asp). Please see the example below:
```python
# include the random module in our file
@@ -47,10 +61,13 @@ chosen_fruit = random.choice(fruits)
# print the value of variable chosen_fruit
print(chosen_fruit)
```
+
Let's practice random.choice() in the next lab.
### Lab 03: [Magic 8 Ball](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab03-magic_8_ball.md)
+[Quiz - Modules](https://forms.gle/Ui3UrdgncTcFfn9Y6)
+
---
### Integers & Operators
@@ -58,7 +75,12 @@ Let's practice random.choice() in the next lab.
- [Operators Overview](https://www.w3schools.com/python/python_operators.asp)
- Complete [Exercise 3](https://learnpythonthehardway.org/python3/ex3.html) of Learn Python the Hard Way
+#### Quizzes
+- [Integers & Arithmetic Operators](https://forms.gle/fHcU5oR6Z5WvJtQa8)
+- [Assignment Operators](https://forms.gle/GKHzieGUhVD6j2XF6)
+
### Conditional Statements
+- [Python Comparison Operators](https://www.w3schools.com/python/python_operators.asp) Scroll down to Comparison Operators
- [Conditional and If statements](https://www.w3schools.com/python/python_conditions.asp)
- Complete [Exercises 1-6](https://www.w3schools.com/python/exercise.asp?filename=exercise_ifelse1) of the PYTHON If...Else section
diff --git a/units/unit_03.md b/units/unit_03.md
index 617d743..a76ba10 100644
--- a/units/unit_03.md
+++ b/units/unit_03.md
@@ -1,10 +1,26 @@
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
## Unit 03
+
+
[Back to Syllabus](https://github.com/PdxCodeGuild/IntroToProgramming#top)
## Table of Contents
- [while loop](#while)
- [break](#break)
- [else](#else)
+- [for x in range()](#range)
- [for each](#each)
- [continue](#continue)
- [for x in range](#range)
@@ -27,7 +43,8 @@ while i < 6: # as long as i (1) is less than 6, run the following
i += 1 # after printing i (1), add 1 to i (1). i is now 2
```
-Complete [Exercise 1](https://www.w3schools.com/python/exercise.asp?filename=exercise_loops1) of PYTHON Loops.
+- Complete [Exercise 1](https://www.w3schools.com/python/exercise.asp?filename=exercise_while_loops1) of PYTHON Loops.
+- [Quiz: While Loop](https://forms.gle/LYFnGv7J5M89t1aU6)
#### break
@@ -45,7 +62,7 @@ while i < 6: # as long as i (1) is less than 6, run the following
#### else
Do something while statement is true. When it is no longer true, do something else.
-Complete [Exercise 2](https://www.w3schools.com/python/exercise.asp?filename=exercise_loops2) of PYTHON Loops.
+Complete [Exercise 2](https://www.w3schools.com/python/exercise.asp?filename=exercise_while_loops2) of PYTHON Loops.
```python
i = 1 # set variable i equal to the value of 1
@@ -56,25 +73,8 @@ else: # the moment, i is 6, the while statement goes from True to False
print("i is no longer less than 6") # this will now print
```
-#### for each
-
-Do something to each item in a list.
-
-```python
-# initialize a list with student names and save to a variable, students
-students = ["Al", "Anthony", "Lisa"]
-# the student variable only exists in this for loop. you cannot use "student" anywhere else
-# studentS is the list variable we created a bove
-for student in students: # for each item in the list, do this:
- print(student)
-
-# outcome: each item of the list on a new line
-"Al"
-"Anthony"
-"Lisa"
-```
-
-Complete [Exercise 3](https://www.w3schools.com/python/exercise.asp?filename=exercise_loops3) of PYTHON Loops.
+- Complete [Exercise 3](https://www.w3schools.com/python/exercise.asp?filename=exercise_while_loops3) of PYTHON Loops.
+- [Quiz - While Loop]()
#### continue
@@ -85,7 +85,7 @@ for i in range(9):
continue
print(i)
```
-Complete [Exercise 4](https://www.w3schools.com/python/exercise.asp?filename=exercise_loops4) of PYTHON Loops.
+Complete [Exercise 4](https://www.w3schools.com/python/exercise.asp?filename=exercise_for_loops1) of PYTHON Loops.
#### for x in range()
@@ -95,9 +95,35 @@ Do something for a set number of times.
# x here is just a placeholder. it will do the counting for us
for x in range(3): # do the following 3 times
print("Hello!")
+
+# outcome: each item of the list on a new line
+Hello
+Hello
+Hello
+```
+
+Complete [Exercise 5](https://www.w3schools.com/python/exercise.asp?filename=exercise_for_loops2) of PYTHON Loops.
+
+#### for each
+
+Do something to each item in a list.
+
+```python
+# initialize a list with student names and save to a variable, students
+students = ["Al", "Anthony", "Lisa"]
+# the student variable only exists in this for loop. you cannot use "student" anywhere else
+# studentS is the list variable we created a bove
+for student in students: # for each item in the list, do this:
+ print(f"Hello {student}")
+
+ # outcome: each item of the list on a new line
+Hello Al
+Hello Anthony
+Hello Lisa
```
-Complete [Exercise 5](https://www.w3schools.com/python/exercise.asp?filename=exercise_loops1) of PYTHON Loops.
+- Complete [Exercise 6](https://www.w3schools.com/python/exercise.asp?filename=exercise_for_loops3) of PYTHON Loops.
+- [Quiz: For Loops](https://forms.gle/KfDEbvi1HkzZuCb86)
### Lab 06: [Rock Paper Scissors](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab06-rock_paper_scissors.md)
You don't need loops to complete the lab. BUT you will need them for the advance versions. Give it a shot and try to incorporate loops into your code.
diff --git a/units/unit_04.md b/units/unit_04.md
index 18a707f..ee7cdf0 100644
--- a/units/unit_04.md
+++ b/units/unit_04.md
@@ -1,4 +1,18 @@
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
## Unit 04
+
[Back to Syllabus](https://github.com/PdxCodeGuild/IntroToProgramming#top)
## Table of Contents
@@ -6,16 +20,16 @@
- [String Module](#string)
### Review of Week 1
-Lab 8 will review the following concepts:
+Lab 7 will review the following concepts:
- [the random module](https://www.w3schools.com/python/module_random.asp)
- [input()](https://www.w3schools.com/python/ref_func_input.asp)
- [if/else](https://www.w3schools.com/python/python_conditions.asp)
-The advance versions of Lab 8 review:
+The advance versions of Lab 7 review:
- [while loops](https://www.w3schools.com/python/python_while_loops.asp)
- [break](https://www.w3schools.com/python/ref_keyword_break.asp)
-#### Lab 08: [Guess the Number](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab08-guess_the_number.md)
+#### Lab 07: [Guess the Number](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab07-guess_the_number.md)
### String Module
- [official docs](https://docs.python.org/3/library/string.html)
@@ -30,6 +44,6 @@ letters = string.ascii_letters
print(letters)
# outcome: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'
```
-#### Lab 07: [Password Generator](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab07-password_generator.md)
+#### Lab 08: [Password Generator](https://github.com/PdxCodeGuild/IntroToProgramming/blob/master/labs/lab08-password_generator.md)
[Back to top](#top)
diff --git a/units/unit_05.md b/units/unit_05.md
index 679dc8e..4227492 100644
--- a/units/unit_05.md
+++ b/units/unit_05.md
@@ -1,4 +1,18 @@
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
# Unit 05
+
[Back to Syllabus](https://github.com/PdxCodeGuild/IntroToProgramming#top)
## Table of Contents
@@ -27,8 +41,8 @@ employee_availability = {
# value: "Mon", ["Tues", "Wed", "Thurs"], ["Mon", "Tues", "Wed", "Thurs", "Fri"]
# how many days will Al work in a year?
-# 365 days divided by the len of Al's list of availability (3)
-worked_days = 365 / len(employee_availability["al"])
+# 52 weeks in a year multiplied by the number of days worked each week (3)
+worked_days = 52 * len(employee_availability["al"])
print(worked_days)
```
diff --git a/units/unit_06.md b/units/unit_06.md
index f3db53e..9756869 100644
--- a/units/unit_06.md
+++ b/units/unit_06.md
@@ -1,4 +1,18 @@
-# Unit 06
+
+
+## *******************************************************
+
+## This syllabus is **deprecated**.
+
+### Intro to Programming has become Programming 101 and Programming 102.
+
+### **Contact your instructor** for the link to the correct syllabus.
+***
+## *******************************************************
+
+
+# Unit 06
+
[Back to Syllabus](https://github.com/PdxCodeGuild/IntroToProgramming#top)
## Table of Contents