diff --git a/src/app/app.component.html b/src/app/app.component.html
index 0f4ca0b..afabe32 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,58 +1,17 @@
-
-
-
-
- Wohnzimmer
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Esszimmer
-
-
-
-
-
-
- |
-
-
- |
-
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{room.room}}
+
+
+
+
+
+
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 7b0f672..ed4f5ee 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,10 +1,72 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { MqttclientService } from './mqttclient.service'
@Component({
selector: 'app-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.css']
})
-export class AppComponent {
+export class AppComponent implements OnInit {
title = 'app';
+ private topic : string = 'smartclient/configuration'
+ configuration : any = {
+ 'switches': [
+ {
+ 'room': 'Wohnzimmer',
+ 'switches': [
+ {
+ 'label': 'kleine Lampe',
+ 'topic': 'dispatcher_ng/items/Gnd/LivingRoom/SmallLight'
+ },
+ {
+ 'label': 'große Lampe',
+ 'topic': 'dispatcher_ng/items/Gnd/LivingRoom/LargeLight'
+ },
+ {
+ 'label': 'Sterne',
+ 'topic': 'dispatcher_ng/items/Gnd/LivingRoom/Stars'
+ },
+ {
+ 'label': 'Stehlampe',
+ 'topic': 'dispatcher_ng/items/Gnd/LivingRoom/StandLight'
+ }
+ ]
+ },
+ {
+ 'room': 'Esszimmer',
+ 'switches': [
+ {
+ 'label': 'kleine Lampe',
+ 'topic': 'dispatcher_ng/items/Gnd/DiningRoom/SmallLight'
+ },
+ {
+ 'label': 'Stehlampe',
+ 'topic': 'dispatcher_ng/items/Gnd/DiningRoom/StandLight'
+ },
+ {
+ 'label': 'Schranklicht',
+ 'topic': 'dispatcher_ng/items/Gnd/DiningRoom/CupboardLight'
+ },
+ {
+ 'label': 'Naehkaestchenlicht',
+ 'topic': 'dispatcher_ng/items/Gnd/DiningRoom/NaehkaestchenLight'
+ },
+ {
+ 'label': 'Regallicht',
+ 'topic': 'dispatcher_ng/items/Gnd/DiningRoom/ShelfLight'
+ }
+ ]
+ }
+ ]
+
+ }
+
+ constructor(private mqttclientService : MqttclientService) {
+ }
+
+ ngOnInit() {
+ this.mqttclientService.register(this.topic, (message: string) => {
+ })
+ }
+
}
diff --git a/src/app/led-button-group2/led-button-group2.component.ts b/src/app/led-button-group2/led-button-group2.component.ts
index ce807f9..acb0cca 100644
--- a/src/app/led-button-group2/led-button-group2.component.ts
+++ b/src/app/led-button-group2/led-button-group2.component.ts
@@ -25,7 +25,7 @@ export class LedButtonGroup2Component implements OnInit {
ngOnInit() {
this.actionTopic = this.topicPre + '/state'
- this.feedbackTopic = this.topicPre + '/feedback'
+ this.feedbackTopic = this.topicPre + '/state/feedback'
}
diff --git a/src/app/mqttclient.service.ts b/src/app/mqttclient.service.ts
index 72b8b1f..169584e 100644
--- a/src/app/mqttclient.service.ts
+++ b/src/app/mqttclient.service.ts
@@ -9,7 +9,7 @@ export class MqttclientService {
private callbacks : Map = new Map()
constructor() {
- this.mqttClient = Mqtt.connect('ws://localhost:9001')
+ this.mqttClient = Mqtt.connect('ws://mqttbroker:9001')
this.mqttClient.on('connect', () => {
console.log('MQTT connected')
this.callbacks.forEach((value: callbackFunc, key: string) => {