Merge branch 'main' of github.com:turingschool/curriculum-site

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)
@@ -44,13 +42,11 @@ title: Mod 0 - Lessons
 * [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`.
 
-<!--
-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!

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/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

module2/projects/coupon-codes/index.md

@@ -32,7 +32,7 @@ This is a solo project. All code must be written by you. You should use your res
 This project is an extension of Little Shop. You'll need to start this project with a frontend repo and backend repo. Read below carefully for the set-up instructions.
 
 **Backend Repo**
-- If your Little Shop project is complete, you can use the backend repo as your starting point for this project. If you are not the repo owner, fork the project to your account. If you are the repo owner, you can work off the repo without forking, just make sure your teammates have a chance to fork before pushing any commits to either repo.
+- If your Little Shop project is complete, you can use the backend repo as your starting point for this project.  🚨 **IMPORTANT**: Each team member who wants to use your Little Shop group project repo must **fork** the repo, including the repo owner.   No work should be pushed to your original group project repo throughout this project.  
 - If your Little Shop backend is _not_ complete, fork **[this backend repo](https://github.com/turingschool-examples/little-shop-be-final-starter)** as a starting point for this project.  Do not clone it into the BE directory - keep them separate.  
 
 

module2/projects/index.md

@@ -8,16 +8,16 @@ title: Module 2 - Projects
 The following projects will be assigned and their completion is required to be promoted to module 3.  
 The project specs will be linked below as each project is assigned.
 
-- Week 1-2 (FE Solo): [Hang In There (FE)](./hang_in_there)
-<!-- - Week 3 (Paired): TBA -->
-- Week 3 (Paired): [Hang In There API](./hang_in_there_api/)
-<!-- - Week 4-5 (Group): TBA -->
-- Week 4-5 (Group): [Little Shop](./little_shop/)
-<!-- - Week 5-6 (Final Solo): TBA -->
-- Week 5-6 (Final Solo): [Coupon Codes](./coupon-codes/)
-
+- Week 1-2 (FE Solo): TBA
+<!-- - Week 1-2 (FE Solo): [Hang In There (FE)](./hang_in_there) -->
+- Week 3 (Paired): TBA
+<!-- - Week 3 (Paired): [Hang In There API](./hang_in_there_api/) -->
+- Week 4-5 (Group): TBA
+<!-- - Week 4-5 (Group): [Little Shop](./little_shop/) -->
+- Week 5-6 (Final Solo): TBA
+<!-- - Week 5-6 (Final Solo): [Coupon Codes](./coupon-codes/) -->
 
 ## Additional Projects and Resources
 
 - [PR Template](./pr_template)
-- [jsFUNk:](./js_funk) Daily assessment prep with JS data manipulation exercises
+- [jsFunk:](./js_funk) Daily assessment prep with JS data manipulation exercises