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/04week/gitOlympics.js b/04week/gitOlympics.js
new file mode 100644
index 000000000..332de72b7
--- /dev/null
+++ b/04week/gitOlympics.js
@@ -0,0 +1,9 @@
+'use strict'
+
+const names = ['athens', 'berlin', 'atlanta', 'seoul', 'los angeles']
+
+const printListOfOlympics=(arr)=>{
+ arr.forEach(i => console.log(i))
+}
+
+printListOfOlympics(names);
diff --git a/06week/higherOrder.js b/06week/higherOrder.js
index 73926e3dc..db3fbe750 100644
--- a/06week/higherOrder.js
+++ b/06week/higherOrder.js
@@ -3,15 +3,45 @@
const assert = require('assert');
function forEach(arr, callback) {
- // Your code here
+ // create an array with whatever you want in it
+ const arrProblemOne = [1, 2, 3]
+
+ //make a for loop that runs the number of items in the array amount of times.
+ //make a variable that prints a phrase the amount of times defined by the for loop
+ for (let i = 0; i < arrProblemOne.length; i++) {
+ callback();
+ }
+ }
}
function map(arr, callback) {
- // Your code here
+ // Create an array, put whatever you want in it
+ const test = ['1', '2', '3', '4', '5', '6'];
+
+ //doThis(), a function that creates a new array, then does whatever function you want when you call doThis to the original array
+ //pushes the result of the called function to the new array
+ //print out the new array
+ const doThis = (arr, callBackFunction) => {
+ const newArr = [];
+ test.forEach((i) => {
+ newArr.push(callBackFunction(i));
+ });
+ console.log(newArr);
+};
}
function filter(arr, callback) {
- // Your code here
+ //create an array with three numbers
+ const arrProblemThree = [1, 2, 3];
+
+ //longestWords(), create a function that takes an array and a function
+ //the called function affects the called array
+ //a new, empty array accepts the results of the function
+ const filtered = (arrTwo, callbackTwo) => {
+ const arrResultThree = [];
+ if (callbackTwo(arrTwo[i])) arrResultThree.push(arrTwo[i])
+ }
+ console.log(arrResultThree);
}
function some(arr, callback) {
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!