From 0266bdd60cb9cccf20a5ded3eba72ea833bee72d Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Tue, 20 Oct 2015 23:18:16 +0200 Subject: o Adding a webapp. o Using di.js as dependency injection framework. --- web/app/DillerRpc.js | 41 ++++++++++++++++++++++++++ web/app/app.js | 60 +++++++++++++++++++++++++++++++++++++++ web/app/templates/device.html | 21 ++++++++++++++ web/app/templates/front-page.html | 24 ++++++++++++++++ web/app/templates/property.html | 36 +++++++++++++++++++++++ web/index.html | 24 ++++++++++++++++ 6 files changed, 206 insertions(+) create mode 100644 web/app/DillerRpc.js create mode 100644 web/app/app.js create mode 100644 web/app/templates/device.html create mode 100644 web/app/templates/front-page.html create mode 100644 web/app/templates/property.html create mode 100644 web/index.html (limited to 'web') diff --git a/web/app/DillerRpc.js b/web/app/DillerRpc.js new file mode 100644 index 0000000..a0c20fb --- /dev/null +++ b/web/app/DillerRpc.js @@ -0,0 +1,41 @@ +function DillerRpc($http) { + function getDevices() { + var req = {}; + req.method = 'get'; + req.url = '/api/device'; + return $http(req); + } + + function getDevice(deviceId) { + var req = {}; + req.method = 'get'; + req.url = '/api/device/:deviceId'; + req.url = req.url.replace(/:deviceId/, deviceId); + return $http(req); + } + + function getValues(propertyId) { + var req = {}; + req.method = 'get'; + req.url = '/api/property/:propertyId/values'; + req.url = req.url.replace(/:propertyId/, propertyId); + return $http(req); + } + + return { + getDevices: getDevices, + getDevice: getDevice, + getValues: getValues + }; +} + +DillerRpcResolve = {}; +DillerRpcResolve.getDevices = function(DillerRpc) { + return DillerRpc.getDevices(); +}; +DillerRpcResolve.getDevice = function(DillerRpc, $route) { + return DillerRpc.getDevice($route.current.params.deviceId); +}; +DillerRpcResolve.getValues = function(DillerRpc, $route) { + return DillerRpc.getValues($route.current.params.propertyId); +}; diff --git a/web/app/app.js b/web/app/app.js new file mode 100644 index 0000000..cd14ae5 --- /dev/null +++ b/web/app/app.js @@ -0,0 +1,60 @@ +(function () { + function FrontPageController(devices) { + var ctrl = this; + + ctrl.devices = devices.data.devices; + } + + function DeviceController(device) { + var ctrl = this; + + ctrl.device = device.data.device; + } + + function PropertyController($route, device, values) { + var ctrl = this; + + ctrl.device = device.data.device; + ctrl.property = _.find(ctrl.device.properties, {id: $route.current.params.propertyId}); + ctrl.values = values.data.values; + } + + function config($routeProvider, $locationProvider) { + $routeProvider + .when('/', { + controller: FrontPageController, + controllerAs: 'ctrl', + templateUrl: '/app/templates/front-page.html', + resolve: { + devices: DillerRpcResolve.getDevices + } + }) + .when('/device/:deviceId', { + controller: DeviceController, + controllerAs: 'ctrl', + templateUrl: '/app/templates/device.html', + resolve: { + device: DillerRpcResolve.getDevice + } + }) + .when('/device/:deviceId/property/:propertyId', { + controller: PropertyController, + controllerAs: 'ctrl', + templateUrl: '/app/templates/property.html', + resolve: { + device: DillerRpcResolve.getDevice, + values: DillerRpcResolve.getValues + } + }) + .otherwise({ + redirectTo: '/' + }); + + //$locationProvider.html5Mode(true); + } + + angular + .module('Diller', ['ngRoute']) + .config(config) + .service('DillerRpc', DillerRpc); +})(); diff --git a/web/app/templates/device.html b/web/app/templates/device.html new file mode 100644 index 0000000..ae028b5 --- /dev/null +++ b/web/app/templates/device.html @@ -0,0 +1,21 @@ +
+ +

+ {{ctrl.device.key}} + device +

+ + + +

Properties

+ + +
diff --git a/web/app/templates/front-page.html b/web/app/templates/front-page.html new file mode 100644 index 0000000..1846dea --- /dev/null +++ b/web/app/templates/front-page.html @@ -0,0 +1,24 @@ +
+ +

+ Diller + All your sensor data are belong to us +

+ +

Devices

+ + + + + + + + + + + + +
Key
+ {{d.key}} +
+
diff --git a/web/app/templates/property.html b/web/app/templates/property.html new file mode 100644 index 0000000..65a66e8 --- /dev/null +++ b/web/app/templates/property.html @@ -0,0 +1,36 @@ +
+ +

+ {{ctrl.device.key}} + device +

+ +

+ {{ctrl.property.key}} + property +

+ + + +

Latest Values

+ + + + + + + + + + + + + + +
TimestampValue
{{v.timestamp | date:'medium'}}{{v.value}}
+ +
diff --git a/web/index.html b/web/index.html new file mode 100644 index 0000000..b591e55 --- /dev/null +++ b/web/index.html @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + +Loading Diller ... + + -- cgit v1.2.3