From 4180991e1b2523ce0484e140c020977b50e4c7f8 Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Mon, 12 Jun 2017 16:25:46 +0200
Subject: [PATCH 01/22] some basics for the brand choosing front end

---
 api/branding/index.js                         |  75 +++++++++++
 config.js                                     |  10 +-
 helpers/index.js                              |  41 ++++++
 public/img/cncf-logo.png                      | Bin 0 -> 5607 bytes
 public/img/logo.png                           | Bin 8483 -> 0 bytes
 public/img/{logo-small.png => weave-logo.png} | Bin
 public/welcome.html                           | 122 ++++++++++++++++++
 server.js                                     |  32 ++++-
 8 files changed, 278 insertions(+), 2 deletions(-)
 create mode 100644 api/branding/index.js
 create mode 100644 public/img/cncf-logo.png
 delete mode 100644 public/img/logo.png
 rename public/img/{logo-small.png => weave-logo.png} (100%)
 create mode 100644 public/welcome.html

diff --git a/api/branding/index.js b/api/branding/index.js
new file mode 100644
index 000000000..0460a41e4
--- /dev/null
+++ b/api/branding/index.js
@@ -0,0 +1,75 @@
+(function (){
+  'use strict';
+
+  var async     = require("async")
+    , express   = require("express")
+    , request   = require("request")
+    , helpers   = require("../../helpers")
+    , config       = require("../../config")
+    , endpoints = require("../endpoints")
+    , app       = express()
+    , fs = require('fs')
+    , busyboy = require('express-busboy');
+  
+  busyboy.extend(app,
+	  {
+		      upload: true,
+		      path: '/tmp/logo',
+		      allowedPath: /./
+
+	  }
+  ); 
+
+  app.post("/branding", function (req, res, next) {
+      	if (config.branding.set === true) {
+    		res.redirect("/")
+		return
+	}
+      	if (req.body.brand !== undefined) {
+    	var brand = req.body.brand
+	var image
+	if (brand == "cncf") {
+		config.branding.set = true
+		config.branding.values.name = "cncf"
+		image = "./public/img/cncf-logo.png"
+	} else if (brand == "weave") {
+		config.branding.set = true
+		config.branding.values.name = "weave"
+		image = "./public/img/weave-logo.png"
+	} else if (brand == "other") {
+		config.branding.set = true
+		config.branding.values.name = "other"
+    		console.log(req.files.logo.file);
+		if (req.files.logo == undefined) {
+    		res.redirect("/welcome.html")
+		return
+		}		
+	        image = req.files.logo.file
+	}
+	else {
+    		res.redirect("/welcome.html")
+		return
+	}
+	config.branding.values.logo = fs.readFileSync(image).toString("base64")
+    }
+    helpers.setBrandingConfig()
+    res.redirect("/")
+  });
+
+
+  app.get("/img/logo*", function (req, res, next) {
+	    var buf;
+	    console.log("fired")
+	    buf = new Buffer(config.branding.values.logo, 'base64');
+	    res.writeHead(200, {
+		'Content-Type': "image/png",
+		'Content-disposition': 'attachment;filename=logo.png',
+		'Content-Length': buf.length
+	    });
+	    res.end(new Buffer(buf, 'binary'));
+  });
+
+  module.exports = app;
+
+
+}());
diff --git a/config.js b/config.js
index 274fc8ec6..1a4738d14 100644
--- a/config.js
+++ b/config.js
@@ -3,7 +3,7 @@
 
   var session      = require("express-session"),
       RedisStore   = require('connect-redis')(session)
-
+      ,redis = require("redis")
   module.exports = {
     session: {
       name: 'md.sid',
@@ -18,6 +18,14 @@
       secret: 'sooper secret',
       resave: false,
       saveUninitialized: true
+    },
+    redis_client: null,
+    branding :{
+    	set: false,
+	values: {
+		name: "",
+		logo: "",
+	}
     }
   };
 }());
diff --git a/helpers/index.js b/helpers/index.js
index 348e785db..1143e1ce7 100644
--- a/helpers/index.js
+++ b/helpers/index.js
@@ -2,6 +2,10 @@
   'use strict';
 
   var request = require("request");
+  var config  = require("../config");
+  var fs = require('fs');
+  var redis = require("redis")
+
   var helpers = {};
 
   /* Public: errorHandler is a middleware that handles your errors
@@ -102,5 +106,42 @@
 
     return req.session.customerId;
   }
+
+
+  helpers.getBrandingConfig = function(callback) {
+	if(process.env.SESSION_REDIS) {
+		config.redis_client = redis.createClient();
+    		var test = config.redis_client.get("branding_info")
+		console.log("fired")
+    		config.redis_client.get("branding_info", function(err, reply) {
+			if (reply !== null) {
+				config.branding.values = JSON.parse(reply)
+				config.branding.set = true
+				callback(config.branding)
+			} else {
+				callback(config.branding)
+			}
+		})
+	} else {
+		if (fs.existsSync("./branding.json")) {
+			config.branding.values = JSON.parse(fs.readFileSync('./branding.json'))
+			config.branding.set = true
+				callback(config.branding)
+			} else {
+				callback(config.branding)
+			}
+	}
+  }
+
+  helpers.setBrandingConfig = function() {
+	if(process.env.SESSION_REDIS) {
+    		return config.redis_client.set("branding_info", JSON.stringify(config.branding.values))
+	} else {
+		fs.writeFile("./branding.json", JSON.stringify(config.branding.values, null, 2), function(err) {
+			return err;
+		}); 
+	}
+  }
+
   module.exports = helpers;
 }());
diff --git a/public/img/cncf-logo.png b/public/img/cncf-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fe93ec41013b489d5128fed90c7403cfff7fb91
GIT binary patch
literal 5607
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
B3f2Gs

literal 0
HcmV?d00001

diff --git a/public/img/logo.png b/public/img/logo.png
deleted file mode 100644
index ef0521bc76887f1c96713e3846285b2c4ca0cd31..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8483
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
R0|o#9002ovPDHLkV1lYSoC^Q|

diff --git a/public/img/logo-small.png b/public/img/weave-logo.png
similarity index 100%
rename from public/img/logo-small.png
rename to public/img/weave-logo.png
diff --git a/public/welcome.html b/public/welcome.html
new file mode 100644
index 000000000..d50fe415f
--- /dev/null
+++ b/public/welcome.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+
+    <meta charset="utf-8">
+    <meta name="robots" content="all,follow">
+    <meta name="googlebot" content="index,follow,snippet,archive">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="WeaveSocks Demo App">
+    <meta name="author" content="Ondrej Svestka | ondrejsvestka.cz">
+    <meta name="keywords" content="">
+
+    <title>
+        WeaveSocks
+    </title>
+
+    <meta name="keywords" content="">
+
+    <link href='https://fonts.googleapis.com/css?family=Roboto:400,500,700,300,100'
+          rel='stylesheet' type='text/css'>
+
+    <!-- styles -->
+    <link href="css/font-awesome.css" rel="stylesheet">
+    <link href="css/bootstrap.min.css" rel="stylesheet">
+    <link href="css/animate.min.css" rel="stylesheet">
+    <link href="css/owl.carousel.css" rel="stylesheet">
+    <link href="css/owl.theme.css" rel="stylesheet">
+
+    <!-- theme stylesheet -->
+    <link href="css/style.blue.css" rel="stylesheet" id="theme-stylesheet">
+
+    <!-- your stylesheet with modifications -->
+    <link href="css/custom.css" rel="stylesheet">
+
+    <script src="js/respond.min.js"></script>
+
+    <link rel="shortcut icon" href="favicon.png">
+
+
+</head>
+
+<body>
+
+<div id="navbar"></div>
+
+<div id="all">
+
+    <div id="content">
+
+        <div class="container">
+            <div class="col-md-12">
+            	<div class="welcome_text">
+			Welcome!
+                <div class="box">
+                    <form method="post" action="branding" id="branding"  method="post" enctype="multipart/form-data">
+                        <div class="content">
+                            <div class="row">
+                                <div class="col-sm-6">
+                                    <div>Branding</div>
+                                    <div class="form-group">
+					    <div>
+				                <label><input type="radio" name="brand" value="cncf">CNCF</label>
+					    </div>
+					    <div>
+						<label><input type="radio" name="brand" value="weave">Weaveworks</label>
+					    </div>
+					    <div>
+						<label>
+					            <input type="radio" name="brand" value="other" data-toggle="collapse" data-target="#upload-image">Other</label>
+					    </div>
+                                    </div>
+                                    <div class="form-group collapse" id="upload-image">
+					<label class="btn btn-primary btn-file">
+					    Upload <input type="file" hidden name="logo" id="logo">
+					</label>
+                                    </div>
+                                    <div class="form-group">
+                            		<button class="btn btn-primary" href="#" on>
+						  <input type="submit" value="Submit">
+
+                            		</button>
+                                    </div>
+                                </div>
+                            </div>
+               		</div>
+                    </div>
+		    </form>
+            	</div>
+            </div>
+        </div>
+
+
+    </div>
+    <!-- /#content -->
+
+    <div id="footer"></div>
+
+</div>
+<!-- /#all -->
+
+
+<!-- *** SCRIPTS TO INCLUDE ***
+_________________________________________________________ -->
+<script src="js/jquery-1.11.0.min.js"></script>
+<script src="js/bootstrap.min.js"></script>
+<script src="js/js.cookie.js"></script>
+<script src="js/client.js"></script>
+<script src="js/jquery.cookie.js"></script>
+<script src="js/waypoints.min.js"></script>
+<script src="js/modernizr.js"></script>
+<script src="js/bootstrap-hover-dropdown.js"></script>
+<script src="js/owl.carousel.min.js"></script>
+<script src="js/front.js"></script>
+<script src="js/jquery.query-object.js"></script>
+<script src="js/client.js"></script>
+<script>
+
+</script>
+</body>
+
+</html>
diff --git a/server.js b/server.js
index 929f7a403..efeb9635c 100644
--- a/server.js
+++ b/server.js
@@ -12,16 +12,45 @@ var request      = require("request")
   , catalogue    = require("./api/catalogue")
   , orders       = require("./api/orders")
   , user         = require("./api/user")
+  , branding     = require("./api/branding")
   , metrics      = require("./api/metrics")
   , app          = express()
 
 
+
+app.use(function (req, res, next) {
+	if (config.branding.set == false) {
+	helpers.getBrandingConfig(function(cfg){
+		if (!cfg.set) {
+			ext = req.url.split('.').pop();
+			if ((["js", "css", "png", "map"].indexOf(ext) > -1) || 
+				(["/welcome.html", "/branding"].indexOf(req.url) > -1)) {
+				next()
+				return
+
+			} else {
+				res.redirect("/welcome.html")
+				return
+			}
+		} else {
+				next()
+				return
+		}
+	});
+	} else {
+				helpers.setBrandingConfig()
+				next()
+	}
+				return
+});
+
+app.use(express.static("public"));
 app.use(helpers.rewriteSlash);
 app.use(metrics);
-app.use(express.static("public"));
 if(process.env.SESSION_REDIS) {
     console.log('Using the redis based session manager');
     app.use(session(config.session_redis));
+
 }
 else {
     console.log('Using local session manager');
@@ -49,6 +78,7 @@ app.use(cart);
 app.use(catalogue);
 app.use(orders);
 app.use(user);
+app.use(branding);
 
 app.use(helpers.errorHandler);
 

From 52fad639201fd804008afc7e27fac36ce6735fb1 Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Mon, 12 Jun 2017 16:33:29 +0200
Subject: [PATCH 02/22] updated package.json

---
 package.json | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index ad0d695f5..74a7d0f5d 100644
--- a/package.json
+++ b/package.json
@@ -20,15 +20,17 @@
   "dependencies": {
     "async": "^1.5.2",
     "body-parser": "^1.15.1",
+    "connect-busboy": "0.0.2",
+    "connect-redis": "^3.2.0",
     "cookie-parser": "^1.4.3",
     "express": "^4.13.4",
     "express-session": "^1.13.0",
     "finalhandler": "^0.4.1",
-    "request": "^2.72.0",
-    "serve-static": "^1.10.2",
-    "prom-client": "^6.3.0",
     "morgan": "^1.7.0",
-    "connect-redis": "^3.2.0"
+    "prom-client": "^6.3.0",
+    "redis": "^2.7.1",
+    "request": "^2.72.0",
+    "serve-static": "^1.10.2"
   },
   "devDependencies": {
     "chai": "^3.5.0",

From 07aa11572f8b89a1f7914ac1305b57c7134335a6 Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Mon, 12 Jun 2017 16:54:32 +0200
Subject: [PATCH 03/22] changed build for better feedback

---
 scripts/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build.sh b/scripts/build.sh
index 42d203b66..d51f1b17b 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -24,5 +24,5 @@ CODE_DIR=$(cd $SCRIPT_DIR/..; pwd)
 echo $CODE_DIR
 
 REPO=${GROUP}/$(basename front-end);
-
+echo $REPO
 $DOCKER_CMD build -t ${REPO}:${COMMIT} .

From 9de89d37969e185e71a47f7474ced558744aa923 Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Mon, 12 Jun 2017 17:12:34 +0200
Subject: [PATCH 04/22] added welcome so no redirects

---
 test/container.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/container.sh b/test/container.sh
index 210a84069..b15f1b73b 100755
--- a/test/container.sh
+++ b/test/container.sh
@@ -23,7 +23,7 @@ CID=$($DOCKER_CMD run -d --name testcontainer -p 8080:8079 ${REPO}:${COMMIT})
 
 for i in 1 2 3 4 5
 do
-  curl -s --head http://localhost:8080/ > /dev/null
+  curl -s --head http://localhost:8080/welcome.html > /dev/null
   if [ $? -eq "0" ]
   then
     PASS=0

From 08fbfc2dd287ee53d5bdc027e202059aee61479e Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Mon, 12 Jun 2017 17:22:00 +0200
Subject: [PATCH 05/22] dumping logs to test

---
 test/container.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/container.sh b/test/container.sh
index b15f1b73b..97b6d931d 100755
--- a/test/container.sh
+++ b/test/container.sh
@@ -24,6 +24,7 @@ CID=$($DOCKER_CMD run -d --name testcontainer -p 8080:8079 ${REPO}:${COMMIT})
 for i in 1 2 3 4 5
 do
   curl -s --head http://localhost:8080/welcome.html > /dev/null
+  docker logs testcontainer
   if [ $? -eq "0" ]
   then
     PASS=0

From 4a82e3e978bd89fa8272fb720ae7eb5cbf7d4bfc Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Mon, 12 Jun 2017 17:28:19 +0200
Subject: [PATCH 06/22] removed logs dump added more time for service to come
 up?

---
 test/container.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/container.sh b/test/container.sh
index 97b6d931d..e36ccb4bd 100755
--- a/test/container.sh
+++ b/test/container.sh
@@ -21,10 +21,9 @@ REPO=${GROUP}/$(basename front-end);
 
 CID=$($DOCKER_CMD run -d --name testcontainer -p 8080:8079 ${REPO}:${COMMIT})
 
-for i in 1 2 3 4 5
+for i in 1 2 3 4 5 6 7 8 9
 do
   curl -s --head http://localhost:8080/welcome.html > /dev/null
-  docker logs testcontainer
   if [ $? -eq "0" ]
   then
     PASS=0

From 7519faa2a3007e69671147b9f07ca6bd76b38fef Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Mon, 12 Jun 2017 17:34:40 +0200
Subject: [PATCH 07/22] user error

---
 test/container.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/container.sh b/test/container.sh
index e36ccb4bd..4fce539b6 100755
--- a/test/container.sh
+++ b/test/container.sh
@@ -21,7 +21,7 @@ REPO=${GROUP}/$(basename front-end);
 
 CID=$($DOCKER_CMD run -d --name testcontainer -p 8080:8079 ${REPO}:${COMMIT})
 
-for i in 1 2 3 4 5 6 7 8 9
+for i in 1 2 3 4 5
 do
   curl -s --head http://localhost:8080/welcome.html > /dev/null
   if [ $? -eq "0" ]
@@ -29,10 +29,11 @@ do
     PASS=0
     break
   else
-    sleep 1
+    sleep 
   fi
 done
 
+docker logs testcontainer
 $DOCKER_CMD rm -f $CID > /dev/null
 
 if [ $PASS -eq "0" ]

From ecaee9ea6001f94a68de428e1d551fdfbb352fdf Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Mon, 12 Jun 2017 17:43:49 +0200
Subject: [PATCH 08/22] accidentaly removed sleep

---
 test/container.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/container.sh b/test/container.sh
index 4fce539b6..d5f221fd2 100755
--- a/test/container.sh
+++ b/test/container.sh
@@ -29,7 +29,7 @@ do
     PASS=0
     break
   else
-    sleep 
+    sleep 1 
   fi
 done
 

From 70a414b7ca3a336af80a03d36920923cbae20396 Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Mon, 12 Jun 2017 17:46:24 +0200
Subject: [PATCH 09/22] switched to DOCKER_CMD

---
 test/container.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/container.sh b/test/container.sh
index d5f221fd2..d56fd8fcd 100755
--- a/test/container.sh
+++ b/test/container.sh
@@ -33,7 +33,7 @@ do
   fi
 done
 
-docker logs testcontainer
+$DOCKER_CMD logs testcontainer
 $DOCKER_CMD rm -f $CID > /dev/null
 
 if [ $PASS -eq "0" ]

From 373d42e86889fca9ce7e7e7180f9493eb77a2e18 Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Mon, 12 Jun 2017 17:52:46 +0200
Subject: [PATCH 10/22] updated to express-busboy

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 74a7d0f5d..1bef8ecd8 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "connect-redis": "^3.2.0",
     "cookie-parser": "^1.4.3",
     "express": "^4.13.4",
+    "express-busboy": "^6.0.1",
     "express-session": "^1.13.0",
     "finalhandler": "^0.4.1",
     "morgan": "^1.7.0",

From ab233a8a74d199575e8eccc260793f3d96da7f5e Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Mon, 12 Jun 2017 17:56:50 +0200
Subject: [PATCH 11/22] removed logs dump

---
 test/container.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/container.sh b/test/container.sh
index d56fd8fcd..b9d1e5653 100755
--- a/test/container.sh
+++ b/test/container.sh
@@ -33,7 +33,6 @@ do
   fi
 done
 
-$DOCKER_CMD logs testcontainer
 $DOCKER_CMD rm -f $CID > /dev/null
 
 if [ $PASS -eq "0" ]

From 1455e31bef7e0eadcbfd3a4c741f0b14aad7ed6d Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Thu, 15 Jun 2017 11:51:10 +0200
Subject: [PATCH 12/22] added check before trying to set value, in attempt to
 stop crashing

---
 helpers/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/helpers/index.js b/helpers/index.js
index 1143e1ce7..a35b260e4 100644
--- a/helpers/index.js
+++ b/helpers/index.js
@@ -110,7 +110,7 @@
 
   helpers.getBrandingConfig = function(callback) {
 	if(process.env.SESSION_REDIS) {
-		config.redis_client = redis.createClient();
+		config.redis_client = redis.createClient("redis://session-db:6379");
     		var test = config.redis_client.get("branding_info")
 		console.log("fired")
     		config.redis_client.get("branding_info", function(err, reply) {
@@ -135,7 +135,9 @@
 
   helpers.setBrandingConfig = function() {
 	if(process.env.SESSION_REDIS) {
-    		return config.redis_client.set("branding_info", JSON.stringify(config.branding.values))
+    		if (config.redis_client.connected) {
+			config.redis_client.set("branding_info", JSON.stringify(config.branding.values))
+		}
 	} else {
 		fs.writeFile("./branding.json", JSON.stringify(config.branding.values, null, 2), function(err) {
 			return err;

From 0c5b0514d6cac9a84b53ef07e59fd2135831b2d3 Mon Sep 17 00:00:00 2001
From: Jason Richard Smith <jasonrichardsmith@gmail.com>
Date: Thu, 15 Jun 2017 13:26:55 +0200
Subject: [PATCH 13/22] added disconnect functions to avoid crashing

---
 helpers/index.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/helpers/index.js b/helpers/index.js
index a35b260e4..f4ff0476b 100644
--- a/helpers/index.js
+++ b/helpers/index.js
@@ -111,8 +111,13 @@
   helpers.getBrandingConfig = function(callback) {
 	if(process.env.SESSION_REDIS) {
 		config.redis_client = redis.createClient("redis://session-db:6379");
-    		var test = config.redis_client.get("branding_info")
-		console.log("fired")
+		config.redis_client.on("error", function (err) {
+  			console.log("Redis error encountered", err);
+		});
+
+		config.redis_client.on("end", function() {
+			console.log("Redis connection closed");
+		});
     		config.redis_client.get("branding_info", function(err, reply) {
 			if (reply !== null) {
 				config.branding.values = JSON.parse(reply)

From c8a94cd26248ff1b5e2737ea9596963a31faf6d4 Mon Sep 17 00:00:00 2001
From: Jason Richard Smith <jasonrichardsmith@gmail.com>
Date: Mon, 19 Jun 2017 10:55:58 +0200
Subject: [PATCH 14/22] added default branding so staging doesnt have to update

---
 server.js | 46 ++++++++++++++++++++++++++++------------------
 1 file changed, 28 insertions(+), 18 deletions(-)

diff --git a/server.js b/server.js
index efeb9635c..53577c322 100644
--- a/server.js
+++ b/server.js
@@ -14,34 +14,44 @@ var request      = require("request")
   , user         = require("./api/user")
   , branding     = require("./api/branding")
   , metrics      = require("./api/metrics")
+  , fs 		 = require('fs')
   , app          = express()
 
 
 
 app.use(function (req, res, next) {
 	if (config.branding.set == false) {
-	helpers.getBrandingConfig(function(cfg){
-		if (!cfg.set) {
-			ext = req.url.split('.').pop();
-			if ((["js", "css", "png", "map"].indexOf(ext) > -1) || 
-				(["/welcome.html", "/branding"].indexOf(req.url) > -1)) {
-				next()
-				return
-
-			} else {
-				res.redirect("/welcome.html")
-				return
-			}
+		if(process.env.DEFAULT_BRANDING) {
+			config.branding.set = true
+			config.branding.values.name = "weave"
+			image = "./public/img/weave-logo.png"
+			config.branding.values.logo = fs.readFileSync(image).toString("base64")
+			next()
 		} else {
-				next()
-				return
+	
+			helpers.getBrandingConfig(function(cfg){
+				if (!cfg.set) {
+					ext = req.url.split('.').pop();
+						if ((["js", "css", "png", "map"].indexOf(ext) > -1) || 
+							(["/welcome.html", "/branding"].indexOf(req.url) > -1)) {
+							next()
+							return
+
+						} else {
+							res.redirect("/welcome.html")
+							return
+						}
+				} else {
+					next()
+					return
+				}
+			});
 		}
-	});
 	} else {
-				helpers.setBrandingConfig()
-				next()
+		helpers.setBrandingConfig()
+		next()
 	}
-				return
+	return
 });
 
 app.use(express.static("public"));

From eb14aa673bb2831f68e840b7d5d852d927a458b0 Mon Sep 17 00:00:00 2001
From: Jason Richard Smith <jasonrichardsmith@gmail.com>
Date: Tue, 20 Jun 2017 07:36:02 +0200
Subject: [PATCH 15/22] fixed default branding

---
 helpers/index.js | 29 ++++++++++++++++++++---------
 server.js        | 42 ++++++++++++++++--------------------------
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/helpers/index.js b/helpers/index.js
index f4ff0476b..ace0ef659 100644
--- a/helpers/index.js
+++ b/helpers/index.js
@@ -118,15 +118,26 @@
 		config.redis_client.on("end", function() {
 			console.log("Redis connection closed");
 		});
-    		config.redis_client.get("branding_info", function(err, reply) {
-			if (reply !== null) {
-				config.branding.values = JSON.parse(reply)
-				config.branding.set = true
-				callback(config.branding)
-			} else {
-				callback(config.branding)
-			}
-		})
+		
+		if(process.env.DEFAULT_BRANDING) {
+			config.branding.set = true
+			config.branding.values.name = "weave"
+			var image
+			image = "./public/img/weave-logo.png"
+			config.branding.values.logo = fs.readFileSync(image).toString("base64")
+			callback(config.branding)
+			return
+		} else { 
+			config.redis_client.get("branding_info", function(err, reply) {
+				if (reply !== null) {
+					config.branding.values = JSON.parse(reply)
+					config.branding.set = true
+					callback(config.branding)
+				} else {
+					callback(config.branding)
+				}
+			})
+		}
 	} else {
 		if (fs.existsSync("./branding.json")) {
 			config.branding.values = JSON.parse(fs.readFileSync('./branding.json'))
diff --git a/server.js b/server.js
index 53577c322..19e59ccfd 100644
--- a/server.js
+++ b/server.js
@@ -14,39 +14,29 @@ var request      = require("request")
   , user         = require("./api/user")
   , branding     = require("./api/branding")
   , metrics      = require("./api/metrics")
-  , fs 		 = require('fs')
   , app          = express()
 
 
 
 app.use(function (req, res, next) {
 	if (config.branding.set == false) {
-		if(process.env.DEFAULT_BRANDING) {
-			config.branding.set = true
-			config.branding.values.name = "weave"
-			image = "./public/img/weave-logo.png"
-			config.branding.values.logo = fs.readFileSync(image).toString("base64")
-			next()
-		} else {
-	
-			helpers.getBrandingConfig(function(cfg){
-				if (!cfg.set) {
-					ext = req.url.split('.').pop();
-						if ((["js", "css", "png", "map"].indexOf(ext) > -1) || 
-							(["/welcome.html", "/branding"].indexOf(req.url) > -1)) {
-							next()
-							return
+		helpers.getBrandingConfig(function(cfg){
+			if (!cfg.set) {
+				ext = req.url.split('.').pop();
+					if ((["js", "css", "png", "map"].indexOf(ext) > -1) || 
+						(["/welcome.html", "/branding"].indexOf(req.url) > -1)) {
+						next()
+						return
 
-						} else {
-							res.redirect("/welcome.html")
-							return
-						}
-				} else {
-					next()
-					return
-				}
-			});
-		}
+					} else {
+						res.redirect("/welcome.html")
+						return
+					}
+			} else {
+				next()
+				return
+			}
+		});
 	} else {
 		helpers.setBrandingConfig()
 		next()

From d04eb9680c73959894e2bb64e73faeb584dbfa86 Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Tue, 20 Jun 2017 14:32:33 +0200
Subject: [PATCH 16/22] made some logic changes to insure user sets branding

---
 api/branding/index.js | 65 +++++++++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/api/branding/index.js b/api/branding/index.js
index 0460a41e4..c6cd661db 100644
--- a/api/branding/index.js
+++ b/api/branding/index.js
@@ -21,39 +21,44 @@
   ); 
 
   app.post("/branding", function (req, res, next) {
-      	if (config.branding.set === true) {
+      	if (config.branding.set == true) {
     		res.redirect("/")
 		return
+	} else {
+		console.log(req.body.brand)
+		if (req.body.brand !== undefined) {
+			var brand = req.body.brand
+			var image
+			if (brand == "cncf") {
+				config.branding.set = true
+				config.branding.values.name = "cncf"
+				image = "./public/img/cncf-logo.png"
+			} else if (brand == "weave") {
+				config.branding.set = true
+				config.branding.values.name = "weave"
+				image = "./public/img/weave-logo.png"
+			} else if (brand == "other") {
+				config.branding.set = true
+				config.branding.values.name = "other"
+				console.log(req.files.logo.file);
+				if (req.files.logo == undefined) {
+				res.redirect("/welcome.html")
+				return
+				}		
+				image = req.files.logo.file
+			}
+			else {
+				res.redirect("/welcome.html")
+				return
+			}
+			config.branding.values.logo = fs.readFileSync(image).toString("base64")
+			res.redirect("/")
+			return
+	    	} else {
+			res.redirect("/welcome.html")
+			return
+    		}
 	}
-      	if (req.body.brand !== undefined) {
-    	var brand = req.body.brand
-	var image
-	if (brand == "cncf") {
-		config.branding.set = true
-		config.branding.values.name = "cncf"
-		image = "./public/img/cncf-logo.png"
-	} else if (brand == "weave") {
-		config.branding.set = true
-		config.branding.values.name = "weave"
-		image = "./public/img/weave-logo.png"
-	} else if (brand == "other") {
-		config.branding.set = true
-		config.branding.values.name = "other"
-    		console.log(req.files.logo.file);
-		if (req.files.logo == undefined) {
-    		res.redirect("/welcome.html")
-		return
-		}		
-	        image = req.files.logo.file
-	}
-	else {
-    		res.redirect("/welcome.html")
-		return
-	}
-	config.branding.values.logo = fs.readFileSync(image).toString("base64")
-    }
-    helpers.setBrandingConfig()
-    res.redirect("/")
   });
 
 

From 4f209501a7702d9402fec2393f6ed5a9df39ce5e Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Tue, 20 Jun 2017 16:47:41 +0200
Subject: [PATCH 17/22] started adding some additional fields for more
 branding, needs templating on the footer

---
 api/branding/index.js | 11 +++++++++++
 config.js             |  6 ++++++
 public/welcome.html   | 38 +++++++++++++++++++++++++++++++++++---
 3 files changed, 52 insertions(+), 3 deletions(-)

diff --git a/api/branding/index.js b/api/branding/index.js
index c6cd661db..67e0ac42e 100644
--- a/api/branding/index.js
+++ b/api/branding/index.js
@@ -33,10 +33,21 @@
 				config.branding.set = true
 				config.branding.values.name = "cncf"
 				image = "./public/img/cncf-logo.png"
+				config.branding.values.company = "Cloud Native Computing Foundation c/o The Linux Foundation"
+				config.branding.values.street = "1 Letterman Drive</br>Suite D4700"
+				config.branding.values.city = "San Francisco"
+				config.branding.values.state = "CA"
+				config.branding.values.zip = "94129"
+				config.branding.values.country = "USA"
 			} else if (brand == "weave") {
 				config.branding.set = true
 				config.branding.values.name = "weave"
 				image = "./public/img/weave-logo.png"
+				config.branding.values.company = "Weaveworks Ltd."
+				config.branding.values.street = "32 – 38 Scrutton Street"
+				config.branding.values.city = "London"
+				config.branding.values.zip = "EC2A 4RQ"
+				config.branding.values.country = "UK"
 			} else if (brand == "other") {
 				config.branding.set = true
 				config.branding.values.name = "other"
diff --git a/config.js b/config.js
index 1a4738d14..41fbda395 100644
--- a/config.js
+++ b/config.js
@@ -25,6 +25,12 @@
 	values: {
 		name: "",
 		logo: "",
+		company: "",
+		street: "",
+		city: "",
+		zip: "",
+		state: "",
+		country: "",
 	}
     }
   };
diff --git a/public/welcome.html b/public/welcome.html
index d50fe415f..b8eb72da6 100644
--- a/public/welcome.html
+++ b/public/welcome.html
@@ -60,20 +60,44 @@
                                     <div>Branding</div>
                                     <div class="form-group">
 					    <div>
-				                <label><input type="radio" name="brand" value="cncf">CNCF</label>
+				                <label><input type="radio" name="brand" value="cncf" class="not-other">CNCF</label>
 					    </div>
 					    <div>
-						<label><input type="radio" name="brand" value="weave">Weaveworks</label>
+						<label><input type="radio" name="brand" value="weave" class="not-other">Weaveworks</label>
 					    </div>
 					    <div>
 						<label>
-					            <input type="radio" name="brand" value="other" data-toggle="collapse" data-target="#upload-image">Other</label>
+					            <input type="radio" name="brand" value="other" class="other">Other</label>
 					    </div>
                                     </div>
                                     <div class="form-group collapse" id="upload-image">
 					<label class="btn btn-primary btn-file">
 					    Upload <input type="file" hidden name="logo" id="logo">
 					</label>
+					<div class="form-group">
+						<input type="text" class="form-control"
+                                   			name="company" placeholder="Company">
+                                    	</div>
+					<div class="form-group">
+						<input type="text" class="form-control"
+                                   			name="street" placeholder="Street address">
+                                    	</div>
+					<div class="form-group">
+						<input type="text" class="form-control"
+                                   			name="city" placeholder="City">
+                                    	</div>
+					<div class="form-group">
+						<input type="text" class="form-control"
+                                   			name="zip" placeholder="Zip">
+                                    	</div>
+					<div class="form-group">
+						<input type="text" class="form-control"
+                                   			name="state" placeholder="State">
+                                    	</div>
+					<div class="form-group">
+						<input type="text" class="form-control"
+                                   			name="country" placeholder="Country">
+                                    	</div>
                                     </div>
                                     <div class="form-group">
                             		<button class="btn btn-primary" href="#" on>
@@ -116,6 +140,14 @@
 <script src="js/client.js"></script>
 <script>
 
+$(document).ready(function(){
+    $(".not-other").click(function(){
+        $(".collapse").collapse('hide');
+    });
+    $(".other").click(function(){
+        $(".collapse").collapse('show');
+    });
+});
 </script>
 </body>
 

From ca761c3cc48fb47b9bc1d536e572c5fd5deb20eb Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Wed, 21 Jun 2017 11:17:27 +0200
Subject: [PATCH 18/22] added template for footer

---
 api/branding/index.js | 105 ++++++++++++++++++++++--------------------
 1 file changed, 54 insertions(+), 51 deletions(-)

diff --git a/api/branding/index.js b/api/branding/index.js
index 67e0ac42e..804f2ce55 100644
--- a/api/branding/index.js
+++ b/api/branding/index.js
@@ -20,60 +20,60 @@
 	  }
   ); 
 
-  app.post("/branding", function (req, res, next) {
-      	if (config.branding.set == true) {
-    		res.redirect("/")
-		return
-	} else {
-		console.log(req.body.brand)
-		if (req.body.brand !== undefined) {
-			var brand = req.body.brand
-			var image
-			if (brand == "cncf") {
-				config.branding.set = true
-				config.branding.values.name = "cncf"
-				image = "./public/img/cncf-logo.png"
-				config.branding.values.company = "Cloud Native Computing Foundation c/o The Linux Foundation"
-				config.branding.values.street = "1 Letterman Drive</br>Suite D4700"
-				config.branding.values.city = "San Francisco"
-				config.branding.values.state = "CA"
-				config.branding.values.zip = "94129"
-				config.branding.values.country = "USA"
-			} else if (brand == "weave") {
-				config.branding.set = true
-				config.branding.values.name = "weave"
-				image = "./public/img/weave-logo.png"
-				config.branding.values.company = "Weaveworks Ltd."
-				config.branding.values.street = "32 – 38 Scrutton Street"
-				config.branding.values.city = "London"
-				config.branding.values.zip = "EC2A 4RQ"
-				config.branding.values.country = "UK"
-			} else if (brand == "other") {
-				config.branding.set = true
-				config.branding.values.name = "other"
-				console.log(req.files.logo.file);
-				if (req.files.logo == undefined) {
-				res.redirect("/welcome.html")
+	app.post("/branding", function (req, res, next) {
+		if (config.branding.set == true) {
+			res.redirect("/")
+			return
+		} else {
+			console.log(req.body.brand)
+			if (req.body.brand !== undefined) {
+				var brand = req.body.brand
+				var image
+				if (brand == "cncf") {
+					config.branding.set = true
+					config.branding.values.name = "cncf"
+					image = "./public/img/cncf-logo.png"
+					config.branding.values.company = "Cloud Native Computing Foundation c/o The Linux Foundation"
+					config.branding.values.street = "1 Letterman Drive Suite D4700"
+					config.branding.values.city = "San Francisco"
+					config.branding.values.state = "CA"
+					config.branding.values.zip = "94129"
+					config.branding.values.country = "USA"
+				} else if (brand == "weave") {
+					config.branding.set = true
+					config.branding.values.name = "weave"
+					image = "./public/img/weave-logo.png"
+					config.branding.values.company = "Weaveworks Ltd."
+					config.branding.values.street = "32 – 38 Scrutton Street"
+					config.branding.values.city = "London"
+					config.branding.values.zip = "EC2A 4RQ"
+					config.branding.values.country = "UK"
+				} else if (brand == "other") {
+					config.branding.set = true
+					config.branding.values.name = "other"
+					console.log(req.files.logo.file);
+					if (req.files.logo == undefined) {
+					res.redirect("/welcome.html")
+					return
+					}		
+					image = req.files.logo.file
+				}
+				else {
+					res.redirect("/welcome.html")
+					return
+				}
+				config.branding.values.logo = fs.readFileSync(image).toString("base64")
+				res.redirect("/")
 				return
-				}		
-				image = req.files.logo.file
-			}
-			else {
+			} else {
 				res.redirect("/welcome.html")
 				return
 			}
-			config.branding.values.logo = fs.readFileSync(image).toString("base64")
-			res.redirect("/")
-			return
-	    	} else {
-			res.redirect("/welcome.html")
-			return
-    		}
-	}
-  });
+		}
+	});
 
 
-  app.get("/img/logo*", function (req, res, next) {
+	app.get("/img/logo*", function (req, res, next) {
 	    var buf;
 	    console.log("fired")
 	    buf = new Buffer(config.branding.values.logo, 'base64');
@@ -83,9 +83,12 @@
 		'Content-Length': buf.length
 	    });
 	    res.end(new Buffer(buf, 'binary'));
-  });
-
-  module.exports = app;
+	});
+	
+	app.get('/footer.html', function (req, res) {
+	  res.render('footer', config.branding.values )
+	})
 
+  	module.exports = app;
 
 }());

From 99ca61b12c1c6904247a9c8c988f9399c06cc9f7 Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Wed, 21 Jun 2017 11:18:23 +0200
Subject: [PATCH 19/22] added ejs templates and package

---
 package.json                           |  1 +
 server.js                              |  2 ++
 public/footer.html => views/footer.ejs | 10 +++++-----
 3 files changed, 8 insertions(+), 5 deletions(-)
 rename public/footer.html => views/footer.ejs (93%)

diff --git a/package.json b/package.json
index 1bef8ecd8..7155cc8a6 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "connect-busboy": "0.0.2",
     "connect-redis": "^3.2.0",
     "cookie-parser": "^1.4.3",
+    "ejs": "^2.5.6",
     "express": "^4.13.4",
     "express-busboy": "^6.0.1",
     "express-session": "^1.13.0",
diff --git a/server.js b/server.js
index 19e59ccfd..443c9f0df 100644
--- a/server.js
+++ b/server.js
@@ -86,3 +86,5 @@ var server = app.listen(process.env.PORT || 8079, function () {
   var port = server.address().port;
   console.log("App now running in %s mode on port %d", app.get("env"), port);
 });
+app.set('view engine', 'ejs')
+
diff --git a/public/footer.html b/views/footer.ejs
similarity index 93%
rename from public/footer.html
rename to views/footer.ejs
index 24516ab2d..35319e3d4 100644
--- a/public/footer.html
+++ b/views/footer.ejs
@@ -54,11 +54,11 @@ <h4>Top categories</h4>
 
                 <h4>Where to find us</h4>
 
-                <p><strong>Weaveworks Ltd.</strong>
-                    <br>32 – 38 Scrutton Street
-                    <br>London
-                    <br>EC2A 4RQ
-                    <br>UK
+                <p><strong><%= company %></strong>
+                    <br><%= street %>
+                    <br><%= city %>
+	            <br><%= state %> <%= zip %>
+                    <br><%= country %>
                 </p>
 
                 <hr class="hidden-md hidden-lg">

From 4b851a32697fdf11c7186b13a26148fa5d586740 Mon Sep 17 00:00:00 2001
From: Jason Smith <jasonrichardsmith@gmail.com>
Date: Wed, 21 Jun 2017 15:16:32 +0200
Subject: [PATCH 20/22] added the form values to the api/branding for other

---
 api/branding/index.js | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/api/branding/index.js b/api/branding/index.js
index 804f2ce55..6f1ae169b 100644
--- a/api/branding/index.js
+++ b/api/branding/index.js
@@ -53,9 +53,15 @@
 					config.branding.values.name = "other"
 					console.log(req.files.logo.file);
 					if (req.files.logo == undefined) {
-					res.redirect("/welcome.html")
-					return
-					}		
+						res.redirect("/welcome.html")
+						return
+					}	
+					config.branding.values.company = req.body.company
+					config.branding.values.street = req.body.street
+					config.branding.values.city = req.body.city
+					config.branding.values.zip = req.body.zip
+					config.branding.values.state = req.body.state
+					config.branding.values.country = req.body.country
 					image = req.files.logo.file
 				}
 				else {

From be6dab9aedf97aa9d1c1dd3ff03882b5feaee278 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Leo=CC=81n?= <mail@carlosleon.info>
Date: Wed, 30 Aug 2017 17:31:12 +0200
Subject: [PATCH 21/22] Fix formatting in some JS files

Replacing tabs for spaces. Deleting spaces on EOL, etc.
---
 api/branding/index.js | 165 ++++++++++++++++++++----------------------
 config.js             |  29 ++++----
 helpers/index.js      | 102 +++++++++++++-------------
 server.js             |  52 ++++++-------
 4 files changed, 172 insertions(+), 176 deletions(-)

diff --git a/api/branding/index.js b/api/branding/index.js
index 6f1ae169b..8bdec6b4c 100644
--- a/api/branding/index.js
+++ b/api/branding/index.js
@@ -5,96 +5,91 @@
     , express   = require("express")
     , request   = require("request")
     , helpers   = require("../../helpers")
-    , config       = require("../../config")
+    , config    = require("../../config")
     , endpoints = require("../endpoints")
     , app       = express()
-    , fs = require('fs')
-    , busyboy = require('express-busboy');
-  
-  busyboy.extend(app,
-	  {
-		      upload: true,
-		      path: '/tmp/logo',
-		      allowedPath: /./
+    , fs        = require('fs')
+    , busyboy   = require('express-busboy');
 
-	  }
-  ); 
+  busyboy.extend(app, {
+    upload: true,
+    path: '/tmp/logo',
+    allowedPath: /./
+  });
 
-	app.post("/branding", function (req, res, next) {
-		if (config.branding.set == true) {
-			res.redirect("/")
-			return
-		} else {
-			console.log(req.body.brand)
-			if (req.body.brand !== undefined) {
-				var brand = req.body.brand
-				var image
-				if (brand == "cncf") {
-					config.branding.set = true
-					config.branding.values.name = "cncf"
-					image = "./public/img/cncf-logo.png"
-					config.branding.values.company = "Cloud Native Computing Foundation c/o The Linux Foundation"
-					config.branding.values.street = "1 Letterman Drive Suite D4700"
-					config.branding.values.city = "San Francisco"
-					config.branding.values.state = "CA"
-					config.branding.values.zip = "94129"
-					config.branding.values.country = "USA"
-				} else if (brand == "weave") {
-					config.branding.set = true
-					config.branding.values.name = "weave"
-					image = "./public/img/weave-logo.png"
-					config.branding.values.company = "Weaveworks Ltd."
-					config.branding.values.street = "32 – 38 Scrutton Street"
-					config.branding.values.city = "London"
-					config.branding.values.zip = "EC2A 4RQ"
-					config.branding.values.country = "UK"
-				} else if (brand == "other") {
-					config.branding.set = true
-					config.branding.values.name = "other"
-					console.log(req.files.logo.file);
-					if (req.files.logo == undefined) {
-						res.redirect("/welcome.html")
-						return
-					}	
-					config.branding.values.company = req.body.company
-					config.branding.values.street = req.body.street
-					config.branding.values.city = req.body.city
-					config.branding.values.zip = req.body.zip
-					config.branding.values.state = req.body.state
-					config.branding.values.country = req.body.country
-					image = req.files.logo.file
-				}
-				else {
-					res.redirect("/welcome.html")
-					return
-				}
-				config.branding.values.logo = fs.readFileSync(image).toString("base64")
-				res.redirect("/")
-				return
-			} else {
-				res.redirect("/welcome.html")
-				return
-			}
-		}
-	});
+  app.post("/branding", function (req, res, next) {
+    if (config.branding.set == true) {
+      res.redirect("/")
+      return
+    } else {
+      console.log(req.body.brand)
+      if (req.body.brand !== undefined) {
+        var brand = req.body.brand
+        var image
+        if (brand == "cncf") {
+          config.branding.set = true
+          config.branding.values.name = "cncf"
+          image = "./public/img/cncf-logo.png"
+          config.branding.values.company = "Cloud Native Computing Foundation c/o The Linux Foundation"
+          config.branding.values.street = "1 Letterman Drive Suite D4700"
+          config.branding.values.city = "San Francisco"
+          config.branding.values.state = "CA"
+          config.branding.values.zip = "94129"
+          config.branding.values.country = "USA"
+        } else if (brand == "weave") {
+          config.branding.set = true
+          config.branding.values.name = "weave"
+          image = "./public/img/weave-logo.png"
+          config.branding.values.company = "Weaveworks Ltd."
+          config.branding.values.street = "32 – 38 Scrutton Street"
+          config.branding.values.city = "London"
+          config.branding.values.zip = "EC2A 4RQ"
+          config.branding.values.country = "UK"
+        } else if (brand == "other") {
+          config.branding.set = true
+          config.branding.values.name = "other"
+          console.log(req.files.logo.file);
+          if (req.files.logo == undefined) {
+            res.redirect("/welcome.html")
+            return
+          }
+          config.branding.values.company = req.body.company
+          config.branding.values.street = req.body.street
+          config.branding.values.city = req.body.city
+          config.branding.values.zip = req.body.zip
+          config.branding.values.state = req.body.state
+          config.branding.values.country = req.body.country
+          image = req.files.logo.file
+        }
+        else {
+          res.redirect("/welcome.html")
+          return
+        }
+        config.branding.values.logo = fs.readFileSync(image).toString("base64")
+        res.redirect("/")
+        return
+      } else {
+        res.redirect("/welcome.html")
+        return
+      }
+    }
+  });
 
+  app.get("/img/logo*", function (req, res, next) {
+    var buf;
+    console.log("fired")
+    buf = new Buffer(config.branding.values.logo, 'base64');
+    res.writeHead(200, {
+      'Content-Type': "image/png",
+      'Content-disposition': 'attachment;filename=logo.png',
+      'Content-Length': buf.length
+    });
+    res.end(new Buffer(buf, 'binary'));
+  });
 
-	app.get("/img/logo*", function (req, res, next) {
-	    var buf;
-	    console.log("fired")
-	    buf = new Buffer(config.branding.values.logo, 'base64');
-	    res.writeHead(200, {
-		'Content-Type': "image/png",
-		'Content-disposition': 'attachment;filename=logo.png',
-		'Content-Length': buf.length
-	    });
-	    res.end(new Buffer(buf, 'binary'));
-	});
-	
-	app.get('/footer.html', function (req, res) {
-	  res.render('footer', config.branding.values )
-	})
-
-  	module.exports = app;
+  app.get('/footer.html', function (req, res) {
+    res.render('footer', config.branding.values )
+  })
 
+  module.exports = app;
 }());
diff --git a/config.js b/config.js
index 41fbda395..2af63de19 100644
--- a/config.js
+++ b/config.js
@@ -1,9 +1,10 @@
 (function (){
   'use strict';
 
-  var session      = require("express-session"),
-      RedisStore   = require('connect-redis')(session)
-      ,redis = require("redis")
+  var session    = require("express-session")
+    , RedisStore = require('connect-redis')(session)
+    , redis      = require("redis");
+
   module.exports = {
     session: {
       name: 'md.sid',
@@ -21,17 +22,17 @@
     },
     redis_client: null,
     branding :{
-    	set: false,
-	values: {
-		name: "",
-		logo: "",
-		company: "",
-		street: "",
-		city: "",
-		zip: "",
-		state: "",
-		country: "",
-	}
+      set: false,
+      values: {
+        name: "",
+        logo: "",
+        company: "",
+        street: "",
+        city: "",
+        zip: "",
+        state: "",
+        country: "",
+      }
     }
   };
 }());
diff --git a/helpers/index.js b/helpers/index.js
index ace0ef659..c60f7d9f8 100644
--- a/helpers/index.js
+++ b/helpers/index.js
@@ -57,10 +57,10 @@
 
   /* Rewrites and redirects any url that doesn't end with a slash. */
   helpers.rewriteSlash = function(req, res, next) {
-   if(req.url.substr(-1) == '/' && req.url.length > 1)
-       res.redirect(301, req.url.slice(0, -1));
-   else
-       next();
+    if(req.url.substr(-1) == '/' && req.url.length > 1)
+      res.redirect(301, req.url.slice(0, -1));
+    else
+      next();
   }
 
   /* Public: performs an HTTP GET request to the given URL
@@ -109,56 +109,56 @@
 
 
   helpers.getBrandingConfig = function(callback) {
-	if(process.env.SESSION_REDIS) {
-		config.redis_client = redis.createClient("redis://session-db:6379");
-		config.redis_client.on("error", function (err) {
-  			console.log("Redis error encountered", err);
-		});
-
-		config.redis_client.on("end", function() {
-			console.log("Redis connection closed");
-		});
-		
-		if(process.env.DEFAULT_BRANDING) {
-			config.branding.set = true
-			config.branding.values.name = "weave"
-			var image
-			image = "./public/img/weave-logo.png"
-			config.branding.values.logo = fs.readFileSync(image).toString("base64")
-			callback(config.branding)
-			return
-		} else { 
-			config.redis_client.get("branding_info", function(err, reply) {
-				if (reply !== null) {
-					config.branding.values = JSON.parse(reply)
-					config.branding.set = true
-					callback(config.branding)
-				} else {
-					callback(config.branding)
-				}
-			})
-		}
-	} else {
-		if (fs.existsSync("./branding.json")) {
-			config.branding.values = JSON.parse(fs.readFileSync('./branding.json'))
-			config.branding.set = true
-				callback(config.branding)
-			} else {
-				callback(config.branding)
-			}
-	}
+    if(process.env.SESSION_REDIS) {
+      config.redis_client = redis.createClient("redis://session-db:6379");
+      config.redis_client.on("error", function (err) {
+        console.log("Redis error encountered", err);
+      });
+
+      config.redis_client.on("end", function() {
+        console.log("Redis connection closed");
+      });
+
+      if(process.env.DEFAULT_BRANDING) {
+        config.branding.set = true
+        config.branding.values.name = "weave"
+        var image
+        image = "./public/img/weave-logo.png"
+        config.branding.values.logo = fs.readFileSync(image).toString("base64")
+        callback(config.branding)
+        return
+      } else {
+        config.redis_client.get("branding_info", function(err, reply) {
+          if (reply !== null) {
+            config.branding.values = JSON.parse(reply)
+            config.branding.set = true
+            callback(config.branding)
+          } else {
+            callback(config.branding)
+          }
+        })
+      }
+    } else {
+      if (fs.existsSync("./branding.json")) {
+        config.branding.values = JSON.parse(fs.readFileSync('./branding.json'))
+        config.branding.set = true
+        callback(config.branding)
+      } else {
+        callback(config.branding)
+      }
+    }
   }
 
   helpers.setBrandingConfig = function() {
-	if(process.env.SESSION_REDIS) {
-    		if (config.redis_client.connected) {
-			config.redis_client.set("branding_info", JSON.stringify(config.branding.values))
-		}
-	} else {
-		fs.writeFile("./branding.json", JSON.stringify(config.branding.values, null, 2), function(err) {
-			return err;
-		}); 
-	}
+    if(process.env.SESSION_REDIS) {
+      if (config.redis_client.connected) {
+        config.redis_client.set("branding_info", JSON.stringify(config.branding.values))
+      }
+    } else {
+      fs.writeFile("./branding.json", JSON.stringify(config.branding.values, null, 2), function(err) {
+        return err;
+      });
+    }
   }
 
   module.exports = helpers;
diff --git a/server.js b/server.js
index 443c9f0df..15cc84864 100644
--- a/server.js
+++ b/server.js
@@ -19,42 +19,42 @@ var request      = require("request")
 
 
 app.use(function (req, res, next) {
-	if (config.branding.set == false) {
-		helpers.getBrandingConfig(function(cfg){
-			if (!cfg.set) {
-				ext = req.url.split('.').pop();
-					if ((["js", "css", "png", "map"].indexOf(ext) > -1) || 
-						(["/welcome.html", "/branding"].indexOf(req.url) > -1)) {
-						next()
-						return
+  if (config.branding.set == false) {
+    helpers.getBrandingConfig(function(cfg){
+      if (!cfg.set) {
+        ext = req.url.split('.').pop();
+        if ((["js", "css", "png", "map"].indexOf(ext) > -1) ||
+          (["/welcome.html", "/branding"].indexOf(req.url) > -1)) {
+          next()
+          return
 
-					} else {
-						res.redirect("/welcome.html")
-						return
-					}
-			} else {
-				next()
-				return
-			}
-		});
-	} else {
-		helpers.setBrandingConfig()
-		next()
-	}
-	return
+        } else {
+          res.redirect("/welcome.html")
+          return
+        }
+      } else {
+        next()
+        return
+      }
+    });
+  } else {
+    helpers.setBrandingConfig()
+    next()
+  }
+  return
 });
 
 app.use(express.static("public"));
 app.use(helpers.rewriteSlash);
 app.use(metrics);
 if(process.env.SESSION_REDIS) {
-    console.log('Using the redis based session manager');
-    app.use(session(config.session_redis));
+  console.log('Using the redis based session manager');
+  app.use(session(config.session_redis));
 
 }
 else {
-    console.log('Using local session manager');
-    app.use(session(config.session));
+  console.log('Using local session manager');
+  app.use(session(config.session));
 }
 
 app.use(bodyParser.json());

From 532aaccd03e3135c494ccd48f9b52b639e2e6398 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Leo=CC=81n?= <mail@carlosleon.info>
Date: Thu, 31 Aug 2017 10:47:54 +0200
Subject: [PATCH 22/22] Clean up branding JS code

---
 api/branding/index.js | 92 +++++++++++++++++++++----------------------
 config.js             |  3 +-
 helpers/index.js      | 45 ++++++++++-----------
 server.js             | 34 +++++++---------
 4 files changed, 84 insertions(+), 90 deletions(-)

diff --git a/api/branding/index.js b/api/branding/index.js
index 8bdec6b4c..6bacb2887 100644
--- a/api/branding/index.js
+++ b/api/branding/index.js
@@ -9,9 +9,9 @@
     , endpoints = require("../endpoints")
     , app       = express()
     , fs        = require('fs')
-    , busyboy   = require('express-busboy');
+    , busboy    = require('express-busboy');
 
-  busyboy.extend(app, {
+  busboy.extend(app, {
     upload: true,
     path: '/tmp/logo',
     allowedPath: /./
@@ -19,66 +19,66 @@
 
   app.post("/branding", function (req, res, next) {
     if (config.branding.set == true) {
-      res.redirect("/")
-      return
+      res.redirect("/");
+      return;
     } else {
-      console.log(req.body.brand)
+      console.log(req.body.brand);
       if (req.body.brand !== undefined) {
-        var brand = req.body.brand
-        var image
+        var brand = req.body.brand;
+        var image;
+
         if (brand == "cncf") {
-          config.branding.set = true
-          config.branding.values.name = "cncf"
-          image = "./public/img/cncf-logo.png"
-          config.branding.values.company = "Cloud Native Computing Foundation c/o The Linux Foundation"
-          config.branding.values.street = "1 Letterman Drive Suite D4700"
-          config.branding.values.city = "San Francisco"
-          config.branding.values.state = "CA"
-          config.branding.values.zip = "94129"
-          config.branding.values.country = "USA"
+          image = "./public/img/cncf-logo.png";
+          config.branding.set = true;
+          config.branding.values.name = "cncf";
+          config.branding.values.company = "Cloud Native Computing Foundation c/o The Linux Foundation";
+          config.branding.values.street = "1 Letterman Drive Suite D4700";
+          config.branding.values.city = "San Francisco";
+          config.branding.values.state = "CA";
+          config.branding.values.zip = "94129";
+          config.branding.values.country = "USA";
         } else if (brand == "weave") {
-          config.branding.set = true
-          config.branding.values.name = "weave"
-          image = "./public/img/weave-logo.png"
-          config.branding.values.company = "Weaveworks Ltd."
-          config.branding.values.street = "32 – 38 Scrutton Street"
-          config.branding.values.city = "London"
-          config.branding.values.zip = "EC2A 4RQ"
-          config.branding.values.country = "UK"
+          image = "./public/img/weave-logo.png";
+          config.branding.set = true;
+          config.branding.values.name = "weave";
+          config.branding.values.company = "Weaveworks Ltd.";
+          config.branding.values.street = "32 – 38 Scrutton Street";
+          config.branding.values.city = "London";
+          config.branding.values.zip = "EC2A 4RQ";
+          config.branding.values.country = "UK";
         } else if (brand == "other") {
-          config.branding.set = true
-          config.branding.values.name = "other"
+          config.branding.set = true;
+          config.branding.values.name = "other";
           console.log(req.files.logo.file);
           if (req.files.logo == undefined) {
-            res.redirect("/welcome.html")
-            return
+            res.redirect("/welcome.html");
+            return;
           }
-          config.branding.values.company = req.body.company
-          config.branding.values.street = req.body.street
-          config.branding.values.city = req.body.city
-          config.branding.values.zip = req.body.zip
-          config.branding.values.state = req.body.state
-          config.branding.values.country = req.body.country
-          image = req.files.logo.file
+          image = req.files.logo.file;
+          config.branding.values.company = req.body.company;
+          config.branding.values.street = req.body.street;
+          config.branding.values.city = req.body.city;
+          config.branding.values.zip = req.body.zip;
+          config.branding.values.state = req.body.state;
+          config.branding.values.country = req.body.country;
         }
         else {
-          res.redirect("/welcome.html")
-          return
+          res.redirect("/welcome.html");
+          return;
         }
-        config.branding.values.logo = fs.readFileSync(image).toString("base64")
-        res.redirect("/")
-        return
+        config.branding.values.logo = fs.readFileSync(image).toString("base64");
+        res.redirect("/");
+        return;
       } else {
-        res.redirect("/welcome.html")
-        return
+        res.redirect("/welcome.html");
+        return;
       }
     }
   });
 
   app.get("/img/logo*", function (req, res, next) {
-    var buf;
     console.log("fired")
-    buf = new Buffer(config.branding.values.logo, 'base64');
+    var buf = new Buffer(config.branding.values.logo, 'base64');
     res.writeHead(200, {
       'Content-Type': "image/png",
       'Content-disposition': 'attachment;filename=logo.png',
@@ -88,8 +88,8 @@
   });
 
   app.get('/footer.html', function (req, res) {
-    res.render('footer', config.branding.values )
-  })
+    res.render('footer', config.branding.values);
+  });
 
   module.exports = app;
 }());
diff --git a/config.js b/config.js
index 2af63de19..335bea900 100644
--- a/config.js
+++ b/config.js
@@ -20,8 +20,9 @@
       resave: false,
       saveUninitialized: true
     },
+
     redis_client: null,
-    branding :{
+    branding: {
       set: false,
       values: {
         name: "",
diff --git a/helpers/index.js b/helpers/index.js
index c60f7d9f8..de625fb3d 100644
--- a/helpers/index.js
+++ b/helpers/index.js
@@ -1,12 +1,11 @@
 (function (){
   'use strict';
 
-  var request = require("request");
-  var config  = require("../config");
-  var fs = require('fs');
-  var redis = require("redis")
-
-  var helpers = {};
+  var  request = require("request")
+     , config  = require("../config")
+     , fs      = require('fs')
+     , redis   = require("redis")
+     , helpers = {}
 
   /* Public: errorHandler is a middleware that handles your errors
    *
@@ -15,7 +14,6 @@
    * var app = express();
    * app.use(helpers.errorHandler);
    * */
-
   helpers.errorHandler = function(err, req, res, next) {
     var ret = {
       message: err.message,
@@ -120,39 +118,38 @@
       });
 
       if(process.env.DEFAULT_BRANDING) {
-        config.branding.set = true
-        config.branding.values.name = "weave"
-        var image
-        image = "./public/img/weave-logo.png"
-        config.branding.values.logo = fs.readFileSync(image).toString("base64")
-        callback(config.branding)
+        var image = "./public/img/weave-logo.png";
+        config.branding.set = true;
+        config.branding.values.name = "weave";
+        config.branding.values.logo = fs.readFileSync(image).toString("base64");
+        callback(config.branding);
         return
       } else {
         config.redis_client.get("branding_info", function(err, reply) {
           if (reply !== null) {
-            config.branding.values = JSON.parse(reply)
-            config.branding.set = true
-            callback(config.branding)
+            config.branding.values = JSON.parse(reply);
+            config.branding.set = true;
+            callback(config.branding);
           } else {
-            callback(config.branding)
+            callback(config.branding);
           }
-        })
+        });
       }
     } else {
       if (fs.existsSync("./branding.json")) {
-        config.branding.values = JSON.parse(fs.readFileSync('./branding.json'))
-        config.branding.set = true
-        callback(config.branding)
+        config.branding.values = JSON.parse(fs.readFileSync('./branding.json'));
+        config.branding.set = true;
+        callback(config.branding);
       } else {
-        callback(config.branding)
+        callback(config.branding);
       }
     }
-  }
+  };
 
   helpers.setBrandingConfig = function() {
     if(process.env.SESSION_REDIS) {
       if (config.redis_client.connected) {
-        config.redis_client.set("branding_info", JSON.stringify(config.branding.values))
+        config.redis_client.set("branding_info", JSON.stringify(config.branding.values));
       }
     } else {
       fs.writeFile("./branding.json", JSON.stringify(config.branding.values, null, 2), function(err) {
diff --git a/server.js b/server.js
index 15cc84864..895737d97 100644
--- a/server.js
+++ b/server.js
@@ -14,9 +14,7 @@ var request      = require("request")
   , user         = require("./api/user")
   , branding     = require("./api/branding")
   , metrics      = require("./api/metrics")
-  , app          = express()
-
-
+  , app          = express();
 
 app.use(function (req, res, next) {
   if (config.branding.set == false) {
@@ -25,34 +23,33 @@ app.use(function (req, res, next) {
         ext = req.url.split('.').pop();
         if ((["js", "css", "png", "map"].indexOf(ext) > -1) ||
           (["/welcome.html", "/branding"].indexOf(req.url) > -1)) {
-          next()
-          return
+          next();
+          return;
 
         } else {
-          res.redirect("/welcome.html")
-          return
+          res.redirect("/welcome.html");
+          return;
         }
       } else {
-        next()
-        return
+        next();
+        return;
       }
     });
   } else {
-    helpers.setBrandingConfig()
-    next()
+    helpers.setBrandingConfig();
+    next();
   }
-  return
+  return;
 });
 
 app.use(express.static("public"));
 app.use(helpers.rewriteSlash);
 app.use(metrics);
-if(process.env.SESSION_REDIS) {
+
+if (process.env.SESSION_REDIS) {
   console.log('Using the redis based session manager');
   app.use(session(config.session_redis));
-
-}
-else {
+} else {
   console.log('Using local session manager');
   app.use(session(config.session));
 }
@@ -79,12 +76,11 @@ app.use(catalogue);
 app.use(orders);
 app.use(user);
 app.use(branding);
-
 app.use(helpers.errorHandler);
 
+app.set('view engine', 'ejs')
+
 var server = app.listen(process.env.PORT || 8079, function () {
   var port = server.address().port;
   console.log("App now running in %s mode on port %d", app.get("env"), port);
 });
-app.set('view engine', 'ejs')
-