prettify code and clean up

Createdd · Createdd · commit 9011ff5b3668 · 2017-05-06T17:39:30.000+02:00
diff --git a/app.js b/app.js
@@ -4,7 +4,7 @@ const router = require('./router.js');
 const port = 3000;
 
 const server = http.createServer((req, res) => {
-  router.home(req,res);
+  router.home(req, res);
   router.user(req, res);
 }).listen(port, () => {
   console.log(`Server running at http://:${port}/`);
diff --git a/designsTemplates/error.html b/designsTemplates/error.html
diff --git a/designsTemplates/index.html b/designsTemplates/index.html
diff --git a/designsTemplates/profile.html b/designsTemplates/profile.html
diff --git a/profile.js b/profile.js
@@ -15,7 +15,7 @@ function Profile(username) {
     profileEmitter = this;
 
     //Connect to the API URL (https://teamtreehouse.com/username.json)
-    var request = https.get("https://teamtreehouse.com/" + username + ".json", function(response) {
+    var request = https.get("https://teamtreehouse.com/" + username + ".json", function (response) {
         var body = "";
 
         if (response.statusCode !== 200) {
@@ -31,7 +31,7 @@ function Profile(username) {
         });
 
         response.on('end', function () {
-            if(response.statusCode === 200) {
+            if (response.statusCode === 200) {
                 try {
                     //Parse the data
                     var profile = JSON.parse(body);
@@ -40,12 +40,12 @@ function Profile(username) {
                     profileEmitter.emit("error", error);
                 }
             }
-        }).on("error", function(error){
+        }).on("error", function (error) {
             profileEmitter.emit("error", error);
         });
     });
 }
 
-util.inherits( Profile, EventEmitter );
+util.inherits(Profile, EventEmitter);
 
 module.exports = Profile;
diff --git a/render.js b/render.js
@@ -2,14 +2,13 @@ var fs = require("fs");
 
 function mergeValues(values, content) {
   for (var key in values) {
-    content = content.replace("{{"+key+"}}", values[key])
+    content = content.replace("{{" + key + "}}", values[key])
   }
   return content;
 }
 
-
-function view (templateName, values, res) {
-  var fileContent = fs.readFileSync('./views/'+templateName+'.html', 'utf8');
+function view(templateName, values, res) {
+  var fileContent = fs.readFileSync('./views/' + templateName + '.html', 'utf8');
   fileContent = mergeValues(values, fileContent);
   res.write(fileContent);
 }
diff --git a/router.js b/router.js
@@ -10,7 +10,7 @@ function home(req, res) {
       render.view("header", {}, res);
       render.view("search", {}, res);
       render.view("footer", {}, res);
-      res.end('End of the response\n');
+      res.end();
     } else {
       req.on("data", function (postBody) {
         var query = querystring.parse(postBody.toString());
@@ -36,15 +36,15 @@ function user(req, res) {
       render.view("header", {}, res);
       render.view("profile", values, res);
       render.view("footer", {}, res);
-      res.end('End of the response\n');
+      res.end();
     });
 
     studentProfile.on('error', function (err) {
       render.view("header", {}, res);
       render.view("error", { errorMessage: err.message }, res)
       render.view("search", {}, res);
       render.view("footer", {}, res);
-      res.end('End of the response\n');
+      res.end();
     });
   }
 }
diff --git a/views/error.html b/views/error.html
@@ -1,2 +1 @@
-<div id="error">{{errorMessage}}</div>
-  <img src="https://upload.wikimedia.org/wikipedia/commons/0/0c/Cz-Error.png" alt="Error" id="searchIcon">
+<div id="error">{{errorMessage}}</div>
diff --git a/views/header.html b/views/header.html
@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html>
-
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -47,16 +46,16 @@
         }
 
         .button {
-            border-color: #5FB6E1;
-            background: #5FB6E1;
+            border-color: blue;
+            background: blue;
             color: #fff;
         }
 
         #error {
             width: 100%;
             padding: 22px 0;
-            background: #FFE6B2;
-            color: #C5A14E;
+            background: #ff0000;
+            color: lightyellow ;
             position: absolute;
             left: 0;
             top: 0;
@@ -65,7 +64,7 @@
         #profile {
             background: #fff;
             border-radius: 4px;
-            border: 1px solid #D5DDE4;
+            border: 1px solid blue;
             padding: 40px 0 0;
             margin: -40px 0 0;
         }
diff --git a/views/profile.html b/views/profile.html
@@ -1,9 +1,6 @@
 <div id="profile">
-
     <img src="{{avatarUrl}}" alt="Avatar" id="avatar">
-
     <p><span>{{username}}</span></p>
-
     <ul>
         <li><span>{{badges}}</span> Badges earned</li>
         <li><span>{{javascript}}</span> JavaScript points</li>
diff --git a/views/search.html b/views/search.html
@@ -1,5 +1,4 @@
 <img src="http://simpleicon.com/wp-content/uploads/magnifier-7-256x256.png" alt="Magnifying Glass" id="searchIcon">
-
 <form action="/" method="POST">
     <input type="text" placeholder="Enter a Treehouse username" id="username" name="username">
     <input type="submit" value="search" class="button">

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,13 @@ var fs = require("fs");`
`2`	`2`
`3`	`3`	`function mergeValues(values, content) {`
`4`	`4`	`for (var key in values) {`
`5`		`- content = content.replace("{{"+key+"}}", values[key])`
	`5`	`+ content = content.replace("{{" + key + "}}", values[key])`
`6`	`6`	`}`
`7`	`7`	`return content;`
`8`	`8`	`}`
`9`	`9`
`10`		`-`
`11`		`-function view (templateName, values, res) {`
`12`		`- var fileContent = fs.readFileSync('./views/'+templateName+'.html', 'utf8');`
	`10`	`+function view(templateName, values, res) {`
	`11`	`+ var fileContent = fs.readFileSync('./views/' + templateName + '.html', 'utf8');`
`13`	`12`	`fileContent = mergeValues(values, fileContent);`
`14`	`13`	`res.write(fileContent);`
`15`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-<div id="error">{{errorMessage}}</div>`
`2`		`- <img src="https://upload.wikimedia.org/wikipedia/commons/0/0c/Cz-Error.png" alt="Error" id="searchIcon">`
	`1`	`+<div id="error">{{errorMessage}}</div>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<img src="http://simpleicon.com/wp-content/uploads/magnifier-7-256x256.png" alt="Magnifying Glass" id="searchIcon">`
`2`		`-`
`3`	`2`	`<form action="/" method="POST">`
`4`	`3`	`<input type="text" placeholder="Enter a Treehouse username" id="username" name="username">`
`5`	`4`	`<input type="submit" value="search" class="button">`