From 9b066457e7cd2650fefc8d5c45a64c9cd3d39366 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Tue, 24 Oct 2017 18:54:01 -0500 Subject: [PATCH 1/9] starting to understand the syntax of forEach --- 04week/gitOlympics.js | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 04week/gitOlympics.js diff --git a/04week/gitOlympics.js b/04week/gitOlympics.js new file mode 100644 index 000000000..9554111a9 --- /dev/null +++ b/04week/gitOlympics.js @@ -0,0 +1,7 @@ +'use strict' + +const names = ['athens', 'berlin', 'atlanta', 'seoul'] + +printListOfOlympics=(arr)=>{ + arr.forEach(i)=>{console.log(i)} +} From 01da0422d27d6637f825cad78c5506bf8012a2f1 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Tue, 24 Oct 2017 18:56:26 -0500 Subject: [PATCH 2/9] added missing const --- 04week/gitOlympics.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/04week/gitOlympics.js b/04week/gitOlympics.js index 9554111a9..fe9b8488c 100644 --- a/04week/gitOlympics.js +++ b/04week/gitOlympics.js @@ -2,6 +2,8 @@ const names = ['athens', 'berlin', 'atlanta', 'seoul'] -printListOfOlympics=(arr)=>{ - arr.forEach(i)=>{console.log(i)} +const printListOfOlympics=(arr)=>{ + arr.forEach(i => console.log(i)) } + +printListOfOlympics(names); From 7d6c86886eae7e51532acba7f969c21f1cc58090 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Tue, 24 Oct 2017 18:57:02 -0500 Subject: [PATCH 3/9] added one more city --- 04week/gitOlympics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/04week/gitOlympics.js b/04week/gitOlympics.js index fe9b8488c..332de72b7 100644 --- a/04week/gitOlympics.js +++ b/04week/gitOlympics.js @@ -1,6 +1,6 @@ 'use strict' -const names = ['athens', 'berlin', 'atlanta', 'seoul'] +const names = ['athens', 'berlin', 'atlanta', 'seoul', 'los angeles'] const printListOfOlympics=(arr)=>{ arr.forEach(i => console.log(i)) From 26d8d99a53cd2028cf579cd17cf515b09fc2ea2b Mon Sep 17 00:00:00 2001 From: walzer85 Date: Tue, 24 Oct 2017 19:51:37 -0500 Subject: [PATCH 4/9] will review this change in a bit --- 01week/datatypes.js | 81 +++++++++++++++++++++++++++++++++++++++++++++ 02week/pigLatin.js | 51 ---------------------------- 02week/tests.js | 67 +++++++++++++++++++++++++++++++++++++ index.html | 2 +- 4 files changed, 149 insertions(+), 52 deletions(-) delete mode 100644 02week/pigLatin.js diff --git a/01week/datatypes.js b/01week/datatypes.js index e69de29bb..9f82f4110 100644 --- a/01week/datatypes.js +++ b/01week/datatypes.js @@ -0,0 +1,81 @@ +`use strict` + +//returns current date and time +//create a function that inputs the year, month, and day +//make new var to store the today var and toDateString method +//use var today with toDateString method + +function dateDisplay(year, month, date) { + var today = new Date(year, month, date); + return today.toDateString(); +} + +dateDisplay(1985, 10, 1); + +//create a function with one argument. +//the argument should be a number +//return the argument with the toString() method to make the number a string + +function toNumber(number) { + return number.toString() +} + +toNumber(13); + +//create a fucntion that receives one argument +//argument should be a string +//use parseInt() method on argument to pull a number out + +function stringNum(str){ + return parseInt(str); +} + +stringNum('15 years'); + +//create a function with one argument +//use the typeOf method on the argument and return the result + +function dataType(dT){ + return typeof(dT); +} + +dataType(`words words words`); + +//Create a function with two arguments +//Inside the function, add the two var together +//Use parseInt() to take the number out of the string + +function add(numOne, numTwo) { + return parseInt(numOne) + parseInt(numTwo) +} + +add(`13`, `17`); + +//write a function that returns a true if two var are truthy +//if both var are true, show "nope" +//if both var are false, also show "nope" +// if one is false and one is true, show "yep!" + +function truest(thingOne, thingTwo) { + if ((thingOne === true && thingTwo === true) || (thingOne === false && thingTwo === false)){ + return `nope`; + } else { + return 'yep!'; + } +} + +truest(true, false); + +//write a function with two arguments +//if both arguments are false, show a confirmation message +//if either argument is true, return a negative response + +function womp(dumb, dumber) { + if (dumb === false && dumber === false) { + return `yes, they're both false` + } else { + return 'nah, try again' + } +}; + +womp(false, true); diff --git a/02week/pigLatin.js b/02week/pigLatin.js deleted file mode 100644 index 046434c94..000000000 --- a/02week/pigLatin.js +++ /dev/null @@ -1,51 +0,0 @@ -'use strict'; - -const assert = require('assert'); -const readline = require('readline'); -const rl = readline.createInterface({ - input: process.stdin, - output: process.stdout -}); - - -function pigLatin(word) { - - // Your code here - -} - - -function getPrompt() { - rl.question('word ', (answer) => { - console.log( pigLatin(answer) ); - getPrompt(); - }); -} - -// Tests - -if (typeof describe === 'function') { - - describe('#pigLatin()', () => { - it('should translate a simple word', () => { - assert.equal(pigLatin('car'), 'arcay'); - assert.equal(pigLatin('dog'), 'ogday'); - }); - it('should translate a complex word', () => { - assert.equal(pigLatin('create'), 'eatecray'); - assert.equal(pigLatin('valley'), 'alleyvay'); - }); - it('should attach "yay" if word begins with vowel', () => { - assert.equal(pigLatin('egg'), 'eggyay'); - assert.equal(pigLatin('emission'), 'emissionyay'); - }); - it('should lowercase and trim word before translation', () => { - assert.equal(pigLatin('HeLlO '), 'ellohay'); - assert.equal(pigLatin(' RoCkEt'), 'ocketray'); - }); - }); -} else { - - getPrompt(); - -} diff --git a/02week/tests.js b/02week/tests.js index e69de29bb..6991b4d89 100644 --- a/02week/tests.js +++ b/02week/tests.js @@ -0,0 +1,67 @@ +'use strict'; + +const assert = require('assert'); +const readline = require('readline'); +const rl = readline.createInterface({ + input: process.stdin, + output: process.stdout +}); + + +function rockPaperScissors(hand1, hand2) { + // check for a tie, if it is a tie, return tie, if not check for win + // rock beats scissors, scissors beats paper, paper beats rock + //to find who won, compare hand1 to hand2 + const handOne = 'Hand one wins!' + const handTwo = 'Hand two wins!' + + if(hand1 === hand2) { + return "It's a tie!"; + } else if (hand1 === 'rock'){ + return hand2 === 'paper' ? handTwo : handOne; + } else if (hand1 === 'paper') { + return hand2 === 'scissors' ? handTwo : handOne; + } else if (hand1 === 'scissors') { + return hand2 === 'rock' ? handTwo : handOne; + } +}; + +function getPrompt() { + rl.question('hand1: ', (answer1) => { + rl.question('hand2: ', (answer2) => { + console.log( rockPaperScissors(answer1, answer2) ); + getPrompt(); + }); + }); +} + +// Tests + +if (typeof describe === 'function') { + + describe('#rockPaperScissors()', () => { + it('should detect a tie', () => { + assert.equal(rockPaperScissors('rock', 'rock'), "It's a tie!"); + assert.equal(rockPaperScissors('paper', 'paper'), "It's a tie!"); + assert.equal(rockPaperScissors('scissors', 'scissors'), "It's a tie!"); + }); + it('should detect which hand won', () => { + assert.equal(rockPaperScissors('rock', 'paper'), "Hand two wins!"); + assert.equal(rockPaperScissors('paper', 'scissors'), "Hand two wins!"); + assert.equal(rockPaperScissors('scissors', 'rock'), "Hand two wins!"); + assert.equal(rockPaperScissors('scissors', 'paper'), "Hand one wins!"); + assert.equal(rockPaperScissors('rock', 'scissors'), "Hand one wins!"); + assert.equal(rockPaperScissors('paper', 'rock'), "Hand one wins!"); + }); + it('should scrub input to ensure lowercase with "trim"ed whitepace', () => { + assert.equal(rockPaperScissors('rOcK', ' paper '), "Hand two wins!"); + assert.equal(rockPaperScissors('Paper', 'SCISSORS'), "Hand two wins!"); + assert.equal(rockPaperScissors('rock ', 'sCiSsOrs'), "Hand one wins!"); + });w + // it('should detect ') + }); +} else { + + getPrompt(); + +} diff --git a/index.html b/index.html index a8de93e90..ffe101bd4 100644 --- a/index.html +++ b/index.html @@ -5,6 +5,6 @@ -

Hello World!

+

Hello Eric, how are you!

From 74a2c5dbaf382135e6a44152537f6db5ece27199 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Fri, 27 Oct 2017 06:30:25 -0500 Subject: [PATCH 5/9] finished first for loop --- 04week/loop.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/04week/loop.js b/04week/loop.js index e69de29bb..fc08a12f6 100644 --- a/04week/loop.js +++ b/04week/loop.js @@ -0,0 +1,11 @@ +'use strict' + +//create a variable with several car makers +const carsInReverse ['toyota', 'honda', 'chevrolet', 'puegot'] + +//using forEach, console log the items inside the array carsInReverse +carsInReverse.forEach((item)=>{ + console.log(item); +}); + +carsInReverse; From f13846d5d38199f4ac147a5ebf70f6bc28222220 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Fri, 27 Oct 2017 06:59:13 -0500 Subject: [PATCH 6/9] completeed for...in loop --- 04week/loop.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/04week/loop.js b/04week/loop.js index fc08a12f6..8c097fd08 100644 --- a/04week/loop.js +++ b/04week/loop.js @@ -9,3 +9,16 @@ carsInReverse.forEach((item)=>{ }); carsInReverse; + +//create an object with the personal information from assignment +const personalInfo = { + firstName: "Jane", + lastName: "Doe", + birthDate: "Jan 5, 1925", + gender: "female"; +} + +//create a for...in loop that prints out the contents of personalInfo +for (const prop in personalInfo) { + console.log(`personalInfo.${prop} = ${personalInfo[prop]}`); +} From 0074c5bfb58730f2045c45a7df3d65b1e7201e92 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Fri, 27 Oct 2017 07:11:46 -0500 Subject: [PATCH 7/9] need to find the correct method to display one entry in the object --- 04week/loop.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/04week/loop.js b/04week/loop.js index 8c097fd08..e4faeab64 100644 --- a/04week/loop.js +++ b/04week/loop.js @@ -20,5 +20,10 @@ const personalInfo = { //create a for...in loop that prints out the contents of personalInfo for (const prop in personalInfo) { - console.log(`personalInfo.${prop} = ${personalInfo[prop]}`); + console.log(`${prop} = ${personalInfo[prop]}`); +} + +//use the same personalInfo in a for...in loop to show only birthDate +for (const prop in personalInfo) { + console.log(`${birthDate} = ${personalInfo[birthDate]}`); } From cac7067e9dc126eaf6ae929c8de81904d1ffb4db Mon Sep 17 00:00:00 2001 From: walzer85 Date: Fri, 27 Oct 2017 07:17:11 -0500 Subject: [PATCH 8/9] added the while loop --- 04week/loop.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/04week/loop.js b/04week/loop.js index e4faeab64..a6dbb8f1a 100644 --- a/04week/loop.js +++ b/04week/loop.js @@ -1,10 +1,10 @@ 'use strict' //create a variable with several car makers -const carsInReverse ['toyota', 'honda', 'chevrolet', 'puegot'] +const carsInReverse['toyota', 'honda', 'chevrolet', 'puegot'] //using forEach, console log the items inside the array carsInReverse -carsInReverse.forEach((item)=>{ +carsInReverse.forEach((item) => { console.log(item); }); @@ -27,3 +27,12 @@ for (const prop in personalInfo) { for (const prop in personalInfo) { console.log(`${birthDate} = ${personalInfo[birthDate]}`); } + +//create a variable that is assigned a number value of zero +let numBeginning = 1; + +//I want to print every number between 1 and 1000 using a while loop +while (numBeginning <= 1000) { + console.log(numBeginning); + numBeginning ++; +} From 0e8d65fd211367bcc2d13ed8fc9abde527c579b7 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Sat, 28 Oct 2017 08:49:09 -0500 Subject: [PATCH 9/9] done first draft of loops --- 04week/loop.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/04week/loop.js b/04week/loop.js index a6dbb8f1a..228edf725 100644 --- a/04week/loop.js +++ b/04week/loop.js @@ -1,5 +1,6 @@ 'use strict' +//Problem One //create a variable with several car makers const carsInReverse['toyota', 'honda', 'chevrolet', 'puegot'] @@ -10,6 +11,7 @@ carsInReverse.forEach((item) => { carsInReverse; +//Problem 2 //create an object with the personal information from assignment const personalInfo = { firstName: "Jane", @@ -23,11 +25,13 @@ for (const prop in personalInfo) { console.log(`${prop} = ${personalInfo[prop]}`); } +//Problem 3 //use the same personalInfo in a for...in loop to show only birthDate for (const prop in personalInfo) { console.log(`${birthDate} = ${personalInfo[birthDate]}`); } +//Problem 4 //create a variable that is assigned a number value of zero let numBeginning = 1; @@ -36,3 +40,13 @@ while (numBeginning <= 1000) { console.log(numBeginning); numBeginning ++; } + +//Problem 5 +//create a variable to act as the iterator +let i = 1; + +//use a do...while loop to increase the iterator +do { + i += 1; + console.log(i + ' '); +} while (i < 1000);