From 539e950c0015cf54433f66bc2feb8b3f5fa06d20 Mon Sep 17 00:00:00 2001 From: mntone <901816+mntone@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:43:08 +0900 Subject: [PATCH] Adds feat to show WebSocket status on OverlayController. --- public/locales/de.json | 2 + public/locales/en.json | 2 + public/locales/es-419.json | 2 + public/locales/es.json | 2 + public/locales/fr-CA.json | 2 + public/locales/fr.json | 2 + public/locales/it.json | 2 + public/locales/ja.json | 2 + public/locales/ko.json | 2 + public/locales/nl.json | 2 + public/locales/ru.json | 2 + public/locales/zh-CN.json | 2 + public/locales/zh-TW.json | 2 + src/app/App.css | 10 ---- src/app/App.tsx | 4 -- src/index.css | 17 +++++++ .../overlay/components/OverlayController.tsx | 15 ------ .../components/OverlayController/index.tsx | 48 +++++++++++++++++++ .../components/OverlayController/styles.css | 9 ++++ src/modules/overlay/messages.ts | 8 ++++ src/modules/settings/pages/DataSourcePage.tsx | 43 +++++++++-------- .../settings/pages/DevelopmentPage.tsx | 2 +- src/modules/settings/styles.css | 19 ++++---- .../telemetry/components/WebSocketStatus.tsx | 32 +++++++++++++ 24 files changed, 172 insertions(+), 61 deletions(-) delete mode 100644 src/modules/overlay/components/OverlayController.tsx create mode 100644 src/modules/overlay/components/OverlayController/index.tsx create mode 100644 src/modules/overlay/components/OverlayController/styles.css create mode 100644 src/modules/telemetry/components/WebSocketStatus.tsx diff --git a/public/locales/de.json b/public/locales/de.json index 1fc9f82..16b2d36 100644 --- a/public/locales/de.json +++ b/public/locales/de.json @@ -55,6 +55,8 @@ "Notification.webSocketConnected": "Mit WebSocket-Server verbunden", "Notification.webSocketDisconnected": "Verbindung zum WebSocket-Server fehlgeschlagen", + "overlay.connected": "Verbunden", + "overlay.notConnected": "Nicht verbunden", "overlay.noData": "Keine Daten", "overlay.hideOverlay": "Overlay Ausblenden", "overlay.showOverlay": "Overlay Anzeigen", diff --git a/public/locales/en.json b/public/locales/en.json index bc16780..f87174f 100644 --- a/public/locales/en.json +++ b/public/locales/en.json @@ -55,6 +55,8 @@ "Notification.webSocketConnected": "Connected to WebSocket Server", "Notification.webSocketDisconnected": "Failed to Connect to WebSocket Server", + "overlay.connected": "Connected", + "overlay.notConnected": "Not Connected", "overlay.noData": "No Data", "overlay.hideOverlay": "Hide Overlay", "overlay.showOverlay": "Show Overlay", diff --git a/public/locales/es-419.json b/public/locales/es-419.json index 4e25b42..07816e7 100644 --- a/public/locales/es-419.json +++ b/public/locales/es-419.json @@ -55,6 +55,8 @@ "Notification.webSocketConnected": "Conectado al servidor WebSocket", "Notification.webSocketDisconnected": "No se pudo conectar al servidor WebSocket", + "overlay.connected": "Conectado", + "overlay.notConnected": "No conectado", "overlay.noData": "Sin datos", "overlay.hideOverlay": "Cerrar superposición", "overlay.showOverlay": "Abrir superposición", diff --git a/public/locales/es.json b/public/locales/es.json index 8721be5..607a2d4 100644 --- a/public/locales/es.json +++ b/public/locales/es.json @@ -55,6 +55,8 @@ "Notification.webSocketConnected": "Conectado al servidor WebSocket", "Notification.webSocketDisconnected": "No se pudo conectar al servidor WebSocket", + "overlay.connected": "Conectado", + "overlay.notConnected": "No conectado", "overlay.noData": "Sin datos", "overlay.hideOverlay": "Cerrar superposición", "overlay.showOverlay": "Abrir superposición", diff --git a/public/locales/fr-CA.json b/public/locales/fr-CA.json index ddd0b9a..a06e338 100644 --- a/public/locales/fr-CA.json +++ b/public/locales/fr-CA.json @@ -55,6 +55,8 @@ "Notification.webSocketConnected": "Connecté au serveur WebSocket", "Notification.webSocketDisconnected": "Échec de la connexion au serveur WebSocket", + "overlay.connected": "Connecté", + "overlay.notConnected": "Non connecté", "overlay.noData": "Aucune donnée", "overlay.hideOverlay": "Masquer la superposition", "overlay.showOverlay": "Afficher la superposition", diff --git a/public/locales/fr.json b/public/locales/fr.json index 3a4b356..6f89971 100644 --- a/public/locales/fr.json +++ b/public/locales/fr.json @@ -56,6 +56,8 @@ "Notification.webSocketConnected": "Connecté au serveur WebSocket", "Notification.webSocketDisconnected": "Échec de la connexion au serveur WebSocket", + "overlay.connected": "Connecté", + "overlay.notConnected": "Non connecté", "overlay.noData": "Aucune donnée", "overlay.hideOverlay": "Masquer la superposition", "overlay.showOverlay": "Afficher la superposition", diff --git a/public/locales/it.json b/public/locales/it.json index 75b9e4e..d4c3845 100644 --- a/public/locales/it.json +++ b/public/locales/it.json @@ -55,6 +55,8 @@ "Notification.webSocketConnected": "Connesso al server WebSocket", "Notification.webSocketDisconnected": "Connessione al server WebSocket fallita", + "overlay.connected": "Connesso", + "overlay.notConnected": "Non connesso", "overlay.noData": "Nessun dato", "overlay.hideOverlay": "Nascondi sovrapposizione", "overlay.showOverlay": "Mostra sovrapposizione", diff --git a/public/locales/ja.json b/public/locales/ja.json index f8dde00..731412d 100644 --- a/public/locales/ja.json +++ b/public/locales/ja.json @@ -55,6 +55,8 @@ "Notification.webSocketConnected": "WebSocketサーバーに接続しました", "Notification.webSocketDisconnected": "WebSocketサーバーに接続できませんでした", + "overlay.connected": "接続済み", + "overlay.notConnected": "未接続", "overlay.noData": "データなし", "overlay.hideOverlay": "オーバーレイを非表示", "overlay.showOverlay": "オーバーレイを表示", diff --git a/public/locales/ko.json b/public/locales/ko.json index 5c3f857..f804cc6 100644 --- a/public/locales/ko.json +++ b/public/locales/ko.json @@ -55,6 +55,8 @@ "Notification.webSocketConnected": "WebSocket 서버에 연결됨", "Notification.webSocketDisconnected": "WebSocket 서버에 연결 실패", + "overlay.connected": "연결됨", + "overlay.notConnected": "연결되지 않음", "overlay.noData": "데이터 없음", "overlay.hideOverlay": "오버레이 끄기", "overlay.showOverlay": "오버레이 켜기", diff --git a/public/locales/nl.json b/public/locales/nl.json index 13b136c..5eef0f3 100644 --- a/public/locales/nl.json +++ b/public/locales/nl.json @@ -55,6 +55,8 @@ "Notification.webSocketConnected": "Verbonden met WebSocket-server", "Notification.webSocketDisconnected": "Verbinding met WebSocket-server mislukt", + "overlay.connected": "Verbonden", + "overlay.notConnected": "Niet verbonden", "overlay.noData": "Geen gegevens", "overlay.hideOverlay": "Verberg overlay", "overlay.showOverlay": "Toon overlay", diff --git a/public/locales/ru.json b/public/locales/ru.json index 5c6bdef..18d7daa 100644 --- a/public/locales/ru.json +++ b/public/locales/ru.json @@ -55,6 +55,8 @@ "Notification.webSocketConnected": "Подключено к WebSocket серверу", "Notification.webSocketDisconnected": "Не удалось подключиться к WebSocket серверу", + "overlay.connected": "Подключено", + "overlay.notConnected": "Не подключено", "overlay.noData": "Нет данных", "overlay.hideOverlay": "Скрыть наложение", "overlay.showOverlay": "Показать наложение", diff --git a/public/locales/zh-CN.json b/public/locales/zh-CN.json index f7cebfe..87f3aac 100644 --- a/public/locales/zh-CN.json +++ b/public/locales/zh-CN.json @@ -55,6 +55,8 @@ "Notification.webSocketConnected": "已连接到WebSocket服务器", "Notification.webSocketDisconnected": "连接WebSocket服务器失败", + "overlay.connected": "已连接", + "overlay.notConnected": "未连接", "overlay.noData": "没有数据", "overlay.hideOverlay": "隐藏叠加", "overlay.showOverlay": "显示叠加", diff --git a/public/locales/zh-TW.json b/public/locales/zh-TW.json index 17bea26..8f006e3 100644 --- a/public/locales/zh-TW.json +++ b/public/locales/zh-TW.json @@ -55,6 +55,8 @@ "Notification.webSocketConnected": "已連接到WebSocket伺服器", "Notification.webSocketDisconnected": "連接WebSocket伺服器失敗", + "overlay.connected": "連接的", + "overlay.notConnected": "未連接", "overlay.noData": "沒有資料", "overlay.hideOverlay": "隱藏疊加", "overlay.showOverlay": "顯示疊加", diff --git a/src/app/App.css b/src/app/App.css index 19c526b..ec3e27e 100644 --- a/src/app/App.css +++ b/src/app/App.css @@ -9,13 +9,3 @@ color: #FFF; background: linear-gradient(120deg, #4B0024, #4B2800); } - -.App-footer { - display: inline; - margin-left: auto; - - font-size: 75%; - text-align: right; - - color: var(--fg-secondary); -} diff --git a/src/app/App.tsx b/src/app/App.tsx index 5416d0a..142fac1 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -18,10 +18,6 @@ const App = () => {
+
+
{intl.formatMessage(DialogMessages.developmentUseCamera)}