Class australian shepherd

Evening Python Fullstack bootcamp. Aug 01 - Dec 12

Instructor:

• Matthew Chimenti
• matt@pdxcodeguild.com

TAs:

• Michael Broetje
• michael.b@pdxcodeguild.com
• Timothy Johnson
• timothy.j@pdxcodeguild.com

---

---

Rough Timeline

• Weeks 1, 2, 3, 4, 5: Python
• Weeks 6, 7: HTML/CSS/Flask
• Weeks 8, 9, 10, 11: Django
• Weeks 12, 13, 14, 15: Javascript
• Weeks 16, 17, 18: Capstone project

---

Scheduled Holidays (no class) To be confirmed

• Sept 5 - Labor Day
• Nov 24 - Thanksgiving
• Nov 25 - Day after Thankgiving

---

Assigned Labs:

Python

Lab Number	Title	Due Date
Lab 01	Code Folder	07 Aug
Lab 02a	Mad Lib	08 Aug
Lab 02b	Average Num	08 Aug
Lab 05	Palindrome Checker	10 Aug
Lab 06b	Credit Card Validation	14 Aug
Lab 08	Pick 6	15 Aug
Lab 09	Blackjack Advice	21 Aug
Lab 14	ARI	22 Aug
Lab 07	Rot 13	22 Aug
Lab 11	Contact List	22 Aug
Lab 14	ATM	28 Aug
Lab 19	Dad Joke API	29 Aug
Lab 15	Quotes API	30 Aug
Final	Mini Capstone	12 Sep

HTML/CSS/Flask

Lab Number	Title	Due Date
Lab 01	Bio	13 Sep
Lab 02	Company	15 Sep
Lab 03	Blog	16 Sep
Lab 04	Burrito	01 Oct
Lab 05	Personal Portfolio	29 Sep

Django Labs Assigned:

Lab	Name	Date Assigned	Due By Start Of Class	Hard Due Date
00	Polls	Jun 8th	Oct 03th
01	Todo List	Jun 13th	Oct 07th
02	URL Shortener	Jun 15th	Oct 10th
03	Chirp	Jun 21st	Oct 15th

---

Submitting your work

Make sure all labs are located within class_australian_shepherd/code/<YOUR_NAME>, where <YOUR_NAME> is your first name in all lowercase letters.

To emulate a more professional Git workflow, we're going to start creating new branches for each lab starting in the HTML/CSS section.

Creating a new branch:

Click to expand

• git branch to check that you're on the main branch, use git checkout main to go to the main branch if needed.

• git status to check if your local main branch is up to date with origin/main on Github.

• git pull if needed to pull any recent changes to your local repository

• Create a new branch and switch to it.

  • Option 1:

    • git branch <YOUR_NAME-SECTION-LAB_NUMBER>
    • git checkout <YOUR_NAME-SECTION-LAB_NUMBER>

  • Option 2:

    The -b flag can be used after the checkout command to combine these two steps:

    git checkout -b <YOUR_NAME-SECTION-LAB_NUMBER>

  e.g. My branch for the "Lab 01 - Bio" in the HTML/CSS section would be named: matt-htmlcss-lab01. The name can vary a bit from this example, but please keep the chosen formatting consistent from one lab to another.

• git add <FILENAME> to add a specific file or git add . to add everything in the current dicrectory

• git commit -m "your commit message" to commit your work

• A remote branch will need to be created for each new local branch. Git will usually display the proper command to do this when a new branch is pushed for the first time.

  The command is:

  git push --set-upstream origin <BRANCH_NAME>

  OR

  git push -u origin <BRANCH_NAME>

  Screenshot

  

• After successfully pushing your new branch to Github, you should see the option to create a Pull Request for your branch on the main repo page.

  Screenshot

  

• If you don't see that message, you'll have to navigate to your new remote branch

  Screenshot

  

• Once you've navigated to your individual branch, you'll find the option to create a Pull Request in the "Contribute" dropdown.

  Screenshot

  

• Click the "Open Pull Request" button. Add a comment to your Pull Request like "Submitting Lab 00" and click "Create Pull request"

  Screenshot

  

Updating a branch

Click to expand

After a Pull Request is submitted, the code on that branch will be checked.

Necessary corrections or adjustments will be posted as comments on the Pull Request on Github and the Pull Request will be closed. When the corrections are made, submit the Pull Request again for checking.

Corrections will be made only to that particular branch.

• git checkout <YOUR_NAME-SECTION-LAB_NUMBER>

• Add and commit updated files.

• git push to push your changes up to the remote repository on GitHub

• Only one Pull Request is allowed per branch.

  • If a Pull Request is already open for the branch, a message will be added to the current Pull Request for the new commits.
  • If a Pull Request is not already open for the branch a new Pull Request will need to be created.

• Once a lab is complete, its branch will be merged into the main branch.

---