diff --git a/package-lock.json b/package-lock.json index d663c98a..6751df13 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "js-fundamentals", "version": "1.0.0", "license": "ISC", "devDependencies": { diff --git a/src/conditional-flow/boolean-conditions.js b/src/conditional-flow/boolean-conditions.js index 70b623d4..36953d36 100644 --- a/src/conditional-flow/boolean-conditions.js +++ b/src/conditional-flow/boolean-conditions.js @@ -4,9 +4,14 @@ function getResult (didPass) { // TODO: write code in this function body to pass the tests - +if (didPass === true) +return 'Well done, you passed!' +else (didPass === false) +return 'Sorry, try again' } module.exports = { a: getResult } + +// npx jasmine spec/conditional-flow/boolean-conditions.spec.js \ No newline at end of file diff --git a/src/conditional-flow/multiple-conditions.js b/src/conditional-flow/multiple-conditions.js index 80420abf..8cd59e6a 100644 --- a/src/conditional-flow/multiple-conditions.js +++ b/src/conditional-flow/multiple-conditions.js @@ -4,16 +4,25 @@ function isInRange (num, lower, upper) { // TODO: write code in this function body to pass the tests - +if (num >= lower && num <= upper) { + return true; +} else { + return false; +} } + // This function should return true if the passed string is equal // to "Hello" or "Goodbye". Implement this with a single // if statement. function isHelloOrGoodbye (val1) { // TODO: write code in this function body to pass the tests - +if (val1 === "Hello" || val1 === "Goodbye") { + return true; +} else { + return false; +} } // This function should return a string that describes the provided age value. The @@ -31,10 +40,21 @@ function isHelloOrGoodbye (val1) { function getAgeDescription (age) { // TODO: write code in this function body to pass the tests + if (age === 0) { + return "Baby"; + } else if (age >= 1 && age <= 4) { + return "Toddler"; + } else if (age >= 5 && age <= 12) { + return "Child" + } else if (age >= 13 && age <= 19) { + return "Teenager" + } else if (age >= 20) { + return "Adult" + } } module.exports = { a: isInRange, b: isHelloOrGoodbye, c: getAgeDescription -} +} \ No newline at end of file diff --git a/src/conditional-flow/numeric-conditions.js b/src/conditional-flow/numeric-conditions.js index 0f6656a5..0bf4472c 100644 --- a/src/conditional-flow/numeric-conditions.js +++ b/src/conditional-flow/numeric-conditions.js @@ -4,6 +4,12 @@ function isArrayEmpty (array) { // TODO: write code in this function body to pass the tests + if (array.length === 0) { + return true + } + else { + return false + } } @@ -11,6 +17,12 @@ function isArrayEmpty (array) { function isGreaterThan (num1, num2) { // TODO: write code in this function body to pass the tests +if (num1 > num2) { + return true +} +else { + return false + } } @@ -19,6 +31,12 @@ function findLowest (nums) { // TODO: write code in this function body to pass the tests + // PseudoCode: + // 1. You want to find the lowest number inside this array [10, 8, 4, 1, 8]. + // 2. It's 1, so show it using Math.min + // 3. return the result. It will happen automatically when you write down the const name (lowestNum) + const lowestNum = Math.min(...nums) + return lowestNum } module.exports = { @@ -26,3 +44,5 @@ module.exports = { b: isGreaterThan, c: findLowest } + +// npx jasmine spec/conditional-flow/numeric-conditions.spec.js \ No newline at end of file diff --git a/src/conditional-flow/string-conditions.js b/src/conditional-flow/string-conditions.js index d91bfaf0..f406f5ad 100644 --- a/src/conditional-flow/string-conditions.js +++ b/src/conditional-flow/string-conditions.js @@ -2,14 +2,22 @@ function isHello (val1) { // TODO: write code in this function body to pass the tests - +if (val1 === "Hello") { + return true +} else { + return false +} } // This function should return true if the passed string is not equal to "Hello" function isNotHello (val1) { // TODO: write code in this function body to pass the tests - +if (val1 !== "Hello") { + return true +} else { + return false +} } // This function should return true if the string val1 is is longer @@ -17,7 +25,11 @@ function isNotHello (val1) { function isLongerThan (val1, val2) { // TODO: write code in this function body to pass the tests - +if (val1.length > val2.length) { + return true +} else { + return false +} } // This function should return true if the string passed in the function's first @@ -26,16 +38,28 @@ function isLongerThan (val1, val2) { function hasOddNumberVowels (val1) { // TODO: write code in this function body to pass the tests - +const vowels = ['a', 'e', 'i', 'o', 'u'] +let total = 0 +for (let i = 0; i < val1.length; i++) { + if (vowels.includes(val1[i].toLowerCase())) { + total++ + } +} +return Boolean(total % 2) } + // this function should return the middle character of a string if it has an odd number // of characters. If there are an even number of characters the function should return // the middle two letters function getMiddleLetter (val1) { // TODO: write code in this function body to pass the tests - +if (val1.length % 2 === 0) { + return val1[val1.length / 2 - 1] + val1[val1.length / 2] +} else { + return val1[(val1.length + 1) / 2 - 1] +} } // This function should return the name of the season for the provided @@ -50,6 +74,17 @@ function getMiddleLetter (val1) { function seasonForMonth (monthName) { // TODO: write code in this function body to pass the tests + if (monthName === 'March' || monthName === 'April' || monthName === 'May') { + return 'Spring' + } else if (monthName === 'June' || monthName === 'July' || monthName === 'August') { + return 'Summer' + } else if (monthName === 'September' || monthName === 'October' || monthName === 'November') { + return 'Autumn' + } else if (monthName === 'December' || monthName === 'January' || monthName === 'February') { + return 'Winter' + } else { + return '' + } } module.exports = { @@ -60,3 +95,5 @@ module.exports = { e: getMiddleLetter, f: seasonForMonth } + +// npx jasmine spec/conditional-flow/string-conditions.spec.js \ No newline at end of file diff --git a/src/data-types/arrays/accessing-elements.js b/src/data-types/arrays/accessing-elements.js index 374a19bb..b54d93b4 100644 --- a/src/data-types/arrays/accessing-elements.js +++ b/src/data-types/arrays/accessing-elements.js @@ -4,16 +4,16 @@ const cities = ['London', 'Shanghai', 'New York', 'Delhi', 'Kuala Lumpur'] // TODO: write code to pass the tests // Set names equal to an array containing 'Bob', 'Jane', 'Joanna' in that order -const names = null +const names = ['Bob', 'Jane', 'Joanna'] // Set fourthCity to the 4th element in the cities array -const fourthCity = '' +const fourthCity = cities[3] // Set firstCity to the 1st element in the cities array -const firstCity = '' +const firstCity = cities[0] // Set lengthOfCitiesArray to the length of the cities array -const lengthOfCitiesArray = NaN +const lengthOfCitiesArray = cities.length // Do not edit this exported object module.exports = { @@ -22,3 +22,5 @@ module.exports = { c: firstCity, d: lengthOfCitiesArray } + +// npx jasmine spec/data-types/arrays/accessing-elements.spec.js \ No newline at end of file diff --git a/src/data-types/arrays/adding-removing-elements.js b/src/data-types/arrays/adding-removing-elements.js index 69e559e8..330731e5 100644 --- a/src/data-types/arrays/adding-removing-elements.js +++ b/src/data-types/arrays/adding-removing-elements.js @@ -10,25 +10,25 @@ const fruits = ['Apple', 'Orange', 'Pear'] // TODO: write code to pass the tests // Edit this code to add 'Fred' to the names array -names.push(undefined) +names.push('Fred') // Edit this code to add 4 to the end of the numbers array -numbers.push(NaN) +numbers.push(4) // Edit this code to add 'Rio' to the start of the cities array -cities.unshift(undefined) +cities.unshift('Rio') // Use an array method to remove the first item from colours -colours +colours.shift() // Use an array method to remove the last item from keys -keys +keys.pop() // Use an array method to remove 'Jordon' from the countries array -countries.splice(NaN, NaN) +countries.splice(1,1) // use an array method to remove the last item from the fruits array and store the value in the pear variable -const pear = fruits.undefined +const pear = fruits.pop('Pear') // Do not edit this exported object module.exports = { @@ -41,3 +41,5 @@ module.exports = { g: fruits, h: pear } + +// npx jasmine spec/data-types/arrays/adding-removing-elements.spec.js \ No newline at end of file diff --git a/src/data-types/numbers.js b/src/data-types/numbers.js index 01dd70de..fe0ad87d 100644 --- a/src/data-types/numbers.js +++ b/src/data-types/numbers.js @@ -6,22 +6,22 @@ const numThree = 32 // TODO: Add code below using Javascript numeric operators so that the tests pass // Set this variable to numOne added to numTwo -const numOnePlusNumTwo = NaN +const numOnePlusNumTwo = numOne + numTwo // Set this variable to numThree multiplied by numTwo -const numThreeTimesNumTwo = NaN +const numThreeTimesNumTwo = numThree * numTwo // Set this variable to numThree divided by numOne -const numThreeDividedByNumOne = NaN +const numThreeDividedByNumOne = numThree / numOne // Set this variable to numThree minus numOne -const numThreeMinusNumOne = NaN +const numThreeMinusNumOne = numThree - numOne // Set this variable to the sum of numOne, numTwo and numThree -const sum = NaN +const sum = numOne + numTwo + numThree // Set this variable to the sum of (numOne, numTwo, numThree) divided by numOne -const numBytes = NaN +const numBytes = (numOne + numTwo + numThree) / numOne // do not edit the exported object. module.exports = { @@ -32,3 +32,5 @@ module.exports = { e: sum, f: numBytes } + +// npx jasmine spec/data-types/numbers.spec.js \ No newline at end of file diff --git a/src/data-types/objects/creating-objects.js b/src/data-types/objects/creating-objects.js index 1939e6b0..d6d05935 100644 --- a/src/data-types/objects/creating-objects.js +++ b/src/data-types/objects/creating-objects.js @@ -1,10 +1,20 @@ // TODO: write code in this section to pass the tests. You will need to add new code // as well as modify some of the existing code -const person = null -const computer = null +const person = { + name: 'Jane', + age: 32 +} +const computer = { + form: 'laptop', + specs: + {memory: '16GB', + storage: '1TB'} +} // Do not edit this exported object module.exports = { person: person, computer: computer } + +// npx jasmine spec/data-types/objects/creating-objects.spec.js \ No newline at end of file diff --git a/src/data-types/objects/object-keys.js b/src/data-types/objects/object-keys.js index 4999e940..673a0301 100644 --- a/src/data-types/objects/object-keys.js +++ b/src/data-types/objects/object-keys.js @@ -17,10 +17,20 @@ const isbn13 = '978-0132350884' // as well as modify some of the existing code // Set this to the book name -const name = '' +const name = book.name // Set this to the isbn 10 value -const isbn10 = '' +const isbn10 = '9780132350884' + +book.category = 'Programming' + +book.pages = 464 + +book.isbn.isbn13 = '978-0132350884' + +delete book.dimensions + +delete book.isbn.asin // Do not edit this exported object module.exports = { diff --git a/src/data-types/objects/objects-and-arrays.js b/src/data-types/objects/objects-and-arrays.js index e4819467..cfe5082b 100644 --- a/src/data-types/objects/objects-and-arrays.js +++ b/src/data-types/objects/objects-and-arrays.js @@ -22,10 +22,20 @@ const basket = { // as well as modify some of the existing code // Set this variable to the length of the baskets voucher codes array -const numberOfVoucherCodes = null +const numberOfVoucherCodes = 2 // Set this variable to the first element in of the baskets voucher codes array -const firstVoucherCode = null +const firstVoucherCode = 'AA-AA-A' + +basket.items[0].price = 2 + +const orange = { + name: 'Oranges', + price: 0.75, + quantity: 4 +}; + +basket.items.push (orange) // Do not edit this exported object module.exports = { diff --git a/src/data-types/strings.js b/src/data-types/strings.js index a8eb8c5b..d9470d47 100644 --- a/src/data-types/strings.js +++ b/src/data-types/strings.js @@ -6,16 +6,16 @@ const secondName = 'Smith' // TODO: Update the code using Javascript string operations and the variables above so that the tests pass. // Set this variable to firstName and secondName concatenated -const fullName = null +const fullName = 'Jane ' + 'Smith' // Set this variable to the 10th character of the alphabet variable -const tenthCharacterOfAlphabet = null +const tenthCharacterOfAlphabet = alphabet.charAt(9) // Set this variable by calling a method on the alphabet variable to transform it to lower case -const lowerCaseAlphabet = null +const lowerCaseAlphabet = alphabet.toLowerCase() // Set this variable by using a property on the alphabet variable to get it's length -const numberOfLettersInAlphabet = null +const numberOfLettersInAlphabet = alphabet.length // do not edit the exported object. module.exports = { diff --git a/src/demo/demo.js b/src/demo/demo.js index 9201bd8a..551a4e32 100644 --- a/src/demo/demo.js +++ b/src/demo/demo.js @@ -4,14 +4,16 @@ const numTwo = 2 let numThree = 0 // TODO: Update numThree so the tests pass -numThree = 0 +numThree = 5 // TODO: Update the code below so that the tests pass -const numOnePlusNumTwo = 0 // Set this variable to numOne plus numTwo +const numOnePlusNumTwo = numOne + numTwo // Set this variable to numOne plus numTwo // do not edit this section module.exports = { a: numThree, b: numOnePlusNumTwo } + +// npx jasmine spec/demo/demo.spec.js \ No newline at end of file diff --git a/src/functions/calling-functions.js b/src/functions/calling-functions.js index f44038d6..d4b0e8f9 100644 --- a/src/functions/calling-functions.js +++ b/src/functions/calling-functions.js @@ -19,13 +19,14 @@ function sayHelloManyTimes (name, times) { // TODO: Add and update code here to make the tests pass // Set this variable to 'Hello' by calling the sayHello function -const hello = '' +const hello = sayHello () + // Set this variable variable to 'Hello Jane' calling the sayHelloTo function -const helloToJane = '' +const helloToJane = sayHelloTo ("Jane") // Set this variable to 'Hello Bob! Hello Bob! Hello Bob!' calling the sayHelloManyTimes function -const helloToBob3Times = '' +const helloToBob3Times = sayHelloManyTimes ("Bob", 3) // do not edit below this line module.exports = { diff --git a/src/functions/creating-functions-multiple-args.js b/src/functions/creating-functions-multiple-args.js index a437ae8a..f1e0bdfb 100644 --- a/src/functions/creating-functions-multiple-args.js +++ b/src/functions/creating-functions-multiple-args.js @@ -10,6 +10,13 @@ // // TODO: write code below +function createArray (lower, upper) { + const output = [] + for (let i = lower; i <= upper; i++) { + output.push(i) + } + return output +} // define a function that takes two arguments: a string and a number. // The function should return the same string but in upper case with exclamation // marks appended to the end. The number of exclamation marks should be @@ -21,9 +28,23 @@ // error, 10 | ERROR!!!!!!!!!! // // TODO: write code below +function stringWithUpperCase (string, num) { + +let outcome = string.toUpperCase() +let exclamationMarks = '' + +for (let i = 0; i= 0; i--) { + numsReversed.push(nums[i]); +} // do not change below this line module.exports = { diff --git a/src/loops/for-loop-basic.js b/src/loops/for-loop-basic.js index 38a5c971..93f309df 100644 --- a/src/loops/for-loop-basic.js +++ b/src/loops/for-loop-basic.js @@ -4,12 +4,26 @@ const evenNums = [] const countdown = [] // TODO: Write a for loop that adds the numbers 0 to 3 to the numsZeroToThree array +for (let i = 0; i < 4; i++) { + numsZeroToThree.push(i) +} // TODO: Write a for loop that adds the numbers 5 to 10 to the numsFiveToTen array +for (let i = 5; i < 11; i++) { + numsFiveToTen.push(i) +} // TODO: Write a for loop that adds all the even numbers between 0 and 6 (0, 2, 4, 6) to evenNums +const numbers = [0, 2, 4, 6]; +for (let i = 0; i < numbers.length; i++) { + if (numbers[i] % 2 === 0); + evenNums.push(numbers[i]); + } // TODO: Write a for loop that adds the numbers 3 to 0 (in that order) to the countdown array +for (let i = 3; i >= 0; i--) { + countdown.push(i) +} // do not change below this line module.exports = { @@ -18,3 +32,5 @@ module.exports = { c: evenNums, d: countdown } + +// npx jasmine spec/loops/for-loop-basic.spec.js \ No newline at end of file diff --git a/src/variables/assignment.js b/src/variables/assignment.js index 98f2e31c..50ad35c0 100644 --- a/src/variables/assignment.js +++ b/src/variables/assignment.js @@ -3,9 +3,9 @@ let firstNumber = 10 firstNumber = 0 // TODO: Set the value of firstNumber below so the tests pass - +firstNumber = 20 // TODO: Change the code below so that the tests pass -const secondNumber = 0 // edit this value +const secondNumber = 42 // edit this value // do not edit the exported object. module.exports = { diff --git a/src/variables/declaration.js b/src/variables/declaration.js index 8afaa55b..aea3da37 100644 --- a/src/variables/declaration.js +++ b/src/variables/declaration.js @@ -1,5 +1,8 @@ // +let firstName = "Jane" +console.log(firstName) // +let age = 35 // // TODO: Declare the variables firstName and age so that the tests pass