This commit is contained in:
marlon-erler
2024-07-27 23:45:36 +02:00
parent f8ed893f79
commit 2c05e0b616
7 changed files with 44 additions and 31 deletions
+14 -14
View File
@@ -2637,7 +2637,7 @@
setNameButtonAudioLabel: "set name",
firstDayOfWeekLabel: "First day of week",
manageStorageButton: "Manage storage",
transferFilesButton: "Transfer Files",
transferDataButton: "Transfer Data",
scrollToChatButton: "Chats",
///
backToOverviewAudioLabel: "go back to overview",
@@ -2651,9 +2651,9 @@
///
connectButtonAudioLabel: "connect"
},
fileTransferModal: {
transferFilesHeadline: "Transfer Files",
selectionDescription: "Select the files that you want to transfer.",
dataTransferModal: {
transferDataHeadline: "Transfer Data",
selectionDescription: "Select the data that you want to transfer.",
///
fromThisDeviceButton: "From this device",
toThisDeviceButton: "To this device",
@@ -4438,10 +4438,10 @@
taskStatusSuggestions = new ListState();
};
// src/View/Modals/fileTransferModal.tsx
function FileTransferModal(fileTransferViewModel2) {
// src/View/Modals/dataTransferModal.tsx
function DataTransferModal(fileTransferViewModel2) {
const OptionConverter = (fileOption) => {
return FileOption(fileOption, fileTransferViewModel2);
return OptionEntry(fileOption, fileTransferViewModel2);
};
return /* @__PURE__ */ createElement(
"div",
@@ -4449,7 +4449,7 @@
class: "modal",
"toggle:open": fileTransferViewModel2.isShowingTransferModal
},
/* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, translations.fileTransferModal.transferFilesHeadline), /* @__PURE__ */ createElement("span", { class: "secondary" }, translations.fileTransferModal.selectionDescription), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("h3", null, translations.fileTransferModal.generalHeadline), /* @__PURE__ */ createElement(
/* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, translations.dataTransferModal.transferDataHeadline), /* @__PURE__ */ createElement("span", { class: "secondary" }, translations.dataTransferModal.selectionDescription), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("h3", null, translations.dataTransferModal.generalHeadline), /* @__PURE__ */ createElement(
"div",
{
class: "flex-column gap content-margin-bottom",
@@ -4458,7 +4458,7 @@
OptionConverter
]
}
), /* @__PURE__ */ createElement("h3", null, translations.fileTransferModal.chatsHeadline), /* @__PURE__ */ createElement(
), /* @__PURE__ */ createElement("h3", null, translations.dataTransferModal.chatsHeadline), /* @__PURE__ */ createElement(
"div",
{
class: "flex-column gap",
@@ -4485,7 +4485,7 @@
)))
);
}
function FileOption(fileOption, fileTransferViewModel2) {
function OptionEntry(fileOption, fileTransferViewModel2) {
const isSelected = new State(false);
isSelected.subscribeSilent((isSelected2) => {
if (isSelected2 == true) {
@@ -4587,11 +4587,11 @@
this.chatFileOptions.clear();
this.generalFileOptions.add(
{
label: translations.fileTransferModal.connectionData,
label: translations.dataTransferModal.connectionData,
path: StorageModel.getPath("connection" /* ConnectionModel */, [])
},
{
label: translations.fileTransferModal.settingsData,
label: translations.dataTransferModal.settingsData,
path: StorageModel.getPath("settings" /* SettingsModel */, [])
}
);
@@ -4729,7 +4729,7 @@
"on:click": fileTransferViewModel2.showTransferModal
},
/* @__PURE__ */ createElement("span", { class: "icon" }, "sync_alt"),
/* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translations.homePage.transferFilesButton))
/* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translations.homePage.transferDataButton))
), /* @__PURE__ */ createElement("button", { class: "tile flex-no", "on:click": storageViewModel2.showStorageModal }, /* @__PURE__ */ createElement("span", { class: "icon" }, "hard_drive_2"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translations.homePage.manageStorageButton))), /* @__PURE__ */ createElement("div", { class: "mobile-only" }, /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("div", { class: "flex-row justify-end" }, /* @__PURE__ */ createElement("button", { class: "ghost width-50", "on:click": scrollToChat }, translations.homePage.scrollToChatButton, /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_forward")))));
const chatSection = /* @__PURE__ */ createElement("div", { id: "chat-section" }, /* @__PURE__ */ createElement("h2", null, translations.homePage.chatsHeadline), /* @__PURE__ */ createElement("div", { class: "flex-row width-input" }, /* @__PURE__ */ createElement(
"input",
@@ -5228,7 +5228,7 @@
),
ChatPageWrapper(chatListViewModel),
ConnectionModal(connectionViewModel),
FileTransferModal(fileTransferViewModel),
DataTransferModal(fileTransferViewModel),
StorageModal(storageViewModel)
);
})();
+1 -1
View File
@@ -76,7 +76,7 @@ COLORS
@media (prefers-color-scheme: dark) {
:root {
--background: hsla(0, 0%, 9%, 100%);
--background-glass: hsla(0, 0%, 9%, 40%);
--background-glass: hsla(0, 0%, 9%, 20%);
--background-transparent: hsla(0, 0%, 100%, 5%);
--background-hover: hsla(0, 0%, 55%, 16%);
--background-active: hsla(0, 0%, 55%, 40%);
@@ -7,13 +7,13 @@ import FileTransferViewModel, {
import StorageModel from "../../Model/Global/storageModel";
import { translations } from "../translations";
export function FileTransferModal(
export function DataTransferModal(
fileTransferViewModel: FileTransferViewModel
) {
const OptionConverter: React.StateItemConverter<FileTransferOption> = (
fileOption: FileTransferOption
) => {
return FileOption(fileOption, fileTransferViewModel);
return OptionEntry(fileOption, fileTransferViewModel);
};
return (
@@ -23,14 +23,14 @@ export function FileTransferModal(
>
<div>
<main>
<h2>{translations.fileTransferModal.transferFilesHeadline}</h2>
<h2>{translations.dataTransferModal.transferDataHeadline}</h2>
<span class="secondary">
{translations.fileTransferModal.selectionDescription}
{translations.dataTransferModal.selectionDescription}
</span>
<hr></hr>
<h3>{translations.fileTransferModal.generalHeadline}</h3>
<h3>{translations.dataTransferModal.generalHeadline}</h3>
<div
class="flex-column gap content-margin-bottom"
children:append={[
@@ -39,7 +39,7 @@ export function FileTransferModal(
]}
></div>
<h3>{translations.fileTransferModal.chatsHeadline}</h3>
<h3>{translations.dataTransferModal.chatsHeadline}</h3>
<div
class="flex-column gap"
children:append={[
@@ -68,7 +68,7 @@ export function FileTransferModal(
);
}
function FileOption(
function OptionEntry(
fileOption: FileTransferOption,
fileTransferViewModel: FileTransferViewModel
) {
+1 -1
View File
@@ -124,7 +124,7 @@ export function HomePage(
>
<span class="icon">sync_alt</span>
<div>
<span>{translations.homePage.transferFilesButton}</span>
<span>{translations.homePage.transferDataButton}</span>
</div>
</button>
+4 -4
View File
@@ -56,7 +56,7 @@ const englishTranslations = {
manageStorageButton: "Manage storage",
transferFilesButton: "Transfer Files",
transferDataButton: "Transfer Data",
scrollToChatButton: "Chats",
@@ -78,9 +78,9 @@ const englishTranslations = {
connectButtonAudioLabel: "connect",
},
fileTransferModal: {
transferFilesHeadline: "Transfer Files",
selectionDescription: "Select the files that you want to transfer.",
dataTransferModal: {
transferDataHeadline: "Transfer Data",
selectionDescription: "Select the data that you want to transfer.",
///
+15 -2
View File
@@ -28,11 +28,11 @@ export default class FileTransferViewModel {
this.generalFileOptions.add(
{
label: translations.fileTransferModal.connectionData,
label: translations.dataTransferModal.connectionData,
path: StorageModel.getPath(StorageModelSubPath.ConnectionModel, []),
},
{
label: translations.fileTransferModal.settingsData,
label: translations.dataTransferModal.settingsData,
path: StorageModel.getPath(StorageModelSubPath.SettingsModel, []),
}
);
@@ -70,3 +70,16 @@ export interface FileTransferOption {
label: string;
path: string[];
}
export enum FileTransferModals {
DirectionSelection,
// sending
FileSelection,
TransferDataDisplay,
TransferDisplay,
// receiving
TransferDataInput,
ReceptionDisplay
}
+2 -2
View File
@@ -11,7 +11,7 @@ import { ConnectionModal } from "./View/Modals/connectionModal";
import ConnectionModel from "./Model/Global/connectionModel";
import ConnectionViewModel from "./ViewModel/Global/connectionViewModel";
import CoreViewModel from "./ViewModel/Global/coreViewModel";
import { FileTransferModal } from "./View/Modals/fileTransferModal";
import { DataTransferModal } from "./View/Modals/dataTransferModal";
import FileTransferModel from "./Model/Global/fileTransferModel";
import FileTransferViewModel from "./ViewModel/Global/fileTransferViewModel";
import { HomePage } from "./View/homePage";
@@ -83,6 +83,6 @@ document
),
ChatPageWrapper(chatListViewModel),
ConnectionModal(connectionViewModel),
FileTransferModal(fileTransferViewModel),
DataTransferModal(fileTransferViewModel),
StorageModal(storageViewModel)
);