grimhilt/mail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch rooms

Browse Source
This commit is contained in:
grimhilt 2023-03-20 14:43:07 +01:00
parent 095efb5440
commit d7029854b4
12 changed files with 160 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -33,4 +33,5 @@ config.json
*.json
tmp
*test*
*.png
*.png
!*/schemas/*

17
back/controllers/rooms.js Normal file
View File

@ -0,0 +1,17 @@
const statusCode = require("../utils/statusCodes").statusCodes;
const { getRooms } = require("../db/api.js");
async function rooms(body, res) {
const { mailboxId, offset, limit } = body;
getRooms(mailboxId).then((rooms) => {
console.log(rooms)
res.status(statusCode.OK).json(rooms);
}).catch((err) => {
console.log(err)
res.status(statusCode.INTERNAL_SERVER_ERROR);
});
}
module.exports = {
rooms,
};

27
back/db/api.js
View File

@ -20,7 +20,32 @@ async function getMailboxes() {
return await execQueryAsync(query, values);
}
async function getRooms(mailboxId) {
const query = `
SELECT
app_room.room_id AS id,
app_room.room_name AS roomName,
address.email AS user,
app_room.owner_id AS userId,
app_room.notSeen,
mailbox_message.mailbox_id AS mailboxId
FROM app_room
INNER JOIN message
INNER JOIN mailbox_message
INNER JOIN address
WHERE
message.message_id = app_room.message_id AND
mailbox_message.mailbox_id = 1 AND
mailbox_message.message_id = message.message_id AND
address.address_id = app_room.owner_id
`;
// todo mailboxId
const values = [];
return await execQueryAsync(query, values);
}
module.exports = {
registerMailbox,
getMailboxes
getMailboxes,
getRooms
};

17
back/routes/mail.js
View File

@ -9,6 +9,7 @@ addFormats(ajv);
const schema_mailbox = require("../schemas/mailbox_schema.json");
const { addMailbox } = require("../controllers/addMailbox.js");
const { getMailboxes } = require("../db/api.js");
const { rooms } = require("../controllers/rooms.js");
const validate_mailbox = ajv.compile(schema_mailbox);
@ -28,23 +29,11 @@ router.get("/mailboxes", (req, res) => {
* @param {string} token the token of the user
* @return {object} a list of room and their preview (subject)
*/
router.get("/{mailboxId}/messages", (req, res) => {
router.get("/:mailboxId/rooms", async (req, res) => {
const { mailboxId, offset, limit } = req.params;
// todo check token
// todo use offset
const query = `
SELECT app_room.room_id, app_room.room_name, app_room.owner_id, app_room.notSeen, mailbox_message.mailbox_id, address.email
FROM app_room
INNER JOIN message
INNER JOIN mailbox_message
INNER JOIN address
WHERE
message.message_id = app_room.message_id AND
mailbox_message.mailbox_id = 1 AND
mailbox_message.message_id = message.message_id AND
address.address_id = app_room.owner_id
`;
const values = [mailboxId];
await rooms(req.params, res);
});

14
back/schemas/mailbox_schema.json Normal file
View File

@ -0,0 +1,14 @@
{
"type": "object",
"properties": {
"email": { "type": "string", "format": "email" },
"pwd": { "type": "string" },
"xoauth": { "type": "string" },
"xoauth2": { "type": "string" },
"host": { "type": "string", "format": "hostname" },
"port": { "type": "number", "maximum": 65535 },
"tls": { "type": "boolean" }
},
"required": ["email", "host", "port", "tls"],
"additionalProperties": false
}

3
front/src/services/imapAPI.js
View File

@ -7,4 +7,7 @@ export default {
getMailboxes() {
return API().get('/mail/mailboxes');
},
getRooms(mailboxId) {
return API().get(`/mail/${mailboxId}/rooms`);
}
}

131
front/src/store/rooms.js
View File

@ -2,65 +2,80 @@ import API from "@/services/imapAPI";
import { createStore } from "vuex";
const roomsStore = createStore({
state() {
return {
rooms: [
{
users: "clemnce",
object:
"Lorem magna minim cillum labore ex eiusmod proident excepteur sint irure ipsum.",
mailbox: 1,
},
{
users: "juliette",
object:
"Lorem magna minim cillum labore ex eiusmod proident excepteur sint irure ipsum.",
mailbox: 1,
},
{
users: "jean",
object:
"Lorem magna minim cillum labore ex eiusmod proident excepteur sint irure ipsum.",
mailbox: 2,
},
{
users: "luc",
object:
"Lorem magna minim cillum labore ex eiusmod proident excepteur sint irure ipsum.",
mailbox: 2,
},
],
mailboxes: [],
activeMailbox: -1
};
},
mutations: {
setActiveMailbox(state, payload) {
state.activeMailbox = payload;
state() {
return {
rooms: [
{
id: 0,
user: "clemnce",
userId: 0,
name: "Lorem magna minim cillum labore ex eiusmod proident excepteur sint irure ipsum.",
mailboxId: 1,
},
{
user: "juliette",
name: "Lorem magna minim cillum labore ex eiusmod proident excepteur sint irure ipsum.",
mailboxId: 1,
},
{
user: "jean",
name: "Lorem magna minim cillum labore ex eiusmod proident excepteur sint irure ipsum.",
mailboxId: 2,
},
{
user: "luc",
name: "Lorem magna minim cillum labore ex eiusmod proident excepteur sint irure ipsum.",
mailboxId: 2,
},
],
mailboxes: [],
activeMailbox: -1,
};
},
mutations: {
setActiveMailbox(state, payload) {
state.activeMailbox = payload;
const mailbox = state.mailboxes.find((mailbox) => mailbox.id == payload);
// todo fetched mailbox all
if (mailbox?.fetched == false) {
mailbox.fetched = true;
console.log("add messages")
API.getRooms(payload).then((res) => {
// todo add if not exist
res.data.forEach((room) => {
state.rooms.push(room);
});
}).catch((err) => {
console.log(err)
});
}
},
addMailboxes(state, payload) {
payload.forEach((mailbox) => {
mailbox.fetched = false;
state.mailboxes.push(mailbox);
});
},
},
getters: {
rooms: (state) => () => {
console.log(state.rooms.length)
if (state.activeMailbox == 0) return state.rooms;
return state.rooms.filter((room) => room.mailboxId == state.activeMailbox);
},
},
actions: {
async fetchMailboxes(context) {
console.log("add mailboxes");
API.getMailboxes()
.then((res) => {
context.commit("addMailboxes", res.data);
})
.catch((err) => {
console.log(err);
});
},
},
addMailboxes(state, payload) {
payload.forEach(mailbox => {
state.mailboxes.push(mailbox);
});
}
},
getters: {
rooms: (state) => () => {
if (state.activeMailbox == 0) return state.rooms;
return state.rooms.filter(room => room.mailbox == state.activeMailbox);
}
},
actions: {
async addMailboxes(context) {
console.log("add mailboxes")
API.getMailboxes().then((res) => {
console.log(res.data)
context.commit("addMailboxes", res.data);
}).catch((err) => {
console.log(err)
});
}
}
});
export default roomsStore;

8
front/src/views/sidebar/Sidebar.vue
View File

@ -1,19 +1,19 @@
<template>
<div>
<Mailboxes />
<Users id="users"/>
<Rooms id="rooms"/>
</div>
</template>
<script>
import Mailboxes from './mailboxes/Mailboxes'
import Users from './users/Users.vue'
import Rooms from './rooms/Rooms.vue'
export default {
name: 'Sidebar',
components: {
Mailboxes,
Users,
Rooms,
}
}
</script>
@ -24,7 +24,7 @@ div {
height: 100%;
}
#users {
#rooms {
max-width: 300px;
min-width: 250px;
}

9
front/src/views/sidebar/mailboxes/Mailboxes.vue
View File

@ -28,11 +28,10 @@ export default {
computed: {
...mapState(['mailboxes'])
},
}
if (roomsStore.state.mailboxes.length == 0) {
console.log("call api get mailboxes");
roomsStore.dispatch('addMailboxes');
created() {
console.log("call api get mailboxes");
roomsStore.dispatch('fetchMailboxes');
}
}
</script>

14
front/src/views/sidebar/users/User.vue → front/src/views/sidebar/rooms/Room.vue
View File

@ -3,8 +3,8 @@
<div id="user">
<BaseAvatar url="vue.png"/>
<div id="content">
<div id="sender">{{ sender }}</div>
<div id="object">{{ object }}</div>
<div id="sender">{{ data.user }}</div>
<div id="object">{{ data.roomName }}</div>
</div>
</div>
<ThreadList />
@ -18,8 +18,14 @@ import ThreadList from './threads/ThreadList.vue'
export default {
name: 'User',
props: {
sender: String,
object: String
data: {
id: Number,
roomName: String,
user: String,
userId: Number,
notSeen: Number,
mailboxId: Number
}
},
components: {
BaseAvatar,

8
front/src/views/sidebar/users/Users.vue → front/src/views/sidebar/rooms/Rooms.vue
View File

@ -1,20 +1,20 @@
<template>
<div>
<User v-for="(room, index) in rooms()" :key="index" :sender="room.users" :object="room.object" />
<Room v-for="(room, index) in rooms()" :key="index" :data="room" />
</div>
</template>
<script>
import { mapGetters } from 'vuex'
import User from './User'
import Room from './Room'
export default {
name: 'Users',
name: 'Rooms',
props: {
},
components: {
User
Room
},
computed: {
...mapGetters(['rooms'])

0
front/src/views/sidebar/users/threads/ThreadList.vue → front/src/views/sidebar/rooms/threads/ThreadList.vue
View File