diff --git a/back/db/api-db.ts b/back/db/api-db.ts index cbe37b4..430f552 100644 --- a/back/db/api-db.ts +++ b/back/db/api-db.ts @@ -53,7 +53,7 @@ export async function getRooms(mailboxId) { INNER JOIN flag ON flag.flag_id = flag_name.flag_id AND flag.message_id = app_room_message.message_id WHERE flag_name.flag_id = flag.flag_id ) - ) notSeenRoom ON notSeenThreads.room_id = room.room_id + ) notSeenRoom ON notSeenRoom.room_id = room.room_id LEFT JOIN ( SELECT app_room_message.message_id, app_thread.parent_id diff --git a/front/src/components/modals/MessageViewModal.vue b/front/src/components/modals/MessageViewModal.vue index 20a4854..c8c85ef 100644 --- a/front/src/components/modals/MessageViewModal.vue +++ b/front/src/components/modals/MessageViewModal.vue @@ -1,6 +1,7 @@ - - $emit('close')"> - yep + + $emit('close')"> + + {{ props.message?.subject ?? "No Object" }} + + - + diff --git a/front/src/components/structure/message/Content.vue b/front/src/components/structure/message/Content.vue new file mode 100644 index 0000000..db3af9f --- /dev/null +++ b/front/src/components/structure/message/Content.vue @@ -0,0 +1,70 @@ + + + + + + diff --git a/front/src/views/room/Message.vue b/front/src/components/structure/message/Message.vue similarity index 64% rename from front/src/views/room/Message.vue rename to front/src/components/structure/message/Message.vue index 0fccc68..fc1e798 100644 --- a/front/src/views/room/Message.vue +++ b/front/src/components/structure/message/Message.vue @@ -1,57 +1,14 @@ + + + mark as not read + flag favorite + reply + delete from all + delete from remote + transfer + see source + + + + diff --git a/front/src/views/room/RoomView.vue b/front/src/views/room/RoomView.vue index 8c70699..3740044 100644 --- a/front/src/views/room/RoomView.vue +++ b/front/src/views/room/RoomView.vue @@ -3,7 +3,7 @@ import { useStore } from "vuex"; import { useRoute, onBeforeRouteUpdate } from "vue-router"; import { onBeforeMount, ref } from "vue"; import Header from "./Header.vue"; -import Message from "./Message.vue"; +import Message from "../../components/structure/message/Message.vue"; import { Room, RoomType } from "@/store/models/model"; import MessageViewModal from "@/components/modals/MessageViewModal.vue";