UI Fixes

me-box · Toshbrown · Apr 16, 2018 · Oct 2, 2017 · Oct 3, 2017 · Oct 9, 2017
commit 21efcca626adfa0b6acc9523c38ed31f7f558480
diff --git a/package.json b/package.json
@@ -1,56 +1,53 @@
 {
-  "name": "container-manager",
-  "version": "0.3.0",
-  "description": "Databox OS container manager and dashboard server",
-  "scripts": {
-    "test": "./node_modules/mocha/bin/mocha",
-    "build": "node-sass --output-style compressed src/www/styles/ -o src/www/styles/ && pug -cD src/www/templates/",
-    "watch": "node-sass --output-style compressed -w src/www/styles/ -o src/www/styles/ |  pug -cwD src/www/templates/",
-    "start": "node src/main.js",
-    "killall": "docker kill $(docker ps -a -q)",
-    "clean": "node ./node_modules/modclean/bin/modclean.js -p ./node_modules/ -r",
-    "dockerclean": "docker kill $(docker ps -a -q) && docker rm $(docker ps -a -q) && docker rmi -f $(docker images -q)"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/me-box/container-manager.git"
-  },
-  "keywords": [
-    "docker",
-    "databox",
-    "personal",
-    "data",
-    "dashboard",
-    "container",
-    "manager"
-  ],
-  "author": "Yousef Amar <yousef@amar.io> (http://yousefamar.com/)",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/me-box/container-manager-js/issues"
-  },
-  "homepage": "https://github.com/me-box/container-manager-js#readme",
-  "dependencies": {
-    "body-parser": "^1.15.2",
-    "cookie-parser": "^1.4.3",
-    "cors": "^2.8.4",
-    "dockerode": "^2.4.3",
-    "express": "^4.14.0",
-    "jsonfile": "^2.4.0",
-    "material-design-lite": "^1.2.1",
-    "modclean": "^2.1.0",
-    "nedb": "^1.8.0",
-    "node-databox": "0.6.2",
-    "node-forge": "^0.7.1",
-    "node-databox": "0.7.5",
-    "promise-retry": "^1.1.1",
-    "request": "^2.69.0",
-    "selfsigned": "^1.8.0",
-    "url": "^0.11.0"
-  },
-  "devDependencies": {
-    "mocha": "^3.1.2",
-    "supertest": "^2.0.1",
-    "should": "^11.1.1"
-  }
+	"name": "container-manager",
+	"version": "0.3.0",
+	"description": "Databox OS container manager and dashboard server",
+	"scripts": {
+		"test": "./node_modules/mocha/bin/mocha",
+		"build": "node-sass --output-style compressed src/www/styles/ -o src/www/styles/ && pug -cD src/www/templates/",
+		"watch": "node-sass --output-style compressed -w src/www/styles/ -o src/www/styles/ |  pug -cwD src/www/templates/",
+		"start": "node src/main.js",
+		"killall": "docker kill $(docker ps -a -q)",
+		"clean": "node ./node_modules/modclean/bin/modclean.js -p ./node_modules/ -r",
+		"dockerclean": "docker kill $(docker ps -a -q) && docker rm $(docker ps -a -q) && docker rmi -f $(docker images -q)"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/me-box/container-manager.git"
+	},
+	"keywords": [
+		"docker",
+		"databox",
+		"personal",
+		"data",
+		"dashboard",
+		"container",
+		"manager"
+	],
+	"author": "Yousef Amar <yousef@amar.io> (http://yousefamar.com/)",
+	"license": "MIT",
+	"bugs": {
+		"url": "https://github.com/me-box/container-manager-js/issues"
+	},
+	"homepage": "https://github.com/me-box/container-manager-js#readme",
+	"dependencies": {
+		"body-parser": "^1.18.2",
+		"cookie-parser": "^1.4.3",
+		"cors": "^2.8.4",
+		"dockerode": "^2.5.4",
+		"express": "^4.16.3",
+		"modclean": "^2.1.2",
+		"nedb": "^1.8.0",
+		"node-forge": "^0.7.5",
+		"node-databox": "^0.7.6",
+		"promise-retry": "^1.1.1",
+		"request": "^2.85.0",
+		"selfsigned": "^1.10.2",
+		"url": "^0.11.0"
+	},
+	"devDependencies": {
+		"mocha": "^3.1.2",
+		"supertest": "^2.0.1",
+		"should": "^11.1.1"
+	}
 }
diff --git a/src/server.js b/src/server.js
@@ -182,6 +182,7 @@ module.exports = {
 			if (!sessionToken) {
 				sessionToken = crypto.randomBytes(24).toString('base64');
 			}
+			res.cookie('session', sessionToken);
 			res.send(sessionToken);
 		});
 

diff --git a/src/www/http/css/material-components-web.min.css b/src/www/http/css/material-components-web.min.css
diff --git a/src/www/http/index.html b/src/www/http/index.html
@@ -1,4 +1,4 @@
 <!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="mobile-web-app-capable" content="yes"><meta name="apple-mobile-web-app-capable" content="yes"><meta name="theme-color" content="#3f51b5"><link rel="manifest" href="icons/manifest.json"><link rel="apple-touch-icon" sizes="57x57" href="icons/apple-icon-57.png"><link rel="apple-touch-icon" sizes="76x76" href="icons/apple-icon-76.png"><link rel="apple-touch-icon" sizes="120x120" href="icons/apple-icon-120.png"><link rel="apple-touch-icon" sizes="152x152" href="icons/apple-icon-152.png"><link rel="apple-touch-icon" sizes="180x180" href="icons/apple-icon-180.png"><link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16.png"><link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32.png"><link rel="icon" type="image/png" sizes="96x96" href="icons/android-icon-96.png"><link rel="icon" type="image/png" sizes="192x192" href="icons/android-icon-192.png"><link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons"><link rel="stylesheet" href="css/material-components-web.min.css"><title>Databox</title><style>:root {
 	--mdc-theme-primary: #3f51b5;
-}</style><script src="js/material-components-web.min.js" defer></script></head><body style="background: #EEE;"><header class="mdc-toolbar mdc-toolbar--fixed mdc-toolbar--fixed mdc-theme--dark"><div class="mdc-toolbar__row"><section class="mdc-toolbar__section mdc-toolbar__section--align-start"><span class="mdc-toolbar__title">Databox</span></section></div></header><main class="mdc-toolbar-fixed-adjust mdc-typography" id="content"><div class="mdc-layout-grid"><div class="mdc-layout-grid__inner"><div class="mdc-layout-grid__cell--span-2-desktop"></div><div class="mdc-card mdc-layout-grid__cell mdc-layout-grid__cell--span-8" style="background: #FFF;"><section class="mdc-card__primary qrdiv"><div><h2>Welcome to Databox</h2><div>Databox lets you take control of your personal data and IoT devices.</div><div style="background: #EE9;margin: 16px 0;padding: 8px;display: flex;align-items: center;"><span class="material-icons" style="padding: 4px 12px; color: #990;">warning</span>In order to use Databox securely, we ask that you install the certificate for this site</div><ul><li><a href="" title="Sorry, just a placeholder">How to Install the certificate on Windows</a></li><li><a href="" title="Sorry, just a placeholder">How to Install the certificate on Mac OS X</a></li></ul><div style="display: flex;justify-content: center;align-items: center;"><a href="https://play.google.com/store/apps/details?id=io.databox.app" target="_top" style="margin-top: 5px; margin-right: 20px;"><img alt="Get it on Google Play" height="60" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"></a><a href="https://itunes.apple.com/us/app/databox-controller/id1295071825?mt=8" target="_top" style="display:inline-block;overflow:hidden;background:url(//linkmaker.itunes.apple.com/assets/shared/badges/en-us/appstore-lrg.svg) no-repeat;width:135px;height:40px;background-size:contain;"></a></div></div></section><section class="mdc-card__actions" style="align-self: flex-end;"><a class="mdc-button mdc-card__action" href="/cert.pem">Download Certificate</a><a class="mdc-button mdc-card__action" id="secure_link" href="">Secure Website</a></section></div></div></div></main><script>var link = document.getElementById('secure_link');
+}</style><script src="js/material-components-web.min.js" defer></script></head><body style="background: #EEE"><header class="mdc-toolbar mdc-toolbar--fixed mdc-toolbar--fixed mdc-theme--dark"><div class="mdc-toolbar__row"><section class="mdc-toolbar__section mdc-toolbar__section--align-start"><span class="mdc-toolbar__title">Databox</span></section></div></header><main class="mdc-toolbar-fixed-adjust mdc-typography" id="content"><div class="mdc-layout-grid"><div class="mdc-layout-grid__inner"><div class="mdc-layout-grid__cell--span-2-desktop"></div><div class="mdc-card mdc-layout-grid__cell mdc-layout-grid__cell--span-8" style="background: #FFF"><section class="mdc-card__primary qrdiv"><div><h2>Welcome to Databox</h2><div>Databox lets you take control of your personal data and IoT devices.</div><div style="background: #EE9;margin: 16px 0;padding: 8px;display: flex;align-items: center;"><span class="material-icons" style="padding: 4px 12px; color: #990">warning</span>In order to use Databox securely, we ask that you install the certificate for this site</div><ul><li><a href="" title="Sorry, just a placeholder">How to Install the certificate on Windows</a></li><li><a href="" title="Sorry, just a placeholder">How to Install the certificate on Mac OS X</a></li></ul><div style="display: flex;justify-content: center;align-items: center;"><a href="https://play.google.com/store/apps/details?id=io.databox.app" target="_top" style="margin-top: 5px; margin-right: 20px"><img alt="Get it on Google Play" height="60" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"></a><a href="https://itunes.apple.com/us/app/databox-controller/id1295071825?mt=8" target="_top" style="display:inline-block;overflow:hidden;background:url(//linkmaker.itunes.apple.com/assets/shared/badges/en-us/appstore-lrg.svg) no-repeat;width:135px;height:40px;background-size:contain;"></a></div></div></section><section class="mdc-card__actions" style="align-self: flex-end"><a class="mdc-button mdc-card__action" href="/cert.pem">Download Certificate</a><a class="mdc-button mdc-card__action" id="secure_link" href="">Secure Website</a></section></div></div></div></main><script>var link = document.getElementById('secure_link');
 link.href = "https://" + document.location.hostname</script></body></html>