From e8ec4001ce1297d5a3db6d3fc8af8de47daa6a61 Mon Sep 17 00:00:00 2001 From: Trygve Laugstøl Date: Sun, 25 Oct 2015 00:33:41 +0200 Subject: wip --- web/static/app/DillerRpc.js | 43 +++++++++++++++++++ web/static/app/app.css | 3 ++ web/static/app/app.js | 72 ++++++++++++++++++++++++++++++++ web/static/app/templates/device.html | 34 +++++++++++++++ web/static/app/templates/front-page.html | 23 ++++++++++ web/static/app/templates/property.html | 42 +++++++++++++++++++ 6 files changed, 217 insertions(+) create mode 100644 web/static/app/DillerRpc.js create mode 100644 web/static/app/app.css create mode 100644 web/static/app/app.js create mode 100644 web/static/app/templates/device.html create mode 100644 web/static/app/templates/front-page.html create mode 100644 web/static/app/templates/property.html (limited to 'web/static') diff --git a/web/static/app/DillerRpc.js b/web/static/app/DillerRpc.js new file mode 100644 index 0000000..de90aee --- /dev/null +++ b/web/static/app/DillerRpc.js @@ -0,0 +1,43 @@ +function DillerRpc($http, DillerConfig) { + var baseUrl = DillerConfig.baseUrl; + + function getDevices() { + var req = {}; + req.method = 'get'; + req.url = baseUrl + '/api/device'; + return $http(req); + } + + function getDevice(deviceId) { + var req = {}; + req.method = 'get'; + req.url = baseUrl + '/api/device/:deviceId'; + req.url = req.url.replace(/:deviceId/, deviceId); + return $http(req); + } + + function getValues(propertyId) { + var req = {}; + req.method = 'get'; + req.url = baseUrl + '/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/static/app/app.css b/web/static/app/app.css new file mode 100644 index 0000000..090ac5e --- /dev/null +++ b/web/static/app/app.css @@ -0,0 +1,3 @@ +nav.navbar { + margin-bottom: 2rem; +} diff --git a/web/static/app/app.js b/web/static/app/app.js new file mode 100644 index 0000000..5274362 --- /dev/null +++ b/web/static/app/app.js @@ -0,0 +1,72 @@ +(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); + } + + function DillerConfig() { + var head = document.getElementsByTagName('head')[0]; + var base = head.getElementsByTagName('base')[0]; + console.log('base =', base); + var baseUrl = base.href.replace(/\/$/, ''); + console.log('baseUrl =', baseUrl); + return { + baseUrl: baseUrl + }; + } + + angular + .module('Diller', ['ngRoute']) + .config(config) + .service('DillerConfig', DillerConfig) + .service('DillerRpc', DillerRpc); +})(); diff --git a/web/static/app/templates/device.html b/web/static/app/templates/device.html new file mode 100644 index 0000000..b466fdc --- /dev/null +++ b/web/static/app/templates/device.html @@ -0,0 +1,34 @@ +
+ +

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

+ + + +

Properties

+ + + + + + + + + + + + + + +
RegisteredKey
+ {{p.created_timestamp | date:'medium'}} + + {{p.key}} +
+
diff --git a/web/static/app/templates/front-page.html b/web/static/app/templates/front-page.html new file mode 100644 index 0000000..68026c3 --- /dev/null +++ b/web/static/app/templates/front-page.html @@ -0,0 +1,23 @@ +
+ +

Devices

+ + + + + + + + + + + + + + +
RegisteredKey
+ {{d.created_timestamp | date:'medium'}} + + {{d.key}} +
+
diff --git a/web/static/app/templates/property.html b/web/static/app/templates/property.html new file mode 100644 index 0000000..5f925e7 --- /dev/null +++ b/web/static/app/templates/property.html @@ -0,0 +1,42 @@ +
+ +

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

+ +

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

+ + + +

Latest Values

+ + + + + + + + + + + + + + + + + + + + +
TimestampValue
{{v.timestamp | date:'medium'}}{{v.value}}
{{v.timestamp | date:'medium'}}{{v.value}}
+ +
-- cgit v1.2.3