From 397a5f76e45c07d3f1ff04bab7161ca41e0786e7 Mon Sep 17 00:00:00 2001 From: marlon-erler Date: Wed, 30 Sep 2026 18:57:09 +0200 Subject: [PATCH] add progress bar to data transfer --- dist/index.js | 124 +- dist/sw.js | 2 +- dist/version.txt | 2 +- src/Model/Global/fileTransferModel.ts | 49 +- src/Model/Utility/crypto.ts | 4 +- src/View/ChatPages/settingsPage.tsx | 11 +- src/View/ChatPages/taskPage.tsx | 8 +- src/View/Components/boardViewToggleButton.tsx | 4 +- src/View/Components/progressBar.tsx | 24 + src/View/Modals/dataTransferModal.tsx | 67 +- src/View/homePage.css | 8 +- src/View/homePage.tsx | 51 +- src/View/translations.ts | 1133 +++++++++-------- src/ViewModel/Chat/chatListViewModel.ts | 13 +- src/ViewModel/Global/coreViewModel.ts | 25 +- src/ViewModel/Global/fileTransferViewModel.ts | 32 +- src/ViewModel/Pages/boardViewModel.ts | 402 +++--- src/ViewModel/Pages/calendarPageViewModel.ts | 8 +- src/ViewModel/Pages/homeViewModel.ts | 39 +- src/ViewModel/Pages/messagePageViewModel.ts | 92 +- src/ViewModel/Pages/settingsPageViewModel.ts | 13 +- src/ViewModel/Pages/taskPageViewModel.ts | 8 +- src/ViewModel/Utility/searchViewModel.ts | 2 +- src/base.css | 6 +- src/index.tsx | 46 +- 25 files changed, 1125 insertions(+), 1048 deletions(-) create mode 100644 src/View/Components/progressBar.tsx diff --git a/dist/index.js b/dist/index.js index 5c69824b..6033ad22 100644 --- a/dist/index.js +++ b/dist/index.js @@ -436,9 +436,8 @@ sendButton: "Send", sendAgainButton: "Send again", /// - filesSentCount: (count) => `Files sent: ${count}.`, - allFilesSent: "Done.", - filesReceivedCount: (count) => `Files processed: ${count}.`, + filesSentProgress: (progress, total) => `Sent ${progress} of ${total} files`, + filesReceivedProgress: (progress, total) => `Received ${progress} of ${total} files`, // exportKey: "Encryption key", exportKeyConfirmation: "Confirm", @@ -702,9 +701,8 @@ transferKeyHeadline: "Schl\xFCssel", sendButton: "Senden", sendAgainButton: "Erneut senden", - filesSentCount: (count) => `Dateien gesendet: ${count}.`, - allFilesSent: "Fertig.", - filesReceivedCount: (count) => `Dateien empfangen: ${count}.`, + filesSentProgress: (progress, total) => `${progress} von ${total} Dateien gesendet`, + filesReceivedProgress: (progress, total) => `${progress} von ${total} Dateien empfangen`, exportKey: "Schl\xFCssel", exportKeyConfirmation: "Schl\xFCssel best\xE4tigen", downloadFileButton: "Herunterladen", @@ -954,9 +952,8 @@ transferKeyHeadline: "Clave de encriptaci\xF3n de transferencia", sendButton: "Enviar", sendAgainButton: "Enviar otra vez", - filesSentCount: (count) => `Archivos enviados: ${count}.`, - allFilesSent: "Hecho.", - filesReceivedCount: (count) => `Archivos recibidos: ${count}.`, + filesSentProgress: (progress, total) => `${progress} de ${total} enviados`, + filesReceivedProgress: (progress, total) => `${progress} de ${total} recibidos`, exportKey: "Clave de encriptaci\xF3n", exportKeyConfirmation: "Confirmar clave", downloadFileButton: "Descargar", @@ -2290,27 +2287,13 @@ this.receivingTransferChannel = new State(""); this.receivingTransferKey = new State(""); this.filePathsSent = new ListState(); - this.filesSentCount = createProxyState( - [this.filePathsSent], - () => this.filePathsSent.value.size - ); - this.filesSentText = createProxyState( - [this.filesSentCount], - () => this.coreViewModel.translations.dataTransferModal.filesSentCount( - this.filesSentCount.value - ) - ); + this.fileTransferTotal = new State(0); + this.fileTransferProgress = new State(0); this.filePathsReceived = new ListState(); this.filesReceivedCount = createProxyState( [this.filePathsReceived], () => this.filePathsReceived.value.size ); - this.filesReceivedText = createProxyState( - [this.filesReceivedCount], - () => this.coreViewModel.translations.dataTransferModal.filesReceivedCount( - this.filesReceivedCount.value - ) - ); this.exportKey = new State(""); this.exportKeyConfirmation = new State(""); this.importedFile = new State(void 0); @@ -2322,7 +2305,6 @@ [this.selectedPaths], () => this.selectedPaths.value.size == 0 ); - this.didNotFinishSending = new State(true); this.cannotPrepareToReceive = createProxyState( [this.receivingTransferChannel, this.receivingTransferKey], () => this.receivingTransferChannel.value == "" || this.receivingTransferKey.value == "" @@ -2346,6 +2328,7 @@ // handlers this.handleReceivedFile = (path) => { this.filePathsReceived.add(path); + this.fileTransferProgress.value = this.filePathsReceived.value.size; }; // methods this.getOptions = () => { @@ -2454,7 +2437,6 @@ }; this.initiateTransfer = () => { this.presentedModal.value = 3 /* TransferDisplay */; - this.didNotFinishSending.value = true; this.filePathsSent.clear(); this.coreViewModel.fileTransferModel.sendFiles( this.selectedPaths.value.values(), @@ -2462,7 +2444,6 @@ this.filePathsSent.add(path); } ); - this.didNotFinishSending.value = false; }; this.showTransferDataInputModal = () => { this.presentedModal.value = 4 /* TransferDataInput */; @@ -2496,6 +2477,10 @@ this.handleContextClose = () => { this.presentedModal.value = void 0; }; + this.coreViewModel.fileTransferModel.transferSizeHandlerManager.setHandler( + "file-transfer-view-model", + (count) => this.fileTransferTotal.value = count + ); this.coreViewModel.fileTransferModel.fileHandlerManager.setHandler( "file-transfer-view-model", this.handleReceivedFile @@ -4742,7 +4727,6 @@ }; this.randomizeKey = () => { this.encryptionKeyInput.value = random(24); - this.setEncryptionKey(); }; this.applyColor = () => { this.chatViewModel.setColor(this.color.value); @@ -8165,6 +8149,21 @@ return /* @__PURE__ */ createElement("span", { class: "ellipsis" }, string); }; + // src/View/Components/progressBar.tsx + function ProgressBar(valueLabel, value, maximum) { + const style = createProxyState( + [value, maximum], + () => `width: ${100 * (value.value / maximum.value)}%` + ); + return /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("div", { class: "width-100 surface-alt", style: "height: 18px" }, /* @__PURE__ */ createElement( + "div", + { + class: "height-100 background-primary", + "set:style": style + } + )), /* @__PURE__ */ createElement("span", { class: "secondary", "subscribe:innerText": valueLabel })); + } + // src/View/Modals/dataTransferModal.tsx function DataTransferModalWrapper(coreViewModel2, connectionViewModel2, fileTransferViewModel2) { return /* @__PURE__ */ createElement("div", null, DirectionSelectionModal( @@ -8320,20 +8319,8 @@ [fileTransferViewModel2.presentedModal], () => fileTransferViewModel2.presentedModal.value == 3 /* TransferDisplay */ ); - return /* @__PURE__ */ createElement("div", { class: "modal", "toggle:open": isPresented }, /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, coreViewModel2.translations.dataTransferModal.transferDataHeadline), /* @__PURE__ */ createElement( - "p", - { - class: "secondary", - "subscribe:innerText": fileTransferViewModel2.filesSentText - } - ), /* @__PURE__ */ createElement( - "p", - { - class: "secondary", - "toggle:hidden": fileTransferViewModel2.didNotFinishSending - }, - coreViewModel2.translations.dataTransferModal.allFilesSent - ), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("div", { class: "flex-column gap content-margin-bottom" }, /* @__PURE__ */ createElement("div", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "forum"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", { class: "secondary" }, coreViewModel2.translations.dataTransferModal.transferChannelHeadline), /* @__PURE__ */ createElement( + const progressLabel = createProxyState([fileTransferViewModel2.fileTransferProgress, fileTransferViewModel2.fileTransferTotal], () => coreViewModel2.translations.dataTransferModal.filesSentProgress(fileTransferViewModel2.fileTransferProgress.value, fileTransferViewModel2.fileTransferTotal.value)); + return /* @__PURE__ */ createElement("div", { class: "modal", "toggle:open": isPresented }, /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, coreViewModel2.translations.dataTransferModal.transferDataHeadline), ProgressBar(progressLabel, fileTransferViewModel2.fileTransferProgress, fileTransferViewModel2.fileTransferTotal), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("div", { class: "flex-column gap content-margin-bottom" }, /* @__PURE__ */ createElement("div", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "forum"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", { class: "secondary" }, coreViewModel2.translations.dataTransferModal.transferChannelHeadline), /* @__PURE__ */ createElement( "b", { "subscribe:innerText": fileTransferViewModel2.transferChannel @@ -8364,8 +8351,7 @@ "button", { class: "flex", - "on:click": fileTransferViewModel2.close, - "toggle:disabled": fileTransferViewModel2.didNotFinishSending + "on:click": fileTransferViewModel2.close }, coreViewModel2.translations.general.closeButton, /* @__PURE__ */ createElement("span", { class: "icon" }, "close") @@ -8413,13 +8399,8 @@ [fileTransferViewModel2.presentedModal], () => fileTransferViewModel2.presentedModal.value == 5 /* ReceptionDisplay */ ); - return /* @__PURE__ */ createElement("div", { class: "modal", "toggle:open": isPresented }, /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, coreViewModel2.translations.dataTransferModal.receiveHeadline), /* @__PURE__ */ createElement( - "p", - { - class: "secondary", - "subscribe:innerText": fileTransferViewModel2.filesReceivedText - } - ), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement( + const progressLabel = createProxyState([fileTransferViewModel2.fileTransferProgress, fileTransferViewModel2.fileTransferTotal], () => coreViewModel2.translations.dataTransferModal.filesReceivedProgress(fileTransferViewModel2.fileTransferProgress.value, fileTransferViewModel2.fileTransferTotal.value)); + return /* @__PURE__ */ createElement("div", { class: "modal", "toggle:open": isPresented }, /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, coreViewModel2.translations.dataTransferModal.receiveHeadline), ProgressBar(progressLabel, fileTransferViewModel2.fileTransferProgress, fileTransferViewModel2.fileTransferTotal), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement( "div", { class: "tile flex-column align-start", @@ -8641,6 +8622,7 @@ this.direction = 0 /* Send */; // handler managers this.fileHandlerManager = new HandlerManager(); + this.transferSizeHandlerManager = new HandlerManager(); this.readyToSendHandlerManager = new HandlerManager(); // general this.generateTransferData = () => { @@ -8700,6 +8682,11 @@ }; this.handleDecryptedFile = (data) => { const parsed = parse(data); + if (!parsed.type) return; + if (parsed.type == "transfer-size" && typeof parsed.count == "number") { + this.transferSizeHandlerManager.trigger(parsed.count); + return; + } const isFileData = checkMatchesObjectStructure( parsed, FileDataReference @@ -8714,16 +8701,22 @@ }; // sending this.sendFiles = (directoryPaths, fileCallback) => { + const filesToSend = /* @__PURE__ */ new Set(); for (const directoryPath of directoryPaths) { this.storageModel.recurse(directoryPath, (filePath) => { const stringifiedFileData = this.prepareFileForSending(filePath); - this.sendFile(stringifiedFileData); - const pathString = StorageModel.pathComponentsToString( - ...filePath - ); - fileCallback(pathString); + filesToSend.add([stringifiedFileData, filePath]); }); } + this.sendTransferSize(filesToSend.size); + for (const file of filesToSend) { + const [stringifiedFileData, filePath] = file; + this.sendFile(stringifiedFileData); + const pathString = StorageModel.pathComponentsToString( + ...filePath + ); + fileCallback(pathString); + } }; this.generateBackup = async (directoryPaths, passphrase) => { const files = []; @@ -8739,10 +8732,26 @@ const blob = new Blob([encrypted], { type: "text/plain" }); return blob; }; + this.sendTransferSize = async (count) => { + if (!this.transferData) return; + const data = { + type: "transfer-size", + count + }; + const encryptedData = await encryptString( + stringify(data), + this.transferData.key + ); + this.connectionModel.sendPlainMessage( + this.transferData.channel, + encryptedData + ); + }; this.prepareFileForSending = (filePath) => { const fileContent = this.storageModel.read(filePath); if (fileContent == null) return ""; const fileData = { + type: "file-data", path: filePath, body: fileContent }; @@ -8771,6 +8780,7 @@ } }; var FileDataReference = { + type: "file-data", path: [""], body: "" }; diff --git a/dist/sw.js b/dist/sw.js index d08b6820..9b65dcb0 100644 --- a/dist/sw.js +++ b/dist/sw.js @@ -1,4 +1,4 @@ -const VERSION = "2610 Beta 21.12" +const VERSION = "2610 Beta 21.13" function processUrl(event) { const url = event.request.url; diff --git a/dist/version.txt b/dist/version.txt index 8c98f5f9..dec5df2b 100644 --- a/dist/version.txt +++ b/dist/version.txt @@ -1 +1 @@ -2610 Beta 21.12 +2610 Beta 21.13 diff --git a/src/Model/Global/fileTransferModel.ts b/src/Model/Global/fileTransferModel.ts index d37f2759..58d9aace 100644 --- a/src/Model/Global/fileTransferModel.ts +++ b/src/Model/Global/fileTransferModel.ts @@ -24,6 +24,7 @@ export default class FileTransferModel { // handler managers readonly fileHandlerManager = new HandlerManager(); + readonly transferSizeHandlerManager = new HandlerManager(); readonly readyToSendHandlerManager = new HandlerManager(); // general @@ -105,6 +106,12 @@ export default class FileTransferModel { readonly handleDecryptedFile = (data: string): void => { const parsed: any = parse(data); + if (!parsed.type) return; + if (parsed.type == "transfer-size" && typeof parsed.count == "number") { + this.transferSizeHandlerManager.trigger(parsed.count); + return; + } + const isFileData: boolean = checkMatchesObjectStructure( parsed, FileDataReference, @@ -126,17 +133,23 @@ export default class FileTransferModel { directoryPaths: IteratorObject, fileCallback: (path: string) => void, ): void => { + const filesToSend = new Set<[string, string[]]>(); for (const directoryPath of directoryPaths) { this.storageModel.recurse(directoryPath, (filePath: string[]) => { const stringifiedFileData = this.prepareFileForSending(filePath); - this.sendFile(stringifiedFileData); - const pathString: string = StorageModel.pathComponentsToString( - ...filePath, - ); - fileCallback(pathString); + filesToSend.add([stringifiedFileData, filePath]); }); } + this.sendTransferSize(filesToSend.size); + for (const file of filesToSend) { + const [stringifiedFileData, filePath] = file; + this.sendFile(stringifiedFileData); + const pathString: string = StorageModel.pathComponentsToString( + ...filePath, + ); + fileCallback(pathString); + } }; readonly generateBackup = async ( @@ -158,11 +171,30 @@ export default class FileTransferModel { return blob; }; + readonly sendTransferSize = async (count: number): Promise => { + if (!this.transferData) return; + + const data: TransferSize = { + type: "transfer-size", + count, + }; + + const encryptedData: string = await encryptString( + stringify(data), + this.transferData.key, + ); + this.connectionModel.sendPlainMessage( + this.transferData.channel, + encryptedData, + ); + }; + readonly prepareFileForSending = (filePath: string[]): string => { const fileContent: string | null = this.storageModel.read(filePath); if (fileContent == null) return ""; const fileData: FileData = { + type: "file-data", path: filePath, body: fileContent, }; @@ -200,11 +232,18 @@ export interface TransferData { } export interface FileData { + type: "file-data"; path: string[]; body: string; } +export interface TransferSize { + type: "transfer-size"; + count: number; +} + export const FileDataReference: FileData = { + type: "file-data", path: [""], body: "", }; diff --git a/src/Model/Utility/crypto.ts b/src/Model/Utility/crypto.ts index 2697b986..ed0636af 100644 --- a/src/Model/Utility/crypto.ts +++ b/src/Model/Utility/crypto.ts @@ -5,10 +5,10 @@ const ENCRYPTION_ALG = "AES-GCM"; // random export function random(length: number): string { - return cryptoRandomString({length}) + return cryptoRandomString({ length }); } -// encrypt +// encrypt export async function encryptString( plaintext: string, passphrase: string, diff --git a/src/View/ChatPages/settingsPage.tsx b/src/View/ChatPages/settingsPage.tsx index 8801e92b..ca2acb8b 100644 --- a/src/View/ChatPages/settingsPage.tsx +++ b/src/View/ChatPages/settingsPage.tsx @@ -140,11 +140,12 @@ export function SettingsPage(
diff --git a/src/View/Components/boardViewToggleButton.tsx b/src/View/Components/boardViewToggleButton.tsx index ec3bf4c9..f2c0fd6d 100644 --- a/src/View/Components/boardViewToggleButton.tsx +++ b/src/View/Components/boardViewToggleButton.tsx @@ -12,8 +12,8 @@ export function BoardViewToggleButton( key: string, ) { function select() { - boardViewModel.selectedPage.value = page; - boardViewModel.resetPinchZoom(); + boardViewModel.selectedPage.value = page; + boardViewModel.resetPinchZoom(); } const isSelected = React.createProxyState( diff --git a/src/View/Components/progressBar.tsx b/src/View/Components/progressBar.tsx new file mode 100644 index 00000000..d31287dc --- /dev/null +++ b/src/View/Components/progressBar.tsx @@ -0,0 +1,24 @@ +import * as React from "../../react"; + +export function ProgressBar( + valueLabel: React.State, + value: React.State, + maximum: React.State, +) { + const style = React.createProxyState( + [value, maximum], + () => `width: ${100 * (value.value / maximum.value)}%`, + ); + + return ( +
+
+
+
+ +
+ ); +} diff --git a/src/View/Modals/dataTransferModal.tsx b/src/View/Modals/dataTransferModal.tsx index 7634312a..aee84d9f 100644 --- a/src/View/Modals/dataTransferModal.tsx +++ b/src/View/Modals/dataTransferModal.tsx @@ -1,6 +1,7 @@ import { ViewController } from "../viewController"; import { CommonKeys, getKeySymbol } from "../keystrokes"; import { StringToTextSpan } from "../Components/textSpan"; +import { ProgressBar } from "../Components/progressBar"; import * as React from "../../react"; import FileTransferViewModel, { FileTransferModals, @@ -370,6 +371,18 @@ function TransferDisplayModal( FileTransferModals.TransferDisplay, ); + const progressLabel = React.createProxyState( + [ + fileTransferViewModel.fileTransferProgress, + fileTransferViewModel.fileTransferTotal, + ], + () => + coreViewModel.translations.dataTransferModal.filesSentProgress( + fileTransferViewModel.fileTransferProgress.value, + fileTransferViewModel.fileTransferTotal.value, + ), + ); + return (
@@ -381,24 +394,11 @@ function TransferDisplayModal( } -

- -

- { - coreViewModel.translations.dataTransferModal - .allFilesSent - } -

+ {ProgressBar( + progressLabel, + fileTransferViewModel.fileTransferProgress, + fileTransferViewModel.fileTransferTotal, + )}
@@ -460,13 +460,7 @@ function TransferDisplayModal( } restart_alt - @@ -588,6 +582,18 @@ function DataReceptionModal( FileTransferModals.ReceptionDisplay, ); + const progressLabel = React.createProxyState( + [ + fileTransferViewModel.fileTransferProgress, + fileTransferViewModel.fileTransferTotal, + ], + () => + coreViewModel.translations.dataTransferModal.filesReceivedProgress( + fileTransferViewModel.fileTransferProgress.value, + fileTransferViewModel.fileTransferTotal.value, + ), + ); + return (
@@ -599,12 +605,11 @@ function DataReceptionModal( } -

+ {ProgressBar( + progressLabel, + fileTransferViewModel.fileTransferProgress, + fileTransferViewModel.fileTransferTotal, + )}
diff --git a/src/View/homePage.css b/src/View/homePage.css index 517fc286..64456c0c 100644 --- a/src/View/homePage.css +++ b/src/View/homePage.css @@ -50,7 +50,7 @@ @media (min-width: 640px) { #home-page > div { - gap: var(--content-padding); + gap: var(--content-padding); } #home-page #overview-section { @@ -66,11 +66,11 @@ @media (min-width: 1000px) { #home-page > div { - gap: var(--large-gap); + gap: var(--large-gap); } #home-page > h1 { - padding-top: 3rem; - padding-bottom: 1rem; + padding-top: 3rem; + padding-bottom: 1rem; } } diff --git a/src/View/homePage.tsx b/src/View/homePage.tsx index 1e0feb39..d6a8a96b 100644 --- a/src/View/homePage.tsx +++ b/src/View/homePage.tsx @@ -1,5 +1,6 @@ import "./homePage.css"; import { StringToOption } from "./Components/option"; +import { NewItemEntry } from "./Components/newItemEntry"; import { HomePageButton } from "./Components/homePageButton"; import { ChatViewModelToChatEntry } from "./Components/chatEntry"; import * as React from "../react"; @@ -9,7 +10,6 @@ import FileTransferViewModel from "../ViewModel/Global/fileTransferViewModel"; import CoreViewModel from "../ViewModel/Global/coreViewModel"; import ConnectionViewModel from "../ViewModel/Global/connectionViewModel"; import ChatListViewModel from "../ViewModel/Chat/chatListViewModel"; -import {NewItemEntry} from "./Components/newItemEntry"; export function HomePage( coreViewModel: CoreViewModel, @@ -19,9 +19,18 @@ export function HomePage( fileTransferViewModel: FileTransferViewModel, chatListViewModel: ChatListViewModel, ) { - const greeting = React.createProxyState([settingsViewModel.username], ()=>coreViewModel.translations.homePage.greeting(settingsViewModel.username.value)); + const greeting = React.createProxyState([settingsViewModel.username], () => + coreViewModel.translations.homePage.greeting( + settingsViewModel.username.value, + ), + ); - const isChatPlaceholderHidden = React.createProxyState([chatListViewModel.chatMatches, chatListViewModel.chatQuery], ()=>chatListViewModel.chatMatches.value.size > 0 || chatListViewModel.chatQuery.value != ""); + const isChatPlaceholderHidden = React.createProxyState( + [chatListViewModel.chatMatches, chatListViewModel.chatQuery], + () => + chatListViewModel.chatMatches.value.size > 0 || + chatListViewModel.chatQuery.value != "", + ); // sections const overviewSection = ( @@ -119,8 +128,8 @@ export function HomePage( update - -
+ +
); @@ -128,25 +137,25 @@ export function HomePage(
-
+
-
+
- {NewItemEntry(coreViewModel, chatListViewModel.chatQuery, chatListViewModel.createChat)} + {NewItemEntry( + coreViewModel, + chatListViewModel.chatQuery, + chatListViewModel.createChat, + )} - - {coreViewModel.translations.homePage.noChatsPlaceholder} - + + {coreViewModel.translations.homePage.noChatsPlaceholder} +
+ >
); // final return ( -
-

+
+

{overviewSection} {chatSection} diff --git a/src/View/translations.ts b/src/View/translations.ts index 2925db52..c297fc19 100644 --- a/src/View/translations.ts +++ b/src/View/translations.ts @@ -54,7 +54,7 @@ const englishTranslations = { homePage: { appName: "Coordination Tool", - greeting: (name: string) => `Hi ${name}`, + greeting: (name: string) => `Hi ${name}`, /// @@ -72,8 +72,8 @@ const englishTranslations = { /// - typeChat: "chat", - noChatsPlaceholder: "No chats", + typeChat: "chat", + noChatsPlaceholder: "No chats", }, settings: { @@ -181,10 +181,10 @@ const englishTranslations = { /// - filesSentCount: (count: number) => `Files sent: ${count}.`, - allFilesSent: "Done.", - - filesReceivedCount: (count: number) => `Files processed: ${count}.`, + filesSentProgress: (progress: number, total: number) => + `Sent ${progress} of ${total} files`, + filesReceivedProgress: (progress: number, total: number) => + `Received ${progress} of ${total} files`, // @@ -236,7 +236,7 @@ const englishTranslations = { encryptionKeyLabel: "Encryption key", setEncryptionKeyButtonAudioLabel: "set encryption key", showEncryptionKey: "Show encryption key", - randomizeKey: "Randomize", + randomizeKey: "Randomize", setColorButtonAudioLabel: "set color", @@ -292,7 +292,7 @@ const englishTranslations = { noBoardSelected: "No board selected", boardNotFound: "Board not found", - typeBoard: "board", + typeBoard: "board", /// @@ -402,7 +402,8 @@ export const allTranslations: { saveButton: "Speichern", setButton: "OK", - filterOrCreateLabel: (type: string) => `${type} suchen oder erstellen`, + filterOrCreateLabel: (type: string) => + `${type} suchen oder erstellen`, createLabel: (query: string) => `"${query}" erstellen`, reloadAppButton: "Neu laden", @@ -433,640 +434,640 @@ export const allTranslations: { }, homePage: { - appName: "Coordination Tool", - greeting: (name: string) => `Hi ${name}!`, - - serverAddress: "Serveradresse", - serverAddressPlaceholder: "wss://192.168.0.69:3000", - connectAudioLabel: "mit Server verbinden", - disconnectAudioLabel: "vom Server trennen", - manageConnectionsAudioLabel: "Verbindungen verwalten", - - settingsButton: "Einstellungen", - manageStorageButton: "Daten verwalten", - transferDataButton: "Daten übertragen", - - updateButton: (version: string) => `Aktualisieren: ${version}`, - - typeChat: "Chat", - noChatsPlaceholder: "Keine Chats", - }, - - settings: { - pages: { - appearance: "Erscheinungsbild", - account: "Konto", - regional: "Sprache & Region", - info: "Über CT", - }, - themes: { - dynamic: "Dynamisch", - dark: "Dunkel", - light: "Hell", - system: "Geräteeinstellung", - black: "Schwarz", - }, - account: { - yourNameLabel: "Dein Name", - yourNamePlaceholder: "Max Mustermann", - setNameButtonAudioLabel: "Namen festlegen", - }, - regional: { - language: "Sprache", - firstDayOfWeekLabel: "Erster Wochentag", - }, - about: { - version: "Version", - checkUpdatesButton: "Nach Updates suchen", - }, - }, - - onboarding: { - connectionHeadline: "Mit UDN verbinden", - connectionDescription: - "Um Daten und Nachichten zu verschicken, verbinde dich mit dem Universellen Dezentralen Netzwerk (UDN).", - connectButton: "Verbinden", - connectionNextButton: (isConnected: boolean) => - isConnected ? "Weiter" : "Ohne UDN einrichten", - - /// - - transferOptionsHeadline: "Deine Daten kopieren", - transferOptionsDescription: - "Wenn du Coordination Tool bereits auf einem anderen Gerät verwendest, kopiere deine Kontodaten. Du kannst beide Geräte gleichzeitig verwenden.", - transferOptionTransfer: "Daten übertragen", - transferOptionNew: "Als neues Gerät enrichten", - - // - - nameHeadline: "Dein Name", - nameDescription: - "Diesen Namen sehen andere, wenn du Nachrichten versendest. Du kannst deinen Namen jederzeit in den Einstellungen ändern.", - - // - - transferHeadline: "Datenübertragung", - transferDescription: - "Verwende die Funktion zur Datenübertragung auf deinem anderen Getät, um deine Identität und persönlichen Daten zu kopieren. Gib die dazu angezeigten Daten unten ein. Du findest die Datenübertragung auf der Startseite des anderen Geräts.", - transferButton: "Daten kopieren", - }, - - connectionModal: { - connectionModalHeadline: "Verbindungen verwalten", - - connectButtonAudioLabel: "verbinden", - }, - - dataTransferModal: { - transferDataHeadline: "Datenübertragung", - sendHeadline: "An anderes Gerät senden", - receiveHeadline: "An dieses Gerät senden", - exportHeadline: "Daten exportieren", - importHeadline: "Daten importieren", - selectionDescription: - "Wähle die Daten aus, die du übertragen möchtest.", - exportSelectionDescription: - "Wähle die Daten aus, die du exportieren möchtest.", - dataEntryDescription: - "Gib diese Informationen auf dem anderen Gerät ein.", - dataEntryInputDescription: - "Gib die auf dem anderen Gerät angezeigten Informationen ein.", - - fromThisDeviceButton: "An anderes Gerät senden", - toThisDeviceButton: "An dieses Gerät senden", - exportButton: "Als Datei exportieren", - importButton: "Aus Datei importieren", - - generalHeadline: "Allgemein", - - connectionData: "Verbindungsdaten", - settingsData: "Identität und persönliche Daten", - - chatsHeadline: "Chats", - - transferChannelHeadline: "Übertragungskanal", - transferKeyHeadline: "Schlüssel", - - sendButton: "Senden", - sendAgainButton: "Erneut senden", - - filesSentCount: (count) => `Dateien gesendet: ${count}.`, - allFilesSent: "Fertig.", - - filesReceivedCount: (count) => `Dateien empfangen: ${count}.`, - - exportKey: "Schlüssel", - exportKeyConfirmation: "Schlüssel bestätigen", - downloadFileButton: "Herunterladen", - importFileButton: "Importieren", - decryptImportButton: "Entschlüsseln", - incorrectPassphraseError: "Der Schlüssel ist nicht korrekt", - }, - - storage: { - noItemSelected: "Kein Element ausgewählt", - notAFile: "(keine Datei)", - contentEmpty: "(leer)", - - usageLabel: "Speicher", - usageVauleLabel: (used: number, max: number) => - `${used} von ${max} MB belegt`, - - path: "Pfad", - content: "Inhalt", - - deleteItem: "Element löschen", - - removeJunkButton: "Datenmüll löschen", - }, + appName: "Coordination Tool", + greeting: (name: string) => `Hi ${name}!`, + + serverAddress: "Serveradresse", + serverAddressPlaceholder: "wss://192.168.0.69:3000", + connectAudioLabel: "mit Server verbinden", + disconnectAudioLabel: "vom Server trennen", + manageConnectionsAudioLabel: "Verbindungen verwalten", + + settingsButton: "Einstellungen", + manageStorageButton: "Daten verwalten", + transferDataButton: "Daten übertragen", + + updateButton: (version: string) => `Aktualisieren: ${version}`, + + typeChat: "Chat", + noChatsPlaceholder: "Keine Chats", + }, + + settings: { + pages: { + appearance: "Erscheinungsbild", + account: "Konto", + regional: "Sprache & Region", + info: "Über CT", + }, + themes: { + dynamic: "Dynamisch", + dark: "Dunkel", + light: "Hell", + system: "Geräteeinstellung", + black: "Schwarz", + }, + account: { + yourNameLabel: "Dein Name", + yourNamePlaceholder: "Max Mustermann", + setNameButtonAudioLabel: "Namen festlegen", + }, + regional: { + language: "Sprache", + firstDayOfWeekLabel: "Erster Wochentag", + }, + about: { + version: "Version", + checkUpdatesButton: "Nach Updates suchen", + }, + }, + + onboarding: { + connectionHeadline: "Mit UDN verbinden", + connectionDescription: + "Um Daten und Nachichten zu verschicken, verbinde dich mit dem Universellen Dezentralen Netzwerk (UDN).", + connectButton: "Verbinden", + connectionNextButton: (isConnected: boolean) => + isConnected ? "Weiter" : "Ohne UDN einrichten", + + /// + + transferOptionsHeadline: "Deine Daten kopieren", + transferOptionsDescription: + "Wenn du Coordination Tool bereits auf einem anderen Gerät verwendest, kopiere deine Kontodaten. Du kannst beide Geräte gleichzeitig verwenden.", + transferOptionTransfer: "Daten übertragen", + transferOptionNew: "Als neues Gerät enrichten", + + // + + nameHeadline: "Dein Name", + nameDescription: + "Diesen Namen sehen andere, wenn du Nachrichten versendest. Du kannst deinen Namen jederzeit in den Einstellungen ändern.", + + // + + transferHeadline: "Datenübertragung", + transferDescription: + "Verwende die Funktion zur Datenübertragung auf deinem anderen Getät, um deine Identität und persönlichen Daten zu kopieren. Gib die dazu angezeigten Daten unten ein. Du findest die Datenübertragung auf der Startseite des anderen Geräts.", + transferButton: "Daten kopieren", + }, + + connectionModal: { + connectionModalHeadline: "Verbindungen verwalten", + + connectButtonAudioLabel: "verbinden", + }, + + dataTransferModal: { + transferDataHeadline: "Datenübertragung", + sendHeadline: "An anderes Gerät senden", + receiveHeadline: "An dieses Gerät senden", + exportHeadline: "Daten exportieren", + importHeadline: "Daten importieren", + selectionDescription: + "Wähle die Daten aus, die du übertragen möchtest.", + exportSelectionDescription: + "Wähle die Daten aus, die du exportieren möchtest.", + dataEntryDescription: + "Gib diese Informationen auf dem anderen Gerät ein.", + dataEntryInputDescription: + "Gib die auf dem anderen Gerät angezeigten Informationen ein.", + + fromThisDeviceButton: "An anderes Gerät senden", + toThisDeviceButton: "An dieses Gerät senden", + exportButton: "Als Datei exportieren", + importButton: "Aus Datei importieren", + + generalHeadline: "Allgemein", + + connectionData: "Verbindungsdaten", + settingsData: "Identität und persönliche Daten", + + chatsHeadline: "Chats", + + transferChannelHeadline: "Übertragungskanal", + transferKeyHeadline: "Schlüssel", + + sendButton: "Senden", + sendAgainButton: "Erneut senden", + + filesSentProgress: (progress: number, total: number) => + `${progress} von ${total} Dateien gesendet`, + filesReceivedProgress: (progress: number, total: number) => + `${progress} von ${total} Dateien empfangen`, + + exportKey: "Schlüssel", + exportKeyConfirmation: "Schlüssel bestätigen", + downloadFileButton: "Herunterladen", + importFileButton: "Importieren", + decryptImportButton: "Entschlüsseln", + incorrectPassphraseError: "Der Schlüssel ist nicht korrekt", + }, + + storage: { + noItemSelected: "Kein Element ausgewählt", + notAFile: "(keine Datei)", + contentEmpty: "(leer)", + + usageLabel: "Speicher", + usageVauleLabel: (used: number, max: number) => + `${used} von ${max} MB belegt`, + + path: "Pfad", + content: "Inhalt", + + deleteItem: "Element löschen", + + removeJunkButton: "Datenmüll löschen", + }, + + chatPage: { + closeChatAudioLabe: "Chat schließen", + chatSettingsAudioLabel: "Chateinstellungen", + + pages: { + settings: "Einstellungen", + messages: "Nachrichten", + tasks: "Aufgaben", + calendar: "Kalender", + }, - chatPage: { - closeChatAudioLabe: "Chat schließen", - chatSettingsAudioLabel: "Chateinstellungen", + settings: { + settingsHeadline: "Einstellungen", - pages: { - settings: "Einstellungen", - messages: "Nachrichten", - tasks: "Aufgaben", - calendar: "Kalender", - }, + nameLabel: "Name", + setNameButtonAudioLabel: "namen festlegen", - settings: { - settingsHeadline: "Einstellungen", + newSecondaryChannelPlaceholder: "Sekundären Kanal hinzufügen", + newSecondaryChannelAudioLabel: + "Name des neuen sekundären Kanals", + addSecondaryChannelButtonAudioLabel: + "Sekundären Kanal hinzufügen", - nameLabel: "Name", - setNameButtonAudioLabel: "namen festlegen", + encryptionKeyLabel: "Schlüssel", + setEncryptionKeyButtonAudioLabel: "Schlüssel festlegen", + showEncryptionKey: "Schlüssel anzeigen", + randomizeKey: "Zufällig generieren", - newSecondaryChannelPlaceholder: "Sekundären Kanal hinzufügen", - newSecondaryChannelAudioLabel: - "Name des neuen sekundären Kanals", - addSecondaryChannelButtonAudioLabel: - "Sekundären Kanal hinzufügen", + setColorButtonAudioLabel: "Farbe festlegen", - encryptionKeyLabel: "Schlüssel", - setEncryptionKeyButtonAudioLabel: "Schlüssel festlegen", - showEncryptionKey: "Schlüssel anzeigen", - randomizeKey: "Zufällig generieren", + deleteChatButton: "Gesamten Chat löschen", + }, - setColorButtonAudioLabel: "Farbe festlegen", + message: { + messagesHeadline: "Nachrichten", - deleteChatButton: "Gesamten Chat löschen", - }, + messageFilterHeadline: "Nachrichten filtern", + messageFilterReactionsHadline: "Reaktionen", + messageFilterAllReactionsButton: "Alle anzeigen", - message: { - messagesHeadline: "Nachrichten", + composerInputPlaceholder: "Schreib eine Nachricht...", + sendMessageButtonAudioLabel: "nachricht senden", + filterMessagesButtonAudioLabel: "nachrichten filtern", - messageFilterHeadline: "Nachrichten filtern", - messageFilterReactionsHadline: "Reaktionen", - messageFilterAllReactionsButton: "Alle anzeigen", + showMessageInfoButtonAudioLabel: "nachrichteninfo anzeigen", + messageInfoHeadline: "Nachrichteninfo", + cancelReplyAudioLabel: "antwort abbrechen", - composerInputPlaceholder: "Schreib eine Nachricht...", - sendMessageButtonAudioLabel: "nachricht senden", - filterMessagesButtonAudioLabel: "nachrichten filtern", + sentBy: "Gesendet von", + timeSent: "Sendezeit", + channel: "Kanal", + messageContent: "Nachrichteninhalt", - showMessageInfoButtonAudioLabel: "nachrichteninfo anzeigen", - messageInfoHeadline: "Nachrichteninfo", - cancelReplyAudioLabel: "antwort abbrechen", + copyMessageButton: "Nachricht kopieren", + resendMessageButton: "Nachricht erneut senden", + decryptMessageButton: "Nachricht entschlüsseln", + replyToMessageButton: "Auf Nachricht antworten", + deleteMessageButton: "Nachricht löschen", - sentBy: "Gesendet von", - timeSent: "Sendezeit", - channel: "Kanal", - messageContent: "Nachrichteninhalt", + // - copyMessageButton: "Nachricht kopieren", - resendMessageButton: "Nachricht erneut senden", - decryptMessageButton: "Nachricht entschlüsseln", - replyToMessageButton: "Auf Nachricht antworten", - deleteMessageButton: "Nachricht löschen", + thumbsUpReaction: "Reaktion: Daumen hoch", + checkReaction: "Reaktion: Haken", + stopReaction: "Reaktion: Stopp", + attentionReaction: "Reaktion: Ausrufezeichen", + doubleAttentionReaction: "Reaktion: doppeltes Ausrufezeichen", + questionReaction: "Reaktion: Fragezeichen", - // + replyPrefixLabel: "Antworten: ", + replyHeaderLabel: (message: string) => + `Antworten an "${message}"`, + }, - thumbsUpReaction: "Reaktion: Daumen hoch", - checkReaction: "Reaktion: Haken", - stopReaction: "Reaktion: Stopp", - attentionReaction: "Reaktion: Ausrufezeichen", - doubleAttentionReaction: "Reaktion: doppeltes Ausrufezeichen", - questionReaction: "Reaktion: Fragezeichen", + task: { + noBoardSelected: "Kein Board ausgewählt", + boardNotFound: "Board nicht gefunden", - replyPrefixLabel: "Antworten: ", - replyHeaderLabel: (message: string) => - `Antworten an "${message}"`, - }, + typeBoard: "Board", - task: { - noBoardSelected: "Kein Board ausgewählt", - boardNotFound: "Board nicht gefunden", + closeBoardButtonAudioLabel: "board schließen", + toggleBoardButtonAudioLabel: "board-liste ein/ausblenden", + showBoardSettingsButtonAudioLabel: + "Board-Einstellungen anzeigen", - typeBoard: "Board", + listViewButtonAudioLabel: "Listenansicht", + kanbanViewButtonAudioLabel: "Kanban-Ansicht", + statusViewButtonAudioLabel: "Statusrasteransicht", - closeBoardButtonAudioLabel: "board schließen", - toggleBoardButtonAudioLabel: "board-liste ein/ausblenden", - showBoardSettingsButtonAudioLabel: - "Board-Einstellungen anzeigen", + filterTasksButtonAudioLabel: "Aufgaben filtern", + createTaskButtonAudioLabel: "Neue Aufgabe erstellen", - listViewButtonAudioLabel: "Listenansicht", - kanbanViewButtonAudioLabel: "Kanban-Ansicht", - statusViewButtonAudioLabel: "Statusrasteransicht", + boardSettingsHeadline: "Board-Einstellungen", + boardNameInputLabel: "Boardname", + deleteBoardButton: "Board und alle Aufgaben löschen", - filterTasksButtonAudioLabel: "Aufgaben filtern", - createTaskButtonAudioLabel: "Neue Aufgabe erstellen", + taskSettingsHeadline: "Aufgabe bearbeiten", - boardSettingsHeadline: "Board-Einstellungen", - boardNameInputLabel: "Boardname", - deleteBoardButton: "Board und alle Aufgaben löschen", + taskNameLabel: "Titel", + taskBoardLabel: "Board", - taskSettingsHeadline: "Aufgabe bearbeiten", + taskCategoryLabel: "Kategorie", + taskStatusLabel: "Status", + taskPriorityLabel: "Priorität", - taskNameLabel: "Titel", - taskBoardLabel: "Board", + taskDescriptionLabel: "Beschreibung", - taskCategoryLabel: "Kategorie", - taskStatusLabel: "Status", - taskPriorityLabel: "Priorität", + taskDateLabel: "Datum", + taskTimeLabel: "Uhrzeit", - taskDescriptionLabel: "Beschreibung", + deleteTaskButton: "Aufgabe löschen", - taskDateLabel: "Datum", - taskTimeLabel: "Uhrzeit", + filterTasksHeadline: "Aufgaben filtern", - deleteTaskButton: "Aufgabe löschen", + renameCategoryInputPlaceholder: "Kategorie umbenennen", + renameStatusInputPlaceholder: "Status umbenennen", + }, - filterTasksHeadline: "Aufgaben filtern", + calendar: { + eventsBoard: "Ereignisse", - renameCategoryInputPlaceholder: "Kategorie umbenennen", - renameStatusInputPlaceholder: "Status umbenennen", - }, + /// - calendar: { - eventsBoard: "Ereignisse", + todayButtonAudioLabel: "gehe zu heute", - /// + previousMonthButtonAudioLabel: "vorheriger monat", + nextMonthButtonAudioLabel: "nächster monat", - todayButtonAudioLabel: "gehe zu heute", + yearInputAudioLabel: "Jahr", + monthInputAudioLabel: "Monat", - previousMonthButtonAudioLabel: "vorheriger monat", - nextMonthButtonAudioLabel: "nächster monat", + yearInputPlaceholder: "2000", + monthInputPlaceholder: "01", - yearInputAudioLabel: "Jahr", - monthInputAudioLabel: "Monat", + searchEventsHeadline: "Ereignisse suchen", - yearInputPlaceholder: "2000", - monthInputPlaceholder: "01", + events: "Ereignisse", + noEvents: "Keine Ereignisse", - searchEventsHeadline: "Ereignisse suchen", - - events: "Ereignisse", - noEvents: "Keine Ereignisse", - - eventNext: "Als nächstes", - }, - }, + eventNext: "Als nächstes", + }, + }, }, es: { - updater: { - migrated: "Migrado", - }, - - general: { - deleteItemButtonAudioLabel: "eliminar elemento", - searchButtonAudioLabel: "buscar", - searchButtonClearAudioLabel: "borrar büsqueda", - - abortButton: "Abortar", - applyButton: "Guardar", - backButton: "Atrás", - cancelButton: "Cancelar", - continueButton: "Continuar", - confirmButton: "Confirmar", - closeButton: "Cerrar", - deleteButton: "Borrar", - exitButton: "Salir", - fullscreenButton: "Pantalla completa", - refreshButton: "Actualizar", - saveButton: "Guardar", - setButton: "OK", - - filterOrCreateLabel: (type: string) => `Buscar o crear ${type}`, - createLabel: (query: string) => `Crear "${query}"`, - - reloadAppButton: "Recargar app", - - fileVersionLabel: "Versión", - searchLabel: "Buscar", - searchSuggestionsLabel: "Búsquedas anteriores", - waitingLabel: "Esperando...", - - restoreConnection: "Conectar de nuevo", - - noPageSelected: "No página seleccionada", - }, - - regional: { - weekdays: { - full: [ - "Domingo", - "Lunes", - "Martes", - "Miércoles", - "Jueves", - "Viernes", - "Sábado", - ], - abbreviated: ["Dom", "Lun", "Mar", "Mié", "Jue", "Vie", "Sáb"], - }, - }, - - homePage: { - appName: "Coordination Tool", - greeting: (name: string) => `Hola ${name}!`, - - serverAddress: "Dirección del servidor", - serverAddressPlaceholder: "wss://192.168.0.69:3000", - connectAudioLabel: "conectar al servidor", - disconnectAudioLabel: "desconectar del servidor", - manageConnectionsAudioLabel: "gestionar conexiones", - - settingsButton: "Ajustes", - manageStorageButton: "Gestionar almacenamiento", - transferDataButton: "Enviar o exportar archivos", - - updateButton: (version: string) => `Actualizar a ${version}`, - - typeChat: "chat", - noChatsPlaceholder: "No hay chats", - }, - - settings: { - pages: { - appearance: "Aspecto", - account: "Cuenta", - regional: "Idioma y Región", - info: "Sobre CT", - }, - themes: { - dynamic: "Dinámico", - dark: "Oscuro", - light: "Claro", - system: "Según dispositivo", - black: "Negro", - }, - account: { - yourNameLabel: "Tu nombre", - yourNamePlaceholder: "Juan Pérez", - setNameButtonAudioLabel: "establecer nombre", - }, - regional: { - language: "Idioma", - firstDayOfWeekLabel: "Primer día de la semana", - }, - about: { - version: "Versión", - checkUpdatesButton: "Buscar actualisaciones", - }, - }, - - onboarding: { - connectionHeadline: "Conectar al UDN", - connectionDescription: - "Para transferir datos y enviar mensajes, conéctate a la Red Descentralizada Universal (UDN).", - connectButton: "Conectar", - connectionNextButton: (isConnected: boolean): string => - isConnected ? "Continuar" : "Configurar sin UDN", - - /// - - transferOptionsHeadline: "Copiar tus datos", - transferOptionsDescription: - "Si ya usas el Coordination Tool en otro disposistivo, copia tu idantidad aquí. Puedes usar ambos dispositivos al mismo tiempo.", - transferOptionTransfer: "Copiar mis datos aquí", - transferOptionNew: "Configurar como dispositivo nuevo", - - // - - nameHeadline: "Tu nombre", - nameDescription: - "Esto es lo que ven otros cuando envías menajes. Siempre lo puedes cambiar en las ajustes.", - - // - - transferHeadline: "Transferencia de datos", - transferDescription: - "En el otro dispositivo, prepara la transferencia de tu identidad y datos personales. Ingresa los datos que se muestran a continuación. La opción de la transferencia de datos se encuentra en la pantalla inicial en el otro dispositivo.", - transferButton: "Copiar datos", - }, - - connectionModal: { - connectionModalHeadline: "Gestionar Conexiones", - - connectButtonAudioLabel: "conectar", - }, - - dataTransferModal: { - transferDataHeadline: "Transferencia de datos", - sendHeadline: "Enviar a otro dispositivo", - receiveHeadline: "Enviar a este dispositivo", - exportHeadline: "Exportar archivo", - importHeadline: "Importar archivo", - selectionDescription: - "Selecciona los datos que quieres transferir.", - exportSelectionDescription: - "Selecciona los datos que quieres exportar.", - dataEntryDescription: - "Introduce estos datos en el otro dispositivo.", - dataEntryInputDescription: - "Introduce los datos mostrados en el otro dispositivo.", - - fromThisDeviceButton: "Enviar a otro dispositivo", - toThisDeviceButton: "Enviar a este dispositivo", - exportButton: "Exportar archivo", - importButton: "Importar archivo", - - generalHeadline: "General", - - connectionData: "Datos de conexión", - settingsData: "Identidad y datos personales", - - chatsHeadline: "Chats", - - transferChannelHeadline: "Canal de Transferencia", - transferKeyHeadline: "Clave de encriptación de transferencia", - - sendButton: "Enviar", - sendAgainButton: "Enviar otra vez", - - filesSentCount: (count) => `Archivos enviados: ${count}.`, - allFilesSent: "Hecho.", - - filesReceivedCount: (count) => `Archivos recibidos: ${count}.`, - - exportKey: "Clave de encriptación", - exportKeyConfirmation: "Confirmar clave", - downloadFileButton: "Descargar", - importFileButton: "Importar", - decryptImportButton: "Descifrar", - incorrectPassphraseError: "La clave no es correcta", - }, - - storage: { - noItemSelected: "Ningún elemento seleccionado", - notAFile: "(no es un archivo)", - contentEmpty: "(vacío)", - - usageLabel: "Almacenamiento", - usageVauleLabel: (used: number, max: number) => - `${used} de ${max} MB en uso`, - - path: "Ruta", - content: "Contenido", - - deleteItem: "Eliminar elemento", - - removeJunkButton: "Eliminar archivos basura", - }, - - chatPage: { - closeChatAudioLabe: "cerrar chat", - chatSettingsAudioLabel: "configuración del chat", - - pages: { - settings: "Configuración", - messages: "Mensajes", - tasks: "Tareas", - calendar: "Calendario", - }, + updater: { + migrated: "Migrado", + }, + + general: { + deleteItemButtonAudioLabel: "eliminar elemento", + searchButtonAudioLabel: "buscar", + searchButtonClearAudioLabel: "borrar büsqueda", + + abortButton: "Abortar", + applyButton: "Guardar", + backButton: "Atrás", + cancelButton: "Cancelar", + continueButton: "Continuar", + confirmButton: "Confirmar", + closeButton: "Cerrar", + deleteButton: "Borrar", + exitButton: "Salir", + fullscreenButton: "Pantalla completa", + refreshButton: "Actualizar", + saveButton: "Guardar", + setButton: "OK", + + filterOrCreateLabel: (type: string) => `Buscar o crear ${type}`, + createLabel: (query: string) => `Crear "${query}"`, + + reloadAppButton: "Recargar app", + + fileVersionLabel: "Versión", + searchLabel: "Buscar", + searchSuggestionsLabel: "Búsquedas anteriores", + waitingLabel: "Esperando...", + + restoreConnection: "Conectar de nuevo", + + noPageSelected: "No página seleccionada", + }, + + regional: { + weekdays: { + full: [ + "Domingo", + "Lunes", + "Martes", + "Miércoles", + "Jueves", + "Viernes", + "Sábado", + ], + abbreviated: ["Dom", "Lun", "Mar", "Mié", "Jue", "Vie", "Sáb"], + }, + }, + + homePage: { + appName: "Coordination Tool", + greeting: (name: string) => `Hola ${name}!`, + + serverAddress: "Dirección del servidor", + serverAddressPlaceholder: "wss://192.168.0.69:3000", + connectAudioLabel: "conectar al servidor", + disconnectAudioLabel: "desconectar del servidor", + manageConnectionsAudioLabel: "gestionar conexiones", + + settingsButton: "Ajustes", + manageStorageButton: "Gestionar almacenamiento", + transferDataButton: "Enviar o exportar archivos", + + updateButton: (version: string) => `Actualizar a ${version}`, + + typeChat: "chat", + noChatsPlaceholder: "No hay chats", + }, + + settings: { + pages: { + appearance: "Aspecto", + account: "Cuenta", + regional: "Idioma y Región", + info: "Sobre CT", + }, + themes: { + dynamic: "Dinámico", + dark: "Oscuro", + light: "Claro", + system: "Según dispositivo", + black: "Negro", + }, + account: { + yourNameLabel: "Tu nombre", + yourNamePlaceholder: "Juan Pérez", + setNameButtonAudioLabel: "establecer nombre", + }, + regional: { + language: "Idioma", + firstDayOfWeekLabel: "Primer día de la semana", + }, + about: { + version: "Versión", + checkUpdatesButton: "Buscar actualisaciones", + }, + }, + + onboarding: { + connectionHeadline: "Conectar al UDN", + connectionDescription: + "Para transferir datos y enviar mensajes, conéctate a la Red Descentralizada Universal (UDN).", + connectButton: "Conectar", + connectionNextButton: (isConnected: boolean): string => + isConnected ? "Continuar" : "Configurar sin UDN", + + /// + + transferOptionsHeadline: "Copiar tus datos", + transferOptionsDescription: + "Si ya usas el Coordination Tool en otro disposistivo, copia tu idantidad aquí. Puedes usar ambos dispositivos al mismo tiempo.", + transferOptionTransfer: "Copiar mis datos aquí", + transferOptionNew: "Configurar como dispositivo nuevo", + + // + + nameHeadline: "Tu nombre", + nameDescription: + "Esto es lo que ven otros cuando envías menajes. Siempre lo puedes cambiar en las ajustes.", + + // + + transferHeadline: "Transferencia de datos", + transferDescription: + "En el otro dispositivo, prepara la transferencia de tu identidad y datos personales. Ingresa los datos que se muestran a continuación. La opción de la transferencia de datos se encuentra en la pantalla inicial en el otro dispositivo.", + transferButton: "Copiar datos", + }, + + connectionModal: { + connectionModalHeadline: "Gestionar Conexiones", + + connectButtonAudioLabel: "conectar", + }, + + dataTransferModal: { + transferDataHeadline: "Transferencia de datos", + sendHeadline: "Enviar a otro dispositivo", + receiveHeadline: "Enviar a este dispositivo", + exportHeadline: "Exportar archivo", + importHeadline: "Importar archivo", + selectionDescription: + "Selecciona los datos que quieres transferir.", + exportSelectionDescription: + "Selecciona los datos que quieres exportar.", + dataEntryDescription: + "Introduce estos datos en el otro dispositivo.", + dataEntryInputDescription: + "Introduce los datos mostrados en el otro dispositivo.", + + fromThisDeviceButton: "Enviar a otro dispositivo", + toThisDeviceButton: "Enviar a este dispositivo", + exportButton: "Exportar archivo", + importButton: "Importar archivo", + + generalHeadline: "General", + + connectionData: "Datos de conexión", + settingsData: "Identidad y datos personales", + + chatsHeadline: "Chats", + + transferChannelHeadline: "Canal de Transferencia", + transferKeyHeadline: "Clave de encriptación de transferencia", + + sendButton: "Enviar", + sendAgainButton: "Enviar otra vez", + + filesSentProgress: (progress: number, total: number) => + `${progress} de ${total} enviados`, + filesReceivedProgress: (progress: number, total: number) => + `${progress} de ${total} recibidos`, + + exportKey: "Clave de encriptación", + exportKeyConfirmation: "Confirmar clave", + downloadFileButton: "Descargar", + importFileButton: "Importar", + decryptImportButton: "Descifrar", + incorrectPassphraseError: "La clave no es correcta", + }, + + storage: { + noItemSelected: "Ningún elemento seleccionado", + notAFile: "(no es un archivo)", + contentEmpty: "(vacío)", + + usageLabel: "Almacenamiento", + usageVauleLabel: (used: number, max: number) => + `${used} de ${max} MB en uso`, + + path: "Ruta", + content: "Contenido", + + deleteItem: "Eliminar elemento", + + removeJunkButton: "Eliminar archivos basura", + }, + + chatPage: { + closeChatAudioLabe: "cerrar chat", + chatSettingsAudioLabel: "configuración del chat", + + pages: { + settings: "Configuración", + messages: "Mensajes", + tasks: "Tareas", + calendar: "Calendario", + }, - settings: { - settingsHeadline: "Configuración", + settings: { + settingsHeadline: "Configuración", - nameLabel: "Nombre del chat", - setNameButtonAudioLabel: "establecer nombre", + nameLabel: "Nombre del chat", + setNameButtonAudioLabel: "establecer nombre", - newSecondaryChannelPlaceholder: "Añadir canal secundario", - newSecondaryChannelAudioLabel: - "nombre del nuevo canal secundario", - addSecondaryChannelButtonAudioLabel: "añadir canal secundario", + newSecondaryChannelPlaceholder: "Añadir canal secundario", + newSecondaryChannelAudioLabel: + "nombre del nuevo canal secundario", + addSecondaryChannelButtonAudioLabel: "añadir canal secundario", - encryptionKeyLabel: "Clave de encriptación", - setEncryptionKeyButtonAudioLabel: - "establecer clave de encriptación", - showEncryptionKey: "Mostrar clave de encriptación", - randomizeKey: "Aleatorizar", + encryptionKeyLabel: "Clave de encriptación", + setEncryptionKeyButtonAudioLabel: + "establecer clave de encriptación", + showEncryptionKey: "Mostrar clave de encriptación", + randomizeKey: "Aleatorizar", - setColorButtonAudioLabel: "establecer color", + setColorButtonAudioLabel: "establecer color", - deleteChatButton: "Eliminar todo el chat", - }, + deleteChatButton: "Eliminar todo el chat", + }, - message: { - messagesHeadline: "Mensajes", + message: { + messagesHeadline: "Mensajes", - messageFilterHeadline: "Filtrar mensajes", - messageFilterReactionsHadline: "Reacciones", - messageFilterAllReactionsButton: "Mostrar todas", + messageFilterHeadline: "Filtrar mensajes", + messageFilterReactionsHadline: "Reacciones", + messageFilterAllReactionsButton: "Mostrar todas", - composerInputPlaceholder: "Escribe un mensaje...", - sendMessageButtonAudioLabel: "enviar mensaje", - filterMessagesButtonAudioLabel: "filtrar mensajes", + composerInputPlaceholder: "Escribe un mensaje...", + sendMessageButtonAudioLabel: "enviar mensaje", + filterMessagesButtonAudioLabel: "filtrar mensajes", - showMessageInfoButtonAudioLabel: - "mostrar información del mensaje", - messageInfoHeadline: "Información del Mensaje", - cancelReplyAudioLabel: "abortar la respuesta", + showMessageInfoButtonAudioLabel: + "mostrar información del mensaje", + messageInfoHeadline: "Información del Mensaje", + cancelReplyAudioLabel: "abortar la respuesta", - sentBy: "Enviado por", - timeSent: "Hora de envío", - channel: "Canal", - messageContent: "Contenido del mensaje", + sentBy: "Enviado por", + timeSent: "Hora de envío", + channel: "Canal", + messageContent: "Contenido del mensaje", - copyMessageButton: "Copiar mensaje", - resendMessageButton: "Reenviar mensaje", - decryptMessageButton: "Desencriptar mensaje", - replyToMessageButton: "Responder al mensaje", - deleteMessageButton: "Eliminar mensaje", + copyMessageButton: "Copiar mensaje", + resendMessageButton: "Reenviar mensaje", + decryptMessageButton: "Desencriptar mensaje", + replyToMessageButton: "Responder al mensaje", + deleteMessageButton: "Eliminar mensaje", - // + // - thumbsUpReaction: "Reacción: pulgar hacia arriba", - checkReaction: "Reacción: marca de verificación", - stopReaction: "Reacción: signo de parada", - attentionReaction: "Reaccion: signo de atención", - doubleAttentionReaction: "Reaccion: signo de atención doble", - questionReaction: "Reaccion: signo de interrogación", + thumbsUpReaction: "Reacción: pulgar hacia arriba", + checkReaction: "Reacción: marca de verificación", + stopReaction: "Reacción: signo de parada", + attentionReaction: "Reaccion: signo de atención", + doubleAttentionReaction: "Reaccion: signo de atención doble", + questionReaction: "Reaccion: signo de interrogación", - replyPrefixLabel: "Respuestas: ", - replyHeaderLabel: (message: string) => - `Respuestas a "${message}"`, - }, + replyPrefixLabel: "Respuestas: ", + replyHeaderLabel: (message: string) => + `Respuestas a "${message}"`, + }, - task: { - noBoardSelected: "Ningún tablero seleccionado", - boardNotFound: "Tablero no encontrado", + task: { + noBoardSelected: "Ningún tablero seleccionado", + boardNotFound: "Tablero no encontrado", - typeBoard: "board", + typeBoard: "board", - closeBoardButtonAudioLabel: "cerrar tablero", - toggleBoardButtonAudioLabel: - "mostrar o ocultar lista de tableros", - showBoardSettingsButtonAudioLabel: - "mostrar configuración del tablero", + closeBoardButtonAudioLabel: "cerrar tablero", + toggleBoardButtonAudioLabel: + "mostrar o ocultar lista de tableros", + showBoardSettingsButtonAudioLabel: + "mostrar configuración del tablero", - listViewButtonAudioLabel: "vista de lista", - kanbanViewButtonAudioLabel: "vista kanban", - statusViewButtonAudioLabel: "vista de cuadrícula de estado", + listViewButtonAudioLabel: "vista de lista", + kanbanViewButtonAudioLabel: "vista kanban", + statusViewButtonAudioLabel: "vista de cuadrícula de estado", - filterTasksButtonAudioLabel: "filtrar tareas", - createTaskButtonAudioLabel: "crear nueva tarea", + filterTasksButtonAudioLabel: "filtrar tareas", + createTaskButtonAudioLabel: "crear nueva tarea", - boardSettingsHeadline: "Configuración del Tablero", - boardNameInputLabel: "Nombre del tablero", - deleteBoardButton: "Eliminar tablero y todas las tareas", + boardSettingsHeadline: "Configuración del Tablero", + boardNameInputLabel: "Nombre del tablero", + deleteBoardButton: "Eliminar tablero y todas las tareas", - taskSettingsHeadline: "Editar Tarea", + taskSettingsHeadline: "Editar Tarea", - taskNameLabel: "Título", - taskBoardLabel: "Tablero", + taskNameLabel: "Título", + taskBoardLabel: "Tablero", - taskCategoryLabel: "Categoría", - taskStatusLabel: "Estado", - taskPriorityLabel: "Prioridad", + taskCategoryLabel: "Categoría", + taskStatusLabel: "Estado", + taskPriorityLabel: "Prioridad", - taskDescriptionLabel: "Descripción", + taskDescriptionLabel: "Descripción", - taskDateLabel: "Fecha", - taskTimeLabel: "Hora", + taskDateLabel: "Fecha", + taskTimeLabel: "Hora", - deleteTaskButton: "Eliminar tarea", + deleteTaskButton: "Eliminar tarea", - filterTasksHeadline: "Filtrar Tareas", + filterTasksHeadline: "Filtrar Tareas", - renameCategoryInputPlaceholder: "Renombrar categoría", - renameStatusInputPlaceholder: "Renombrar estado", - }, + renameCategoryInputPlaceholder: "Renombrar categoría", + renameStatusInputPlaceholder: "Renombrar estado", + }, - calendar: { - eventsBoard: "Eventos", + calendar: { + eventsBoard: "Eventos", - /// + /// - todayButtonAudioLabel: "ir a hoy", + todayButtonAudioLabel: "ir a hoy", - previousMonthButtonAudioLabel: "mes anterior", - nextMonthButtonAudioLabel: "mes siguiente", + previousMonthButtonAudioLabel: "mes anterior", + nextMonthButtonAudioLabel: "mes siguiente", - yearInputAudioLabel: "año", - monthInputAudioLabel: "mes", + yearInputAudioLabel: "año", + monthInputAudioLabel: "mes", - yearInputPlaceholder: "2000", - monthInputPlaceholder: "01", + yearInputPlaceholder: "2000", + monthInputPlaceholder: "01", - searchEventsHeadline: "Buscar Eventos", + searchEventsHeadline: "Buscar Eventos", - events: "Eventos", - noEvents: "No hay eventos", + events: "Eventos", + noEvents: "No hay eventos", - eventNext: "A continuación", - }, - }, + eventNext: "A continuación", + }, + }, }, }; diff --git a/src/ViewModel/Chat/chatListViewModel.ts b/src/ViewModel/Chat/chatListViewModel.ts index 76da14bf..31dbd62f 100644 --- a/src/ViewModel/Chat/chatListViewModel.ts +++ b/src/ViewModel/Chat/chatListViewModel.ts @@ -35,9 +35,7 @@ export default class ChatListViewModel { // methods createChat = (): void => { const chatModel: ChatModel = - this.coreViewModel.chatListModel.createChat( - this.chatQuery.value, - ); + this.coreViewModel.chatListModel.createChat(this.chatQuery.value); this.chatQuery.value = ""; const chatViewModel: ChatViewModel = @@ -108,8 +106,13 @@ export default class ChatListViewModel { ); this.loadChats(); - - implementFilter(this.chatViewModels, this.chatMatches, this.chatQuery, chat => chat.chatModel.info.name) + + implementFilter( + this.chatViewModels, + this.chatMatches, + this.chatQuery, + (chat) => chat.chatModel.info.name, + ); } // utility diff --git a/src/ViewModel/Global/coreViewModel.ts b/src/ViewModel/Global/coreViewModel.ts index 8627615f..2db92ce2 100644 --- a/src/ViewModel/Global/coreViewModel.ts +++ b/src/ViewModel/Global/coreViewModel.ts @@ -52,22 +52,23 @@ export default class CoreViewModel { ) return; - let exitNext: boolean = false; + let exitNext: boolean = false; while (this.contexts.length > 0) { const currentContext: Context | undefined = this.context; if (!currentContext) break; - const response = currentContext.handleContextClose(fromHistoryEvent); - if (response == false) break; + const response = + currentContext.handleContextClose(fromHistoryEvent); + if (response == false) break; this.contextStack.delete(currentContext.contextId); - if (response == true) { - exitNext = true; - continue; - } else if (exitNext == true) { - break - } else if (currentContext.contextId == contextId) { - break; - } + if (response == true) { + exitNext = true; + continue; + } else if (exitNext == true) { + break; + } else if (currentContext.contextId == contextId) { + break; + } } }; @@ -206,7 +207,7 @@ export class Context { }; close = (): void => {}; - handleContextClose = (fromHistoryEvent: boolean): void|boolean=> {}; + handleContextClose = (fromHistoryEvent: boolean): void | boolean => {}; registerKeyStroke = (key: string, fn: () => void): void => { this.keystrokes.set(key, fn); diff --git a/src/ViewModel/Global/fileTransferViewModel.ts b/src/ViewModel/Global/fileTransferViewModel.ts index 8eb253f5..ae37091b 100644 --- a/src/ViewModel/Global/fileTransferViewModel.ts +++ b/src/ViewModel/Global/fileTransferViewModel.ts @@ -11,7 +11,7 @@ import ChatModel from "../../Model/Chat/chatModel"; export default class FileTransferViewModel extends Context { // state - exitReception: () => void | undefined = undefined; + exitReception: (() => void) | undefined = undefined; presentedModal: React.State = new React.State(undefined); @@ -29,30 +29,14 @@ export default class FileTransferViewModel extends Context { receivingTransferKey: React.State = new React.State(""); filePathsSent: React.ListState = new React.ListState(); - filesSentCount: React.State = React.createProxyState( - [this.filePathsSent], - () => this.filePathsSent.value.size, - ); - filesSentText: React.State = React.createProxyState( - [this.filesSentCount], - () => - this.coreViewModel.translations.dataTransferModal.filesSentCount( - this.filesSentCount.value, - ), - ); + fileTransferTotal: React.State = new React.State(0); + fileTransferProgress: React.State = new React.State(0); filePathsReceived: React.ListState = new React.ListState(); filesReceivedCount: React.State = React.createProxyState( [this.filePathsReceived], () => this.filePathsReceived.value.size, ); - filesReceivedText: React.State = React.createProxyState( - [this.filesReceivedCount], - () => - this.coreViewModel.translations.dataTransferModal.filesReceivedCount( - this.filesReceivedCount.value, - ), - ); exportKey: React.State = new React.State(""); exportKeyConfirmation: React.State = new React.State(""); @@ -69,7 +53,6 @@ export default class FileTransferViewModel extends Context { [this.selectedPaths], () => this.selectedPaths.value.size == 0, ); - didNotFinishSending: React.State = new React.State(true); cannotPrepareToReceive: React.State = React.createProxyState( [this.receivingTransferChannel, this.receivingTransferKey], () => @@ -99,6 +82,7 @@ export default class FileTransferViewModel extends Context { // handlers handleReceivedFile = (path: string): void => { this.filePathsReceived.add(path); + this.fileTransferProgress.value = this.filePathsReceived.value.size; }; // methods @@ -229,7 +213,6 @@ export default class FileTransferViewModel extends Context { initiateTransfer = (): void => { this.presentedModal.value = FileTransferModals.TransferDisplay; - this.didNotFinishSending.value = true; this.filePathsSent.clear(); this.coreViewModel.fileTransferModel.sendFiles( @@ -238,8 +221,6 @@ export default class FileTransferViewModel extends Context { this.filePathsSent.add(path); }, ); - - this.didNotFinishSending.value = false; }; showTransferDataInputModal = (): void => { @@ -287,6 +268,11 @@ export default class FileTransferViewModel extends Context { constructor(public readonly coreViewModel: CoreViewModel) { super("file-transfer"); + this.coreViewModel.fileTransferModel.transferSizeHandlerManager.setHandler( + "file-transfer-view-model", + (count) => (this.fileTransferTotal.value = count), + ); + this.coreViewModel.fileTransferModel.fileHandlerManager.setHandler( "file-transfer-view-model", this.handleReceivedFile, diff --git a/src/ViewModel/Pages/boardViewModel.ts b/src/ViewModel/Pages/boardViewModel.ts index bd205615..d1fc9957 100644 --- a/src/ViewModel/Pages/boardViewModel.ts +++ b/src/ViewModel/Pages/boardViewModel.ts @@ -21,7 +21,7 @@ export default class BoardViewModel extends TaskContainingPageViewModel { index: React.State = new React.State(0); selectedPage: React.State = new React.State( - BoardPageTypes.List, + BoardPageTypes.List, ); isSelected: React.State; @@ -31,339 +31,339 @@ export default class BoardViewModel extends TaskContainingPageViewModel { searchViewModel: SearchViewModel; searchSuggestions = new React.ListState(); filteredTaskViewModels: React.ListState = - new React.ListState(); + new React.ListState(); isFilterActive: React.State; pinchToZoomData: React.State = new React.State({ - zoom: 1, - x: 0, - y: 0, + zoom: 1, + x: 0, + y: 0, }); // paths getBasePath = (): string[] => { - return [ - ...this.taskPageViewModel.getBoardViewPath(this.boardInfo.fileId), - ]; + return [ + ...this.taskPageViewModel.getBoardViewPath(this.boardInfo.fileId), + ]; }; getLastUsedBoardPath = (): string[] => { - return [...this.getBasePath(), BoardViewModelSubPaths.LastUsedView]; + return [...this.getBasePath(), BoardViewModelSubPaths.LastUsedView]; }; getPreviousSearchesPath = (): string[] => { - return [...this.getBasePath(), BoardViewModelSubPaths.PreviousSearches]; + return [...this.getBasePath(), BoardViewModelSubPaths.PreviousSearches]; }; getLastSearchPath = (): string[] => { - return [...this.getBasePath(), BoardViewModelSubPaths.LastSearch]; + return [...this.getBasePath(), BoardViewModelSubPaths.LastSearch]; }; // settings saveSettings = (): void => { - const newBoardInfoFileContent: BoardInfoFileContent = - BoardsAndTasksModel.createBoardInfoFileContent( - this.boardInfo.fileId, - this.name.value, - this.color.value, - ); + const newBoardInfoFileContent: BoardInfoFileContent = + BoardsAndTasksModel.createBoardInfoFileContent( + this.boardInfo.fileId, + this.name.value, + this.color.value, + ); - this.taskPageViewModel.updateBoard(newBoardInfoFileContent); + this.taskPageViewModel.updateBoard(newBoardInfoFileContent); }; applyColor = (): void => { - this.taskPageViewModel.chatViewModel.setDisplayedColor( - this.color.value, - ); + this.taskPageViewModel.chatViewModel.setDisplayedColor( + this.color.value, + ); }; deleteBoard = (): void => { - this.taskPageViewModel.deleteBoard(this.boardInfo); - this.chatViewModel.taskBoardSuggestions.remove(this.boardInfo.fileId); - this.close(); + this.taskPageViewModel.deleteBoard(this.boardInfo); + this.chatViewModel.taskBoardSuggestions.remove(this.boardInfo.fileId); + this.close(); }; // methods createTask = (): void => { - this.createTaskFromBoardId(this.boardInfo.fileId); + this.createTaskFromBoardId(this.boardInfo.fileId); }; handleDropWithinBoard = (category?: string, status?: string): void => { - const draggedObject: any = this.coreViewModel.draggedObject.value; - if (draggedObject instanceof TaskViewModel == false) return; - draggedObject.setCategoryAndStatus(category, status); + const draggedObject: any = this.coreViewModel.draggedObject.value; + if (draggedObject instanceof TaskViewModel == false) return; + draggedObject.setCategoryAndStatus(category, status); }; handleDropBetweenBoards = (): void => { - const draggedObject: any = this.coreViewModel.draggedObject.value; - if (draggedObject instanceof TaskViewModel == false) return; - draggedObject.setBoardId(this.boardInfo.fileId); + const draggedObject: any = this.coreViewModel.draggedObject.value; + if (draggedObject instanceof TaskViewModel == false) return; + draggedObject.setBoardId(this.boardInfo.fileId); }; // storage storeLastUsedView = (): void => { - const path: string[] = this.getLastUsedBoardPath(); - const lastUsedView: string = this.selectedPage.value; - this.coreViewModel.storageModel.write(path, lastUsedView); + const path: string[] = this.getLastUsedBoardPath(); + const lastUsedView: string = this.selectedPage.value; + this.coreViewModel.storageModel.write(path, lastUsedView); }; restoreLastUsedView = (): void => { - const path: string[] = this.getLastUsedBoardPath(); - const lastUsedView: string | null = - this.coreViewModel.storageModel.read(path); - if (lastUsedView == null) return; + const path: string[] = this.getLastUsedBoardPath(); + const lastUsedView: string | null = + this.coreViewModel.storageModel.read(path); + if (lastUsedView == null) return; - this.selectedPage.value = lastUsedView as BoardPageTypes; + this.selectedPage.value = lastUsedView as BoardPageTypes; }; handleNewSearch = (searchTerm: string): void => { - const suggestionPath: string[] = [ - ...this.getPreviousSearchesPath(), - searchTerm, - ]; - this.coreViewModel.storageModel.write(suggestionPath, ""); - if (!this.searchSuggestions.value.has(searchTerm) && searchTerm != "") { - this.searchSuggestions.add(searchTerm); - } + const suggestionPath: string[] = [ + ...this.getPreviousSearchesPath(), + searchTerm, + ]; + this.coreViewModel.storageModel.write(suggestionPath, ""); + if (!this.searchSuggestions.value.has(searchTerm) && searchTerm != "") { + this.searchSuggestions.add(searchTerm); + } - const lastSearchPath: string[] = this.getLastSearchPath(); - this.coreViewModel.storageModel.write(lastSearchPath, searchTerm); + const lastSearchPath: string[] = this.getLastSearchPath(); + this.coreViewModel.storageModel.write(lastSearchPath, searchTerm); }; handleSearchRemoved = (searchTerm: string): void => { - const suggestionPath: string[] = [ - ...this.getPreviousSearchesPath(), - searchTerm, - ]; - this.coreViewModel.storageModel.remove(suggestionPath); + const suggestionPath: string[] = [ + ...this.getPreviousSearchesPath(), + searchTerm, + ]; + this.coreViewModel.storageModel.remove(suggestionPath); }; // view showTask = (taskFileContent: TaskFileContent): void => { - if (taskFileContent.boardId != this.boardInfo.fileId) { - // remove task that was moved to different board - this.boardsAndTasksModel.deleteTaskReference( - this.boardInfo.fileId, - taskFileContent.fileId, - ); - this.removeTaskFromView(taskFileContent); - return; - } + if (taskFileContent.boardId != this.boardInfo.fileId) { + // remove task that was moved to different board + this.boardsAndTasksModel.deleteTaskReference( + this.boardInfo.fileId, + taskFileContent.fileId, + ); + this.removeTaskFromView(taskFileContent); + return; + } - const taskViewModel: TaskViewModel = new TaskViewModel( - this.coreViewModel, - this.chatViewModel, - this.boardsAndTasksModel, - this, - taskFileContent, - ); - this.taskViewModels.set(taskFileContent.fileId, taskViewModel); + const taskViewModel: TaskViewModel = new TaskViewModel( + this.coreViewModel, + this.chatViewModel, + this.boardsAndTasksModel, + this, + taskFileContent, + ); + this.taskViewModels.set(taskFileContent.fileId, taskViewModel); }; removeTaskFromView = (taskFileContent: TaskFileContent): void => { - this.taskViewModels.remove(taskFileContent.fileId); - this.updateIndex(); + this.taskViewModels.remove(taskFileContent.fileId); + this.updateIndex(); }; select = (): void => { - this.taskPageViewModel.selectBoard(this); + this.taskPageViewModel.selectBoard(this); }; close = (): void => { - this.taskPageViewModel.closeBoard(); - this.taskPageViewModel.storeLastUsedBoard(); - this.taskViewModels.clear(); + this.taskPageViewModel.closeBoard(); + this.taskPageViewModel.storeLastUsedBoard(); + this.taskViewModels.clear(); }; showSettings = (): void => { - this.isPresentingSettingsModal.value = true; + this.isPresentingSettingsModal.value = true; }; hideSettings = (): void => { - this.saveSettings(); - this.isPresentingSettingsModal.value = false; + this.saveSettings(); + this.isPresentingSettingsModal.value = false; }; showFilterModal = (): void => { - this.isPresentingFilterModal.value = true; + this.isPresentingFilterModal.value = true; }; hideFilterModal = (): void => { - this.isPresentingFilterModal.value = false; + this.isPresentingFilterModal.value = false; }; resetFilter = (): void => { - this.searchViewModel.search(""); + this.searchViewModel.search(""); }; updateIndex = (): void => { - const index: number = - this.taskPageViewModel.boardIndexManager.getIndex(this); - this.index.value = index; + const index: number = + this.taskPageViewModel.boardIndexManager.getIndex(this); + this.index.value = index; }; resetPinchZoom = (): void => { - this.pinchToZoomData.value = {x: 0, y: 0, zoom: 1}; - } + this.pinchToZoomData.value = { x: 0, y: 0, zoom: 1 }; + }; // load preloadData = (): void => { - this.name.value = this.boardInfo.name; - this.color.value = this.boardInfo.color; + this.name.value = this.boardInfo.name; + this.color.value = this.boardInfo.color; }; loadTasks = (): void => { - const taskIds: string[] = this.boardsAndTasksModel.listTaskIds( - this.boardInfo.fileId, - ); - for (const taskId of taskIds) { - if (this.taskViewModels.value.has(taskId)) continue; + const taskIds: string[] = this.boardsAndTasksModel.listTaskIds( + this.boardInfo.fileId, + ); + for (const taskId of taskIds) { + if (this.taskViewModels.value.has(taskId)) continue; - const taskFileContent: TaskFileContent | null = - this.boardsAndTasksModel.getLatestTaskFileContent(taskId); - if (taskFileContent == null) continue; + const taskFileContent: TaskFileContent | null = + this.boardsAndTasksModel.getLatestTaskFileContent(taskId); + if (taskFileContent == null) continue; - const taskViewModel: TaskViewModel = new TaskViewModel( - this.coreViewModel, - this.chatViewModel, - this.boardsAndTasksModel, - this, - taskFileContent, - ); - this.taskViewModels.set(taskFileContent.fileId, taskViewModel); - } + const taskViewModel: TaskViewModel = new TaskViewModel( + this.coreViewModel, + this.chatViewModel, + this.boardsAndTasksModel, + this, + taskFileContent, + ); + this.taskViewModels.set(taskFileContent.fileId, taskViewModel); + } - this.updateTaskIndices(); + this.updateTaskIndices(); }; loadSearchSuggestions = (): void => { - const dirPath: string[] = this.getPreviousSearchesPath(); - const searches: string[] = - this.coreViewModel.storageModel.list(dirPath); - this.searchSuggestions.add(...searches.filter((x) => x != "")); + const dirPath: string[] = this.getPreviousSearchesPath(); + const searches: string[] = + this.coreViewModel.storageModel.list(dirPath); + this.searchSuggestions.add(...searches.filter((x) => x != "")); }; restoreSearch = (): void => { - const lastSearchPath: string[] = this.getLastSearchPath(); - const lastSearch: string | null = - this.coreViewModel.storageModel.read(lastSearchPath); - if (lastSearch != null) { - this.searchViewModel.search(lastSearch); - } + const lastSearchPath: string[] = this.getLastSearchPath(); + const lastSearch: string | null = + this.coreViewModel.storageModel.read(lastSearchPath); + if (lastSearch != null) { + this.searchViewModel.search(lastSearch); + } }; loadData = (): void => { - this.restoreLastUsedView(); - this.loadTasks(); - this.loadSearchSuggestions(); + this.restoreLastUsedView(); + this.loadTasks(); + this.loadSearchSuggestions(); }; // exit handleContextClose = (fromHistoryEvent: boolean): void => { - this.taskPageViewModel.handleBoardClosed(this); + this.taskPageViewModel.handleBoardClosed(this); - if (!fromHistoryEvent) return; - this.taskPageViewModel.storeLastUsedBoard(); + if (!fromHistoryEvent) return; + this.taskPageViewModel.storeLastUsedBoard(); }; // init constructor( - public readonly coreViewModel: CoreViewModel, - public readonly chatViewModel: ChatViewModel, - public readonly boardsAndTasksModel: BoardsAndTasksModel, - public readonly taskPageViewModel: TaskPageViewModel, - public readonly boardInfo: BoardInfoFileContent, + public readonly coreViewModel: CoreViewModel, + public readonly chatViewModel: ChatViewModel, + public readonly boardsAndTasksModel: BoardsAndTasksModel, + public readonly taskPageViewModel: TaskPageViewModel, + public readonly boardInfo: BoardInfoFileContent, ) { - super(coreViewModel, chatViewModel, boardsAndTasksModel, "board"); + super(coreViewModel, chatViewModel, boardsAndTasksModel, "board"); - // load - this.preloadData(); - - // search - this.searchViewModel = new SearchViewModel( - this.taskViewModels, - this.filteredTaskViewModels, - TaskViewModel.getStringsForFilter, - this.searchSuggestions, - ); - this.searchViewModel.appliedQuery.subscribeSilent((newQuery) => { - this.handleNewSearch(newQuery); - }); - this.restoreSearch(); - this.searchSuggestions.handleRemovals(this.handleSearchRemoved); + // load + this.preloadData(); - this.isFilterActive = React.createProxyState( - [this.searchViewModel.appliedQuery], - () => this.searchViewModel.appliedQuery.value != "", - ); + // search + this.searchViewModel = new SearchViewModel( + this.taskViewModels, + this.filteredTaskViewModels, + TaskViewModel.getStringsForFilter, + this.searchSuggestions, + ); + this.searchViewModel.appliedQuery.subscribeSilent((newQuery) => { + this.handleNewSearch(newQuery); + }); + this.restoreSearch(); + this.searchSuggestions.handleRemovals(this.handleSearchRemoved); - // subscriptions - this.isSelected = React.createProxyState( - [this.taskPageViewModel.selectedBoardId], - () => - this.taskPageViewModel.selectedBoardId.value == - this.boardInfo.fileId, - ); + this.isFilterActive = React.createProxyState( + [this.searchViewModel.appliedQuery], + () => this.searchViewModel.appliedQuery.value != "", + ); - this.color.subscribe(() => { - if (this.isSelected.value == false) return; - if (this.chatViewModel.selectedPage.value != ChatPageTypes.Tasks) - return; - this.applyColor(); - }); + // subscriptions + this.isSelected = React.createProxyState( + [this.taskPageViewModel.selectedBoardId], + () => + this.taskPageViewModel.selectedBoardId.value == + this.boardInfo.fileId, + ); - this.selectedPage.subscribeSilent(() => { - this.storeLastUsedView(); - }); + this.color.subscribe(() => { + if (this.isSelected.value == false) return; + if (this.chatViewModel.selectedPage.value != ChatPageTypes.Tasks) + return; + this.applyColor(); + }); - this.searchViewModel.appliedQuery.subscribeSilent(()=> { - this.resetPinchZoom(); - }) + this.selectedPage.subscribeSilent(() => { + this.storeLastUsedView(); + }); - // handlers - boardsAndTasksModel.taskHandlerManager.setHandler( - this.boardInfo.fileId, - (taskFileContent: TaskFileContent) => { - if (taskFileContent.boardId != this.boardInfo.fileId) return; - this.showTask(taskFileContent); - this.updateTaskIndices(); - }, - ); + this.searchViewModel.appliedQuery.subscribeSilent(() => { + this.resetPinchZoom(); + }); - // keystrokes - this.registerKeyStroke(CommonKeys.Filter, this.showFilterModal); - this.registerKeyStroke(CommonKeys.Reset, this.resetFilter); // - this.registerKeyStroke(CommonKeys.CloseOrCancel, this.hideFilterModal); - this.registerKeyStroke(CommonKeys.Settings, this.showSettings); - this.registerKeyStroke(CommonKeys.Apply, this.hideSettings); - this.registerKeyStroke(CommonKeys.Create, this.createTask); + // handlers + boardsAndTasksModel.taskHandlerManager.setHandler( + this.boardInfo.fileId, + (taskFileContent: TaskFileContent) => { + if (taskFileContent.boardId != this.boardInfo.fileId) return; + this.showTask(taskFileContent); + this.updateTaskIndices(); + }, + ); - this.registerKeyStroke( - "j", - () => (this.selectedPage.value = BoardPageTypes.List), - ); - this.registerKeyStroke( - "k", - () => (this.selectedPage.value = BoardPageTypes.Kanban), - ); - this.registerKeyStroke( - "l", - () => (this.selectedPage.value = BoardPageTypes.StatusGrid), - ); + // keystrokes + this.registerKeyStroke(CommonKeys.Filter, this.showFilterModal); + this.registerKeyStroke(CommonKeys.Reset, this.resetFilter); // + this.registerKeyStroke(CommonKeys.CloseOrCancel, this.hideFilterModal); + this.registerKeyStroke(CommonKeys.Settings, this.showSettings); + this.registerKeyStroke(CommonKeys.Apply, this.hideSettings); + this.registerKeyStroke(CommonKeys.Create, this.createTask); - this.taskPageViewModel.registerContext(this.boardInfo.fileId, this); + this.registerKeyStroke( + "j", + () => (this.selectedPage.value = BoardPageTypes.List), + ); + this.registerKeyStroke( + "k", + () => (this.selectedPage.value = BoardPageTypes.Kanban), + ); + this.registerKeyStroke( + "l", + () => (this.selectedPage.value = BoardPageTypes.StatusGrid), + ); + + this.taskPageViewModel.registerContext(this.boardInfo.fileId, this); } } export enum BoardViewModelSubPaths { LastUsedView = "last-used-view", - PreviousSearches = "previous-searches", - LastSearch = "last-search", + PreviousSearches = "previous-searches", + LastSearch = "last-search", } // types export enum BoardPageTypes { List = "list", - Kanban = "kanban", - StatusGrid = "status-grid", + Kanban = "kanban", + StatusGrid = "status-grid", } diff --git a/src/ViewModel/Pages/calendarPageViewModel.ts b/src/ViewModel/Pages/calendarPageViewModel.ts index 3b215cf5..424593d9 100644 --- a/src/ViewModel/Pages/calendarPageViewModel.ts +++ b/src/ViewModel/Pages/calendarPageViewModel.ts @@ -219,12 +219,12 @@ export default class CalendarPageViewModel extends TaskContainingPageViewModel { }; loadData = (): void => {}; - + // context handleContextClose = (fromHistoryEvent: boolean): void | boolean => { - if (!fromHistoryEvent) return; - return true; - } + if (!fromHistoryEvent) return; + return true; + }; // init constructor( diff --git a/src/ViewModel/Pages/homeViewModel.ts b/src/ViewModel/Pages/homeViewModel.ts index 8f0bfd47..038cd378 100644 --- a/src/ViewModel/Pages/homeViewModel.ts +++ b/src/ViewModel/Pages/homeViewModel.ts @@ -1,34 +1,33 @@ -import * as React from "../../react"; - import StorageViewModel from "../Global/storageViewModel"; import SettingsViewModel from "../Global/settingsViewModel"; import FileTransferViewModel from "../Global/fileTransferViewModel"; import CoreViewModel, { Context } from "../Global/coreViewModel"; import ConnectionViewModel from "../Global/connectionViewModel"; +import * as React from "../../react"; import { CommonKeys } from "../../View/keystrokes"; export default class HomeViewModel extends Context { constructor( - public readonly coreViewModel: CoreViewModel, - public readonly settingsViewModel: SettingsViewModel, - public readonly fileTransferViewModel: FileTransferViewModel, - public readonly storageViewModel: StorageViewModel, - public readonly connectionViewModel: ConnectionViewModel, + public readonly coreViewModel: CoreViewModel, + public readonly settingsViewModel: SettingsViewModel, + public readonly fileTransferViewModel: FileTransferViewModel, + public readonly storageViewModel: StorageViewModel, + public readonly connectionViewModel: ConnectionViewModel, ) { - super("home"); + super("home"); - this.coreViewModel.context = this; + this.coreViewModel.context = this; - this.registerKeyStroke( - CommonKeys.Settings, - this.settingsViewModel.showSettingsModal, - ); - this.registerKeyStroke( - "t", - this.fileTransferViewModel.showDirectionSelectionModal, - ); - this.registerKeyStroke("e", this.storageViewModel.showStorageModal); - this.registerKeyStroke("x", this.connectionViewModel.disconnect); - this.registerKeyStroke("c", this.connectionViewModel.connect); + this.registerKeyStroke( + CommonKeys.Settings, + this.settingsViewModel.showSettingsModal, + ); + this.registerKeyStroke( + "t", + this.fileTransferViewModel.showDirectionSelectionModal, + ); + this.registerKeyStroke("e", this.storageViewModel.showStorageModal); + this.registerKeyStroke("x", this.connectionViewModel.disconnect); + this.registerKeyStroke("c", this.connectionViewModel.connect); } } diff --git a/src/ViewModel/Pages/messagePageViewModel.ts b/src/ViewModel/Pages/messagePageViewModel.ts index 36892ed3..8dad5d22 100644 --- a/src/ViewModel/Pages/messagePageViewModel.ts +++ b/src/ViewModel/Pages/messagePageViewModel.ts @@ -197,61 +197,61 @@ export default class MessagePageViewModel extends Context { }; // context - handleContextClose = (fromHistoryEvent: boolean):boolean=> { - if (fromHistoryEvent) { - if (this.replyViewSelectedMessage.value == undefined) return true; + handleContextClose = (fromHistoryEvent: boolean): boolean | void => { + if (fromHistoryEvent) { + if (this.replyViewSelectedMessage.value == undefined) return true; - this.resetReplyView(); - return false; - } - } + this.resetReplyView(); + return false; + } + }; // init constructor( - public readonly coreViewModel: CoreViewModel, - public readonly chatViewModel: ChatViewModel, - public readonly contactListViewModel: ContactListViewModel, + public readonly coreViewModel: CoreViewModel, + public readonly chatViewModel: ChatViewModel, + public readonly contactListViewModel: ContactListViewModel, ) { - super("message-page"); - this.restoreFilter(); + super("message-page"); + this.restoreFilter(); - // states - this.cannotSendMessage = React.createProxyState( - [ - this.chatViewModel.settingsViewModel.username, - this.composingMessage, - ], - () => - this.chatViewModel.settingsViewModel.username.value == "" || - this.composingMessage.value == "", - ); + // states + this.cannotSendMessage = React.createProxyState( + [ + this.chatViewModel.settingsViewModel.username, + this.composingMessage, + ], + () => + this.chatViewModel.settingsViewModel.username.value == "" || + this.composingMessage.value == "", + ); - this.searchViewModel = new SearchViewModel( - this.chatMessageViewModels, - this.filteredMessageViewModels, - (chatMessageViewModel) => [chatMessageViewModel.body.value], - new React.ListState(), - ); + this.searchViewModel = new SearchViewModel( + this.chatMessageViewModels, + this.filteredMessageViewModels, + (chatMessageViewModel) => [chatMessageViewModel.body.value], + new React.ListState(), + ); - this.isFilterActive = React.createProxyState( - [this.searchViewModel.appliedQuery, this.reactionFilter], - () => - this.searchViewModel.appliedQuery.value != "" || - this.reactionFilter.value != undefined, - ); + this.isFilterActive = React.createProxyState( + [this.searchViewModel.appliedQuery, this.reactionFilter], + () => + this.searchViewModel.appliedQuery.value != "" || + this.reactionFilter.value != undefined, + ); - // keystrokes - this.registerKeyStroke(CommonKeys.Filter, this.showFilterModal); - this.registerKeyStroke(CommonKeys.CloseOrCancel, () => { - if (this.isFilterModalOpen.value == true) { - this.hideFilterModal(); - } else { - this.replyingMessage.value = undefined; - } - }); - this.registerKeyStroke(CommonKeys.Reset, this.resetFilter); - this.registerKeyStroke(CommonKeys.Create, this.setFocus); + // keystrokes + this.registerKeyStroke(CommonKeys.Filter, this.showFilterModal); + this.registerKeyStroke(CommonKeys.CloseOrCancel, () => { + if (this.isFilterModalOpen.value == true) { + this.hideFilterModal(); + } else { + this.replyingMessage.value = undefined; + } + }); + this.registerKeyStroke(CommonKeys.Reset, this.resetFilter); + this.registerKeyStroke(CommonKeys.Create, this.setFocus); - this.chatViewModel.registerContext(ChatPageTypes.Messages, this); + this.chatViewModel.registerContext(ChatPageTypes.Messages, this); } } diff --git a/src/ViewModel/Pages/settingsPageViewModel.ts b/src/ViewModel/Pages/settingsPageViewModel.ts index ffea4328..397854a3 100644 --- a/src/ViewModel/Pages/settingsPageViewModel.ts +++ b/src/ViewModel/Pages/settingsPageViewModel.ts @@ -2,7 +2,7 @@ import CoreViewModel, { Context } from "../Global/coreViewModel"; import ChatViewModel, { ChatPageTypes } from "../Chat/chatViewModel"; import * as React from "../../react"; import { Colors } from "../../colors"; -import {random} from "../../Model/Utility/crypto"; +import { random } from "../../Model/Utility/crypto"; export default class SettingsPageViewModel extends Context { // state @@ -75,9 +75,8 @@ export default class SettingsPageViewModel extends Context { }; randomizeKey = (): void => { - this.encryptionKeyInput.value = random(24); - this.setEncryptionKey(); - } + this.encryptionKeyInput.value = random(24); + }; applyColor = (): void => { this.chatViewModel.setColor(this.color.value); @@ -123,9 +122,9 @@ export default class SettingsPageViewModel extends Context { // context handleContextClose = (fromHistoryEvent: boolean): void | boolean => { - if (!fromHistoryEvent) return; - return true; - } + if (!fromHistoryEvent) return; + return true; + }; // init constructor( diff --git a/src/ViewModel/Pages/taskPageViewModel.ts b/src/ViewModel/Pages/taskPageViewModel.ts index 7ce9a21e..52d16187 100644 --- a/src/ViewModel/Pages/taskPageViewModel.ts +++ b/src/ViewModel/Pages/taskPageViewModel.ts @@ -165,12 +165,12 @@ export default class TaskPageViewModel extends ContextHost { this.updateBoardIndices(); this.openLastUsedBoard(); }; - + // context handleContextClose = (fromHistoryEvent: boolean): void | boolean => { - if (!fromHistoryEvent) return; - return true; - } + if (!fromHistoryEvent) return; + return true; + }; // init constructor( diff --git a/src/ViewModel/Utility/searchViewModel.ts b/src/ViewModel/Utility/searchViewModel.ts index 311a961e..1a99343b 100644 --- a/src/ViewModel/Utility/searchViewModel.ts +++ b/src/ViewModel/Utility/searchViewModel.ts @@ -40,7 +40,7 @@ export default class SearchViewModel { clear = (): void => { this.searchInput.value = ""; - this.applySearch(); + this.applySearch(); }; deleteSuggestion = (suggestion: string): void => { diff --git a/src/base.css b/src/base.css index 43df30ab..44e98c59 100644 --- a/src/base.css +++ b/src/base.css @@ -29,8 +29,8 @@ main { z-index: -1; pointer-events: none; - - opacity: .3; + + opacity: 0.3; } #background-wrapper > div > div { @@ -143,6 +143,6 @@ body[theme="dark"] #background-wrapper #grass-2 { } body[keystroke-active] [ctkeystroke]::after { - opacity: .7; + opacity: 0.7; transform: translateY(0px); } diff --git a/src/index.tsx b/src/index.tsx index f7130bdf..9d5694dc 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -85,32 +85,32 @@ chatListViewModel.selectedChat.subscribe(() => { document.body.append(
-
-
-
-
-
+
+
+
+
+
, ); document .querySelector("main")! .append( - HomePage( - coreViewModel, - storageViewModel, - settingsViewModel, - connectionViewModel, - fileTransferViewModel, - chatListViewModel, - ), - ChatPageWrapper(coreViewModel, chatListViewModel), - OnboardingModalWrapper(coreViewModel, onboardingViewModel), - ConnectionModal(coreViewModel, connectionViewModel), - DataTransferModalWrapper( - coreViewModel, - connectionViewModel, - fileTransferViewModel, - ), - StorageModal(coreViewModel, storageViewModel), - SettingsModal(coreViewModel, settingsViewModel), + HomePage( + coreViewModel, + storageViewModel, + settingsViewModel, + connectionViewModel, + fileTransferViewModel, + chatListViewModel, + ), + ChatPageWrapper(coreViewModel, chatListViewModel), + OnboardingModalWrapper(coreViewModel, onboardingViewModel), + ConnectionModal(coreViewModel, connectionViewModel), + DataTransferModalWrapper( + coreViewModel, + connectionViewModel, + fileTransferViewModel, + ), + StorageModal(coreViewModel, storageViewModel), + SettingsModal(coreViewModel, settingsViewModel), );