Commit graph

338 commits

Author SHA1 Message Date
apetitco
1f4f62c00b fighting git conflicts 2025-12-22 15:14:04 +01:00
apetitco
13895f8de8 idk 2025-12-22 15:13:53 +01:00
apetitco
a60569822b fighting git conflicts 2025-12-22 15:12:10 +01:00
apetitco
575464f65b fighting git conflicts 2025-12-22 15:12:10 +01:00
apetitco
e36d41a7c4 fighting git conflicts 2025-12-22 15:12:10 +01:00
Maieul BOYER
53a2c06d43 fixed things
# Conflicts:
#	src/pnpm-lock.yaml
2025-12-22 15:12:10 +01:00
apetitco
fb49ba4ee9 (schism): started separating backend from frontend 2025-12-22 15:12:10 +01:00
NigeParis
117b535962 Fixed Priv Message Blockage - now working 2025-12-22 14:15:35 +01:00
NigeParis
97d7318cf9 Added blocage Message Private 2025-12-22 14:15:35 +01:00
NigeParis
f49505cc74 Added and Fixed bug of Blocage a User in the Chat 2025-12-22 14:15:35 +01:00
Maix0
5ee7e7c0b7
Merge pull request #65 from Maix0/nigel/functionBlockMessage
Nigel/function block message
2025-12-19 14:46:56 +01:00
Maieul BOYER
5b979c8882
chore(cleanup): made the chat page not bypassing the auth check anymore 2025-12-19 14:42:54 +01:00
Maieul BOYER
d5278274ea
yes 2025-12-19 14:37:21 +01:00
NigeParis
2299294f0e rebased Master amd eslint - activated logs Raph for merge with master because eslint makes problems with graphana not activated 2025-12-19 10:01:27 +01:00
NigeParis
9f0e626e29 fixed broken compile 2025-12-19 09:13:45 +01:00
NigeParis
e49a69b3bf Merge remote-tracking branch 'refs/remotes/origin/nigel/functionBlockMessage' into nigel/functionBlockMessage 2025-12-19 09:09:10 +01:00
NigeParis
cd0f2bd3d2 turned off console.logs to see clearly on the WIP block user 2025-12-19 09:04:44 +01:00
NigeParis
cd621e6c1a Cleaned un the type obj - now consistant through out 2025-12-19 09:03:06 +01:00
NigeParis
f76d27ab62 WIP Blocked users and clean up obj { } its in constitant 2025-12-19 09:01:59 +01:00
NigeParis
01f278a947 turned off console.logs to see clearly on the WIP block user 2025-12-19 08:56:32 +01:00
NigeParis
ddce5f3839 Conflicts 2025-12-18 20:32:41 +01:00
NigeParis
9122194b7b Conflicts 2025-12-18 20:31:23 +01:00
NigeParis
7c6de16bec Conflicts 2025-12-18 20:30:41 +01:00
NigeParis
0128ec5f69 Conflicts 2025-12-18 20:28:13 +01:00
NigeParis
d9cc54ade9 WIP conflits sorted out 2025-12-18 20:26:00 +01:00
NigeParis
0d5b30388f Merge remote-tracking branch 'refs/remotes/origin/nigel/functionBlockMessage' into nigel/functionBlockMessage 2025-12-18 20:25:34 +01:00
NigeParis
384e0b6256 WIP conflits sorted out 2025-12-18 20:24:39 +01:00
NigeParis
fd1ec359d2 Merge conflicts 2025-12-18 20:20:40 +01:00
NigeParis
8bfa65ba51 Merge conflicts 2025-12-18 20:20:04 +01:00
NigeParis
46a1b99ed1 Merge conflicts 2025-12-18 20:18:45 +01:00
NigeParis
73a41f2b39 Conflits merge 2025-12-18 20:09:57 +01:00
NigeParis
36d767072f WIP - block user 2025-12-18 20:07:07 +01:00
NigeParis
a7fcb351f8 WIP trying to fix a bug with blocking Broadcast message from a user on the chat 2025-12-18 20:03:24 +01:00
NigeParis
f506fb44bf Work in progress - blocage working on it ./app 206 2025-12-18 15:11:27 +01:00
NigeParis
8500d7dbe2 block button in profil toggles with block or un blocked 2025-12-18 15:11:27 +01:00
NigeParis
c41a32e4b1 clean up obj 2025-12-18 15:11:27 +01:00
NigeParis
e543116b5d Cleaned un the type obj - now consistant through out 2025-12-18 15:11:27 +01:00
NigeParis
f5366bf9e1 WIP Blocked users and clean up obj { } its in constitant 2025-12-18 15:11:27 +01:00
Maieul BOYER
556138d624 feat(user): added description and global guest user mute 2025-12-18 14:51:12 +01:00
Maieul BOYER
bcba86ed8a feat(chat): send online user in a single socketio message 2025-12-18 13:55:26 +01:00
Maieul BOYER
41fdbfbaaa
feat(monitoring): fixes issues 2025-12-17 21:02:12 +01:00
Raphaël
3fd3635fd1
Merge pull request #62 from Maix0/monitoring/nginx
Cleanup monitoring side of the service
2025-12-17 20:56:59 +01:00
Maix0
e5f186af04 fixes(eslint): removed trailing space 2025-12-17 19:52:17 +01:00
Maix0
4627f37574 feat(docker): general cleanup of docker-compose
Changed every service to be prefixed by their "group":
- `app` is for the application services
- `mon` is for the monitoring side of things
- `log` is for the logs collection side of things

Renamed the main network to `app`
Moved around some comments in the file to clearly show different groups of services
2025-12-17 19:47:42 +01:00
Maix0
9b24bd0c41 feat(monitoring): change logger to pino
This changes the logger used to be pino, which print the logs on a single line per log event
2025-12-17 19:42:33 +01:00
Maix0
8a3481ea8b feat(monitoring): general fixup
- added healthcheck for every service
- added nginx second "server" block for monitoring
    all monitoring services are now behind this nginx reverse proxy
- fixed logging driver not present for chat service
2025-12-17 19:23:47 +01:00
NigeParis
637229c8c8 Work in progress - blocage working on it ./app 206 2025-12-17 17:21:06 +01:00
NigeParis
a1d6c4ae9c block button in profil toggles with block or un blocked 2025-12-17 13:20:01 +01:00
NigeParis
eb1b3472cb clean up obj 2025-12-17 12:03:28 +01:00
NigeParis
fb68487786 Cleaned un the type obj - now consistant through out 2025-12-17 10:20:07 +01:00