rm db

cette fois on est bon
Prêt a déployer
2023-02-28 09:24:48 +01:00 · 2023-02-26 17:12:10 +01:00 · 2023-02-26 16:29:05 +01:00 · 2023-02-26 11:37:56 +01:00
51 changed files with 2031 additions and 1486 deletions
--- a/backend/api/database/room/crud.py
+++ b/backend/api/database/room/crud.py
@ -5,7 +5,7 @@ from typing import List
 from fastapi import Depends, HTTPException, status, Query
 from pydantic import BaseModel
 from sqlalchemy import func
-from sqlmodel import Session, delete, select, col
+from sqlmodel import Session, delete, select, col, update

 from database.auth.crud import get_user_from_token
 from database.auth.models import User
@ -59,6 +59,12 @@ def change_room_status(room: Room, public: bool, db: Session):
    return room


+def delete_room_db(room: Room, db: Session):
+    db.delete(room)
+    db.commit()
+    return True
+
+
 def get_member_from_user(user_id: int, room_id: int, db: Session):
    member = db.exec(select(Member).where(Member.room_id ==
                                          room_id, Member.user_id == user_id)).first()
@ -109,7 +115,8 @@ def get_member_from_clientId(clientId: str, room_id: int, db: Session):
    return member


-def create_member(*, room: Room, user: User | None = None, anonymous: Anonymous | None = None, waiting: bool = False, db: Session):
+def create_member(*, room: Room, user: User | None = None, anonymous: Anonymous | None = None, waiting: bool = False,
+                  db: Session):
    member_id = generate_unique_code(Member, s=db)
    member = Member(room=room, user=user, anonymous=anonymous, waiting=waiting,
                    id_code=member_id)
@ -269,6 +276,8 @@ def refuse_waiter(member: Member, db: Session):


 def leave_room(member: Member, db: Session):
+    # db.execute(delete(Challenger).where(col(Challenger.member_id) == member.id))
+    # db.execute(delete(TmpCorrection).where(col(TmpCorrection.member_id) == member.id))
    db.delete(member)
    db.commit()
    return None
@ -324,6 +333,12 @@ def getChallenges(c: Challenger, db: Session):
    return challenges


+def getMemberChallenges(m: Member, p: Parcours, db: Session):
+    challenges = db.exec(select(Challenge).where(Challenge.challenger_mid == m.id,
+                                                 Challenge.challenger_pid == p.id)).all()
+    return challenges
+
+
 def getTops(p: Parcours, db: Session):
    tops = db.exec(select(Challenge).where(Challenge.parcours_id == p.id_code).order_by(
        col(Challenge.mistakes), col(Challenge.time)).limit(3)).all()
@ -370,6 +385,13 @@ def getMemberAvgRank(m: Member, p: Parcours, db: Session):
    return getAvgRank(challenger, p, db)


+def getMemberValidated(m: Member, p: Parcours, db: Session):
+    challenger = db.exec(select(Challenger).where(Challenger.member_id == m.id)).first()
+    if challenger is None or challenger.validated is None:
+        return None
+    return challenger.validated
+
+
 def serialize_parcours(parcours: Parcours, member: Member, db: Session):
    tops = getTops(parcours, db)
    avgTop = getAvgTops(parcours, db)
@ -392,55 +414,13 @@ def serialize_parcours(parcours: Parcours, member: Member, db: Session):
    challengers = db.exec(statement).all()

    challs = {c.member.id_code: {
-        "challenger": {"id_code": c.member.id_code, "name": getUsername(c.member)},
+        "challenger": {"id_code": c.member.id_code, "name": getUsername(c.member), "validated": c.validated},
        # 'validated': chall.mistakes <= parcours.max_mistakes
        "challenges": [Challenges(**{**chall.dict(), "canCorrige": chall.data != []}) for chall in getChallenges(c, db)]
    } for c in challengers}

    return {**parcours.dict(), "pb": pb, "tops": tops, "challenges": challs, "rank": noteRank, "memberRank": avgRank,
            "validated": challenger.validated if challenger != None else False, "ranking": avgTop}
-    tops = []
-    challs = {}
-    challenges = sorted(parcours.challenges, key=lambda x: (
-        x.note['value'], x.time), reverse=True)
-    memberRank = None
-    rank = None
-    pb = None
-    validated = False
-
-    total = 0
-
-    for i, chall in enumerate(challenges):
-        total += chall.note['value']
-        id = chall.challenger.id_code
-        name = chall.challenger.user.username if chall.challenger.user_id != None else chall.challenger.anonymous.username
-        if i <= 2:
-            tops.append({"challenger": {"id_code": id, "name": name},
-                         "note": chall.note, "time": chall.time})
-
-        if id == member.id_code:
-            if challs.get(id) is None:
-                rank = i + 1
-                memberRank = len(challs) + 1
-                pb = {"note": chall.note, "time": chall.time}
-            if validated is False and chall.validated:
-                validated = True
-
-        if member.is_admin or chall.challenger.id_code == member.id_code:
-            t = challs.get(id, {"total": 0})['total']
-            challs[id] = {"challenger": {"id_code": id, "name": name
-                                         }, "challenges": [*challs.get(id, {'challenges': []})['challenges'],
-                                                           Challenges(
-                                                               **{**chall.dict(), "canCorrige": chall.data != []})],
-                          "total": t + chall.note['value']}
-
-    topMembers = [{**c['challenger'], "avg": c['total'] /
-                                             len(c['challenges'])} for id, c in challs.items()]
-    topMembers.sort(key=lambda x: x['avg'], reverse=True)
-    return {**parcours.dict(), "tops": tops, "challenges": challs, "rank": rank, "memberRank": memberRank, "pb": pb,
-            "validated": validated,
-            'avg': None if len(parcours.challenges) == 0 else round(total / len(parcours.challenges), 2),
-            "ranking": topMembers}


 def change_anonymous_clientId(anonymous: Anonymous, db: Session):
@ -510,29 +490,23 @@ def deleteParcoursRelated(parcours: Parcours, db: Session):
    db.commit()


-def change_challengers_validation(p: Parcours, validation: int, db: Session):
-    challengers = db.exec(select(Challenger).where(
-        Challenger.parcours_id == p.id)).all()
-    challs = []
-    for c in challengers:
-        validated = c.best <= validation
-        if validated != c.validated:
-            c.validated = validated
-            challs.append(c)
-
-    db.bulk_save_objects(challs)
+def change_challengers_validation(p: Parcours, db: Session):
+    stmt = update(Challenger).values(
+        validated=select(Challenge.id).where(Challenge.challenger_mid == Challenger.member_id,
+                                             Challenge.challenger_pid == Challenger.parcours_id,
+                                             Challenge.validated == 1).exists()).where(
+        Challenger.parcours_id == p.id)
+    db.execute(stmt)
    db.commit()
+    return


-def change_challenges_validation(p: Parcours, validation: int, db: Session):
-
+def change_challenges_validation(p: Parcours, db: Session):
    challenges = db.exec(select(Challenge).where(
        Challenge.parcours_id == p.id_code)).all()
-    print('CHALLS', challenges)
    challs = []
    for c in challenges:
-        validated = c.mistakes <= validation
-        print('CHAL', validated, c.validated, c)
+        validated = c.time <= p.time * 60 and c.mistakes <= p.max_mistakes
        if validated != c.validated:
            c.validated = validated
            challs.append(c)
@ -541,9 +515,10 @@ def change_challenges_validation(p: Parcours, validation: int, db: Session):
    db.commit()


-def changeValidation(p: Parcours, validation: int, db: Session):
-    change_challengers_validation(p, validation, db)
-    change_challenges_validation(p, validation, db)
+def changeValidation(p: Parcours, db: Session):
+    change_challenges_validation(p, db)
+
+    change_challengers_validation(p, db)


 def compareExercices(old: list[Exercices], new: list[ExercicesCreate]):
@ -563,9 +538,7 @@ def update_parcours_db(parcours: ParcoursCreate, parcours_obj: Parcours, db: Ses
        update_challenges = True
        parcours_obj.exercices = exercices

-    if parcours_obj.max_mistakes != parcours.max_mistakes:
-        changeValidation(parcours_obj, parcours.max_mistakes, db)
-
+    update_validated = parcours_obj.max_mistakes != parcours.max_mistakes or parcours_obj.time != parcours.time
    parcours_obj.name = parcours.name
    parcours_obj.time = parcours.time
    parcours_obj.max_mistakes = parcours.max_mistakes
@ -574,6 +547,8 @@ def update_parcours_db(parcours: ParcoursCreate, parcours_obj: Parcours, db: Ses
    db.commit()

    db.refresh(parcours_obj)
+    if update_validated:
+        changeValidation(parcours_obj, db)

    return parcours_obj, update_challenges

@ -728,7 +703,9 @@ def checkValidated(challenger: Challenger, db: Session, challenge: Challenge | N
 def create_challenge(data: List[CorrigedData], challenger: Member, parcours: Parcours, time: int, mistakes: int,
                     isCorriged: bool, db: Session):
    challenger_obj: Challenger = getChallenger(parcours, challenger, db)
-    validated = mistakes <= parcours.max_mistakes
+    print('VALIDATING', time <= parcours.time * 60 and mistakes <= parcours.max_mistakes, time, parcours.time)
+    validated = time <= parcours.time * 60 and mistakes <= parcours.max_mistakes
+
    challenge = Challenge(data=data, challenger_pid=challenger_obj.parcours_id, challenger_mid=challenger_obj.member_id,
                          parcours=parcours, time=time, mistakes=mistakes, isCorriged=isCorriged,
                          id_code=generate_unique_code(Challenge, s=db), validated=validated)
@ -767,7 +744,7 @@ def change_challenge(challenge: Challenge, corriged: CorrigedChallenge, db: Sess
        challenger.best = corriged['mistakes']
        challenger.best_time = challenge.time

-    validated = corriged['mistakes'] <= parcours.max_mistakes
+    validated = challenge.time <= parcours.time * 60 and corriged['mistakes'] <= parcours.max_mistakes
    challenge.validated = validated

    if challenger.validated == False and validated:
@ -844,10 +821,12 @@ def get_exercices(parcours: Parcours = Depends(get_parcours), db: Session = Depe
    exercices = db.exec(select(Exercice).where(col(Exercice.id_code).in_(
        [e['exercice_id'] for e in parcours.exercices]))).all()

-    return [{"exercice": e, "quantity": [q for q in parcours.exercices if q['exercice_id'] == e.id_code][0]['quantity']} for e in exercices]
+    return [{"exercice": e, "quantity": [q for q in parcours.exercices if q['exercice_id'] == e.id_code][0]['quantity']}
+            for e in exercices]


-def get_correction(correction_id: str, parcours_id: str, member: Member = Depends(get_member_dep), db: Session = Depends(get_session)):
+def get_correction(correction_id: str, parcours_id: str, member: Member = Depends(get_member_dep),
+                   db: Session = Depends(get_session)):
    tmpCorr = db.exec(select(TmpCorrection).where(
        TmpCorrection.id_code == correction_id, TmpCorrection.parcours_id == parcours_id)).first()
    if tmpCorr is None:
--- a/backend/api/database/room/models.py
+++ b/backend/api/database/room/models.py
@ -24,8 +24,8 @@ class Room(RoomBase, table=True):
    id: Optional[int] = Field(default=None, primary_key=True)
    id_code: str = Field(index=True)

-    members: List['Member'] = Relationship(back_populates="room")
-    parcours: List['Parcours'] = Relationship(back_populates="room")
+    members: List['Member'] = Relationship(back_populates="room",sa_relationship_kwargs={"cascade": "all, delete, delete-orphan"})
+    parcours: List['Parcours'] = Relationship(back_populates="room",sa_relationship_kwargs={"cascade": "all, delete, delete-orphan"})


 class AnonymousBase(SQLModel):
@ -58,7 +58,9 @@ class Member(SQLModel, table=True):
    room_id: int = Field(foreign_key="room.id")
    room: Room = Relationship(back_populates='members')

-    challengers: List["Challenger"] = Relationship(back_populates="member")
+    challengers: List["Challenger"] = Relationship(back_populates="member", sa_relationship_kwargs={"cascade": "all, delete, delete-orphan"})
+    corrections: List["TmpCorrection"] = Relationship(back_populates="member", sa_relationship_kwargs={"cascade": "all, delete, delete-orphan"})
+

    is_admin: bool = False

@ -68,7 +70,6 @@ class Member(SQLModel, table=True):

    waiter_code: Optional[str] = Field(default=None)

-    corrections: List['TmpCorrection'] = Relationship(back_populates="member")


 class ExercicesCreate(SQLModel):
@ -101,7 +102,7 @@ class Parcours(SQLModel, table=True):
    room_id: int = Field(foreign_key="room.id")
    room: Room = Relationship(back_populates='parcours')

-    challengers: list[Challenger] = Relationship(back_populates="parcours")
+    challengers: list[Challenger] = Relationship(back_populates="parcours", sa_relationship_kwargs={"cascade": "all, delete, delete-orphan"})
    
    name: str
    time: int
@ -110,9 +111,9 @@ class Parcours(SQLModel, table=True):
    max_mistakes: int
    
    exercices: List[Exercices] = Field(sa_column=Column(JSON))
-    challenges: List["Challenge"] = Relationship(back_populates="parcours")
+    challenges: List["Challenge"] = Relationship(back_populates="parcours", sa_relationship_kwargs={"cascade": "all, delete, delete-orphan"})
    corrections: List["TmpCorrection"] = Relationship(
-        back_populates="parcours")
+        back_populates="parcours", sa_relationship_kwargs={"cascade": "all, delete, delete-orphan"})
    
    

@ -144,6 +145,7 @@ class ParcoursReadUpdate(SQLModel):
 class ChallengerInfo(BaseModel):
    name: str
    id_code: str
+    validated: bool = False


 class ChallengerAverage(ChallengerInfo):
--- a/backend/api/database7.db
+++ b/backend/api/database7.db
--- a/backend/api/routes/exercices/routes.py
+++ b/backend/api/routes/exercices/routes.py
@ -7,7 +7,7 @@ from fastapi import APIRouter, Depends, Query, UploadFile, HTTPException, status
 from fastapi.responses import FileResponse, StreamingResponse
 from fastapi_pagination.ext.sqlalchemy_future import paginate as p
 from pydantic import BaseModel
-from sqlmodel import Session, select
+from sqlmodel import Session, select, col

 from database.auth.models import User
 from database.db import get_session
@ -85,6 +85,8 @@ def get_user_exercices(user: User = Depends(get_current_user),
        sub = select(ExercicesTagLink).where(ExercicesTagLink.exercice_id == Exercice.id).where(
            ExercicesTagLink.tag_id == t).exists()
        statement = statement.where(sub)
+
+    statement = statement.order_by(col(Exercice.id).desc())
    page = p(db, statement)
    exercices = page.items
    page.items = [
@ -116,7 +118,7 @@ def get_public_exercices(user: User | None = Depends(get_current_user_optional),
            sub = select(ExercicesTagLink).where(ExercicesTagLink.exercice_id == Exercice.id).where(
                ExercicesTagLink.tag_id == t).exists()
            statement = statement.where(sub)
-
+        statement = statement.order_by(col(Exercice.id).desc())
        page = p(db, statement)
        print('¨PAGE', page)
        exercices = page.items
--- a/backend/api/routes/room/consumer.py
+++ b/backend/api/routes/room/consumer.py
@ -8,7 +8,7 @@ from database.auth.crud import get_user_from_token
 from database.room.crud import change_room_name, change_room_status, serialize_member, check_user_in_room, \
    create_anonymous, create_member, get_member, get_member_from_token, get_member_from_reconnect_code, connect_member, \
    disconnect_member, get_waiter, accept_waiter, leave_room, refuse_waiter
-from database.room.models import Room, Member, MemberRead, Waiter
+from database.room.models import Room, Member, MemberRead, Waiter, Challenger
 from services.websocket import Consumer

 if TYPE_CHECKING:
@ -17,7 +17,7 @@ if TYPE_CHECKING:

 class RoomConsumer(Consumer):

-    def __init__(self, ws: WebSocket, room: Room, manager: "RoomManager", db: Session):
+    def __init__(self, ws: WebSocket, room: Room | None, manager: "RoomManager", db: Session):
        self.room = room
        self.ws = ws
        self.manager = manager
@ -25,14 +25,22 @@ class RoomConsumer(Consumer):
        self.member = None
        self.banned = False

+
+    async def connect(self):
+        await self.ws.accept()
+        if self.room is None:
+            await self.send_error("Salle introuvable", code=404)
+            await self.ws.close()
+            return False
+        return True
+
    # WS Utilities
    async def send(self, payload: Any | Callable):
        if callable(payload):
            payload = payload(self.member)
        return await super().send(payload)

-    async def connect(self):
-        await self.ws.accept()
+

    async def direct_send(self, type: str, payload: Any, code: int | None = None):
        sending = {'type': type, "data": payload, }
@ -243,12 +251,13 @@ class RoomConsumer(Consumer):

    @Consumer.event('leave', conditions=[isMember])
    async def leave(self):
+        print('LEAVED', self.member, isinstance(self.member, Member), isinstance(self.member, Challenger))
        if self.member.is_admin is True:
            await self.send_error("Vous ne pouvez pas quitter une salle dont vous êtes l'administrateur")
            return
        member_obj = serialize_member(self.member)
        leave_room(self.member, self.db)
-
+        self.member = None
        await self.direct_send(type="successfully_leaved", payload={})
        await self.broadcast(type='leaved', payload={"member": member_obj})
        self.member = None
@ -294,13 +303,13 @@ class RoomConsumer(Consumer):
        self.manager.remove(self.room.id, self)
        return {"waiter_id": waiter_id}

-    @Consumer.sending("banned", conditions=[isMember])
-    async def banned(self):
-        self.member = None
-        self.manager.remove(self.room.id_code, self)
-        self.banned = True
-        #await self.ws.close()
-        return {}
+    # @Consumer.sending("banned", conditions=[isMember])
+    # def banned(self):
+    #     self.member = None
+    #     self.manager.remove(self.room.id_code, self)
+    #     self.banned = True
+    #     #await self.ws.close()
+    #     return {}

    @Consumer.sending('ping', conditions=[isMember])
    def ping(self):
--- a/backend/api/routes/room/manager.py
+++ b/backend/api/routes/room/manager.py
@ -39,7 +39,6 @@ class RoomManager:
        
        if group in self.active_connections:
            for connection in list(set(self.active_connections[group])):
-                print(connection, connection.ws.state, connection.ws.client_state, connection.ws.application_state)
                if connection not in exclude and all(f(connection) for f in conditions):
                    await self._send(connection, message, group)

--- a/backend/api/routes/room/routes.py
+++ b/backend/api/routes/room/routes.py
@ -8,35 +8,12 @@ from sqlmodel import Session, select
 from database.auth.models import User
 from database.db import get_session
 from database.exercices.models import Exercice
+from database.room.crud import delete_room_db, getUsername, getMemberValidated
 from database.room.crud import serialize_parcours_short, change_correction, corrige_challenge, \
    create_parcours_db, delete_parcours_db, create_room_db, get_member_dep, check_room, serialize_room, \
    update_parcours_db, get_parcours, get_room, check_admin, get_exercices, get_challenge, get_correction, \
    create_tmp_correction, create_challenge, change_challenge, serialize_parcours, getTops, getAvgRank, getRank, \
-    getAvgTops, ChallengerFromChallenge, getMemberAvgRank, getMemberRank
-from database.room.models import Challenge, ChallengeRead, Challenges, ParcoursReadUpdate, ChallengeInfo, Member, \
-    Parcours, ParcoursCreate, ParcoursRead, ParcoursReadShort, Room, RoomConnectionInfos, \
-    RoomCreate, RoomInfo, TmpCorrection, CorrigedData, CorrectionData
-from generateur.generateur_main import generate_from_path, parseGeneratorOut
-from routes.room.consumer import RoomConsumer
-from routes.room.manager import RoomManager
-from services.auth import get_current_user_optional
-from services.io import add_fast_api_root
-from services.misc import stripKeyDict
-from typing import List, Optional
-
-from fastapi import APIRouter, Depends, WebSocket, status, Query, Body
-from fastapi.exceptions import HTTPException
-from pydantic import BaseModel
-from sqlmodel import Session, select
-
-from database.auth.models import User
-from database.db import get_session
-from database.exercices.models import Exercice
-from database.room.crud import serialize_parcours_short, change_correction, corrige_challenge, \
-    create_parcours_db, delete_parcours_db, create_room_db, get_member_dep, check_room, serialize_room, \
-    update_parcours_db, get_parcours, get_room, check_admin, get_exercices, get_challenge, get_correction, \
-    create_tmp_correction, create_challenge, change_challenge, serialize_parcours, getTops, getAvgRank, getRank, \
-    getAvgTops, ChallengerFromChallenge, getMemberAvgRank, getMemberRank
+    getAvgTops, ChallengerFromChallenge, getMemberAvgRank, getMemberRank, getMemberChallenges
 from database.room.models import Challenge, ChallengeRead, Challenges, ParcoursReadUpdate, ChallengeInfo, Member, \
    Parcours, ParcoursCreate, ParcoursRead, ParcoursReadShort, Room, RoomConnectionInfos, \
    RoomCreate, RoomInfo, TmpCorrection, CorrigedData, CorrectionData
@ -68,6 +45,14 @@ def get_room_route(room: Room = Depends(get_room), member: Member = Depends(get_
    return serialize_room(room, member, db)


+@router.delete('/room/{room_id}', dependencies=[Depends(check_admin)])
+async def delete_room(room: Room = Depends(get_room), m: RoomManager = Depends(get_manager),
+                      db: Session = Depends(get_session)):
+    delete_room_db(room, db)
+    await m.broadcast({"type": "deleted"}, room.id_code)
+    return {"message": "ok"}
+
+
@router.post('/room/{room_id}/parcours', response_model=ParcoursRead)
 async def create_parcours(*, parcours: ParcoursCreate, room_id: str, member: Member = Depends(check_admin),
                          m: RoomManager = Depends(get_manager), db: Session = Depends(get_session)):
@ -88,6 +73,8 @@ async def get_parcours_route(*, parcours: Parcours = Depends(get_parcours), memb
    return serialize_parcours(parcours, member, db)


+
+
@router.put('/room/{room_id}/parcours/{parcours_id}', response_model=ParcoursRead)
 async def update_parcours(*, room_id: str, parcours: ParcoursCreate, member: Member = Depends(check_admin),
                          parcours_old: Parcours = Depends(get_parcours), m: RoomManager = Depends(get_manager),
@ -103,9 +90,16 @@ async def update_parcours(*, room_id: str, parcours: ParcoursCreate, member: Mem
    await m.broadcast({"type": "edit_parcours", "data": {
        "parcours": ParcoursReadUpdate(**parcours_obj.dict(), update_challenges=update_challenges).dict()}},
                      parcours_old.id_code)
+    print('BROADCASTING')
+    await m.broadcast(
+        lambda m: {"type": "update_challenges", "data": {"challenger": {"id_code": m.id_code, "name": getUsername(m), "validated": getMemberValidated(m, parcours_obj, db)},
+                                                         "challenges": [Challenges(
+                                                             **{**chall.dict(), "canCorrige": chall.data != []}).dict() for
+                                                             chall in
+                                                             getMemberChallenges(m, parcours_obj, db)]}},
+        parcours_old.id_code, conditions=[lambda m: m.member.id_code != member.id_code])

    return serialize_parcours(parcours_obj, member, db)
-    return {**parcours_obj.dict()}


@router.delete('/room/{room_id}/parcours/{parcours_id}', dependencies=[Depends(check_admin)])
@ -183,7 +177,7 @@ async def send_challenge(*, challenge: List[CorrectionData], correction: TmpCorr
        }}, parcours.id_code)
    print('CHALLENGE', chall)
    db.delete(correction)
-    returnValue = {**chall.dict(), 'validated': chall.mistakes <= correction.parcours.max_mistakes}
+    returnValue = {**chall.dict()}
    db.commit()
    return returnValue
    # return {**chall.dict(), 'validated': chall.mistakes <= correction.parcours.max_mistakes}
@ -258,8 +252,5 @@ async def corrige(*, correction: List[CorrigedData] = Body(), challenge: Challen
@router.websocket('/ws/room/{room_id}')
 async def room_ws(ws: WebSocket, room: Room | None = Depends(check_room), db: Session = Depends(get_session),
                  m: RoomManager = Depends(get_manager)):
-    if room is None:
-        raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND, detail='Room not found')
    consumer = RoomConsumer(ws=ws, room=room, manager=m, db=db)
    await consumer.run()
--- a/backend/api/services/websocket.py
+++ b/backend/api/services/websocket.py
@ -1,9 +1,10 @@
-from typing import List, Callable, Any, Dict
-from pydantic import validate_arguments, BaseModel
-from fastapi.websockets import WebSocketDisconnect, WebSocket
-from pydantic.error_wrappers import ValidationError
 import inspect
-from starlette.websockets import WebSocketState
+from typing import List, Callable, Any, Dict
+
+from fastapi.websockets import WebSocketDisconnect, WebSocket
+from pydantic import validate_arguments, BaseModel
+from pydantic.error_wrappers import ValidationError
+

 def make_event_decorator(eventsDict):
    def _(name: str | List, conditions: List[Callable | bool] = []):
@ -62,7 +63,8 @@ class Consumer:
        #self.events: Dict[str, Callable] = {}

    async def connect(self):
-        pass
+        await self.ws.accept()
+        return True

    async def validation_error_handler(self, e: ValidationError):
        errors = e.errors()
@ -132,7 +134,9 @@ class Consumer:
        pass

    async def run(self):
-        await self.connect()
+        accepted = await self.connect()
+        if accepted is False:
+            return
        try:
            while True:
                data = await self.ws.receive_json()
--- a/frontend/.gitignore
+++ b/frontend/.gitignore
@ -9,3 +9,4 @@ node_modules
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
 .idea
+*/database*
--- a/frontend/src/apis/auth.api.ts
+++ b/frontend/src/apis/auth.api.ts
@ -1,13 +1,13 @@
-import axios from 'axios';
-import { autoRefresh } from '../utils/utils';
-import {env} from '$env/dynamic/private';
+import axios from "axios";
+import { autoRefresh } from "../utils/utils";
+import { env } from "$env/dynamic/public";

 export const authInstance = axios.create({
-	baseURL: `${env.API_BASE}`,
+  baseURL: `${env.PUBLIC_API_BASE}`,
  headers: {
-		'Content-Type': 'application/json',
-		Accept: 'application/json',
-		'Access-Control-Allow-Origin': '*',
+    "Content-Type": "application/json",
+    Accept: "application/json",
+    "Access-Control-Allow-Origin": "*"
    //'X-CSRFToken': csrftoken != undefined ? csrftoken : '',
  }
 });
--- a/frontend/src/apis/exo.api.ts
+++ b/frontend/src/apis/exo.api.ts
@ -1,10 +1,10 @@
 import axios from 'axios';
 import { parse, stringify } from 'qs'
 import { autoRefresh } from '../utils/utils';
-import {env} from '$env/dynamic/private';
+import { env } from "$env/dynamic/public";
 export const exoInstance = axios.create({
 	paramsSerializer:{encode:(params)=> {return parse(params, {arrayFormat:"brackets"})}, serialize: (p)=>{return stringify(p, {arrayFormat: "repeat"})}},
-	baseURL: `${env.API_BASE}`,
+	baseURL: `${env.PUBLIC_API_BASE}`,
 	headers: {
 		'Content-Type': 'application/json',
 		Accept: 'application/json',
--- a/frontend/src/apis/room.api.ts
+++ b/frontend/src/apis/room.api.ts
@ -1,13 +1,13 @@
-import axios from 'axios';
-import { autoRefresh } from '../utils/utils';
-import {env} from '$env/dynamic/private';
+import axios from "axios";
+import { autoRefresh } from "../utils/utils";
+import { env } from "$env/dynamic/public";

 export const roomInstance = axios.create({
-	baseURL: `${env.API_BASE}/room`,
+  baseURL: `${env.PUBLIC_API_BASE}room`,
  headers: {
-		'Content-Type': 'application/json',
-		Accept: 'application/json',
-		'Access-Control-Allow-Origin': '*',
+    "Content-Type": "application/json",
+    Accept: "application/json",
+    "Access-Control-Allow-Origin": "*"
    //'X-CSRFToken': csrftoken != undefined ? csrftoken : '',
  }
 });
--- a/frontend/src/app.scss
+++ b/frontend/src/app.scss
@ -4,6 +4,7 @@
  box-sizing: border-box;
  margin: 0;
 }
+
 .spinner {
  width: 30px;
  height: 30px;
@ -20,6 +21,7 @@
 .italic {
  font-style: italic;
 }
+
 .underline {
  text-decoration: underline;
 }
@ -54,6 +56,7 @@
  padding: 0 50px;
  width: max-content;
  cursor: pointer;
+
  &:disabled {
    cursor: not-allowed
  }
@ -62,6 +65,7 @@
 .primary-btn {
  @extend .btn;
  background-color: #fcbf49;
+
  &:hover {
    background-color: #ac7b19;
  }
@ -70,6 +74,7 @@
 .danger-btn {
  @extend .btn;
  background-color: #fc5e49;
+
  &:hover {
    background-color: #ac1919;
  }
@ -80,6 +85,7 @@
  background-color: transparent;
  border: 1px solid #fcbf49;
  color: #fcbf49;
+
  &:hover {
    background-color: #fcbf49;
    color: black;
@ -100,6 +106,7 @@
  transition: 0.3s;
  border-radius: 0;
  margin: 0;
+
  &:focus {
    outline: none;
    border-bottom-color: $contrast;
@ -111,6 +118,7 @@
  display: flex;
  justify-content: center;
 }
+
@for $f from 0 through 100 {
  .wp-#{$f} {
    width: 1% * $f;
@ -126,3 +134,11 @@
  font-weight: 900;
 }

+.contrast {
+  color: $contrast;
+}
+
+
+.loading {
+  cursor: progress;
+}
--- a/frontend/src/components/NavBar.svelte
+++ b/frontend/src/components/NavBar.svelte
@ -5,7 +5,7 @@
  import FaHome from "svelte-icons/fa/FaHome.svelte";
  import { afterNavigate } from "$app/navigation";
  import FaUser from "svelte-icons/fa/FaUser.svelte";
-  import FaSignOutAlt from "svelte-icons/fa/FaSignOutAlt.svelte";
+  import IoIosLogOut from 'svelte-icons/io/IoIosLogOut.svelte'

  const {
    isAuth,
@ -16,6 +16,7 @@
  afterNavigate(() => {
    open = false;
  });
+  $: console.log("USERNAME", $username);
 </script>

 <nav data-sveltekit-preload-data="hover" class:open>
@ -29,6 +30,7 @@
    <NavLink href="/room">Salles</NavLink>

  </div>
+  <div class="right">
    <div class="auth">
      {#if $isAuth && $username != null}

@ -37,22 +39,23 @@
            <div class="icon">
              <FaUser />
            </div>
-          {$username}</div>
+            {$username}
+          </div>
        </NavLink>
        <div class="icon signout" title="Se déconnecter" on:click={()=>{
                logout()
            }}>
-        <FaSignOutAlt />
+          <IoIosLogOut />
        </div>

      {:else}
        <NavLink href="/signup" exact>S'inscrire</NavLink>
        <NavLink href="/signin" exact>Se connecter</NavLink>
      {/if}
+
+    </div>
    <div class="burger" on:click={()=>{open=!open}}><span>  </span></div>
  </div>
-
-
 </nav>
 <style lang="scss">
  @import "../mixins";
@ -107,9 +110,20 @@
    }
  }

+  .auth {
+    transition: .3s;
+    display: flex;
+    gap: 7px;
+    @include down(666) {
+      //display: none;
+      opacity: 0;
+    }
+  }
+
+
  .burger {
    background: 0 0;
-    @include up(750px) {
+    @include up(666) {
      display: none;
    }
    border: none;
@ -164,15 +178,11 @@

  .open {

-    @include down(750px) {
+    @include down(666px) {
      .navigate {
-        *:first-child {
-          display: none
-        }
+
        max-height: 1000000px;

-        // Remove home icon
-        transition: .2s;
        background: rgba($background-dark, 0.8);
        height: 100%;
        position: fixed;
@ -184,18 +194,31 @@
        flex-direction: column;
        justify-content: center;
        align-items: center;
-        gap: 42px;
-        z-index: 100;
+        //gap: 42px;
+        z-index: 600;
+
+        animation: open .1s ease-in-out forwards;
+
+      }
+
+      :global(.home){
+        display: none;
+      }
+
+      .right {
+        justify-content: end;
+        width: 100%;
+        z-index: 601;
+        display: flex;
      }

      .auth {
-        justify-content: end;
-        width: 100%;
-        z-index: 101;
-
+        display: flex;
+        opacity: 1;
      }

      & .burger {
+        z-index: 1000;

        & span::before {
          bottom: 0;
@ -220,4 +243,14 @@
    padding-right: 20px;
  }

+  @keyframes open {
+    0% {
+      gap: 10px;
+      opacity: .3;
+    }
+    100% {
+     gap: 42px;
+      opacity: 1;
+    }
+  }
 </style>
--- a/frontend/src/components/auth/InfoForm.svelte
+++ b/frontend/src/components/auth/InfoForm.svelte
@ -6,23 +6,23 @@
  import { onMount } from "svelte";
  import { errorMsg } from "../../utils/forms.js";

-    export let user: User
+  export let user: User;
  export let myForm;
-    const username = field('username', user.username, [required(), max(20), min(2)], {
+  const username = field("username", user.username, [required(), max(20), min(2)], {
    checkOnInit: true
  });
-    const name = field('name', user.name || "", [max(50)], {
+  const name = field("name", user.name || "", [max(50)], {
    checkOnInit: true
  });
-    const firstname = field('firstname', user.firstname || "", [max(50),], {
+  const firstname = field("firstname", user.firstname || "", [max(50)], {
    checkOnInit: true
  });
-    const emailField = field('email', user.email || "", [ /*email()*/], {
+  const emailField = field("email", user.email || "", [ /*email()*/], {
    checkOnInit: true
  });
  onMount(() => {
    myForm = form(username, name, firstname, emailField);
-    })
+  });
 </script>

 {#if !!$myForm}
@ -39,8 +39,13 @@
 {/if}

 <style lang="scss">
+  @import "../../mixins.scss";
+
  div {
    display: grid;
    grid-template-columns: 1fr 1fr;
+    @include down(800px){
+      grid-template-columns: 1fr;
+    }
  }
 </style>
--- a/frontend/src/components/auth/PasswordForm.svelte
+++ b/frontend/src/components/auth/PasswordForm.svelte
@ -6,12 +6,12 @@
  import { errorMsg } from "../../utils/forms";


-    const password = field('password', '', [required(), min(8), pattern(/[0-9]/), pattern(/[A-Z]/)], {checkOnInit: true});
-    const confirm = field('password_confirm', '', [required(), matchField(password)],{checkOnInit: true});
+  const password = field("password", "", [required(), min(8), pattern(/[0-9]/), pattern(/[A-Z]/)], { checkOnInit: true });
+  const confirm = field("password_confirm", "", [required(), matchField(password)], { checkOnInit: true });
  export let myForm;
  onMount(() => {
-        myForm = form(password, confirm)
-    })
+    myForm = form(password, confirm);
+  });

 </script>

@ -24,8 +24,12 @@
  </div>
 {/if}
 <style lang="scss">
+  @import "../../mixins.scss";
+
  div {
    display: grid;
    grid-template-columns: 1fr 1fr;
+    @include down(800){
+      grid-template-columns: 1fr;}
  }
 </style>
--- a/frontend/src/components/auth/RoomList.svelte
+++ b/frontend/src/components/auth/RoomList.svelte
@ -10,7 +10,7 @@
    <ul>
        {#each rooms as room}
            <li>
-                <a href="/room/{room.id_code}">{room.name} ({room.admin ? "Administrateur" : "Member"})</a>
+                <a href="/room/{room.id_code}">{room.name} ({room.admin ? "Administrateur" : "Membre"})</a>
            </li>
        {/each}
    </ul>
--- a/frontend/src/components/auth/Section.svelte
+++ b/frontend/src/components/auth/Section.svelte
@ -1,16 +1,17 @@
 <script lang="ts">

-    export let icon = null
+  export let icon = null;
  export let title;
-    export let validate = "Valider !"
-    export let onValidate = null
-    export let canValid = false
+  export let validate = "Valider !";
+  export let onValidate = null;
+  export let canValid = false;
 </script>

 <div>
  <h2>
    <div class="icon">
-            <svelte:component this={icon}/></div>
+      <svelte:component this={icon} />
+    </div>
    {title}</h2>
  <div class="content">
    <slot />
@ -24,10 +25,16 @@
 </div>

 <style lang="scss">
+  @import "../../mixins.scss";
+
  h2 {
    display: flex;
    align-items: center;
+    @include down(800){
+      justify-content: center;
    }
+  }
+
  .icon {
    margin-right: 10px;
    width: 25px;
@ -49,5 +56,8 @@
    display: flex;
    justify-content: flex-end;
    margin-top: 10px;
+    @include down(800){
+      justify-content: center;
+    }
  }
 </style>
--- a/frontend/src/components/exos/Card.svelte
+++ b/frontend/src/components/exos/Card.svelte
@ -1,21 +1,21 @@
 <script lang="ts">
-	import type { Exercice } from '../../types/exo.type';
-	import { getContext } from 'svelte';
-	import ModalCard from './ModalCard.svelte';
-	import { goto } from '$app/navigation';
-	import { cloneExo } from '../../requests/exo.request';
-	import TagContainer from './TagContainer.svelte';
-	import PrivacyIndicator from './PrivacyIndicator.svelte';
-	import MdContentCopy from 'svelte-icons/md/MdContentCopy.svelte';
-	import type { Writable } from 'svelte/store';
+  import type { Exercice } from "../../types/exo.type";
+  import { getContext } from "svelte";
+  import ModalCard from "./ModalCard.svelte";
+  import { goto } from "$app/navigation";
+  import { cloneExo } from "../../requests/exo.request";
+  import TagContainer from "./TagContainer.svelte";
+  import PrivacyIndicator from "./PrivacyIndicator.svelte";
+  import MdContentCopy from "svelte-icons/md/MdContentCopy.svelte";
+  import type { Writable } from "svelte/store";

  export let exo: Exercice;

-	const { show } = getContext<{ show: Function }>('modal');
-	const { navigate } = getContext<{ navigate: Function }>('navigation');
-	const { isAuth } = getContext<{ isAuth: Writable<boolean> }>('auth');
-	const exerciceStore = getContext('exos');
-	const tagsStore = getContext('tags');
+  const { show } = getContext<{ show: Function }>("modal");
+  const { navigate } = getContext<{ navigate: Function }>("navigation");
+  const { isAuth } = getContext<{ isAuth: Writable<boolean> }>("auth");
+  const exerciceStore = getContext("exos");
+  const tagsStore = getContext("tags");

  let opened = false;
  const handleClick = () => {
@ -92,9 +92,11 @@

 <style lang="scss">
  @import '../../variables';
+
  * {
    transition: 0.45s;
  }
+
  .icon {
    width: 18px;
    height: 18px;
@ -102,6 +104,7 @@
    cursor: pointer;
    opacity: 0.7;
    transform: scale(0.9);
+
    &:hover {
      transform: scale(1);
      opacity: 1;
@ -124,6 +127,7 @@
    overflow: hidden;
    text-overflow: ellipsis;
    margin-bottom: 20px;
+
    p {
      margin: 10px;
      margin-left: 18px;
@ -132,6 +136,7 @@
      text-overflow: ellipsis;
      white-space: nowrap;
    }
+
    h2 {
      font-size: 0.95em;
      margin: 10px;
@ -147,16 +152,20 @@
    bottom: 0;
    z-index: 1;
    border: 1px solid $border;
+
    + :global(div) {
      transition: 0.45s;
    }
+
    &:hover {
      border: 1px solid $primary;
+
      + :global(div) {
        border: 1px solid $primary;
        border-top: none;
      }
    }
+
    box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.75);
  }

@ -173,6 +182,7 @@
    -webkit-line-clamp: 2;
    -webkit-box-orient: vertical;
    word-wrap: break-word;
+
    &:hover {
      color: $primary;
    }
@ -186,6 +196,8 @@
    background-color: $background;
    min-height: 250px;
    max-height: 300px;
+    min-width: 250px;
+
    &:hover {
      transform: translateX(10px) translateY(-10px);
    }
--- a/frontend/src/components/exos/CreateCard.svelte
+++ b/frontend/src/components/exos/CreateCard.svelte
@ -1,7 +1,7 @@
 <script lang="ts">
-	import type { Exercice, Page } from '../../types/exo.type';
-	import type { Writable } from 'svelte/store';
-	import EditForm from './EditForm.svelte';
+  import type { Exercice, Page } from "../../types/exo.type";
+  import type { Writable } from "svelte/store";
+  import EditForm from "./EditForm.svelte";

  export let cancel: Function;
  export let exos: Writable<{ isLoading: boolean; isFetching: boolean; data: Page }>;
@ -19,6 +19,8 @@

 <style lang="scss">
  @import '../../variables';
+  @import '../../mixins';
+
  div {
    background: $background;
    padding: 50px;
@ -26,7 +28,15 @@
    flex-direction: column;
    gap: 20px;
    align-items: flex-start;
+    @include down(800){
+      width: 100%;
+      height: 100%;
+      min-width: 0;
    }
+    min-width: 800px;
+
+  }
+
  h1 {
    font-size: 1.5em;
  }
--- a/frontend/src/components/exos/DownloadForm.svelte
+++ b/frontend/src/components/exos/DownloadForm.svelte
@ -86,7 +86,7 @@
 	{/if}
 	<div class="icons">
 		<div>
-			<div class="icon" style:color="black" on:click={() => close()} on:keypress={() => {}}>
+			<div class="icon contrast" on:click={() => close()} on:keypress={() => {}}>
 				<MdClose />
 			</div>
 		</div>
@ -148,6 +148,7 @@
 {/if}

 <style lang="scss">
+	@import '../../mixins';
 	.icon {
 		width: 25px;
 		height: 25px;
@ -183,7 +184,7 @@
 		span.name {
 			overflow: hidden;
 			word-wrap: break-word;
-
+			width: 100%;
 		}
 		span:not(.name) {
 			position: relative;
@ -191,6 +192,11 @@
 			font-size: 18px;
 			cursor: pointer;
 		}
+
+		@include down(750px){
+			flex-direction: column;
+			gap: 10px;
+		}
 	}

 	.examples {
--- a/frontend/src/components/exos/EditForm.svelte
+++ b/frontend/src/components/exos/EditForm.svelte
@ -1,21 +1,25 @@
 <script lang="ts">
-	import { form, field } from 'svelte-forms';
-	import { required, max, min } from 'svelte-forms/validators';
-	import FileInput from '../forms/FileInput.svelte';
-	import InputWithLabel from '../forms/InputWithLabel.svelte';
-	import { getContext } from 'svelte';
-	import { createExo, editExo } from '../../requests/exo.request';
-	import type { Exercice } from '../../types/exo.type';
-	import { checkFile, errorMsg } from '../../utils/forms';
-	import { compareObject } from '../../utils/utils';
+  import { form, field } from "svelte-forms";
+  import { required, max, min } from "svelte-forms/validators";
+  import FileInput from "../forms/FileInput.svelte";
+  import InputWithLabel from "../forms/InputWithLabel.svelte";
+  import { getContext } from "svelte";
+  import { createExo, editExo } from "../../requests/exo.request";
+  import type { Exercice } from "../../types/exo.type";
+  import { checkFile, errorMsg } from "../../utils/forms";
+  import { compareObject } from "../../utils/utils";
+  import { goto } from "$app/navigation";
+  import ModalCard from "./ModalCard.svelte";

  export let editing = true;
-	export let updateExo: Function = (e: Exercice) => {};
+  export let updateExo: Function = (e: Exercice) => {
+  };

  export let exo: Exercice | null = null;
  export let cancel: Function;

-	const { alert } = getContext<{ alert: Function }>('alert');
+  const { alert } = getContext<{ alert: Function }>("alert");
+  const { show } = getContext<{ show: Function }>("modal");

  // "Legally" initiate empty FileList for model field (simple list raises warning)
  /* let list = new DataTransfer();
@ -24,20 +28,26 @@
  !editing && list.items.remove(0); */

  // Initiate fields and form
-	const name = field('name', !!exo ? exo.name : '', [required(), max(50), min(5)], {
+  const name = field("name", !!exo ? exo.name : "", [required(), max(50), min(5)], {
    checkOnInit: true
  });
-	const consigne = field('consigne', !!exo && exo.consigne != null ? exo.consigne : '', [max(200)], { checkOnInit: true });
-	const prv = field('private', !!exo ? exo.private : false);
-	const model = field('model', [], [checkFile(), required()], {
+  const consigne = field("consigne", !!exo && exo.consigne != null ? exo.consigne : "", [max(200)], { checkOnInit: true });
+  const prv = field("private", !!exo ? exo.private : false);
+  const model = field("model", [], [checkFile(), required()], {
    checkOnInit: !editing
  });
  const myForm = form(name, consigne, prv, model);
+  const exerciceStore = getContext<{ exerciceStore: any }>("exerciceStore");
+  const tagsStore = getContext<{ tagsStore: any }>("tagsStore");
+  const { navigate } = getContext<{ navigate: Function }>("navigation");
+  const { success, error } = getContext<{ success: Function, error: Function }>("notif");
+  let loading = false
 </script>

 <form
  action=""
  on:submit|preventDefault={() => {
+    loading = true
 		if (editing && exo != null) {
 			editExo(exo.id_code, {
 				name: $name.value,
@ -45,19 +55,43 @@
 				private: $prv.value,
 				...($model.dirty == true && { file: $model.value[0] })
 			}).then((r) => {
+        loading=false
+        success('Exercice modifié !', `Exercice ${r.data.name} modifié avec succès !`)
 				exo=r.data
 				updateExo(r.data);
 				cancel()
+			}).catch((e) => {
+        loading=false
+        console.log(e)
+        error('Erreur', 'Une erreur est survenue lors de la modification de l\'exercice')
      });
 		} else {
+
 			createExo({
 				name: $name.value,
 				consigne: $consigne.value,
 				private: $prv.value,
 				file: $model.value[0]
 			}).then((r) => {
+        loading=false
 				updateExo(r.data);
-				cancel()
+        success('Exercice créé !', `Exercice ${r.data.name} créé avec succès !`)
+				goto(`/exercices/${r.data.id_code}`)
+				//cancel()
+				show(
+            ModalCard,
+            {
+              exo: r.data,
+              exos: exerciceStore,
+              tags: tagsStore
+            },
+            () => {
+              navigate(-1)
+            }, true
+          );
+			}).catch((e) => {
+        loading=false
+        error('Erreur', 'Une erreur est survenue lors de la création de l\'exercice')
      });
 		}
 	}}
@ -86,10 +120,17 @@
    <input type="checkbox" bind:checked={$prv.value} name="private" id="private" />
    <label for="private">Privé</label>
  </div>
-	<FileInput bind:value={$model.value} accept=".py" id_code={exo?.id_code} defaultValue={editing &&exo!= null?  exo.exo_source: null}/>
+  <FileInput bind:value={$model.value} accept=".py" id_code={exo?.id_code}
+             defaultValue={editing &&exo!= null?  exo.exo_source: null} />

  <div class="wp-100">
-		<button class="primary-btn" disabled={!$myForm.valid}>Modifier</button>
+    <button class="primary-btn" disabled={!$myForm.valid}>
+      {#if !loading}
+        {editing ? "Modifier" : "Créer"}
+        {:else}
+        <span class="spinner"></span>
+      {/if}
+    </button>
    <button
      class="danger-btn"
      on:click|preventDefault={() => {
@ -104,7 +145,8 @@
 				} else {
 					cancel();
 				}
-			}}>Annuler</button
+			}}>Annuler
+    </button
    >
  </div>
 </form>
@ -117,4 +159,9 @@
        gap: 10px;
        align-items: flex-start;
    }
+    .spinner{
+        width: 15px;
+        height: 15px;
+        border-width: 2px!important;
+    }
 </style>
--- a/frontend/src/components/exos/ExoList.svelte
+++ b/frontend/src/components/exos/ExoList.svelte
@ -137,6 +137,7 @@
 </div>

 <style lang="scss">
+  @import '../../mixins';
  .auth-head {
    display: flex;

@ -157,6 +158,11 @@
    background-color: $background;
    padding: 20px;
    height: 100%;
+    min-width: 600px;
+    @include down(800){
+      min-width: 0;
+      width: 100%;
+    }
  }

  .selected {
--- a/frontend/src/components/exos/Feed.svelte
+++ b/frontend/src/components/exos/Feed.svelte
@ -112,12 +112,14 @@

 </script>

+
+<div class="full" class:loading={$tagStore.isFetching || $exerciceStore.isFetching}>
+
+
  {#if $tagStore.data != undefined}
    <Head location={filter} bind:search bind:selected />
  {/if}
-{#if $tagStore.isFetching == true}
-  Fetching
-{/if}
+

  <div class="feed">
    <div class="title">
@ -143,7 +145,7 @@
        <Card bind:exo={e} />
      {/each}
      {#if $exerciceStore.data.items.length == 0}
-      <p>Aucun exercices</p>
+        <p class="empty">Aucun exercice</p>
      {/if}
    {:else}
      {#each Array(10) as i}
@ -154,12 +156,15 @@
  {#if $exerciceStore.data != undefined}
    <Pagination bind:page={activePage} total={$exerciceStore.data.totalPage} />
  {/if}
+</div>

 <style lang="scss">
  @import '../../variables';
+  @import "../../mixins.scss";

  .skeleton {
-    width: 330px;
+    //width: 330px;
+    max-width: 330px;
    height: 250px;
    opacity: .8;

@ -214,6 +219,10 @@
    margin-top: 20px;
  }

+  .full {
+    padding: 0 20px;
+  }
+
  .title {
    grid-column: 1/3;
    display: flex;
@ -221,6 +230,11 @@
    justify-content: center;
    flex-direction: column;

+    @include down(600) {
+      grid-column: 1/2;
+      text-align: center;
+    }
+
    h1 {
      font-size: 3.5em;
      font-weight: bolder;
@ -235,4 +249,11 @@
      color: $primary;
    }
  }
+  .empty{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-style: italic;
+  }
+
 </style>
--- a/frontend/src/components/exos/Head.svelte
+++ b/frontend/src/components/exos/Head.svelte
@ -70,6 +70,7 @@
 </div>

 <style lang="scss">
+	@import "../../mixins.scss";
 	.head {
 		display: flex;
 		justify-content: space-between;
@ -77,6 +78,17 @@
 		div {
 			width: 50%;
 		}
+
+		@include down(600){
+			flex-direction: column;
+			gap: 10px;
+			> * {
+				width: 100%!important;
+			}
+			button{
+				width: 100%!important;
+			}
+		}
 	}
 	.search {
 		display: flex;
--- a/frontend/src/components/exos/ModalCard.svelte
+++ b/frontend/src/components/exos/ModalCard.svelte
@ -51,6 +51,7 @@
 			}}
 		/>
 	{:else if editing === true}
+		<h1>Modification</h1>
 		<EditForm
 			bind:exo
 			cancel={() => {
@ -63,8 +64,10 @@

 <style lang="scss">
 	@import '../../variables';
+	@import '../../mixins';
+
 	.modal {
-		min-width: 820px;
+		min-width: 800px;
 		background: $background;
 		padding: 70px;
 		grid-gap: 10px;
@ -73,5 +76,15 @@
 		flex-direction: column;
 		align-items: flex-start;
 		gap: 20px;
+		@include down(800){
+			width: 100%;
+			height: 100%;
+			min-width: 0;
+			padding: 50px;
+		}
+	}
+
+	h1{
+		font-size: 1.8rem;
 	}
 </style>
--- a/frontend/src/components/exos/Pagination.svelte
+++ b/frontend/src/components/exos/Pagination.svelte
@ -104,7 +104,6 @@
 		display: flex;
 		margin: 30px;
 		height: max-content;
-		width: 100%;
 		justify-content: center;
 		align-items: center;
 		button {
--- a/frontend/src/components/forms/InputWithLabel.svelte
+++ b/frontend/src/components/forms/InputWithLabel.svelte
@ -27,7 +27,7 @@
 </script>

 <span class="inputLabel" class:error={errors.length !== 0}>
-
+	<div style:position="relative">
 	<input
 		use:typeAction
 		on:input={(e)=>{change(e)}}
@ -48,7 +48,7 @@
 			{/if}
 		</div>
 	{/if}
-
+	</div>
 	<span class="bar" />

 	{#if errors.length !== 0}
--- a/frontend/src/components/rooms/Challenge.svelte
+++ b/frontend/src/components/rooms/Challenge.svelte
@ -5,18 +5,18 @@
    ParcoursInfos,
    Room,
    Note as NoteType
-	} from '../../types/room.type';
+  } from "../../types/room.type";
  import { getContext, onDestroy, onMount } from "svelte";
-	import { writable, type Writable } from 'svelte/store';
-	import { challenge, corrigeChallenge, getChallenge, getParcours, sendChallenge } from '../../requests/room.request';
-	import { goto } from '$app/navigation';
-	import { page } from '$app/stores';
-	import InputChallenge from './InputChallenge.svelte';
-	import { parseTimer } from '../../utils/utils';
-	import FaUndo from 'svelte-icons/fa/FaUndo.svelte';
+  import { writable, type Writable } from "svelte/store";
+  import { challenge, corrigeChallenge, getChallenge, getParcours, sendChallenge } from "../../requests/room.request";
+  import { goto } from "$app/navigation";
+  import { page } from "$app/stores";
+  import InputChallenge from "./InputChallenge.svelte";
+  import { parseTimer } from "../../utils/utils";
+  import FaUndo from "svelte-icons/fa/FaUndo.svelte";

-	const room: Writable<Room> = getContext('room');
-	const member: Writable<Member> = getContext('member');
+  const room: Writable<Room> = getContext("room");
+  const member: Writable<Member> = getContext("member");

  const challengeStore: Writable<{
    challenge: Challenge[];
@ -43,13 +43,12 @@
        remaining = p.time;
      });
    }
-	})
-
+  });


  let timer: number | null = null;
  let remaining: number | null = null;
-
+  const {error, success} = getContext("notif");
  $: {
    if (!corrige && $challengeStore != null && remaining == null) {
      remaining = $challengeStore.parcours.time * 60;
@ -71,6 +70,7 @@
  });
 </script>

+<div class="full">
  {#if $challengeStore != null}
    <div class="head">
      <h1>
@ -78,7 +78,7 @@

        {#if corrige && !!$challengeStore.challenger && remaining != null}
 				<span class="correction-info">
-					- Correction de <span class="italic">{$challengeStore.parcours.name}</span> par
+					Correction de <span class="italic">{$challengeStore.parcours.name}</span> par
 					<span class="italic underline">{$challengeStore.challenger.name}</span>
 					en {parseTimer(remaining)} (cliquez sur les réponses pour voir)</span
        >
@ -102,9 +102,11 @@
        >
        {/if}
      </h1>
+
      {#if $challengeStore.mistakes}
-			{$challengeStore.mistakes} fautes
+        <p class="mistakes" class:validated={$challengeStore.validated}>{$challengeStore.mistakes} fautes</p>
      {/if}
+
      {#if !corrige}
        <p
          class="timer"
@ -121,9 +123,11 @@
      <div class="exo">
        <div class="infos">
          <h2>Exercice {d + 1} : <span>{e.exo.name}</span></h2>
+          {#if e.exo.consigne != null}
            <p>
              {e.exo.consigne}
            </p>
+          {/if}
        </div>
        <div class="data">
          {#each e.data as c, a}
@ -175,7 +179,8 @@
 							clearInterval(timer);
 						}
 					});
-				}}>Valider !</button
+				}}>Valider !
+        </button
        >
        <button
          hidden={!$challengeStore.corriged}
@ -190,7 +195,8 @@
 							timer = null;
 						}
 					});
-				}}>Réessayer !</button
+				}}>Réessayer !
+        </button
        >
      {:else if $member.isAdmin}
        <button
@ -202,9 +208,12 @@
 						$challengeStore.challenge = p.data
 						$challengeStore.mistakes = p.mistakes
 						$challengeStore.validated = p.validated
-					
+					  success('Corrigé !', 'Le challenge a été corrigé avec succès !')
+					}).catch(()=>{
+            error('Erreur', 'Une erreur est survenue lors de la correction du challenge')
 					});
-				}}>Valider !</button
+				}}>Valider !
+        </button
        >
      {/if}

@ -217,8 +226,14 @@
      >
    </div>
  {/if}
-
+</div>
 <style lang="scss">
+  @import "../../mixins";
+
+  .full {
+    padding: 7px 15px;
+  }
+
  .timer {
    font-size: 2em;
    color: $green;
@ -235,6 +250,20 @@
    justify-content: space-between;
    margin: 40px 0;
    min-height: 70px;
+    @include down(800px) {
+      flex-direction: column;
+      text-align: center;
+      h1{
+        flex-direction: column;
+      }
+    }
+
+    @include up(800px) {
+      .correction-info::before{
+        content: " - ";
+      }
+    }
+
  }

  .late {
@ -247,6 +276,7 @@
    gap: 10px;
    position: relative;
  }
+
  .data {
    display: grid;
    grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
@ -256,15 +286,18 @@
  .infos {
    h2 {
      font-size: 1.2em;
+
      span {
        font-style: italic;
      }
    }
+
    p {
      font-size: 1em;
      font-style: italic;
      text-decoration: underline;
    }
+
    margin-bottom: 10px;
  }

@ -272,25 +305,39 @@
    margin-bottom: 30px;
    margin-top: 20px;
  }
+
  .icon {
    height: 20px;
    width: 20px;
    cursor: pointer;
    display: flex;
    transition: 0.2s;
+
    &:hover {
      transform: rotate(360deg);
    }
  }
+
  h1 {
    display: flex;
    align-items: center;
    gap: 20px;
    font-size: 2.3em;
  }
+
  .correction-info {
    font-size: 0.6em;
    color: grey;
    font-weight: 600;
  }
+
+  .mistakes {
+    font-weight: 700;
+    font-size: 2em;
+    color: $red;
+  }
+
+  .validated {
+    color: $green;
+  }
 </style>
--- a/frontend/src/components/rooms/ChallengesList.svelte
+++ b/frontend/src/components/rooms/ChallengesList.svelte
@ -1,16 +1,17 @@
 <script lang="ts">
-	import type { Member, ParcoursRead } from '../../types/room.type';
-	import { getContext } from 'svelte';
-	import type { Writable } from 'svelte/store';
-	import IoIosArrowDown from 'svelte-icons/io/IoIosArrowDown.svelte';
-	import { goto } from '$app/navigation';
-	import { parseTimer } from '../../utils/utils';
-    import IoMdOpen from 'svelte-icons/io/IoMdOpen.svelte';
+  import type { Member, ParcoursRead } from "../../types/room.type";
+  import { getContext } from "svelte";
+  import type { Writable } from "svelte/store";
+  import IoIosArrowDown from "svelte-icons/io/IoIosArrowDown.svelte";
+  import { goto } from "$app/navigation";
+  import { parseTimer } from "../../utils/utils";
+  import IoMdOpen from "svelte-icons/io/IoMdOpen.svelte";

-	const parcours: Writable<ParcoursRead | null> = getContext('parcours');
-	const member: Writable<Member | null> = getContext('member');
+  const parcours: Writable<ParcoursRead | null> = getContext("parcours");
+  const member: Writable<Member | null> = getContext("member");
+
+  let selected = "";

-	let selected = '';
 </script>

 {#if $parcours != null && $member != null}
@ -30,6 +31,7 @@
      >
        <span class="icon"><IoIosArrowDown /></span>
        {chall.challenger.id_code == $member.id_code ? 'Vos essais' : chall.challenger.name}
+        <span class:valid = {chall.challenger.validated} class="validation-status">{chall.challenger.validated ? "Validé": "Non validé"}</span>
      </p>

      {#if selected == chall.challenger.id_code}
@ -43,7 +45,7 @@
            title="Voir la correction"
          >
            <p><span class:validated={c.validated} class:uncorriged={!c.isCorriged} class="note"
-								>{c.mistakes} faute{c.mistakes > 1 ?"s": ""} </span> en <strong >{parseTimer(c.time)}</strong>
+            >{c.mistakes} faute{c.mistakes > 1 ? "s" : ""} </span> en <strong>{c.time < $parcours.time * 60 ? parseTimer(c.time): parseTimer($parcours.time*60)} <span title={`Vous avez dépassé de ${parseTimer(c.time - $parcours.time*60)}`} class="time-overflow">{c.time > $parcours.time * 60? `( + ${parseTimer(c.time - $parcours.time*60)} )`:""}</span></strong>
            </p>
            <span class="corrige-link icon"><IoMdOpen /></span>
          </div>
@ -69,8 +71,10 @@
      transition: 0.2s;
    }
  }
+
  .selected {
    font-weight: 700;
+
    .icon {
      transform: rotate(0);
    }
@ -82,7 +86,8 @@
    cursor: pointer;
    width: max-content;
    margin-left: 30px;
-        p span{
+
+    p > span {
      color: $red;
      font-weight: 600;
    }
@ -102,12 +107,28 @@
    color: grey;
    font-weight: 900;
  }
+
  .trylist {
    display: flex;
    flex-direction: column;
    gap: 10px;
  }
-    .validated {
+  .validation-status{
+    color: $red;
+    font-weight: 600;
+    &::before{
+      content: " - ";
+    }
+  }
+  .validated, .valid {
    color: $green !important;
  }
+
+  .time-overflow{
+    color: $red;
+    font-weight: 400;
+    font-size: .8em;
+  }
+
+
 </style>
--- a/frontend/src/components/rooms/Members.svelte
+++ b/frontend/src/components/rooms/Members.svelte
@ -4,11 +4,15 @@
  import FaLock from "svelte-icons/fa/FaLock.svelte";
  import { getContext } from "svelte";
  import type { Writable } from "svelte/store";
+  import FaTimes from "svelte-icons/fa/FaTimes.svelte";
+  import FaCheck from "svelte-icons/fa/FaCheck.svelte";
+  import MdCheck from "svelte-icons/md/MdCheck.svelte";
+  import MdClose from "svelte-icons/md/MdClose.svelte";

  const room: Writable<Room> = getContext("room");
  const member: Writable<Member> = getContext("member");
  const { send } = getContext<{ send: Function }>("ws");
-
+  const { alert } = getContext<{ alert: Function }>("alert");
  $: online =
    $room != null
      ? $room.members.filter((r): r is Member => "online" in r && r.online == true)
@ -21,6 +25,16 @@
    $room != null
      ? $room.members.filter((r): r is Waiter => "waiter_id" in r && !!r.waiter_id)
      : [];
+  const ban = (m: Member) => {
+    if (!$member.isAdmin || m.isAdmin) return;
+    alert(
+      {
+        title: "Bannir", description: "Êtes-vous sûr de vouloir bannir cet utilisateur ?", validate: () => {
+          send("ban", { member_id: m.id_code });
+        }, validateButton: "Bannir"
+      }
+    );
+  };
 </script>

 <div class="members">
@ -62,9 +76,7 @@
        class:member={m.id_code == $member.id_code}
        class="online"
        title={$member.isAdmin && !m.isAdmin ? 'Bannir' : ''}
-        on:click={() => {
-					$member.isAdmin && !m.isAdmin && send('ban', { member_id: m.id_code });
-				}}
+        on:click={(e)=>ban(m)}
        on:keydown={() => {}}
      >
        {m.username}
@ -86,9 +98,7 @@
          class:bannable={m.id_code != $member.id_code && $member.isAdmin && !m.isAdmin}
          class:member={m.id_code == $member.id_code}
          title={$member.isAdmin && !m.isAdmin ? 'Bannir' : ''}
-          on:click={() => {
-						$member.isAdmin && !m.isAdmin &&  send('ban', { member_id: m.id_code });
-					}}
+          on:click={(e)=>ban(m)}
          on:keydown={() => {}}
        >
          {m.username}
@ -111,14 +121,20 @@
            class="accept"
            on:click={() => {
 							send('accept', { waiter_id: m.waiter_id });
-						}}>Accept
+						}}
+            title="Accepter"
+          >
+            <MdCheck />
          </button
          >
          <button
            class="refuse"
            on:click={() => {
 							send('refuse', { waiter_id: m.waiter_id });
-						}}>Refuse
+						}}
+            title="Refuser"
+          >
+            <MdClose />
          </button
          >
        </p>
@ -171,6 +187,9 @@
      font-size: 1em;
      width: max-content;

+      display: flex;
+      align-items: center;
+
      span {
        color: grey;
        font-size: 0.9em;
@ -203,4 +222,27 @@
    font-weight: 500;
    font-size: 0.8em !important;
  }
+
+  .accept, .refuse {
+    border: none;
+    background-color: transparent;
+    cursor: pointer;
+    width: 30px;
+    height: 30px;
+    transition: .3s;
+    margin: 0;
+
+    &:hover {
+      transform: scale(1.1);
+    }
+  }
+
+  .accept {
+    margin-left: 5px;
+    color: $green;
+  }
+
+  .refuse {
+    color: $red;
+  }
 </style>
--- a/frontend/src/components/rooms/ParcoursDetails.svelte
+++ b/frontend/src/components/rooms/ParcoursDetails.svelte
@ -13,6 +13,8 @@
  import { messages, handlers } from "../../store/ws";
  import Stats from "./Stats.svelte";
  import ChallengesList from "./ChallengesList.svelte";
+  import { delParcours } from "../../requests/room.request.js";
+  import FaRegTrashAlt from "svelte-icons/fa/FaRegTrashAlt.svelte";

  export let id_code: string;

@ -20,7 +22,7 @@
  const member: Writable<Member> = getContext("member");

  const { send } = getContext<{ send: Function }>("ws");
-
+  const {alert} = getContext<{alert: Function}>("alert");
  const parcours: Writable<ParcoursRead | null> = getContext("parcours");

  let open = "";
@ -53,6 +55,27 @@
          >
            <FaEdit />
          </div>
+          <div
+            class="icon back"
+            on:keydown={() => {}}
+            on:click|stopPropagation={() => {
+							alert({
+								title: 'Supprimer ?',
+								description: 'Voulez vous supprimer ce parcours ?',
+								validate: () => {
+									delParcours(
+										$room?.id_code,
+										$parcours.id_code,
+										!$member.isUser ? $member?.clientId : null
+									).then(()=>{
+                    goto(`?${new URLSearchParams().toString()}`);
+									});
+								}
+							});
+						}}
+          >
+            <FaRegTrashAlt />
+          </div>
        {/if}

        <div
@ -187,6 +210,7 @@
    display: flex;
    align-items: center;
    width: 20px;
+    height: 20px;
  }


@ -235,6 +259,7 @@
    flex-direction: column;
    gap: 20px;
    align-items: stretch;
+    padding: 3px 15px;
  }

  .btn {
@ -269,4 +294,7 @@
  .edit {
    color: $green;
  }
+  h1{
+    word-break: break-word;
+  }
 </style>
--- a/frontend/src/components/rooms/ParcoursList.svelte
+++ b/frontend/src/components/rooms/ParcoursList.svelte
@ -1,14 +1,11 @@
 <script lang="ts">
-	import { delParcours } from '../../requests/room.request';
-	import { getContext } from 'svelte';
-	import FaRegTrashAlt from 'svelte-icons/fa/FaRegTrashAlt.svelte';
-	import type { Writable } from 'svelte/store';
-	import type { Member, Room } from '../../types/room.type';
-	import { goto } from '$app/navigation';
-	import { page } from '$app/stores';
-	const room: Writable<Room> = getContext('room');
-	const member: Writable<Member> = getContext('member');
-	const { alert } = getContext<{ alert: Function }>('alert');
+  import { getContext } from "svelte";
+  import type { Writable } from "svelte/store";
+  import type { Member, Room } from "../../types/room.type";
+  import { goto } from "$app/navigation";
+
+  const room: Writable<Room> = getContext("room");
+  const member: Writable<Member> = getContext("member");
 </script>

 <div class="parcours">
@ -19,7 +16,8 @@
        class="primary-btn"
        on:click={() => {
 					goto(`?${new URLSearchParams({ p: 'new' }).toString()}`);
-				}}>Nouveau</button
+				}}>Nouveau
+      </button
      >
    {/if}
  </div>
@ -35,37 +33,23 @@
 				}}
        on:keydown={() => {}}
      >
-				<p>{p.name}</p>
+        <p class="parcours-name">{p.name}</p>
+
+
+        <div class="stats">
+          <p class="stat">
            {#if p.best_note}
-					<p>Record : {p.best_note} fautes</p>
+              <strong>Record :</strong> {p.best_note} faute{p.best_note > 1 ? "s" : ""}
            {:else}
              Aucun essai effectué
            {/if}
-				{#if p.validated}
-					<p data-testid="valid">Parcours validé</p>
-				{/if}
+          </p>
+          <p class="stat valid" data-testid="valid"
+             class:validated={p.validated}>{ p.validated ? "Parcours validé" : "Parcours non validé"}</p>

-				{#if $member.isAdmin}
-					<div
-						class="icon delete"
-						on:keydown={() => {}}
-						on:click|stopPropagation={() => {
-							alert({
-								title: 'Supprimer ?',
-								description: 'Voulez vous supprimer ce parcours ?',
-								validate: () => {
-									delParcours(
-										$room?.id_code,
-										p.id_code,
-										!$member.isUser ? $member?.clientId : null
-									);
-								}
-							});
-						}}
-					>
-						<FaRegTrashAlt />
        </div>
-				{/if}
+
+
      </div>
    {/each}
  </div>
@ -77,6 +61,9 @@
    font-style: italic;
    margin: 30px 0;
  }
+
+
+
  .parcours {
    background-color: rgba($background, 0.4);
    border: 1px solid $border;
@ -87,28 +74,34 @@
    flex-direction: column;
    border-radius: 5px;
  }
+
  .head {
    display: flex;
    align-items: center;
    justify-content: space-between;
    border-bottom: 1px solid $border;
    padding: 10px 0;
+
    button {
      width: max-content;
    }
  }
+
  .icon {
    width: 18px;
    height: 18px;
    color: $red;
    transition: 0.4s;
    opacity: 0;
+
    &:hover {
      transform: scale(1.1);
    }
  }
+
  .list {
    overflow: auto;
+
    > div {
      padding: 30px 10px;
      border-bottom: 1px solid $border-light;
@ -117,12 +110,41 @@
      display: flex;
      align-items: center;
      justify-content: space-between;
+
      &:hover {
        background-color: lighten($color: $background, $amount: 10);
+
        .icon {
          opacity: 1;
        }
      }
    }
  }
+
+  .valid {
+    font-weight: 600;
+    color: $red;
+  }
+
+  .validated {
+    color: $green;
+  }
+
+  .stat{
+    text-align: justify;
+    height: 1em;
+    margin: 5px 0;
+    width: max-content;
+    &::after{
+      content: "";
+      display: inline-block;
+      width: 100%;
+    }
+  }
+
+  .parcours-name {
+    font-weight: 500;
+    margin: 0;
+    word-break: break-word;
+  }
 </style>
--- a/frontend/src/components/rooms/RoomHead.svelte
+++ b/frontend/src/components/rooms/RoomHead.svelte
@ -1,16 +1,20 @@
 <script lang="ts">
-	import { getContext } from 'svelte';
-	import FaRegTrashAlt from 'svelte-icons/fa/FaRegTrashAlt.svelte';
+  import { getContext } from "svelte";
+  import FaRegTrashAlt from "svelte-icons/fa/FaRegTrashAlt.svelte";

-	import FaUndo from 'svelte-icons/fa/FaUndo.svelte';
-	import FaTimes from 'svelte-icons/fa/FaTimes.svelte';
-	import { goto } from '$app/navigation';
-	import type { Writable } from 'svelte/store';
-	import type { Room, Member } from '../../types/room.type';
-	import type ReconnectingWebSocket from 'reconnecting-websocket';
-	const room: Writable<Room> = getContext('room');
-	const member: Writable<Member>= getContext('member');
-	const { send, ws } = getContext<{send: Function, ws: ReconnectingWebSocket}>('ws');
+  import FaUndo from "svelte-icons/fa/FaUndo.svelte";
+  import FaTimes from "svelte-icons/fa/FaTimes.svelte";
+  import IoMdLogOut from 'svelte-icons/io/IoMdLogOut.svelte'
+  import { goto } from "$app/navigation";
+  import type { Writable } from "svelte/store";
+  import type { Member, Room } from "../../types/room.type";
+  import type ReconnectingWebSocket from "reconnecting-websocket";
+  import { deleteRoom } from "../../requests/room.request.js";
+
+  const room: Writable<Room> = getContext("room");
+  const member: Writable<Member> = getContext("member");
+  const { send, ws } = getContext<{ send: Function, ws: ReconnectingWebSocket }>("ws");
+  const { alert } = getContext<{ alert: Function }>("alert");
  let editing = false;
  let name = $room.name;
  let r: HTMLInputElement;
@ -33,14 +37,13 @@
    {/if}

    <input
-			type="text"
+      bind:this={r}
+      bind:value={name}
      class="input"
      class:hide={!editing}
      on:focusout={() => {
 				editing = false;
 			}}
-			bind:value={name}
-			bind:this={r}
      on:keydown={(e) => {
 				if (e.key == 'Escape') {
 					editing = false;
@ -49,28 +52,54 @@
 					editing = false;
 				}
 			}}
+      type="text"
    />
  </div>

  <div class="icons">
    {#if $member.isAdmin}
-            <div class="icon trash" data-testid="delete"><FaRegTrashAlt /></div>
+      <div class="icon trash" data-testid="delete" on:click={()=>{
+        alert({title:"Voulez vous vraiment supprimer la salle ?",
+               description:"L'intégralité des données de la salle sera supprimée et vous ne pourrez plus y accéder",
+               validate: ()=>{
+         deleteRoom($room.id_code, !$member.isUser ? $member.clientId: null)
+        },
+                validateButton: "Supprimer la salle"})
+
+         //goto('/room/join')
+      }}>
+        <FaRegTrashAlt />
+      </div>
+    {:else}
+      <div class="icon trash" data-testid="leave" on:click={()=>{
+        alert({title:"Voulez vous vraiment quitter la salle ?",
+               description:"Vous perdrez l'intégralité de vos résultats et ne pourrez plus accéder à cette salle sans y avoir été accepté à nouveau",
+               validate: ()=>{
+          send('leave')
+        },
+                validateButton: "Quitter la salle"})
+
+        //goto('/room/join')
+      }}
+           on:keypress={()=>{}}
+      >
+        <IoMdLogOut />
+      </div>
    {/if}

    <div
      class="icon refresh"
+      data-testid="refresh"
      on:click={() => {
-                console.log(ws)
 				ws.reconnect();
 			}}
      on:keydown={() => {}}
-			data-testid="refresh"
    >
      <FaUndo />
    </div>
    <div
-			data-testid="leave"
      class="icon trash"
+      data-testid="leave"
      on:click={() => {
 				ws.close();
        goto('/room/join')
@ -90,6 +119,7 @@
    border: none;
    opacity: 0;
  }
+
  .title {
    max-width: 50%;
    margin: 10px 0;
@ -104,16 +134,19 @@
      padding-left: 0;
      padding-top: 0;
    }
+
    h1 {
      margin: 0;
      font-weight: 700;
      font-size: inherit;
+
      span {
        font-size: 0.5em;
        color: grey;
      }
    }
  }
+
  .head {
    display: flex;
    align-items: center;
@ -126,6 +159,7 @@
    transition: 0.2s;
    cursor: pointer;
    display: flex;
+
    &:hover {
      transform: scale(1.1);
    }
@ -137,6 +171,7 @@

  .refresh {
    color: $contrast;
+
    &:hover {
      transform: rotate(-360deg);
    }
--- a/frontend/src/components/rooms/Stats.svelte
+++ b/frontend/src/components/rooms/Stats.svelte
@ -1,12 +1,12 @@
 <script lang="ts">
-	import type { ParcoursRead, Member } from '../../types/room.type';
-	import { parseTimer, statsCalculator } from '../../utils/utils';
-	import { getContext } from 'svelte';
-	import type { Writable } from 'svelte/store';
-	import Classement from './Classement.svelte';
+  import type { ParcoursRead, Member } from "../../types/room.type";
+  import { parseTimer, statsCalculator } from "../../utils/utils";
+  import { getContext } from "svelte";
+  import type { Writable } from "svelte/store";
+  import Classement from "./Classement.svelte";

-	const parcours: Writable<ParcoursRead | null> = getContext('parcours');
-	const member: Writable<Member | null> = getContext('member');
+  const parcours: Writable<ParcoursRead | null> = getContext("parcours");
+  const member: Writable<Member | null> = getContext("member");

  $: stats =
    $parcours != null && $member != null && !!$parcours.challenges[$member.id_code]
@ -80,6 +80,8 @@
 {/if}

 <style lang="scss">
+  @import "../../mixins.scss";
+  
  .stats {
    display: flex;
    flex-direction: column;
@ -87,9 +89,11 @@
    width: 100%;
    gap: 20px;
  }
+
  .statistics {
    display: flex;
    gap: 20px;
+
    p {
      display: flex;
      flex-direction: column;
@ -102,15 +106,30 @@
    color: $red;
    text-align: center;
  }
+
  .validated {
    color: $green;
  }
+
  .ranks {
    display: flex;
    justify-content: space-evenly;
+    @include down(750) {
+      flex-direction: column;
+      align-items: center;
+      gap: 10px;
+      & > div {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        gap: 7px;
      }
+    }
+  }
+
  .classement {
    width: 100%;
+
    h2 {
      text-align: center;
    }
--- a/frontend/src/context/Auth.svelte
+++ b/frontend/src/context/Auth.svelte
@ -94,7 +94,7 @@
            if (checkExpire(exp) && refresh != null) {
                refreshRequest(refresh).then((r) => {
                    localStorage.setItem('token', r.access_token);
-                    $username = username;
+                    $username = name;
                    $isAuth = true;
                });

--- a/frontend/src/context/Modal.svelte
+++ b/frontend/src/context/Modal.svelte
@ -69,16 +69,19 @@
 		position: fixed;
 		top: 50%;
 		left: 50%;
-		width: 50%;
+		//width: 50%;
 		transform: translateX(-50%) translateY(-50%) scale(0.7);
 		visibility: hidden;
 		transition: 0.4s;
 		opacity: 0;
 		z-index: 1000;
-		height: 57vh;
+		max-height: 57vh;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
+		align-items: center;
+
+
 		&.visible {
 			visibility: visible !important;
 			transform: translateX(-50%) translateY(-50%) scale(1) !important;
@ -95,7 +98,7 @@
 	.overlay {
 		background-color: black;
 		opacity: 0;
-		z-index: 999;
+		z-index: 500;
 		width: 100%;
 		position: absolute;
 		top: 0;
--- a/frontend/src/context/Notification.svelte
+++ b/frontend/src/context/Notification.svelte
@ -1,16 +1,17 @@
 <script lang="ts">
-	import { setContext } from 'svelte';
-	import { writable } from 'svelte/store';
-     import SvelteMarkdown from 'svelte-markdown'
+  import { setContext } from "svelte";
+  import { writable } from "svelte/store";
+  import SvelteMarkdown from "svelte-markdown";
+
  type Notif = {
    title: string;
    description: string;
-		type: 'alert' | 'info' | 'success' | 'error';
+    type: "alert" | "info" | "success" | "error";
  };
  type Notification = {
    title: string;
    description: string;
-		type: 'alert' | 'info' | 'success' | 'error';
+    type: "alert" | "info" | "success" | "error";
    id: number;
    deleted: boolean;
  };
@ -44,18 +45,18 @@
  };

  const alert = (title: string, description: string) => {
-		toast({ title, description, type: 'alert' });
+    toast({ title, description, type: "alert" });
  };
  const info = (title: string, description: string) => {
-		toast({ title, description, type: 'info' });
+    toast({ title, description, type: "info" });
  };
  const success = (title: string, description: string) => {
-		toast({ title, description, type: 'success' });
+    toast({ title, description, type: "success" });
  };
  const error = (title: string, description: string) => {
-		toast({ title, description, type: 'error' });
+    toast({ title, description, type: "error" });
  };
-	setContext('notif', { toast, alert, info, success, error });
+  setContext("notif", { toast, alert, info, success, error });
 </script>

 <slot />
@ -74,7 +75,9 @@
      class:deleted={n.deleted}
    >
      <h1>{n.title}</h1>
-			<p><SvelteMarkdown source={n.description} /></p>
+      <p>
+        <SvelteMarkdown source={n.description} />
+      </p>
    </div>
  {/each}
 </div>
@ -84,12 +87,12 @@
    position: absolute;
    right: 0;
    top: 0;
-		padding: 30px;
+    margin: 30px;
    gap: 10px;
    display: flex;
    flex-direction: column;
-        width: 500px;
-		z-index: 1000;
+    width: min(calc(100% - 60px), 500px);
+    z-index: 500;

    div {
      background-color: $background;
@ -99,9 +102,11 @@
      position: relative;
      overflow: hidden;
      word-wrap: break-word;
+
      h1 {
        font-size: 1.1em;
      }
+
      p {
        font-size: 0.9em;
      }
@ -116,6 +121,7 @@
        right: 0;
        left: 0;
      }
+
      &::before {
        z-index: 3;
        background-color: $background-light;
@ -123,32 +129,40 @@
        width: 0%;
        animation: slide 3s forwards ease-in-out;
      }
+
      &::after {
        width: 100%;

        z-index: 2;
      }
+
      &.deleted {
        transition: 0.5s;
        opacity: 0;
      }
    }
  }
+
  .empty {
    z-index: -20;
  }
+
  .alert::after {
    background-color: $orange;
  }
+
  .info::after {
    background-color: $bleu;
  }
+
  .error::after {
    background-color: $red;
  }
+
  .success::after {
    background-color: $green;
  }
+
  @keyframes slide {
    from {
      width: 0%;
--- a/frontend/src/requests/auth.request.ts
+++ b/frontend/src/requests/auth.request.ts
@ -1,10 +1,11 @@
 import axios from 'axios';
 import {authInstance} from '../apis/auth.api';
+import { env } from "$env/dynamic/public";

 export const loginRequest = (data: { username: string; password: string }) => {
    return authInstance
        .request({
-            url: 'http://localhost:8002/login',
+            url: '/login',
            method: 'POST',
            data,
            headers: {
@ -23,7 +24,7 @@ export const registerRequest = (data: {
 }) => {
    return authInstance
        .request({
-            url: 'http://localhost:8002/register',
+            url: '/register',
            method: 'POST',
            data,
            headers: {
@ -37,9 +38,9 @@ export const registerRequest = (data: {
 };

 export const refreshRequest = (token: string) => {
-    return authInstance
+    return axios
        .request({
-            url: 'http://localhost:8002/refresh',
+            url: `${env.PUBLIC_API_BASE}/refresh`,
            method: 'POST',
            headers: {
                'Content-Type': 'application/x-www-form-urlencoded',
--- a/frontend/src/requests/exo.request.ts
+++ b/frontend/src/requests/exo.request.ts
@ -131,9 +131,11 @@ export const getExoSource = (id_code: string,) => {
 		link.click();
 		link.remove();
 	});
-};export const generateRequest = (id_code: string,filename: string) => {
+};
+
+export const generateRequest = (id_code: string,filename: string) => {
 	return exoInstance({
-		url: `/generator/csv/${id_code}/`,
+		url: `generator/csv/${id_code}`,
 		method: 'Get',
 		params: {filename}
 	}).then((r) => {
--- a/frontend/src/requests/room.request.ts
+++ b/frontend/src/requests/room.request.ts
@ -4,7 +4,7 @@ import { roomInstance } from '../apis/room.api';
 export const createRoom = (data: { name: string }, username: string | null = null) => {
 	return roomInstance
 		.request({
-			url: '/',
+			url: '',
 			method: 'POST',
 			params: { username },
 			data: { ...data, public: false, global_results: false }
@ -13,7 +13,6 @@ export const createRoom = (data: { name: string }, username: string | null = nul
 };

 export const getRoom = (id_code: string, clientId: string | null = null) => {
-	console.log('GETROOM', clientId, { ...(clientId != null && { clientId }) });
 	return roomInstance
 		.request({
 			url: '/' + id_code,
@ -23,6 +22,16 @@ export const getRoom = (id_code: string, clientId: string | null = null) => {
 		.then((r) => r.data);
 };

+export const deleteRoom = (id_code: string, clientId: string | null = null) => {
+	return roomInstance
+		.request({
+			url: '/' + id_code,
+			method: 'DELETE',
+			params: { ...(clientId != null && { clientId }) }
+		})
+		.then((r) => r.data);
+};
+
 export const createParcours = (
 	id_code: string,
 	parcours: { time: number; name: string; max_mistakes: number; exercices: {exercice_id: string, quantity:number}[] },
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@ -21,6 +21,7 @@
        <Auth>
            <Alert>
                <Modal>
+
                    <main>
                        <NavBar/>
                        <slot/>
@ -78,7 +79,7 @@
    height: calc(100vh - var(--navbar-height) - 10px);
    overflow: auto;
    height: 100%;
-
+    overflow-x: hidden;
    a {
      color: red;
    }
--- a/frontend/src/routes/+page.svelte
+++ b/frontend/src/routes/+page.svelte
@ -1,10 +1,30 @@
-<script>
+<script lang="ts">

+	import {goto} from "$app/navigation";
 </script>

-<button
-	on:click={() => {
-	}}>test</button
->
+<div class="rooms">
+	<h1>Générateur d'exercices</h1>
+	<div class="btns">
+		<button class="primary-btn" on:click={()=>{goto('/exercices')}}>Générer</button>
+		<button class="primary-btn" on:click={()=>{goto('/room')}}>Salles en ligne</button>
+	</div>
+</div>

+<style lang="scss">
+	h1{
+		font-size: 4rem;
+		margin-bottom: 1rem;
+	}
+	.rooms {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.btns {
+		display: flex;
+		gap: 20px;
+	}
+</style>

--- a/frontend/src/routes/dashboard/+page.svelte
+++ b/frontend/src/routes/dashboard/+page.svelte
@ -1,4 +1,4 @@
-<script lang='ts'>
+<script lang="ts">
  import { getContext } from "svelte";
  import { dashBoardRequest } from "../../requests/auth.request";
  import Section from "../../components/auth/Section.svelte";
@ -10,26 +10,26 @@
  import PasswordForm from "../../components/auth/PasswordForm.svelte";
  import { updatePassword, updateUserRequest } from "../../requests/auth.request.js";
  import UserConfirm from "../../components/auth/UserConfirm.svelte";
-    import MdInfo from 'svelte-icons/md/MdInfo.svelte'
-    import FaUsers from 'svelte-icons/fa/FaUsers.svelte'
-    import FaUserLock from 'svelte-icons/fa/FaUserLock.svelte'
+  import MdInfo from "svelte-icons/md/MdInfo.svelte";
+  import FaUsers from "svelte-icons/fa/FaUsers.svelte";
+  import FaUserLock from "svelte-icons/fa/FaUserLock.svelte";
  import { goto } from "$app/navigation";

-    let u = '';
-    let p = '';
-    const user: Writable<User | null> = writable(null)
-    const {logout, username, isAuth,initialLoading} = getContext('auth')
+  let u = "";
+  let p = "";
+  const user: Writable<User | null> = writable(null);
+  const { logout, username, isAuth, initialLoading } = getContext("auth");

  $: !$initialLoading && $isAuth && dashBoardRequest().then((res) => {
-        console.log(res)
-        user.set(res)
-    })
-    const {show, close} = getContext("modal")
-    const {success, error} = getContext("notif")
-    let passwordForm = null
-    let infoForm = null
+    console.log(res);
+    user.set(res);
+  });
+  const { show, close } = getContext("modal");
+  const { success, error } = getContext("notif");
+  let passwordForm = null;
+  let infoForm = null;

-    $: !$initialLoading && !$isAuth && goto('/')
+  $: !$initialLoading && !$isAuth && goto("/");

 </script>

@ -71,9 +71,18 @@

 </div>

-<style lang='scss'>
+<style lang="scss">
+  @import "../../mixins.scss";
+
  h1 {
    font-size: 3em;
    margin-bottom: 20px;
+    @include down(800){
+      text-align: center;
+    }
+  }
+
+  div {
+    padding: 7px 15px;
  }
 </style>
--- a/frontend/src/routes/room/+page.svelte
+++ b/frontend/src/routes/room/+page.svelte
@ -1,16 +1,31 @@
 <script lang="ts">

    import {goto} from "$app/navigation";
+
 </script>

-<div>
+<div class="rooms">
    <h1>Salles</h1>
-    <div>
+    <div class="btns">
        <button class="primary-btn" on:click={()=>{goto('/room/join')}}>Rejoindre</button>
        <button class="primary-btn" on:click={()=>{goto('/room/create')}}>Créer</button>
    </div>
 </div>

 <style lang="scss">
+    h1{
+        font-size: 4rem;
+        margin-bottom: 1rem;
+    }
+    .rooms {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+    }
+
+    .btns {
+        display: flex;
+        gap: 20px;
+    }

 </style>
--- a/frontend/src/routes/room/[...slug]/+page.svelte
+++ b/frontend/src/routes/room/[...slug]/+page.svelte
@ -26,13 +26,13 @@
  const room = writable<Room | null>(null);
  const member = writable<Member | null>(null);
  const parcours = writable<ParcoursRead | null>(null);
-  const ws = connect("ws://127.0.0.1:8002/ws/room/" + $page.params.slug);
+  const ws = connect("ws://127.0.0.1:8002/api/ws/room/" + $page.params.slug);

  setContext("room", room);
  setContext("member", member);
  setContext("parcours", parcours);
  setContext("ws", { send: (type: string, data: Object) => ws.send({ type, data }), ws: ws.ws });
-  const { error } = getContext("notif");
+  const { error, info } = getContext("notif");
  const onMessage = (payload: { type: string; data: any }) => {
    if (payload == undefined) return;
    const { type, data } = payload;
@ -63,7 +63,6 @@
        if ($page.url.searchParams.get("a") == "waiting") {
          goto(`?`);
        }
-        console.log("ACCEPTED", data.member);
        member.set(data.member);

        getRoom($page.params.slug, !$isAuth ? data.member.clientId : null).then((r) => {
@ -83,11 +82,13 @@


      case "waiting":
+        close();
        $member = { ...data.waiter, room: data.room };
        goto(`?${new URLSearchParams({ a: "waiting" })}`);
        return;

      case "refused":
+        error("Refusé", "L'administrateur a refusé votre demande");
        close();
        ws?.close(1000);
        goto("/room/join");
@ -101,17 +102,25 @@
          return;
        }
        if ($room != null) {
+          info("Départ", `*${data.member.username}* n'est plus dans la salle`);
          $room.members = [
            ...$room.members.filter((r) => "waiter_id" in r || r.id_code != data.member.id_code)
          ];
        }
        return;
      case "banned":
+        error("Ban", "Vous avez été banni de la salle par l'administrateur");
        ws?.close(1000);
        goto("/room/join");
        sessionStorage.removeItem("reconnect");
        return;

+      case "deleted":
+        info("Suppression", "La salle a été supprimée par l'administrateur");
+        ws.close(1000);
+        goto("/room/join");
+        return;
+
      case "error":
        const { code, msg } = data;
        if (code == 401) {
@ -148,6 +157,10 @@
        } else {
          error("Erreur", "Message : " + msg);
        }
+        if (code == 404) {
+          ws.close(1000);
+          goto("/room/join");
+        }
        return;
      case "waiter":

@ -199,6 +212,7 @@

      case "joined":
        if ($room != null) {
+          info("Arrivée", `*${data.member.username}* a rejoint la salle`)
          $room.members = [
            ...$room?.members.filter(
              (m) =>
@ -346,8 +360,9 @@
            $parcours.validated = $parcours.pb.mistakes <= $parcours.max_mistakes;
          }
        }
+        return
      case "challenge_change":
-        if ($parcours != null && !!$parcours.challenges[data.member]) {
+        if ($parcours != null && $member != null && !!$parcours.challenges[data.member]) {
          $parcours.challenges[data.member].challenges = $parcours.challenges[
            data.member
            ].challenges.map((c) => {
@ -356,9 +371,25 @@
            }
            return c;
          });
+          $parcours.challenges[data.member].challenger.validated = data.validated;
+          if (data.member == $member.id_code) {
            $parcours.validated = data.validated;
          }
        }
+        return;
+
+      case "update_challenges":
+        if ($parcours != null && $member != null) {
+          const { challenger, challenges } = data;
+          if (challenges.length != 0) {
+            $parcours.challenges[challenger.id_code] = data;
+          }
+          if (challenger.id_code == $member.id_code) {
+            $parcours.validated = data.challenger.validated;
+          }
+        }
+        return;
+    }
  };

  handlers.update((h) => {
@ -419,6 +450,7 @@

  $: console.log("edit", $page.url.searchParams.get("a"));
  onDestroy(() => {
+
    ws.close(1000);
  });

@ -507,6 +539,7 @@
    column-gap: 50px;
    row-gap: 10px;
    height: 100%;
+    padding: 7px 15px;
    @include down(800) {
      display: flex;
      flex-direction: column;
--- a/frontend/src/routes/room/create/+page.svelte
+++ b/frontend/src/routes/room/create/+page.svelte
@ -7,6 +7,8 @@
  let name = "";
  let pseudo = "";
  const { isAuth } = getContext("auth");
+  let loading = false;
+  const { error } = getContext("notif");
 </script>

 <div class="container">
@ -20,15 +22,27 @@
      class="primary-btn"
      on:click={() => {
        console.log('(NAME)', name)
+        loading = true
 		createRoom({ name }, !$isAuth ? pseudo : null).then((r) => {
+
            if(!$isAuth){
                sessionStorage.setItem('reconnect', r.member)
            }
 			      goto(`/room/${r.room}`);
+            loading= false
+		}).catch((e) => {
+      error("Erreur", "Une erreur est survenue lors de la création de la salle")
+      loading= false
+      console.log(e);
    });
 	}}
    >
-      Valider
+      {#if loading}
+        <span class="spinner"></span>
+      {:else}
+        Créer
+      {/if}
+
    </button>
  </div>
 </div>
@ -51,4 +65,10 @@
    display: flex;
    justify-content: center;
  }
+
+  .spinner {
+    width: 15px;
+    height: 15px;
+    border-width: 2px !important;
+  }
 </style>
--- a/frontend/src/routes/room/join/+page.svelte
+++ b/frontend/src/routes/room/join/+page.svelte
@ -4,7 +4,6 @@


  let room = "";
-
 </script>

 <div class="container">
--- a/frontend/src/routes/signin/+page.svelte
+++ b/frontend/src/routes/signin/+page.svelte
@ -11,6 +11,7 @@
 	$: {
 		!$initialLoading && !!$isAuth && goto('/dashboard');
 	}
+	let loading = false
 </script>

 <div class="parent">
@ -37,13 +38,19 @@
 		<button
 			class="primary-btn"
 			on:click={() => {
-				login(username, password).catch((r) => {
+				loading = true;
+				login(username, password).then(()=>{loading=false}).catch((r) => {
 					errors = { ...errors, ...r.data.detail };
+					loading = false;
 				});
 			}}

 		>
+			{#if loading}
+				<span class="spinner" />
+			{:else}
 				Se connecter
+			{/if}
 		</button>
 	</div>
 </div>
@ -65,4 +72,9 @@
 			gap: 20px;
 		}
 	}
+	.spinner{
+		width: 15px;
+		height: 15px;
+		border-width: 2px!important;
+	}
 </style>
--- a/frontend/src/routes/signup/+page.svelte
+++ b/frontend/src/routes/signup/+page.svelte
@ -18,6 +18,7 @@
 	const myForm = form(username, password, confirm);

 	$: !$initialLoading && !!$isAuth && goto('/dashboard');
+	let loading = false
 </script>

 <div class="parent">
@ -62,7 +63,9 @@
 		<button
 			class="primary-btn"
 			on:click={() => {
-				register($username.value, $password.value, $confirm.value).catch((r) => {
+				loading = true
+				register($username.value, $password.value, $confirm.value).then(()=>{loading=false}).catch((r) => {
+					loading = false
 					console.log('ERREUR', r);

 					errors = { ...errors, ...r.data.detail };
@ -70,7 +73,12 @@
 			}}
 			disabled={!$myForm.valid}
 		>
+<!--			loading et span.spinner else text-->
+			{#if loading}
+				<span class="spinner"></span>
+			{:else}
 				S'inscrire
+			{/if}
 		</button>
 	</div>
 </div>
@ -92,4 +100,9 @@
 			gap: 20px;
 		}
 	}
+	.spinner{
+		width: 15px;
+		height: 15px;
+		border-width: 2px!important;
+	}
 </style>
--- a/frontend/src/store/ws.ts
+++ b/frontend/src/store/ws.ts
@ -9,7 +9,6 @@ export const connect = (url,) => {
    const ws = new ReconnectingWebSocket(url);
    
    ws.onmessage = (m) => {
-        console.log('MESAGE', m)

 		messages.update((o) => [JSON.parse(m.data), ...o]);
        Object.values(get(handlers)).map(h => {
Author	SHA1	Message	Date
Lilian	8c83658708	rm db	2023-02-28 09:24:48 +01:00
Benjamin	2dc81bb4e3	cette fois on est bon	2023-02-26 17:12:10 +01:00
Benjamin	71038c169c	Prêt a déployer	2023-02-26 16:29:05 +01:00
Lilian	9393c88f8e	Salles	2023-02-26 11:37:56 +01:00