From e5cbeb89907a0fe43b31577295954211a2d73613 Mon Sep 17 00:00:00 2001 From: Thomas Basler Date: Mon, 14 Nov 2022 20:50:29 +0100 Subject: [PATCH] webapp: coding style changes --- .../src/components/LimitSettingsCurrent.vue | 2 +- webapp/src/types/DevInfoStatus.ts | 16 ++--- webapp/src/types/DtuConfig.ts | 6 +- webapp/src/types/EventlogStatus.ts | 12 ++-- webapp/src/types/LimitConfig.ts | 6 +- webapp/src/types/LimitStatus.ts | 6 +- webapp/src/types/LiveDataStatus.ts | 58 +++++++++---------- webapp/src/types/MqttConfig.ts | 36 ++++++------ webapp/src/types/MqttStatus.ts | 30 +++++----- webapp/src/types/NetworkStatus.ts | 32 +++++----- webapp/src/types/NetworkkConfig.ts | 18 +++--- webapp/src/types/NtpConfig.ts | 6 +- webapp/src/types/NtpStatus.ts | 8 +-- webapp/src/types/SecurityConfig.ts | 2 +- webapp/src/types/SystemStatus.ts | 46 +++++++-------- 15 files changed, 142 insertions(+), 142 deletions(-) diff --git a/webapp/src/components/LimitSettingsCurrent.vue b/webapp/src/components/LimitSettingsCurrent.vue index 24ced63..617d106 100644 --- a/webapp/src/components/LimitSettingsCurrent.vue +++ b/webapp/src/components/LimitSettingsCurrent.vue @@ -14,7 +14,7 @@ import { defineComponent } from 'vue'; import { formatNumber } from '@/utils'; declare interface LimitData { - limit: number, + limit: number; } export default defineComponent({ diff --git a/webapp/src/types/DevInfoStatus.ts b/webapp/src/types/DevInfoStatus.ts index e42b5fb..a60d538 100644 --- a/webapp/src/types/DevInfoStatus.ts +++ b/webapp/src/types/DevInfoStatus.ts @@ -1,10 +1,10 @@ export interface DevInfoStatus { - valid_data: boolean, - fw_bootloader_version: number, - fw_build_version: number, - fw_build_datetime: Date, - hw_part_number: number, - hw_version: number, - hw_model_name: string, - max_power: number, + valid_data: boolean; + fw_bootloader_version: number; + fw_build_version: number; + fw_build_datetime: Date; + hw_part_number: number; + hw_version: number; + hw_model_name: string; + max_power: number; } \ No newline at end of file diff --git a/webapp/src/types/DtuConfig.ts b/webapp/src/types/DtuConfig.ts index 5f05bf1..51e45fa 100644 --- a/webapp/src/types/DtuConfig.ts +++ b/webapp/src/types/DtuConfig.ts @@ -1,5 +1,5 @@ export interface DtuConfig { - dtu_serial: number, - dtu_pollinterval: number, - dtu_palevel: number + dtu_serial: number; + dtu_pollinterval: number; + dtu_palevel: number; } \ No newline at end of file diff --git a/webapp/src/types/EventlogStatus.ts b/webapp/src/types/EventlogStatus.ts index 19f35bf..5db8d11 100644 --- a/webapp/src/types/EventlogStatus.ts +++ b/webapp/src/types/EventlogStatus.ts @@ -1,11 +1,11 @@ export interface EventlogItem { - message_id: number, - message: string, - start_time: number, - end_time: number + message_id: number; + message: string; + start_time: number; + end_time: number; } export interface EventlogItems { - count: number, - events: Array, + count: number; + events: Array; } \ No newline at end of file diff --git a/webapp/src/types/LimitConfig.ts b/webapp/src/types/LimitConfig.ts index 4d811be..d311ca6 100644 --- a/webapp/src/types/LimitConfig.ts +++ b/webapp/src/types/LimitConfig.ts @@ -1,5 +1,5 @@ export interface LimitConfig { - serial: number, - limit_value: number, - limit_type: number + serial: number; + limit_value: number; + limit_type: number; } \ No newline at end of file diff --git a/webapp/src/types/LimitStatus.ts b/webapp/src/types/LimitStatus.ts index 48d797e..286ce3c 100644 --- a/webapp/src/types/LimitStatus.ts +++ b/webapp/src/types/LimitStatus.ts @@ -1,5 +1,5 @@ export interface LimitStatus { - limit_relative: number, - max_power: number, - limit_set_status: string, + limit_relative: number; + max_power: number; + limit_set_status: string; } \ No newline at end of file diff --git a/webapp/src/types/LiveDataStatus.ts b/webapp/src/types/LiveDataStatus.ts index d8189e9..0fa6afb 100644 --- a/webapp/src/types/LiveDataStatus.ts +++ b/webapp/src/types/LiveDataStatus.ts @@ -1,43 +1,43 @@ export interface ValueObject { - v: number, // value - u: string, // unit - d: number, // digits + v: number; // value + u: string; // unit + d: number; // digits }; export interface InverterStatistics { - Power?: ValueObject, - Voltage?: ValueObject, - Current?: ValueObject, - "Power DC"?: ValueObject, - YieldDay?: ValueObject, - YieldTotal?: ValueObject, - Frequency?: ValueObject, - Temperature?: ValueObject, - PowerFactor?: ValueObject, - ReactivePower?: ValueObject, - Efficiency?: ValueObject, - Irradiation?: ValueObject, + Power?: ValueObject; + Voltage?: ValueObject; + Current?: ValueObject; + "Power DC"?: ValueObject; + YieldDay?: ValueObject; + YieldTotal?: ValueObject; + Frequency?: ValueObject; + Temperature?: ValueObject; + PowerFactor?: ValueObject; + ReactivePower?: ValueObject; + Efficiency?: ValueObject; + Irradiation?: ValueObject; } export interface Inverter { - serial: number, - name: string, - data_age: number, - reachable: boolean, - producing: boolean, - limit_relative: number, - limit_absolute: number, - events: number, - [key: number]: InverterStatistics, + serial: number; + name: string; + data_age: number; + reachable: boolean; + producing: boolean; + limit_relative: number; + limit_absolute: number; + events: number; + [key: number]: InverterStatistics; }; export interface Total { - Power: ValueObject, - YieldDay: ValueObject, - YieldTotal: ValueObject, + Power: ValueObject; + YieldDay: ValueObject; + YieldTotal: ValueObject; }; export interface LiveData { - inverters: Inverter[], - total: Total, + inverters: Inverter[]; + total: Total; } \ No newline at end of file diff --git a/webapp/src/types/MqttConfig.ts b/webapp/src/types/MqttConfig.ts index 02619dd..8077ae7 100644 --- a/webapp/src/types/MqttConfig.ts +++ b/webapp/src/types/MqttConfig.ts @@ -1,20 +1,20 @@ export interface MqttConfig { - mqtt_enabled: boolean, - mqtt_hostname: string, - mqtt_port: number, - mqtt_username: string, - mqtt_password: string, - mqtt_topic: string, - mqtt_publish_interval: number, - mqtt_retain: boolean, - mqtt_tls: boolean, - mqtt_root_ca_cert: string, - mqtt_lwt_topic: string, - mqtt_lwt_online: string, - mqtt_lwt_offline: string, - mqtt_hass_enabled: boolean, - mqtt_hass_expire: boolean, - mqtt_hass_retain: boolean, - mqtt_hass_topic: string, - mqtt_hass_individualpanels: boolean + mqtt_enabled: boolean; + mqtt_hostname: string; + mqtt_port: number; + mqtt_username: string; + mqtt_password: string; + mqtt_topic: string; + mqtt_publish_interval: number; + mqtt_retain: boolean; + mqtt_tls: boolean; + mqtt_root_ca_cert: string; + mqtt_lwt_topic: string; + mqtt_lwt_online: string; + mqtt_lwt_offline: string; + mqtt_hass_enabled: boolean; + mqtt_hass_expire: boolean; + mqtt_hass_retain: boolean; + mqtt_hass_topic: string; + mqtt_hass_individualpanels: boolean; } \ No newline at end of file diff --git a/webapp/src/types/MqttStatus.ts b/webapp/src/types/MqttStatus.ts index f8bc2ce..fe046ed 100644 --- a/webapp/src/types/MqttStatus.ts +++ b/webapp/src/types/MqttStatus.ts @@ -1,17 +1,17 @@ export interface MqttStatus { - mqtt_enabled: boolean, - mqtt_hostname: string, - mqtt_port: number, - mqtt_username: string, - mqtt_topic: string, - mqtt_publish_interval: number, - mqtt_retain: boolean, - mqtt_tls: boolean, - mqtt_root_ca_cert_info: string, - mqtt_connected: boolean, - mqtt_hass_enabled: boolean, - mqtt_hass_expire: boolean, - mqtt_hass_retain: boolean, - mqtt_hass_topic: string, - mqtt_hass_individualpanels: boolean + mqtt_enabled: boolean; + mqtt_hostname: string; + mqtt_port: number; + mqtt_username: string; + mqtt_topic: string; + mqtt_publish_interval: number; + mqtt_retain: boolean; + mqtt_tls: boolean; + mqtt_root_ca_cert_info: string; + mqtt_connected: boolean; + mqtt_hass_enabled: boolean; + mqtt_hass_expire: boolean; + mqtt_hass_retain: boolean; + mqtt_hass_topic: string; + mqtt_hass_individualpanels: boolean; } \ No newline at end of file diff --git a/webapp/src/types/NetworkStatus.ts b/webapp/src/types/NetworkStatus.ts index 01f7fe2..c10c4a0 100644 --- a/webapp/src/types/NetworkStatus.ts +++ b/webapp/src/types/NetworkStatus.ts @@ -1,22 +1,22 @@ export interface NetworkStatus { // WifiStationInfo - sta_status: boolean, - sta_ssid: string, - sta_rssi: number, + sta_status: boolean; + sta_ssid: string; + sta_rssi: number; // WifiApInfo - ap_status: boolean, - ap_ssid: string, - ap_stationnum: number, + ap_status: boolean; + ap_ssid: string; + ap_stationnum: number; // InterfaceNetworkInfo - network_hostname: string, - network_ip: string, - network_netmask: string, - network_gateway: string, - network_dns1: string, - network_dns2: string, - network_mac: string, - network_mode: string, + network_hostname: string; + network_ip: string; + network_netmask: string; + network_gateway: string; + network_dns1: string; + network_dns2: string; + network_mac: string; + network_mode: string; // InterfaceApInfo - ap_ip: string, - ap_mac: string, + ap_ip: string; + ap_mac: string; } \ No newline at end of file diff --git a/webapp/src/types/NetworkkConfig.ts b/webapp/src/types/NetworkkConfig.ts index 0c79d6a..51f6a46 100644 --- a/webapp/src/types/NetworkkConfig.ts +++ b/webapp/src/types/NetworkkConfig.ts @@ -1,11 +1,11 @@ export interface NetworkConfig { - ssid: string, - password: string, - hostname: string, - dhcp: boolean, - ipaddress: string, - netmask: string, - gateway: string, - dns1: string, - dns2: string + ssid: string; + password: string; + hostname: string; + dhcp: boolean; + ipaddress: string; + netmask: string; + gateway: string; + dns1: string; + dns2: string; } \ No newline at end of file diff --git a/webapp/src/types/NtpConfig.ts b/webapp/src/types/NtpConfig.ts index 24176cf..38fd55c 100644 --- a/webapp/src/types/NtpConfig.ts +++ b/webapp/src/types/NtpConfig.ts @@ -1,5 +1,5 @@ export interface NtpConfig { - ntp_server: string, - ntp_timezone: string, - ntp_timezone_descr: string + ntp_server: string; + ntp_timezone: string; + ntp_timezone_descr: string; } \ No newline at end of file diff --git a/webapp/src/types/NtpStatus.ts b/webapp/src/types/NtpStatus.ts index fd4c56f..29b2d4a 100644 --- a/webapp/src/types/NtpStatus.ts +++ b/webapp/src/types/NtpStatus.ts @@ -1,7 +1,7 @@ export interface NtpStatus { - ntp_server: string, - ntp_timezone: string, + ntp_server: string; + ntp_timezone: string; ntp_timezone_descr: string - ntp_status: boolean, - ntp_localtime: string + ntp_status: boolean; + ntp_localtime: string; } \ No newline at end of file diff --git a/webapp/src/types/SecurityConfig.ts b/webapp/src/types/SecurityConfig.ts index ca1f721..83ad8ae 100644 --- a/webapp/src/types/SecurityConfig.ts +++ b/webapp/src/types/SecurityConfig.ts @@ -1,3 +1,3 @@ export interface SecurityConfig { - password: string + password: string; } \ No newline at end of file diff --git a/webapp/src/types/SystemStatus.ts b/webapp/src/types/SystemStatus.ts index e31eff4..9e6728e 100644 --- a/webapp/src/types/SystemStatus.ts +++ b/webapp/src/types/SystemStatus.ts @@ -1,29 +1,29 @@ export interface SystemStatus { // HardwareInfo - chipmodel: string, - chiprevision: number, - chipcores: number, - cpufreq: number, + chipmodel: string; + chiprevision: number; + chipcores: number; + cpufreq: number; // FirmwareInfo - hostname: string, - sdkversion: string, - config_version: string, - git_hash: string, - resetreason_0: string, - resetreason_1: string, - cfgsavecount: number, - uptime: number, - update_text: string, - update_url: string, - update_status: string, + hostname: string; + sdkversion: string; + config_version: string; + git_hash: string; + resetreason_0: string; + resetreason_1: string; + cfgsavecount: number; + uptime: number; + update_text: string; + update_url: string; + update_status: string; // MemoryInfo - heap_total: number, - heap_used: number, - littlefs_total: number, - littlefs_used: number, - sketch_total: number, - sketch_used: number, + heap_total: number; + heap_used: number; + littlefs_total: number; + littlefs_used: number; + sketch_total: number; + sketch_used: number; // RadioInfo - radio_connected: boolean, - radio_pvariant: boolean, + radio_connected: boolean; + radio_pvariant: boolean; } \ No newline at end of file