1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-30 00:00:13 +01:00

Update offline data

This commit is contained in:
Markus Grigull 2016-07-27 18:08:31 +02:00
parent 16fef1ae47
commit df63a68b4b
4 changed files with 25 additions and 5 deletions

View file

@ -8,6 +8,16 @@ export default Ember.Route.extend({
id: 'S1_ElectricalGrid',
isPattern: false,
type: ''
},
{
id: 'S2_ElectricalGrid',
isPattern: false,
type: ''
},
{
id: 'S3_ElectricalGrid',
isPattern: false,
type: ''
}
]});
//return this.store.findAll('entity');
@ -27,6 +37,16 @@ export default Ember.Route.extend({
id: 'S1_ElectricalGrid',
isPattern: false,
type: ''
},
{
id: 'S2_ElectricalGrid',
isPattern: false,
type: ''
},
{
id: 'S3_ElectricalGrid',
isPattern: false,
type: ''
}
]});
//this.store.findAll('entity');

View file

@ -4,7 +4,7 @@ module.exports = function(environment) {
/*********************************
* This variable must be set to the address the server should be available on.
*/
var hostAddress = 'localhost';
var hostAddress = process.env.HOST_ADDRESS || 'localhost';
/*
*
*********************************/
@ -47,8 +47,6 @@ module.exports = function(environment) {
// ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
// ENV.APP.LOG_VIEW_LOOKUPS = true;
hostAddress = '192.168.99.100'; // docker-machine ip address (only when using docker on a mac)
ENV.contentSecurityPolicy['script-src'] += " " + hostAddress + ":80";
ENV.contentSecurityPolicy['connect-src'] += " ws://" + hostAddress + ":49152";
}

View file

@ -21,4 +21,4 @@ playback:
image: acs/playback
links:
- orion
command: orion:1026 m1_S1_ElectricalGrid_data.txt
command: orion:1026 m1_S1_ElectricalGrid_data.txt 200 3

View file

@ -10,6 +10,8 @@ nginx:
- "80:80"
ember:
environment:
HOST_ADDRESS: 'localhost'
image: danlynn/ember-cli
volumes:
- ./:/myapp/
@ -29,4 +31,4 @@ playback:
image: acs/playback
links:
- orion
command: orion:1026 m1_S1_ElectricalGrid_data.txt
command: orion:1026 m1_S1_ElectricalGrid_data.txt 200 3