resolve merge conflicts

CONTRIBUTING.md

@@ -57,4 +57,4 @@
 1. Run `npm run validate-links` to find potentially dead links.
 1. Check links against [our list of false positives](./meta/false-dead-links.md) to weed out the real dead links that need fixing.
 1. Fix links and submit a pull request.
-1. Search & check links from github.com & codepen.io manually.  These sites block bots, so we are unable to test them effectively with our tool.
+1. Search & check links from github.com & codepen.io manually. These sites block bots, so we are unable to test them effectively with our tool.

README.md

@@ -1,6 +1,6 @@
 ### Welcome to the Techtonica curriculum!
 
-Techtonica is a non-profit project of SocialGood that does free tech training and job placement for unemployed or underemployed folks. For more information, please see our website: [Techtonica.org](http://techtonica.org)
+Techtonica is a non-profit project of SocialGood that offers a software engineering training with a need-based, sliding-scale, subsidized tuition and stipend scholarships for intensive tech training and job placement for unemployed or underemployed folks. For more information, please see our website: [Techtonica.org](http://techtonica.org)
 
 Program participants will learn to do full-stack web development using JavaScript. What bootcamps and Techtonica have in common is the fact that they are intensive training. However, bootcamps can be pretty passive classroom learning and they cost \$15,000+ for the students.
 
@@ -14,8 +14,8 @@ If you would like to contribute to the curriculum, please [sign up here](https:/
 
 **Get started:**
 
-- Choose an issue from the [TO-DO](https://github.com/Techtonica/curriculum/projects/2) column that seems right for you & leave a comment for Techtonica staff. If you know someone connected to Techtonica, they may be able to add you to our slack channel. If you are here for GHC or Hacktoberfest, message Alina, Leah, or TaLea and say you'd like to pick up the issue.
-- In the issue, you should find a link for a lesson outline and for corresponding slides.
+- Choose an issue from the [TO-DO](https://github.com/Techtonica/curriculum/projects/2) column that seems right for you & leave a comment for Techtonica staff. If you know someone connected to Techtonica, they may be able to add you to our slack channel. If you are here for GHC or Hacktoberfest, message Cristina, Ruthie or Sarah and say you'd like to pick up the issue.
+- In the issue, you should find a link for a lesson outline and for our resources about the topic.
 - If it is in the ["TO-DO"](https://github.com/Techtonica/curriculum/projects/2) column, that means it is available, even if there's an "assignee".
 - To **create an outline**, fork the repo or commit directly onto the main branch. [Here is a topic outline template that explains what we need for each section](./_templates/topic-outline.md).
 - To **edit a slideshow**, you'll need to request edit permission by clicking View Only > Request Edit Access, or message Alina. If you are logged into an account ending in @gmail.com, you can simply make a copy, edit, and transfer ownership to [email protected] when you finish. Either way, save on top of the sample template used in the slide, and cut any slides you find unnecessary.
@@ -116,7 +116,7 @@ Participants should memorize [common JavaScript built-in functions](/javascript/
 1. [Portfolio Project: Personal Branding](/personal-brand/personal-branding.md)
 1. [Reading/Writing Documentation](/reading-and-writing-documentation/documentation.md)
 1. [Writing Readable Code](/writing-readable-code/writing-readable-code.md)
-1. [Deploy your Portfolio Project: Deploying Client-Side Apps with Netlify](/deploying/deploying-1-personal-site.md)
+1. [Deploy your Portfolio Project: Deploying Client-Side Apps with Netlify](/deploying/deploying-1-personal-site-to-netlify.md)
 1. [Portfolio Project: Collaboration and Review](/projects/portfolio/portfolio-webpage-3.md)
 
 ### Week 3 - JavaScript Fundamentals

agile-development/intro-to-agile.md

@@ -60,7 +60,6 @@ The benefits of Agile software development includes:
 - [Video: Explaining Scrum in less than 120 seconds](https://www.youtube.com/watch?v=WxiuE-1ujCM)
 - [Blog Post: What is a user story?(4 min read)](https://www.mountaingoatsoftware.com/agile/user-stories)
 - [Blog Post: What Is a Kanban Board?(5 min read)](https://leankit.com/learn/kanban/kanban-board/)
-- [Blog Post: What is a retrospective?(2 min read)](http://finding-marbles.com/retr-o-mat/what-is-a-retrospective/)
 
 ### Definition of Agile
 
@@ -121,7 +120,6 @@ The Stacey complexity graph divides tasks into four different categories.
 
 Sources / further reading:
 
-- [Complexity Theory Stacey Diagram](https://www.gp-training.net/training/communication_skills/consultation/equipoise/complexity/stacey.htm)
 - https://www.scrum-tips.com/2016/02/17/stacey-complexity-model/
 
 _Describe step-by-step what needs to be done to prepare a cup of tea. (Baking a cake by following a recipe is another example to use). This should illustrate a defined process. Plot "making a cup of tea" on the Stacey graph._
@@ -191,7 +189,6 @@ Process:
 - [Blog Post: What is a user story? (4 min read)](https://www.mountaingoatsoftware.com/agile/user-stories)
 - [Time-boxing](https://www.agilealliance.org/glossary/iteration)
 - [Blog Post: What Is a Kanban Board? (5 min read)](https://leankit.com/learn/kanban/kanban-board/)
-- [Blog Post: What is a retrospective? (2 min read)](http://finding-marbles.com/retr-o-mat/what-is-a-retrospective/)
 
 Technical:
 
@@ -251,4 +248,3 @@ Incorporate the following in personal study:
 - [Wiki Article: eXtreme Programming (XP)(15 min read)](https://en.wikipedia.org/wiki/Extreme_programming)
 - [Wiki Article: Feature Driven Delopment (FDD)(8 min read)](https://en.wikipedia.org/wiki/Feature-driven_development)
 - [Martin Fowler's blog: A website on building software effectively(3 min read) ](https://martinfowler.com/)
-- [Finding Marbles blog: How work can be – Stories of agile & lean - Corinna Baldauf(10 min read)](http://finding-marbles.com/)

agile-development/scrum.md

@@ -1,9 +1,5 @@
 # Scrum
 
-### Projected Time
-
-Example: 60 - 120 minutes
-
 ### Prerequisites
 
 - [HTML](/web/html.md)
@@ -21,7 +17,7 @@ Practicing Scrum will enable you and your team to instantly address change reque
 
 **Which companies use Scrum?**
 
-- Below are the companies that use Scrum. You can find the description of each company [here](https://www.quickstart.com/blog/how-agile-scrum-training-transformed-these-5-companies/).
+- Below are some companies that use Scrum.
   - 3M: Minnesota Mining and Manufacturing Company.
   - IBM
   - Google

algorithms/searching.md

@@ -1,10 +1,5 @@
 # Searching Algorithms
 
-### Projected Time
-
-- Video: 30 min
-- Exercises: 2-3 hours
-
 ### Prerequisites
 
 - Arrays
@@ -66,7 +61,7 @@ Video:[Searching algorithm (video walkthrough of slides)](https://drive.google.c
 
 ### Challenge
 
-- Write a binary search to find a given item in an array. You can write it yourself, or use this tutorial for some guidance: https://www.khanacademy.org/computing/computer-science/algorithms/binary-search/p/challenge-binary-search
+- Write a binary search to find a given item in an array.
 
 ### Check for Understanding
 

algorithms/sorting.md

@@ -13,7 +13,7 @@
 
 Sorting is important in programming for the same reason it is important in everyday life. It is easier and faster to locate items in a sorted list than unsorted. Sorting algorithms can be used in a program to sort an array for later searching or writing out to an ordered file or report.[(by Siddharth Khuntwal)](https://www.quora.com/Why-is-sorting-important-in-computer-science-and-programming)
 
-For example bubble sort, quick sort, and selection sort all take the same input and produce the same output but at different speeds. This is a nice way to show how different approaches can yield more efficient algorithms using approaches such as divide and conquer. On top of that, sorting algorithms don't require advanced data structures knowledge to understand. If you can understand arrays you can understand sorting algorithm examples.[(by cma)](https://dev.to/cooperfle/whats-the-point-of-learning-how-to-sort-20dl)
+For example bubble sort, quick sort, and selection sort all take the same input and produce the same output but at different speeds. This is a nice way to show how different approaches can yield more efficient algorithms using approaches such as divide and conquer. On top of that, sorting algorithms don't require advanced data structures knowledge to understand. If you can understand arrays you can understand sorting algorithm examples.
 
 ### Objectives
 

api/REST-API.md

@@ -6,7 +6,6 @@
 - What is a Restful API?
 - What is JSON?
 
-
 ### Prerequisites
 
 Here are links to lessons that should be completed before this lesson:
@@ -72,6 +71,16 @@ Again, REST is an acronym. It stands for **RE**presentational **S**tate **T**ran
 
 Basically, a REST API is simply a style of architecture that we use when we design any type of networked applications. It can be implemented in any language, but for this lesson, we will be using NodeJS.
 
+#### Key principles of a RESTful API include:
+
+**Statelessness:** The server does not store any client state between requests. Each request from a client must contain all the information necessary to understand and process that request.
+
+**Uniform Interface:** The API should have a consistent and standardized way of interacting with resources. This typically includes using standard HTTP methods like GET (retrieve), POST (create), PUT (update), DELETE (remove), etc.
+
+**Representation:** Resources are represented in various formats like JSON (JavaScript Object Notation), XML (eXtensible Markup Language), or HTML (HyperText Markup Language).
+
+**Self-contained:** Each resource should include enough information to understand how to interact with it. Hypermedia controls (e.g., links) are often used to guide clients through the API.
+
 ### HTTP Methods
 
 When you want to make a request to your API, if that one follows RESTful conventions, you will want to use specific HTTP Methods. Here are the most common ones; the ones we will be using below in the guided practice:
@@ -485,10 +494,8 @@ So, the same way, you can setup the second GET method, as planned:
 | ----------- | ----------- |
 | `/invoices` | `GET`       |
 
-With Express, routing is as easy as chaining the HTTP method to the `route()` method, taking care of putting the route you want to lookup inside of the `route()` method parenthesis.
-
 ```javascript
-app.route('/invoices').get((req, res) => {
+app.get('/invoices', (req, res) => {
   res.status(200).send(invoices);
 });
 ```
@@ -505,7 +512,7 @@ However, the beauty of a RESTful API is that we want to use the possibility to f
 So, to create these, simply add another routing to the `app`, but this time we need to fetch the ID that's included in the parameters. If you recall your server lessons, this can be done by accessing the `req.params` object. We then should iterate through all records until we find the record that has the same `id` because that is the property that we are looking for. Of course, you could use any of the object's properties, here. You would just need to adjust the route appropriately, but we will not cover this for now.
 
 ```javascript
-app.route('/customers/:id').get((req, res) => {
+app.get('/customers/:id', (req, res) => {
   let customer_id = req.params.id;
   let status = 400;
   let response = 'Unable to fetch data!';
@@ -517,7 +524,7 @@ app.route('/customers/:id').get((req, res) => {
   res.status(status).send(response);
 });
 
-app.route('/invoices/:id').get((req, res) => {
+app.get('/invoices/:id', (req, res) => {
   let invoice_id = req.params.id;
   let status = 400;
   let response = 'Unable to fetch data!';
@@ -633,6 +640,71 @@ Finally, for the `DELETE` method:
 
 And there you go! You now have a complete functioning RESTful API with full CRUD functionality!
 
+```javascript
+const express = require('express');
+const app = express();
+const PORT = 3000;
+
+// Middleware to parse JSON data in the request body
+app.use(express.json());
+
+// Sample data: Replace this with a database in a real application
+let customers = [
+  { id: 1, name: 'John Doe', email: '[email protected]' },
+  { id: 2, name: 'Jane Smith', email: '[email protected]' },
+];
+
+// GET all customers
+app.get('/customers', (req, res) => {
+  res.json(customers);
+});
+
+// GET a single customer by ID
+app.get('/customers/:id', (req, res) => {
+  const customerId = parseInt(req.params.id);
+  const customer = customers.find((c) => c.id === customerId);
+  if (customer) {
+    res.json(customer);
+  } else {
+    res.status(404).json({ error: 'Customer not found' });
+  }
+});
+
+// POST a new customer
+app.post('/customers', (req, res) => {
+  const { name, email } = req.body;
+  const newCustomer = { id: customers.length + 1, name, email };
+  customers.push(newCustomer);
+  res.status(201).json(newCustomer);
+});
+
+// PUT (update) an existing customer by ID
+app.put('/customers/:id', (req, res) => {
+  const customerId = parseInt(req.params.id);
+  const { name, email } = req.body;
+  const customerIndex = customers.findIndex((c) => c.id === customerId);
+  if (customerIndex !== -1) {
+    customers[customerIndex] = { id: customerId, name, email };
+    res.json(customers[customerIndex]);
+  } else {
+    res.status(404).json({ error: 'Customer not found' });
+  }
+});
+
+// DELETE a customer by ID
+app.delete('/customers/:id', (req, res) => {
+  const customerId = parseInt(req.params.id);
+  customers = customers.filter((c) => c.id !== customerId);
+  res.json({ message: 'Customer deleted successfully' });
+});
+
+// Start the server
+app.listen(PORT, () => {
+  console.log(`Server running on http://localhost:${PORT}`);
+});
+
+```
+
  </details>
 
 ## PART III: Reference, Practice and Supplemental Materials
@@ -693,12 +765,9 @@ Because practice makes perfect, especially with REST APIs, work with you pair on
 
 - If you want to follow along another type of guided practice, you can have a look at how to [Build a Node.js API in Under 30 Minutes](https://www.freecodecamp.org/news/building-a-simple-node-js-api-in-under-30-minutes-a07ea9e390d2/) blog post.
 - [5 Minute Intro to REST APIs](https://www.newline.co/@bchiang7/5-minute-intro-to-rest-apis--b5081674)
-
 - Another great resource is the [What is a RESTful API](https://www.youtube.com/watch?v=Q-BpqyOT3a8) video tutorial by Traversy Media.
 - To learn about the Guiding principles of REST:
   - [restfulapi.net](https://restfulapi.net/rest-architectural-constraints/)
   - [Wikipidia](https://en.wikipedia.org/wiki/Representational_state_transfer#cite_note-Fielding-Ch5-3)
   - [Dinesh on Java](https://www.dineshonjava.com/what-is-rest-and-rest-architecture-and-rest-constraints/), to show you APIs can be built with any language but keep their familiarity.
   - [Future Vision on Medium](https://medium.com/future-vision/what-are-the-constraints-of-rest-and-how-they-saved-the-internet-6fb8503138ab)
-  - [A visual blog post](https://blog.appscrip.com/what-is-restful-api-key-constraints-use-cases/)
-

api/apis-and-json.md

@@ -7,8 +7,7 @@
 - What is the syntax and structure of JSON
 - What is the difference between JSON and a Javascript Object?
 - What are serialization and deserialization?
-- How does one  read data from a JSON?
-
+- How does one read data from a JSON?
 
 ### Prerequisites
 

api/http-request-practice.md

@@ -156,7 +156,6 @@ Open a new tab to try to issue the same `fetch` command.
 
 What happens?
 
-- [b0rk explains CORS](https://twitter.com/b0rk/status/1162392625057583104)
 - [Hacking It Out: When CORS won’t let you be great](https://medium.com/netscape/hacking-it-out-when-cors-wont-let-you-be-great-35f6206cc646)
 
 To keep things simple, for this example, we just load the same origin, worldtimeapi.org, so we didn't have to worry about it.

api/intro-to-http.md

@@ -30,7 +30,6 @@ HTTP is the backbone of the web, for both human users and other programs (APIs)
 ### Materials
 
 - [HTTP Crash Course](https://www.youtube.com/watch?v=iYM2zFP3Zn0) - _first 17 minutes are all that matter but feel free to watch the whole thing as it covers Postman_
-- b0rk's [Anatomy of an HTTP Request](https://twitter.com/b0rk/status/1145362860136177664/photo/1)
 - [Routing HTTP requests](https://blog.dadops.co/p/c33b0dd1-aa9f-4e7d-a19c-d609a20c884a/)
 - [Servers, Requests, and Responses](https://blog.dadops.co/p/acff7914-23ae-4b47-bd04-aa2524267690/)
 
@@ -83,8 +82,7 @@ Instead of using a browser, let's see what's happening underneath by using `nc`,
 
 Extend your Node web server above to console.log which browser the user is uses. Try out mobile browsers to see how they look different.
 
-Hint: Add this line to your server-side Node.js code  `console.log(req.headers['user-agent'])`
-
+Hint: Add this line to your server-side Node.js code `console.log(req.headers['user-agent'])`
 
 #### How to know what is required?
 
@@ -96,3 +94,5 @@ If you're curious what each required piece is, check out this [simplified HTTP s
 
 - [HTTP Status Code Cats](https://http.cat/)
 - [HTTPS explained with Carrier Pigeons](https://www.freecodecamp.org/news/https-explained-with-carrier-pigeons-7029d2193351/)
+- [Node, Express, & HTTP Requests with Russ Harmon](https://www.dropbox.com/scl/fi/edoomibrdgvvbbmxbsx2z/GMT20231011-220541_Recording_gallery_2560x1440.mp4?rlkey=uir7qjdylsrusd3n12jam3y2x&dl=0)
+- [SQL & APIs with Andy Peterson](https://www.dropbox.com/scl/fi/jbbuhorda3w3z8c4yslkq/GMT20231012-210808_Recording_gallery_1920x1258.mp4?rlkey=h2moholvboaued3o0zj2emd61&dl=0)

best-practice-in-development/best-practice-in-client-side-development.md

@@ -1,11 +1,5 @@
 # Best Practices in Client-side Development
 
-### Projected Time
-
-About 20-30 minutes
-
-- Lesson: 20 min
-
 ### Prerequisites
 
 [HTML](/web/html.md) and [CSS](/web/css.md)
@@ -32,7 +26,3 @@ About 20-30 minutes
 - Lorem Ipsum/Picsum is filler text used before exact content is ready. It allows you to visualize the font-family and font colors until the real text is swapped in.
   Link to pick up dummy text : [Lorem Ipsum](https://www.lipsum.com/)
   Link to pick up dummy images :[Lorem Picsum](https://picsum.photos/)
-
-### Supplemental Materials
-
-- [Best Practices For Front-End Coding](https://www.belatrixsf.com/blog/best-practices-for-front-end-coding/)

career/building-confidence.md

@@ -45,9 +45,7 @@ You’ll communicate more effectively: Confidence allows you to speak concisely
 Slides
 
 - [Building Confidence](https://docs.google.com/presentation/d/1EauFdEp4UJcBK50ioj-giPwFeWf2FHc7i_rn0XGf5f8/edit)
-- [Confidence in the Workplace](https://www.indeed.com/career-advice/career-development/self-confidence#:~:text=Examples%20of%20self%2Dconfidence%20in%20the%20workplace&text=Always%20doing%20the%20right%20thing,Accepting%20praise%20for%20completed%20projects.)
-
-Videos:
+  Videos:
 
 - [Sheryl Sandberg impostor syndrome](https://www.youtube.com/watch?v=DNikR2GQwVg&t=39s)
 - [Positive, Rational Thinking](https://www.youtube.com/watch?v=KjDfnUaFKCE)
@@ -137,11 +135,11 @@ _Tip: If a site says you've read too many articles, you can generally use a diff
 
 ### Check for Understanding
 
-- What is trust?How important is it in our lives?
+- What is trust? How important is it in our lives?
 - What did a recent survey by kaplanprofessional say about trust?
 - Why do we need to be confident in the workspace?
 - What do you realize that causes low confidence in you?
-- What is SWOT ?
-- What is the difference between Rational Thinking / Positive Thinking?
+- What is SWOT?
+- What is the difference between Rational and Positive Thinking?
 - What does Bernice Moore's Theory says?
 - Follow the steps for SOS (Stop, Observe, Shift), the negative self-talk stopping technique. Also explain the concept of impostor syndrome for awareness!