fix connection message
This commit is contained in:
Vendored
+44
-43
@@ -349,6 +349,45 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// src/translations.ts
|
||||||
|
var englishTranslations = {
|
||||||
|
// general
|
||||||
|
setInput: "Set",
|
||||||
|
connectionStatus: "Connection status",
|
||||||
|
connectedTo: (server) => `Connected to "${server}"`,
|
||||||
|
disconnected: "Disconnected",
|
||||||
|
// settings
|
||||||
|
settings: "Settings",
|
||||||
|
connection: "Connection",
|
||||||
|
communication: "Communication",
|
||||||
|
encryption: "Encryption",
|
||||||
|
serverAddress: "Server Address",
|
||||||
|
serverAddressPlaceholder: "ws://192.168.0.69:3000",
|
||||||
|
connectToServer: "Connect",
|
||||||
|
primaryChannel: "Primary channel",
|
||||||
|
channelPlaceholder: "my-channel",
|
||||||
|
addSecondaryChannel: "Add secondary channel",
|
||||||
|
removeSecondaryChannel: "Remove secondary channel",
|
||||||
|
newSecondaryChannelPlaceholder: "Add secondary channel",
|
||||||
|
encryptionKey: "Encryption key",
|
||||||
|
encryptionKeyPlaceholder: "1jg028ej40d",
|
||||||
|
showEncryptionKey: "Show encryption key",
|
||||||
|
yourName: "Your Name",
|
||||||
|
yourNamePlaceholder: "Jane Doe",
|
||||||
|
// messages
|
||||||
|
messages: "Messages",
|
||||||
|
composerPlaceholder: "Type a message...",
|
||||||
|
sendMessage: "Send",
|
||||||
|
clearHistory: "Clear history",
|
||||||
|
encryptionUnavailableTitle: "Encryption is not available",
|
||||||
|
encryptionUnavailableMessage: "Encryption is not available on insecure contexts. Obtain this app via HTTPS or continue without encryption"
|
||||||
|
};
|
||||||
|
var allTranslations = {
|
||||||
|
en: englishTranslations
|
||||||
|
};
|
||||||
|
var language = navigator.language.substring(0, 2);
|
||||||
|
var translation = allTranslations[language] ?? allTranslations.en;
|
||||||
|
|
||||||
// src/model.ts
|
// src/model.ts
|
||||||
var UDN = new UDNFrontend();
|
var UDN = new UDNFrontend();
|
||||||
var Channel = class {
|
var Channel = class {
|
||||||
@@ -369,6 +408,10 @@
|
|||||||
var currentAddress = new State("");
|
var currentAddress = new State("");
|
||||||
var serverAddress = restoreState("socket-address", "");
|
var serverAddress = restoreState("socket-address", "");
|
||||||
var isConnected = new State(false);
|
var isConnected = new State(false);
|
||||||
|
var connectionMessage = createProxyState(
|
||||||
|
[serverAddress],
|
||||||
|
() => translation.connectedTo(serverAddress.value)
|
||||||
|
);
|
||||||
var cannotConnect = createProxyState(
|
var cannotConnect = createProxyState(
|
||||||
[serverAddress, currentAddress, isConnected],
|
[serverAddress, currentAddress, isConnected],
|
||||||
() => serverAddress.value == "" || currentAddress.value == serverAddress.value && isConnected.value == true
|
() => serverAddress.value == "" || currentAddress.value == serverAddress.value && isConnected.value == true
|
||||||
@@ -500,48 +543,6 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// src/translations.ts
|
|
||||||
var englishTranslations = {
|
|
||||||
// general
|
|
||||||
setInput: "Set",
|
|
||||||
connectionStatus: "Connection status",
|
|
||||||
connectedTo: createProxyState(
|
|
||||||
[],
|
|
||||||
() => `Connected to ${currentAddress}`
|
|
||||||
),
|
|
||||||
disconnected: "Disconnected",
|
|
||||||
// settings
|
|
||||||
settings: "Settings",
|
|
||||||
connection: "Connection",
|
|
||||||
communication: "Communication",
|
|
||||||
encryption: "Encryption",
|
|
||||||
serverAddress: "Server Address",
|
|
||||||
serverAddressPlaceholder: "ws://192.168.0.69:3000",
|
|
||||||
connectToServer: "Connect",
|
|
||||||
primaryChannel: "Primary channel",
|
|
||||||
channelPlaceholder: "my-channel",
|
|
||||||
addSecondaryChannel: "Add secondary channel",
|
|
||||||
removeSecondaryChannel: "Remove secondary channel",
|
|
||||||
newSecondaryChannelPlaceholder: "Add secondary channel",
|
|
||||||
encryptionKey: "Encryption key",
|
|
||||||
encryptionKeyPlaceholder: "1jg028ej40d",
|
|
||||||
showEncryptionKey: "Show encryption key",
|
|
||||||
yourName: "Your Name",
|
|
||||||
yourNamePlaceholder: "Jane Doe",
|
|
||||||
// messages
|
|
||||||
messages: "Messages",
|
|
||||||
composerPlaceholder: "Type a message...",
|
|
||||||
sendMessage: "Send",
|
|
||||||
clearHistory: "Clear history",
|
|
||||||
encryptionUnavailableTitle: "Encryption is not available",
|
|
||||||
encryptionUnavailableMessage: "Encryption is not available on insecure contexts. Obtain this app via HTTPS or continue without encryption"
|
|
||||||
};
|
|
||||||
var allTranslations = {
|
|
||||||
en: englishTranslations
|
|
||||||
};
|
|
||||||
var language = navigator.language.substring(0, 2);
|
|
||||||
var translation = allTranslations[language] ?? allTranslations.en;
|
|
||||||
|
|
||||||
// src/Views/messageComposer.tsx
|
// src/Views/messageComposer.tsx
|
||||||
function MessageComposer() {
|
function MessageComposer() {
|
||||||
return /* @__PURE__ */ createElement("div", { class: "flex-row width-100" }, /* @__PURE__ */ createElement(
|
return /* @__PURE__ */ createElement("div", { class: "flex-row width-100" }, /* @__PURE__ */ createElement(
|
||||||
@@ -675,7 +676,7 @@
|
|||||||
"span",
|
"span",
|
||||||
{
|
{
|
||||||
class: "success connected-only",
|
class: "success connected-only",
|
||||||
"subscribe:innerText": translation.connectedTo
|
"subscribe:innerText": connectionMessage
|
||||||
}
|
}
|
||||||
), /* @__PURE__ */ createElement("span", { class: "error disconnected-only" }, translation.disconnected)));
|
), /* @__PURE__ */ createElement("span", { class: "error disconnected-only" }, translation.disconnected)));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import * as React from "bloatless-react";
|
import * as React from "bloatless-react";
|
||||||
|
|
||||||
|
import { connectionMessage } from "../model";
|
||||||
import { translation } from "../translations";
|
import { translation } from "../translations";
|
||||||
|
|
||||||
export function ConnectionStatusView() {
|
export function ConnectionStatusView() {
|
||||||
@@ -9,7 +10,7 @@ export function ConnectionStatusView() {
|
|||||||
<b>{translation.connectionStatus}</b>
|
<b>{translation.connectionStatus}</b>
|
||||||
<span
|
<span
|
||||||
class="success connected-only"
|
class="success connected-only"
|
||||||
subscribe:innerText={translation.connectedTo}
|
subscribe:innerText={connectionMessage}
|
||||||
></span>
|
></span>
|
||||||
<span class="error disconnected-only">{translation.disconnected}</span>
|
<span class="error disconnected-only">{translation.disconnected}</span>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -45,6 +45,9 @@ export class Message implements React.Identifiable {
|
|||||||
export const currentAddress = new React.State("");
|
export const currentAddress = new React.State("");
|
||||||
export const serverAddress = React.restoreState("socket-address", "");
|
export const serverAddress = React.restoreState("socket-address", "");
|
||||||
export const isConnected = new React.State(false);
|
export const isConnected = new React.State(false);
|
||||||
|
export const connectionMessage = React.createProxyState([serverAddress], () =>
|
||||||
|
translation.connectedTo(serverAddress.value)
|
||||||
|
);
|
||||||
|
|
||||||
export const cannotConnect = React.createProxyState(
|
export const cannotConnect = React.createProxyState(
|
||||||
[serverAddress, currentAddress, isConnected],
|
[serverAddress, currentAddress, isConnected],
|
||||||
|
|||||||
+1
-4
@@ -6,10 +6,7 @@ const englishTranslations = {
|
|||||||
// general
|
// general
|
||||||
setInput: "Set",
|
setInput: "Set",
|
||||||
connectionStatus: "Connection status",
|
connectionStatus: "Connection status",
|
||||||
connectedTo: React.createProxyState(
|
connectedTo: (server: string) => `Connected to "${server}"`,
|
||||||
[],
|
|
||||||
() => `Connected to ${currentAddress}`
|
|
||||||
),
|
|
||||||
disconnected: "Disconnected",
|
disconnected: "Disconnected",
|
||||||
|
|
||||||
// settings
|
// settings
|
||||||
|
|||||||
Reference in New Issue
Block a user