Merge 51d3d6ff4d into b8b1ae4eda

01_helloWorld/helloWorld.js

@@ -1,5 +1,5 @@
 const helloWorld = function() {
-  return ''
+  return 'Hello, World!'
 };
 
 module.exports = helloWorld;

02_repeatString/repeatString.js

@@ -1,6 +1,12 @@
-const repeatString = function() {
+const repeatString = function(string, num) {
+ if (num < 0){
+    return 'ERROR';
+ } else {
+    return string.repeat(num);
+ }
    
 };
 
-// Do not edit below this line
+repeatString('hey', 3);
 module.exports = repeatString;
+

02_repeatString/repeatString.spec.js

@@ -4,19 +4,19 @@ describe('repeatString', () => {
   test('repeats the string', () => {
     expect(repeatString('hey', 3)).toEqual('heyheyhey');
   });
-  test.skip('repeats the string many times', () => {
+  test('repeats the string many times', () => {
     expect(repeatString('hey', 10)).toEqual('heyheyheyheyheyheyheyheyheyhey');
   });
-  test.skip('repeats the string 1 times', () => {
+  test('repeats the string 1 times', () => {
     expect(repeatString('hey', 1)).toEqual('hey');
   });
-  test.skip('repeats the string 0 times', () => {
+  test('repeats the string 0 times', () => {
     expect(repeatString('hey', 0)).toEqual('');
   });
-  test.skip('returns ERROR with negative numbers', () => {
+  test('returns ERROR with negative numbers', () => {
     expect(repeatString('hey', -1)).toEqual('ERROR');
   });
-  test.skip('repeats the string a random amount of times', function () {
+  test('repeats the string a random amount of times', function () {
     /*The number is generated by using Math.random to get a value from between
     0 to 1, when this is multiplied by 1000 and rounded down with Math.floor it 
     equals a number between 0 to 999 (this number will change everytime you run
@@ -31,7 +31,7 @@ describe('repeatString', () => {
     was randomly generated. */
     expect(repeatString('hey', number).match(/((hey))/g).length).toEqual(number);
   });
-  test.skip('works with blank strings', () => {
+  test('works with blank strings', () => {
     expect(repeatString('', 10)).toEqual('');
   });
 });

03_reverseString/reverseString.js

@@ -1,6 +1,9 @@
-const reverseString = function() {
-
+const reverseString = function(str) {
+    let stringIntoArray = str.split("");
+    let arrayReverse = stringIntoArray.reverse();
+    let arrayIntoString = arrayReverse.join("");
+    return arrayIntoString;
 };
 
-// Do not edit below this line
+reverseString('hello');
 module.exports = reverseString;

03_reverseString/reverseString.spec.js

@@ -5,14 +5,14 @@ describe('reverseString', () => {
     expect(reverseString('hello')).toEqual('olleh');
   });
 
-  test.skip('reverses multiple words', () => {
+  test('reverses multiple words', () => {
     expect(reverseString('hello there')).toEqual('ereht olleh')
   })
 
-  test.skip('works with numbers and punctuation', () => {
+  test('works with numbers and punctuation', () => {
     expect(reverseString('123! abc!')).toEqual('!cba !321')
   })
-  test.skip('works with blank strings', () => {
+  test('works with blank strings', () => {
     expect(reverseString('')).toEqual('')
   })
 });

04_removeFromArray/removeFromArray.js

@@ -1,6 +1,23 @@
-const removeFromArray = function() {
-
+const removeFromArray = function(arr, ...removeItems) {
+     let duplicateArray = arr;
+     console.log('arr duplicates', duplicateArray);
+    for (let i=0; i < removeItems.length; i++) {
+        for (let j=0; j < arr.length; j++) {
+          if(removeItems[i] === arr[j]){
+            duplicateArray.splice(j, 1);
+          }
+        }
+    }
+    return duplicateArray;
 };
+removeFromArray([1, 2, 3, 4], 1, 2, 4);
+
+
+
+removeFromArray([1, 2, 3, 4], 3); 
+removeFromArray([1, 2, 3], "1", 3)
+removeFromArray([1, 2, 3, 4], 1, 2, 3, 4)
 
-// Do not edit below this line
 module.exports = removeFromArray;
+
+

04_removeFromArray/removeFromArray.spec.js

@@ -4,22 +4,27 @@ describe('removeFromArray', () => {
   test('removes a single value', () => {
     expect(removeFromArray([1, 2, 3, 4], 3)).toEqual([1, 2, 4]);
   });
-  test.skip('removes multiple values', () => {
+  test('removes multiple values', () => {
     expect(removeFromArray([1, 2, 3, 4], 3, 2)).toEqual([1, 4]);
   });
-  test.skip('ignores non present values', () => {
+  test('ignores non present values', () => {
     expect(removeFromArray([1, 2, 3, 4], 7, "tacos")).toEqual([1, 2, 3, 4]);
   });
-  test.skip('ignores non present values, but still works', () => {
+
+
+  test('ignores non present values, but still works', () => {
     expect(removeFromArray([1, 2, 3, 4], 7, 2)).toEqual([1, 3, 4]);
   });
-  test.skip('can remove all values', () => {
+
+  test('can remove all values', () => {
     expect(removeFromArray([1, 2, 3, 4], 1, 2, 3, 4)).toEqual([]);
   });
-  test.skip('works with strings', () => {
+  test('works with strings', () => {
     expect(removeFromArray(["hey", 2, 3, "ho"], "hey", 3)).toEqual([2, "ho"]);
   });
-  test.skip('only removes same type', () => {
+
+
+  test('only removes same type', () => {
     expect(removeFromArray([1, 2, 3], "1", 3)).toEqual([1, 2]);
   });
 });

05_sumAll/sumAll.js

@@ -1,6 +1,26 @@
-const sumAll = function() {
-
+const sumAll = function(num1, num2) {
+        if(num1 <= 0 ){
+            return "ERROR"; 
+        } else if(num1 < num2 && typeof(num1) === 'number' && typeof(num2) === 'number' ) {
+            //variable initialisation (int or string)
+            let sum = 0;
+            for ( let i= num1; i<= num2; i++){
+            //operation on variable
+            sum += i;
+            }
+            return sum;
+        } else if (num2 < num1 && typeof(num1) === 'number' && typeof(num2) === 'number' ){
+            let sumR = 0;
+            for ( let i= num2; i<= num1; i++){
+                sumR += i;
+            }
+            return sumR;
+        } else {
+            return "ERROR";
+        }
 };
 
-// Do not edit below this line
+sumAll(5, 7) 
+sumAll(7, 5) 
+
 module.exports = sumAll;

05_sumAll/sumAll.spec.js

@@ -4,19 +4,19 @@ describe('sumAll', () => {
   test('sums numbers within the range', () => {
     expect(sumAll(1, 4)).toEqual(10);
   });
-  test.skip('works with large numbers', () => {
+  test('works with large numbers', () => {
     expect(sumAll(1, 4000)).toEqual(8002000);
   });
-  test.skip('works with larger number first', () => {
+  test('works with larger number first', () => {
     expect(sumAll(123, 1)).toEqual(7626);
   });
-  test.skip('returns ERROR with negative numbers', () => {
+  test('returns ERROR with negative numbers', () => {
     expect(sumAll(-10, 4)).toEqual('ERROR');
   });
-  test.skip('returns ERROR with non-number parameters', () => {
+  test('returns ERROR with non-number parameters', () => {
     expect(sumAll(10, "90")).toEqual('ERROR');
   });
-  test.skip('returns ERROR with non-number parameters', () => {
+  test('returns ERROR with non-number parameters', () => {
     expect(sumAll(10, [90, 1])).toEqual('ERROR');
   });
 });

06_leapYears/leapYears.js

@@ -1,6 +1,19 @@
-const leapYears = function() {
+const leapYears = function(num) {
+    if (num % 4 === 0 && !(num % 100 === 0)){
+        return true;
+    } else if (num % 400 === 0 && !(num % 100 === 0)){
+        return true;
+    } else if (num % 400 === 0){
+         return true;
+    } else {
+        return false;
+    }
 
 };
 
-// Do not edit below this line
+leapYears(2000) 
+leapYears(1985)
+
 module.exports = leapYears;
+
+

06_leapYears/leapYears.spec.js

@@ -4,19 +4,19 @@ describe('leapYears', () => {
   test('works with non century years', () => {
     expect(leapYears(1996)).toBe(true);
   });
-  test.skip('works with non century years', () => {
+  test('works with non century years', () => {
     expect(leapYears(1997)).toBe(false);
   });
-  test.skip('works with ridiculously futuristic non century years', () => {
+  test('works with ridiculously futuristic non century years', () => {
     expect(leapYears(34992)).toBe(true);
   });
-  test.skip('works with century years', () => {
+  test('works with century years', () => {
     expect(leapYears(1900)).toBe(false);
   });
-  test.skip('works with century years', () => {
+  test('works with century years', () => {
     expect(leapYears(1600)).toBe(true);
   });
-  test.skip('works with century years', () => {
+  test('works with century years', () => {
     expect(leapYears(700)).toBe(false);
   });
 });

07_tempConversion/tempConversion.js

@@ -1,10 +1,19 @@
-const convertToCelsius = function() {
+const convertToCelsius = function(temp) {
+  let Ftemp = temp;
+  let intoCelsius = (Ftemp - 32)* 5/9 
+  return Math.round(intoCelsius*10)/10;
 };
 
-const convertToFahrenheit = function() {
+const convertToFahrenheit = function(temp) {
+  let cTemp = temp;
+  let intoFahrenheit = (cTemp * 9/5 + 32)  
+  return Math.round(intoFahrenheit* 10) / 10;
 };
 
-// Do not edit below this line
+convertToCelsius(32)
+convertToFahrenheit(0)
+
+
 module.exports = {
   convertToCelsius,
   convertToFahrenheit

07_tempConversion/tempConversion.spec.js

@@ -4,22 +4,22 @@ describe('convertToCelsius', () => {
   test('works', () => {
     expect(convertToCelsius(32)).toEqual(0);
   });
-  test.skip('rounds to 1 decimal', () => {
+  test('rounds to 1 decimal', () => {
     expect(convertToCelsius(100)).toEqual(37.8);
   });
-  test.skip('works with negatives', () => {
+  test('works with negatives', () => {
     expect(convertToCelsius(-100)).toEqual(-73.3);
   });
 });
 
 describe('convertToFahrenheit', () => {
-  test.skip('works', () => {
+  test('works', () => {
     expect(convertToFahrenheit(0)).toEqual(32);
   });
-  test.skip('rounds to 1 decimal', () => {
+  test('rounds to 1 decimal', () => {
     expect(convertToFahrenheit(73.2)).toEqual(163.8);
   });
-  test.skip('works with negatives', () => {
+  test('works with negatives', () => {
     expect(convertToFahrenheit(-10)).toEqual(14);
   });
 });

08_calculator/calculator.js

@@ -1,25 +1,52 @@
-const add = function() {
-	
+const add = function(a, b) {
+	return a + b;
 };
 
-const subtract = function() {
-	
+const subtract = function(a, b) {
+  return a - b;
 };
 
-const sum = function() {
 
+let arrayDemo = [1, 2, 3, 4, 5];
+let sumNumbers = 0;
+for (i = 0; i < arrayDemo.length; i++){
+  sumNumbers += arrayDemo[i];
+}
+
+// const sum = function(array) {
+//   let sumNr = 0;
+//   for(i =0; i < array.length; i++){
+//     sumNr+= array[i];
+//   }
+//   return sumNr;
+// };
+
+const sum = function(array) {
+    return array.reduce((total, value) => total + value , 0);
 };
 
-const multiply = function() {
 
+const multiply = function(array) {
+  return array.reduce((value1, value2) => value1 * value2);
 };
 
-const power = function() {
-	
+const power = function(num1, num2) {
+	return Math.pow(num1,num2);
 };
 
-const factorial = function() {
+let arrayN = [1, 2, 3, 4, 5];
+let sumN = 0;
+for (i = 0; i < arrayN.length; i++){
+  sumN += arrayN[i];
+}
 
+
+const factorial = function(num) {
+  let total = 1;
+  for(i=1; i <= num; i++) {
+    total *= i;
+  }
+  return total;
 };
 
 // Do not edit below this line

09_palindromes/palindromes.js

@@ -1,6 +1,17 @@
-const palindromes = function () {
-
+const palindromes = function(str) {
+    let strL = str.toString().toLowerCase().toUpperCase().replace(/[.,\/#!$%\^&\*;:{}=\-_`~()]/g,"").replace(/[\W_]+/g, "");
+     let newStr = '';
+    for(i = strL.length; i >= 0; i--){
+        newStr += strL.charAt(i);
+        // console.log(newStr)
+    }
+    if (strL === newStr) {
+        return true;
+    } else {
+        return false;
+    }
 };
-
+palindromes('lid off a daffodil') // true
+palindromes('tacos') // false
 // Do not edit below this line
 module.exports = palindromes;

09_palindromes/palindromes.spec.js

@@ -4,25 +4,30 @@ describe('palindromes', () => {
   test('works with single words', () => {
     expect(palindromes('racecar')).toBe(true);
   });
-  test.skip('works with punctuation ', () => {
+  test('works with punctuation ', () => {
     expect(palindromes('racecar!')).toBe(true);
   });
-  test.skip('works with upper-case letters ', () => {
+  test('works with upper-case letters ', () => {
     expect(palindromes('Racecar!')).toBe(true);
   });
-  test.skip('works with multiple words', () => {
+
+  //de facut
+  test('works with multiple words', () => {
     expect(palindromes('A car, a man, a maraca.')).toBe(true);
   });
-  test.skip('works with multiple words', () => {
+
+  //de facut
+  test('works with multiple words', () => {
     expect(palindromes('Animal loots foliated detail of stool lamina.')).toBe(true);
   });
-  test.skip('doesn\'t just always return true', () => {
+
+  test('doesn\'t just always return true', () => {
     expect(palindromes('ZZZZ car, a man, a maracaz.')).toBe(false);
   });
-  test.skip('works with numbers in a string', () => {
+  test('works with numbers in a string', () => {
     expect(palindromes('rac3e3car')).toBe(true);
   });
-  test.skip('works with unevenly spaced numbers in a string', () => {
+  test('works with unevenly spaced numbers in a string', () => {
     expect(palindromes('r3ace3car')).toBe(false);
   });
 });