From a20d3d6dd227d6a927df1a10065be874ea1aef8d Mon Sep 17 00:00:00 2001 From: Bonnie Eisenman Date: Wed, 23 Sep 2015 19:08:46 -0400 Subject: [PATCH 01/39] add cc links --- units/10-HTML_CSS2/README.md | 6 ++++++ units/11-bootstrap/README.md | 6 ++++++ units/12-jQuery/README.md | 7 +++++++ units/13-javascript2_1/README.md | 6 ++++++ units/14-javascript2_2/README.md | 5 +++++ units/2-HTML1/README.md | 6 ++++++ units/3-CSS1/README.md | 6 ++++++ units/4-GA-/README.md | 2 ++ units/5-javascript1_1/README.md | 4 ++++ units/6-javascript1_2/README.md | 6 ++++++ units/7-commandline/README.md | 4 ++++ units/9-HTML2/README.md | 6 ++++++ 12 files changed, 64 insertions(+) diff --git a/units/10-HTML_CSS2/README.md b/units/10-HTML_CSS2/README.md index 55d4ef5..6545566 100755 --- a/units/10-HTML_CSS2/README.md +++ b/units/10-HTML_CSS2/README.md @@ -9,6 +9,12 @@ This unit delves into `
` tags, `id`, `class`, float, transitions, and anima 2. [CSS Robot Project](sessons/2-project) 2. [CSS Zen Garden](https://github.com/ScriptEdcurriculum/ZenGardenUnit10) +##Codecademy Resources + +1. [HTML Basics III](http://www.codecademy.com/courses/web-beginner-en-f8mcL/0/1?curriculum_id=50579fb998b470000202dc8b) - introduces `
`, ``, and `` +2. [CSS Positioning, exercises 13-25](http://www.codecademy.com/courses/web-beginner-en-6merh/2/1?curriculum_id=50579fb998b470000202dc8b) - covers CSS positioning, including `float` and `clear` properties as well as `static`, `absolute`, and `relative` positioning +3. [Build a Resume](http://www.codecademy.com/courses/web-beginner-en-9x6JW-WnAFv/0/1?curriculum_id=50579fb998b470000202dc8b) - use CSS knowledge so far to build a resume + ####English Standards [CCSS.ELA-LITERACY.L9-10.1](http://www.corestandards.org/ELA-Literacy/L/9-10/1/) diff --git a/units/11-bootstrap/README.md b/units/11-bootstrap/README.md index 2f80842..729e055 100644 --- a/units/11-bootstrap/README.md +++ b/units/11-bootstrap/README.md @@ -9,6 +9,12 @@ This unit focuses on the styling of websites using the Bootstrap framework. The 2. [Responsive Webpages](sessions/2-responsive) [Project: Character Site](sessions/project-character) +##Codecademy Resources + +1. [Make a Website - Introduction to Bootstrap](https://www.codecademy.com/en/skills/make-a-website/topics/bootstrap-components) +2. [Shutterbug Project](https://www.codecademy.com/en/courses/html-css-prj/projects/html-css-prj_shutterbugg) - practice using the Boostrap grid +3. [Red Eye Project](https://www.codecademy.com/en/courses/html-css-prj/projects/html-css-prj_red-eye) - practice using the Bootstrap grid + ##Standards ####English Standards diff --git a/units/12-jQuery/README.md b/units/12-jQuery/README.md index 59a993b..bbfbd77 100644 --- a/units/12-jQuery/README.md +++ b/units/12-jQuery/README.md @@ -10,6 +10,13 @@ This unit makes an introduction to jQuery. Students will learn about selectors a [Project: The jQuery Site](sessions/3-project-jQuerySite) [Project: The Facebook Wall](https://github.com/ScriptEdcurriculum/facebook_wall) +##Codecademy Resources + +1. [Introduction to jQuery](https://www.codecademy.com/courses/web-beginner-en-bay3D/0/1?curriculum_id=50a3fad8c7a770b5fd0007a1) +2. [jQuery - Modifying HTML Elements](https://www.codecademy.com/courses/web-beginner-en-v6phg/0/1?curriculum_id=50a3fad8c7a770b5fd0007a1) +3. [jQuery - Events](https://www.codecademy.com/courses/web-beginner-en-JwhI1/0/1?curriculum_id=50a3fad8c7a770b5fd0007a1) +4. [Birdman Project](https://www.codecademy.com/en/courses/jquery-prj/projects/jquery-prj_birdman) - build a dropdown menu using a click event + ##Standards ###CPP.L2-05 I - Event-Driven Behavior diff --git a/units/13-javascript2_1/README.md b/units/13-javascript2_1/README.md index fb7ce91..5012f13 100644 --- a/units/13-javascript2_1/README.md +++ b/units/13-javascript2_1/README.md @@ -11,6 +11,12 @@ This unit introduces arrays and loops to our students. Students will learn how t 4. [Arrays](sessions/4-array) [Project: Color Changer](sessions/5-project-colorChanger) +##Codecademy Resources + +1. [Introduction to While Loops in Javascript](https://www.codecademy.com/courses/javascript-beginner-en-ASGIv/0/1?curriculum_id=506324b3a7dffd00020bf661) +2.[Introduction to For Loops in Javascript](https://www.codecademy.com/courses/javascript-beginner-en-NhsaT/0/1?curriculum_id=506324b3a7dffd00020bf661) +3.[Arrays and Loops](https://www.codecademy.com/courses/javascript-beginner-en-NhsaT/2/1?curriculum_id=502d635ceda910000200293b#!/exercises/0) - exercises 9-13 + ##Standards ###CPP.L2-05 I - Arrays diff --git a/units/14-javascript2_2/README.md b/units/14-javascript2_2/README.md index 5deacef..36efcb7 100644 --- a/units/14-javascript2_2/README.md +++ b/units/14-javascript2_2/README.md @@ -10,6 +10,11 @@ This unit introduces hashes. Students will learn how to initialize, store, and r [Project: Around the World](sessions/3-project-aroundTheWorld) [Project: Address Book](sessions/4-projectaddressBook) +##Codecademy Resources + +1. [Introduction to Objects, exercises 6-12](https://www.codecademy.com/courses/spencer-sandbox/1/1?curriculum_id=506324b3a7dffd00020bf661) + + ##Standards ###CPP.L3A-08 I diff --git a/units/2-HTML1/README.md b/units/2-HTML1/README.md index 1aea85a..d9792a3 100755 --- a/units/2-HTML1/README.md +++ b/units/2-HTML1/README.md @@ -11,6 +11,12 @@ This unit introduces students to the fundamentals of web design using HTML. It a 4. [Images](sessions/4-image) 5. [Project #2: Images](sessions/5-project-image) +##Codecademy Resources + +1. [HTML Basics](http://www.codecademy.com/courses/web-beginner-en-HZA3b/0/1?curriculum_id=50579fb998b470000202dc8b) - teaches the tags covered in this unit +2. [Build Your Own Webpage](https://www.codecademy.com/courses/web-beginner-en-LceTK/0/1?curriculum_id=50579fb998b470000202dc8b) - re-inforces HTML learned thus far + + #Standards ###English Standards diff --git a/units/3-CSS1/README.md b/units/3-CSS1/README.md index d785057..8c94f77 100755 --- a/units/3-CSS1/README.md +++ b/units/3-CSS1/README.md @@ -10,6 +10,12 @@ This unit focuses on the styling of websites using CSS. Through several learning 3. [Project: CSS ScriptEd Garden](sessions/3-project-garden) 4. [Project: About Who?](sessions/4-project-who) +##Codecademy Resources + +1. [CSS: An Overview](http://www.codecademy.com/courses/web-beginner-en-TlhFi/0/1?curriculum_id=50579fb998b470000202dc8b) +2. [Design a Button For Your Website](http://www.codecademy.com/courses/web-beginner-en-UuBLw/0/1?curriculum_id=50579fb998b470000202dc8b) - build a button by styling divs and links +3. [Make a Website](https://www.codecademy.com/en/skills/make-a-website) - practice using HTML and CSS to style Airbnb's website + ##Standards ####English Standards diff --git a/units/4-GA-/README.md b/units/4-GA-/README.md index 06fec27..522391b 100755 --- a/units/4-GA-/README.md +++ b/units/4-GA-/README.md @@ -8,7 +8,9 @@ This unit uses a step-by-step walkthough produced by General Assembly. In this w 1. [GA Dash](sessions/1-walkthrough) +##Codecademy Resources +1. [Make an Interactive Website](https://www.codecademy.com/en/skills/make-an-interactive-website) - introduces Javascript and jQuery. Specifically, [this lesson](https://www.codecademy.com/en/skills/make-an-interactive-website/topics/jquery-events/jquery-user-events) covers event handlers. ##Standards diff --git a/units/5-javascript1_1/README.md b/units/5-javascript1_1/README.md index a52f7c4..b3a7389 100755 --- a/units/5-javascript1_1/README.md +++ b/units/5-javascript1_1/README.md @@ -10,6 +10,10 @@ This unit starts with an introduction to variables. Students will learn how to c 3. [Project #1: Tiny Turtle](sessions/3-project-tinyturtle) 4. [Project #2: Calculator](sessions/4-project-calculator) +##Codecademy Resources + +1. [Javascript - Getting Started with Programming](https://www.codecademy.com/courses/javascript-beginner-en-6LzGd/0/1?curriculum_id=506324b3a7dffd00020bf661) - covers introduction to basic types and variables. + ##Standards ####CPP.L2-05 I - Variables diff --git a/units/6-javascript1_2/README.md b/units/6-javascript1_2/README.md index 48f1188..0547605 100644 --- a/units/6-javascript1_2/README.md +++ b/units/6-javascript1_2/README.md @@ -11,6 +11,12 @@ This unit starts with an introduction to strings. After becoming comfortable wit 4. [Conditionals: Or/And](sessions/4-conditional) 5. [Project #2: Grading App](sessions/5-project-grading) + +##Codecademy Resources + +1. [Javascript substrings](https://www.codecademy.com/courses/getting-started-v2/3/5?curriculum_id=506324b3a7dffd00020bf661) - exercises 22 and 23 cover substrings +2. [Javascript: Make your computer think!](https://www.codecademy.com/courses/getting-started-v2/2/1?curriculum_id=506324b3a7dffd00020bf661) - exercises 12-17 cover conditionals + ##Standards ####CPP.L2-05 I - Strings diff --git a/units/7-commandline/README.md b/units/7-commandline/README.md index 712d971..b515e9f 100644 --- a/units/7-commandline/README.md +++ b/units/7-commandline/README.md @@ -7,6 +7,10 @@ This unit introduces the basic CRUD (create, read, update, delete) commands in t 1. [Command Line Basics](sessions/1-commandline) 2. [Terminus Game](sessions/2-terminus) +##Codecademy Resources + +1. [Learn the Command Line](https://www.codecademy.com/courses/learn-the-command-line) - Navigation and Manipulation units cover `cd`, `ls`, `mkdir`, `pwd`, `touch`, `cp`, and `mv` + ##Standards ####Math Standards diff --git a/units/9-HTML2/README.md b/units/9-HTML2/README.md index 26d41b3..5f90e9e 100755 --- a/units/9-HTML2/README.md +++ b/units/9-HTML2/README.md @@ -9,6 +9,12 @@ This unit introduces linking pages, creating relative links, images, and creatin 2. [Style and Script](sessions/2-styleScript) [Project: About Me](sessions/3-project-aboutMe) +##Codecademy Resources + +1. [HTML Basics II, exercises 1-6](http://www.codecademy.com/courses/web-beginner-en-y2Yjd/0/1?curriculum_id=50579fb998b470000202dc8b) - teaches HTML lists +2. [HTML Basics III](http://www.codecademy.com/courses/web-beginner-en-f8mcL/0/1?curriculum_id=50579fb998b470000202dc8b) - introduces `
`, `
`, and `` +3. [HTML and CSS Projects](https://www.codecademy.com/en/courses/html-css-prj) - open-ended HTML and CSS practice projects in increasing order of difficulty. + ##Standards ###English Standards From 208c05b1ac72d77690a99861e9738a1824639c35 Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:36:06 -0400 Subject: [PATCH 02/39] Added CodeCademy Description --- units/2-HTML1/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/units/2-HTML1/README.md b/units/2-HTML1/README.md index d9792a3..8942113 100755 --- a/units/2-HTML1/README.md +++ b/units/2-HTML1/README.md @@ -12,6 +12,7 @@ This unit introduces students to the fundamentals of web design using HTML. It a 5. [Project #2: Images](sessions/5-project-image) ##Codecademy Resources +The following CodeCademy lessons correspond and will help student understanding of he concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [HTML Basics](http://www.codecademy.com/courses/web-beginner-en-HZA3b/0/1?curriculum_id=50579fb998b470000202dc8b) - teaches the tags covered in this unit 2. [Build Your Own Webpage](https://www.codecademy.com/courses/web-beginner-en-LceTK/0/1?curriculum_id=50579fb998b470000202dc8b) - re-inforces HTML learned thus far From 34ffe2fde7e4ed1c3c9579b66470a33e1c7338bd Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:38:41 -0400 Subject: [PATCH 03/39] Added CodeCademy Description --- units/3-CSS1/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/units/3-CSS1/README.md b/units/3-CSS1/README.md index 8c94f77..500eba9 100755 --- a/units/3-CSS1/README.md +++ b/units/3-CSS1/README.md @@ -11,6 +11,7 @@ This unit focuses on the styling of websites using CSS. Through several learning 4. [Project: About Who?](sessions/4-project-who) ##Codecademy Resources +The following CodeCademy lessons correspond and will help student understanding of he concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [CSS: An Overview](http://www.codecademy.com/courses/web-beginner-en-TlhFi/0/1?curriculum_id=50579fb998b470000202dc8b) 2. [Design a Button For Your Website](http://www.codecademy.com/courses/web-beginner-en-UuBLw/0/1?curriculum_id=50579fb998b470000202dc8b) - build a button by styling divs and links From 8a57004aea490c680934fa0557b205d0d15338ab Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:39:29 -0400 Subject: [PATCH 04/39] Added CodeCademy Description --- units/3-CSS1/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/3-CSS1/README.md b/units/3-CSS1/README.md index 500eba9..355e522 100755 --- a/units/3-CSS1/README.md +++ b/units/3-CSS1/README.md @@ -11,7 +11,7 @@ This unit focuses on the styling of websites using CSS. Through several learning 4. [Project: About Who?](sessions/4-project-who) ##Codecademy Resources -The following CodeCademy lessons correspond and will help student understanding of he concepts in this unit. The teacher may choose to assign these lessons if they would like. +The following CodeCademy lessons correspond and will help student understand of the concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [CSS: An Overview](http://www.codecademy.com/courses/web-beginner-en-TlhFi/0/1?curriculum_id=50579fb998b470000202dc8b) 2. [Design a Button For Your Website](http://www.codecademy.com/courses/web-beginner-en-UuBLw/0/1?curriculum_id=50579fb998b470000202dc8b) - build a button by styling divs and links From 9d5eb9a046615951fd21aa81a6c8522148ac48cc Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:40:35 -0400 Subject: [PATCH 05/39] Added CodeCademy Description --- units/2-HTML1/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/2-HTML1/README.md b/units/2-HTML1/README.md index 8942113..1b4e522 100755 --- a/units/2-HTML1/README.md +++ b/units/2-HTML1/README.md @@ -12,7 +12,7 @@ This unit introduces students to the fundamentals of web design using HTML. It a 5. [Project #2: Images](sessions/5-project-image) ##Codecademy Resources -The following CodeCademy lessons correspond and will help student understanding of he concepts in this unit. The teacher may choose to assign these lessons if they would like. +The following CodeCademy lessons correspond and will help student understand the concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [HTML Basics](http://www.codecademy.com/courses/web-beginner-en-HZA3b/0/1?curriculum_id=50579fb998b470000202dc8b) - teaches the tags covered in this unit 2. [Build Your Own Webpage](https://www.codecademy.com/courses/web-beginner-en-LceTK/0/1?curriculum_id=50579fb998b470000202dc8b) - re-inforces HTML learned thus far From 0eec46f93fee4fa146cc1dbb5c816244453abede Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:41:01 -0400 Subject: [PATCH 06/39] Update README.md --- units/3-CSS1/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/3-CSS1/README.md b/units/3-CSS1/README.md index 355e522..4a9ac07 100755 --- a/units/3-CSS1/README.md +++ b/units/3-CSS1/README.md @@ -11,7 +11,7 @@ This unit focuses on the styling of websites using CSS. Through several learning 4. [Project: About Who?](sessions/4-project-who) ##Codecademy Resources -The following CodeCademy lessons correspond and will help student understand of the concepts in this unit. The teacher may choose to assign these lessons if they would like. +The following CodeCademy lessons correspond and will help student understand the concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [CSS: An Overview](http://www.codecademy.com/courses/web-beginner-en-TlhFi/0/1?curriculum_id=50579fb998b470000202dc8b) 2. [Design a Button For Your Website](http://www.codecademy.com/courses/web-beginner-en-UuBLw/0/1?curriculum_id=50579fb998b470000202dc8b) - build a button by styling divs and links From 15bb5a56a2b0fa15d2f2dde1859efaecfd306e16 Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:41:47 -0400 Subject: [PATCH 07/39] Added CodeCademy Description --- units/4-GA-/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/units/4-GA-/README.md b/units/4-GA-/README.md index 522391b..834f13e 100755 --- a/units/4-GA-/README.md +++ b/units/4-GA-/README.md @@ -9,6 +9,7 @@ This unit uses a step-by-step walkthough produced by General Assembly. In this w 1. [GA Dash](sessions/1-walkthrough) ##Codecademy Resources +The following CodeCademy lessons correspond and will help student understand the concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [Make an Interactive Website](https://www.codecademy.com/en/skills/make-an-interactive-website) - introduces Javascript and jQuery. Specifically, [this lesson](https://www.codecademy.com/en/skills/make-an-interactive-website/topics/jquery-events/jquery-user-events) covers event handlers. From 3827e0bf72198b78ef580e653629405d9d766e81 Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:42:28 -0400 Subject: [PATCH 08/39] Added CodeCademy Description --- units/5-javascript1_1/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/units/5-javascript1_1/README.md b/units/5-javascript1_1/README.md index b3a7389..e68205a 100755 --- a/units/5-javascript1_1/README.md +++ b/units/5-javascript1_1/README.md @@ -11,6 +11,7 @@ This unit starts with an introduction to variables. Students will learn how to c 4. [Project #2: Calculator](sessions/4-project-calculator) ##Codecademy Resources +The following CodeCademy lessons correspond and will help student understand the concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [Javascript - Getting Started with Programming](https://www.codecademy.com/courses/javascript-beginner-en-6LzGd/0/1?curriculum_id=506324b3a7dffd00020bf661) - covers introduction to basic types and variables. From 8754b564af98860fd21e4a6c32c198bbaf60e3ad Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:42:59 -0400 Subject: [PATCH 09/39] Added CodeCademy Description --- units/6-javascript1_2/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/units/6-javascript1_2/README.md b/units/6-javascript1_2/README.md index 0547605..5713ea1 100644 --- a/units/6-javascript1_2/README.md +++ b/units/6-javascript1_2/README.md @@ -13,6 +13,7 @@ This unit starts with an introduction to strings. After becoming comfortable wit ##Codecademy Resources +The following CodeCademy lessons correspond and will help student understand the concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [Javascript substrings](https://www.codecademy.com/courses/getting-started-v2/3/5?curriculum_id=506324b3a7dffd00020bf661) - exercises 22 and 23 cover substrings 2. [Javascript: Make your computer think!](https://www.codecademy.com/courses/getting-started-v2/2/1?curriculum_id=506324b3a7dffd00020bf661) - exercises 12-17 cover conditionals From c2de6bedabe72251bc281d72584ed899ec2a1af3 Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:43:26 -0400 Subject: [PATCH 10/39] Update README.md --- units/7-commandline/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/units/7-commandline/README.md b/units/7-commandline/README.md index b515e9f..f3d0862 100644 --- a/units/7-commandline/README.md +++ b/units/7-commandline/README.md @@ -8,6 +8,7 @@ This unit introduces the basic CRUD (create, read, update, delete) commands in t 2. [Terminus Game](sessions/2-terminus) ##Codecademy Resources +The following CodeCademy lessons correspond and will help student understand the concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [Learn the Command Line](https://www.codecademy.com/courses/learn-the-command-line) - Navigation and Manipulation units cover `cd`, `ls`, `mkdir`, `pwd`, `touch`, `cp`, and `mv` From 84322b1de68f5ce3eb0fe27fcf61fa99cb070443 Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:44:10 -0400 Subject: [PATCH 11/39] Added CodeCademy Description --- units/9-HTML2/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/units/9-HTML2/README.md b/units/9-HTML2/README.md index 5f90e9e..785f870 100755 --- a/units/9-HTML2/README.md +++ b/units/9-HTML2/README.md @@ -10,6 +10,7 @@ This unit introduces linking pages, creating relative links, images, and creatin [Project: About Me](sessions/3-project-aboutMe) ##Codecademy Resources +The following CodeCademy lessons correspond and will help student understand the concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [HTML Basics II, exercises 1-6](http://www.codecademy.com/courses/web-beginner-en-y2Yjd/0/1?curriculum_id=50579fb998b470000202dc8b) - teaches HTML lists 2. [HTML Basics III](http://www.codecademy.com/courses/web-beginner-en-f8mcL/0/1?curriculum_id=50579fb998b470000202dc8b) - introduces `
`, `
`, and `` From fc404b3d6e37137f759f49d4756d23f156eb3bec Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:44:44 -0400 Subject: [PATCH 12/39] Added CodeCademy Description --- units/10-HTML_CSS2/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/units/10-HTML_CSS2/README.md b/units/10-HTML_CSS2/README.md index 6545566..13c7f49 100755 --- a/units/10-HTML_CSS2/README.md +++ b/units/10-HTML_CSS2/README.md @@ -10,6 +10,7 @@ This unit delves into `
` tags, `id`, `class`, float, transitions, and anima 2. [CSS Zen Garden](https://github.com/ScriptEdcurriculum/ZenGardenUnit10) ##Codecademy Resources +The following CodeCademy lessons correspond and will help student understand the concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [HTML Basics III](http://www.codecademy.com/courses/web-beginner-en-f8mcL/0/1?curriculum_id=50579fb998b470000202dc8b) - introduces `
`, `
`, and `` 2. [CSS Positioning, exercises 13-25](http://www.codecademy.com/courses/web-beginner-en-6merh/2/1?curriculum_id=50579fb998b470000202dc8b) - covers CSS positioning, including `float` and `clear` properties as well as `static`, `absolute`, and `relative` positioning From 4ebf6b59a0b2d1e43d79cfb444663003c76374ec Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:45:16 -0400 Subject: [PATCH 13/39] Added CodeCademy Description --- units/11-bootstrap/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/units/11-bootstrap/README.md b/units/11-bootstrap/README.md index 729e055..5160095 100644 --- a/units/11-bootstrap/README.md +++ b/units/11-bootstrap/README.md @@ -10,6 +10,7 @@ This unit focuses on the styling of websites using the Bootstrap framework. The [Project: Character Site](sessions/project-character) ##Codecademy Resources +The following CodeCademy lessons correspond and will help student understand the concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [Make a Website - Introduction to Bootstrap](https://www.codecademy.com/en/skills/make-a-website/topics/bootstrap-components) 2. [Shutterbug Project](https://www.codecademy.com/en/courses/html-css-prj/projects/html-css-prj_shutterbugg) - practice using the Boostrap grid From af10d88005cda3eab10b5279c2b52885790cb85d Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:45:38 -0400 Subject: [PATCH 14/39] Added CodeCademy Description --- units/12-jQuery/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/units/12-jQuery/README.md b/units/12-jQuery/README.md index bbfbd77..3c9bf22 100644 --- a/units/12-jQuery/README.md +++ b/units/12-jQuery/README.md @@ -11,6 +11,7 @@ This unit makes an introduction to jQuery. Students will learn about selectors a [Project: The Facebook Wall](https://github.com/ScriptEdcurriculum/facebook_wall) ##Codecademy Resources +The following CodeCademy lessons correspond and will help student understand the concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [Introduction to jQuery](https://www.codecademy.com/courses/web-beginner-en-bay3D/0/1?curriculum_id=50a3fad8c7a770b5fd0007a1) 2. [jQuery - Modifying HTML Elements](https://www.codecademy.com/courses/web-beginner-en-v6phg/0/1?curriculum_id=50a3fad8c7a770b5fd0007a1) From 550d8f9ad4ddde9b5a3d5ddb7a8a1ce831dfcc0c Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:46:07 -0400 Subject: [PATCH 15/39] Added CodeCademy Description --- units/13-javascript2_1/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/units/13-javascript2_1/README.md b/units/13-javascript2_1/README.md index 5012f13..2fca150 100644 --- a/units/13-javascript2_1/README.md +++ b/units/13-javascript2_1/README.md @@ -12,6 +12,7 @@ This unit introduces arrays and loops to our students. Students will learn how t [Project: Color Changer](sessions/5-project-colorChanger) ##Codecademy Resources +The following CodeCademy lessons correspond and will help student understand the concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [Introduction to While Loops in Javascript](https://www.codecademy.com/courses/javascript-beginner-en-ASGIv/0/1?curriculum_id=506324b3a7dffd00020bf661) 2.[Introduction to For Loops in Javascript](https://www.codecademy.com/courses/javascript-beginner-en-NhsaT/0/1?curriculum_id=506324b3a7dffd00020bf661) From 507fca9343e6322670ada1d48553cf681d804b7d Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 24 Sep 2015 11:46:33 -0400 Subject: [PATCH 16/39] Added CodeCademy Description --- units/14-javascript2_2/README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/units/14-javascript2_2/README.md b/units/14-javascript2_2/README.md index 36efcb7..dc36b51 100644 --- a/units/14-javascript2_2/README.md +++ b/units/14-javascript2_2/README.md @@ -11,6 +11,7 @@ This unit introduces hashes. Students will learn how to initialize, store, and r [Project: Address Book](sessions/4-projectaddressBook) ##Codecademy Resources +The following CodeCademy lessons correspond and will help student understand the concepts in this unit. The teacher may choose to assign these lessons if they would like. 1. [Introduction to Objects, exercises 6-12](https://www.codecademy.com/courses/spencer-sandbox/1/1?curriculum_id=506324b3a7dffd00020bf661) @@ -18,4 +19,4 @@ This unit introduces hashes. Students will learn how to initialize, store, and r ##Standards ###CPP.L3A-08 I -1. Student can explain the executive process in a has by differentiating from key-value pairs. \ No newline at end of file +1. Student can explain the executive process in a has by differentiating from key-value pairs. From de2a093f219963047cf08787418366457571a5ec Mon Sep 17 00:00:00 2001 From: Scott Carleton Date: Tue, 29 Sep 2015 18:34:15 -0400 Subject: [PATCH 17/39] Small typo in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 858bbb8..cebfc8d 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Students in the advanced course will be completing their final projects using Cl | Unit | Sessions | Skills | Project | API | |-------|:-------:|------|--------------|---------| | [1. Scavenger Hunt](unitsYear2/1-JShunt)| 1-2 | Variables, Functions, Strings, Conditionals, Loops, jQuery | Scavenger hunt of many short programs (<10 lines each) | N/A | -| [2. Rock, Paper, Scissors](https://github.com/ScriptEdcurriculum/rockPaperScissors_Adv)| 2 | Math.random, jQuery, conditionals | A fully fonctional game (user vs. bot) | N/A +| [2. Rock, Paper, Scissors](https://github.com/ScriptEdcurriculum/rockPaperScissors_Adv)| 2 | Math.random, jQuery, conditionals | A fully functional game (user vs. bot) | N/A | [3. Website ReBranding](unitsYear2/3-reDesign)| 2 | Wireframing, Bootstrap, Pair programming | Redesign a company homepage | N/A | [4. SoundCloud API Project](unitsYear2/4-soundcloudAPI)| 1-2 | APIs | A site that displays relevant song information based by genre | [SoundCloud](https://developers.soundcloud.com/docs/api/guide) | [5. Instagram API Project](https://github.com/ScriptEdcurriculum/instagramAPI_Adv) | 2-3 | APIs | A site that searches instagram for images tagged with key words entered by the user | [Instagram](https://instagram.com/developer/) | From bcf9e39e51247579f00f9b58d774359f8ae0abc6 Mon Sep 17 00:00:00 2001 From: Scott Carleton Date: Tue, 29 Sep 2015 18:37:12 -0400 Subject: [PATCH 18/39] Update Readme with link fix Needs to be a full link otherwise Github treats it as a relative path --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 858bbb8..a54d511 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ Students in the advanced course will be completing their final projects using Cl | [5. Instagram API Project](https://github.com/ScriptEdcurriculum/instagramAPI_Adv) | 2-3 | APIs | A site that searches instagram for images tagged with key words entered by the user | [Instagram](https://instagram.com/developer/) | | [6. Giphy API](unitsYear2/6-giphyAPI) | 2-3 | APIs | A site that searches Giphy for images tagged with key words entered by the user | [Giphy](https://github.com/Giphy/GiphyAPI) | [7.jQuery Battle ](unitsYear2/7-jqueryBattle) | 1 | jQuery, Collision Detection, Key Binding | Game that uses keybindings to move character | N/A -| [8. Insult Generator](https://github.com/ScriptEdcurriculum/yoMama_Adv)| 3 | APIs, JSON, Client/Server Interaction | Insult Generating voice game | Custom API made on [mockable.io](mockable.io)| +| [8. Insult Generator](https://github.com/ScriptEdcurriculum/yoMama_Adv)| 3 | APIs, JSON, Client/Server Interaction | Insult Generating voice game | Custom API made on [mockable.io](https://www.mockable.io/)| | [9. SoundMood](https://github.com/ScriptEdcurriculum/SoundMood_Adv)| 2-3 | APIs, JSON, Client/Server Interaction | Music streaming app that plays songs based on user emotion | [SoundCloud](https://developers.soundcloud.com/docs/api/guide)| | [10.Portfolio](unitsYear2/10-portfolio) | 1-2 | GitHub Pages | Personal Portfolio page |N/A| | [11.Entrepreneurialism](unitsYear2/11-Entrepreneurialism)| N/A | Project management, Pair Programming, Self-Motivation| A fully functional WebApp | N/A | From 6127fb3e9bdcce08e39c168f0734fa8085c38aa1 Mon Sep 17 00:00:00 2001 From: Bijesse Date: Thu, 1 Oct 2015 12:52:18 -0400 Subject: [PATCH 19/39] updated project submission directions --- units/10-HTML_CSS2/sessions/1-divIdClass/README.md | 2 +- units/11-bootstrap/sessions/project-character/README.md | 2 +- units/12-jQuery/sessions/3-project-jQuerySite/README.md | 2 +- units/13-javascript2_1/sessions/3-project-99bottles/README.md | 2 +- .../sessions/5-project-colorChanger/README.md | 2 +- .../sessions/3-project-aroundTheWorld/README.md | 2 +- .../14-javascript2_2/sessions/4-project-addressbook/README.md | 4 ++-- units/2-HTML1/sessions/4-image/README.md | 2 +- units/2-HTML1/sessions/5-project-image/README.md | 3 ++- units/3-CSS1/sessions/3-project-garden/README.md | 2 +- units/3-CSS1/sessions/4-project-who/README.md | 2 +- units/5-javascript1_1/sessions/4-project-calculator/README.md | 2 +- units/6-javascript1_2/sessions/2-project-madlibs/README.md | 2 +- units/6-javascript1_2/sessions/5-project-grading/README.md | 2 +- units/9-HTML2/sessions/3-project-aboutMe/README.md | 2 +- 15 files changed, 17 insertions(+), 16 deletions(-) diff --git a/units/10-HTML_CSS2/sessions/1-divIdClass/README.md b/units/10-HTML_CSS2/sessions/1-divIdClass/README.md index cf7d110..356bc79 100755 --- a/units/10-HTML_CSS2/sessions/1-divIdClass/README.md +++ b/units/10-HTML_CSS2/sessions/1-divIdClass/README.md @@ -101,7 +101,7 @@ Students must push their code to their GitHub repo using the following commands `git commit -m "example comment"` `git push origin master` -This project does not yet have to be share with the instructors. +This project does not yet have to be share with the instructors. It will soon be shared in a future lesson. ###Homework Students who are not complete with their site by the end of class should complete it at home for homework. diff --git a/units/11-bootstrap/sessions/project-character/README.md b/units/11-bootstrap/sessions/project-character/README.md index be012ed..849d9f6 100644 --- a/units/11-bootstrap/sessions/project-character/README.md +++ b/units/11-bootstrap/sessions/project-character/README.md @@ -87,4 +87,4 @@ Select students to present their work to the class. Teachers should keep track of student success while they are presenting to the class based on [this rubric](https://docs.google.com/spreadsheets/d/1rSyrqf3E3knsAu-G7bdrI9JrSC5eOpuADYrTD8H4Kfg/edit?usp=sharing). ###How to Submit -Students must push all final code to their GitHub repository. Students will then share the link to their repo at [bit.ly/ScriptEdProjects](bit.ly/ScriptEdProjects). +Students must push all final code to their GitHub repository. Students will then share the link to their repo at the project submission link found in the header of the Daily Session Document. diff --git a/units/12-jQuery/sessions/3-project-jQuerySite/README.md b/units/12-jQuery/sessions/3-project-jQuerySite/README.md index 2d51e31..03f7e50 100644 --- a/units/12-jQuery/sessions/3-project-jQuerySite/README.md +++ b/units/12-jQuery/sessions/3-project-jQuerySite/README.md @@ -43,5 +43,5 @@ Select students to present their work to the class. Teachers should keep track of student success while they are presenting to the class based on [this rubric](https://docs.google.com/spreadsheets/d/1xinwHFPJFaeDlvJt-O_xwQe3GAEwhAEbUtVgnmtwWho/edit#gid=0), paying special attention to the "Events" row. ###How to Submit -Students must push all final code to their GitHub repository. Students will then share the link to their repo at [bit.ly/ScriptEdProjects](bit.ly/ScriptEdProjects). +Students must push all final code to their GitHub repository. Students will then share the link to their repo at the project submission link found in the header of the Daily Session Document. diff --git a/units/13-javascript2_1/sessions/3-project-99bottles/README.md b/units/13-javascript2_1/sessions/3-project-99bottles/README.md index 3202e08..8f195e0 100644 --- a/units/13-javascript2_1/sessions/3-project-99bottles/README.md +++ b/units/13-javascript2_1/sessions/3-project-99bottles/README.md @@ -43,5 +43,5 @@ Select students to present their work to the class. Teachers should keep track of student success while they are presenting to the class based on [this rubric](https://docs.google.com/spreadsheets/d/1xinwHFPJFaeDlvJt-O_xwQe3GAEwhAEbUtVgnmtwWho/edit#gid=0). ###How to Submit -Students must push all final code to their GitHub repository. Students will then share the link to their repo at [bit.ly/ScriptEdProjects](bit.ly/ScriptEdProjects). +Students must push all final code to their GitHub repository. Students will then share the link to their repo at the project submission link found in the header of the Daily Session Document. diff --git a/units/13-javascript2_1/sessions/5-project-colorChanger/README.md b/units/13-javascript2_1/sessions/5-project-colorChanger/README.md index 78a5908..7e0bd61 100644 --- a/units/13-javascript2_1/sessions/5-project-colorChanger/README.md +++ b/units/13-javascript2_1/sessions/5-project-colorChanger/README.md @@ -70,4 +70,4 @@ Select students to present their work to the class. Teachers should keep track of student success while they are presenting to the class based on [this rubric](https://docs.google.com/spreadsheets/d/1rSyrqf3E3knsAu-G7bdrI9JrSC5eOpuADYrTD8H4Kfg/edit?usp=sharing). ###How to Submit -Students must push all final code to their GitHub repository. Students will then share the link to their repo at bit.ly/ScriptEdProjects \ No newline at end of file +Students must push all final code to their GitHub repository. Students will then share the link to their repo at the project submission link found in the header of the Daily Session Document. \ No newline at end of file diff --git a/units/14-javascript2_2/sessions/3-project-aroundTheWorld/README.md b/units/14-javascript2_2/sessions/3-project-aroundTheWorld/README.md index 6725bc9..5feb005 100644 --- a/units/14-javascript2_2/sessions/3-project-aroundTheWorld/README.md +++ b/units/14-javascript2_2/sessions/3-project-aroundTheWorld/README.md @@ -68,5 +68,5 @@ Students must push all final code to their GitHub repository. To push changes in `git commit -m "example comment"` `git push origin master` -**Students will then share the link to their repo at bit.ly/ScriptEdProjects** +Students will then share the link to their repo at the project submission link found in the header of the Daily Session Document. diff --git a/units/14-javascript2_2/sessions/4-project-addressbook/README.md b/units/14-javascript2_2/sessions/4-project-addressbook/README.md index 5d2f3e2..c093926 100644 --- a/units/14-javascript2_2/sessions/4-project-addressbook/README.md +++ b/units/14-javascript2_2/sessions/4-project-addressbook/README.md @@ -75,5 +75,5 @@ Students must push all final code to their GitHub repository. To push changes in `git add .` `git commit -m "example comment"` `git push origin master` - -**Students will then share the link to their repo at bit.ly/ScriptEdProjects** + +Students will then share the link to their repo at the project submission link found in the header of the Daily Session Document. diff --git a/units/2-HTML1/sessions/4-image/README.md b/units/2-HTML1/sessions/4-image/README.md index 37c2ff7..fd5038c 100755 --- a/units/2-HTML1/sessions/4-image/README.md +++ b/units/2-HTML1/sessions/4-image/README.md @@ -84,7 +84,7 @@ Encorage students to share their work on the board. This process can take 5+ minutes, given that it will be new for students: -Students must share their **Gist URL** at bit.ly/ScriptEdProjects +Students must submit their **Gist URL** at the project submission link found in the header of the Daily Session Document. ## After Class diff --git a/units/2-HTML1/sessions/5-project-image/README.md b/units/2-HTML1/sessions/5-project-image/README.md index eba5865..a056d1d 100755 --- a/units/2-HTML1/sessions/5-project-image/README.md +++ b/units/2-HTML1/sessions/5-project-image/README.md @@ -51,4 +51,5 @@ Select students to present their work to the class. ###How to Submit This process can take 5+ minutes, given that its still new for students: -Students must share their **Gist URL** at bit.ly/ScriptEdProjects +Students must submit their **Gist URL** at the project submission link found in the header of the Daily Session Document. + diff --git a/units/3-CSS1/sessions/3-project-garden/README.md b/units/3-CSS1/sessions/3-project-garden/README.md index e602e69..872a2d1 100755 --- a/units/3-CSS1/sessions/3-project-garden/README.md +++ b/units/3-CSS1/sessions/3-project-garden/README.md @@ -59,4 +59,4 @@ Teachers should keep track of student success while they are presenting to the c ###How to Submit Project * The students must export this project as a Gist: File > Export as Gist -* The teacher must ask students to share the link to their project at [bit.ly/ScriptEdProjects](https://bit.ly/ScriptEdProjects). +* Students must submit their **Gist URL** at the project submission link found in the header of the Daily Session Document. diff --git a/units/3-CSS1/sessions/4-project-who/README.md b/units/3-CSS1/sessions/4-project-who/README.md index ee2e16a..5466025 100644 --- a/units/3-CSS1/sessions/4-project-who/README.md +++ b/units/3-CSS1/sessions/4-project-who/README.md @@ -57,4 +57,4 @@ Teachers should keep track of student success while they are presenting to the c ###How to Submit Project * The students must export this project as a Gist: File > Export as Gist -* The teacher must ask students to share the link to their project at [bit.ly/ScriptEdProjects](https://bit.ly/ScriptEdProjects). +* Students must submit their **Gist URL** at the project submission link found in the header of the Daily Session Document. diff --git a/units/5-javascript1_1/sessions/4-project-calculator/README.md b/units/5-javascript1_1/sessions/4-project-calculator/README.md index c45b8f4..5a2ee9c 100755 --- a/units/5-javascript1_1/sessions/4-project-calculator/README.md +++ b/units/5-javascript1_1/sessions/4-project-calculator/README.md @@ -84,5 +84,5 @@ Teachers should keep track of student success while they are presenting to the c ###How to Submit Project * The students must export this project as a Gist: File > Export as Gist -* The teacher must ask students to share the link to their project at [bit.ly/ScriptEdProjects](https://bit.ly/ScriptEdProjects). +* Students must submit their **Gist URL** at the project submission link found in the header of the Daily Session Document. diff --git a/units/6-javascript1_2/sessions/2-project-madlibs/README.md b/units/6-javascript1_2/sessions/2-project-madlibs/README.md index f1c3c04..2008d9c 100644 --- a/units/6-javascript1_2/sessions/2-project-madlibs/README.md +++ b/units/6-javascript1_2/sessions/2-project-madlibs/README.md @@ -71,4 +71,4 @@ Teachers should keep track of student success while they are presenting to the c ###How to Submit Project * The students must export this project as a Gist: File > Export as Gist -* The teacher must ask students to share the link to their project at [bit.ly/ScriptEdProjects](https://bit.ly/ScriptEdProjects). +* Students must submit their **Gist URL** at the project submission link found in the header of the Daily Session Document. diff --git a/units/6-javascript1_2/sessions/5-project-grading/README.md b/units/6-javascript1_2/sessions/5-project-grading/README.md index 20125a2..f680601 100644 --- a/units/6-javascript1_2/sessions/5-project-grading/README.md +++ b/units/6-javascript1_2/sessions/5-project-grading/README.md @@ -103,4 +103,4 @@ Teachers should keep track of student success while they are presenting to the c ###How to Submit Project * The students must export this project as a Gist: File > Export as Gist -* The teacher must ask students to share the link to their project at [bit.ly/ScriptEdProjects](https://bit.ly/ScriptEdProjects). +* Students must submit their **Gist URL** at the project submission link found in the header of the Daily Session Document. diff --git a/units/9-HTML2/sessions/3-project-aboutMe/README.md b/units/9-HTML2/sessions/3-project-aboutMe/README.md index b48e6d2..af5b7f6 100755 --- a/units/9-HTML2/sessions/3-project-aboutMe/README.md +++ b/units/9-HTML2/sessions/3-project-aboutMe/README.md @@ -64,7 +64,7 @@ Select students to present their work to the class. Teachers should keep track of student success while they are presenting to the class. ###How to Submit -Students must push all final code to their GitHub repository. Students will then share the link to their repo at [bit.ly/ScriptEdProjects](https://docs.google.com/a/scripted.org/forms/d/15gUqwz36Vy4C-6-rTeKFo88Tmq0e5vZ3ZKjXAhE5v7Y/viewform?fbzx=-5506744927335389465) +Students must push all final code to their GitHub repository. Students will then share the link to their repo at the project submission link found in the header of the Daily Session Document. To push to GitHub run the following commands in your terminal: `git status` From 56416bf1e9d3e5cd69d6ea26490c67d28f0494e6 Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Mon, 12 Oct 2015 11:50:37 -0400 Subject: [PATCH 20/39] Update README.md --- units/3-CSS1/sessions/2-wireframing/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/3-CSS1/sessions/2-wireframing/README.md b/units/3-CSS1/sessions/2-wireframing/README.md index dbdfd58..4d6f284 100755 --- a/units/3-CSS1/sessions/2-wireframing/README.md +++ b/units/3-CSS1/sessions/2-wireframing/README.md @@ -42,7 +42,7 @@ “Today we will be learning how to use a technique called wireframing to convey a visual idea of what you intend to build. You already started to do this a moment ago. This is important because wireframes help you know what you need to build -- you can’t build an app if you don’t know what it’s going to look like.” ### Introduction to New Material (“I Do”) -Lead instructor will display the wireframe for [YouTube](https://wireframe.cc/84C5gA), and have students guess which website it is a wireframe for. Ask them how they knew. +Lead instructor will display the wireframe for [YouTube](https://wireframe.cc/LyQAxg), and have students guess which website it is a wireframe for. Ask them how they knew. Explain that a wireframe is a tool that is used by lots of people who are involved with app creation -- developers, coders, designers, business analysts are a few people who might use a wireframe. Feel free to elaborate on how you use wireframesand how they have been useful to you. From eade0a12054999bb66d3657b4d5202c0e8be7afd Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Mon, 12 Oct 2015 12:03:19 -0400 Subject: [PATCH 21/39] updated submit direction --- unitsYear2/3-reDesign/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unitsYear2/3-reDesign/README.md b/unitsYear2/3-reDesign/README.md index 77b86c2..7cbd43f 100644 --- a/unitsYear2/3-reDesign/README.md +++ b/unitsYear2/3-reDesign/README.md @@ -83,7 +83,7 @@ Your Manager has offered a stipend a $500 for each of the bonus requirements lis Your manager will be grading your capability on this project based on [this rubric](assessment.md). ##How to Submit -The final code for this project must be pushed back up to your repo on GitHub. **Then share the link to the repo at bit.ly/ScriptEdProjects** +The final code for this project must be pushed back up to your repo on GitHub. **Then share the link to your repo at the project submission link found in the header of the Daily Session Document (bit.ly/ScriptEd).** To push to GitHub, run the following commands in your terminal: `git status` From 6b450b9c6031527b55e653f904178c6aa45e8ad4 Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Mon, 12 Oct 2015 12:04:06 -0400 Subject: [PATCH 22/39] updated submit directions --- unitsYear2/4-soundcloudAPI/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unitsYear2/4-soundcloudAPI/README.md b/unitsYear2/4-soundcloudAPI/README.md index f3b2b77..6a3d5a9 100644 --- a/unitsYear2/4-soundcloudAPI/README.md +++ b/unitsYear2/4-soundcloudAPI/README.md @@ -93,7 +93,7 @@ Your Manager has offered a stipend of $500 for each of the bonus requirements li Your manager will be grading your capibility on this project based on [this rubric](/assessment.md) ##How to Submit -The final code for this project must be pushed back up to your repo on GitHub. **Then share the link to your repo at bit.ly/ScriptEdProjects** +The final code for this project must be pushed back up to your repo on GitHub. **Then share the link to your repo at the project submission link found in the header of the Daily Session Document (bit.ly/ScriptEd).** To push to GitHub run the following commands in your terminal: `git status` From efdf4b5575e0b8671f44accfdda0925329c5c2d0 Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Mon, 12 Oct 2015 12:06:21 -0400 Subject: [PATCH 23/39] updated submit directions --- unitsYear2/6-giphyAPI/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unitsYear2/6-giphyAPI/README.md b/unitsYear2/6-giphyAPI/README.md index 7c6bdad..5aade5b 100644 --- a/unitsYear2/6-giphyAPI/README.md +++ b/unitsYear2/6-giphyAPI/README.md @@ -51,7 +51,7 @@ Your manager has offered a stipend of $500 for each of the bonus requirements li Your manager will be grading your capability on this project based on [this rubric](assessment.md). ##How to Submit -The final code for this project must be pushed back up to your repo on GitHub. **Then share the link to your repo at bit.ly/ScriptEdProjects** +The final code for this project must be pushed back up to your repo on GitHub. **Then share the link to your repo at the project submission link found in the header of the Daily Session Document (bit.ly/ScriptEd).** To push to GitHub run the following commands in your terminal: `git status` From a35cf7e18702b14fbacdf3c5147699a5a8ac4e2d Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Mon, 12 Oct 2015 12:07:00 -0400 Subject: [PATCH 24/39] updated submit directions --- unitsYear2/7-jqueryBattle/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unitsYear2/7-jqueryBattle/README.md b/unitsYear2/7-jqueryBattle/README.md index 6d02c44..70dcd2c 100644 --- a/unitsYear2/7-jqueryBattle/README.md +++ b/unitsYear2/7-jqueryBattle/README.md @@ -71,7 +71,7 @@ Your Manager has offered a stipend of $500 for each of the bonus requirements li Your manager will be grading your capability on this project based on [this rubric](/assessment.md). ##How to Submit -The final code for this project must be pushed back up to your repo on GitHub. **Then share the link to your repo at bit.ly/ScriptEdProjects** +The final code for this project must be pushed back up to your repo on GitHub. **Then share the link to your repo at the project submission link found in the header of the Daily Session Document (bit.ly/ScriptEd).** To push to GitHub run the following commands in your terminal: `git status` From 453f4f7e28fd556516a6f494bf6caba76143f3b4 Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Mon, 12 Oct 2015 12:10:25 -0400 Subject: [PATCH 25/39] updated submit directions --- unitsYear2/10-portfolio/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unitsYear2/10-portfolio/README.md b/unitsYear2/10-portfolio/README.md index d689e46..6790606 100644 --- a/unitsYear2/10-portfolio/README.md +++ b/unitsYear2/10-portfolio/README.md @@ -22,7 +22,7 @@ Create a personal portfolio site that includes all projects you have ever made. * Try adding some CSS animations to your project. ##How to Submit -The final code for this project must be pushed back up to your repo on GitHub. **Then share the link to your repo at bit.ly/ScriptEdProjects** +The final code for this project must be pushed back up to your repo on GitHub. **Then share the link to your repo at the project submission link found in the header of the Daily Session Document (bit.ly/ScriptEd).** To push to GitHub run the following commands in your terminal: `git status` From 39f265d730846dc37a6929e62ab82da76b48f178 Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Mon, 12 Oct 2015 12:11:07 -0400 Subject: [PATCH 26/39] Update README.md --- unitsYear2/11-Entrepreneurialism/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unitsYear2/11-Entrepreneurialism/README.md b/unitsYear2/11-Entrepreneurialism/README.md index 6370fa7..d32e2e8 100644 --- a/unitsYear2/11-Entrepreneurialism/README.md +++ b/unitsYear2/11-Entrepreneurialism/README.md @@ -38,7 +38,7 @@ Who is going to work on the different aspects of this WebApp? ##How to Submit Push to your GitHub and promote to friends and family! Also be sure to add this to your portfolio page. -The final code for this project must be pushed back up to your repo on GitHub. **Then share the link to your repo at bit.ly/ScriptEdProjects** +The final code for this project must be pushed back up to your repo on GitHub. **Then share the link to your repo at the project submission link found in the header of the Daily Session Document (bit.ly/ScriptEd).** To push to GitHub run the following commands in your terminal: `git status` From 52cd102a1d7e835384066d156f4c933949359188 Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Mon, 12 Oct 2015 16:08:01 -0400 Subject: [PATCH 27/39] updated image --- .../starter-code/starter.html | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/units/3-CSS1/sessions/3-project-garden/starter-code/starter.html b/units/3-CSS1/sessions/3-project-garden/starter-code/starter.html index 1747198..25df78b 100644 --- a/units/3-CSS1/sessions/3-project-garden/starter-code/starter.html +++ b/units/3-CSS1/sessions/3-project-garden/starter-code/starter.html @@ -1,14 +1,15 @@ - - Our ScriptEd Class - - -
-

We Love ScriptEd!

- - -

ScriptEd equips students with the fundamental coding skills and professional experiences that together create access to careers in technology.

-
- + + Our ScriptEd Class + + +

ScriptEd CSS Site!

+

We love ScriptEd

+ + +

ScriptEd equips students with the fundamental coding skills and professional experiences that together create access to careers in technology.

+

This year in ScriptEd we are going to create several websites, games and webapps!

+ + From 01a391f892c10ed75c692b7b7155f83b47680530 Mon Sep 17 00:00:00 2001 From: Will Moritz Date: Tue, 13 Oct 2015 09:49:25 -0400 Subject: [PATCH 28/39] typo fix --- units/4-GA-/sessions/1-walkthrough/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/4-GA-/sessions/1-walkthrough/README.md b/units/4-GA-/sessions/1-walkthrough/README.md index b3a2c95..69b3cd4 100755 --- a/units/4-GA-/sessions/1-walkthrough/README.md +++ b/units/4-GA-/sessions/1-walkthrough/README.md @@ -59,7 +59,7 @@ On the screen, open up the General Assembly site and provide a quick explanation ### Guided Practice (“We Do”) -Walk through the first 4-5 slides with he students on the board to show how the tutorial tells you what to type BUT also becomes less helpful as the tutorial progresses. Be sure to also point out the importance of answering the questions on the worksheet as you complete the tutorial. +Walk through the first 4-5 slides with the students on the board to show how the tutorial tells you what to type BUT also becomes less helpful as the tutorial progresses. Be sure to also point out the importance of answering the questions on the worksheet as you complete the tutorial. ### Independent Practice ("You Do") From 73641dfb589ca8b3cb0f1c74d1624ac73f5f6af7 Mon Sep 17 00:00:00 2001 From: Will Moritz Date: Tue, 13 Oct 2015 09:51:10 -0400 Subject: [PATCH 29/39] typo --- units/4-GA-/sessions/1-walkthrough/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/4-GA-/sessions/1-walkthrough/README.md b/units/4-GA-/sessions/1-walkthrough/README.md index b3a2c95..61854cd 100755 --- a/units/4-GA-/sessions/1-walkthrough/README.md +++ b/units/4-GA-/sessions/1-walkthrough/README.md @@ -83,6 +83,6 @@ Leave about 5 minutes at the end of class for there to be a discussion about wha Students who are not complete with the tutorial and/or the worksheet by the end of class should complete it at home for homework. ## After Class -* Teachers must reveiw student tutorial worksheets. It is crucial to provide this feedback so that students will see the value of their work. +* Teachers must review student tutorial worksheets. It is crucial to provide this feedback so that students will see the value of their work. * Prepare for next lesson / hand off to next volunteer in rotation. From 06c3c1e334efd8acda499dc513807f86e7ada4d6 Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 15 Oct 2015 10:36:02 -0400 Subject: [PATCH 30/39] updated image --- units/3-CSS1/sessions/3-project-garden/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/units/3-CSS1/sessions/3-project-garden/README.md b/units/3-CSS1/sessions/3-project-garden/README.md index 872a2d1..b67331d 100755 --- a/units/3-CSS1/sessions/3-project-garden/README.md +++ b/units/3-CSS1/sessions/3-project-garden/README.md @@ -7,7 +7,7 @@ ###Teacher Preparation * Familiarize yourself with [CSS Zen Garden](http://www.csszengarden.com/). -* Prepare to provide students with [starter code](http://jsbin.com/yiyihe/edit?html). +* Prepare to provide students with [starter code](http://jsbin.com/ruqujodove/edit). ### Prerequisites Students should only start this project after they have completed the other lessons in the unit. @@ -36,7 +36,7 @@ Introduce the [CSS Zen Garden](http://www.csszengarden.com/). Explain that as de Walk students through the process of accessing the starter code and cloning it into their own account. 1. Students must logon to [JSBin](http://jsbin.com) -2. Students will access the starter code by visiting [http://bit.ly/csszgse](http://bit.ly/csszgse) +2. Students will access the starter code by visiting [http://jsbin.com/ruqujodove](http://jsbin.com/ruqujodove) 3. Students will select File > Clone to save the code into their own account. 4. Students will then be allowed to edit the file once they have successfully cloned the starter code From 37a3bc222d480ddb00745285021743f1a3e015c8 Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 15 Oct 2015 10:57:17 -0400 Subject: [PATCH 31/39] updated link --- .../1-introduction/sessions/1-computingProcesses/Syllabus.docx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/1-introduction/sessions/1-computingProcesses/Syllabus.docx b/units/1-introduction/sessions/1-computingProcesses/Syllabus.docx index bd8562b..6093969 100755 --- a/units/1-introduction/sessions/1-computingProcesses/Syllabus.docx +++ b/units/1-introduction/sessions/1-computingProcesses/Syllabus.docx @@ -1 +1 @@ -[First Year Syllabus] (https://www.dropbox.com/s/m1t0mhsnvvp1ygo/Syllubus20142015.docx) +[First Year Syllabus] (https://drive.google.com/file/d/0B2338t7VZqsoRy1pLWJyZ3gyb2M/view?usp=sharing) From 4422a86a38c8bc6770e28e97d7e2b4a19f1384b4 Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Thu, 15 Oct 2015 10:57:59 -0400 Subject: [PATCH 32/39] updated syllabus link --- units/1-introduction/sessions/1-computingProcesses/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/units/1-introduction/sessions/1-computingProcesses/README.md b/units/1-introduction/sessions/1-computingProcesses/README.md index 35f7daa..885f8fb 100755 --- a/units/1-introduction/sessions/1-computingProcesses/README.md +++ b/units/1-introduction/sessions/1-computingProcesses/README.md @@ -4,7 +4,7 @@ ## Before Class ###Teacher Preparation -* Must have copies of [syllabus](https://www.dropbox.com/s/maienun209adcy7/ScriptEd%20Year%201%20Syllabus.docx?dl=0) printed. +* Must have copies of [syllabus](https://drive.google.com/file/d/0B2338t7VZqsoRy1pLWJyZ3gyb2M/view?usp=sharing) printed. * Two blank pieces of paper ready to be either taped or tacked to the back wall. @@ -34,7 +34,7 @@ Students will be able to demonstrate the ability to use computing thought proces ### References -* [Syllabus](https://www.dropbox.com/s/maienun209adcy7/ScriptEd%20Year%201%20Syllabus.docx?dl=0) +* [Syllabus](https://drive.google.com/file/d/0B2338t7VZqsoRy1pLWJyZ3gyb2M/view?usp=sharing) ## During Class From a04b6ca02320e4e118708420e246d5cd8d314f3a Mon Sep 17 00:00:00 2001 From: Clinton Halpin Date: Fri, 16 Oct 2015 20:02:01 -0400 Subject: [PATCH 33/39] tage to tags --- units/2-HTML1/sessions/1-BasicTags/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/2-HTML1/sessions/1-BasicTags/README.md b/units/2-HTML1/sessions/1-BasicTags/README.md index 2ad9726..e05137e 100755 --- a/units/2-HTML1/sessions/1-BasicTags/README.md +++ b/units/2-HTML1/sessions/1-BasicTags/README.md @@ -57,7 +57,7 @@ All webpages are made up of HTML. Think about it like this... Your speak in engl HTML pages are made of of tags. Every opening tag has a closing tag. - FILO (First In Last Out) is a term used to describe how tags can fall inside of other tage. (reference the analogy with parenthesis in math class). + FILO (First In Last Out) is a term used to describe how tags can fall inside of other tags. (reference the analogy with parenthesis in math class). ### Guided Practice (“We Do”) #####Slide 8 From 97af1ffbed05c65fa845b26c2a7cd73793a6688b Mon Sep 17 00:00:00 2001 From: Tom Bijesse Date: Tue, 20 Oct 2015 11:43:54 -0400 Subject: [PATCH 34/39] Lessons -> Sessions --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a6fe904..af499c9 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Year 1 =================== While completing the units below, the students are working towards becoming extremely qualified at all the skills found in the [ScriptEd Foundations Rubric](https://docs.google.com/a/scripted.org/spreadsheets/d/1i21YAD2TBEn7nYeii5VH_7smUjCV13cvX2qgbhEkeZk/edit#gid=1132597865). -| Unit | Lessons | Topics/Skills | Project 1 | Project 2 | +| Unit | Sessions | Topics/Skills | Project 1 | Project 2 | |-------|:-------:|------|--------------|--------------| | [**0. ScriptEd**](units/0-Infosession/)| 1 | Routines and Expectations | N/A| N/A| | [**1. Intro to CS**](units/1-introduction/)| 1 | Computational thinking | N/A| N/A| From 810d1f5eca41847ee740030f65b38251e396472f Mon Sep 17 00:00:00 2001 From: luisibanezscripted Date: Sun, 25 Oct 2015 17:26:00 -0400 Subject: [PATCH 35/39] Update URL for Chrome Dev Tools The previous URL (https://developer.chrome.com/devtools) points to this new location with the message: "The DevTools docs have moved! For the latest tutorials, docs and updates head over to the new home of Chrome DevTools". --- units/2-HTML1/sessions/2-devTools/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/2-HTML1/sessions/2-devTools/README.md b/units/2-HTML1/sessions/2-devTools/README.md index e70157c..5d62c1f 100755 --- a/units/2-HTML1/sessions/2-devTools/README.md +++ b/units/2-HTML1/sessions/2-devTools/README.md @@ -25,7 +25,7 @@ ### References -* [Chrome DevTools](https://developer.chrome.com/devtools) +* [Chrome DevTools](https://developers.google.com/web/tools/chrome-devtools) ## During Class From 6134905f820960905894df18e6f1c018d2117f57 Mon Sep 17 00:00:00 2001 From: shane-scripted Date: Mon, 2 Nov 2015 09:17:42 -0500 Subject: [PATCH 36/39] Update README.md --- units/4-GA-/sessions/1-walkthrough/README.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/units/4-GA-/sessions/1-walkthrough/README.md b/units/4-GA-/sessions/1-walkthrough/README.md index e6a4fba..a69a6d9 100755 --- a/units/4-GA-/sessions/1-walkthrough/README.md +++ b/units/4-GA-/sessions/1-walkthrough/README.md @@ -70,13 +70,6 @@ During this time teachers will circulate to help students with technical issues. **Note:** This is a long period of time for a teenager to be completing a single task. Some may need an occasional break from time-to-time. Feel free to have a quick off-topic conversation with a student if you see them struggling to focus. ### Closing -After completing sections 1, 2 & 3 students should begin working on the Activity at the bottom of the Walkthrough worksheet; which reads: - -![Image](http://i.imgur.com/tZmFR5b.png) - -Although students can get started now, this will be the topic of next class so students should not get too carried away as of right now. - -### Check for Understanding Leave about 5 minutes at the end of class for there to be a discussion about what was learned today by completing a tutorial on General Assembly. ###Homework From 478bf91748111fe9f41fb09481e5630f2e7a79d0 Mon Sep 17 00:00:00 2001 From: Mat Brown Date: Fri, 18 Sep 2015 21:36:04 -0400 Subject: [PATCH 37/39] Split first JavaScript lesson in two --- .../sessions/1-types-and-operators/README.md | 170 ++++++++++++++++++ .../{1-variable => 2-variable}/README.md | 58 +----- .../assessments/1/question.md | 0 .../assessments/README.md | 0 .../homework/README.md | 0 .../homework/starter_code/starter.js | 0 6 files changed, 173 insertions(+), 55 deletions(-) create mode 100644 units/5-javascript1_1/sessions/1-types-and-operators/README.md rename units/5-javascript1_1/sessions/{1-variable => 2-variable}/README.md (84%) rename units/5-javascript1_1/sessions/{1-variable => 2-variable}/assessments/1/question.md (100%) rename units/5-javascript1_1/sessions/{1-variable => 2-variable}/assessments/README.md (100%) rename units/5-javascript1_1/sessions/{1-variable => 2-variable}/homework/README.md (100%) rename units/5-javascript1_1/sessions/{1-variable => 2-variable}/homework/starter_code/starter.js (100%) diff --git a/units/5-javascript1_1/sessions/1-types-and-operators/README.md b/units/5-javascript1_1/sessions/1-types-and-operators/README.md new file mode 100644 index 0000000..f473b4b --- /dev/null +++ b/units/5-javascript1_1/sessions/1-types-and-operators/README.md @@ -0,0 +1,170 @@ +#Lesson 1 - Types and Operators + +## Before Class + +### Objective + +Students will be able to manipulate strings and numbers in the console using +built-in JavaScript operators. + +### Key Points + +* JavaScript is a programming language that we can run in our browser. +* JavaScript is basically used to manipulate information; think of it like a + really powerful calculator. +* Different kinds of information have different *types*; two of the most + important are Strings and Numbers. +* You can write strings and numbers in a way that JavaScript understands +* You can manipulate strings and integers using built-in JavaScript operators + like `+`. +* To quickly try out new techniques, we can use the JavaScript console in + JSBin. + +### Assessment + +Students will show progress toward reaching the objective based on their performance on the exit ticket quiz. + +### Vocabulary + +* JavaScript +* Type +* Console +* Arithmetic operation +* String concatenation + +## During Class + +### Do Now + +What is the difference between a word and a number? What can you do with +words that you can't do with numbers? What can you do with numbers that you +can't do with words? + +### Opening + +What is a programming language? Can someone give me some examples? Remind me what a browser is. + +JavaScript is a programming language and we can run it in our browser. + +So far, we’ve learned HTML and CSS. These languages are useful for making web +pages, but we can’t use them to make our pages *do* anything. JavaScript allows +us to make our page do more than just display information: it can change and +react to us. + +### Introduction to New Material ("I Do") + +Open a new JSBin session, and point out the **Console**. Explain that the +console used to try out small amounts of JavaScript and see how they work. When +we want to write more complicated JavaScript, we’ll use the **JavaScript** tab. +But for now, it’s the console. + +##### Console Demonstration + +Demonstrate typing a number and pressing return. + +``` +2 +``` + +Show how the console repeats +the number back to you. Explain that you just gave JavaScript a little bit of +work to do, and it did the work and gave you the result. In this case, the work +was just “show me the number 2”. + +##### Basic Arithmetic + +Do some basic math in the console. Demonstrate adding, subtracting, multiplying +numbers. Point out to the students that everyone in the room knows how to use a +calculator, so now everbody in the room knows some JavaScript as well. + +``` +2 + 2 +10 - 2 +4 * 4 +``` + +##### Strings + +Now type a string, in quotation marks, into the console. Point out that +JavaScript understands this string as well. Try a few other strings to +demonstrate that there’s nothing special about the first string you typed. + +``` +"ScriptEd" +"Coding is fun" +"I am a programmer" +``` + +Point out the quotation marks. Explain that when we want to give JavaScript a +number, we can just type the number. But when we want to give it a word or +words, we have to put them in quotation marks. Otherwise, JavaScript won’t know +what we mean. + +######Types + +Everything in JavaScript has a type. So far, we have seen two types: strings (which have quotes around them) and numbers. We can use the ``typeof`` function to print the type. + +``` +typeof("Justin Bieber") +typeof(22) +``` + +prints out + +``` +string +number +``` + +What will happen if I type this into the console? + +``` +typeof("22") +``` + +prints out ``string`` because we put quotes around 22. This tells JavaScript to treat the value as a string. + +### Guided Practice ("We Do") + +Open up the console and experiment with the `+` sign. + +Try typing: + +``` +10 + 10 +``` + +Note that this makes JavaScript do math. + +Now try: + +``` +"Script" + "Ed" +``` + +Observe that this makes JavaScript stick the two strings together. We call this +**concatenation**. + +### Independent Practice ("You Do") + +In the console, find the answer to this math problem: + +``` +1103819 / 907 +``` + +What happens if you put the numbers in quotes? + +### Exit Ticket + +What result will JavaScript give you for this? + +``` +10 + 2 +``` + +How about for this? + +``` +"10" + "2" +``` diff --git a/units/5-javascript1_1/sessions/1-variable/README.md b/units/5-javascript1_1/sessions/2-variable/README.md similarity index 84% rename from units/5-javascript1_1/sessions/1-variable/README.md rename to units/5-javascript1_1/sessions/2-variable/README.md index 600c856..1eca694 100755 --- a/units/5-javascript1_1/sessions/1-variable/README.md +++ b/units/5-javascript1_1/sessions/2-variable/README.md @@ -10,7 +10,6 @@ Students will able to create, instantiate, and edit variables in JavaScript. ### Key Points -* JavaScript is a programming language that we can run in our browser. * Variables are like boxes; they store something. * Variables have a name and a value. * We can perform various operations on variables. @@ -22,13 +21,10 @@ Students will show progress toward reaching the objective based on their perform ### Vocabulary -* JavaScript * Variable * Instantiate * Assign * Increment / Decrement -* Arithmetic operation -* Type ### References @@ -47,16 +43,13 @@ Students will show progress toward reaching the objective based on their perform Today we will learn about variables in JavaScript. This is important because we can use variables to store things that we can later on look up. It connects to what we've previously learned because we will be able to, eventually, write JavaScript code that interacts with the HTML & CSS that we have written before. -What is a programming language? Can someone give me some examples? Remind me what a browser is. - -JavaScript is also a programming language and we can run it in our browser. - -What is a box? Why do we put things in a box? Can we take things out of the box once we've put stuff in it? +What is a box? Why do we put things in a box? Can we take things out of the box once we've put stuff in it? ### Introduction to New Material ("I Do") Use the Google slides (see references above) to introduce the following material: -#####Instantiate, Print and Change a Variable + +##### Instantiate, Print and Change a Variable **Variables** in JavaScript are like boxes in real life. All variables have a **name** and a **value**. @@ -126,19 +119,6 @@ console.log(age) now gives us 24. -######Order of Operations - -Remember PEMDAS: - -1. Parenthesis -2. Exponent -3. Multiplication -4. Divison -5. Addition -6. Subtraction - -These are the same order of operations you follow in math class. See link in references for more. - ######Increment It's your birthday today. You were 16 yesterday and now you are 17 today. Let's represent this in JavaScript: @@ -158,38 +138,6 @@ console.log(todayAge); This first line from above is equivalent to the second line from earlier. We can similarly use the ``--`` or **decrement** operator to decrease the value of a variable by 1. -######Types - -Every variable in JavaScript has a type. So far, we have seen two types: strings (which have quotes around them) and numbers. We can use the ``typeof`` function to print the type. - -``` -var name = "Justin Bieber"; -var age = 22; -console.log(typeof(name)); -console.log(typeof(age)); -``` - -prints out - -``` -string -number -``` - -Suppose we instead had the following: - -``` -var age = "22"; -``` - -What type is the above variable? - -``` -console.log(typeof(age)); -``` - -prints out ``string`` because we put quotes around 22. This tells JavaScript to treat the value as a string. - ### Guided Practice ("We Do") Write one variable that is named "modeOfTransit" and is set to the string "bicycle." Write another variable that is named "numberOfWheels" and set it to the number 2. diff --git a/units/5-javascript1_1/sessions/1-variable/assessments/1/question.md b/units/5-javascript1_1/sessions/2-variable/assessments/1/question.md similarity index 100% rename from units/5-javascript1_1/sessions/1-variable/assessments/1/question.md rename to units/5-javascript1_1/sessions/2-variable/assessments/1/question.md diff --git a/units/5-javascript1_1/sessions/1-variable/assessments/README.md b/units/5-javascript1_1/sessions/2-variable/assessments/README.md similarity index 100% rename from units/5-javascript1_1/sessions/1-variable/assessments/README.md rename to units/5-javascript1_1/sessions/2-variable/assessments/README.md diff --git a/units/5-javascript1_1/sessions/1-variable/homework/README.md b/units/5-javascript1_1/sessions/2-variable/homework/README.md similarity index 100% rename from units/5-javascript1_1/sessions/1-variable/homework/README.md rename to units/5-javascript1_1/sessions/2-variable/homework/README.md diff --git a/units/5-javascript1_1/sessions/1-variable/homework/starter_code/starter.js b/units/5-javascript1_1/sessions/2-variable/homework/starter_code/starter.js similarity index 100% rename from units/5-javascript1_1/sessions/1-variable/homework/starter_code/starter.js rename to units/5-javascript1_1/sessions/2-variable/homework/starter_code/starter.js From e7401f193728b6232a2de28950808a055e70a089 Mon Sep 17 00:00:00 2001 From: Mat Brown Date: Sat, 7 Nov 2015 16:41:00 -0500 Subject: [PATCH 38/39] Lesson 1: Values and Expressions Reworked first lesson plan based on structure used successfully at GWHS, with focus on values, expressions, and the relationship between the two. --- .../sessions/1-types-and-operators/README.md | 170 ---------------- .../1-values-and-expressions/README.md | 181 ++++++++++++++++++ 2 files changed, 181 insertions(+), 170 deletions(-) delete mode 100644 units/5-javascript1_1/sessions/1-types-and-operators/README.md create mode 100644 units/5-javascript1_1/sessions/1-values-and-expressions/README.md diff --git a/units/5-javascript1_1/sessions/1-types-and-operators/README.md b/units/5-javascript1_1/sessions/1-types-and-operators/README.md deleted file mode 100644 index f473b4b..0000000 --- a/units/5-javascript1_1/sessions/1-types-and-operators/README.md +++ /dev/null @@ -1,170 +0,0 @@ -#Lesson 1 - Types and Operators - -## Before Class - -### Objective - -Students will be able to manipulate strings and numbers in the console using -built-in JavaScript operators. - -### Key Points - -* JavaScript is a programming language that we can run in our browser. -* JavaScript is basically used to manipulate information; think of it like a - really powerful calculator. -* Different kinds of information have different *types*; two of the most - important are Strings and Numbers. -* You can write strings and numbers in a way that JavaScript understands -* You can manipulate strings and integers using built-in JavaScript operators - like `+`. -* To quickly try out new techniques, we can use the JavaScript console in - JSBin. - -### Assessment - -Students will show progress toward reaching the objective based on their performance on the exit ticket quiz. - -### Vocabulary - -* JavaScript -* Type -* Console -* Arithmetic operation -* String concatenation - -## During Class - -### Do Now - -What is the difference between a word and a number? What can you do with -words that you can't do with numbers? What can you do with numbers that you -can't do with words? - -### Opening - -What is a programming language? Can someone give me some examples? Remind me what a browser is. - -JavaScript is a programming language and we can run it in our browser. - -So far, we’ve learned HTML and CSS. These languages are useful for making web -pages, but we can’t use them to make our pages *do* anything. JavaScript allows -us to make our page do more than just display information: it can change and -react to us. - -### Introduction to New Material ("I Do") - -Open a new JSBin session, and point out the **Console**. Explain that the -console used to try out small amounts of JavaScript and see how they work. When -we want to write more complicated JavaScript, we’ll use the **JavaScript** tab. -But for now, it’s the console. - -##### Console Demonstration - -Demonstrate typing a number and pressing return. - -``` -2 -``` - -Show how the console repeats -the number back to you. Explain that you just gave JavaScript a little bit of -work to do, and it did the work and gave you the result. In this case, the work -was just “show me the number 2”. - -##### Basic Arithmetic - -Do some basic math in the console. Demonstrate adding, subtracting, multiplying -numbers. Point out to the students that everyone in the room knows how to use a -calculator, so now everbody in the room knows some JavaScript as well. - -``` -2 + 2 -10 - 2 -4 * 4 -``` - -##### Strings - -Now type a string, in quotation marks, into the console. Point out that -JavaScript understands this string as well. Try a few other strings to -demonstrate that there’s nothing special about the first string you typed. - -``` -"ScriptEd" -"Coding is fun" -"I am a programmer" -``` - -Point out the quotation marks. Explain that when we want to give JavaScript a -number, we can just type the number. But when we want to give it a word or -words, we have to put them in quotation marks. Otherwise, JavaScript won’t know -what we mean. - -######Types - -Everything in JavaScript has a type. So far, we have seen two types: strings (which have quotes around them) and numbers. We can use the ``typeof`` function to print the type. - -``` -typeof("Justin Bieber") -typeof(22) -``` - -prints out - -``` -string -number -``` - -What will happen if I type this into the console? - -``` -typeof("22") -``` - -prints out ``string`` because we put quotes around 22. This tells JavaScript to treat the value as a string. - -### Guided Practice ("We Do") - -Open up the console and experiment with the `+` sign. - -Try typing: - -``` -10 + 10 -``` - -Note that this makes JavaScript do math. - -Now try: - -``` -"Script" + "Ed" -``` - -Observe that this makes JavaScript stick the two strings together. We call this -**concatenation**. - -### Independent Practice ("You Do") - -In the console, find the answer to this math problem: - -``` -1103819 / 907 -``` - -What happens if you put the numbers in quotes? - -### Exit Ticket - -What result will JavaScript give you for this? - -``` -10 + 2 -``` - -How about for this? - -``` -"10" + "2" -``` diff --git a/units/5-javascript1_1/sessions/1-values-and-expressions/README.md b/units/5-javascript1_1/sessions/1-values-and-expressions/README.md new file mode 100644 index 0000000..6f17030 --- /dev/null +++ b/units/5-javascript1_1/sessions/1-values-and-expressions/README.md @@ -0,0 +1,181 @@ +#Lesson 1 - Values and Expressions + +## Before Class + +### Objective + +Students will understand the concepts of JavaScript **values** and +**expressions**. + +### Key Points + +* JavaScript is a programming language that we can run in our browser. +* JavaScript is basically used to manipulate information; think of it like a + really powerful calculator. +* Different kinds of information have different *types*; two of the most + important are Strings and Numbers. +* A **value** is a *piece of data*. +* An **expression** is a *piece of code that produces a value*. +* Many different expressions can produce the same value. +* You can write expressions that produce the exact value you have written. + These are called **literals**. +* You can combine several expressions to produce a new, more complex + expression. One way to do this is using JavaScript operators like `+`. +* Values can have different **types**. A value's type tells us the *role it + plays in the program*. +* To quickly try out new techniques, we can use the JavaScript console in + JSBin. We can type an **expression** into the console, and JSBin will print + out that expression’s **value**. + +### Assessment + +Students will show progress toward reaching the objective based on their performance on the exit ticket quiz. + +### Vocabulary + +* JavaScript +* Value +* Expression +* Type +* Literal +* Console +* Arithmetic operation +* String concatenation + +## During Class + +### Do Now + +What is the difference between a word and a number? What can you do with +words that you can't do with numbers? What can you do with numbers that you +can't do with words? + +### Opening + +What is a programming language? Can someone give me some examples? Remind me what a browser is. + +JavaScript is a programming language and we can run it in our browser. + +So far, we’ve learned HTML and CSS. These languages are useful for making web +pages, but we can’t use them to make our pages *do* anything. JavaScript allows +us to make our page do more than just display information: it can change and +react to us. + +### Introduction to New Material ("I Do") + +On the board, write an empty [T +Chart](http://mathhelpwithpatternsinbivariatedata.weebly.com/uploads/4/4/6/6/44667841/9265818_orig.jpg). Label the left column **Value** and the right column +**Expression**. + +In the left column, write the number **4**. Point at what you just wrote and +ask a student to tell you what it is. + +When the student responds correctly, write **4** in the right column as well. +Explain to the class that in the left column, you actually wrote a little bit +of JavaScript code. That code just happens to be the number 4. + +Now in the left column, write down **2 + 2**. Ask another student what you just +wrote down. If the student answers "two plus two", ask them to do the math. +When you recieve the answer "four", write down **4** again in the right column. + +Explain that, once again, the left column contains a little bit of JavaScript +code, and that the right column contains its value. Just like [student name] +did the work of turning **2+2** into **4**, JavaScript will do the work of +turning an **expression** into a **value** for us. + +At this point, write down the definitions of these key vocabulary terms: + +* A **value** is a *a single piece of information, like a number, word, or + sentence*. +* An **expression** is *a piece of code that produces a value*. + +Point out that you just wrote down two *different* expressions that produced +the *same* value, 4. Emphasize that for any value, there are many possible +expressions that can produce that value. + +Write down two or three more expressions that produce **4**, e.g. **5 - 1**, +**8 / 2**, or **2 + 1 + 1**. + +Point out that the more complex expressions you wrote are composed of simpler +expressions, glued together by **operators**. For instance, in the expression +**5 - 1**, there are also the smaller expressions **5** and **1**, which are +combined into a new, more complex expression using the subtraction operator. + +Open a new JSBin session, and point out the **Console**. Explain that the +console used to try out small amounts of JavaScript and see how they work. When +we want to write more complicated JavaScript, we’ll use the **JavaScript** tab. +But for now, it’s the console. + +### Guided Practice ("We Do") + +Instruct students to take out a piece of paper, and write a T-chart with +headers **Expression** and **Value**, like you just did on the board. + +On their workstations, have students to open up a fresh JSBin console at +http://jsbin.com/?console + +This part of the lesson will follow a pattern: you type an expression into the +console, and the students follow along on their workstations. Once everyone is +ready, you all press **Enter** to see the result. The students write down the +expression-value pair in their T-chart in their notes. + +Below is a good series of expressions, with accompanying instruction where +relevant: + +* `225` +* `215 + 10` +* `550 / 2` +* `5 * 2 + 4` +* `5 * (2 + 4)` + Point out that parentheses can be used for order of operations in JavaScript, + just like the students learned in math class. Provide a quick refresher on + PEMDAS if needed. +* `"ScriptEd"` + Point out the quotation marks, and explain that quotation marks allow us to + write an expression that produces a **string**. + Give the definition of a **string** as a *sequence of letters, numbers, and + symbols*, like a word or a sentence. Write this on the board. + Contrast this with the other values we have been working with, which are + **numbers**. (Note that JavaScript does not make a distinction between + integer and floating-point types, so there is no need to bring that up). +* `"Script" + "Ed"` + Point out that the `+` sign works differently for strings than it did for + integers. Explain that values with different **types** behave differently. + Give the definition of **type** as *the role that a value plays in the + program*. +* `"Sc" + "ri" + "ptE" + "d"` + Give the definition of **concatenation** as *combining several strings into + one long string*. +* `"215" + "10"` + Give the students a moment to absorb the fact that this did not produce the + value they might have expected! Emphasize that any expression that is + surrounded in quotes produces a string value; remember, a string is a + sequence of letters, **numbers**, and symbols. Have the students try the + non-quoted version again to drive the point home. +* `"215 + 10"` + Point out that anything that’s surrounded in quotes is part of a **string + literal**; JavaScript won’t try to **evaluate** it further. + +### Independent Practice ("You Do") + +In the console, find the answer to this math problem: + +``` +1103819 / 907 +``` + +What happens if you put the numbers in quotes? + +### Exit Ticket + +What result will JavaScript give you for this? + +``` +10 + 2 +``` + +How about for this? + +``` +"10" + "2" +``` From 5fc82b4e04c4ff2d5ad4b5e47a88442e6dbaac5c Mon Sep 17 00:00:00 2001 From: Mat Brown Date: Sat, 7 Nov 2015 17:20:04 -0500 Subject: [PATCH 39/39] Rework variables lesson * Tie it back in to values & expressions lesson * Spell out steps for declaring a variable and assigning it a value * Practice using variables in expressions --- .../sessions/2-variable/README.md | 213 +++++++++--------- 1 file changed, 111 insertions(+), 102 deletions(-) diff --git a/units/5-javascript1_1/sessions/2-variable/README.md b/units/5-javascript1_1/sessions/2-variable/README.md index 1eca694..c4dd4a7 100755 --- a/units/5-javascript1_1/sessions/2-variable/README.md +++ b/units/5-javascript1_1/sessions/2-variable/README.md @@ -1,4 +1,4 @@ -#Lesson 1 - Variables +#Lesson 2 - Variables ![image](http://i.imgur.com/xwrZiJd.jpg) @@ -6,14 +6,15 @@ ### Objective -Students will able to create, instantiate, and edit variables in JavaScript. +Students will able to create variables, assign values to them, and use them in +expressions. ### Key Points -* Variables are like boxes; they store something. +* Variables allow us to remember a **value** by giving it a name. * Variables have a name and a value. -* We can perform various operations on variables. -* Each variable has a type. +* The name of a variable, *without quotes*, is an **expression** whose + **value** is the value of the variable. ### Assessment @@ -22,13 +23,12 @@ Students will show progress toward reaching the objective based on their perform ### Vocabulary * Variable -* Instantiate +* Declare * Assign * Increment / Decrement ### References -* [Variable Slides](https://docs.google.com/presentation/d/1CAMz_T9qWWL6GSNx70ZtxwLm-AAN0sBgPaQMDtJ3ZD0/edit#slide=id.g11014a258_073) * [Homework](homework/), Should be printed out before class * Other Resources: http://www.mathsisfun.com/operation-order-pemdas.html, http://www.w3schools.com/js/js_variables.asp, http://www.w3schools.com/js/js_datatypes.asp, http://www.w3schools.com/js/js_functions.asp, http://www.w3schools.com/js/js_comments.asp @@ -37,126 +37,135 @@ Students will show progress toward reaching the objective based on their perform ### Do Now 1. Volunteer takes attendance. [Procedure found here](https://docs.google.com/document/d/19IIhqykr70vj7wnqyJYuQNTkd9GX56Xgl3omD42IcMk/edit). -2. Do a recall activity to remind students about what variables are and how they are used. +2. Do a recall activity to remind students about what variables are and how they are used. ### Opening -Today we will learn about variables in JavaScript. This is important because we can use variables to store things that we can later on look up. It connects to what we've previously learned because we will be able to, eventually, write JavaScript code that interacts with the HTML & CSS that we have written before. +Cold call a student volunteer. Tell the volunteer, “I need you to help me +remember something. The password is ‘wombat’”. -What is a box? Why do we put things in a box? Can we take things out of the box once we've put stuff in it? +After pausing for a moment, ask the student, “what is the password?”. The +baffled student should reply, “wombat”. -### Introduction to New Material ("I Do") - -Use the Google slides (see references above) to introduce the following material: - -##### Instantiate, Print and Change a Variable - -**Variables** in JavaScript are like boxes in real life. All variables have a **name** and a **value**. - -``` -var singer = "Justin Bieber"; -``` - -This is an example of one variable that has a name called ``singer`` and a value called ``"Justin Bieber"``. We could say it is **instantiated** to the value ``"Justin Bieber"``. Notice the ``var`` keyword too; this is how we tell JavaScript we are making a new variable. Also notice the semi-colon at the end of the line; this is how we tell JavaScript we are done with a line of code. Finally, notice the quotes around the word Justin Bieber. These quotes tell JavaScript that this thing is a String. - -Suppose we want to print the value of the variable: - -``` -console.log(singer); -``` - -This line prints ``"Justin Bieber`` to the console using the ``log()`` function. We'll explore both the console and functions later on in this unit. For now, pass in any variable you create into the console.log() function to print it out.. - -Suppose our favorite singer is Ariana Grande, not Justin Bieber. We could change the value of the variable: - - -``` -singer = "Ariana Grande"; -console.log(singer); -``` +Thank the student, then tell them, “the secret code is 2468”. Again, after a +pause, ask them to recite the secret code. Thank them for answering correctly. -This code prints out ``"Ariana Grande"`` to the console. +Then ask again for the password, and again for the secret code. Point out that +you gave the volunteer two different pieces of information, and you’re able to +recall the right one by invoking the *name* you gave to that information: +“password” or “secret code”. -#####Arithmetic Operations +We can do this when we’re programming, too. In JavaScript, we can create +*variables* to remember a piece of information, which we can later refer to by +name. -Once we've stored something into a variable, we can do things with it. Suppose we have a variable that stored a number: - -``` -var age = 10; -``` - -Suppose we want to add two years to this age. We could use the `+` or addition operator: - -``` -age = age + 2; -``` - -Let's read this right to left. We're taking the number 2 and then adding it to the variable ``age``. We're then setting the result of that addition to the variable ``age``. So if we did: - -``` -console.log(age); -``` - -We would see ``12`` get printed out. We can similarly use the ``-`` (subtraction), ``/`` (division), and ``*`` (multiplication) operators. - -Suppose we want to double the age to 24. We could - -``` -age = age * 2; +### Introduction to New Material ("I Do") -OR +#### Declaring and assigning variables -age = age + age; -``` +Tell the students you’re going to tell them how to create a new variable in +JavaScript, and to get ready to take notes. Then, on the board, write a +variable declaration, one step at a time: -Let's talk about the second suggestion. Again, right to left: take the variable ``age`` (which is currently set to 12) and add it to ``age`` again (also set to 12). The result of the addition is 24 which then gets stored in the variable ``age``. +* **The `var` keyword**: Explain that, any time we are *creating* a new + variable, we start by writing the word `var`. This is a special word that + JavaScript knows means we want to create a new variable. +* **The name of the variable**: Write down “password” to tie the lesson back + in to the intro. Explain that every variable has a name, and we can use that + name to retrieve the piece of information that the variable is remembering + for us. +* **The `=` sign**: Explain that, after the variable name, we always write an + equals sign. +* **The value of the variable**: Explain that, after the equals sign, we can + write *any expression*. The value of that expression will become the value + remembered by the variable. -So +Take a moment to give some definitions: -``` -console.log(age) -``` +* A **variable** is a name given to a value, so that it can be stored for + later use. +* To **declare** a variable is to make a new variable. +* We **assign** a value to a variable. -now gives us 24. +Go back to your example and point out that we are both **declaring** the +variable and **assigning** it a value, all at the same time. Emphasize that we +only have to **declare** the variable once, but we can **assign** it different +values at different times. -######Increment +Write an example where we assign a different value to the variable; point out +that this time, we don’t use the `var` keyword. -It's your birthday today. You were 16 yesterday and now you are 17 today. Let's represent this in JavaScript: +#### Using a variable -``` -var yesterdayAge = 16; -var todayAge = yesterdayAge + 1; -console.log(todayAge); -``` +Write a value-expression T-Chart on the board, like the one from the previous +lesson. -This prints out ``17`` like we expect. But line two took forever to write. Let's shorten it by using the **increment** operator. +In the left column, write `password`, without quotes. Ask a student to guess what the right value is. -``` -todayAge = yesterdayAge++; -console.log(todayAge); -``` +Explain that once we declare a variable, the name of that variable *is an +expression* that produces the value stored in the variable. -This first line from above is equivalent to the second line from earlier. We can similarly use the ``--`` or **decrement** operator to decrease the value of a variable by 1. +Write a few more complex expressions that use the `password` variable, e.g. +`password + "!"`, `password + password`, etc. Have the students help you fill +in the values. ### Guided Practice ("We Do") -Write one variable that is named "modeOfTransit" and is set to the string "bicycle." Write another variable that is named "numberOfWheels" and set it to the number 2. - -1. How do I print out the values of both variables? -2. How do I change the value of the modeOfTransit variable to "tricycle"? -3. How do I change the value of the numberOfWheels variable to 3? -4. How do I multiply the value of the numberOfWheels variable by 2? -5. How do I decrease the numberOfWheels variable by 1 without using the subtract operator? +This takes the same form as the We Do from the previous lesson, with the +instructor leading the students in typing expressions into the JSBin console, +observing the value they produce, and then writing down each one in a T-chart. + +* `var artist = "Drake"` + Point out that the JSBin console prints `undefined`, which just means “no + value here”. Compare that to the beginning of class when you asked the + student to remember the password; the student had no particular *answer* to + that request; they simply did as you asked. + Prompt the students for the **name** of the variable and the **value** of the + variable. +* `var age = 27` + Ask the students for the name and value of this variable. As a refresher, ask + what **type** the value has. +* `artist` + Emphasize that the name of the `artist` variable **is an expression**. Point + out that it produces the value that we assigned to the `artist` variable. +* `age` + Emphasize that each variable remembers the value we assigned it. +* `"age"` + Ask the students why this produced a different value. If necessary, reinforce + the effect of quotation marks and the difference between string literals and + variable names. +* `"Hotline Bling is a song by " + artist` + Reinforce that you can use a variable name as part of a larger expression. +* `age + 2` +* `age` + Point out that even though we typed `age + 2` in the previous step, we + haven’t changed the value of the `age` variable. It’s still 27. +* `age = 40` + Emphasize that there is no `var` here! Since we’re assigning a *new* value to + an *old* variable, we don’t write `var`. +* `age` + Point out that the expression `age` produces the *last* value that we + assigned to that variable. The previous value, 27, has now been forgotten. +* `var currentYear = 2015` + Point out that variable names can’t contain spaces, so when we want to make a + variable whose name is more than one word, we capitalize all the words but + the first one. Write a couple of other examples on the board. +* `currentYear - age` + Point out that we are now using two different variables in one expression +* `age = age + 1` + Emphasize that, after the equals sign, we can write *any expression we want*. + We can even write an expression that includes the name of the variable we’re + assigning a new value to! +* `age` + Point out that, since we have now **assigned** a new value to `age`, that + value has replaced the previous value. ### Independent Practice ("You Do") -Write one variable that is named "character" and is set to the string "Shrek." Write another variable that is named "heightInFeet" and set it to the number 6. - -1. Print out the values of both variables. -2. Change the value of the character variable to "Fiona". -3. Change the value of the heightInFeet variable to 5. -4. Divide the value of the heightInFeet variable by 2. -5. Increase the character variable by 1 without using the addition operator. +* Write an expression that produces **half the value of age**. +* Write a statement that assigns `age` a value **one less** than it was before. + * There are actually three ways to do this in JavaScript. Can you use Google + to figure out all three? ### Exit Ticket @@ -179,5 +188,5 @@ Today you learned about variables in JavaScript and JavaScript itself. This is i ## After Class -* Review student exit tickets. +* Review student exit tickets. * Prepare for next lesson / hand off to next volunteer in rotation.