diff --git a/back/db/api.ts b/back/db/api.ts index 4940f41..fd97cb9 100644 --- a/back/db/api.ts +++ b/back/db/api.ts @@ -52,7 +52,7 @@ export async function getRooms(mailboxId) { return await execQueryAsync(query, values); } -export async function getMessages(roomId) { +export async function getMessages(roomId: number) { // todo attachements name const query = ` SELECT @@ -62,7 +62,8 @@ export async function getMessages(roomId) { GROUP_CONCAT(ccT.address_id) AS ccA, subjectT.value AS subject, content.text AS content, - message.idate AS date + message.idate AS date, + GROUP_CONCAT(flagT.flag_name) AS flags FROM app_room_message msg ${queryFromId} fromT ON msg.message_id = fromT.message_id @@ -88,6 +89,9 @@ export async function getMessages(roomId) { bodypart.bodypart_id = header_field.bodypart_id ) content ON msg.message_id = content.message_id + LEFT JOIN flag ON flag.message_id = msg.message_id + LEFT JOIN flag_name flagT ON flagT.flag_id = flag.flag_id + INNER JOIN message ON message.message_id = msg.message_id WHERE msg.room_id = ? diff --git a/back/db/structureV2.sql b/back/db/structureV2.sql index 2f9f7c0..ef32830 100644 --- a/back/db/structureV2.sql +++ b/back/db/structureV2.sql @@ -164,7 +164,7 @@ CREATE TABLE app_room_member ( -- 15 create table flag_name ( - flag_id INT NOT NULL, + flag_id INT AUTO_INCREMENT, flag_name VARCHAR(255) NOT NULL, PRIMARY KEY (flag_id), UNIQUE KEY (flag_name) diff --git a/back/db/utils/addressQueries.ts b/back/db/utils/addressQueries.ts index fde6c9b..3b2c773 100644 --- a/back/db/utils/addressQueries.ts +++ b/back/db/utils/addressQueries.ts @@ -2,9 +2,8 @@ const queryAddress = (type: string): string => ` LEFT JOIN ( SELECT address_field.address_id, address_field.message_id FROM address_field - INNER JOIN field_name + INNER JOIN field_name ON field_name.field_id = address_field.field_id WHERE - field_name.field_id = address_field.field_id AND field_name.field_name = '${type}' ) `; diff --git a/back/server.ts b/back/server.ts index 999d1a0..51a2bd0 100644 --- a/back/server.ts +++ b/back/server.ts @@ -14,6 +14,7 @@ app.use(cors()); app.listen(process.env.PORT || 5500); import mailRouter from "./routes/mail"; +import logger from "./system/Logger"; app.use("/api/mail", mailRouter); const imapSync = new ImapSync(); @@ -33,4 +34,4 @@ if (shouldReset) { // execQuery("DROP TABLE " + table.table_name); }); }); -} \ No newline at end of file +} diff --git a/front/src/components/User.vue b/front/src/components/User.vue index 4f5012b..848eae4 100644 --- a/front/src/components/User.vue +++ b/front/src/components/User.vue @@ -1,7 +1,6 @@ @@ -89,7 +105,7 @@ const displayAddresses = (addressIds: string[] | undefined): string => { }} -
+
options
@@ -126,8 +142,18 @@ const displayAddresses = (addressIds: string[] | undefined): string => { display: flex; padding-top: 6px; flex-direction: row; - /* background-color: #ec7a4342; - background-color: #353c6261; */ +} + +.msg-important { + background-color: #ec7a4342; +} + +.msg-notSeen { + background-color: #222b5b61; +} + +.msg-basic { + background-color: var(--tertiary-background); } iframe { @@ -135,7 +161,7 @@ iframe { max-height: 300px; flex-basis: 100%; border: none; - max-width: 600px; /* template width being 600px to 640px up to 750px (experiment and test) */ + max-width: 640px; /* template width being 600px to 640px up to 750px (experiment and test) */ background-color: rgb(234, 234, 234); } diff --git a/front/src/views/room/RoomView.vue b/front/src/views/room/RoomView.vue index fc89551..c857eb1 100644 --- a/front/src/views/room/RoomView.vue +++ b/front/src/views/room/RoomView.vue @@ -37,7 +37,7 @@ const shouldDisplayComposer = () => {
diff --git a/front/src/views/sidebar/rooms/Room.vue b/front/src/views/sidebar/rooms/Room.vue index cad338f..d5c6744 100644 --- a/front/src/views/sidebar/rooms/Room.vue +++ b/front/src/views/sidebar/rooms/Room.vue @@ -1,23 +1,16 @@ - @@ -26,18 +19,17 @@ const router = useRouter();
-
{{ props.data.user }}
-
{{ props.data.roomName }}
+
{{ props.room?.user }}
+
{{ props.room?.roomName }}
- {{ props.data.unseen }} - +
- +
diff --git a/front/src/views/sidebar/rooms/Rooms.vue b/front/src/views/sidebar/rooms/Rooms.vue index 8978ddd..030f681 100644 --- a/front/src/views/sidebar/rooms/Rooms.vue +++ b/front/src/views/sidebar/rooms/Rooms.vue @@ -1,6 +1,6 @@