Merge remote-tracking branch 'origin/main'

# Conflicts:
#	front_end/src/components/ressourcePanel.tsx

front_end/src/classes.tsx

@@ -107,6 +107,7 @@ export function getUserTest():User{
     s1.name = "Entrainement Frisbee"
     s1.isRecurrent = true;
     s1.ligne = [ligne1];
+    s1.duree= 90;
     var date2 = new Date();
     date2.setDate(date2.getDate() + 2);
     s2.creneau = date2;
@@ -114,11 +115,13 @@ export function getUserTest():User{
     s2.isRecurrent = false;
     s2.name = "entraintement 2"
     s2.ligne = [ligne2];
+    s2.duree= 120;
     s3.creneau = date2;
     s3.id = 3;
     s3.isRecurrent = false;
     s3.name  = "entraintement 3"
-    s3.ligne = [ligne3];
+    s3.ligne = [ligne3, ligne1];
+    s3.duree= 120;