diff --git a/dist/index.js b/dist/index.js index 7c0aae60..19a88d57 100644 --- a/dist/index.js +++ b/dist/index.js @@ -335,7 +335,7 @@ return a.localeCompare(b); } - // src/Model/storageModel.ts + // src/Model/Global/storageModel.ts var PATH_COMPONENT_SEPARATOR = "\\"; var StorageModel = class _StorageModel { storageEntryTree = {}; @@ -467,7 +467,7 @@ chatFiles: [DATA_VERSION, "chat", "files"] }; - // src/Model/fileModel.ts + // src/Model/Files/fileModel.ts var FileModel = class _FileModel { chatModel; storageModel; @@ -642,7 +642,7 @@ return Color2; })(Color || {}); - // src/Model/chatModel.ts + // src/Model/Chat/chatModel.ts var ChatModel = class _ChatModel { connectionModel; storageModel; @@ -867,7 +867,7 @@ stringifiedFile: "" }; - // src/Model/chatListModel.ts + // src/Model/Chat/chatListModel.ts var ChatListModel = class { storageModel; settingsModel; @@ -1826,7 +1826,7 @@ } }; - // src/Model/connectionModel.ts + // src/Model/Global/connectionModel.ts var ConnectionModel = class { udn; storageModel; @@ -2198,7 +2198,7 @@ return /* @__PURE__ */ createElement("article", { id: "home-page" }, /* @__PURE__ */ createElement("div", null, overviewSection, chatSection)); } - // src/Model/settingsModel.ts + // src/Model/Global/settingsModel.ts var SettingsModel = class { storageModel; username; diff --git a/src/Model/chatListModel.ts b/src/Model/Chat/chatListModel.ts similarity index 91% rename from src/Model/chatListModel.ts rename to src/Model/Chat/chatListModel.ts index 8bc2fdcd..4364f0b2 100644 --- a/src/Model/chatListModel.ts +++ b/src/Model/Chat/chatListModel.ts @@ -1,10 +1,10 @@ -import StorageModel, { storageKeys } from "./storageModel"; +import StorageModel, { storageKeys } from "../Global/storageModel"; import ChatModel from "./chatModel"; -import ConnectionModel from "./connectionModel"; +import ConnectionModel from "../Global/connectionModel"; import { Message } from "udn-frontend"; -import SettingsModel from "./settingsModel"; -import { localeCompare } from "./Utility/utility"; +import SettingsModel from "../Global/settingsModel"; +import { localeCompare } from "../Utility/utility"; import { v4 } from "uuid"; export default class ChatListModel { diff --git a/src/Model/chatModel.ts b/src/Model/Chat/chatModel.ts similarity index 94% rename from src/Model/chatModel.ts rename to src/Model/Chat/chatModel.ts index 97f50555..e2fd914c 100644 --- a/src/Model/chatModel.ts +++ b/src/Model/Chat/chatModel.ts @@ -1,19 +1,19 @@ // this file is responsible for managing chats. -import { DATA_VERSION, ValidObject } from "./Utility/typeSafety"; -import FileModel, { File } from "./fileModel"; -import StorageModel, { storageKeys } from "./storageModel"; +import { DATA_VERSION, ValidObject } from "../Utility/typeSafety"; +import FileModel, { File } from "../Files/fileModel"; +import StorageModel, { storageKeys } from "../Global/storageModel"; import { createTimestamp, parseValidObject, stringify, -} from "./Utility/utility"; -import { decryptString, encryptString } from "./Utility/crypto"; +} from "../Utility/utility"; +import { decryptString, encryptString } from "../Utility/crypto"; import ChatListModel from "./chatListModel"; -import { Color } from "../ViewModel/colors"; -import ConnectionModel from "./connectionModel"; -import SettingsModel from "./settingsModel"; +import { Color } from "../../ViewModel/colors"; +import ConnectionModel from "../Global/connectionModel"; +import SettingsModel from "../Global/settingsModel"; import { v4 } from "uuid"; export default class ChatModel { diff --git a/src/Model/fileModel.ts b/src/Model/Files/fileModel.ts similarity index 93% rename from src/Model/fileModel.ts rename to src/Model/Files/fileModel.ts index b38c18ff..9d3b16e9 100644 --- a/src/Model/fileModel.ts +++ b/src/Model/Files/fileModel.ts @@ -1,10 +1,10 @@ // this file is responsible for managing files within chats. -import { DATA_VERSION, ValidObject } from "./Utility/typeSafety"; -import StorageModel, { storageKeys } from "./storageModel"; -import { parseValidObject, stringify } from "./Utility/utility"; +import { DATA_VERSION, ValidObject } from "../Utility/typeSafety"; +import StorageModel, { storageKeys } from "../Global/storageModel"; +import { parseValidObject, stringify } from "../Utility/utility"; -import ChatModel from "./chatModel"; +import ChatModel from "../Chat/chatModel"; import { v4 } from "uuid"; export default class FileModel { diff --git a/src/Model/Files/taskModel.ts b/src/Model/Files/taskModel.ts new file mode 100644 index 00000000..e21ca9a1 --- /dev/null +++ b/src/Model/Files/taskModel.ts @@ -0,0 +1,20 @@ +// thile file is responsible for managing task files within chats. + +import { FileContent } from "./fileModel"; + +export default class TaskFileModel {} + +// types +export interface TaskFileContent extends FileContent { + type: "task", + + board: string; + category?: string; + status?: string; + + description?: string; + + priority?: number; + date?: string; + time?: string; +} \ No newline at end of file diff --git a/src/Model/connectionModel.ts b/src/Model/Global/connectionModel.ts similarity index 98% rename from src/Model/connectionModel.ts rename to src/Model/Global/connectionModel.ts index e3bb1339..308d78e9 100644 --- a/src/Model/connectionModel.ts +++ b/src/Model/Global/connectionModel.ts @@ -1,10 +1,10 @@ // this file is responsible for managing UDN connections. -import { ChatMessage, ChatMessageReference } from "./chatModel"; +import { ChatMessage, ChatMessageReference } from "../Chat/chatModel"; import StorageModel, { storageKeys } from "./storageModel"; import UDNFrontend, { Message } from "udn-frontend"; -import { stringify } from "./Utility/utility"; +import { stringify } from "../Utility/utility"; export default class ConnectionModel { udn: UDNFrontend; diff --git a/src/Model/settingsModel.ts b/src/Model/Global/settingsModel.ts similarity index 100% rename from src/Model/settingsModel.ts rename to src/Model/Global/settingsModel.ts diff --git a/src/Model/storageModel.ts b/src/Model/Global/storageModel.ts similarity index 97% rename from src/Model/storageModel.ts rename to src/Model/Global/storageModel.ts index a2d66c99..c758d23a 100644 --- a/src/Model/storageModel.ts +++ b/src/Model/Global/storageModel.ts @@ -4,8 +4,8 @@ import { DATA_VERSION, ValidObject, checkMatchesObjectStructure, -} from "./Utility/typeSafety"; -import { localeCompare, parseValidObject, stringify } from "./Utility/utility"; +} from "../Utility/typeSafety"; +import { localeCompare, parseValidObject, stringify } from "../Utility/utility"; export const PATH_COMPONENT_SEPARATOR = "\\"; diff --git a/src/View/Components/chatMessage.tsx b/src/View/Components/chatMessage.tsx index 8ab0762d..2677bc2d 100644 --- a/src/View/Components/chatMessage.tsx +++ b/src/View/Components/chatMessage.tsx @@ -1,8 +1,8 @@ import * as React from "bloatless-react"; import { ChatMessageInfoModal } from "./chatMessageInfoModal"; -import { ChatMessageStatus } from "../../Model/chatModel"; -import ChatMessageViewModel from "../../Model/chatMessageViewModel"; +import { ChatMessageStatus } from "../../Model/Chat/chatModel"; +import ChatMessageViewModel from "../../ViewModel/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 46c90e57..31b86a23 100644 --- a/src/View/Components/directoryItemList.tsx +++ b/src/View/Components/directoryItemList.tsx @@ -1,8 +1,6 @@ import * as React from "bloatless-react"; -import StorageModel, { - PATH_COMPONENT_SEPARATOR, -} from "../../Model/storageModel"; +import StorageModel, { PATH_COMPONENT_SEPARATOR } from "../../Model/Global/storageModel"; import StorageViewModel from "../../ViewModel/storageViewModel"; diff --git a/src/View/Components/fileBrowser.tsx b/src/View/Components/fileBrowser.tsx index 597d73e0..dd2b22b3 100644 --- a/src/View/Components/fileBrowser.tsx +++ b/src/View/Components/fileBrowser.tsx @@ -2,12 +2,9 @@ import "./fileBrowser.css"; import * as React from "bloatless-react"; -import StorageModel, { - PATH_COMPONENT_SEPARATOR, -} from "../../Model/storageModel"; - import { DangerousActionButton } from "./dangerousActionButton"; import { DirectoryItemList } from "./directoryItemList"; +import { PATH_COMPONENT_SEPARATOR } from "../../Model/Global/storageModel"; import StorageViewModel from "../../ViewModel/storageViewModel"; import { translations } from "../translations"; diff --git a/src/ViewModel/chatListViewModel.ts b/src/ViewModel/chatListViewModel.ts index 121a889d..9b3d48a9 100644 --- a/src/ViewModel/chatListViewModel.ts +++ b/src/ViewModel/chatListViewModel.ts @@ -1,10 +1,10 @@ import * as React from "bloatless-react"; -import ChatListModel from "../Model/chatListModel"; +import ChatListModel from "../Model/Chat/chatListModel"; import ChatModel from "../Model/chatModel"; import ChatViewModel from "./chatViewModel"; import SettingsViewModel from "./settingsViewModel"; -import StorageModel from "../Model/storageModel"; +import StorageModel from "../Model/Global/storageModel"; export default class ChatListViewModel { chatListModel: ChatListModel; diff --git a/src/ViewModel/chatMessageViewModel.ts b/src/ViewModel/chatMessageViewModel.ts index 55c771e0..4523e15a 100644 --- a/src/ViewModel/chatMessageViewModel.ts +++ b/src/ViewModel/chatMessageViewModel.ts @@ -2,7 +2,7 @@ import * as React from "bloatless-react"; -import { ChatMessage, ChatMessageStatus } from "../Model/chatModel"; +import { ChatMessage, ChatMessageStatus } from "../Model/Chat/chatModel"; import ChatViewModel from "./chatViewModel"; diff --git a/src/ViewModel/chatViewModel.ts b/src/ViewModel/chatViewModel.ts index d03f10ce..f85c3634 100644 --- a/src/ViewModel/chatViewModel.ts +++ b/src/ViewModel/chatViewModel.ts @@ -1,7 +1,7 @@ import * as React from "bloatless-react"; -import ChatModel, { ChatMessage } from "../Model/chatModel"; -import StorageModel, { storageKeys } from "../Model/storageModel"; +import ChatModel, { ChatMessage } from "../Model/Chat/chatModel"; +import StorageModel, { storageKeys } from "../Model/Global/storageModel"; import ChatListViewModel from "./chatListViewModel"; import ChatMessageViewModel from "./chatMessageViewModel"; diff --git a/src/ViewModel/connectionViewModel.ts b/src/ViewModel/connectionViewModel.ts index 6465a1df..2e81fee1 100644 --- a/src/ViewModel/connectionViewModel.ts +++ b/src/ViewModel/connectionViewModel.ts @@ -1,6 +1,6 @@ import * as React from "bloatless-react"; -import ConnectionModel from "../Model/connectionModel"; +import ConnectionModel from "../Model/Global/connectionModel"; export default class ConnectionViewModel { connectionModel: ConnectionModel; diff --git a/src/ViewModel/settingsViewModel.ts b/src/ViewModel/settingsViewModel.ts index c94eabe9..23ab05a0 100644 --- a/src/ViewModel/settingsViewModel.ts +++ b/src/ViewModel/settingsViewModel.ts @@ -1,6 +1,6 @@ import * as React from "bloatless-react"; -import SettingsModel from "../Model/settingsModel"; +import SettingsModel from "../Model/Global/settingsModel"; export default class SettingsViewModel { settingsModel: SettingsModel; diff --git a/src/ViewModel/storageViewModel.ts b/src/ViewModel/storageViewModel.ts index ef2a41ed..a2afbd81 100644 --- a/src/ViewModel/storageViewModel.ts +++ b/src/ViewModel/storageViewModel.ts @@ -1,6 +1,6 @@ import * as React from "bloatless-react"; -import StorageModel, { PATH_COMPONENT_SEPARATOR } from "../Model/storageModel"; +import StorageModel, { PATH_COMPONENT_SEPARATOR } from "../Model/Global/storageModel"; import { translations } from "../View/translations"; diff --git a/src/index.tsx b/src/index.tsx index 218b3162..aafba104 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -3,17 +3,17 @@ import "./colors.css"; import * as React from "bloatless-react"; -import ChatListModel from "./Model/chatListModel"; +import ChatListModel from "./Model/Chat/chatListModel"; import ChatListViewModel from "./ViewModel/chatListViewModel"; import { ChatPageWrapper } from "./View/chatPageWrapper"; import { ConnectionModal } from "./View/Modals/connectionModal"; -import ConnectionModel from "./Model/connectionModel"; +import ConnectionModel from "./Model/Global/connectionModel"; import ConnectionViewModel from "./ViewModel/connectionViewModel"; import { HomePage } from "./View/homePage"; -import SettingsModel from "./Model/settingsModel"; +import SettingsModel from "./Model/Global/settingsModel"; import SettingsViewModel from "./ViewModel/settingsViewModel"; import { StorageModal } from "./View/Modals/storageModal"; -import StorageModel from "./Model/storageModel"; +import StorageModel from "./Model/Global/storageModel"; import StorageViewModel from "./ViewModel/storageViewModel"; // models