From 61e4c2564d9942a1d9baf5b45b4e6d6743a58353 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 26 Oct 2019 15:56:14 -0500 Subject: [PATCH] extra credit ready for turn in --- index.js | 27 ++++++++++++++------------- modules/addNumbers.js | 5 +++++ modules/divide.js | 5 +++++ modules/multiply.js | 5 +++++ modules/subtract.js | 4 ++++ modules/subtractNumbers.js | 14 ++++++++++++++ package-lock.json | 5 +++++ package.json | 19 +++++++++++++++++++ 8 files changed, 71 insertions(+), 13 deletions(-) create mode 100644 modules/divide.js create mode 100644 modules/multiply.js create mode 100644 modules/subtractNumbers.js create mode 100644 package-lock.json create mode 100644 package.json diff --git a/index.js b/index.js index 8c24934..7fab209 100644 --- a/index.js +++ b/index.js @@ -1,38 +1,39 @@ const add = require("./modules/add"); const subtract = require("./modules/subtract"); const multiply= require("./modules/multiply"); -const {addTen, addFive} = require("./modules/addNumbers"); -const {subtractOne}= require("./modules/subtractNumbers"); +const divide= require("./modules/divide"); +const {addTen, addFive, addOne} = require("./modules/addNumbers"); +const {subtractTen, subtractFive, subtractOne}= require("./modules/subtractNumbers"); const number1 = 393; const number2 = 238; let answer = add(number1,number2); -console.log("Adding numbers",number1,number2,answer); +console.log("Adding numbers",number1, "+", number2,"=",answer); answer = subtract(number1,number2); -console.log(answer); +console.log("Subtracting numbers", number1, "-", number2,"=",answer); answer = multiply(number1,number2); -console.log(answer); +console.log("Mulitplying", number1, "*", number2, "=", answer); answer = divide(number1,number2); -console.log(answer); +console.log("Dividing", number1, "%", number2, "=", answer); -answer = addTen(number1); -console.log(answer); +answer = addTen(number1, 10); +console.log(number1, "+", 10, "=", answer); answer = addFive(number1); -console.log(answer); +console.log(number1, "+", 5, "=", answer); answer = addOne(number1); -console.log(answer); +console.log(number1, "+", 1, "=", answer); answer = subtractOne(number1); -console.log(answer); +console.log(number1, "-", 1, "=",answer); answer = subtractFive(number1); -console.log(answer); +console.log(number1, "-", 5, "=", answer); answer = subtractTen(number1); -console.log(answer); +console.log(number1, "-", 10, "=", answer); diff --git a/modules/addNumbers.js b/modules/addNumbers.js index 6854706..c1bbc1c 100644 --- a/modules/addNumbers.js +++ b/modules/addNumbers.js @@ -7,3 +7,8 @@ module.exports.addTen = function(num) { module.exports.addFive = function(num) { return add(num, 5); } + + module.exports.addOne = function(num){ + return add(num, 1) + } + diff --git a/modules/divide.js b/modules/divide.js new file mode 100644 index 0000000..a7cffc7 --- /dev/null +++ b/modules/divide.js @@ -0,0 +1,5 @@ +function divide(num1, num2) { + return num1 / num2; + } + module.exports = divide; + \ No newline at end of file diff --git a/modules/multiply.js b/modules/multiply.js new file mode 100644 index 0000000..8661284 --- /dev/null +++ b/modules/multiply.js @@ -0,0 +1,5 @@ +function multiply(num1, num2) { + return num1 * num2; + } + module.exports = multiply; + \ No newline at end of file diff --git a/modules/subtract.js b/modules/subtract.js index e69de29..1a8879d 100644 --- a/modules/subtract.js +++ b/modules/subtract.js @@ -0,0 +1,4 @@ +function subtract(num1, num2) { + return num1 - num2; + } + module.exports = subtract; \ No newline at end of file diff --git a/modules/subtractNumbers.js b/modules/subtractNumbers.js new file mode 100644 index 0000000..d82ed02 --- /dev/null +++ b/modules/subtractNumbers.js @@ -0,0 +1,14 @@ +const subtract = require("./subtract"); + +module.exports.subtractTen = function(num) { + return subtract(num,10); + } + + module.exports.subtractFive = function(num) { + return subtract(num, 5); + } + + module.exports.subtractOne = function(num){ + return subtract(num, 1) + } + \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..ddf6112 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,5 @@ +{ + "name": "commonjs-module-practice", + "version": "1.0.0", + "lockfileVersion": 1 +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..2544425 --- /dev/null +++ b/package.json @@ -0,0 +1,19 @@ +{ + "name": "commonjs-module-practice", + "version": "1.0.0", + "description": "* fork, clone, run index.js through node", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/sambarrick/commonjs-module-practice.git" + }, + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/sambarrick/commonjs-module-practice/issues" + }, + "homepage": "https://github.com/sambarrick/commonjs-module-practice#readme" +}