Merge branch 'main' into patch-24

career/networking-career.md

@@ -82,6 +82,8 @@ Networking at an in-person event can be daunting for those new to networking. Go
 
 One great goal (even if you aren't sure of your career goals yet) is to meet 3 new people, no matter what kind of industry they might be in. If you get better and better at this, another expert-level goal is to spend no longer than 3 minutes speaking with each person, and speak with as many people as you can. Challenge yourself!
 
+Science of People has some excellent tips for where to stand, how to show you're listening with a head tilt, remembering people's names, giving handshakes, what to wear, etc.
+
 **Here's a list of questions to memorize (or write down and carry with you):**
 
 - What do you do?
@@ -147,3 +149,4 @@ Find a partner and discuss the following:
 - [The Pac-Man rule](http://ericholscher.com/blog/2017/aug/2/pacman-rule-conferences/)
 - [The Double Opt-In Intro](https://qz.com/457699/youre-probably-doing-email-introductions-wrong/)
 - The 5 Secrets of [Networking](https://www.slideshare.net/ucfaramos/the5-secretsofnetworking/57-Network_TrackingSystem_Start_a_Microsoft) by Angel L. Ramos
+- [Networking by Science of People](https://www.scienceofpeople.com/networking/)

career/roles-in-tech/technical-program-manager.md

@@ -9,20 +9,20 @@
 In General you will need following to be a Technical Program Manager:
 
 - **Technical Competency**
-- **Project/Program Management & Agile Experience**
+- **Knowledge of Agile methodologies**
 - **Past Experience in Handling & Leading Development Teams**
 
 ### Motivation
 
 - **Better Estimates**
-- **Add Value to Other Parts of the Project**
+- **Add Value to Other Parts of the Program**
 - **Be the Link Between Development and the Business**
 
 ### Objectives
 
 **Participants will be able to:**
 
-- Create and maintain a project plan with tasks and estimates
+- Create and maintain a program plan with tasks and estimates
 - Communicate with both IT and business stakeholders
 - Risk management and escalation
 - Manage scope
@@ -75,7 +75,7 @@ _TPM stands for **“technical program manager”** a team that manages the coor
 - Cloud TPM
 - UI/UX
 
-Perhaps the biggest **advantage** to being a **technical project manager** is having the ability to fill the communication gap between the development team and the business team.
+Perhaps the biggest **advantage** to being a **technical program manager** is having the ability to fill the communication gap between the development team and the business team.
 
 This can manifest itself in many ways:
 
@@ -87,11 +87,11 @@ This can manifest itself in many ways:
 
 **What Now?**
 
-So now you’re convinced that you should become a technical project manager – **but how?**
+So now you’re convinced that you should become a Technical Program Manager, but how?
 
-1. Take Time to Understand Your Project/Product.
-2. Learn to Code on Your Own.
-3. Build Something on your Own.
+1. Take time to understand the programs around you.
+2. Learn to code on your own.
+3. Build something on your own.
 
 **Challenges**
 
@@ -102,20 +102,20 @@ So now you’re convinced that you should become a technical project manager –
 
 ### Common Mistakes / Misconceptions
 
-- **Tech Project Manager is only skilled in project management**
-- **Tech Project Manager Job is to create reports/ Gantt charts**
-- **No role for Tech Project Manager in Agile context**
-- **Tech Project Manager role is the same across the organisation**
+- **Technical Program Managers are only skilled in program management**
+- **Technical Program Managers just create reports/Gantt charts**
+- **There's no role for Technical Program Managers in Agile context**
+- **Technical Program Manager roles are the same across the organization**
 
 ### Independent Practice
 
-Try to manage or lead a project in your current organization or your team.
+Try to manage or lead a program in your current organization or your team.
 
 ### Check for Understanding
 
-- Are you able to manage or lead the project?
-- Can you deliver project on time?
-- Can you Plan for problems and potential conflicts?
+- Are you able to manage or lead the program?
+- Can you deliver the program on time?
+- Can you plan for problems and potential conflicts?
 
 ### Supplemental Materials
 

electives/web-patterns.md

@@ -1,12 +1,5 @@
 # Web Patterns
 
-### Projected Time
-
-About 45 minutes
-
-- 5 minutes for video walkthrough of slides
-- 30 minutes for Independent Practice & Challenge
-
 ### Prerequisites
 
 - [HTML lesson](/web/html.md)
@@ -45,7 +38,7 @@ Web design patterns are frequently-implemented frontend features. They solve rec
 
 ### Independent Practice
 
-No pairs will be assigned for this activity. On your own, visit at least 5 websites and make note of which, if any, design patterns are used on each website. Some suggestions to get you started are provided below, but feel free to visit any website that would be appropriate.
+If you have some time, visit at least 5 websites and make note of which, if any, design patterns are used on each website. Some suggestions to get you started are provided below, but feel free to visit any website that would be appropriate.
 
 - Airbnb
 - Etsy
@@ -62,8 +55,6 @@ Now that you have seen what a variety of web design patterns look like, choose 3
 
 ### Check for Understanding
 
-Form small groups and discuss:
-
 - What are Web Design Patterns?
 - Why use Web Design Patterns?
 - What are the benefits of using a Web Design Pattern?

git/github-collaboration.md

@@ -1,12 +1,5 @@
 # GitHub Collaboration
 
-### Projected Time
-
-About 1 hour
-
-- 30 minutes for slides/Guided Practice
-- 20 minutes for Independent Practice
-- 10 minutes for small group discussion
 
 ### Prerequisite
 
@@ -71,6 +64,8 @@ In 2020, Techtonica/curriculum renamed its default branch from `master` to `main
 
 ### Guided Practice
 
+PRO TIP: First, ask yourself, "Have I gotten through everything I need to know on a broad level in accordance with the day doc?" -- save guided practice for when you have extra time, don't prioritize it over other tasks.
+
 0. Send your GitHub username to your program manager or an admin, and ask them to give you "Triage" access to Techtonica/curriculum.  (Not Read, not Write, Triage.)
 1. Fork a GitHub repo
    - Navigate to https://github.com/Techtonica/curriculum/
@@ -164,11 +159,10 @@ Make another PR by checking out a new branch
 
 ### Check for Understanding
 
-- Gather into small groups and discuss:
-  - Why do you think forks and new branches would be good tools in a team project?
-  - How do you keep your fork up-to-date with the shared project?
-  - What is the first thing you should do before working on a issue/project?
-  - What is the git command to create a new branch?
-  - Discuss the importance of a good commit message.
-  - What things should you check when creating a new pull request?
-  - Describe how would you resolve merge conflicts?
+ - Why do you think forks and new branches would be good tools in a team project?
+ - How do you keep your fork up-to-date with the shared project?
+ - What is the first thing you should do before working on a issue/project?
+ - What is the git command to create a new branch?
+ - Why is a good commit message important?
+ - What things should you check when creating a new pull request?
+ - How would you resolve merge conflicts?

git/gitignore.md

@@ -1,13 +1,8 @@
 # gitignore
 
-### Projected Time
+### Week 2 Question
 
-About 30-45 minutes
-
-- 10 minutes for Lesson
-- 10 minutes for Guided Practice
-- 10 minutes for Independent Practice
-- 5 minutes for Check for Understanding
+- Why is it important to have a .gitignore file in your project folder?
 
 ### Prerequisites
 
@@ -119,8 +114,6 @@ You should no longer see _.my-secret-keys_ in your untracked files, because git
 
 ### Check for Understanding
 
-Chat with your pair group for the day about the following:
-
 - What sorts of files should you add to your .gitignore?
 - How can add to all files of the same type to .gitignore?
 - How can you add a folder?

networking-computing/intro-to-dns-ip.md

@@ -1,13 +1,12 @@
 # What is DNS?
 
-### Projected Time
+### Week 2 Keywords and Questions
 
-About 1.5 hours
+- What is a DNS?
+- What happens behind the scenes when you enter a URL?
+
+PRO-TIP: The activities in this curriculum are here for your continous reference, and won't disappear, so you don't have to dive deeply if the content and activities presented are not necessary to your day doc level understanding. Take a mental note and move on if you need time for other day doc priorities. 
 
-- Lesson - 10 min
-- Guided Practice - 10 min
-- Independent Practice - 30-40 min
-- Check for Understanding - 10-30 min
 
 ### Prerequisites
 

personal-brand/personal-branding.md

@@ -8,7 +8,6 @@
   - Story - only tell details that show what you did!
   - Take away “What I learned from this”, “Going forward I will always”, “The lesson I learned from this situation”...
 
-
 ### Prerequisites
 
 - [GitHub account](https://github.com/)
@@ -41,9 +40,7 @@
 
 ### Lesson
 
-1.  [Follow this guide](https://blog.markgrowth.com/how-to-start-a-beautiful-personal-blog-using-medium-ca6d89b7e46) to create a personal blog on Medium.
-
-2. Spend a few minutes reading ["How to win friends and stand out from the crowd"](https://pizza.netlify.com). This page will help you to make new friends and grow your Network.
+Spend a few minutes reading ["How to win friends and stand out from the crowd"](https://pizza.netlify.com). This page will help you to make new friends and grow your Network.
 
 - Choose your lane
   - Pick something you have learned or love and go deep in explanations
@@ -68,24 +65,12 @@
 
 ### Guided Practice
 
-- Follow [this tutorial](https://blog.markgrowth.com/how-to-start-a-beautiful-personal-blog-using-medium-ca6d89b7e46) to create your own blog on Medium!
 - You can add a profile README on your Github when you create a repository with a name that matches your Github username. Take a look at some [examples](https://github.com/abhisheknaiidu/awesome-github-profile-readme) and follow the [tutorials](https://github.com/abhisheknaiidu/awesome-github-profile-readme#tutorials) to set up a profile README.
 
-### Independent Practice
-
-Take some time this week to write a blog post on something you learned this week. Before posting to the world, have a fellow classmate review it to see if the information is useful. A typical suggestion is to blog for yourself 3-6 months ago.
-
-Ship it and continue this process at least once a week. Remember to keep the blog post short at first to prevent writers block and anxiety about posting.
-
-Promoting your blog is at least as important as writing it!
-
 ### Challenge
 
-Tweet out about your new blog on Twitter using the [#BridgeTheTechGap](https://twitter.com/search?q=%23BridgeTheTechGap) or [#CodeNewbie ](https://twitter.com/search?q=%23CodeNewbie)hashtag.
-
-### Check for Understanding
+Tweet about your Techtonica experience on Twitter using the [#BridgeTheTechGap](https://twitter.com/search?q=%23BridgeTheTechGap) or [#CodeNewbie ](https://twitter.com/search?q=%23CodeNewbie)hashtag.
 
-Send your first blog post to a peer and ask for comments and 2 ways you can improve your post or your site.
 
 ### Supplemental Resources
 
@@ -96,5 +81,4 @@ Send your first blog post to a peer and ask for comments and 2 ways you can impr
 
 - What are the benefits of having a distinct Personal Brand?
 - How do you build a Personal Brand?
-- Mention some blog hosting sites.
 - Mention some communities you would like to join.

projects/portfolio/portfolio-webpage-1.md

@@ -1,17 +1,6 @@
-# Portfolio Project with HTML, CSS, Bootstrap
+# Portfolio Project with HTML and CSS
 
-### Languages
-
-- HTML
-- CSS
-- Git
-- bash
-
-### Frameworks
-
-- Bootstrap
-
-### Other Skills
+### Addistional Skills
 
 - VS Code
 - Developer Tools
@@ -24,35 +13,50 @@
 
 ### Primary Goals
 
-To demonstrate understanding of the topics covered in the first two weeks of this course.
+To demonstrate understanding of the foundational topics covered in the first two weeks of Techtonica before diving further into the PERN stack.
 
 ### Overview
 
-In this project, you will build a simple portfolio page to practice what you've learned about VSCode, HTML, CSS, Git, and Bootstrap. This should take about 3 hours.
-
-### Context
+In this project, you will build a simple portfolio page to practice what you've learned about VSCode, HTML, CSS, Git, and GitHub. In the future, a great portfolio page will be valuable way to showcase your skills as you look for engineering work.
 
-- A great portfolio page will be valuable way to showcase your skills as you look for engineering work.
-- After you've learned more coding skills and tools, you will be making this site even better.
-- Include your new coding skills in your resume!
 
 ### Motivation
 
 Increase your job prospects dramatically with your own personal web page. Get creative and show off your technical skills. Employers will love you!
-Here's a list of example portfolios
-https://github.com/HackathonHackers/personal-sites
+Here's a list of example portfolios: https://github.com/HackathonHackers/personal-sites
 
-### Starter Code
-
-There is no starter code for this project. You can do it!
 
 ## Project Requirements:
 
-- [ ] As you go through the lesson, commit your code in git and push to GitHub after each bolded section (or more frequently if you want). You should write clear + informative commit messages for each commit.
+You should write clear + informative commit messages for each commit and create pull requests once big/multiple changes have been made for your mentor to review and document it in the cohort shared sheet. 
+
+- At least 15 commits 
+  - Pro-tip: Get used to committing your code every single time a new line of code works
+- At least one PR
+  - Consider pushing your code to GitHub every time you finish a bolded section, but at least every day
+- Use of the command line to create files and implement use of Git
+- Practice use of developer tools
+- HTML
+   - Headers
+   - Sections
+   - Semantic Tags
+   - Contact Form
+- CSS
+  - At least 3 style properties applied to text
+  - Photo
+  - Border
+  - Use of columns
+  - Use of at least 1 ID
+  - Use of at least 3 web design patterns
+  - Override a CSS rule in your code in an obvious way at least once
+  - Change display property of at least 1 element
+- Additional Requirements
+  - Have at least 1 style change for narrow, medium, and wide browser views
+  - Practice creating a thoughtful README
 
 ---
 
-### Part 1 - Build your amazing portfolio page in with HTML, CSS, and Bootstrap
+### Project Checklist
 
 **Ergonomics**
 
@@ -83,6 +87,7 @@ There is no starter code for this project. You can do it!
 - [ ] Double check that you have proper indentation for readability.
 - [ ] Use semantic tags rather than presentational tags when possible.
 - [ ] (Remember to make a git commit after each set of code changes!)
+- [ ] (Second half of week) - Add a contact form with the following fields: name (required), email (required), phone number (not required), and address (not required) (Hint: Required fields in a form are those where you normally see a * symbol)
 
 **Developer Tools**
 
@@ -102,11 +107,6 @@ There is no starter code for this project. You can do it!
 - [ ] Have 2 css blocks that include the class "override" with one overriding the other rule in an obvious way.
 - [ ] Change the display property of at least one element.
 
-**Bootstrap**
-
-- [ ] Link bootstrap to index.html file.
-- [ ] Create a _navigation bar_ that includes your name as the _page title_, and at least two _links_ including your GitHub profile and LinkedIn profile.
-- [ ] Use at least two Bootstrap tags or classes to style your nav bar.
 
 **Media Queries, UI, UX**
 
@@ -123,18 +123,12 @@ There is no starter code for this project. You can do it!
 
 ---
 
-### Part 2 - Go live with GitHub
+### Recommended extension activity if time permits
 
-- [ ] Commit and push any uncommitted changes to GitHub
+- [ ] Move your portfolio project into its own repo instead of within the techtonica-assignments repo
 - [ ] Go into the settings of your portfolio-website repo in GitHub and create a link for your live site
 - [ ] Make the link to your live github.io site clickable on your README.
 
 ---
 
-### Extensions
-
-- Spend what remains of your 3 hours to make improvements to your portfolio site, and be sure to push your changes up to github.
-
-### Frequently Asked Questions
 
-- We can add common FAQs here. Open a GitHub issue or PR if you have any questions.