Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions bun.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,23 @@
"@fastify/cors": "^11.0.1",
"bcryptjs": "^3.0.2",
"cors": "^2.8.5",
"date-fns": "^4.1.0",
"dotenv": "^17.2.0",
"fastify": "^5.4.0",
"jsonwebtoken": "^9.0.2",
"mongoose": "^8.16.4",
"socket.io": "^4.8.1",
"uuid": "^11.1.0",
"validator": "^13.15.15",
},
"devDependencies": {
"@eslint/js": "^9.33.0",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/git": "^10.0.1",
"@semantic-release/github": "^11.0.3",
"commitizen": "^4.3.1",
"cz-conventional-changelog": "^3.3.0",
"globals": "^16.3.0",
"nodemon": "^3.1.10",
"semantic-release": "^24.2.7",
},
Expand All @@ -42,6 +46,8 @@

"@commitlint/types": ["@commitlint/types@19.8.1", "", { "dependencies": { "@types/conventional-commits-parser": "^5.0.0", "chalk": "^5.3.0" } }, "sha512-/yCrWGCoA1SVKOks25EGadP9Pnj0oAIHGpl2wH2M2Y46dPM2ueb8wyCVOD7O3WCTkaJ0IkKvzhl1JY7+uCT2Dw=="],

"@eslint/js": ["@eslint/js@9.35.0", "", {}, "sha512-30iXE9whjlILfWobBkNerJo+TXYsgVM5ERQwMcMKCHckHflCmf7wXDAHlARoWnh0s1U72WqlbeyE7iAcCzuCPw=="],

"@fastify/ajv-compiler": ["@fastify/ajv-compiler@4.0.2", "", { "dependencies": { "ajv": "^8.12.0", "ajv-formats": "^3.0.1", "fast-uri": "^3.0.0" } }, "sha512-Rkiu/8wIjpsf46Rr+Fitd3HRP+VsxUFDDeag0hs9L0ksfnwx2g7SPQQTFL0E8Qv+rfXzQOxBJnjUB9ITUDjfWQ=="],

"@fastify/cors": ["@fastify/cors@11.0.1", "", { "dependencies": { "fastify-plugin": "^5.0.0", "toad-cache": "^3.7.0" } }, "sha512-dmZaE7M1f4SM8ZZuk5RhSsDJ+ezTgI7v3HHRj8Ow9CneczsPLZV6+2j2uwdaSLn8zhTv6QV0F4ZRcqdalGx1pQ=="],
Expand Down Expand Up @@ -254,6 +260,8 @@

"cz-conventional-changelog": ["cz-conventional-changelog@3.3.0", "", { "dependencies": { "chalk": "^2.4.1", "commitizen": "^4.0.3", "conventional-commit-types": "^3.0.0", "lodash.map": "^4.5.1", "longest": "^2.0.1", "word-wrap": "^1.0.3" }, "optionalDependencies": { "@commitlint/load": ">6.1.1" } }, "sha512-U466fIzU5U22eES5lTNiNbZ+d8dfcHcssH4o7QsdWaCcRs/feIPCxKYSWkYBNs5mny7MvEfwpTLWjvbm94hecw=="],

"date-fns": ["date-fns@4.1.0", "", {}, "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg=="],

"debug": ["debug@4.4.1", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ=="],

"dedent": ["dedent@0.7.0", "", {}, "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA=="],
Expand Down Expand Up @@ -370,6 +378,8 @@

"global-prefix": ["global-prefix@1.0.2", "", { "dependencies": { "expand-tilde": "^2.0.2", "homedir-polyfill": "^1.0.1", "ini": "^1.3.4", "is-windows": "^1.0.1", "which": "^1.2.14" } }, "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg=="],

"globals": ["globals@16.3.0", "", {}, "sha512-bqWEnJ1Nt3neqx2q5SFfGS8r/ahumIakg3HcwtNlrVlwXIeNumWn/c7Pn/wKzGhf6SaW6H6uWXLqC30STCMchQ=="],

"globby": ["globby@14.1.0", "", { "dependencies": { "@sindresorhus/merge-streams": "^2.1.0", "fast-glob": "^3.3.3", "ignore": "^7.0.3", "path-type": "^6.0.0", "slash": "^5.1.0", "unicorn-magic": "^0.3.0" } }, "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA=="],

"graceful-fs": ["graceful-fs@4.2.11", "", {}, "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="],
Expand Down Expand Up @@ -842,6 +852,8 @@

"validate-npm-package-license": ["validate-npm-package-license@3.0.4", "", { "dependencies": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" } }, "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew=="],

"validator": ["validator@13.15.15", "", {}, "sha512-BgWVbCI72aIQy937xbawcs+hrVaN/CZ2UwutgaJ36hGqRrLNM+f5LUT/YPRbo8IV/ASeFzXszezV+y2+rq3l8A=="],

"vary": ["vary@1.1.2", "", {}, "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="],

"wcwidth": ["wcwidth@1.0.1", "", { "dependencies": { "defaults": "^1.0.3" } }, "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg=="],
Expand Down
17 changes: 9 additions & 8 deletions frontend/src/context/RoomProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,14 @@ export const RoomProvider = ({ children }: RoomProviderProps) => {

const { adminRooms = [], memberRooms = [] } = res.data;
setRoom([...adminRooms, ...memberRooms]);
} catch (error: any) {
// Error handling
setErrors(error)
} catch (error) {
const apiError = error as ApiError;
const errorMessage =
apiError.response?.data?.error ||
apiError.response?.data?.message ||
apiError.message ||
"Erreur lors de la recuperation des membres";
setErrors(`Error: ${errorMessage}`);
} finally {
setLoading(false);
}
Expand Down Expand Up @@ -97,11 +102,7 @@ export const RoomProvider = ({ children }: RoomProviderProps) => {
}

if (response.data.room) {
setRoom((prevRooms) =>
prevRooms.map((room) =>
room._id === roomId ? response.data.room : room
)
);

setErrors(null);
return response.data;
}
Expand Down
21 changes: 6 additions & 15 deletions frontend/src/pages/ProfilePage.tsx
Original file line number Diff line number Diff line change
@@ -1,36 +1,27 @@
import { useAuth } from "../hook"
import Profile from "../ui/profile/Profile"
import { Skeleton } from "../components/ui/skeleton"
import { useToast } from "../components/ui/use-toast"
import Profiles from "../ui/profile/Profile"
import Loader from "../components/Loader"
import Errors from "../components/Error"

const ProfilePage = () => {
const { currentUser, loading, error } = useAuth()
const { toast } = useToast()

if (loading && !currentUser) {
return (
<div className="space-y-4 p-4">
<Skeleton className="h-12 w-12 rounded-full" />
<div className="space-y-2">
<Skeleton className="h-4 w-[250px]" />
<Skeleton className="h-4 w-[200px]" />
</div>
<Loader/>
</div>
)
}

if (error) {
toast({
variant: "destructive",
title: "Erreur",
description: error,
})
return <Errors error={ error} />
}

return (
<div className="container mx-auto p-4">
{currentUser ? (
<Profile currentUser={currentUser} />
<Profiles currentUser={currentUser} />
) : (
<div className="text-center p-8">
<p>Veuillez vous connecter pour accéder à votre profil</p>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/ui/profile/Profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ interface ProfileProps {
currentUser: User | null | undefined
}

const Profile = ({ currentUser }: ProfileProps) => {
const Profiles = ({ currentUser }: ProfileProps) => {
const { updatePreferences, updateProfile } = useAuth()

// useState pour gérer l'affichage des onglets de profil et de préférence
Expand Down Expand Up @@ -271,4 +271,4 @@ const [loading, setLoading] = useState(false);
)
}

export default Profile
export default Profiles
5 changes: 3 additions & 2 deletions src/controllers/room.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Comment from "../models/comment.model.js";
import { handleError } from "../helpers/handleError.js";
import { ERROR_MESSAGES } from "../constants/roomErrorMessage.js";
import Room from "../models/room.model.js";
import mongoose from "mongoose";

export class RoomController {
async getRoom(request, reply) {
Expand Down Expand Up @@ -624,10 +625,10 @@ export class RoomController {
const { roomId } = request.params;
const currentUserId = request.user.userId;
const session = await mongoose.startSession();

try {
session.startTransaction();

// Vérifier que la salle existe
const room = await Room.findById(roomId).session(session);
if (!room) {
Expand Down
Loading
Loading