From a798c7d8358cf16edde8c0291d3bc40d943e98a4 Mon Sep 17 00:00:00 2001 From: marlon-erler Date: Mon, 22 Jul 2024 19:52:08 +0200 Subject: [PATCH] reorganize --- src/Model/Chat/chatModel.ts | 2 +- src/Model/Files/fileModel.ts | 2 +- src/Model/Files/taskModel.ts | 2 +- src/View/ChatPages/messagePage.tsx | 2 +- src/View/ChatPages/settingsPage.tsx | 2 +- src/View/ChatPages/taskPage.tsx | 2 +- src/View/Components/chatMessage.tsx | 2 +- src/View/Components/directoryItemList.tsx | 2 +- src/View/Components/fileBrowser.tsx | 2 +- src/View/Modals/connectionModal.tsx | 2 +- src/View/Modals/storageModal.tsx | 2 +- src/View/homePage.tsx | 6 +++--- src/ViewModel/{ => Chat}/chatListViewModel.ts | 8 ++++---- src/ViewModel/{ => Chat}/chatMessageViewModel.ts | 2 +- src/ViewModel/{ => Chat}/chatViewModel.ts | 10 +++++----- src/ViewModel/{ => Global}/connectionViewModel.ts | 2 +- src/ViewModel/{ => Global}/settingsViewModel.ts | 2 +- src/ViewModel/{ => Global}/storageViewModel.ts | 4 ++-- src/{ViewModel => }/colors.ts | 0 src/index.tsx | 8 ++++---- 20 files changed, 32 insertions(+), 32 deletions(-) rename src/ViewModel/{ => Chat}/chatListViewModel.ts (90%) rename src/ViewModel/{ => Chat}/chatMessageViewModel.ts (94%) rename src/ViewModel/{ => Chat}/chatViewModel.ts (95%) rename src/ViewModel/{ => Global}/connectionViewModel.ts (97%) rename src/ViewModel/{ => Global}/settingsViewModel.ts (95%) rename src/ViewModel/{ => Global}/storageViewModel.ts (92%) rename src/{ViewModel => }/colors.ts (100%) diff --git a/src/Model/Chat/chatModel.ts b/src/Model/Chat/chatModel.ts index c74c721d..4890dd20 100644 --- a/src/Model/Chat/chatModel.ts +++ b/src/Model/Chat/chatModel.ts @@ -11,7 +11,7 @@ import { import { decryptString, encryptString } from "../Utility/crypto"; import ChatListModel from "./chatListModel"; -import { Color } from "../../ViewModel/colors"; +import { Color } from "../../colors"; import ConnectionModel from "../Global/connectionModel"; import SettingsModel from "../Global/settingsModel"; import { v4 } from "uuid"; diff --git a/src/Model/Files/fileModel.ts b/src/Model/Files/fileModel.ts index b23c4233..e204aab9 100644 --- a/src/Model/Files/fileModel.ts +++ b/src/Model/Files/fileModel.ts @@ -9,7 +9,7 @@ import { } from "../Utility/utility"; import ChatModel from "../Chat/chatModel"; -import { Color } from "../../ViewModel/colors"; +import { Color } from "../../colors"; import TaskModel from "./taskModel"; import { v4 } from "uuid"; diff --git a/src/Model/Files/taskModel.ts b/src/Model/Files/taskModel.ts index c6f2b199..fec231ab 100644 --- a/src/Model/Files/taskModel.ts +++ b/src/Model/Files/taskModel.ts @@ -7,7 +7,7 @@ import { import FileModel, { FileContent } from "./fileModel"; import ChatModel from "../Chat/chatModel"; -import { Color } from "../../ViewModel/colors"; +import { Color } from "../../colors"; import StorageModel from "../Global/storageModel"; import { v4 } from "uuid"; diff --git a/src/View/ChatPages/messagePage.tsx b/src/View/ChatPages/messagePage.tsx index cf734de2..0e991bc9 100644 --- a/src/View/ChatPages/messagePage.tsx +++ b/src/View/ChatPages/messagePage.tsx @@ -3,7 +3,7 @@ import "./messagePage.css"; import * as React from "bloatless-react"; import { ChatMessageViewModelToView } from "../Components/chatMessage"; -import ChatViewModel from "../../ViewModel/chatViewModel"; +import ChatViewModel from "../../ViewModel/Chat/chatViewModel"; import { translations } from "../translations"; export function MessagePage(chatViewModel: ChatViewModel) { diff --git a/src/View/ChatPages/settingsPage.tsx b/src/View/ChatPages/settingsPage.tsx index c6de5ea4..333407e2 100644 --- a/src/View/ChatPages/settingsPage.tsx +++ b/src/View/ChatPages/settingsPage.tsx @@ -1,7 +1,7 @@ import * as React from "bloatless-react"; import ChatViewModel from "../../ViewModel/chatViewModel"; -import { Color } from "../../ViewModel/colors"; +import { Color } from "../../colors"; import { DangerousActionButton } from "../Components/dangerousActionButton"; import { DeletableListItem } from "../Components/deletableListItem"; import { translations } from "../translations"; diff --git a/src/View/ChatPages/taskPage.tsx b/src/View/ChatPages/taskPage.tsx index ce54ce81..0a8617e5 100644 --- a/src/View/ChatPages/taskPage.tsx +++ b/src/View/ChatPages/taskPage.tsx @@ -1,6 +1,6 @@ import * as React from "bloatless-react"; -import ChatViewModel from "../../ViewModel/chatViewModel"; +import ChatViewModel from "../../ViewModel/Chat/chatViewModel"; import { translations } from "../translations"; export function TaskPage(chatViewModel: ChatViewModel) { diff --git a/src/View/Components/chatMessage.tsx b/src/View/Components/chatMessage.tsx index 2677bc2d..492ecb0d 100644 --- a/src/View/Components/chatMessage.tsx +++ b/src/View/Components/chatMessage.tsx @@ -2,7 +2,7 @@ import * as React from "bloatless-react"; import { ChatMessageInfoModal } from "./chatMessageInfoModal"; import { ChatMessageStatus } from "../../Model/Chat/chatModel"; -import ChatMessageViewModel from "../../ViewModel/chatMessageViewModel"; +import ChatMessageViewModel from "../../ViewModel/Chat/chatMessageViewModel"; import { translations } from "../translations"; export function ChatMessage(chatMessageViewModel: ChatMessageViewModel) { diff --git a/src/View/Components/directoryItemList.tsx b/src/View/Components/directoryItemList.tsx index 623cc992..2f292388 100644 --- a/src/View/Components/directoryItemList.tsx +++ b/src/View/Components/directoryItemList.tsx @@ -4,7 +4,7 @@ import StorageModel, { PATH_COMPONENT_SEPARATOR, } from "../../Model/Global/storageModel"; -import StorageViewModel from "../../ViewModel/storageViewModel"; +import StorageViewModel from "../../ViewModel/Global/storageViewModel"; export function DirectoryItemList( storageViewModel: StorageViewModel, diff --git a/src/View/Components/fileBrowser.tsx b/src/View/Components/fileBrowser.tsx index dd2b22b3..23314d0e 100644 --- a/src/View/Components/fileBrowser.tsx +++ b/src/View/Components/fileBrowser.tsx @@ -5,7 +5,7 @@ import * as React from "bloatless-react"; import { DangerousActionButton } from "./dangerousActionButton"; import { DirectoryItemList } from "./directoryItemList"; import { PATH_COMPONENT_SEPARATOR } from "../../Model/Global/storageModel"; -import StorageViewModel from "../../ViewModel/storageViewModel"; +import StorageViewModel from "../../ViewModel/Global/storageViewModel"; import { translations } from "../translations"; export function FileBrowser(storageViewModel: StorageViewModel) { diff --git a/src/View/Modals/connectionModal.tsx b/src/View/Modals/connectionModal.tsx index 8817ab9c..99aa81bf 100644 --- a/src/View/Modals/connectionModal.tsx +++ b/src/View/Modals/connectionModal.tsx @@ -1,6 +1,6 @@ import * as React from "bloatless-react"; -import ConnectionViewModel from "../../ViewModel/connectionViewModel"; +import ConnectionViewModel from "../../ViewModel/Global/connectionViewModel"; import { DeletableListItem } from "../Components/deletableListItem"; import { translations } from "../translations"; diff --git a/src/View/Modals/storageModal.tsx b/src/View/Modals/storageModal.tsx index 263e2cad..e6413aa6 100644 --- a/src/View/Modals/storageModal.tsx +++ b/src/View/Modals/storageModal.tsx @@ -1,7 +1,7 @@ import * as React from "bloatless-react"; import { FileBrowser } from "../Components/fileBrowser"; -import StorageViewModel from "../../ViewModel/storageViewModel"; +import StorageViewModel from "../../ViewModel/Global/storageViewModel"; import { translations } from "../translations"; export function StorageModal(storageViewModel: StorageViewModel) { diff --git a/src/View/homePage.tsx b/src/View/homePage.tsx index b760251e..83e8f726 100644 --- a/src/View/homePage.tsx +++ b/src/View/homePage.tsx @@ -6,9 +6,9 @@ import { Option, StringToOption } from "./Components/option"; import ChatListViewModel from "../ViewModel/chatListViewModel"; import { ChatViewModelToChatEntry } from "./Components/chatEntry"; -import ConnectionViewModel from "../ViewModel/connectionViewModel"; -import SettingsViewModel from "../ViewModel/settingsViewModel"; -import StorageViewModel from "../ViewModel/storageViewModel"; +import ConnectionViewModel from "../ViewModel/Global/connectionViewModel"; +import SettingsViewModel from "../ViewModel/Global/settingsViewModel"; +import StorageViewModel from "../ViewModel/Global/storageViewModel"; import { translations } from "./translations"; export function HomePage( diff --git a/src/ViewModel/chatListViewModel.ts b/src/ViewModel/Chat/chatListViewModel.ts similarity index 90% rename from src/ViewModel/chatListViewModel.ts rename to src/ViewModel/Chat/chatListViewModel.ts index 0dd6e831..d46a3c94 100644 --- a/src/ViewModel/chatListViewModel.ts +++ b/src/ViewModel/Chat/chatListViewModel.ts @@ -1,10 +1,10 @@ import * as React from "bloatless-react"; -import ChatListModel from "../Model/Chat/chatListModel"; -import ChatModel from "../Model/Chat/chatModel"; +import ChatListModel from "../../Model/Chat/chatListModel"; +import ChatModel from "../../Model/Chat/chatModel"; import ChatViewModel from "./chatViewModel"; -import SettingsViewModel from "./settingsViewModel"; -import StorageModel from "../Model/Global/storageModel"; +import SettingsViewModel from "../Global/settingsViewModel"; +import StorageModel from "../../Model/Global/storageModel"; export default class ChatListViewModel { chatListModel: ChatListModel; diff --git a/src/ViewModel/chatMessageViewModel.ts b/src/ViewModel/Chat/chatMessageViewModel.ts similarity index 94% rename from src/ViewModel/chatMessageViewModel.ts rename to src/ViewModel/Chat/chatMessageViewModel.ts index 4523e15a..e5ed9940 100644 --- a/src/ViewModel/chatMessageViewModel.ts +++ b/src/ViewModel/Chat/chatMessageViewModel.ts @@ -2,7 +2,7 @@ import * as React from "bloatless-react"; -import { ChatMessage, ChatMessageStatus } from "../Model/Chat/chatModel"; +import { ChatMessage, ChatMessageStatus } from "../../Model/Chat/chatModel"; import ChatViewModel from "./chatViewModel"; diff --git a/src/ViewModel/chatViewModel.ts b/src/ViewModel/Chat/chatViewModel.ts similarity index 95% rename from src/ViewModel/chatViewModel.ts rename to src/ViewModel/Chat/chatViewModel.ts index 3f732da4..9c653d4e 100644 --- a/src/ViewModel/chatViewModel.ts +++ b/src/ViewModel/Chat/chatViewModel.ts @@ -1,13 +1,13 @@ import * as React from "bloatless-react"; -import ChatModel, { ChatMessage } from "../Model/Chat/chatModel"; -import StorageModel, { filePaths } from "../Model/Global/storageModel"; +import ChatModel, { ChatMessage } from "../../Model/Chat/chatModel"; +import StorageModel, { filePaths } from "../../Model/Global/storageModel"; import ChatListViewModel from "./chatListViewModel"; import ChatMessageViewModel from "./chatMessageViewModel"; -import { Color } from "./colors"; -import SettingsViewModel from "./settingsViewModel"; -import { localeCompare } from "../Model/Utility/utility"; +import { Color } from "../../colors"; +import SettingsViewModel from "../Global/settingsViewModel"; +import { localeCompare } from "../../Model/Utility/utility"; export default class ChatViewModel { chatModel: ChatModel; diff --git a/src/ViewModel/connectionViewModel.ts b/src/ViewModel/Global/connectionViewModel.ts similarity index 97% rename from src/ViewModel/connectionViewModel.ts rename to src/ViewModel/Global/connectionViewModel.ts index 2e81fee1..55b976d1 100644 --- a/src/ViewModel/connectionViewModel.ts +++ b/src/ViewModel/Global/connectionViewModel.ts @@ -1,6 +1,6 @@ import * as React from "bloatless-react"; -import ConnectionModel from "../Model/Global/connectionModel"; +import ConnectionModel from "../../Model/Global/connectionModel"; export default class ConnectionViewModel { connectionModel: ConnectionModel; diff --git a/src/ViewModel/settingsViewModel.ts b/src/ViewModel/Global/settingsViewModel.ts similarity index 95% rename from src/ViewModel/settingsViewModel.ts rename to src/ViewModel/Global/settingsViewModel.ts index 23ab05a0..a0288c6b 100644 --- a/src/ViewModel/settingsViewModel.ts +++ b/src/ViewModel/Global/settingsViewModel.ts @@ -1,6 +1,6 @@ import * as React from "bloatless-react"; -import SettingsModel from "../Model/Global/settingsModel"; +import SettingsModel from "../../Model/Global/settingsModel"; export default class SettingsViewModel { settingsModel: SettingsModel; diff --git a/src/ViewModel/storageViewModel.ts b/src/ViewModel/Global/storageViewModel.ts similarity index 92% rename from src/ViewModel/storageViewModel.ts rename to src/ViewModel/Global/storageViewModel.ts index a2afbd81..3ee10445 100644 --- a/src/ViewModel/storageViewModel.ts +++ b/src/ViewModel/Global/storageViewModel.ts @@ -1,8 +1,8 @@ import * as React from "bloatless-react"; -import StorageModel, { PATH_COMPONENT_SEPARATOR } from "../Model/Global/storageModel"; +import StorageModel, { PATH_COMPONENT_SEPARATOR } from "../../Model/Global/storageModel"; -import { translations } from "../View/translations"; +import { translations } from "../../View/translations"; export default class StorageViewModel { storageModel: StorageModel; diff --git a/src/ViewModel/colors.ts b/src/colors.ts similarity index 100% rename from src/ViewModel/colors.ts rename to src/colors.ts diff --git a/src/index.tsx b/src/index.tsx index aafba104..89089a9c 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -4,17 +4,17 @@ import "./colors.css"; import * as React from "bloatless-react"; import ChatListModel from "./Model/Chat/chatListModel"; -import ChatListViewModel from "./ViewModel/chatListViewModel"; +import ChatListViewModel from "./ViewModel/Chat/chatListViewModel"; import { ChatPageWrapper } from "./View/chatPageWrapper"; import { ConnectionModal } from "./View/Modals/connectionModal"; import ConnectionModel from "./Model/Global/connectionModel"; -import ConnectionViewModel from "./ViewModel/connectionViewModel"; +import ConnectionViewModel from "./ViewModel/Global/connectionViewModel"; import { HomePage } from "./View/homePage"; import SettingsModel from "./Model/Global/settingsModel"; -import SettingsViewModel from "./ViewModel/settingsViewModel"; +import SettingsViewModel from "./ViewModel/Global/settingsViewModel"; import { StorageModal } from "./View/Modals/storageModal"; import StorageModel from "./Model/Global/storageModel"; -import StorageViewModel from "./ViewModel/storageViewModel"; +import StorageViewModel from "./ViewModel/Global/storageViewModel"; // models const storageModel = new StorageModel();