From 19681b7c55ae099a65ae5711d63b524a59345810 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Wed, 4 Nov 2015 06:13:46 -0800 Subject: [PATCH 1/9] set up file structure, gulpfile, etc. --- isabella_organ/.gitignore | 1 + isabella_organ/gulpfile.js | 40 ++++++++++++++++++++++++++++++++ isabella_organ/http_server.js | 0 isabella_organ/package.json | 36 ++++++++++++++++++++++++++++ isabella_organ/public/index.html | 0 isabella_organ/test/test.js | 0 6 files changed, 77 insertions(+) create mode 100644 isabella_organ/.gitignore create mode 100644 isabella_organ/gulpfile.js create mode 100644 isabella_organ/http_server.js create mode 100644 isabella_organ/package.json create mode 100644 isabella_organ/public/index.html create mode 100644 isabella_organ/test/test.js diff --git a/isabella_organ/.gitignore b/isabella_organ/.gitignore new file mode 100644 index 0000000..b512c09 --- /dev/null +++ b/isabella_organ/.gitignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/isabella_organ/gulpfile.js b/isabella_organ/gulpfile.js new file mode 100644 index 0000000..a54c000 --- /dev/null +++ b/isabella_organ/gulpfile.js @@ -0,0 +1,40 @@ +'use strict' + +var gulp = require('gulp'); +var mocha = require('gulp-mocha'); +var jshint = require('gulp-jshint'); +var appFiles = ['http_server.js']; +var testFiles = ['./test/**/*.js']; + +gulp.task('jshint:test', function() { + return gulp.src(testFiles) + .pipe(jshint({ + node: true, + globals: { + describe: true, + it: true, + before: true, + after: true + } + })) + .pipe(jshint.reporter('default')); +}); + +gulp.task('jshint:app', function() { + return gulp.src(appFiles) + .pipe(jshint({ + node: true + })) + .pipe(jshint.reporter('default')); +}); + +gulp.task('mochatest', function () { + return gulp.src('test/*.js') + .pipe(mocha({reporter: 'nyan'})); +}); + +gulp.task('jshint', ['jshint:test', 'jshint:app']); +gulp.task('default', ['jshint', 'mochatest']); + + + diff --git a/isabella_organ/http_server.js b/isabella_organ/http_server.js new file mode 100644 index 0000000..e69de29 diff --git a/isabella_organ/package.json b/isabella_organ/package.json new file mode 100644 index 0000000..b6d98f5 --- /dev/null +++ b/isabella_organ/package.json @@ -0,0 +1,36 @@ +{ + "name": "isabella_organ", + "version": "1.0.0", + "description": "HTTP server", + "main": "http_server.js", + "directories": { + "test": "test" + }, + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "devDependencies": { + "chai": "^3.4.0", + "chai-http": "^1.0.0", + "gulp": "^3.9.0", + "gulp-jshint": "^1.12.0", + "gulp-mocha": "^2.1.3" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/isabellaorgan/create_an_http_server.git" + }, + "keywords": [ + "http", + "server", + "chai", + "chai-http", + "mocha" + ], + "author": "isabellaorgan@gmail.com", + "license": "ISC", + "bugs": { + "url": "https://github.com/isabellaorgan/create_an_http_server/issues" + }, + "homepage": "https://github.com/isabellaorgan/create_an_http_server#readme" +} diff --git a/isabella_organ/public/index.html b/isabella_organ/public/index.html new file mode 100644 index 0000000..e69de29 diff --git a/isabella_organ/test/test.js b/isabella_organ/test/test.js new file mode 100644 index 0000000..e69de29 From 232b74ab6ec5161037017b5408aa3d063ccab0f2 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Wed, 4 Nov 2015 06:38:54 -0800 Subject: [PATCH 2/9] work on initial code base --- isabella_organ/http_server.js | 32 ++++++++++++++++++++++++++++++++ isabella_organ/test/test.js | 26 ++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/isabella_organ/http_server.js b/isabella_organ/http_server.js index e69de29..b857551 100644 --- a/isabella_organ/http_server.js +++ b/isabella_organ/http_server.js @@ -0,0 +1,32 @@ +var http = require('http'); +var fs = require('fs'); +var time = ; +var date = ; +var ReadStream = require('stream').Readable; + +var server = http.createServer(function(req, res) { + + var resData = {}; + + if (req.url === '/time' && req.method === 'GET') { + res.writeHead(200, { + 'Content-Type': 'text/plain' + }); + } + + if (req.url === '/greet' && req.method === 'GET') { + res.writeHead(200, { + 'Content-Type': 'text/plain' + }); + } + + res.writeHead(resData.status || 404, { + 'Content-Type': resData.contentType || 'text/plain' + }); + res.Write(resData.data || 'not found'); + res.end(); +}); + +server.listen(3000, function() { + console.log('server up'); +}); \ No newline at end of file diff --git a/isabella_organ/test/test.js b/isabella_organ/test/test.js index e69de29..04d6e81 100644 --- a/isabella_organ/test/test.js +++ b/isabella_organ/test/test.js @@ -0,0 +1,26 @@ +var chai = require('chai'); +var chaihttp = require('chai-http'); +chai.use(chaihttp); +var expect = chai.expect; +var fs = require('fs'); +require(__dirname = '/../server.js'); + +describe('our server', function() { + before(function() { + this.indexFileString = fs.readFileSync(__dirname + '/../public/index.html').toString(); + }); + + it('should be able to get an index', function(done) { + debugger; + chai.request('localhost:3000') + .get('/') + .end(function(err, res) { + debugger; + expect(err).to.eql(null); + expect(res).to.have.status(200); + expect(res.test).to.eql(this.indexFileString); + done(); + }.bind(this)); + }); + +}); \ No newline at end of file From fc128c9399441498008f269dbbaffeb8fe78e20d Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Wed, 4 Nov 2015 06:56:35 -0800 Subject: [PATCH 3/9] work on read index, get date --- isabella_organ/http_server.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/isabella_organ/http_server.js b/isabella_organ/http_server.js index b857551..e885488 100644 --- a/isabella_organ/http_server.js +++ b/isabella_organ/http_server.js @@ -1,17 +1,23 @@ var http = require('http'); var fs = require('fs'); -var time = ; -var date = ; -var ReadStream = require('stream').Readable; +var url = require('url'); +// var time = ; +// var date = ; + var server = http.createServer(function(req, res) { var resData = {}; if (req.url === '/time' && req.method === 'GET') { + fs.readfile('./public/index.html', fucntion(err, data) { + if (err) return console.log(err); + }) res.writeHead(200, { - 'Content-Type': 'text/plain' + 'Content-Type': 'text/html' }); + response.write(time + ' ' + date).toString(); + response.end(); } if (req.url === '/greet' && req.method === 'GET') { From 9edd392164254a76f89c025af76af092974105c5 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Wed, 4 Nov 2015 09:16:28 -0800 Subject: [PATCH 4/9] add index and css base --- isabella_organ/http_server.js | 31 +++++++++++++----- isabella_organ/public/css/reset.css | 48 ++++++++++++++++++++++++++++ isabella_organ/public/css/styles.css | 48 ++++++++++++++++++++++++++++ isabella_organ/public/index.html | 15 +++++++++ 4 files changed, 134 insertions(+), 8 deletions(-) create mode 100644 isabella_organ/public/css/reset.css create mode 100644 isabella_organ/public/css/styles.css diff --git a/isabella_organ/http_server.js b/isabella_organ/http_server.js index e885488..46438f4 100644 --- a/isabella_organ/http_server.js +++ b/isabella_organ/http_server.js @@ -9,30 +9,45 @@ var server = http.createServer(function(req, res) { var resData = {}; - if (req.url === '/time' && req.method === 'GET') { - fs.readfile('./public/index.html', fucntion(err, data) { + if (req.url === './public/index.html' && req.method === 'GET') { + fs.readfile('./public/index.html', function(err, data) { if (err) return console.log(err); - }) + }); res.writeHead(200, { 'Content-Type': 'text/html' }); - response.write(time + ' ' + date).toString(); + response.write('./public/index.html').toString(); response.end(); } - if (req.url === '/greet' && req.method === 'GET') { + if (req.url === '/time' && req.method === 'GET') { + if (err) return console.log(err); + } res.writeHead(200, { 'Content-Type': 'text/plain' }); + response.write(time + ' ' + date).toString(); + response.end(); + + + if (req.url === '/greet' && req.method === 'GET') { + if (err) return console.log(err); } + res.writeHead(200, { + 'Content-Type': 'text/plain' + }); + + response.write('hello' + ' ' + name).toString(); + response.end(); + res.writeHead(resData.status || 404, { 'Content-Type': resData.contentType || 'text/plain' }); res.Write(resData.data || 'not found'); res.end(); -}); + }); -server.listen(3000, function() { - console.log('server up'); + server.listen(3000, function() { + console.log('server up'); }); \ No newline at end of file diff --git a/isabella_organ/public/css/reset.css b/isabella_organ/public/css/reset.css new file mode 100644 index 0000000..af94440 --- /dev/null +++ b/isabella_organ/public/css/reset.css @@ -0,0 +1,48 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} \ No newline at end of file diff --git a/isabella_organ/public/css/styles.css b/isabella_organ/public/css/styles.css new file mode 100644 index 0000000..c53f5c5 --- /dev/null +++ b/isabella_organ/public/css/styles.css @@ -0,0 +1,48 @@ +/* Table of Contents +Body +Text +*/ + +body { + text-align: center; + width: 90%; + margin: 0 auto; + background-color: #00bfff; + color: #000000; + font-family: Arial, Helvetica, sans-serif; + font-size: 16px; +} +a:link { + color: #14c7de; + text-decoration: none;} +a:visited { + color: #01B0f0;} +a:hover { + color: #AEEE00; + text-decoration: underline; +} + +h1 { + text-align: center; + letter-spacing: 15px; + font-size: 56px; + color: #000000; +} + +p { + height: 75%; + width: 75%; + margin-left: 20px; + padding-left: 20px; + text-align: left; + } + + + + + + + + + + diff --git a/isabella_organ/public/index.html b/isabella_organ/public/index.html index e69de29..2d250b8 100644 --- a/isabella_organ/public/index.html +++ b/isabella_organ/public/index.html @@ -0,0 +1,15 @@ + + + + + + HTTP SERVER + + + + + + +

This is an Index Page

+

It should return some stuff.

+ \ No newline at end of file From 473ed3cbbf7c6a3b4fb0fd5b6c589c0f09ebd947 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Wed, 4 Nov 2015 09:53:49 -0800 Subject: [PATCH 5/9] refactor server some --- isabella_organ/http_server.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/isabella_organ/http_server.js b/isabella_organ/http_server.js index 46438f4..eba8474 100644 --- a/isabella_organ/http_server.js +++ b/isabella_organ/http_server.js @@ -5,19 +5,20 @@ var url = require('url'); // var date = ; -var server = http.createServer(function(req, res) { +var server = http.createServer(function(req, res, err) { var resData = {}; - if (req.url === './public/index.html' && req.method === 'GET') { + console.log(req.url); + if (req.url === '/public/index.html' && req.method === 'GET') { fs.readfile('./public/index.html', function(err, data) { if (err) return console.log(err); }); res.writeHead(200, { 'Content-Type': 'text/html' }); - response.write('./public/index.html').toString(); - response.end(); + res.write('./public/index.html').toString(); + res.end(); } if (req.url === '/time' && req.method === 'GET') { @@ -26,8 +27,8 @@ var server = http.createServer(function(req, res) { res.writeHead(200, { 'Content-Type': 'text/plain' }); - response.write(time + ' ' + date).toString(); - response.end(); + res.write('Date.now()'); + res.end(); if (req.url === '/greet' && req.method === 'GET') { @@ -37,14 +38,14 @@ var server = http.createServer(function(req, res) { 'Content-Type': 'text/plain' }); - response.write('hello' + ' ' + name).toString(); - response.end(); + res.write('hello' + 'Fred'); + res.end(); res.writeHead(resData.status || 404, { 'Content-Type': resData.contentType || 'text/plain' }); - res.Write(resData.data || 'not found'); + res.write(resData.data || 'not found'); res.end(); }); From 44faa386d03727d0f1da96e693965c590e717715 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Wed, 4 Nov 2015 11:45:42 -0800 Subject: [PATCH 6/9] server, 404, time and greet now work --- isabella_organ/http_server.js | 54 ++++++++++++++++------------------- isabella_organ/test/test.js | 5 ++-- 2 files changed, 27 insertions(+), 32 deletions(-) diff --git a/isabella_organ/http_server.js b/isabella_organ/http_server.js index eba8474..22675f3 100644 --- a/isabella_organ/http_server.js +++ b/isabella_organ/http_server.js @@ -1,15 +1,11 @@ var http = require('http'); var fs = require('fs'); var url = require('url'); -// var time = ; -// var date = ; - var server = http.createServer(function(req, res, err) { var resData = {}; - console.log(req.url); if (req.url === '/public/index.html' && req.method === 'GET') { fs.readfile('./public/index.html', function(err, data) { if (err) return console.log(err); @@ -19,36 +15,36 @@ var server = http.createServer(function(req, res, err) { }); res.write('./public/index.html').toString(); res.end(); - } + } else { - if (req.url === '/time' && req.method === 'GET') { + if (req.url === '/time' && req.method === 'GET') { if (err) return console.log(err); - } - res.writeHead(200, { - 'Content-Type': 'text/plain' + + res.writeHead(200, { + 'Content-Type': 'text/plain' + }); + resData.data = 'Time is ' + new Date().toString(); + } + + + if (req.url === '/greet' && req.method === 'GET') { + if (err) return console.log(err); + + res.writeHead(200, { + 'Content-Type': 'text/plain' + }); + resData.data = 'hello'; + } + + + res.writeHead(resData.status || 404, { + 'Content-Type': resData.contentType || 'text/plain' }); - res.write('Date.now()'); + res.write(resData.data || 'not found'); res.end(); - - - if (req.url === '/greet' && req.method === 'GET') { - if (err) return console.log(err); } - res.writeHead(200, { - 'Content-Type': 'text/plain' - }); - - res.write('hello' + 'Fred'); - res.end(); - - res.writeHead(resData.status || 404, { - 'Content-Type': resData.contentType || 'text/plain' - }); - res.write(resData.data || 'not found'); - res.end(); - }); - +}); server.listen(3000, function() { console.log('server up'); -}); \ No newline at end of file + }); diff --git a/isabella_organ/test/test.js b/isabella_organ/test/test.js index 04d6e81..6dcfaa8 100644 --- a/isabella_organ/test/test.js +++ b/isabella_organ/test/test.js @@ -3,7 +3,7 @@ var chaihttp = require('chai-http'); chai.use(chaihttp); var expect = chai.expect; var fs = require('fs'); -require(__dirname = '/../server.js'); +require(__dirname + '/../http_server.js'); describe('our server', function() { before(function() { @@ -18,9 +18,8 @@ describe('our server', function() { debugger; expect(err).to.eql(null); expect(res).to.have.status(200); - expect(res.test).to.eql(this.indexFileString); + expect(res.text).to.eql(this.indexFileString); done(); }.bind(this)); }); - }); \ No newline at end of file From 177ac1a936dffed6521d12f3351c5fa65cdd4d73 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Wed, 4 Nov 2015 12:04:35 -0800 Subject: [PATCH 7/9] minor changes --- isabella_organ/gulpfile.js | 4 ++-- isabella_organ/http_server.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/isabella_organ/gulpfile.js b/isabella_organ/gulpfile.js index a54c000..4047776 100644 --- a/isabella_organ/gulpfile.js +++ b/isabella_organ/gulpfile.js @@ -28,13 +28,13 @@ gulp.task('jshint:app', function() { .pipe(jshint.reporter('default')); }); -gulp.task('mochatest', function () { +gulp.task('mocha', function () { return gulp.src('test/*.js') .pipe(mocha({reporter: 'nyan'})); }); gulp.task('jshint', ['jshint:test', 'jshint:app']); -gulp.task('default', ['jshint', 'mochatest']); +gulp.task('default', ['jshint', 'mocha']); diff --git a/isabella_organ/http_server.js b/isabella_organ/http_server.js index 22675f3..65bc5f8 100644 --- a/isabella_organ/http_server.js +++ b/isabella_organ/http_server.js @@ -6,7 +6,7 @@ var server = http.createServer(function(req, res, err) { var resData = {}; - if (req.url === '/public/index.html' && req.method === 'GET') { + if (req.url === './' && req.method === 'GET') { fs.readfile('./public/index.html', function(err, data) { if (err) return console.log(err); }); From 564c70a0c462a1982146f4217bac43ef2b80ed45 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Wed, 13 Apr 2016 14:38:20 -0700 Subject: [PATCH 8/9] code styling --- isabella_organ/gulpfile.js | 9 +++---- isabella_organ/http_server.js | 8 ++---- isabella_organ/server.js | 51 +++++++++++++++++++++++++++++++++++ isabella_organ/test/test.js | 6 ++--- 4 files changed, 58 insertions(+), 16 deletions(-) create mode 100644 isabella_organ/server.js diff --git a/isabella_organ/gulpfile.js b/isabella_organ/gulpfile.js index 4047776..1a7b23b 100644 --- a/isabella_organ/gulpfile.js +++ b/isabella_organ/gulpfile.js @@ -1,4 +1,4 @@ -'use strict' +'use strict'; var gulp = require('gulp'); var mocha = require('gulp-mocha'); @@ -28,13 +28,10 @@ gulp.task('jshint:app', function() { .pipe(jshint.reporter('default')); }); -gulp.task('mocha', function () { +gulp.task('mocha', function() { return gulp.src('test/*.js') - .pipe(mocha({reporter: 'nyan'})); + .pipe(mocha({ reporter: 'nyan' })); }); gulp.task('jshint', ['jshint:test', 'jshint:app']); gulp.task('default', ['jshint', 'mocha']); - - - diff --git a/isabella_organ/http_server.js b/isabella_organ/http_server.js index 65bc5f8..d1d700d 100644 --- a/isabella_organ/http_server.js +++ b/isabella_organ/http_server.js @@ -1,6 +1,7 @@ var http = require('http'); var fs = require('fs'); var url = require('url'); +var ReadStream = require('stream').Readable; var server = http.createServer(function(req, res, err) { @@ -14,28 +15,24 @@ var server = http.createServer(function(req, res, err) { 'Content-Type': 'text/html' }); res.write('./public/index.html').toString(); - res.end(); + return res.end(); } else { if (req.url === '/time' && req.method === 'GET') { if (err) return console.log(err); - res.writeHead(200, { 'Content-Type': 'text/plain' }); resData.data = 'Time is ' + new Date().toString(); } - if (req.url === '/greet' && req.method === 'GET') { if (err) return console.log(err); - res.writeHead(200, { 'Content-Type': 'text/plain' }); resData.data = 'hello'; } - res.writeHead(resData.status || 404, { 'Content-Type': resData.contentType || 'text/plain' @@ -43,7 +40,6 @@ var server = http.createServer(function(req, res, err) { res.write(resData.data || 'not found'); res.end(); } - }); server.listen(3000, function() { console.log('server up'); diff --git a/isabella_organ/server.js b/isabella_organ/server.js new file mode 100644 index 0000000..1db471f --- /dev/null +++ b/isabella_organ/server.js @@ -0,0 +1,51 @@ +var http = require('http'); +var fs = require('fs'); +var url = require('url'); +var ReadStream = require('stream').Readable; + +var server = http.createServer(function(req, res, err) { + + var resData = {}; + + if (req.url === './' && req.method === 'GET') { + fs.readfile('./public/index.html', function(err, data) { + if (err) return console.log(err); + }); + res.writeHead(200, { + 'Content-Type': 'text/html' + }); + res.write('./public/index.html').toString(); + return res.end(); + } else { + + if (req.url === '/time' && req.method === 'GET') { + if (err) return console.log(err); + + res.writeHead(200, { + 'Content-Type': 'text/plain' + }); + resData.data = 'Time is ' + new Date().toString(); + } + + + if (req.url === '/greet' && req.method === 'GET') { + if (err) return console.log(err); + + res.writeHead(200, { + 'Content-Type': 'text/plain' + }); + resData.data = 'hello'; + } + + + res.writeHead(resData.status || 404, { + 'Content-Type': resData.contentType || 'text/plain' + }); + res.write(resData.data || 'not found'); + res.end(); + } + +}); + server.listen(3000, function() { + console.log('server up'); + }); diff --git a/isabella_organ/test/test.js b/isabella_organ/test/test.js index 6dcfaa8..22274d2 100644 --- a/isabella_organ/test/test.js +++ b/isabella_organ/test/test.js @@ -3,7 +3,7 @@ var chaihttp = require('chai-http'); chai.use(chaihttp); var expect = chai.expect; var fs = require('fs'); -require(__dirname + '/../http_server.js'); +require(__dirname + '../http_server.js'); describe('our server', function() { before(function() { @@ -11,15 +11,13 @@ describe('our server', function() { }); it('should be able to get an index', function(done) { - debugger; chai.request('localhost:3000') .get('/') .end(function(err, res) { - debugger; expect(err).to.eql(null); expect(res).to.have.status(200); expect(res.text).to.eql(this.indexFileString); done(); }.bind(this)); }); -}); \ No newline at end of file +}); From d2fd3f067520df7f8542ca9dd847f785cc250330 Mon Sep 17 00:00:00 2001 From: Isabella Organ Date: Wed, 13 Apr 2016 18:33:58 -0700 Subject: [PATCH 9/9] more code style --- isabella_organ/http_server.js | 12 ++++-------- isabella_organ/server.js | 13 ++++--------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/isabella_organ/http_server.js b/isabella_organ/http_server.js index d1d700d..d7fa369 100644 --- a/isabella_organ/http_server.js +++ b/isabella_organ/http_server.js @@ -4,9 +4,7 @@ var url = require('url'); var ReadStream = require('stream').Readable; var server = http.createServer(function(req, res, err) { - var resData = {}; - if (req.url === './' && req.method === 'GET') { fs.readfile('./public/index.html', function(err, data) { if (err) return console.log(err); @@ -17,7 +15,6 @@ var server = http.createServer(function(req, res, err) { res.write('./public/index.html').toString(); return res.end(); } else { - if (req.url === '/time' && req.method === 'GET') { if (err) return console.log(err); res.writeHead(200, { @@ -25,9 +22,8 @@ var server = http.createServer(function(req, res, err) { }); resData.data = 'Time is ' + new Date().toString(); } - if (req.url === '/greet' && req.method === 'GET') { - if (err) return console.log(err); + if (err) return console.log(err); res.writeHead(200, { 'Content-Type': 'text/plain' }); @@ -41,6 +37,6 @@ var server = http.createServer(function(req, res, err) { res.end(); } }); - server.listen(3000, function() { - console.log('server up'); - }); +server.listen(3000, function() { + console.log('server up'); +}); diff --git a/isabella_organ/server.js b/isabella_organ/server.js index 1db471f..8f9dfd0 100644 --- a/isabella_organ/server.js +++ b/isabella_organ/server.js @@ -4,9 +4,7 @@ var url = require('url'); var ReadStream = require('stream').Readable; var server = http.createServer(function(req, res, err) { - var resData = {}; - if (req.url === './' && req.method === 'GET') { fs.readfile('./public/index.html', function(err, data) { if (err) return console.log(err); @@ -17,7 +15,6 @@ var server = http.createServer(function(req, res, err) { res.write('./public/index.html').toString(); return res.end(); } else { - if (req.url === '/time' && req.method === 'GET') { if (err) return console.log(err); @@ -27,9 +24,8 @@ var server = http.createServer(function(req, res, err) { resData.data = 'Time is ' + new Date().toString(); } - if (req.url === '/greet' && req.method === 'GET') { - if (err) return console.log(err); + if (err) return console.log(err); res.writeHead(200, { 'Content-Type': 'text/plain' @@ -37,15 +33,14 @@ var server = http.createServer(function(req, res, err) { resData.data = 'hello'; } - res.writeHead(resData.status || 404, { 'Content-Type': resData.contentType || 'text/plain' }); res.write(resData.data || 'not found'); res.end(); } +}); +server.listen(3000, function() { + console.log('server up'); }); - server.listen(3000, function() { - console.log('server up'); - });