From 98fe56a9e8054ceee3e3e94935baca026c247ab9 Mon Sep 17 00:00:00 2001 From: Holly Erickson Date: Mon, 4 Dec 2017 13:16:03 -0600 Subject: [PATCH 1/4] Warmup complete --- .gitignore | 1 + index.js | 12 +++++++++ package-lock.json | 62 +++++++++++++++++++++++++++++++++++++++++++++++ package.json | 23 ++++++++++++++++++ 4 files changed, 98 insertions(+) create mode 100644 .gitignore create mode 100644 index.js create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2658d7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules/ diff --git a/index.js b/index.js new file mode 100644 index 0000000..ef6efb6 --- /dev/null +++ b/index.js @@ -0,0 +1,12 @@ +/*jshint esversion: 6 */ +const chalk = require('chalk'); +var _ = require('lodash'); + +let arr=["hi", 2, false]; + +function log(el) { + console.log(el); +} + +console.log(chalk.bgBlue("Blue!")); +_.each(arr, log); diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..aa20a71 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,62 @@ +{ + "name": "assignment_node_hello_world", + "version": "1.0.0", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "requires": { + "has-flag": "2.0.0" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..c0978d1 --- /dev/null +++ b/package.json @@ -0,0 +1,23 @@ +{ + "name": "assignment_node_hello_world", + "version": "1.0.0", + "description": "assignment_node_hello_world ===========================", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/Holly-E/assignment_node_hello_world.git" + }, + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/Holly-E/assignment_node_hello_world/issues" + }, + "homepage": "https://github.com/Holly-E/assignment_node_hello_world#readme", + "dependencies": { + "chalk": "^2.3.0", + "lodash": "^4.17.4" + } +} From 4379118882ab3b713d1f9e21f3b821e410bec788 Mon Sep 17 00:00:00 2001 From: Holly Erickson Date: Mon, 4 Dec 2017 14:04:59 -0600 Subject: [PATCH 2/4] logger built --- index.js | 17 +++++++++++------ lib/logger.js | 30 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 lib/logger.js diff --git a/index.js b/index.js index ef6efb6..9a9a694 100644 --- a/index.js +++ b/index.js @@ -2,11 +2,16 @@ const chalk = require('chalk'); var _ = require('lodash'); -let arr=["hi", 2, false]; +// let arr=["hi", 2, false]; +// +// function log(el) { +// console.log(el); +// } +// _.each(arr, log); -function log(el) { - console.log(el); -} -console.log(chalk.bgBlue("Blue!")); -_.each(arr, log); +var logger = require('./lib/logger'); + +logger.log('Message logged at the INFO level', 'info'); +logger.log('Message logged at the WARNING level', 'warning'); +logger.log('Message logged at the ERROR level', 'error'); diff --git a/lib/logger.js b/lib/logger.js new file mode 100644 index 0000000..b1066da --- /dev/null +++ b/lib/logger.js @@ -0,0 +1,30 @@ +/*jshint esversion: 6 */ +const chalk = require('chalk'); + +var logger = { + log: function(message, level) { + if (level == "info"){ + this.info(message); + } else if (level == "warning"){ + this.warning(message); + } else if (level == "error") { + this.error(message); + } else { + console.log("please input a level"); + } + }, + + info: function(message){ + console.log(chalk.blue(message)); + }, + + warning: function(message){ + console.log(chalk.yellow(message)); + }, + + error: function(message){ + console.log(chalk.red(message)); + } +}; + +module.exports = logger; From ff7c124c1adba6bc2c3476a491368078cbfdb04c Mon Sep 17 00:00:00 2001 From: Holly Erickson Date: Mon, 4 Dec 2017 14:18:23 -0600 Subject: [PATCH 3/4] able to output from JSON file using logger --- index.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/index.js b/index.js index 9a9a694..d518249 100644 --- a/index.js +++ b/index.js @@ -2,16 +2,13 @@ const chalk = require('chalk'); var _ = require('lodash'); -// let arr=["hi", 2, false]; -// -// function log(el) { -// console.log(el); -// } -// _.each(arr, log); - - var logger = require('./lib/logger'); +var data = require('./data/logs'); logger.log('Message logged at the INFO level', 'info'); logger.log('Message logged at the WARNING level', 'warning'); logger.log('Message logged at the ERROR level', 'error'); + +_.each(data, function(data) { + logger.log(data.message, data.level); +}); From 1ea634eb1a835d6cd57df878a4dba29a52f600dd Mon Sep 17 00:00:00 2001 From: Holly Erickson Date: Mon, 4 Dec 2017 14:25:00 -0600 Subject: [PATCH 4/4] Revert to uppercase levels --- index.js | 8 ++++---- lib/logger.js | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/index.js b/index.js index d518249..e7ee6bb 100644 --- a/index.js +++ b/index.js @@ -5,10 +5,10 @@ var _ = require('lodash'); var logger = require('./lib/logger'); var data = require('./data/logs'); -logger.log('Message logged at the INFO level', 'info'); -logger.log('Message logged at the WARNING level', 'warning'); -logger.log('Message logged at the ERROR level', 'error'); +logger.log('Message logged at the INFO level', 'INFO'); +logger.log('Message logged at the WARNING level', 'WARNING'); +logger.log('Message logged at the ERROR level', 'ERROR'); _.each(data, function(data) { - logger.log(data.message, data.level); + logger.log(data.message, data.level.toUpperCase()); }); diff --git a/lib/logger.js b/lib/logger.js index b1066da..de3c537 100644 --- a/lib/logger.js +++ b/lib/logger.js @@ -3,11 +3,11 @@ const chalk = require('chalk'); var logger = { log: function(message, level) { - if (level == "info"){ + if (level == "INFO"){ this.info(message); - } else if (level == "warning"){ + } else if (level == "WARNING"){ this.warning(message); - } else if (level == "error") { + } else if (level == "ERROR") { this.error(message); } else { console.log("please input a level");