From 9b066457e7cd2650fefc8d5c45a64c9cd3d39366 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Tue, 24 Oct 2017 18:54:01 -0500 Subject: [PATCH 1/6] 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/6] 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/6] 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/6] 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 11e49c6b9a14e408763f1637eaddc1fd07d31fa5 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Sun, 12 Nov 2017 12:12:59 -0600 Subject: [PATCH 5/6] writing out the new instances of Customer --- 04week/functional-javascript/helloWorld.js | 14 ++++- 06week/Checkpoint2Objects.js | 62 ++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 06week/Checkpoint2Objects.js diff --git a/04week/functional-javascript/helloWorld.js b/04week/functional-javascript/helloWorld.js index adb078759..a3e4155a8 100644 --- a/04week/functional-javascript/helloWorld.js +++ b/04week/functional-javascript/helloWorld.js @@ -1,5 +1,17 @@ +'use strict' + +//# 1 function upperCaser(input) { return input.toUpperCase(); -} +}; module.exports = upperCaser + + +//# 3 +var numbers = [1, 5, 10, 15]; +var doubles = numbers.map(function(x) { + return x * 2; +}; + +//# 4 diff --git a/06week/Checkpoint2Objects.js b/06week/Checkpoint2Objects.js new file mode 100644 index 000000000..74af22176 --- /dev/null +++ b/06week/Checkpoint2Objects.js @@ -0,0 +1,62 @@ +'use strict' + +//Take the following array of objects and console.log each user and their corresponding data in the following form: "user_name paid amount for product in city, state." using map. + +// let userArray = [ +// { +// "customer": { +// "id": 1, +// "customerName":"Marilyn Monroe", +// "customerCity":"New York City", +// "customerState":"NY", +// "product":"Yellow Chair", +// "productPrice": 19.99 +// } +// }, +// { +// "customer": { +// "id": 2, +// "customerName":"Abraham Lincoln", +// "customerCity":"Boston", +// "customerState":"MA", +// "product":"Movie Tickets", +// "productPrice": 27.00 +// } +// }, +// { +// "customer": { +// "id": 3, +// "customerName":"John F. Kennedy", +// "customerCity":"Dallas", +// "customerState":"TX", +// "product":"Mustang Convertible", +// "productPrice": 24999.99 +// } +// }, +// { +// "customer": { +// "id": 4, +// "customerName":"Martin Luther King", +// "customerCity":"Burmingham", +// "customerState":"AL", +// "product":"Sandwiches", +// "productPrice": 7.99 +// } +// }, +// ]; + +Class Customer { + constructor(id, customerName, customerCity, customerState, product, productPrice){ + this.id = id, + this.customerName = customerName; + this.customerCity = customerCity; + this.customerState = customerState; + this.product = product; + this.productPrice = productPrice; + } + statement(){ + console.log(this.customerName + ' paid ' + this.productPrice + ' for ' + this.product + ' in ' + this.customerCity + ', ' + this.customerState + '.'); + } +}; + +let marilyn = new Customer (1, 'Marilyn Monroe', 'New York City') From 2360d3863a4f199feae5da90faa584fdb2a54f14 Mon Sep 17 00:00:00 2001 From: walzer85 Date: Sun, 12 Nov 2017 12:51:42 -0600 Subject: [PATCH 6/6] ready to commit branch --- 06week/Checkpoint2Objects.js | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/06week/Checkpoint2Objects.js b/06week/Checkpoint2Objects.js index 74af22176..6513297fa 100644 --- a/06week/Checkpoint2Objects.js +++ b/06week/Checkpoint2Objects.js @@ -37,7 +37,7 @@ // "customer": { // "id": 4, // "customerName":"Martin Luther King", -// "customerCity":"Burmingham", +// "customerCity":"Birmingham", // "customerState":"AL", // "product":"Sandwiches", // "productPrice": 7.99 @@ -45,9 +45,10 @@ // }, // ]; -Class Customer { +//Create a new class called customer. it is made out of an id number, a name, city, state, product, and price. Include a statement that prints out the sentence required for the assignment +class Customer { constructor(id, customerName, customerCity, customerState, product, productPrice){ - this.id = id, + this.id = id; this.customerName = customerName; this.customerCity = customerCity; this.customerState = customerState; @@ -55,8 +56,18 @@ Class Customer { this.productPrice = productPrice; } statement(){ - console.log(this.customerName + ' paid ' + this.productPrice + ' for ' + this.product + ' in ' + this.customerCity + ', ' + this.customerState + '.'); + return this.customerName + ' paid ' + this.productPrice + ' for ' + this.product + ' in ' + this.customerCity + ', ' + this.customerState + '.'; } -}; +} -let marilyn = new Customer (1, 'Marilyn Monroe', 'New York City') +//make new instances of Customer. Use the keys and values listed in the assignment +let marilyn = new Customer(1, 'Marilyn Monroe', 'New York City', 'NY', 'Yellow Chair', '19.99'); +let abe = new Customer(2, 'Abraham Lincoln', 'Boston', 'MA', 'Tickets', 27.00); +let john = new Customer(3, 'John F. Kennedy', 'Dallas', 'TX', 'Mustang Convertible', 2499.99); +let martin = new Customer(4, 'Martin Luther King', 'Birmingham', 'AL', 'Sandwiches', 7.99); + +//console log the statements from Customer +console.log(marilyn.statement()); +console.log(abe.statement()); +console.log(john.statement()); +console.log(martin.statement());