Skip to content

Latest commit

 

History

History
189 lines (132 loc) · 9.65 KB

README.md

File metadata and controls

189 lines (132 loc) · 9.65 KB
Raw

Class Hedgehog

Evening Python Fullstack bootcamp. May 23 - Sep 30

Instructor:

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)

  • May 30 - Memorial Day
  • July 4 - Independence Day
  • Sept 5 - Labor Day

Assigned Labs:

JavaScript
Lab Number Title Due Date
Lab 01 Redo (prompt/alert) 22 AUG
Lab 02 Redo (input/events) 24 AUG
Lab 03 Todo List (Mob) 25 AUG
Lab 04 Dad Joke API
Lab 05 Weather API
Lab 06 Pokedex
Django
Lab Number Title Due Date
Lab 01 Django Redo 27 JUL
Lab 02 Grocery List 05 AUG
Lab 03 Todo List 09 AUG
Lab 04 Blog 17 AUG
HTML/CSS/Flask
Lab Number Title Due Date
Lab 01 Bio 08 JUL
Lab 02 Blog 11 JUL
Lab 03 Company 14 JUL
Lab 04 Personal Portfolio 19 JUL
Lab 06 Flask Redo 21 JUL
Python
Lab Number Title Due Date
Lab 01 Code Folder 07 JUN
Lab 02a Madlib 08 JUN
Lab 02b Make Change 08 JUN
Lab 05 Palindrome Checker 10 JUN
Lab 06 Credit Card Validation 14 JUN
Lab 08 Pick 6 15 JUN
lab 09 Blackjack Advice 21 JUN
lab 11 Rot Cipher 22 JUN
lab 14 ATM 28 JUN
lab 19 Trivia API 29 JUN
lab 13 Count Words 30 JUN
Final Mini Capstone 01 JUL

Submitting your work

Make sure all labs are located within class_hedgehog/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: anthony-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.