ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dependabot/npm_and_yarn/cypress-12.17.0

Browse Source
This commit is contained in:
mahula 2023-07-10 16:15:50 +02:00 committed by GitHub
commit 0d6a7daba4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 92 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/schema/resolvers/rooms.ts
View File

@ -12,7 +12,11 @@ export default {
if (resolved) {
resolved.forEach((room) => {
if (room.users) {
// buggy, you must query the username for this to function correctly
room.roomName = room.users.filter((user) => user.id !== context.user.id)[0].name
room.avatar =
room.users.filter((user) => user.id !== context.user.id)[0].avatar?.url ||
'default-avatar'
room.users.forEach((user) => {
user._id = user.id
})

1
backend/src/schema/types/type/Room.gql
View File

@ -14,6 +14,7 @@ type Room {
roomId: String! @cypher(statement: "RETURN this.id")
roomName: String! ## @cypher(statement: "MATCH (this)<-[:CHATS_IN]-(user:User) WHERE NOT user.id = $cypherParams.currentUserId RETURN user[0].name")
avatar: String! ## @cypher match not own user in users array
}
type Mutation {

2
deployment/configurations/stage.ocelot.social

@ -1 +1 @@
Subproject commit 02ccccd38f72d5f0135234d7e77a030a086b7e8c
Subproject commit 350237c62dcff1a5c34f1e8d718f89b05ce3d33f

1
deployment/src/docker/maintenance.Dockerfile
View File

@ -14,6 +14,7 @@ ARG CONFIGURATION=example
# copy public constants into the Docker image to brand it
COPY configurations/${CONFIGURATION}/branding/static/ static/
COPY configurations/${CONFIGURATION}/branding/constants/ constants/
RUN /bin/sh -c 'cd constants && for f in *.ts; do mv -- "$f" "${f%.ts}.js"; done'
# locales
COPY configurations/${CONFIGURATION}/branding/locales/*.json locales/tmp/

1
deployment/src/docker/webapp.Dockerfile
View File

@ -14,6 +14,7 @@ ARG CONFIGURATION=example
# copy public constants into the Docker image to brand it
COPY configurations/${CONFIGURATION}/branding/static/ static/
COPY configurations/${CONFIGURATION}/branding/constants/ constants/
RUN /bin/sh -c 'cd constants && for f in *.ts; do mv -- "$f" "${f%.ts}.js"; done'
COPY configurations/${CONFIGURATION}/branding/locales/html/ locales/html/
COPY configurations/${CONFIGURATION}/branding/assets/styles/imports/ assets/styles/imports/
COPY configurations/${CONFIGURATION}/branding/assets/fonts/ assets/fonts/

114
webapp/components/Chat/Chat.vue
View File

@ -27,7 +27,7 @@
</template>
<script>
// import { roomQuery } from '~/graphql/Rooms'
import { roomQuery, createRoom } from '~/graphql/Rooms'
import { messageQuery } from '~/graphql/Messages'
export default {
@ -36,16 +36,16 @@ export default {
theme: {
type: String,
},
singleRoom: {
type: Boolean,
default: false,
singleRoomId: {
type: String,
default: null,
},
},
data() {
return {
currentUserId: '1234',
menuActions: [
{
/* {
name: 'inviteUser',
title: 'Invite User',
},
@ -56,7 +56,7 @@ export default {
{
name: 'deleteRoom',
title: 'Delete Room',
},
}, */
],
messageActions: [
{
@ -93,6 +93,7 @@ export default {
CANCEL_SELECT_MESSAGE: 'Annuler Sélection',
},
roomActions: [
/*
{
name: 'archiveRoom',
title: 'Archive Room',
@ -100,35 +101,36 @@ export default {
{ name: 'inviteUser', title: 'Invite User' },
{ name: 'removeUser', title: 'Remove User' },
{ name: 'deleteRoom', title: 'Delete Room' },
*/
],
rooms: [
{
roomId: '1',
roomName: 'John Snow',
avatar: 'https://66.media.tumblr.com/avatar_c6a8eae4303e_512.pnj',
users: [
{ _id: '1234', username: 'John Doe' },
{ _id: '4321', username: 'John Snow' },
],
},
{
roomId: '2',
roomName: 'Max J. Mustermann',
avatar:
'https://64.media.tumblr.com/8889b6e26370f4e3837584c1c59721a6/f4f76ed6b0249d08-4b/s1280x1920/810e9e5fa724366d26c10c0fa22ba97dad8778d1.pnj',
users: [
{ _id: '1234', username: 'Johnx Doe' },
{ _id: '43210', username: 'Max J. Mustermann' },
],
},
],
rooms: [],
messages: [],
messagesLoaded: true,
showDemoOptions: true,
responsiveBreakpoint: 600,
singleRoom: !!this.singleRoomId || false,
}
},
mounted() {
if (this.singleRoom) {
this.$apollo
.mutate({
mutation: createRoom(),
variables: {
userId: this.singleRoomId,
},
})
.then(() => {
this.$apollo.queries.Rooms.refetch()
})
.catch((error) => {
this.$toast.error(error)
})
.finally(() => {
// this.loading = false
})
}
},
methods: {
fetchMessages({ room, options = {} }) {
// console.log(room, options)
@ -212,26 +214,42 @@ export default {
}, 2000)
},
},
// apollo: {
// Rooms: {
// query() {
// return roomQuery()
// },
// update({ Room }) {
// console.log('Rooms', Room)
// if (!Room) {
// this.rooms = []
// return
// }
// this.rooms = Room
// },
// error(error) {
// this.rooms = []
// this.$toast.error(error.message)
// },
// fetchPolicy: 'cache-and-network',
// },
// },
apollo: {
Rooms: {
query() {
return roomQuery()
},
update({ Room }) {
// console.log('Rooms', Room)
if (!Room) {
this.rooms = []
return
}
// Backend result needs mapping of the following values
// room[i].users[j].name -> room[i].users[j].username
// room[i].users[j].avatar.url -> room[i].users[j].avatar
// also filter rooms for the single room
this.rooms = Room.map((r) => {
return {
...r,
users: r.users.map((u) => {
return { ...u, username: u.name, avatar: u.avatar?.url }
}),
}
}).filter((r) =>
this.singleRoom ? r.users.filter((u) => u.id === this.singleRoomId).length > 0 : true,
)
// console.log(this.rooms)
},
error(error) {
this.rooms = []
this.$toast.error(error.message)
},
fetchPolicy: 'cache-and-network',
},
},
}
</script>
<style lang="scss">

17
webapp/graphql/Rooms.js
View File

@ -4,9 +4,26 @@ export const roomQuery = () => gql`
query {
Room {
id
roomId
roomName
avatar
users {
_id
id
name
avatar {
url
}
}
}
}
`
export const createRoom = () => gql`
mutation ($userId: ID!) {
CreateRoom(userId: $userId) {
id
roomId
}
}
`

2
webapp/layouts/default.vue
View File

@ -20,7 +20,7 @@
x
</ds-button>
</ds-text>
<chat-module :singleRoom="true" />
<chat-module :singleRoomId="$store.getters['chat/showChat'].roomID" />
</div>
>
</div>