Merge branch 'main' into caching_class

calendars/calendars.html

@@ -87,11 +87,8 @@ <h2>Mod 3</h2>
 
 <section class="module-content" data-module="4" style="display: none">
   <h2>Mod 4</h2>
-  <p>Coming soon!</p>
 
-  <!-- Do not make live until calendar is ready: -->
-
-  <!-- <div class="responsive-iframe-container">
+  <div class="responsive-iframe-container">
     <div class='tablet'>
       <iframe src="https://calendar.google.com/calendar/embed?showTitle=0&amp;showPrint=0&amp;showCalendars=0&amp;mode=AGENDA&amp;height=400&amp;wkst=1&amp;bgcolor=%23FFFFFF&amp;src=casimircreative.com_c1s3vspg5v09vh5cnnh88dn2nc%40group.calendar.google.com&amp;color=%23875509&amp;ctz=America%2FDenver"
         style="border-width:0" frameborder="0" scrolling="no"></iframe>
@@ -100,7 +97,7 @@ <h2>Mod 4</h2>
       <iframe src="https://calendar.google.com/calendar/embed?showTitle=0&amp;showNav=1&amp;showDate=0&amp;showPrint=0&amp;showTabs=0&amp;showCalendars=0&amp;showTz=0&amp;mode=WEEK&amp;height=400&amp;wkst=1&amp;bgcolor=%23FFFFFF&amp;src=casimircreative.com_c1s3vspg5v09vh5cnnh88dn2nc%40group.calendar.google.com&amp;color=%23875509&amp;ctz=America%2FDenver"
         style="border-width:0" frameborder="0" scrolling="no"></iframe>
     </div>
-  </div> -->
+  </div>
 </section>
 
 <h2>Community Calendar</h2>

module0/index.md

@@ -10,14 +10,14 @@ title: Welcome to Module 0
     <th>Mod 1 Cohort (Start Date)</th>
     <th>Mod 0 Dates</th>
   </tr>
-  <tr>
-    <td>2410 (Oct 7)</td>
-    <td>September 30 - October 6</td>
-  </tr>
   <tr>
     <td>2412 (Dec 2)</td>
     <td>November 11 - November 15</td>
   </tr>
+  <tr>
+    <td>2502 (Feb 3)</td>
+    <td>January 13 - January 17</td>
+  </tr>
 </table>
 
 Mod 0 is a **required** course for Turing's Software Engineering programs designed to ensure students are ready to begin engaging with technical content on the first day of Mod 1. The course supports students in the following areas:

module0/lessons/index.md

@@ -31,8 +31,6 @@ title: Mod 0 - Lessons
 * [Problem Solving]({{ site.url }}/module0/lessons/problem-solving)
 * Before session 3, your Mod 0 Gist should contain sections and CFU answers for `Data Types`, `Arrays`, `Asking Technical Questions`, `DTR Prep`, `Calendaring & Time Management`, `Git Workflow`, and `Problem Solving`.
 
-
-
 ## Session 3
 ### Live Sessions
 * [GitHub]({{ site.url }}/module0/lessons/github)
@@ -42,15 +40,13 @@ title: Mod 0 - Lessons
 * [Methods repository](https://github.com/turingschool/methods_cfu_am0) (Use the Methods lesson Follow the instructions in the README to complete this asignment)
 * [Beyond Mod 0 Plan]({{ site.url }}/module0/lessons/plan)
 * [Final Reflections]({{ site.url }}/module0/lessons/final-reflections)
-* By the end of the day Saturday, your Mod 0 Gist should contain all CFU answers and assignments including sections for `Data Types`, `Arrays`, `Asking Technical Questions`, `DTR Prep`, `Calendaring & Time Management`, `Git Workflow`, `Problem Solving`, `GitHub` `Conditionals`, `Methods`, `Beyond Mod 0 Plan`, and `Final Reflections`.
+* By the end of the day Sunday, your Mod 0 Gist should contain all CFU answers and assignments including sections for `Data Types`, `Arrays`, `Asking Technical Questions`, `DTR Prep`, `Calendaring & Time Management`, `Git Workflow`, `Problem Solving`, `GitHub` `Conditionals`, `Methods`, `Beyond Mod 0 Plan`, and `Final Reflections`.
+
 
-<!--
-Put this section back in for traditional mod 0 (non intermission Mod 0)
 ## Complete Before Mod 1
 Note: You are not expected to be experts on these topics, but you should come to Mod 1 ready to ask questions about the topics covered in these lessons.
 * Pre-teach this [Testing]({{ site.url }}/module0/lessons/testing) lesson.
 * Complete some [Programming Exercises](https://github.com/turingschool-examples/se-mod1-exercises). We'd like you to focus on the `data-types`, `ints-and-floats`, and `strings` folders.
--->
 
 ## Important Note
 On the first day of Mod1, you we will be introducing you to all of the instructors at **8:30 AM MT**.  Make sure to note this early start on your calendar!!

module0/prework/index.md

@@ -13,14 +13,14 @@ title: Mod 0 - Prework
 * [Markdown]({{ site.url }}/module0/prework/markdown)
 * [Terminal]({{ site.url }}/module0/prework/terminal)
 * [VS Code]({{ site.url }}/module0/prework/vs-code)
-<!-- * [Introduction Video]({{ site.url }}/module0/prework/intro-video) -->
+* [Introduction Video]({{ site.url }}/module0/prework/intro-video)
 
 ## Prework Submission
 Once you have completed all your prework items, please create a new Github Gist that includes the following:
 1. A header that says "Mod 0 Gist - [Your Name]"
 1. A subheader with your pronouns and cohort (ex: she/her 2407)
 1. An "About Me" section with an introduction about who you are and why you decided to come to Turing.
-<!-- 1. A link to your slack thread post of your loom Intro Video. (You can find this link by hovering over your slack thread post, clicking the three dots, then selecting _Copy Link_) -->
+1. A link to your slack thread post of your loom Intro Video. (You can find this link by hovering over your slack thread post, clicking the three dots, then selecting _Copy Link_)
 1. Be sure to save the file as a markdown file by using a `.md` file type. For example, you might name the file `kaylagordon_mod0gist.md`.
 1. Check that you save this as a secret gist, not a public one.
 1. Bookmark this Gist - you will be adding to it in the future (read the Notes below)!
@@ -29,7 +29,7 @@ Once you have completed all your prework items, please create a new Github Gist
 ## Important Notes
 Throughout Mod 0 you will have many opportunities to practice the information you learn. One of the ways we have you reflect on your learnings is by answering CFU (Check For Understanding) questions. At the end of each live lesson and homework lesson, there will be a set of CFUs for you to respond to. To track these responses, we will have you use the same Mod 0 Gist you submit as your prework. You will be able to add to this gist throughout Mod 0 and instructors will be able to see those updates and provide feedback. 
 
-If you get stuck when creating this Gist, refer back to the [Markdown lesson]({{ site.url }}/prework/markdown).
+If you get stuck when creating this Gist, refer back to the [Markdown lesson]({{ site.url }}/module0/prework/markdown).
 
 Here is a sample of how you might structure your Mod 0 Gist file:
 ```markdown
@@ -38,9 +38,10 @@ Here is a sample of how you might structure your Mod 0 Gist file:
 
 ## About Me
 I am a former educator who loves my dog. I'm excited to join Turing because...
+
+## Intro Video Link
+[Link](URL to slack thread here...)
 ```
-<!-- ## Intro Video Link
-[Link](URL to slack thread here...) -->
 
 
 You cannot begin Mod 0 until this prework is submitted. Reach out via Slack early if you have any questions or concerns!

module1/lessons/git_for_pairs.md

@@ -97,8 +97,8 @@ In order to fix it, you need to change the text of the file to include only the
 * Add collaborator on github
 
 * Check out new branch (`git checkout -b new_feature`)
-* Changes the existing file (the name of the class and some of the attributes - don't change the filename)
-* Commits and pushes to branch
+* Change the existing file (the name of the class and some of the attributes - don't change the filename)
+* Commit and push to branch
   - `git status`
   - `git add filename.rb`
   - `git status`
@@ -107,18 +107,18 @@ In order to fix it, you need to change the text of the file to include only the
   - Do NOT do anything on GitHub, switch to Person B
 
 #### Person B
-* accepts invitation
-* clones repo (`git clone <ssh key to repo>`)
-* cds into cloned repo
-* checks out a new branch (`git checkout -b add_content`)
-* changes the existing file (change class name and the attributes to something different than person A did)
-* commits and pushes to branch
+* accept invitation
+* clone repo (`git clone <ssh key to repo>`)
+* cd into cloned repo
+* check out a new branch (`git checkout -b add_content`)
+* change the existing file (change class name and the attributes to something different than person A did)
+* commit and push to branch
   - `git status`
   - `git add filename.rb`
   - `git status`
   - `git commit -m "changes first line"`
   - `git push origin add_content`
-* Creates a Pull Request on Github
+* Create a Pull Request on Github
 
  -**Stop Here until your next break out room session**-
 
@@ -128,12 +128,12 @@ In order to fix it, you need to change the text of the file to include only the
 
 Remote main is now updated.
 
-From `new_feature` branch (should already be on this): 
-* pulls origin main into `new_feature`
+From `new_feature` branch (you should already be on this): 
+* pull origin main into `new_feature` branch
   - `git pull origin main`
-* fixes merge conflict
-* commits and pushes to remote `new_feature`
-* creates pull request on Github
+* fix merge conflict
+* commit and push to remote `new_feature` branch
+* create pull request on Github
 
 #### Person B
 * Review and comment on Person A's Pull Request
@@ -143,6 +143,8 @@ From `new_feature` branch (should already be on this):
 * Checkout local main and pull from main
   * `git checkout main`
   * `git pull origin main`
+
+-**Close**-
 
 
 ## Checks for Understanding

module1/projects/flashcards/peer_code_review.md

@@ -7,7 +7,7 @@ _[Back to FlashCards Home](./index)_
 
 ## Peer Code Review
 
-With your partner, please answer the following questions.  Take notes and share those notes with your partner.
+With your partner, please answer the following questions.
 
 1. Review the `number_correct` method on the Round class:
     * Discuss the decisions you made to either store this information as an instance variable, or calculate the number any time the method is called.

module1/projects/flashcards/requirements.md

@@ -18,6 +18,6 @@ In addition to the functionality outlined in these iterations, we will expect th
 * write tests for each class
 * write readable code
 * make frequent commits
-* use pull requests
+* submit via pull request
 
 For more detailed information about what we expect, please review the [rubric](./rubric) before starting this project!

module1/projects/flashcards/setup.md

@@ -6,7 +6,7 @@ title: FlashCards - Setup
 _[Back to FlashCards Home](./index)_
 
 
-* Fork [this repository](https://github.com/turingschool-examples/flash_cards)
+* Fork <a href="https://github.com/turingschool-examples/flash_cards" target="_blank">this repository</a>
 * Clone YOUR fork to your computer
 * Make sure you don't clone the turingschool-examples repository
   * You can confirm that you have cloned the correct repository by running `git remote -v`. You should see something like this:

module1/projects/index.md

@@ -10,15 +10,15 @@ The project specs will be linked below as each project is assigned.
 
 <!-- Week 1 (Ungraded): [Credit Check](./credit_check.markdown)-->
 <!-- Alternate between Flash Cards and War or Peace for repeaters -->
-Week 1-2 (Solo): [War or Peace](./war_or_peace/) 
-<!-- Week 1-2 (Solo): [Flash Cards](./flashcards/) -->  
+<!-- Week 1-2 (Solo): [War or Peace](./war_or_peace/) -->
+Week 1-2 (Solo): [Flash Cards](./flashcards/)  
 Week 2-3 (Solo): [DMV](./dmv/)  
-<!-- Week 2-3 (Solo): TBD -->
+<!-- Week 2-3 (Solo): TBD  -->
 <!-- Option to add more advanced option with Connect Four as other pair project -->
 <!-- Week 3-4 (Paired): TBD -->
-Week 3-4 (Paired):  [Battleship](./battleship/)   
-<!-- -->
-Week 5-6 (Group Final): [Futbol](./futbol_pd/)
+Week 3-4 (Paired):  [Battleship](./battleship/)  
+Week 5-6 (Group Final): TBD  
+<!-- Week 5-6 (Group Final): [Futbol](./futbol_pd/) -->
 
 ## Additional Projects and Resources
 

module2/index.md

@@ -19,9 +19,9 @@ In Module 2, students will be introduced to HTML, CSS, and JavaScript while also
 - [Lessons](./lessons)
 - [Projects](./projects)
 
-<!-- ## Other Resources
+## Other Resources
 
-- Coming Soon! -->
+- [Active Record Obstacle Course](https://github.com/turingschool-projects/activerecord-obstacle-course)
 
 ## Requirements
 

module2/intermission_work/index.md

@@ -49,12 +49,14 @@ Time-box recommendations are in each section's instructions, and also included h
 Do a modified version of the assignments above:
 
 - [Intro to SQL](./sql) (1-2 hrs total)
-  - You can skip the Jumpstart Lab tutorial if you like. You can use the Checks for Understanding as a gauge of whether you need to review it or not.
+  <!-- - You can skip the Jumpstart Lab tutorial if you like. You can use the Checks for Understanding as a gauge of whether you need to review it or not. -->
+  - You can skip the SQLBolt tutorial if you like. You can use the Checks for Understanding as a gauge of whether you need to review it or not.
   - Work on the SQL exercises. Spend at least 1 hour in all three sections.
   - Complete the Checks for Understanding
-- [Task Manager](https://github.com/turingschool-examples/task_manager_rails)
-  - Review your code. If you do not have a copy, use the completed repo linked at the bottom of the README.
+- [Task Manager](https://github.com/turingschool-examples/se_task_manager_rails)
+  - Try to build the application by referencing the README only when you get stuck.
   - Answer the Checks for Understanding at the end of the README.
+  - **BONUS!** Add another table (i.e. `users`) and create a one-to-many relationship between `tasks` and the additional table. You should also add the ability to CRUD this additional data as well. (i.e. View all users, View a user, Delete a user, etc.)
 - Complete a timed [Dog Party](./dog_party)
   - As you work, reference the [W3Schools HTML5 Tutorial](https://www.w3schools.com/html/default.asp) and [W3Schools CSS Tutorial](https://www.w3schools.com/css/default.asp)
 

module2/intermission_work/sql.md

@@ -7,9 +7,13 @@ SQL is a programming language used to interact with a database. Learning to inte
 
 For your SQl intermission work, you will complete an introductory tutorial, and then will complete some exercises to help you practice the most important SQL concepts. This assignment is meant as an introduction to sql, so don't be alarmed if you don't feel like you have mastered these concepts. Use the accompanying Checks for Understanding to assess yourself.
 
-## Jumpstart Lab Tutorial
+<!-- ## Jumpstart Lab Tutorial
 
-Work through the [Jumpstart Lab SQL Tutorial](http://tutorials.jumpstartlab.com/topics/sql/fundamental_sql.html), **but you don't need to read past the "Adding Columns to the Table" section** Then complete the Checks for Understanding.
+Work through the [Jumpstart Lab SQL Tutorial](http://tutorials.jumpstartlab.com/topics/sql/fundamental_sql.html), **but you don't need to read past the "Adding Columns to the Table" section** Then complete the Checks for Understanding. -->
+
+## SQLBolt Introduction to SQL Tutorial
+
+Work through the [SQLBolt Intro to SQL Tutorial](https://sqlbolt.com/), **but you don't need to complete anything under the "Additional Topics" section.** Then complete the Checks for Understanding below, followed by the SQL exercises underneath.
 
 ### Checks for Understanding
 
@@ -19,10 +23,10 @@ Work through the [Jumpstart Lab SQL Tutorial](http://tutorials.jumpstartlab.com/
 1. What is a Table?
 1. What is a primary key?
 1. Explain what each of the following SQL commands do:
-  * insert
-  * select
-  * where
-  * order by
+    * insert
+    * select
+    * where
+    * order by
 
 ## SQL Exercises
 

module2/lessons/css_fundamentals.md

@@ -235,7 +235,7 @@ Today you will work on `iteration 1` of [this activity](https://github.com/kayla
 <section class="call-to-action">
 ### Solo Journaling
 
-- How does CSS differ from HTML?
+- How does CSS get applied to HTML elements?
 - Explain the Box Model
 - What questions do you still have about CSS?
 

module2/lessons/how_the_web_works_api.md

@@ -201,7 +201,8 @@ When thinking about the role that APIs play in our web applications, they are an
 - **Rate Limiting:** Many APIs restrict the number of requests you can make in a given time period.
 - **Cost:** Some APIs charge for usage, which can become expensive as your application scales.
 - **Versioning Issues:** API providers may update their services, potentially breaking your integration if you don't keep up.
-- **Limited Conrol:** You're bound by the API's functionality and can't easily modify it to suit your specific needs.
+- **Limited Control:** You're bound by the API's functionality and can't easily modify it to suit your specific needs.
+
 </section>
 
 ## Additional Postman Practice

module2/lessons/js_approaching_problems_many_ways.md

@@ -322,4 +322,4 @@ Steps in the solution:
 
 
 ## Looking Ahead
-While you are working on jsFUNk, **take the time to solve the same problem multiple ways**. This will reduce the likelihood that you become too attached or too afraid of an iterator method. It can also help to understand each method better if you are comparing them to each other. Remember that jsFUNk is there to help you learn - finishing the problems as fast as you can is not the goal!
+While you are working on jsFunk, **take the time to solve the same problem multiple ways**. This will reduce the likelihood that you become too attached or too afraid of an iterator method. It can also help to understand each method better if you are comparing them to each other. Remember that jsFunk is there to help you learn - finishing the problems as fast as you can is not the goal!

module2/lessons/js_fundamentals.md

@@ -530,7 +530,7 @@ evaluateSleep(4)
 
 <section class="answer">
 
-### Exercise 3
+### Exercise 2
 
 Imagine you're a developer for AAA. Your website needs to provide different information to users based on their age.
 

module2/lessons/js_intro_to_dom_manipulation.md

@@ -369,7 +369,7 @@ Note that if you are going to add/remove a class via JavaScript, that class shou
 ### Key Takeaways
 - In your CSS file you can apply styles to specific class selectors.  Then you can use JS to add/remove/toggle that class to specified elements so that it will/will not have those styles applied.
 - If you're going to add/remove a class with JavaScript, the styling for that class should be declared **below** the original styling for the given element in the CSS file. 
-- We _can_ apply styles to an element directly with JavaScript but manipulating the `.style` property - but we do not want to do this.
+- We _can_ apply styles to an element directly with JavaScript by manipulating the `.style` property - but we do not want to do this.
 
 
 </section>

module2/lessons/midmods_practice.md

@@ -170,4 +170,4 @@ console.log(calculateCost('marta'));
 
 ## Closing 
 
-You're ready for midmods! If anything weird happened with VS Code Live Share, let your instructors know right away. Remember that working through **[your jsFUNk repo](https://github.com/turingschool-examples/jsFUNk)** is the best way to technically prepare for M2 assessments. You got this!
+You're ready for midmods! If anything weird happened with VS Code Live Share, let your instructors know right away. Remember that working through **[your jsFunk repo](https://github.com/turingschool-examples/jsFunk)** is the best way to technically prepare for M2 assessments. You got this!

module2/projects/coupon-codes/back_end_requirements.md

@@ -27,8 +27,7 @@ rails db:migrate
    - A merchant can have a maximum of 5 activated coupons in the system at one time.
    - A merchant cannot delete a coupon, rather they can activate/deactivate them.
    - A Coupon has a name, unique code (e.g. "BOGO50"), and either percent-off or dollar-off value. The coupon's code must be unique in the whole database.
-* If a coupon's dollar value (ex. "$10 off") exceeds the total cost of that merchant's items on the invoice, the grand total for that merchant's items should then be $0. (In other words, the merchant will never *owe* money to a customer.)
-* A coupon code from a Merchant only applies to Items sold by that Merchant.
+
 
 ​
 ## 1) CRUD Endpoints