reorganize

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";

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";
 

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";
 

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) {

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";

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) {

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) {

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,

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) {

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";
 

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) {

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 ConnectionViewModel from "../ViewModel/Global/connectionViewModel";
-import SettingsViewModel from "../ViewModel/settingsViewModel";
+import SettingsViewModel from "../ViewModel/Global/settingsViewModel";
-import StorageViewModel from "../ViewModel/storageViewModel";
+import StorageViewModel from "../ViewModel/Global/storageViewModel";
 import { translations } from "./translations";
 
 export function HomePage(

src/ViewModel/Chat/chatListViewModel.ts

@@ -1,10 +1,10 @@
 import * as React from "bloatless-react";
 
-import ChatListModel from "../Model/Chat/chatListModel";
+import ChatListModel from "../../Model/Chat/chatListModel";
-import ChatModel from "../Model/Chat/chatModel";
+import ChatModel from "../../Model/Chat/chatModel";
 import ChatViewModel from "./chatViewModel";
-import SettingsViewModel from "./settingsViewModel";
+import SettingsViewModel from "../Global/settingsViewModel";
-import StorageModel from "../Model/Global/storageModel";
+import StorageModel from "../../Model/Global/storageModel";
 
 export default class ChatListViewModel {
   chatListModel: ChatListModel;

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";
 

src/ViewModel/Chat/chatViewModel.ts

@@ -1,13 +1,13 @@
 import * as React from "bloatless-react";
 
-import ChatModel, { ChatMessage } from "../Model/Chat/chatModel";
+import ChatModel, { ChatMessage } from "../../Model/Chat/chatModel";
-import StorageModel, { filePaths } from "../Model/Global/storageModel";
+import StorageModel, { filePaths } from "../../Model/Global/storageModel";
 
 import ChatListViewModel from "./chatListViewModel";
 import ChatMessageViewModel from "./chatMessageViewModel";
-import { Color } from "./colors";
+import { Color } from "../../colors";
-import SettingsViewModel from "./settingsViewModel";
+import SettingsViewModel from "../Global/settingsViewModel";
-import { localeCompare } from "../Model/Utility/utility";
+import { localeCompare } from "../../Model/Utility/utility";
 
 export default class ChatViewModel {
   chatModel: ChatModel;

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;

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;

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;

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();