Move status.js to src/scripts

cwilling · cwilling · commit 59bd8524aa13 · 2017-08-29T23:28:19.000+10:00
diff --git a/Makefile b/Makefile
@@ -16,6 +16,9 @@ SERVER_FILES = \
 	src/scripts/modules/sensorLister.js \
 	src/scripts/modules/server.js
 
+CLIENT_FILES = \
+	src/scripts/status.js \
+
 TEST_FILES = test-status.js \
 		src/scripts/modules/jsogpio.js \
 		src/scripts/modules/cpuinfo.js \
@@ -64,7 +67,7 @@ default.conf:	default.conf.in
 node_modules:
 	npm install
 
-client: node_modules
+client: node_modules $(CLIENT_FILES)
 	./node_modules/.bin/rollup --config client.config.js
 	touch client
 
diff --git a/client.config.js b/client.config.js
@@ -15,7 +15,7 @@ import cssnext from 'postcss-cssnext';
 import cssnano from 'cssnano';
 
 export default {
-  entry: 'status.js',
+  entry: 'src/scripts/status.js',
   targets: [
     { dest: 'build/js/brewableclientbundle.js', format: 'iife' },
   ],
diff --git a/src/scripts/brewable.js b/src/scripts/brewable.js
diff --git a/src/scripts/modules/gpioworker.js b/src/scripts/modules/gpioworker.js
@@ -164,6 +164,13 @@ gpioWorker.prototype.sensorDevices = function () {
   for (var z=0;z<sensorList.length;z++) {
     deviceList.push(new sensordevice(sensorList[z]));
   }
+
+  // Sort the device list by (slightly mangled) id's
+  deviceList.sort(function(a, b) {
+    var aval = parseInt(a.id.substr(0,a.id.search("-")),16) + parseInt(a.id.substr(a.id.search("-") + 1),16);
+    var bval = parseInt(b.id.substr(0,b.id.search("-")),16) + parseInt(b.id.substr(b.id.search("-") + 1),16);
+    return aval - bval;
+  });
   return deviceList;
 };
 
diff --git a/src/scripts/modules/sensorLister.js b/src/scripts/modules/sensorLister.js
@@ -1,4 +1,4 @@
-var fs =require('fs');
+import fs from "fs";
 
 // Return a list of sensor devices
 export default function sensors() {
diff --git a/src/scripts/status.js b/src/scripts/status.js
@@ -1,5 +1,5 @@
 // Import styles (automatically injected into <head>).
-import "./styles/brewable.css";
+import "../../styles/brewable.css";
 
 import { select, selectAll, event, mouse } from "d3-selection";
 import { max, min } from "d3-array";

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-var fs =require('fs');`
	`1`	`+import fs from "fs";`
`2`	`2`
`3`	`3`	`// Return a list of sensor devices`
`4`	`4`	`export default function sensors() {`