more fix

consumerWebsite/views/sensor-data.ejs

@@ -1,41 +1,39 @@
 <%- include('top') %>
 
-<style>
-	#sensorDataList{
-		padding-top: 2.5em;
-	}
-</style>
+	<style>
+		#sensorDataList {
+			padding-top: 2.5em;
+		}
+	</style>
 
-<ul id="sensorDataList">
-	<li jq-repeat='sensorData'>
-		rowid: {{ id }}
-		sensorId: {{ sensorid }}
-		created: {{ createdAt }}
-		location: {{ locationid }}
-		<br/ >
-		co: {{ measurement.co }}
-		humidity: {{ measurement.humidity }}
-		no2: {{ measurement.no2 }}
-		o3: {{ measurement.o3 }}
-		psi: {{ measurement.psi }}
-		so2: {{ measurement.so2 }}
-		temperature: {{ measurement.temperature }}
-		windspeed: {{ measurement.windspeed }}
-		<hr />
-	</li>
-	<li jq-repeat-defualt='sensorData'>
-		Loading...
-	</li>
-</ul>
+	<ul id="sensorDataList">
+		<li jq-repeat='sensorData'>
+			rowid: {{ id }}
+			sensorId: {{ sensorid }}
+			created: {{ createdAt }}
+			location: {{ locationid }}
+			<br />
+			co: {{ measurement.co }}
+			humidity: {{ measurement.humidity }}
+			no2: {{ measurement.no2 }}
+			o3: {{ measurement.o3 }}
+			psi: {{ measurement.psi }}
+			so2: {{ measurement.so2 }}
+			temperature: {{ measurement.temperature }}
+			windspeed: {{ measurement.windspeed }}
+			<hr />
+		</li>
+		<li jq-repeat-defualt='sensorData'>
+			Loading...
+		</li>
+	</ul>
 
-<script type="text/javascript">
-	$(document).ready(async function(){
-		$.scope.sensorData.push(...await app.api.get('sensor-data/data?order=DESC&limit=40'));
+	<script type="text/javascript">
+		$(document).ready(async function () {
+			app.api.get('sensor-data/data?order=DESC&limit=40', function(error, data){
+            $.scope.sensorData.push(...data);
+        })
+		})
 
-		app.socket.on('sensordata:new', function(data){
-			$.scope.sensorData.unshift(data);
-		});
-	})
-
-</script>
-<%- include('bot') %>
+	</script>
+	<%- include('bot') %>

consumerWebsite/views/top.ejs

@@ -128,6 +128,3 @@
 			</div>
 		</div>
 	</nav>
-</body>
-
-</html>