From 11301de814006fd41644cc7359cb99212471008f Mon Sep 17 00:00:00 2001 From: Vitaliy Korolyk Date: Sun, 3 May 2020 14:49:07 +0300 Subject: [PATCH 1/8] all exercises --- Exercises/1-let.js | 2 +- Exercises/2-const.js | 2 +- Exercises/3-hello.js | 3 +-- Exercises/4-range.js | 8 ++++++-- Exercises/5-range-odd.js | 7 ++++++- Exercises/6-calculate.js | 21 ++++++++++++++++----- Exercises/7-objects.js | 13 ++++++++++--- Exercises/8-create.js | 9 ++++++--- Exercises/9-array.js | 16 ++++++++++++---- Exercises/a-hash.js | 10 +++++++--- 10 files changed, 66 insertions(+), 25 deletions(-) diff --git a/Exercises/1-let.js b/Exercises/1-let.js index d705443..199b4a7 100644 --- a/Exercises/1-let.js +++ b/Exercises/1-let.js @@ -1,5 +1,5 @@ 'use strict'; -let name = undefined; +let name = "Vitaliy Korolyk"; module.exports = { name }; diff --git a/Exercises/2-const.js b/Exercises/2-const.js index 5512738..c647183 100644 --- a/Exercises/2-const.js +++ b/Exercises/2-const.js @@ -1,5 +1,5 @@ 'use strict'; -const year = undefined; +const year = 1995; module.exports = { year }; diff --git a/Exercises/3-hello.js b/Exercises/3-hello.js index a597391..17ed83b 100644 --- a/Exercises/3-hello.js +++ b/Exercises/3-hello.js @@ -1,5 +1,4 @@ 'use strict'; -const hello = null; - +const hello = name => {return `Hello ${name}`}; module.exports = { hello }; diff --git a/Exercises/4-range.js b/Exercises/4-range.js index 31bd852..a5365e3 100644 --- a/Exercises/4-range.js +++ b/Exercises/4-range.js @@ -1,5 +1,9 @@ 'use strict'; -const range = null; - +const range = (start, end) => { +for( let i = start; i <= end; i++) { + return i; +} +}; +range(15,30); module.exports = { range }; diff --git a/Exercises/5-range-odd.js b/Exercises/5-range-odd.js index 54bb5b4..aa37fb7 100644 --- a/Exercises/5-range-odd.js +++ b/Exercises/5-range-odd.js @@ -1,5 +1,10 @@ 'use strict'; -const rangeOdd = null; +const rangeOdd = (start, end) => { + for( let i = start; i <= end; i++) { + ( i % 2 === 1 ) ? i : false; + } + }; + rangeOdd(15,30); module.exports = { rangeOdd }; diff --git a/Exercises/6-calculate.js b/Exercises/6-calculate.js index dfecf6b..c8b6384 100644 --- a/Exercises/6-calculate.js +++ b/Exercises/6-calculate.js @@ -1,11 +1,22 @@ -'use strict'; +"use strict"; -const square = null; +const square = (x) => x * x; -const cube = null; +const cube = (x) => x ** 3; -const average = null; +const average = (a, b) => (a + b) / 2; -const calculate = null; +let arr = []; + +const calculate = (x) => { + for (let i = 0; i <= 9; i++) { + const s = square(i); + const c = cube(i); + arr[i] = average(s, c); + } + return arr; +}; + +calculate(3); module.exports = { square, cube, average, calculate }; diff --git a/Exercises/7-objects.js b/Exercises/7-objects.js index 0920026..06f7c13 100644 --- a/Exercises/7-objects.js +++ b/Exercises/7-objects.js @@ -1,5 +1,12 @@ -'use strict'; - -const fn = null; +"use strict"; +const fn = () => { + const obj1 = { name: "Vitalik" }; + let obj2 = { name: "Oleg" }; + obj1.name = "asdasd"; + obj2.name = "asdsa123"; + obj2 = { name: 50 }; + +}; +fn(); module.exports = { fn }; diff --git a/Exercises/8-create.js b/Exercises/8-create.js index ac27ddd..9bcadbe 100644 --- a/Exercises/8-create.js +++ b/Exercises/8-create.js @@ -1,5 +1,8 @@ -'use strict'; - -const createUser = null; +"use strict"; +const createUser = (name, city) => { + let obj = { name: name, city: city }; + return obj; +}; +createUser("Mark", "Brody"); module.exports = { createUser }; diff --git a/Exercises/9-array.js b/Exercises/9-array.js index 466c69a..5648ab0 100644 --- a/Exercises/9-array.js +++ b/Exercises/9-array.js @@ -1,7 +1,15 @@ -'use strict'; +"use strict"; -const phonebook = null; - -const findPhoneByName = null; +let phonebook = [ + { name: "Vitalik", phone: "1234" }, + { name: "Oleg", phone: "4321" }, +]; +const findPhoneByName = (name) => { + for (const x of phonebook) { + if (x.name === name) { return x.phone; + } + } +}; +findPhoneByName("Vitalik"); module.exports = { phonebook, findPhoneByName }; diff --git a/Exercises/a-hash.js b/Exercises/a-hash.js index 466c69a..438f5f2 100644 --- a/Exercises/a-hash.js +++ b/Exercises/a-hash.js @@ -1,7 +1,11 @@ -'use strict'; +"use strict"; -const phonebook = null; +const phonebook = { + Vitalik: 1234, + Oleg: 4321, +}; -const findPhoneByName = null; +const findPhoneByName = name => phonebook[name]; +findPhoneByName("Oleg"); module.exports = { phonebook, findPhoneByName }; From a8e292b1cfe80b7f6131706be07787c08923257a Mon Sep 17 00:00:00 2001 From: Vitaliy Korolyk Date: Sun, 3 May 2020 15:24:42 +0300 Subject: [PATCH 2/8] fix linter errors --- Exercises/1-let.js | 2 +- Exercises/3-hello.js | 2 +- Exercises/4-range.js | 6 +++--- Exercises/5-range-odd.js | 10 +++++----- Exercises/6-calculate.js | 10 +++++----- Exercises/7-objects.js | 11 +++++------ Exercises/8-create.js | 9 ++++++--- Exercises/9-array.js | 15 ++++++++------- 8 files changed, 34 insertions(+), 31 deletions(-) diff --git a/Exercises/1-let.js b/Exercises/1-let.js index 199b4a7..dee9f11 100644 --- a/Exercises/1-let.js +++ b/Exercises/1-let.js @@ -1,5 +1,5 @@ 'use strict'; -let name = "Vitaliy Korolyk"; +let name = 'Vitaliy Korolyk'; module.exports = { name }; diff --git a/Exercises/3-hello.js b/Exercises/3-hello.js index 17ed83b..193f461 100644 --- a/Exercises/3-hello.js +++ b/Exercises/3-hello.js @@ -1,4 +1,4 @@ 'use strict'; -const hello = name => {return `Hello ${name}`}; +const hello = name => `Hello ${name}`; module.exports = { hello }; diff --git a/Exercises/4-range.js b/Exercises/4-range.js index a5365e3..353bb91 100644 --- a/Exercises/4-range.js +++ b/Exercises/4-range.js @@ -1,9 +1,9 @@ 'use strict'; const range = (start, end) => { -for( let i = start; i <= end; i++) { + for (let i = start; i <= end; i++) { return i; -} + } }; -range(15,30); +range(15, 30); module.exports = { range }; diff --git a/Exercises/5-range-odd.js b/Exercises/5-range-odd.js index aa37fb7..39d5f54 100644 --- a/Exercises/5-range-odd.js +++ b/Exercises/5-range-odd.js @@ -1,10 +1,10 @@ 'use strict'; const rangeOdd = (start, end) => { - for( let i = start; i <= end; i++) { - ( i % 2 === 1 ) ? i : false; - } - }; - rangeOdd(15,30); + for (let i = start; i <= end; i++) { + (i % 2 === 1) ? i : false; + } +}; +rangeOdd(15, 30); module.exports = { rangeOdd }; diff --git a/Exercises/6-calculate.js b/Exercises/6-calculate.js index c8b6384..fd4a5a8 100644 --- a/Exercises/6-calculate.js +++ b/Exercises/6-calculate.js @@ -1,14 +1,14 @@ -"use strict"; +'use strict'; -const square = (x) => x * x; +const square = x => x * x; -const cube = (x) => x ** 3; +const cube = x => x ** 3; const average = (a, b) => (a + b) / 2; -let arr = []; +const arr = []; -const calculate = (x) => { +const calculate = () => { for (let i = 0; i <= 9; i++) { const s = square(i); const c = cube(i); diff --git a/Exercises/7-objects.js b/Exercises/7-objects.js index 06f7c13..1e4bbc1 100644 --- a/Exercises/7-objects.js +++ b/Exercises/7-objects.js @@ -1,12 +1,11 @@ -"use strict"; +'use strict'; const fn = () => { - const obj1 = { name: "Vitalik" }; - let obj2 = { name: "Oleg" }; - obj1.name = "asdasd"; - obj2.name = "asdsa123"; + const obj1 = { name: 'Vitalik' }; + let obj2 = { name: 'Oleg' }; + obj1.name = 'asdasd'; + obj2.name = 'asdsa123'; obj2 = { name: 50 }; - }; fn(); module.exports = { fn }; diff --git a/Exercises/8-create.js b/Exercises/8-create.js index 9bcadbe..9e8fcd0 100644 --- a/Exercises/8-create.js +++ b/Exercises/8-create.js @@ -1,8 +1,11 @@ -"use strict"; +'use strict'; const createUser = (name, city) => { - let obj = { name: name, city: city }; + const obj = { + name, + city, + }; return obj; }; -createUser("Mark", "Brody"); +createUser('Mark', 'Brody'); module.exports = { createUser }; diff --git a/Exercises/9-array.js b/Exercises/9-array.js index 5648ab0..ee9d156 100644 --- a/Exercises/9-array.js +++ b/Exercises/9-array.js @@ -1,15 +1,16 @@ -"use strict"; +'use strict'; -let phonebook = [ - { name: "Vitalik", phone: "1234" }, - { name: "Oleg", phone: "4321" }, +const phonebook = [ + { name: 'Vitalik', phone: 1234 }, + { name: 'Oleg', phone: 4321 }, ]; -const findPhoneByName = (name) => { +const findPhoneByName = name => { for (const x of phonebook) { - if (x.name === name) { return x.phone; + if (x.name === name) { + return x.phone; } } }; -findPhoneByName("Vitalik"); +findPhoneByName('Vitalik'); module.exports = { phonebook, findPhoneByName }; From 401d90762d314e980e6c819a37f3a0267bfb3c20 Mon Sep 17 00:00:00 2001 From: Vitaliy Korolyk Date: Sun, 3 May 2020 15:31:39 +0300 Subject: [PATCH 3/8] fixed last linter error --- Exercises/a-hash.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Exercises/a-hash.js b/Exercises/a-hash.js index 438f5f2..e657a9f 100644 --- a/Exercises/a-hash.js +++ b/Exercises/a-hash.js @@ -1,4 +1,4 @@ -"use strict"; +'use strict'; const phonebook = { Vitalik: 1234, @@ -6,6 +6,6 @@ const phonebook = { }; const findPhoneByName = name => phonebook[name]; -findPhoneByName("Oleg"); +findPhoneByName('Oleg'); module.exports = { phonebook, findPhoneByName }; From 28d5dbc12225bea7503f108ea6d689aec1dd604d Mon Sep 17 00:00:00 2001 From: Vitaliy Korolyk Date: Sun, 3 May 2020 15:54:17 +0300 Subject: [PATCH 4/8] fix4-range --- Exercises/4-range.js | 6 ++++-- Exercises/7-objects.js | 7 +++---- Exercises/9-array.js | 9 +++------ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Exercises/4-range.js b/Exercises/4-range.js index 353bb91..5d3a6b8 100644 --- a/Exercises/4-range.js +++ b/Exercises/4-range.js @@ -1,9 +1,11 @@ 'use strict'; const range = (start, end) => { - for (let i = start; i <= end; i++) { - return i; + const arr = []; + for (let i = 0; i <= end - start; i++) { + arr[i] = start + i; } + return arr; }; range(15, 30); module.exports = { range }; diff --git a/Exercises/7-objects.js b/Exercises/7-objects.js index 1e4bbc1..33f0a1c 100644 --- a/Exercises/7-objects.js +++ b/Exercises/7-objects.js @@ -3,9 +3,8 @@ const fn = () => { const obj1 = { name: 'Vitalik' }; let obj2 = { name: 'Oleg' }; - obj1.name = 'asdasd'; - obj2.name = 'asdsa123'; - obj2 = { name: 50 }; + obj1.name = 'Oleg'; + obj2.name = 'Vitalik'; + obj2 = { name: 'Serge' }; }; -fn(); module.exports = { fn }; diff --git a/Exercises/9-array.js b/Exercises/9-array.js index ee9d156..185916b 100644 --- a/Exercises/9-array.js +++ b/Exercises/9-array.js @@ -1,16 +1,13 @@ 'use strict'; const phonebook = [ - { name: 'Vitalik', phone: 1234 }, - { name: 'Oleg', phone: 4321 }, + { name: 'Vitalik', phone: '1234' }, + { name: 'Oleg', phone: '4321' }, ]; const findPhoneByName = name => { for (const x of phonebook) { - if (x.name === name) { - return x.phone; - } + if (x.name === name) return x.phone; } }; -findPhoneByName('Vitalik'); module.exports = { phonebook, findPhoneByName }; From 50b155850df0081aabcfc6807382c53aaa31d61d Mon Sep 17 00:00:00 2001 From: Vitaliy Korolyk Date: Sun, 3 May 2020 17:28:35 +0300 Subject: [PATCH 5/8] fix5-range-odd(bad version) --- Exercises/3-hello.js | 2 +- Exercises/4-range copy.js | 11 +++++++++++ Exercises/5-range-odd.js | 15 ++++++++++----- 3 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 Exercises/4-range copy.js diff --git a/Exercises/3-hello.js b/Exercises/3-hello.js index 193f461..5432eef 100644 --- a/Exercises/3-hello.js +++ b/Exercises/3-hello.js @@ -1,4 +1,4 @@ 'use strict'; -const hello = name => `Hello ${name}`; +const hello = name => console.log(`Hello ${name}`); module.exports = { hello }; diff --git a/Exercises/4-range copy.js b/Exercises/4-range copy.js new file mode 100644 index 0000000..5d3a6b8 --- /dev/null +++ b/Exercises/4-range copy.js @@ -0,0 +1,11 @@ +'use strict'; + +const range = (start, end) => { + const arr = []; + for (let i = 0; i <= end - start; i++) { + arr[i] = start + i; + } + return arr; +}; +range(15, 30); +module.exports = { range }; diff --git a/Exercises/5-range-odd.js b/Exercises/5-range-odd.js index 39d5f54..de85e50 100644 --- a/Exercises/5-range-odd.js +++ b/Exercises/5-range-odd.js @@ -1,10 +1,15 @@ 'use strict'; -const rangeOdd = (start, end) => { - for (let i = start; i <= end; i++) { - (i % 2 === 1) ? i : false; +const range = (start, end) => { + const arr = []; + for (let i = 0; i <= end - start; i++) { + if ((start + i) % 2 === 1) { + arr[i] = start + i; + } } + return arr.filter(Number); }; -rangeOdd(15, 30); +range(15, 30); + +module.exports = { range }; -module.exports = { rangeOdd }; From 7b6db1e0d1eaf61ccc84eaff8a001d3ee46454c5 Mon Sep 17 00:00:00 2001 From: Vitaliy Korolyk Date: Sun, 3 May 2020 17:31:01 +0300 Subject: [PATCH 6/8] fix5-range-odd(bad version)#2 --- Exercises/5-range-odd.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Exercises/5-range-odd.js b/Exercises/5-range-odd.js index de85e50..17c4d43 100644 --- a/Exercises/5-range-odd.js +++ b/Exercises/5-range-odd.js @@ -1,6 +1,6 @@ 'use strict'; -const range = (start, end) => { +const rangeOdd = (start, end) => { const arr = []; for (let i = 0; i <= end - start; i++) { if ((start + i) % 2 === 1) { @@ -9,7 +9,7 @@ const range = (start, end) => { } return arr.filter(Number); }; -range(15, 30); +rangeOdd(15, 30); -module.exports = { range }; +module.exports = { rangeOdd }; From 69ea271cd02d2f123213ce0529b176d08f954f5a Mon Sep 17 00:00:00 2001 From: Vitaliy Korolyk Date: Sun, 3 May 2020 18:02:30 +0300 Subject: [PATCH 7/8] fix5-range-odd(bad version)#3 --- Exercises/5-range-odd.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Exercises/5-range-odd.js b/Exercises/5-range-odd.js index 17c4d43..cda608a 100644 --- a/Exercises/5-range-odd.js +++ b/Exercises/5-range-odd.js @@ -2,14 +2,14 @@ const rangeOdd = (start, end) => { const arr = []; - for (let i = 0; i <= end - start; i++) { - if ((start + i) % 2 === 1) { - arr[i] = start + i; + for (let i = start; i <= end; i++) { + if ((start + i) % 2 !== 0) { + arr.push(i); } } - return arr.filter(Number); + return arr; }; -rangeOdd(15, 30); + module.exports = { rangeOdd }; From 0bf013c3920bc1c68db500718b32a452e2029ad1 Mon Sep 17 00:00:00 2001 From: Vitaliy Korolyk Date: Sun, 3 May 2020 18:07:14 +0300 Subject: [PATCH 8/8] fix5-range-odd(bad version)#4 --- Exercises/5-range-odd.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Exercises/5-range-odd.js b/Exercises/5-range-odd.js index cda608a..f0712c7 100644 --- a/Exercises/5-range-odd.js +++ b/Exercises/5-range-odd.js @@ -3,13 +3,12 @@ const rangeOdd = (start, end) => { const arr = []; for (let i = start; i <= end; i++) { - if ((start + i) % 2 !== 0) { + if (i % 2 !== 0) { arr.push(i); } } return arr; }; - module.exports = { rangeOdd };