diff --git a/back/abl/Message-abl.ts b/back/abl/Message-abl.ts index 46f370d..28c0378 100644 --- a/back/abl/Message-abl.ts +++ b/back/abl/Message-abl.ts @@ -34,11 +34,11 @@ export default class MessageAbl { } static async addFlag(body, res: Response) { - await this.changeFlag(body, res, false); + await MessageAbl.changeFlag(body, res, false); } static async removeFlag(body, res: Response) { - await this.changeFlag(body, res, true); + await MessageAbl.changeFlag(body, res, true); } static async deleteRemoteUtil(message: Message, mailboxId: number, res, isFull: boolean): Promise { @@ -80,7 +80,7 @@ export default class MessageAbl { static deleteRemoteOnly = async (body, res: Response) => { const { mailboxId, messageId } = body; const message = new Message().setMessageId(messageId); - await this.deleteRemoteUtil(message, mailboxId, res, true); + await MessageAbl.deleteRemoteUtil(message, mailboxId, res, true); }; static deleteEverywhere = async (body, res: Response) => { @@ -97,7 +97,7 @@ export default class MessageAbl { // if message not deleted remotly, delete it if (!message.isDeleted) { - const success = await this.deleteRemoteUtil(message, mailboxId, res, false); + const success = await MessageAbl.deleteRemoteUtil(message, mailboxId, res, false); if (!success) { return; } diff --git a/back/mails/utils/mailBuilder.ts b/back/mails/utils/mailBuilder.ts index 3458203..00d6d9a 100644 --- a/back/mails/utils/mailBuilder.ts +++ b/back/mails/utils/mailBuilder.ts @@ -49,4 +49,5 @@ export default class MailBuilder { this.message.subject = "RE: " + originSubject; return this; } + // https://cr.yp.to/immhf/thread.html } diff --git a/front/src/assets/css/main.css b/front/src/assets/css/main.css index d0ff38e..18e976e 100644 --- a/front/src/assets/css/main.css +++ b/front/src/assets/css/main.css @@ -26,6 +26,7 @@ /* 343a46 */ } /* .badge-primary { */ +/* https://angel-rs.github.io/css-color-filter-generator/ */ .selected { background-color: var(--selected); diff --git a/front/src/components/modals/ConfirmationModal.vue b/front/src/components/modals/ConfirmationModal.vue index b7a684d..da85c67 100644 --- a/front/src/components/modals/ConfirmationModal.vue +++ b/front/src/components/modals/ConfirmationModal.vue @@ -3,7 +3,7 @@ import { ref, defineProps, withDefaults } from "vue"; import Modal from "./Modal.vue"; import Button from "../basic/Button.vue"; -const modal = ref(true); +const modal = ref(false); export interface Props { title: string; diff --git a/front/src/views/room/RoomView.vue b/front/src/views/room/RoomView.vue index 6e6cd82..40f4584 100644 --- a/front/src/views/room/RoomView.vue +++ b/front/src/views/room/RoomView.vue @@ -7,6 +7,7 @@ import Header from "./Header.vue"; import Message from "../../components/structure/message/Message.vue"; import MessageViewModal from "@/components/modals/MessageViewModal.vue"; import Composer from "@/components/structure/message/Composer.vue"; +import ConfirmationModal from "@/components/modals/ConfirmationModal.vue"; const store = useStore(); const route = useRoute(); @@ -72,6 +73,8 @@ provide("room", room); + +