From bca55db513999af74563edd3a8022493a08f1dd8 Mon Sep 17 00:00:00 2001
From: LKuemmel <lena.kuemmel@openwb.de>
Date: Wed, 25 May 2022 16:13:31 +0200
Subject: [PATCH] use url for json and http

---
 src/components/devices/http/device.vue | 33 ++++++--------------------
 src/components/devices/json/device.vue |  4 ++--
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/src/components/devices/http/device.vue b/src/components/devices/http/device.vue
index 1d1af79d..cfc63d01 100644
--- a/src/components/devices/http/device.vue
+++ b/src/components/devices/http/device.vue
@@ -4,40 +4,21 @@
 			Einstellungen für Http
 			<span class="small">(Modul: {{ $options.name }})</span>
 		</openwb-base-heading>
-		<openwb-base-select-input
-			title="Protokoll"
-			:options="[
-				{ value: 'http', text: 'Unverschlüsselt (http://)' },
-				{ value: 'https', text: 'Verschlüsselt (https://)' },
-			]"
-			:model-value="configuration.protocol"
-			@update:model-value="
-				updateConfiguration($event, 'configuration.protocol')
-			"
-		/>
 		<openwb-base-text-input
-			title="IP oder Hostname"
+			title="URL"
 			subtype="host"
 			required
-			:model-value="configuration.domain"
-			@update:model-value="
-				updateConfiguration($event, 'configuration.domain')
-			"
-		/>
-		<openwb-base-number-input
-			title="Port"
-			:min="1"
-			:max="65535"
-			:model-value="configuration.port"
+			:model-value="configuration.url"
 			@update:model-value="
-				updateConfiguration($event, 'configuration.port')
+				updateConfiguration($event, 'configuration.url')
 			"
 		>
 			<template #help>
-				Diese Angabe ist optional. Ist kein Port angegeben, so wird je
-				nach Protokoll der Standardport genutzt.
+				Es wird eine komplette URL erwartet mit Angaben zum Protokoll,
+				IP oder Hostnamen, optional einem Port und einem Pfad.<br />
+				Beispiel: "http://192.168.1.1:8080/json?data=1"
 			</template>
-		</openwb-base-number-input>
+		</openwb-base-text-input>
 	</div>
 </template>
 
diff --git a/src/components/devices/json/device.vue b/src/components/devices/json/device.vue
index 74152853..5b2514ad 100644
--- a/src/components/devices/json/device.vue
+++ b/src/components/devices/json/device.vue
@@ -8,9 +8,9 @@
 			title="URL"
 			subtype="host"
 			required
-			:model-value="configuration.ip_address"
+			:model-value="configuration.url"
 			@update:model-value="
-				updateConfiguration($event, 'configuration.ip_address')
+				updateConfiguration($event, 'configuration.url')
 			"
 		>
 			<template #help>