Finition gateway Athlete Coach et Activite a tester mais normalement fonctionnel

.drone.yml

@@ -2,20 +2,19 @@ kind: pipeline
 type: docker
 name: HeartWave
 
-trigger: 
+trigger:
   event:
     - push
 
 steps:
+  
   # Test ✔️
   - name: test
     image: composer:2.6
     commands:
       - cd Sources
-      - rm -r vendor
-      - rm composer.lock
        # Installe les dépendances PHP si nécessaire
-      - php composer.phar install --no-interaction
+      - composer install --no-interaction
       - ./vendor/bin/phpunit tests
 
   # Sonar static code analisis deployment
@@ -36,45 +35,19 @@ steps:
       - cd Sources
       - sonar-scanner -D sonar.projectKey=HeartTrack -D sonar.host.url=https://codefirst.iut.uca.fr/sonar
     depends_on: [ test ]
-  # build image and push on the registry ✔️ 
-  - name: rewrite-urls
-    image: 'busybox:latest'
-    commands:
-      - cd Sources
-      - ls
-      - >-
-        find . -type f -exec sed -i -r
-        "s@(href|src)=\"/@\1=\"$${PLUGIN_CONTAINER_PATH}@g" {} +                
-    settings:
-      container_path: https://codefirst.iut.uca.fr/containers/HeartDev-web/
 
+  # build image and push on the registry ✔️        
   - name: docker-build-and-push
     image: plugins/docker
     settings:
-      commands: ls
       dockerfile: Sources/config/Dockerfile
       context: Sources
       registry: hub.codefirst.iut.uca.fr
       repo: hub.codefirst.iut.uca.fr/david.d_almeida/web
-      mirror: https://proxy.iut.uca.fr:8443
       username:
         from_secret: SECRET_REGISTRY_USERNAME
       password:
         from_secret: SECRET_REGISTRY_PASSWORD
-    depends_on:
-      - rewrite-urls
-
-  - name: deploy-container
-    image: >-
-      hub.codefirst.iut.uca.fr/thomas.bellembois/codefirst-dockerproxy-clientdrone:latest
-    environment:
-      IMAGENAME: 'hub.codefirst.iut.uca.fr/david.d_almeida/web:latest'
-      CONTAINERNAME: web
-      COMMAND: create
-      OVERWRITE: true
-      ADMINS: david.d_almeida
-    depends_on:
-      - docker-build-and-push
 
   - name: notify
     image: ruby:2.1
@@ -86,5 +59,3 @@ steps:
     commands:
       - sh ./notifymail.sh
     depends_on: [ docker-build-and-push ]
-
-

.gitignore

@@ -6,7 +6,6 @@ dist
 *.swo
 .env
 
-loginDatabase.php
 # Cache file on macOS
 .DS_Store
 
@@ -29,4 +28,4 @@ sftp-config.json
 sftp-config-alt*.json
 
 *.log*
-coverage/
+coverage/

Documents/Diagramme/BDD/README_BDD.md

@@ -1,276 +0,0 @@
-[retour au README.md](../../../README.md)  
-[Retour aux Documents](../../README_DOCUMENTS.md)  
-[Retour au diagramme de classes](../README_DIAGRAMMES.md)
-
-# BDD
-
-## Modèle Logique de Données (MLD)
-
-Le MLD représente la structure de données de l'application, décrivant les entités et les relations entre elles. Voici un aperçu des principales entités du MLD :
-
-### Athlète (Athlete)
-
-L'entité principale représentant un athlète avec ces informations propre à lui telles que l'identifiant, le nom, le prénom, l'email, etc. Les athlètes peuvent être coach avec le boolean idCoach et être liés par des amitiés, ou par un coaching via la table `Amitie`.
-
-### Amitié (Friendship)
-
-Une entité qui modélise les relations d'amitié entre les athlètes et de coaching entre les athlètes et les coachs. Elle stocke les identifiants des deux utilisateurs impliqués.
-
-### Notification (Notification)
-
-L'entité qui stocke les notifications destinées aux athlètes, avec des détails tels que le message, la date, le statut, et le degré d'urgence.
-
-### Envoi de Notification (SendNotification)
-
-Une entité de liaison entre les athlètes et les notifications, indiquant quel athlète ou coach a envoyé quelle notification. Cela peut-être utile lors d'une notification d'ajout d'amie par exemple.
-
-### Statistique (Statistic)
-
-Les statistiques relatives à un athlètes, y compris le poids, la fréquence cardiaque moyenne, la fréquence cardiaque maximale, etc.
-
-### Entraînement (Training)
-
-Détails sur les sessions d'entraînement planifiés par un coach pour ses athlètes, comprenant la date, la description, la localisation, etc. Les athlètes peuvent participer à des entraînements et donner leur feedback sur l'entrainement donné.
-
-### Participation (Participate)
-
-Une entité de liaison entre les athlètes et les entraînements, indiquant quels athlètes participent à quels entraînements.
-
-### Don (GiveParticipation)
-
-Une entité de liaison entre les coachs et les entraînements, indiquant quels coachs ont attribué quels entraînements.
-
-### Source de Données (DataSource)
-
-L'entité représentant la source des données des enregistrements sportif, telle que le type, le modèle, la précision, etc., utilisée par les athlètes pour enregistrer une ou des activités.
-
-### Activité (Activity)
-
-Les détails des activités des athlètes, y compris le type, la date, les heures de début et de fin, l'effort ressenti, etc.
-
-### Fréquence Cardiaque (HeartRate)
-
-Les données de fréquence cardiaque enregistrées pendant les activités, avec des informations telles que l'altitude, la température, etc.
-
-Ce MLD forme la base de données sous-jacente pour l'application, offrant une structure organisée pour stocker et récupérer les informations relatives aux athlètes et à leurs activités.
-
-```plantuml
-@startuml
-skinparam classAttributeIconSize 0
-package MLD{
-entity "Athlete" as athlete {
-    {static} idAthlete
-    username
-    nom
-    prenom
-    email
-    sexe
-    taille
-    poids
-    motDePasse
-    dateNaissance
-    isCoach
-}
-
-entity "Amitie" as friendship{
-{static}# idAthlete1
-{static}# idAthlete2
-début
-}
-
-entity "Notification" as notif {
-    {static} idNotif
-    message
-    date
-    statut
-    urgence
-    #athleteId
-}
-
-entity "Envoi" as sendNotif{
-{static}# idAthlete
-{static}# idNotif
-}
-
-entity "Statistique" as stats {
-    {static} idStatistique
-    poids
-    fcMoyenne
-    fcMax
-    caloriesBruleesMoy
-    date 
-    #athleteId
-}
-
-entity "Entrainement" as training {
-    {static} idEntrainement
-    date
-    description
-    latitude
-    longitude
-    feedback
-    #athleteId
-}
-
-entity "Participe" as takepart {
-    {static} #athleteId
-    {static} #entrainementId   
-}
-
-entity "Donne" as givepart {
-    {static} #coachId
-    {static} #entrainementId   
-}
-
-
-entity "SourceDonnee" as source {
-    {static} idSource
-    type 
-    modele
-    precision
-    #athleteId
-}  
-
-entity "Activite" as activity {
-    {static} idActivité
-    type
-    date
-    heureDeDebut
-    heureDeFin
-    effortRessent
-    variabilite
-    variance
-    ecartType
-    moyenne
-    maximum
-    minimum
-    temperatureMoyenne
-    #athleteId 
-    #sourceId
-}
-entity "FréquenceCardiaque" as fc {
-    {static} idFc
-    altitude
-    temps : time
-    température    
-    bpm
-    longitude
-    latitude
-    #activitéId
-}
-
-}
-activity --> athlete
-activity --> source
-activity <-- fc
-athlete <-- source
-stats --> athlete
-takepart --> athlete
-takepart --> training
-givepart --> athlete
-givepart --> training
-sendNotif --> athlete
-sendNotif --> notif
-friendship --> athlete
-notif --> athlete
-athlete <-- friendship
-@enduml
-```
-
-```plantuml
-@startuml
-skinparam classAttributeIconSize 0
-package MCD{
-entity "Athlete" as athlete {
-    {static} idAthlete
-    username
-    nom
-    prenom
-    email
-    sexe
-    taille
-    poids
-    motDePasse
-    dateNaissance
-    isCoach
-}
-
-entity "Notification" as notif {
-    {static} idNotif
-    message
-    date
-    statut
-    urgence
-    #athleteId
-}
-
-entity "Statistique" as stats {
-    {static} idStatistique
-    poids
-    fcMoyenne
-    fcMax
-    caloriesBruleesMoy
-    date 
-    #athleteId
-}
-
-entity "Entrainement" as training {
-    {static} idEntrainement
-    date
-    description
-    latitude
-    longitude
-    feedback
-    #athleteId
-}
-
-entity "SourceDonnee" as source {
-    {static} idSource
-    type 
-    modele
-    precision
-    #athleteId
-}  
-
-entity "Activite" as activity {
-    {static} idActivité
-    type
-    date
-    heureDeDebut
-    heureDeFin
-    effortRessent
-    variabilite
-    variance
-    ecartType
-    moyenne
-    maximum
-    minimum
-    temperatureMoyenne
-    #athleteId 
-    #sourceId
-}
-
-entity "FréquenceCardiaque" as fc {
-    {static} idFc
-    altitude
-    temps : time
-    température    
-    bpm
-    longitude
-    latitude
-    #activitéId
-}
-
-}
-activity "0..n" --- "1..1" athlete : réalise
-activity "1..n" --- "1..1" source : possede
-activity "1..1" --- "1..n" fc : enregistre
-athlete "1..n" --- "0..1" source : possede
-stats "0..n" --- "1..1" athlete : possede
-training "0..n" --- "1..n" athlete : participe
-training "0..n" --- "1..1" athlete : donne
-athlete "0..n" --- "1..n" athlete : est ami
-notif "0..n" --- "1..n" athlete : recoit
-notif "0..n" --- "1..1" athlete : envoie
-@enduml
-```

Documents/Diagramme/DiagrammeDeClasses/README_DIAGRAMME.md

@@ -28,11 +28,11 @@ Bienvenue dans l'écosystème dynamique de notre plateforme de gestion d'activit
 
 - Les Utilisateurs ont un rôle spécifique (Athlete, Coach) qui détermine leurs fonctionnalités.
 
-- Un Athlète peut enregistrer plusieurs Activités, possède des Statistiques, et une Sources de Données qui est la plus utilisé.
+- Un Athlète peut enregistrer plusieurs Activités, Statistiques, et interagir avec différentes Sources de Données.
 
 - Les Entraînements sont liés aux Utilisateurs, permettant une planification efficace.
 
-- Les Notifications informent les Utilisateurs des événements importants tels qu'une demande d'amis ou une notification d'avertissement de ban.
+- Les Notifications informent les Utilisateurs des événements importants.
 
 Explorez ce diagramme pour comprendre comment notre plateforme offre une expérience complète, de la gestion des utilisateurs à l'enregistrement des activités sportives et au suivi des performances.
 

Documents/Diagramme/DiagrammeDeClasses/README_accesDonnees.md

@@ -18,7 +18,7 @@ Bienvenue dans le cœur de notre système, où les données prennent vie à trav
 
 - **NotificationRepository :** Responsable de la gestion des notifications, assurant un accès structuré et une manipulation sécurisée de ces informations cruciales.
 
-- **RelationshipRequestRepository :** Facilite la gestion des demandes de relations entre utilisateurs (amitiés), garantissant une interaction claire et ordonnée au sein de l'application.
+- **RelationshipRequestRepository :** Facilite la gestion des demandes de relations entre utilisateurs, garantissant une interaction claire et ordonnée.
 
 - **TrainingRepository :** Permet l'accès et la manipulation des données liées aux entraînements, facilitant le suivi des performances athlétiques.
 
@@ -26,7 +26,7 @@ Explorez ce diagramme pour découvrir la robustesse de notre architecture de ges
 
 ```plantuml
 @startuml couche_acces_aux_donnees
-interface IGenericRepository {
+abstract class IGenericRepository {
     + getItemById(int id) : object
     + getNbItems() : int
     + getItems(int index, int count, string orderingPropertyName, bool descending) : array

Documents/Diagramme/DiagrammeDeClasses/README_issue016.md

@@ -4,15 +4,15 @@
 
 # Introduction au Diagramme de Classes : Statistiques pour Coach
 
-Bienvenue dans l'univers captivant de notre système de gestion d'activités sportives avec une mise au point spéciale sur les statistiques destinées aux athlètes. Ce diagramme de classes offre une vue approfondie de la manière dont les utilisateurs, en particulier les athlètes, interagissent avec leurs statistiques.
+Bienvenue dans l'univers captivant de notre système de gestion d'activités sportives avec une mise au point spéciale sur les statistiques destinées aux coaches. Ce diagramme de classes offre une vue approfondie de la manière dont les utilisateurs, en particulier les athlètes et les coaches, interagissent avec les données de performance.
 
 **Entités Principales :**
 
 - **Utilisateur (User) :** Représente les individus inscrits sur notre plateforme, avec des détails personnels et un rôle spécifique dans l'écosystème sportif.
 
-- **Athlète (Athlete) :** Un type spécialisé d'utilisateur qui possède des statistiques liées à ses activités sportives.
+- **Athlète (Athlete) :** Un type spécialisé d'utilisateur qui peut enregistrer des statistiques liées à ses activités sportives.
 
-- **Coach (Coach) :** Un rôle qui s'étend à partir de la classe abstraite Role, dédié à la gestion des athlètes et de la vision de leurs statistiques.
+- **Coach (Coach) :** Un rôle qui s'étend à partir de la classe abstraite Role, dédié à la gestion des athlètes et de leurs statistiques.
 
 - **Statistique (Statistique) :** Contient des informations détaillées sur les performances sportives d'un athlète, telles que la distance totale, le poids, le temps total, la fréquence cardiaque moyenne, minimale et maximale, ainsi que les calories brûlées.
 
@@ -22,11 +22,11 @@ Bienvenue dans l'univers captivant de notre système de gestion d'activités spo
 
 - Un Coach peut gérer une liste d'athlètes et avoir accès à leurs statistiques.
 
-- Un Athlète peut enregistrer plusieurs activités afin d'avoir des statistiques liées à celle-ci.
+- Un Athlète peut enregistrer plusieurs statistiques liées à ses activités.
 
 **Objectif Principal :**
 
-- Permettre aux coachs d'accéder et de surveiller les statistiques détaillées de leurs athlètes, offrant ainsi un aperçu complet de leurs performances sportives. 
+- Permettre aux coaches d'accéder et de surveiller les statistiques détaillées de leurs athlètes, offrant ainsi un aperçu complet de leurs performances sportives. 
 
 Explorez ce diagramme pour découvrir comment notre application crée une synergie entre les utilisateurs, les rôles, et les statistiques, contribuant ainsi à une expérience enrichissante dans le suivi des activités sportives.
 

Documents/Diagramme/DiagrammeDeClasses/README_issue023.md

@@ -4,7 +4,7 @@
 
 # Introduction au Modèle de Données de l'Application
 
-L'architecture de données de notre application de suivi d'activités sportives repose sur un modèle robuste, avec des entités clés pour représenter les activités, les athlètes et les coachs et la récupération de ces données au sein de notre application. Découvrez les composants principaux de notre modèle de données :
+L'architecture de données de notre application de suivi d'activités sportives repose sur un modèle robuste, avec des entités clés pour représenter les activités, les athlètes et les coachs. Découvrez les composants principaux de notre modèle de données :
 
 ## Activité
 L'entité Activité représente une session d'activité sportive avec des détails variés tels que le type d'activité, la date, la durée, l'effort ressenti, etc. Le `ActiviteEntity` encapsule ces données, tandis que le `ActiviteGateway` gère la communication avec la base de données pour les activités.

Documents/Diagramme/DiagrammeDeClasses/README_issue028.md

@@ -4,12 +4,12 @@
 
 # Diagramme de classes pour l'importation de fichiers .fit
 
-Bienvenue dans le monde de la gestion d'activités sportives avec notre application innovante ! Ce diagramme de classe se concentre sur une fonctionnalité essentielle qui améliorera l'expérience des utilisateurs : l'importation de fichiers .fit. Nous avons conçu un diagramme de classes pour vous offrir une vision claire et structurée de la manière dont cette fonctionnalité est implémentée au sein de notre application.
+Bienvenue dans le monde de la gestion d'activités sportives avec notre application innovante ! Cette user story se concentre sur une fonctionnalité essentielle qui améliorera l'expérience des utilisateurs : l'importation de fichiers .fit. Nous avons conçu un diagramme de classes pour vous offrir une vision claire et structurée de la manière dont cette fonctionnalité est implémentée au sein de notre application.
 
 **Acteurs Principaux :**
 
-- Utilisateur (User) : Représente un individu inscrit sur notre plateforme.
+- Utilisateur (User) : Représente un individu inscrit sur notre plateforme, avec la capacité d'importer des fichiers .fit.
-- Athlète (Athlete) : Un type spécialisé d'utilisateur, bénéficiant de fonctionnalités supplémentaires liées à la gestion d'activités sportives et avec la capacité d'importer des fichiers .fit.  
+- Athlète (Athlete) : Un type spécialisé d'utilisateur, bénéficiant de fonctionnalités supplémentaires liées à la gestion d'activités sportives.  
 
 **Entités Clés :**
 
@@ -18,13 +18,13 @@ Bienvenue dans le monde de la gestion d'activités sportives avec notre applicat
 
 **Fonctionnalité Clé :**
 
-- Importation de fichiers .fit : Permet aux utilisateurs de charger des données provenant de fichiers .fit via la bibliothèque `php-fit-file-analysis`, générés par des dispositifs de suivi d'activité. Ces fichiers contiennent des informations précieuses telles que la fréquence cardiaque, la distance parcourue et d'autres données de santé importante pour nos analyses.
+- Importation de fichiers .fit : Permet aux utilisateurs de charger des données provenant de fichiers .fit, générés par des dispositifs de suivi d'activité. Ces fichiers contiennent des informations précieuses telles que la fréquence cardiaque, la distance parcourue et d'autres métriques essentielles.
 
 **Architecture :**
 
 - AuthService (Service d'Authentification) : Gère l'authentification des utilisateurs, garantissant un accès sécurisé à la fonction d'importation.
 - UserManager (Gestionnaire d'Utilisateurs) : Gère les opérations liées aux utilisateurs, y compris l'importation de fichiers .fit.
-- ActivityManager (Gestionnaire d'Activités) : Responsable du stockage et de la gestion des activités importées.
+ActivityManager (Gestionnaire d'Activités) : Responsable du stockage et de la gestion des activités importées.
 
 **Objectif :**
 

Documents/Diagramme/README_DIAGRAMMES.md

@@ -20,7 +20,4 @@
 ## Diagrammes de cas d'utilisation
 - [Cas d'utilisation pour la gestion du compte et des amitiés](CasUtilisations/README_gestionCompteAmitie.md)
 - [Cas d'utilisation pour la gestion des activités et données](CasUtilisations/README_gestionActivites.md)
-- [Cas d'utilisation pour la suivi d'une équipe sportive](CasUtilisations/README_coachSuiviSportif.md)
+- [Cas d'utilisation pour la suivi d'une équipe sportive](CasUtilisations/README_coachSuiviSportif.md)
-
-## Base de Données
-- [MLD](BDD/README_BDD.md)

README.md

@@ -71,8 +71,7 @@ Documentation et informations à propos de `HearthTrack` disponible [ici]()
 ### Prerequisites
 * [Visual Studio code](https://code.visualstudio.com/) - exemple d'IDE gratuit
 * [Git](https://git-scm.com/) - Versioning
-* [XAMPP : X, Apache, MySQL, Perl, PHP](https://www.apachefriends.org/fr/index.html) - Languages
+* [XAMPP : X, Apache, MySQL, Perl, PHP](https://www.apachefriends.org/fr/index.html) - Langages
-* [PostgreSQL](https://www.postgresql.org/) - Base de Donnée
   
 ## Getting Started
 1. Cloner le répos
@@ -81,7 +80,7 @@ Documentation et informations à propos de `HearthTrack` disponible [ici]()
 4. Lancer le serveur Apache et MySQL
 5. Lancer le projet avec `php -S localhost:8000 -t Sources/`
 6. Ouvrir le navigateur et aller sur `localhost:8000/index.php`
- 
+
 ## Features
 * [x] Import de fichier .fit
 * [x] Ajout d'amis

Sources/composer.json

@@ -24,7 +24,7 @@
             "Shared\\Exception\\": "src/shared/exception",
             "Shared\\Attributes\\": "src/shared/attributes",
             "App\\Views\\Directives\\" : "src/app/views/directives",
-            "Data\\Core\\": "src/data/core/" 
+            "Data\\Core\\": "src/data/core/"
         }
     },
     "require": {
@@ -32,7 +32,9 @@
         "altorouter/altorouter": "1.1.0",
         "vlucas/phpdotenv": "^5.5",
         "psr/container": "^2.0",
-        "adriangibbons/php-fit-file-analysis": "^3.2.0"
+        "adriangibbons/php-fit-file-analysis": "^3.2.0",
+      "ext-couchbase": "*",
+        "ext-pdo": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "*"

Sources/config/.htaccess

@@ -1,2 +0,0 @@
-AddType text/css .css
-AddType application/javascript .js

Sources/config/Dockerfile

@@ -1,31 +1,17 @@
-FROM php:8.2-apache as base
+FROM php:8.2-fpm
 # Installation de dépendances nécessaires pour Composer
 RUN apt-get update && apt-get install -y \
     git \
     unzip
 
 # Installation de Composer
-
+# TODO : should use a image with composer install
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
 RUN docker-php-ext-install pdo pdo_mysql
 
-# Copy configs
+COPY . /var/www/
-COPY ./config/virtual-host.conf /etc/apache2/sites-available/000-default.conf
-COPY ./config/httpd.conf /etc/apache2/httpd.conf
-
-# Setup App
-RUN mkdir -p /app/public && chown -R www-data:www-data /app
-
-WORKDIR /app
-
-# add sources code
-COPY . /app
-
-ENV VOLUME_PATH /app/public
-
-RUN composer install
 
-EXPOSE 80
+WORKDIR /var/www/
 
-CMD ["apache2-foreground"]
+RUN composer install

Sources/config/config.php

@@ -5,7 +5,6 @@ use Shared\Log;
 
 $dotenv = Dotenv::createUnsafeImmutable(__DIR__,'.env');
 $dotenv->safeLoad();
-// echo($_ENV);
 // apenrently getEnv is not a good thing cause
 // const DB_HOST = $_ENV['DB_HOST'] ?? 'localhost';
 // const DB_DATABASE = $_ENV['DB_DATABASE'] ?? 'heartTrack';

Sources/config/httpd.conf

@@ -1 +0,0 @@
-SetEnv ASSET_PREFIX containers/HeartDev-web/

Sources/config/nginx.conf

@@ -1,19 +1,28 @@
 server {
     listen 80;
-    index index.php index.html index.htm;
+    index index.php;
-    root /usr/share/nginx/html;
+    root /var/www/public;
     error_page 404 /index.php;
 
+    location ~ ^/(images|javascript|js|css|flash|media|static)/  {
+      root    /var/www/public;
+    }
 
     location ~ \.php$ {
+        fastcgi_pass web:9000; # service name defined in docker-compose.yml file like web
         fastcgi_param REQUEST_METHOD $request_method;
         fastcgi_index index.php;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
         include fastcgi_params;
-    }        
+    }
+    location ~ /\. {
+       deny all;
+       access_log off;
+       log_not_found off;
+    }
 
     location / {
-      root /usr/share/nginx/html;
+      try_files $uri $uri/ /index.php?$query_string;
-      try_files $uri /index.php;
     }
+
 }

Sources/config/virtual-host.conf

@@ -1,39 +0,0 @@
-<VirtualHost *:80>
-	ServerName default
-
-	<Directory />
-		Options FollowSymLinks
-		AllowOverride None
-		Require all denied
-	</Directory>
-
-	<Directory ${VOLUME_PATH}>
-		AllowOverride All
-		Require all granted
-	</Directory>
-
-	DocumentRoot ${VOLUME_PATH}
-
-	AccessFileName .htaccess
-	<FilesMatch "^\.ht">
-		Require all denied
-	</FilesMatch>
-
-	LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
-	LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
-	LogFormat "%h %l %u %t \"%r\" %>s %O" common
-	LogFormat "%{Referer}i -> %U" referer
-	LogFormat "%{User-agent}i" agent
-
-	CustomLog /proc/self/fd/1 combined
-
-	<FilesMatch \.php$>
-		SetHandler application/x-httpd-php
-	</FilesMatch>
-
-	# Multiple DirectoryIndex directives within the same context will add
-	# to the list of resources to look for rather than replace
-	# https://httpd.apache.org/docs/current/mod/mod_dir.html#directoryindex
-	DirectoryIndex disabled
-	DirectoryIndex index.php index.html
-</VirtualHost>

Sources/public/index.php

@@ -65,4 +65,12 @@ $appFactory->registerService(\Twig\Environment::class,\Twig\Environment::class);
 // $databaseContext = DatabaseContext::getInstance();
 
 $appFactory->AddControllers();
+$app = $appFactory->create();
+if (!is_null($app)){
+    // Ajout des Middleware
+    /*$app->use(new LoggingMiddleware());*/
+    $app->use(new AuthMiddleware());
+    $app->mapControllers();
+    $app->run(RequestFactory::createFromGlobals());
+}
 

Sources/public/js/script2.js

@@ -0,0 +1,34 @@
+/*!
+* Start Bootstrap - New Age v6.0.7 (https://startbootstrap.com/theme/new-age)
+* Copyright 2013-2023 Start Bootstrap
+* Licensed under MIT (https://github.com/StartBootstrap/startbootstrap-new-age/blob/master/LICENSE)
+*/
+//
+// Scripts
+//
+
+window.addEventListener('DOMContentLoaded', event => {
+
+    // Activate Bootstrap scrollspy on the main nav element
+    const mainNav = document.body.querySelector('#mainNav');
+    if (mainNav) {
+        new bootstrap.ScrollSpy(document.body, {
+            target: '#mainNav',
+            offset: 74,
+        });
+    };
+
+    // Collapse responsive navbar when toggler is visible
+    const navbarToggler = document.body.querySelector('.navbar-toggler');
+    const responsiveNavItems = [].slice.call(
+        document.querySelectorAll('#navbarResponsive .nav-link')
+    );
+    responsiveNavItems.map(function (responsiveNavItem) {
+        responsiveNavItem.addEventListener('click', () => {
+            if (window.getComputedStyle(navbarToggler).display !== 'none') {
+                navbarToggler.click();
+            }
+        });
+    });
+
+});

Sources/public/js/scripts2.js

@@ -0,0 +1,34 @@
+/*!
+* Start Bootstrap - New Age v6.0.7 (https://startbootstrap.com/theme/new-age)
+* Copyright 2013-2023 Start Bootstrap
+* Licensed under MIT (https://github.com/StartBootstrap/startbootstrap-new-age/blob/master/LICENSE)
+*/
+//
+// Scripts
+// 
+
+window.addEventListener('DOMContentLoaded', event => {
+
+    // Activate Bootstrap scrollspy on the main nav element
+    const mainNav = document.body.querySelector('#mainNav');
+    if (mainNav) {
+        new bootstrap.ScrollSpy(document.body, {
+            target: '#mainNav',
+            offset: 74,
+        });
+    };
+
+    // Collapse responsive navbar when toggler is visible
+    const navbarToggler = document.body.querySelector('.navbar-toggler');
+    const responsiveNavItems = [].slice.call(
+        document.querySelectorAll('#navbarResponsive .nav-link')
+    );
+    responsiveNavItems.map(function (responsiveNavItem) {
+        responsiveNavItem.addEventListener('click', () => {
+            if (window.getComputedStyle(navbarToggler).display !== 'none') {
+                navbarToggler.click();
+            }
+        });
+    });
+
+});

Sources/src/app/controller/AthleteController.php

@@ -1,7 +1,15 @@
 <?php
 
+namespace App\Controller;
 namespace App\Controller;
 
+use App\Container;
+use App\Router\Request\IRequest;
+use App\Router\Response\Response;
+use Shared\Attributes\Route;
+use Twig\Environment;
+use Data\Core\Preferences;
+use Shared\Log;
 use App\Container;
 use App\Router\Request\IRequest;
 use App\Router\Response\Response;
@@ -13,7 +21,16 @@ use Shared\Log;
 class AthleteController extends BaseController
 {
 
-    #[Route(path: '/search-ath', name: 'search-ath', methods: ['GET'])]
+    private Environment $twig;
+    private Preferences $preference;
+
+    public function __construct()
+    {
+       session_start();
+       $this->preference = new Preferences();
+    }
+
+    #[Route(path: '/search-user', name: 'search-user', methods: ['GET'])]
     public function searchUser(string $username, IRequest $req): Response
     {
         $taberror = [];
@@ -33,34 +50,52 @@ class AthleteController extends BaseController
         ];
         // if(!Validation::val_string($name)){
         try {
-            //code...
+                //code...
-            //     $model->userMgr->getUser($name);
+                //     $model->userMgr->getUser($name);
-            return $this->render('./page/addfriend.html.twig', [
+                return $this->render('./page/addfriend.html.twig',[
-                'css' => $this->preference->getCookie(),
+                    'css' => $this->preference->getCookie(),
-                'pp' => "test2",
+                    'pp' => "test2",
-                'user' => "Doe",
+                    'user' => "Doe",
-                'role' => "Athlète",
+                    'role' => "Athlète",
-                'friendship' => [],
+                    'friendship' => [],
-                'analyzes' => [],
+                    'analyzes' => [],
-                'mails' => [],
+                    'mails' => [],
-                'users' => $utiliArray,
+                    'users' => $utiliArray,
-                'infoUser' => [],
+                    'infoUser' => [],
-                'exos' => [],
+                    'exos' => [],
-                'member' => [],
+                    'member' => [],
-                'responce' => "Notification d'ajout envoyée à $username"
+                    'responce' => "Notification d'ajout envoyée à $username"
-            ]);
+                ]);
-        } catch (\Throwable $th) {
+            } catch (\Throwable $th) {
-            //throw $th;
+                //throw $th;
-            // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
+                // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
-        }
+            }
         // }
-
+        
     }
 
     #[Route(path: '/analyses', name: 'analyses', methods: ['GET'])]
     public function analyses(): Response
     {
-        return $this->render('./page/analyze.html.twig', [
+        return $this->render('./page/analyze.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
+
+    #[Route(path: '/activity', name: 'activity', methods: ['GET'])]
+    public function activity(): Response
+    {
+        return $this->render('./page/activity.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
             'user' => "Doe",
@@ -79,7 +114,7 @@ class AthleteController extends BaseController
     #[Route(path: '/exercice', name: 'exercice', methods: ['GET'])] // 8
     public function exercice(): Response
     {
-        return $this->render('./page/exercice.html.twig', [
+        return $this->render('./page/exercice.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
             'user' => "Doe",
@@ -94,6 +129,32 @@ class AthleteController extends BaseController
         ]);
     }
 
+    #[Route(path: '/exercices', name: 'exercices', methods: ['POST'])] // 8
+    public function exercices(String $type, String $intensite, String $date, IRequest $req): Response
+    {
+        $exercicesArray = [
+            [
+                'date' => $date,
+                'type' => $type,
+                'intensite' => $intensite,
+                'status' => 'A venur',
+            ]
+        ];
+        return $this->render('./page/exercice.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => $exercicesArray,
+            'member' => []
+        ]);
+    }
+
     #[Route(path: '/add-friend', name: 'add-friend', methods: ['POST'])]
     public function addFriend(string $username, IRequest $req): Response
     {
@@ -114,33 +175,30 @@ class AthleteController extends BaseController
         ];
         // if(!Validation::val_string($name)){
         try {
-            //code...
+                //code...
-            //     $model->userMgr->addFriend($name);
+                //     $model->userMgr->addFriend($name);
-            return $this->render('./page/addfriend.html.twig', [
+                return $this->render('./page/addfriend.html.twig',[
-                'css' => $this->preference->getCookie(),
+                    'css' => $this->preference->getCookie(),
-                'pp' => "test2",
+                    'pp' => "test2",
-                'user' => "Doe",
+                    'user' => "Doe",
-                'role' => "Athlète",
+                    'role' => "Athlète",
-                'friendship' => [],
+                    'friendship' => [],
-                'analyzes' => [],
+                    'analyzes' => [],
-                'mails' => [],
+                    'mails' => [],
-                'users' => $utiliArray,
+                    'users' => $utiliArray,
-                'infoUser' => [],
+                    'infoUser' => [],
-                'exos' => [],
+                    'exos' => [],
-                'member' => [],
+                    'member' => [],
-                'responce' => "Notification d'ajout envoyée à $username"
+                    'responce' => "Notification d'ajout envoyée à $username"
-            ]);
+                ]);
-        } catch (\Throwable $th) {
+            } catch (\Throwable $th) {
-            //throw $th;
+                //throw $th;
-            // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
+                // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
-        }
+            }
         // }
-
+        
     }
 
-
-
-    
     #[Route(path: '/friend', name: 'friend', methods: ['GET'])]
     public function friend(): Response
     {
@@ -173,4 +231,78 @@ class AthleteController extends BaseController
         ]);
     }
 
-}
+    #[Route(path: '/friendlist', name: 'friendlist', methods: ['POST'])]
+    public function friendlist(string $username, IRequest $req): Response
+    {
+        $utiliArray = [
+            [
+                'nom' => 'John',
+                'prenom' => 'Doe',
+                'img' => 'john_doe',
+                'username' => 'johndoe',
+            ],
+            [
+                'nom' => 'Alice',
+                'prenom' => 'Smith',
+                'img' => 'alice_smith',
+                'username' => 'alicesmith',
+            ],
+        ];
+        /* TODO */
+
+        // -> Enlever ou bloquer un utilisateur en fonction de son username
+
+        return $this->render('./page/friend.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => $utiliArray,
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => [],
+        ]);
+    }
+
+    #[Route(path: '/friendlist', name: 'friendlist2', methods: ['GET'])]
+    public function friendlist2(): Response
+    {
+        $utiliArray = [
+            [
+                'nom' => 'John',
+                'prenom' => 'Doe',
+                'img' => 'test',
+                'status' => 'johndoe',
+                'username' => 'jdoe',
+            ],
+            [
+                'nom' => 'Alice',
+                'prenom' => 'Smith',
+                'img' => 'test2',
+                'status' => 'alicesmith',
+                'username' => 'asmith',
+            ],
+        ];
+        return $this->render('./page/friend.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => $utiliArray,
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => [],
+        ]);
+    }
+
+    // #[Route(path: '/delete-friend', name: 'delete-friend', methods: ['POST'])]
+    
+}
+
+?>

Sources/src/app/controller/AuthController.php

@@ -5,46 +5,113 @@ namespace App\Controller;
 use App\Container;
 use App\Router\Request\IRequest;
 use App\Router\Response\Response;
-use App\Router\Response\IResponse;
-
-use Couchbase\UserManager;
 use Shared\Attributes\Route;
-use Shared\Validation;
 use Twig\Environment;
 use Data\Core\Preferences;
 use Shared\Log;
 
 class AuthController extends BaseController
 {
+    
+    private Preferences $preference;
 
+    public function __construct(){
+        $this->preference = new Preferences();
+    }
 
-    #[Route('/login', name: 'login',methods: ['POST'])]
+    #[Route('/login', name: 'login')]
-    public function login(IRequest $request): IResponse {
+    public function login(?string $username, ?string $password ,IRequest $request): Response {
-        
+        // if user is already logged in, don't display the login page again
-        $error = [];
+        if ($user) {
-        try {
+            return $this->redirectToRoute('blog_index');
-            $log=Validation::clean_string($request->getBody()['email']);
-            $mdp=Validation::clean_string($request->getBody()['password']);
-        } catch (\Throwable $th) {
-            $error = "Wrong cred";
         }
+
+        // this statement solves an edge-case: if you change the locale in the login
+        // page, after a successful login you are redirected to a page in the previous
+        // locale. This code regenerates the referrer URL whenever the login page is
+        // browsed, to ensure that its locale is always the current one.
+        $this->saveTargetPath($request->getSession(), 'main', $this->generateUrl('admin_index'));
+
+        return $this->render('security/login.html.twig', [
+            // last username entered by the user (if any)
+            'last_username' => $helper->getLastUsername(),
+            // last authentication error (if any)
+            'error' => $helper->getLastAuthenticationError(),
+        ]);
+    }
+
+    // #[Route('/login', name: 'login')]
+    // public function login(?string $username, ?string $password ,IRequest $request): Response {
+    //     // if user is already logged in, don't display the login page again
+    //     if ($user) {
+    //         return $this->redirectToRoute('blog_index');
+    //     }
+
+    //     // this statement solves an edge-case: if you change the locale in the login
+    //     // page, after a successful login you are redirected to a page in the previous
+    //     // locale. This code regenerates the referrer URL whenever the login page is
+    //     // browsed, to ensure that its locale is always the current one.
+    //     $this->saveTargetPath($request->getSession(), 'main', $this->generateUrl('admin_index'));
+
+    //     return $this->render('security/login.html.twig', [
+    //         // last username entered by the user (if any)
+    //         'last_username' => $helper->getLastUsername(),
+    //         // last authentication error (if any)
+    //         'error' => $helper->getLastAuthenticationError(),
+    //     ]);
+    // }
+
+    #[Route(path: '/register', name: 'register', methods: ['POST'])]
+    public function register(string $username,string $mdp,string $confirmMdp,string $nom,string $prenom,string $dateNaissance,string $sexe,string $taille,string $poids, IRequest $req): Response
+    {
         
-        if($this->container->get(UserManager::class)->login($log,$mdp)){
+       // CONFIRMER LES DONNESS !!!!! IMPORTANT
-            return $this->redirectToRoute('/');
+
-        }
+        return $this->render('./page/home.html.twig',[
-        else{
+            'css' => $this->preference->getCookie()
-            $error [] = "Erreur de connexion. Essayez encore"; 
+        ]);
-        }
+    }
-        return $this->render('./page/login.html.twig', ['error' => $error]);
+
-        
+    #[Route(path: '/regist', name: 'regist', methods: ['GET'])]
+    public function register2(): Response
+    {
         
+       // CONFIRMER LES DONNESS !!!!! IMPORTANT
+
+        return $this->render('./page/register.html.twig',[
+            'css' => $this->preference->getCookie()
+        ]);
+    }
+
+    
+    function inscription() {
+        $model = new ModelVisitor();
+        $log=Validation::clean_string($_POST['pseudo']);
+        $mdp=Validation::clean_string($_POST['password']);
+        if($model->createAUser($log,$mdp)){
+            if(ModelUser::login($log, $mdp)){
+                UserControler::displayView();
+            }
+        }
+    }
+    function connexion(){
+        $model = new ModelVisitor();
+        if(!isset($_POST['pseudo']) || !isset($_POST['password'])) throw new Exception(" some wrong with credentials !!!!!");
+        $log=Validation::clean_string($_POST['pseudo']);
+        $mdp=Validation::clean_string($_POST['password']);
+            if(ModelUser::login($log, $mdp)){
+                UserControler::displayView();
+            }
         
     }
 
-    #[Route('/log', name: 'baseLog',methods: ['GET'])]
+    #[Route(path: '/pass', name: 'pass', methods: ['GET'])]
-    public function index(IRequest $request): IResponse { 
+    public function pass(): Response
+    {
+        
+       // CONFIRMER LES DONNESS !!!!! IMPORTANT
 
-        return $this->render('./page/login.html.twig',[
+        return $this->render('./page/password.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
             'user' => "Doe",
@@ -57,74 +124,36 @@ class AuthController extends BaseController
             'exos' => [],
             'member' => []
         ]);
-
     }
 
-    #[Route('/register', name: 'register' , methods:['GET'])]
+    #[Route(path: '/log', name: 'log', methods: ['GET'])]
-    public function register(IRequest $request): IResponse
+    public function login2(): Response
     {
-        if ($request->getMethod() == 'POST') {
+        
-            $nom = $request->getBody()['nom'];
+       // CONFIRMER LES DONNESS !!!!! IMPORTANT
-    
-            $prenom = $request->getBody()['prenom'];
-    
-            $username = $request->getBody()['username'];
-    
-            $email = $request->getBody()['email'];
-    
-            $motDePasse = $request->getBody()['motDePasse'];
-    
-            $sexe = $request->getBody()['sexe'];
-    
-            $taille = $request->getBody()['taille'];
-    
-            $poids = $request->getBody()['poids'];
-    
-            $dateNaissanceStr = $request->getBody()['nom'];
-            $dateNaissance = new \DateTime($dateNaissanceStr);
-    
-    
-            if (!$dateNaissance) {
-                throw new \Exception("Date de naissance non valide. Format attendu : YYYY-MM-DD");
-            }
-    
-            $roleName = $request->getBody()['roleName'];
-
-
-            $registrationData = [
-                'nom' => $nom,
-                'prenom' => $prenom,
-                'username' => $username,
-                'email' => $email,
-                'sexe' => $sexe,
-                'taille' => $taille,
-                'poids' => $poids,
-                'dateNaissance' => $dateNaissance,
-                'roleName' => $roleName
-            ];
-
-            try {
-                if ($this->container->get(UserManager::class)->register($email, $motDePasse, $registrationData)) {
-                    return $this->redirectToRoute('/');
-                } else {
-            
-                    $error [] = 'L\'inscription a échoué. Veuillez réessayer.';
-                }
-            } catch (\Exception $e) {
-                $error [] = 'Erreur lors de l\'inscription: ' . $e->getMessage(); 
-            }
-        }
 
-        return $this->render('/register.html.twig');
+        return $this->render('./page/login.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
     }
 
-    #[Route(path: '/mdp', name: 'mdp', methods: ['POST'])]
+    #[Route(path: '/password', name: 'password', methods: ['POST'])]
-    public function mdp(string $ancienMotDePasse,string $nouveauMotDePasse,string $confirmerMotDePasse, IRequest $req): Response
+    public function password(string $email, IRequest $req): Response
     {
         
        // CONFIRMER LES DONNESS !!!!! IMPORTANT
 
-        return $this->render('./page/settings.html.twig',[
+        return $this->render('./page/login.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
             'user' => "Doe",
@@ -140,8 +169,6 @@ class AuthController extends BaseController
     }
 
     
-   
-
-    
 }
+
 ?>

Sources/src/app/controller/CoachController.php

@@ -1,49 +1,34 @@
 <?php
 
-// namespace App\Controller;
+namespace App\Controller;
 
-// use App\Container;
+use App\Container;
-// use App\Router\Request\IRequest;
+use App\Router\Request\IRequest;
-// use App\Router\Response\Response;
+use App\Router\Response\Response;
-// use App\Router\Response\IResponse;
+use App\Router\Response\IResponse;
 
-// use Shared\Attributes\Route;
+use Shared\Attributes\Route;
-// use Twig\Environment;
+use Twig\Environment;
-// use Data\Core\Preferences;
+use Data\Core\Preferences;
-// use Shared\Log;
+use Shared\Log;
 
 
+class CoachController extends BaseController
+{
 
-// #[Route(path: '/coach', name: 'coach')]
+    private ICoachManager $coachManager;
-// class CoachController extends BaseController
+    private $security;
-// {
+    private Environment $twig;
+    private Preferences $preference;
 
-//     private ICoachManager $coachManager;
+    public function __construct(DataManager $dataManager, Security $security)
-//     private $security;
+    {
+        session_start();
+        $this->coachManager = $dataManager->coachMgr;
+        $this->security = $security;
+        $this->preference = new Preferences();
+    }
 
-//     public function __construct(DataManager $dataManager, Security $security)
-//     {
-//         $this->coachManager = $dataManager->coachMgr;
-//         $this->security = $security;
-//     }
-
-//     #[Route(path: '/', name: 'home', methods: ['GET'])]
-//     public function index(): Response
-//     {
-//         return $this->render('./page/home.html.twig',[
-//             'css' => $this->preference->getCookie(),
-//             'pp' => "test2",
-//             'user' => "Doe",
-//             'role' => "Athlète",
-//             'friendship' => [],
-//             'analyzes' => [],
-//             'mails' => [],
-//             'users' => [],
-//             'infoUser' => [],
-//             'exos' => [],
-//             'member' => []
-//         ]);
-//     }
 //     #[Route('/global-stats', name: 'coach_global_stats', methods: ['GET'])]
 //     public function globalStats(): Response
 //     {
@@ -51,41 +36,145 @@
 //         return $this->render('coach/global_stats.html.twig');
 //     }
 
-// #[Route(path: '/exercice', name: 'exercice', methods: ['GET'])] // 8
-//     public function exercice(): Response
-//     {
-//         return $this->render('./page/exercice.html.twig',[
-//             'css' => $this->preference->getCookie(),
-//             'pp' => "test2",
-//             'user' => "Doe",
-//             'role' => "Athlète",
-//             'friendship' => [],
-//             'analyzes' => [],
-//             'mails' => [],
-//             'users' => [],
-//             'infoUser' => [],
-//             'exos' => [],
-//             'member' => []
-//         ]);
-//     }
 
-// #[Route(path: '/coaching', name: 'coaching', methods: ['GET'])]
+    #[Route(path: '/coaching', name: 'coaching', methods: ['GET'])]
-// public function coaching(): Response
+    public function coaching(): Response
-// {
+    {
-//     return $this->render('./page/coaching.html.twig',[
+        return $this->render('./page/coaching.html.twig',[
-//         'css' => $this->preference->getCookie(),
+            'css' => $this->preference->getCookie(),
-//         'pp' => "test2",
+            'pp' => "test2",
-//         'user' => "Doe",
+            'user' => "Doe",
-//         'role' => "Athlète",
+            'role' => "Coach",
-//         'friendship' => [],
+            'friendship' => [],
-//         'analyzes' => [],
+            'analyzes' => [],
-//         'mails' => [],
+            'mails' => [],
-//         'users' => [],
+            'users' => [],
-//         'infoUser' => [],
+            'infoUser' => [],
-//         'exos' => [],
+            'exos' => [],
-//         'member' => []
+            'member' => []
-//     ]);
+        ]);
-// }
+    }
+
+    #[Route(path: '/search-member', name: 'search-member', methods: ['GET'])]
+    public function searchMember(string $username, IRequest $req): Response
+    {
+        $taberror = [];
+        // FILTER 
+        $utiliArray = [
+            [
+                'nom' => 'John',
+                'prenom' => 'Doe',
+                'img' => 'john_doe',
+                'username' => 'johndoe',
+            ],
+            [
+                'nom' => 'Alice',
+                'prenom' => 'Smith',
+                'img' => 'alice_smith',
+                'username' => 'alicesmith',
+            ],
+        ];
+        // if(!Validation::val_string($name)){
+        try {
+                //code...
+                //     $model->userMgr->addFriend($name);
+                return $this->render('./page/addmember.html.twig',[
+                    'css' => $this->preference->getCookie(),
+                    'pp' => "test2",
+                    'user' => "Doe",
+                    'role' => "Athlète",
+                    'friendship' => [],
+                    'analyzes' => [],
+                    'mails' => [],
+                    'users' => $utiliArray,
+                    'infoUser' => [],
+                    'exos' => [],
+                    'member' => [],
+                    'responce' => "Notification d'ajout envoyée à $username"
+                ]);
+            } catch (\Throwable $th) {
+                //throw $th;
+                // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
+            }
+        // }
+        
+    }
+
+    #[Route(path: '/add-member', name: 'add-member', methods: ['POST'])]
+    public function addmember(string $username, IRequest $req): Response
+    {
+        $taberror = [];
+        $utiliArray = [
+            [
+                'nom' => 'John',
+                'prenom' => 'Doe',
+                'img' => 'john_doe',
+                'username' => 'johndoe',
+            ],
+            [
+                'nom' => 'Alice',
+                'prenom' => 'Smith',
+                'img' => 'alice_smith',
+                'username' => 'alicesmith',
+            ],
+        ];
+        // if(!Validation::val_string($name)){
+        try {
+                //code...
+                //     $model->userMgr->addFriend($name);
+                return $this->render('./page/addmember.html.twig',[
+                    'css' => $this->preference->getCookie(),
+                    'pp' => "test2",
+                    'user' => "Doe",
+                    'role' => "Athlète",
+                    'friendship' => [],
+                    'analyzes' => [],
+                    'mails' => [],
+                    'users' => $utiliArray,
+                    'infoUser' => [],
+                    'exos' => [],
+                    'member' => [],
+                    'responce' => "Notification d'ajout envoyée à $username"
+                ]);
+            } catch (\Throwable $th) {
+                //throw $th;
+                // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
+            }
+        // }
+        
+    }
+
+    #[Route(path: '/member', name: 'member', methods: ['GET'])]
+    public function member(): Response
+    {
+        $utiliArray = [
+            [
+                'nom' => 'John',
+                'prenom' => 'Doe',
+                'img' => 'john_doe',
+                'username' => 'johndoe',
+            ],
+            [
+                'nom' => 'Alice',
+                'prenom' => 'Smith',
+                'img' => 'alice_smith',
+                'username' => 'alicesmith',
+            ],
+        ];
+        return $this->render('./page/addmember.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => $utiliArray,
+            'infoUser' => [],
+            'exos' => [],
+            'member' => [],
+        ]);
+    }
 
 //     #[Route('/list-athletes', name: 'coach_list_athletes')]
 //     public function listAthletes(): Response
@@ -121,4 +210,4 @@
 //     // }
 
     
-// }
+}

Sources/src/app/controller/Controller.php

@@ -0,0 +1,716 @@
+<?php
+
+// namespace App\Controller;
+
+// use App\Container;
+// use App\Router\Request\IRequest;
+// use App\Router\Response\Response;
+// use Shared\Attributes\Route;
+// use Twig\Environment;
+// use Data\Core\Preferences;
+// use Shared\Log;
+
+// // TODO : Remove this BaseClass
+// class Controller extends BaseController
+// {
+//     private Environment $twig;
+//     private Preferences $preference;
+
+//     public function __construct()
+//     {
+//        session_start();
+//        $this->preference = new Preferences();
+//     }
+    
+    // #[Route(path: '/', name: 'index', methods: ['GET'])]
+    // public function index(): Response
+    // {
+    //     return $this->render('./page/index.html',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/home', name: 'home', methods: ['GET'])]
+    // public function home(): Response
+    // {
+    //     return $this->render('./page/home.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/analyses', name: 'analyses', methods: ['GET'])]
+    // public function analyses(): Response
+    // {
+    //     return $this->render('./page/analyze.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/activity', name: 'activity', methods: ['GET'])]
+    // public function activity(): Response
+    // {
+    //     return $this->render('./page/activity.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/exercice', name: 'exercice', methods: ['GET'])] // 8
+    // public function exercice(): Response
+    // {
+    //     return $this->render('./page/exercice.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/exercices', name: 'exercices', methods: ['POST'])] // 8
+    // public function exercices(String $type, String $intensite, String $date, IRequest $req): Response
+    // {
+    //     $exercicesArray = [
+    //         [
+    //             'date' => $date,
+    //             'type' => $type,
+    //             'intensite' => $intensite,
+    //             'status' => 'A venur',
+    //         ]
+    //     ];
+    //     return $this->render('./page/exercice.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => $exercicesArray,
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/search-user', name: 'search-user', methods: ['GET'])]
+    // public function searchUser(string $username, IRequest $req): Response
+    // {
+    //     $taberror = [];
+    //     // FILTER 
+    //     $utiliArray = [
+    //         [
+    //             'nom' => 'John',
+    //             'prenom' => 'Doe',
+    //             'img' => 'john_doe',
+    //             'username' => 'johndoe',
+    //         ],
+    //         [
+    //             'nom' => 'Alice',
+    //             'prenom' => 'Smith',
+    //             'img' => 'alice_smith',
+    //             'username' => 'alicesmith',
+    //         ],
+    //     ];
+    //     // if(!Validation::val_string($name)){
+    //     try {
+    //             //code...
+    //             //     $model->userMgr->addFriend($name);
+    //             return $this->render('./page/addfriend.html.twig',[
+    //                 'css' => $this->preference->getCookie(),
+    //                 'pp' => "test2",
+    //                 'user' => "Doe",
+    //                 'role' => "Athlète",
+    //                 'friendship' => [],
+    //                 'analyzes' => [],
+    //                 'mails' => [],
+    //                 'users' => $utiliArray,
+    //                 'infoUser' => [],
+    //                 'exos' => [],
+    //                 'member' => [],
+    //                 'responce' => "Notification d'ajout envoyée à $username"
+    //             ]);
+    //         } catch (\Throwable $th) {
+    //             //throw $th;
+    //             // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
+    //         }
+    //     // }
+        
+    // }
+
+    // #[Route(path: '/search-member', name: 'search-member', methods: ['GET'])]
+    // public function searchMember(string $username, IRequest $req): Response
+    // {
+    //     $taberror = [];
+    //     // FILTER 
+    //     $utiliArray = [
+    //         [
+    //             'nom' => 'John',
+    //             'prenom' => 'Doe',
+    //             'img' => 'john_doe',
+    //             'username' => 'johndoe',
+    //         ],
+    //         [
+    //             'nom' => 'Alice',
+    //             'prenom' => 'Smith',
+    //             'img' => 'alice_smith',
+    //             'username' => 'alicesmith',
+    //         ],
+    //     ];
+    //     // if(!Validation::val_string($name)){
+    //     try {
+    //             //code...
+    //             //     $model->userMgr->addFriend($name);
+    //             return $this->render('./page/addmember.html.twig',[
+    //                 'css' => $this->preference->getCookie(),
+    //                 'pp' => "test2",
+    //                 'user' => "Doe",
+    //                 'role' => "Athlète",
+    //                 'friendship' => [],
+    //                 'analyzes' => [],
+    //                 'mails' => [],
+    //                 'users' => $utiliArray,
+    //                 'infoUser' => [],
+    //                 'exos' => [],
+    //                 'member' => [],
+    //                 'responce' => "Notification d'ajout envoyée à $username"
+    //             ]);
+    //         } catch (\Throwable $th) {
+    //             //throw $th;
+    //             // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
+    //         }
+    //     // }
+        
+    // }
+
+    // #[Route(path: '/add-member', name: 'add-member', methods: ['POST'])]
+    // public function addmember(string $username, IRequest $req): Response
+    // {
+    //     $taberror = [];
+    //     $utiliArray = [
+    //         [
+    //             'nom' => 'John',
+    //             'prenom' => 'Doe',
+    //             'img' => 'john_doe',
+    //             'username' => 'johndoe',
+    //         ],
+    //         [
+    //             'nom' => 'Alice',
+    //             'prenom' => 'Smith',
+    //             'img' => 'alice_smith',
+    //             'username' => 'alicesmith',
+    //         ],
+    //     ];
+    //     // if(!Validation::val_string($name)){
+    //     try {
+    //             //code...
+    //             //     $model->userMgr->addFriend($name);
+    //             return $this->render('./page/addmember.html.twig',[
+    //                 'css' => $this->preference->getCookie(),
+    //                 'pp' => "test2",
+    //                 'user' => "Doe",
+    //                 'role' => "Athlète",
+    //                 'friendship' => [],
+    //                 'analyzes' => [],
+    //                 'mails' => [],
+    //                 'users' => $utiliArray,
+    //                 'infoUser' => [],
+    //                 'exos' => [],
+    //                 'member' => [],
+    //                 'responce' => "Notification d'ajout envoyée à $username"
+    //             ]);
+    //         } catch (\Throwable $th) {
+    //             //throw $th;
+    //             // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
+    //         }
+    //     // }
+        
+    // }
+
+    // #[Route(path: '/member', name: 'member', methods: ['GET'])]
+    // public function member(): Response
+    // {
+    //     $utiliArray = [
+    //         [
+    //             'nom' => 'John',
+    //             'prenom' => 'Doe',
+    //             'img' => 'john_doe',
+    //             'username' => 'johndoe',
+    //         ],
+    //         [
+    //             'nom' => 'Alice',
+    //             'prenom' => 'Smith',
+    //             'img' => 'alice_smith',
+    //             'username' => 'alicesmith',
+    //         ],
+    //     ];
+    //     return $this->render('./page/addmember.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => $utiliArray,
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => [],
+    //     ]);
+    // }
+
+    // #[Route(path: '/add-friend', name: 'add-friend', methods: ['POST'])]
+    // public function addFriend(string $username, IRequest $req): Response
+    // {
+    //     $taberror = [];
+    //     $utiliArray = [
+    //         [
+    //             'nom' => 'John',
+    //             'prenom' => 'Doe',
+    //             'img' => 'john_doe',
+    //             'username' => 'johndoe',
+    //         ],
+    //         [
+    //             'nom' => 'Alice',
+    //             'prenom' => 'Smith',
+    //             'img' => 'alice_smith',
+    //             'username' => 'alicesmith',
+    //         ],
+    //     ];
+    //     // if(!Validation::val_string($name)){
+    //     try {
+    //             //code...
+    //             //     $model->userMgr->addFriend($name);
+    //             return $this->render('./page/addfriend.html.twig',[
+    //                 'css' => $this->preference->getCookie(),
+    //                 'pp' => "test2",
+    //                 'user' => "Doe",
+    //                 'role' => "Athlète",
+    //                 'friendship' => [],
+    //                 'analyzes' => [],
+    //                 'mails' => [],
+    //                 'users' => $utiliArray,
+    //                 'infoUser' => [],
+    //                 'exos' => [],
+    //                 'member' => [],
+    //                 'responce' => "Notification d'ajout envoyée à $username"
+    //             ]);
+    //         } catch (\Throwable $th) {
+    //             //throw $th;
+    //             // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
+    //         }
+    //     // }
+        
+    // }
+
+    // #[Route(path: '/friend', name: 'friend', methods: ['GET'])]
+    // public function friend(): Response
+    // {
+    //     $utiliArray = [
+    //         [
+    //             'nom' => 'John',
+    //             'prenom' => 'Doe',
+    //             'img' => 'john_doe',
+    //             'username' => 'johndoe',
+    //         ],
+    //         [
+    //             'nom' => 'Alice',
+    //             'prenom' => 'Smith',
+    //             'img' => 'alice_smith',
+    //             'username' => 'alicesmith',
+    //         ],
+    //     ];
+    //     return $this->render('./page/addfriend.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => $utiliArray,
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => [],
+    //     ]);
+    // }
+
+    // #[Route(path: '/friendlist', name: 'friendlist', methods: ['POST'])]
+    // public function friendlist(string $username, IRequest $req): Response
+    // {
+    //     $utiliArray = [
+    //         [
+    //             'nom' => 'John',
+    //             'prenom' => 'Doe',
+    //             'img' => 'john_doe',
+    //             'username' => 'johndoe',
+    //         ],
+    //         [
+    //             'nom' => 'Alice',
+    //             'prenom' => 'Smith',
+    //             'img' => 'alice_smith',
+    //             'username' => 'alicesmith',
+    //         ],
+    //     ];
+    //     /* TODO */
+
+    //     // -> Enlever ou bloquer un utilisateur en fonction de son username
+
+    //     return $this->render('./page/friend.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => $utiliArray,
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => [],
+    //     ]);
+    // }
+
+    // #[Route(path: '/friendlist', name: 'friendlist2', methods: ['GET'])]
+    // public function friendlist2(): Response
+    // {
+    //     $utiliArray = [
+    //         [
+    //             'nom' => 'John',
+    //             'prenom' => 'Doe',
+    //             'img' => 'test',
+    //             'status' => 'johndoe',
+    //             'username' => 'jdoe',
+    //         ],
+    //         [
+    //             'nom' => 'Alice',
+    //             'prenom' => 'Smith',
+    //             'img' => 'test2',
+    //             'status' => 'alicesmith',
+    //             'username' => 'asmith',
+    //         ],
+    //     ];
+    //     return $this->render('./page/friend.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => $utiliArray,
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => [],
+    //     ]);
+    // }
+
+    // #[Route(path: '/coaching', name: 'coaching', methods: ['GET'])]
+    // public function coaching(): Response
+    // {
+    //     return $this->render('./page/coaching.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/mail', name: 'mail', methods: ['GET'])]
+    // public function mail(): Response
+    // {
+    //     return $this->render('./page/mail.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/import', name: 'import', methods: ['GET'])]
+    // public function import(): Response
+    // {
+    //     return $this->render('./page/import.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/settings', name: 'settings', methods: ['GET'])]
+    // public function settings(IRequest $req): Response
+    // {
+    //     return $this->render('./page/settings.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/profile', name: 'profile', methods: ['GET'])]
+    // public function profile(): Response
+    // {
+    //     return $this->render('./page/profile.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/preferences', name: 'preferences', methods: ['POST'])]
+    // public function preferences(string $theme, IRequest $req): Response
+    // {
+    //     /*TODO*/
+
+    //     //  VALIDER LES DONNEES
+    //     $this->preference->majCookie($theme);
+       
+    //     return $this->render('./page/settings.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/psettings', name: 'psettings', methods: ['POST'])]
+    // public function psettings(string $nom,string $prenom,string $dateNaissance,string $mail,string $tel, IRequest $req): Response
+    // {
+        
+       
+    //     return $this->render('./page/settings.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => $prenom,
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/mdp', name: 'mdp', methods: ['POST'])]
+    // public function mdp(string $ancienMotDePasse,string $nouveauMotDePasse,string $confirmerMotDePasse, IRequest $req): Response
+    // {
+        
+    //    // CONFIRMER LES DONNESS !!!!! IMPORTANT
+
+    //     return $this->render('./page/settings.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/login', name: 'login', methods: ['POST'])]
+    // public function login(string $username,string $mdp, IRequest $req): Response
+    // {
+        
+    //    // CONFIRMER LES DONNESS !!!!! IMPORTANT
+
+    //     return $this->render('./page/home.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/log', name: 'log', methods: ['GET'])]
+    // public function login2(): Response
+    // {
+        
+    //    // CONFIRMER LES DONNESS !!!!! IMPORTANT
+
+    //     return $this->render('./page/login.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/register', name: 'register', methods: ['POST'])]
+    // public function register(string $username,string $mdp,string $confirmMdp,string $nom,string $prenom,string $dateNaissance,string $sexe,string $taille,string $poids, IRequest $req): Response
+    // {
+        
+    //    // CONFIRMER LES DONNESS !!!!! IMPORTANT
+
+    //     return $this->render('./page/home.html.twig',[
+    //         'css' => $this->preference->getCookie()
+    //     ]);
+    // }
+
+    // #[Route(path: '/regist', name: 'regist', methods: ['GET'])]
+    // public function register2(): Response
+    // {
+        
+    //    // CONFIRMER LES DONNESS !!!!! IMPORTANT
+
+    //     return $this->render('./page/register.html.twig',[
+    //         'css' => $this->preference->getCookie()
+    //     ]);
+    // }
+
+    // #[Route(path: '/pass', name: 'pass', methods: ['GET'])]
+    // public function pass(): Response
+    // {
+        
+    //    // CONFIRMER LES DONNESS !!!!! IMPORTANT
+
+    //     return $this->render('./page/password.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+
+    // #[Route(path: '/password', name: 'password', methods: ['POST'])]
+    // public function password(string $email, IRequest $req): Response
+    // {
+        
+    //    // CONFIRMER LES DONNESS !!!!! IMPORTANT
+
+    //     return $this->render('./page/login.html.twig',[
+    //         'css' => $this->preference->getCookie(),
+    //         'pp' => "test2",
+    //         'user' => "Doe",
+    //         'role' => "Athlète",
+    //         'friendship' => [],
+    //         'analyzes' => [],
+    //         'mails' => [],
+    //         'users' => [],
+    //         'infoUser' => [],
+    //         'exos' => [],
+    //         'member' => []
+    //     ]);
+    // }
+    
+//}
+
+
+

Sources/src/app/controller/HeartRateController.php

@@ -1,36 +1,45 @@
 <?php
 
-// namespace App\Controller;
+namespace App\Controller;
-
+
-// use App\Container;
+use App\Container;
-// use App\Router\Request\IRequest;
+use App\Router\Request\IRequest;
-// use App\Router\Response\Response;
+use App\Router\Response\Response;
-// use Shared\Attributes\Route;
+use Shared\Attributes\Route;
-// use Twig\Environment;
+use Twig\Environment;
-// use Data\Core\Preferences;
+use Data\Core\Preferences;
-// use Shared\Log;
+use Shared\Log;
-
+
-// class HeartRateController extends BaseController
+class HeartRateController extends BaseController
-// {
+{
-
+
-
+    private Environment $twig;
-//     #[Route(path: '/import', name: 'import', methods: ['GET'])]
+    private Preferences $preference;
-//     public function import(): Response
+
-//     {
+    public function __construct()
-//         return $this->render('./page/import.html.twig',[
+    {
-//             'css' => $this->preference->getCookie(),
+       session_start();
-//             'pp' => "test2",
+       $this->preference = new Preferences();
-//             'user' => "Doe",
+    }
-//             'role' => "Athlète",
+
-//             'friendship' => [],
+
-//             'analyzes' => [],
+    #[Route(path: '/import', name: 'import', methods: ['GET'])]
-//             'mails' => [],
+    public function import(): Response
-//             'users' => [],
+    {
-//             'infoUser' => [],
+        return $this->render('./page/import.html.twig',[
-//             'exos' => [],
+            'css' => $this->preference->getCookie(),
-//             'member' => []
+            'pp' => "test2",
-//         ]);
+            'user' => "Doe",
-//     }
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
 
     
-// }
+}

Sources/src/app/controller/SocialController.php

@@ -1,19 +1,45 @@
 <?php
 
-// namespace App\Controller;
+namespace App\Controller;
 
-// use App\Container;
+use App\Container;
-// use App\Router\Request\IRequest;
+use App\Router\Request\IRequest;
-// use App\Router\Response\Response;
+use App\Router\Response\Response;
-// use App\Router\Response\IResponse;
+use Shared\Attributes\Route;
+use Twig\Environment;
+use Data\Core\Preferences;
+use Shared\Log;
 
-// use Shared\Attributes\Route;
+class SocialController extends BaseController
-// use Twig\Environment;
+{
-// use Data\Core\Preferences;
-// use Shared\Log;
 
+    private Environment $twig;
+    private Preferences $preference;
 
+    public function __construct()
+    {
+       session_start();
+       $this->preference = new Preferences();
+    }
 
-// #[Route(path: '/coach', name: 'coach')]
+
-// class CoachController extends BaseController
+    #[Route(path: '/mail', name: 'mail', methods: ['GET'])]
-// {
+    public function mail(): Response
+    {
+        return $this->render('./page/mail.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
+
+    
+}

Sources/src/app/controller/UserController.php

@@ -13,11 +13,37 @@ use Shared\Log;
 class UserController extends BaseController
 {
 
+    private Environment $twig;
+    private Preferences $preference;
 
-    #[Route(path: '/', name: 'home', methods: ['GET'])]
+    public function __construct()
+    {
+       session_start();
+       $this->preference = new Preferences();
+    }
+
+
+    #[Route(path: '/', name: 'index', methods: ['GET'])]
     public function index(): Response
     {
-        
+        return $this->render('./page/index.html',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
+
+    #[Route(path: '/home', name: 'home', methods: ['GET'])]
+    public function home(): Response
+    {
         return $this->render('./page/home.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
@@ -52,10 +78,28 @@ class UserController extends BaseController
         ]);
     }
 
+    #[Route(path: '/profile', name: 'profile', methods: ['GET'])]
+    public function profile(): Response
+    {
+        return $this->render('./page/profile.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
 
     #[Route(path: '/preferences', name: 'preferences', methods: ['POST'])]
     public function preferences(string $theme, IRequest $req): Response
     {
+        /*TODO*/
 
         //  VALIDER LES DONNEES
         $this->preference->majCookie($theme);
@@ -74,5 +118,46 @@ class UserController extends BaseController
             'member' => []
         ]);
     }
+
+    #[Route(path: '/psettings', name: 'psettings', methods: ['POST'])]
+    public function psettings(string $nom,string $prenom,string $dateNaissance,string $mail,string $tel, IRequest $req): Response
+    {
+        
+       
+        return $this->render('./page/settings.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => $prenom,
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
+
+    #[Route(path: '/mdp', name: 'mdp', methods: ['POST'])]
+    public function mdp(string $ancienMotDePasse,string $nouveauMotDePasse,string $confirmerMotDePasse, IRequest $req): Response
+    {
+        
+       // CONFIRMER LES DONNESS !!!!! IMPORTANT
+
+        return $this->render('./page/settings.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
     
 }

Sources/src/app/views/Templates/authbase.html.twig

@@ -1,71 +1,71 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
+<head>
-        <meta charset="utf-8" />
+    <meta charset="utf-8" />
-        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-        <meta name="description" content="" />
+    <meta name="description" content="" />
-        <meta name="author" content="" />
+    <meta name="author" content="" />
-        <title>{% block title %}{% endblock %}</title>
+    <title>{% block title %}{% endblock %}</title>
-        <link href="/css/{% block css %}base_theme{% endblock %}.css" rel="stylesheet" />
+    <link href="/css/{% block css %}base_theme{% endblock %}.css" rel="stylesheet" />
-        <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
+    <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
-    </head>
+</head>
-    <body class="bg-primary">
+<body class="bg-primary">
-        <div id="layoutAuthentication">
+<div id="layoutAuthentication">
-            <div id="layoutAuthentication_content">
+    <div id="layoutAuthentication_content">
-                <main>
+        <main>
-                {% block main %}
+            {% block main %}
-                    <div class="container">
+                <div class="container">
-                        <div class="row justify-content-center">
+                    <div class="row justify-content-center">
-                            <div class="col-lg-5">
+                        <div class="col-lg-5">
-                                <div class="card shadow-lg border-0 rounded-lg mt-5">
+                            <div class="card shadow-lg border-0 rounded-lg mt-5">
-                                    <div class="card-header"><h3 class="text-center font-weight-light my-4">Connexion</h3></div>
+                                <div class="card-header"><h3 class="text-center font-weight-light my-4">Connexion</h3></div>
-                                    <div class="card-body">
+                                <div class="card-body">
-                                        <form>
+                                    <form>
-                                            <div class="form-floating mb-3">
+                                        <div class="form-floating mb-3">
-                                                <input class="form-control" id="inputEmail" type="email" placeholder="nom@exemple.com" />
+                                            <input class="form-control" id="inputEmail" type="email" placeholder="nom@exemple.com" />
-                                                <label for="inputEmail">Adresse eMail</label>
+                                            <label for="inputEmail">Adresse eMail</label>
-                                            </div>
+                                        </div>
-                                            <div class="form-floating mb-3">
+                                        <div class="form-floating mb-3">
-                                                <input class="form-control" id="inputPassword" type="password" placeholder="Mot de passe" />
+                                            <input class="form-control" id="inputPassword" type="password" placeholder="Mot de passe" />
-                                                <label for="inputPassword">Mot de passe</label>
+                                            <label for="inputPassword">Mot de passe</label>
-                                            </div>
+                                        </div>
-                                            <div class="form-check mb-3">
+                                        <div class="form-check mb-3">
-                                                <input class="form-check-input" id="inputRememberPassword" type="checkbox" value="" />
+                                            <input class="form-check-input" id="inputRememberPassword" type="checkbox" value="" />
-                                                <label class="form-check-label" for="inputRememberPassword">Mémoriser le mot de passe</label>
+                                            <label class="form-check-label" for="inputRememberPassword">Mémoriser le mot de passe</label>
-                                            </div>
+                                        </div>
-                                            <div class="d-flex align-items-center justify-content-between mt-4 mb-0">
+                                        <div class="d-flex align-items-center justify-content-between mt-4 mb-0">
-                                                <a class="small" href="password.html">Mot de passe oublié ?</a>
+                                            <a class="small" href="password.html">Mot de passe oublié ?</a>
-                                                <a class="btn btn-primary" href="index.html">Se connecter</a>
+                                            <a class="btn btn-primary" href="index.html">Se connecter</a>
-                                            </div>
+                                        </div>
-                                        </form>
+                                    </form>
-                                    </div>
+                                </div>
-                                    <div class="card-footer text-center py-3">
+                                <div class="card-footer text-center py-3">
-                                        <div class="small"><a href="register.html">Besoin d'un compte ? Inscrivez-vous !</a></div>
+                                    <div class="small"><a href="register.html">Besoin d'un compte ? Inscrivez-vous !</a></div>
-                                    </div>
                                 </div>
                             </div>
                         </div>
                     </div>
-                    {% endblock %}
+                </div>
-                </main>
+            {% endblock %}
-            </div>
+        </main>
-            <div id="layoutAuthentication_footer">
+    </div>
-                <footer class="py-4 bg-light mt-auto">
+    <div id="layoutAuthentication_footer">
-                    <div class="container-fluid px-4">
+        <footer class="py-4 bg-light mt-auto">
-                        <div class="d-flex align-items-center justify-content-between small">
+            <div class="container-fluid px-4">
-                            <div class="text-muted">Copyright &copy; HeartTrack 2023</div>
+                <div class="d-flex align-items-center justify-content-between small">
-                            <div>
+                    <div class="text-muted">Copyright &copy; HeartTrack 2023</div>
-                                <a href="#">Politique de confidentialité</a>
+                    <div>
-                                &middot;
+                        <a href="#">Politique de confidentialité</a>
-                                <a href="#">Termes &amp; Conditions d'utilisations</a>
+                        &middot;
-                            </div>
+                        <a href="#">Termes &amp; Conditions d'utilisations</a>
-                        </div>
                     </div>
-                </footer>
+                </div>
             </div>
-        </div>
+        </footer>
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
+    </div>
-        <script src="js/scripts.js"></script>
+</div>
-    </body>
+<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
+<script src="js/scripts.js"></script>
+</body>
 </html>

Sources/src/app/views/Templates/base.html.twig

@@ -8,7 +8,7 @@
         <meta name="author" content="PINAGOT Antoine" />
         <title>{% block title %}{% endblock %}</title>
         <link href="https://cdn.jsdelivr.net/npm/simple-datatables@7.1.2/dist/style.min.css" rel="stylesheet" />
-        <link href="/css/{% block css %}style{% endblock %}.css" rel="stylesheet" />
+        <link href="/css/{% block css %}styles{% endblock %}.css" rel="stylesheet" />
         <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
     </head>
 <body class="sb-nav-fixed">
@@ -35,7 +35,7 @@
                         <li><a class="dropdown-item" href="/profile">Profile</a></li>
                         <li><a class="dropdown-item" href="/settings">Paramètres</a></li>
                         <li><hr class="dropdown-divider" /></li>
-                        <li><a class="dropdown-item" href="/logout">Déconnexion</a></li>
+                        <li><a class="dropdown-item" href="/">Déconnexion</a></li>
                     </ul>
                 </li>
             </ul>
@@ -46,7 +46,7 @@
                     <div class="sb-sidenav-menu">
                         <div class="nav">
                             <div class="sb-sidenav-menu-heading">Menu</div>
-                            <a class="nav-link" href="/">
+                            <a class="nav-link" href="/home">
                                 <div class="sb-nav-link-icon"><img src="/assets/img/house.png"></div>
                                 Accueil
                             </a>

Sources/src/app/views/Templates/page/index.html

@@ -1 +1,292 @@
-<a  href="/log">Se connecter</button>
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+        <meta name="description" content="index page du site web" />
+        <meta name="author" content="PINAGOT Antoine" />
+        <title>HeartTrack - Getting Started</title>
+        <link rel="icon" type="image/x-icon" href="assets/favicon.ico" />
+        <!-- Bootstrap icons-->
+        <link href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.5.0/font/bootstrap-icons.css" rel="stylesheet" />
+        <!-- Google fonts-->
+        <link rel="preconnect" href="https://fonts.gstatic.com" />
+        <link href="https://fonts.googleapis.com/css2?family=Newsreader:ital,wght@0,600;1,600&amp;display=swap" rel="stylesheet" />
+        <link href="https://fonts.googleapis.com/css2?family=Mulish:ital,wght@0,300;0,500;0,600;0,700;1,300;1,500;1,600;1,700&amp;display=swap" rel="stylesheet" />
+        <link href="https://fonts.googleapis.com/css2?family=Kanit:ital,wght@0,400;1,400&amp;display=swap" rel="stylesheet" />
+        <!-- Core theme CSS (includes Bootstrap)-->
+        <link href="css/styles2.css" rel="stylesheet" />
+    </head>
+    <body id="page-top">
+        <!-- Navigation-->
+        <nav class="navbar navbar-expand-lg navbar-light fixed-top shadow-sm" id="mainNav">
+            <div class="container px-5">
+                <a class="navbar-brand fw-bold" href="/">HeartTrack</a>
+                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
+                    Menu
+                    <i class="bi-list"></i>
+                </button>
+                <div class="collapse navbar-collapse" id="navbarResponsive">
+                    <ul class="navbar-nav ms-auto me-4 my-3 my-lg-0">
+                        <li class="nav-item"><a class="nav-link me-lg-3" href="/log">Se connecter</a></li>
+                        <li class="nav-item"><a class="nav-link me-lg-3" href="/regist">S'inscire</a></li>
+                    </ul>
+                    <button class="btn btn-primary rounded-pill px-3 mb-2 mb-lg-0" data-bs-toggle="modal" data-bs-target="#feedbackModal">
+                        <span class="d-flex align-items-center">
+                            <i class="bi-chat-text-fill me-2"></i>
+                            <span class="small">Donnez votre avis</span>
+                        </span>
+                    </button>
+                </div>
+            </div>
+        </nav>
+        <!-- Mashead header-->
+        <header class="masthead">
+            <div class="container px-5">
+                <div class="row gx-5 align-items-center">
+                    <div class="col-lg-6">
+                        <!-- Mashead text and app badges-->
+                        <div class="mb-5 mb-lg-0 text-center text-lg-start">
+                            <h1 class="display-1 lh-1 mb-3">HeartTrack pour mobile !</h1>
+                            <p class="lead fw-normal text-muted mb-5">Une application pour suivre vos analyses en direct, est en cours de développement.</p>
+                            <!-- <div class="d-flex flex-column flex-lg-row align-items-center">
+                                <a class="me-lg-3 mb-4 mb-lg-0" href="#!"><img class="app-badge" src="assets/img/google-play-badge.svg" alt="..." /></a>
+                                <a href="#!"><img class="app-badge" src="assets/img/app-store-badge.svg" alt="..." /></a>
+                            </div> -->
+                        </div>
+                    </div>
+                    <div class="col-lg-6">
+                        <!-- Masthead device mockup feature-->
+                        <div class="masthead-device-mockup">
+                            <svg class="circle" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+                                <defs>
+                                    <linearGradient id="circleGradient" gradientTransform="rotate(45)">
+                                        <stop class="gradient-start-color" offset="0%"></stop>
+                                        <stop class="gradient-end-color" offset="100%"></stop>
+                                    </linearGradient>
+                                </defs>
+                                <circle cx="50" cy="50" r="50"></circle></svg
+                            ><svg class="shape-1 d-none d-sm-block" viewBox="0 0 240.83 240.83" xmlns="http://www.w3.org/2000/svg">
+                                <rect x="-32.54" y="78.39" width="305.92" height="84.05" rx="42.03" transform="translate(120.42 -49.88) rotate(45)"></rect>
+                                <rect x="-32.54" y="78.39" width="305.92" height="84.05" rx="42.03" transform="translate(-49.88 120.42) rotate(-45)"></rect></svg
+                            ><svg class="shape-2 d-none d-sm-block" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><circle cx="50" cy="50" r="50"></circle></svg>
+                            <div class="device-wrapper">
+                                <div class="device" data-device="iPhoneX" data-orientation="portrait" data-color="black">
+                                    <div class="screen bg-black">
+                                        <!-- PUT CONTENTS HERE:-->
+                                        <!-- * * This can be a video, image, or just about anything else.-->
+                                        <!-- * * Set the max width of your media to 100% and the height to-->
+                                        <!-- * * 100% like the demo example below.-->
+                                        <video muted="muted" autoplay="" loop="" style="max-width: 100%; height: 100%"><source src="assets/img/demo-screen.mp4" type="video/mp4" /></video>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </header>
+        <!-- Quote/testimonial aside-->
+        <aside class="text-center bg-gradient-primary-to-secondary">
+            <div class="container px-5">
+                <div class="row gx-5 justify-content-center">
+                    <div class="col-xl-8">
+                        <div class="h2 fs-1 text-white mb-4">"Une solution gratuite pour analyser vos données de fréquences cardiaques !"</div>
+                        <img src="assets/img/tnw-logo.svg" alt="..." style="height: 3rem" />
+                    </div>
+                </div>
+            </div>
+        </aside>
+        <!-- App features section-->
+        <section id="features">
+            <div class="container px-5">
+                <div class="row gx-5 align-items-center">
+                    <div class="col-lg-8 order-lg-1 mb-5 mb-lg-0">
+                        <div class="container-fluid px-5">
+                            <div class="row gx-5">
+                                <div class="col-md-6 mb-5">
+                                    <!-- Feature item-->
+                                    <div class="text-center">
+                                        <i class="bi-phone icon-feature text-gradient d-block mb-3"></i>
+                                        <h3 class="font-alt">Web/Mobile</h3>
+                                        <p class="text-muted mb-0">Gardez les informations tant bien dans l'application que sur le site web avec la synchronisation des données !</p>
+                                    </div>
+                                </div>
+                                <div class="col-md-6 mb-5">
+                                    <!-- Feature item-->
+                                    <div class="text-center">
+                                        <i class="bi-cast icon-feature text-gradient d-block mb-3"></i>
+                                        <h3 class="font-alt">Importez vos données</h3>
+                                        <p class="text-muted mb-0">Importez vos données directement depuis un fichier .FIT !</p>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-md-6 mb-5 mb-md-0">
+                                    <!-- Feature item-->
+                                    <div class="text-center">
+                                        <i class="bi-gift icon-feature text-gradient d-block mb-3"></i>
+                                        <h3 class="font-alt">Gratuit</h3>
+                                        <p class="text-muted mb-0">Ce site et cette application sont entièrement gratuites !</p>
+                                    </div>
+                                </div>
+                                <div class="col-md-6">
+                                    <!-- Feature item-->
+                                    <div class="text-center">
+                                        <i class="bi-patch-check icon-feature text-gradient d-block mb-3"></i>
+                                        <h3 class="font-alt">Open Source</h3>
+                                        <p class="text-muted mb-0">Ce projet est fait en Open Source, tout le monde peut y accéder !</p>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="col-lg-4 order-lg-0">
+                        <!-- Features section device mockup-->
+                        <div class="features-device-mockup">
+                            <svg class="circle" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+                                <defs>
+                                    <linearGradient id="circleGradient" gradientTransform="rotate(45)">
+                                        <stop class="gradient-start-color" offset="0%"></stop>
+                                        <stop class="gradient-end-color" offset="100%"></stop>
+                                    </linearGradient>
+                                </defs>
+                                <circle cx="50" cy="50" r="50"></circle></svg
+                            ><svg class="shape-1 d-none d-sm-block" viewBox="0 0 240.83 240.83" xmlns="http://www.w3.org/2000/svg">
+                                <rect x="-32.54" y="78.39" width="305.92" height="84.05" rx="42.03" transform="translate(120.42 -49.88) rotate(45)"></rect>
+                                <rect x="-32.54" y="78.39" width="305.92" height="84.05" rx="42.03" transform="translate(-49.88 120.42) rotate(-45)"></rect></svg
+                            ><svg class="shape-2 d-none d-sm-block" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg"><circle cx="50" cy="50" r="50"></circle></svg>
+                            <div class="device-wrapper">
+                                <div class="device" data-device="iPhoneX" data-orientation="portrait" data-color="black">
+                                    <div class="screen bg-black">
+                                        <!-- PUT CONTENTS HERE:-->
+                                        <!-- * * This can be a video, image, or just about anything else.-->
+                                        <!-- * * Set the max width of your media to 100% and the height to-->
+                                        <!-- * * 100% like the demo example below.-->
+                                        <video muted="muted" autoplay="" loop="" style="max-width: 100%; height: 100%"><source src="assets/img/demo-screen.mp4" type="video/mp4" /></video>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </section>
+        <!-- Basic features section-->
+        <section class="bg-light">
+            <div class="container px-5">
+                <div class="row gx-5 align-items-center justify-content-center justify-content-lg-between">
+                    <div class="col-12 col-lg-5">
+                        <h2 class="display-4 lh-1 mb-4">Fonctionnalité supplémentaire de notre application</h2>
+                        <p class="lead fw-normal text-muted mb-5 mb-lg-0">Notre application propose un service de coaching personnalisé en fonction du besoin que vous avez en tant qu'athelète. Vous pouvez aussi fournir un service de coaching aux autres utilisateurs en vous inscrivant en tant que coach sportif.</p>
+                    </div>
+                    <div class="col-sm-8 col-md-6">
+                        <div class="px-5 px-sm-0"><img class="img-fluid rounded-circle" src="./assets/img/bg1.png" alt="..." /></div>
+                    </div>
+                </div>
+            </div>
+        </section>
+        <!-- Call to action section-->
+        <section class="cta">
+            <div class="cta-content">
+                <div class="container px-5">
+                    <h2 class="text-white display-1 lh-1 mb-4">
+                        Arrêtez d'attendre...
+                        <br />
+                        Inscrivez-vous !
+                    </h2>
+                    <!-- <a class="btn btn-outline-light py-3 px-4 rounded-pill" href="#" target="_blank">Download for free</a> -->
+                </div>
+            </div>
+        </section>
+        <!-- App badge section-->
+        <section class="bg-gradient-primary-to-secondary" id="download">
+            <div class="container px-5">
+                <h2 class="text-center text-white font-alt mb-4">Application bientôt disponible !</h2>
+                <!-- <div class="d-flex flex-column flex-lg-row align-items-center justify-content-center">
+                    <a class="me-lg-3 mb-4 mb-lg-0" href="#!"><img class="app-badge" src="assets/img/google-play-badge.svg" alt="..." /></a>
+                    <a href="#!"><img class="app-badge" src="assets/img/app-store-badge.svg" alt="..." /></a>
+                </div> -->
+            </div>
+        </section>
+        <!-- Footer-->
+        <footer class="bg-black text-center py-5">
+            <div class="container px-5">
+                <div class="text-white-50 small">
+                    <div class="mb-2">&copy; HeartTrack 2023. Tous droits réservé.</div>
+                    <a href="#!">Politique de confidentialité</a>
+                    <span class="mx-1">&middot;</span>
+                    <a href="#!">Termes & Conditions d'utilisation</a>
+                </div>
+            </div>
+        </footer>
+        <!-- Feedback Modal-->
+        <div class="modal fade" id="feedbackModal" tabindex="-1" aria-labelledby="feedbackModalLabel" aria-hidden="true">
+            <div class="modal-dialog modal-dialog-centered">
+                <div class="modal-content">
+                    <div class="modal-header bg-gradient-primary-to-secondary p-4">
+                        <h5 class="modal-title font-alt text-white" id="feedbackModalLabel">Envoyez votre avis</h5>
+                        <button class="btn-close btn-close-white" type="button" data-bs-dismiss="modal" aria-label="Close"></button>
+                    </div>
+                    <div class="modal-body border-0 p-4">
+                        <!-- * * * * * * * * * * * * * * *-->
+                        <!-- * * SB Forms Contact Form * *-->
+                        <!-- * * * * * * * * * * * * * * *-->
+                        <!-- This form is pre-integrated with SB Forms.-->
+                        <!-- To make this form functional, sign up at-->
+                        <!-- https://startbootstrap.com/solution/contact-forms-->
+                        <!-- to get an API token!-->
+                        <form id="contactForm" data-sb-form-api-token="API_TOKEN">
+                            <!-- Name input-->
+                            <div class="form-floating mb-3">
+                                <input class="form-control" id="name" type="text" placeholder="Entrez votre nom complet..." data-sb-validations="required" />
+                                <label for="name">Nom complet</label>
+                                <div class="invalid-feedback" data-sb-feedback="name:required">Un nom est requis.</div>
+                            </div>
+                            <!-- Email address input-->
+                            <div class="form-floating mb-3">
+                                <input class="form-control" id="email" type="email" placeholder="nom@exemple.com" data-sb-validations="required,email" />
+                                <label for="email">Adresse email</label>
+                                <div class="invalid-feedback" data-sb-feedback="email:required">Adresse email requis.</div>
+                                <div class="invalid-feedback" data-sb-feedback="email:email">L'adresse email n'est pas valide.</div>
+                            </div>
+                            <!-- Phone number input-->
+                            <div class="form-floating mb-3">
+                                <input class="form-control" id="phone" type="tel" placeholder="06 12 34 56 78" data-sb-validations="required" />
+                                <label for="phone">Numéro de téléphone</label>
+                                <div class="invalid-feedback" data-sb-feedback="phone:required">Numéro de téléphone requis.</div>
+                            </div>
+                            <!-- Message input-->
+                            <div class="form-floating mb-3">
+                                <textarea class="form-control" id="message" type="text" placeholder="Entrez votre message..." style="height: 10rem" data-sb-validations="required"></textarea>
+                                <label for="message">Message</label>
+                                <div class="invalid-feedback" data-sb-feedback="message:required">Un message est requis.</div>
+                            </div>
+                            <!-- Submit success message-->
+                            <!---->
+                            <!-- This is what your users will see when the form-->
+                            <!-- has successfully submitted-->
+                            <div class="d-none" id="submitSuccessMessage">
+                                <div class="text-center mb-3">
+                                    <div class="fw-bolder">Avis envoyé !</div>
+                                </div>
+                            </div>
+                            <!-- Submit error message-->
+                            <!---->
+                            <!-- This is what your users will see when there is-->
+                            <!-- an error submitting the form-->
+                            <div class="d-none" id="submitErrorMessage"><div class="text-center text-danger mb-3">Erreur du formulaire !</div></div>
+                            <!-- Submit Button-->
+                            <div class="d-grid"><button class="btn btn-primary rounded-pill btn-lg disabled" id="submitButton" type="submit">Envoyer</button></div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- Bootstrap core JS-->
+        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js"></script>
+        <!-- Core theme JS-->
+        <script src="js/scripts2.js"></script>
+        <script src="https://cdn.startbootstrap.com/sb-forms-latest.js"></script>
+    </body>
+</html>

Sources/src/app/views/Templates/page/login.html.twig

@@ -25,13 +25,13 @@
                                                 <label class="form-check-label" for="inputRememberPassword">Mémoriser le mot de passe</label>
                                             </div>
                                             <div class="d-flex align-items-center justify-content-between mt-4 mb-0">
-                                                <a class="small" href="password.html">Mot de passe oublié ?</a>
+                                                <a class="small" href="/pass">Mot de passe oublié ?</a>
-                                                <a class="btn btn-primary" href="index.html">Se connecter</a>
+                                                <a class="btn btn-primary" href="/home">Se connecter</a>
                                             </div>
                                         </form>
                                     </div>
                                     <div class="card-footer text-center py-3">
-                                        <div class="small"><a href="register.html">Besoin d'un compte ? Inscrivez-vous !</a></div>
+                                        <div class="small"><a href="/regist">Besoin d'un compte ? Inscrivez-vous !</a></div>
                                     </div>
                                 </div>
                             </div>

Sources/src/app/views/Templates/page/password.html.twig

@@ -19,7 +19,7 @@
                                             </div>
                                             <div class="d-flex align-items-center justify-content-between mt-4 mb-0">
                                                 <a class="small" href="/log">Retour à la connexion</a>
-                                                <button class="btn btn-primary" type="submit">Réinitialiser votre mot de passe</a>
+                                                <button class="btn btn-primary" type="submit">Réinitialiser votre mot de passe</button>
                                             </div>
                                         </form>
                                     </div>

Sources/src/app/views/Templates/page/register.html.twig

@@ -81,12 +81,12 @@
                                                 </div>
                                             </div>
                                             <div class="mt-4 mb-0">
-                                                <div class="d-grid"><a class="btn btn-primary btn-block" href="login.html.twig">Créer un compte</a></div>
+                                                <div class="d-grid"><a class="btn btn-primary btn-block" href="/log">Créer un compte</a></div>
                                             </div>
                                         </form>
                                     </div>
                                     <div class="card-footer text-center py-3">
-                                        <div class="small"><a href="login.html.twig">Avez-vous déjà un compte ? Connectez-vous ?</a></div>
+                                        <div class="small"><a href="/log">Avez-vous déjà un compte ? Connectez-vous ?</a></div>
                                     </div>
                                 </div>
                             </div>

Sources/src/data/core/database/ActiviteGateway.php

@@ -1,38 +1,39 @@
 <?php
 
 namespace Database;
+use \PDO;
 
-class ActiviteGateway {
+class ActivityGateway {
-    private $connection;
+    private Connexion $connection;
 
-    public function __construct(Connection $connection) {
+    public function __construct(Connexion $connection) {
         $this->connection = $connection;
     }
 
-    public function getActivite() {
+    public function getActivity() {
         $query = "SELECT * FROM Activite";
         return $this->connection->executeWithErrorHandling($query);
     }
 
-    public function getActiviteById(int $activiteId) {
+    public function getActivityById(int $activityId) {
         $query = "SELECT * FROM Activite WHERE idActivite = :id";
-        $params = [':id' => [$activiteId, PDO::PARAM_INT]];
+        $params = [':id' => [$activityId, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActiviteByType(string $type) {
+    public function getActivityByType(string $type) {
         $query = "SELECT * FROM Activite WHERE type = :type";
         $params = [':type' => [$type, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActiviteByDate(string $date) {
+    public function getActivityByDate(string $date) {
         $query = "SELECT * FROM Activite WHERE date = :date";
         $params = [':date' => [$date, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActiviteByTimeRange(string $startTime, string $endTime) {
+    public function getActivityByTimeRange(string $startTime, string $endTime) {
         $query = "SELECT * FROM Activite WHERE heureDebut >= :startTime AND heureFin <= :endTime";
         $params = [
             ':startTime' => [$startTime, PDO::PARAM_STR],
@@ -41,76 +42,76 @@ class ActiviteGateway {
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActiviteByEffort(int $effortRessenti) {
+    public function getActivityByEffort(int $effortRessenti) {
         $query = "SELECT * FROM Activite WHERE effortRessenti = :effort";
         $params = [':effort' => [$effortRessenti, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActiviteByVariability(int $variabilite) {
+    public function getActivityByVariability(int $variabilite) {
         $query = "SELECT * FROM Activite WHERE variabilite = :variability";
         $params = [':variability' => [$variabilite, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getActiviteByTemperature(int $temperatureMoyenne) {
+    public function getActivityByTemperature(int $temperatureMoyenne) {
         $query = "SELECT * FROM Activite WHERE temperatureMoyenne = :temperature";
         $params = [':temperature' => [$temperatureMoyenne, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function addActivite(ActiviteEntity $activite) {
+    public function addActivity(ActivityEntity $activity) {
         $query = "INSERT INTO Activite (type, date, heureDebut, heureDeFin, effortRessenti, variabilite, variance, ecartType, moyenne, maximum, minimum, temperatureMoyenne) 
                   VALUES (:type, :date, :heureDebut, :heureDeFin, :effortRessenti, :variabilite, :variance, :ecartType, :moyenne, :maximum, :minimum, :temperatureMoyenne)";
 
         $params = [
-            ':type' => $activite->getType(),
+            ':type' => $activity->getType(),
-            ':date' => $activite->getDate()->format('Y-m-d'), // Format date pour SQL
+            ':date' => $activity->getDate()->format('Y-m-d'), // Format date pour SQL
-            ':heureDebut' => $activite->getHeureDebut()->format('H:i:s'), // Format heure pour SQL
+            ':heureDebut' => $activity->getHeureDebut()->format('H:i:s'), // Format heure pour SQL
-            ':heureDeFin' => $activite->getHeureFin()->format('H:i:s'), // Format heure pour SQL
+            ':heureDeFin' => $activity->getHeureFin()->format('H:i:s'), // Format heure pour SQL
-            ':effortRessenti' => $activite->getEffortRessenti(),
+            ':effortRessenti' => $activity->getEffortRessenti(),
-            ':variabilite' => $activite->getVariabilite(),
+            ':variabilite' => $activity->getVariabilite(),
-            ':variance' => $activite->getVariance(),
+            ':variance' => $activity->getVariance(),
-            ':ecartType' => $activite->getEcartType(),
+            ':ecartType' => $activity->getEcartType(),
-            ':moyenne' => $activite->getMoyenne(),
+            ':moyenne' => $activity->getMoyenne(),
-            ':maximum' => $activite->getMaximum(),
+            ':maximum' => $activity->getMaximum(),
-            ':minimum' => $activite->getMinimum(),
+            ':minimum' => $activity->getMinimum(),
-            ':temperatureMoyenne' => $activite->getTemperatureMoyenne(),
+            ':temperatureMoyenne' => $activity->getTemperatureMoyenne(),
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function updateActivite(ActiviteEntity $oldActivite, ActiviteEntity $newActivite) {
+    public function updateActivity(ActivityEntity $oldActivity, ActivityEntity $newActivity) {
         $query = "UPDATE Activite
                   SET type = :type, date = :date, heureDebut = :heureDebut, heureDeFin = :heureDeFin,
                   effortRessenti = :effortRessenti, variabilite = :variabilite, variance = :variance, ecartType = :ecartType, moyenne = :moyenne, maximum = :maximum, minimum = :minimum, temperatureMoyenne = :temperatureMoyenne
                   WHERE idActivite = :idActivite";
 
         $params = [
-            ':idActivite' => $oldActivite->getIdActivite(),
+            ':idActivite' => $oldActivity->getIdActivity(),
-            ':type' => $newActivite->getType(),
+            ':type' => $newActivity->getType(),
-            ':date' => $newActivite->getDate()->format('Y-m-d'), // Format date pour SQL
+            ':date' => $newActivity->getDate()->format('Y-m-d'), // Format date pour SQL
-            ':heureDebut' => $newActivite->getHeureDebut()->format('H:i:s'), // Format heure pour SQL
+            ':heureDebut' => $newActivity->getHeureDebut()->format('H:i:s'), // Format heure pour SQL
-            ':heureDeFin' => $newActivite->getHeureFin()->format('H:i:s'), // Format heure pour SQL
+            ':heureDeFin' => $newActivity->getHeureFin()->format('H:i:s'), // Format heure pour SQL
-            ':effortRessenti' => $newActivite->getEffortRessenti(),
+            ':effortRessenti' => $newActivity->getEffortRessenti(),
-            ':variabilite' => $newActivite->getVariabilite(),
+            ':variabilite' => $newActivity->getVariabilite(),
-            ':variance' => $newActivite->getVariance(),
+            ':variance' => $newActivity->getVariance(),
-            ':ecartType' => $newActivite->getEcartType(),
+            ':ecartType' => $newActivity->getEcartType(),
-            ':moyenne' => $newActivite->getMoyenne(),
+            ':moyenne' => $newActivity->getMoyenne(),
-            ':maximum' => $newActivite->getMaximum(),
+            ':maximum' => $newActivity->getMaximum(),
-            ':minimum' => $newActivite->getMinimum(),
+            ':minimum' => $newActivity->getMinimum(),
-            ':temperatureMoyenne' => $newActivite->getTemperatureMoyenne(),
+            ':temperatureMoyenne' => $newActivity->getTemperatureMoyenne(),
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function deleteActivite(int $idActivite) {
+    public function deleteActivity(int $idActivity) {
-        $query = "DELETE FROM Activite WHERE idActivite = :idActivite";
+        $query = "DELETE FROM Activite WHERE idActivite = :idActivity";
 
         $params = [
-            ':idActivite' => $idActivite,
+            ':idActivity' => $idActivity,
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);

Sources/src/data/core/database/ActiviteMapper.php

@@ -1,34 +1,81 @@
 <?php
 
 namespace Database;
-use Model\Activite;
+use Model\Activity;
-
+
-class ActiviteMapper {
+class ActivityMapper {
-    public function map(array $data):ActiviteEntity {
+    public function activitySqlToEntity(array $data):array
-        $activite = new ActiviteEntity();
+    {
-        $activite->setIdActivite($data['idActivite']);
+        $activityEntities = [];
-        $activite->setType($data['type']);
+
-        $activite->setDate($data['date']);
+        foreach ($data as $activityData) {
-        $activite->setHeureDebut($data['heureDebut']);
+            $activity = new ActivityEntity();
-        $activite->setHeureFin($data['heureFin']);
+
-        $activite->setEffortRessenti($data['effortRessenti']);
+            if (isset($activityData['idActivity'])) {
-        $activite->setVariabilite($data['variabilite']);
+                $activity->setIdActivity($data['idActivity']);
-        $activite->setVariance($data['variance']);
+            }
-        $activite->setEcartType($data['ecartType']);
+
-        $activite->setMoyenne($data['moyenne']);
+            if (isset($activityData['type'])) {
-        $activite->setMaximum($data['maximum']);
+                $activity->setType($data['type']);
-        $activite->setMinimum($data['minimum']);
+            }
-        $activite->setTemperatureMoyenne($data['temperatureMoyenne']);
+
-
+            if (isset($activityData['date'])) {
-        return $activite;
+                $activity->setDate($data['date']);
-    }
+            }
+
+            if (isset($activityData['heureDebut'])) {
+                $activity->setHeureDebut($data['heureDebut']);
+            }
+
+            if (isset($activityData['heureFin'])) {
+                $activity->setHeureFin($data['heureFin']);
+            }
+
+            if (isset($activityData['effortRessenti'])) {
+                $activity->setEffortRessenti($data['effortRessenti']);
+            }
+
+            if (isset($activityData['variabilite'])) {
+                $activity->setVariabilite($data['variabilite']);
+            }
+
+            if (isset($activityData['variance'])) {
+                $activity->setVariance($data['variance']);
+            }
+
+            if (isset($activityData['ecartType'])) {
+                $activity->setEcartType($data['ecartType']);
+            }
 
-    //public function ActiviteEntityToModel(ActiviteEntity entity): Activite;
+            if (isset($activityData['moyenne'])) {
+                $activity->setMoyenne($data['moyenne']);
+            }
 
-    public function ActiviteEntityToModel(ActiviteEntity $activiteEntity):Activite{
+            if (isset($activityData['maximum'])) {
+                $activity->setMaximum($data['maximum']);
+            }
 
-        $act = new Activite(
+            if (isset($activityData['minimum'])) {
-            $activiteEntity->getIdActivite(),
+                $activity->setMinimum($data['minimum']);
+            }
+
+            if (isset($activityData['temperatureMoyenne'])) {
+                $activity->setTemperatureMoyenne($data['temperatureMoyenne']);
+            }
+
+            $activityEntities[] = $activity;
+        }
+
+        return $activityEntities;
+    }
+
+    /**
+     * @throws \Exception
+     */
+    public function ActivityEntityToModel(ActivityEntity $activiteEntity):Activity{
+
+        $act = new Activity(
+            $activiteEntity->getIdActivity(),
             $activiteEntity->getType(),
             $activiteEntity->getDate(),
             $activiteEntity->getHeureDebut(),
@@ -45,7 +92,27 @@ class ActiviteMapper {
 
         return $act;
     }
-    //public function ActiviteToEntity(Activite model): ActiviteEntity;
+    //public function ActivityToEntity(Activity model): ActivityEntity;
+
+    public function activityToEntity(Activity $act):ActivityEntity{
+
+        $act = new ActivityEntity();
+        $act->setIdActivity($act->getIdActivity()());
+        $act->setType($act->getType());
+        $act->setDate($act->getDate());
+        $act->setHeureDebut($act->getHeureDebut());
+        $act->setHeureFin($act->getHeureFin());
+        $act->setEffortRessenti($act->getEffortRessenti());
+        $act->setVariabilite($act->getVariabilite());
+        $act->setVariance($act->getVariance());
+        $act->setEcartType($act->getEcartType());
+        $act->setMoyenne($act->getMoyenne());
+        $act->setMaximum($act->getMaximum());
+        $act->setMinimum($act->getMinimum());
+        $act->setTemperatureMoyenne($act->getTemperatureMoyenne());
+
+        return $act;
+    }
 }
 
 ?>

Sources/src/data/core/database/ActivityEntity.php

@@ -2,8 +2,8 @@
 
 namespace Database;
 
-class ActiviteEntity {
+class ActivityEntity {
-    private $idActivite;
+    private $idActivity;
     private $type;
     private $date;
     private $heureDebut;
@@ -18,7 +18,7 @@ class ActiviteEntity {
     private $temperatureMoyenne;
 
     // Getters
-    public function getIdActivite() {
+    public function getIdActivity() {
         return $this->idActivity;
     }
 
@@ -71,7 +71,7 @@ class ActiviteEntity {
     }
 
     // Setters
-    public function setIdActivite($idActivite) {
+    public function setIdActivity($idActivity) {
         $this->idActivity = $idActivity;
     }
 

Sources/src/data/core/database/AthleteEntity.php

@@ -12,6 +12,8 @@ class AthleteEntity {
     private $poids;
     private $motDePasse;
     private $dateNaissance;
+    private $isCoach;
+    private $coachId;
 
     // Getters
     public function getIdAthlete() {
@@ -50,6 +52,14 @@ class AthleteEntity {
         return $this->dateNaissance;
     }
 
+    public function getIsCoach(){
+        return $this->isCoach;
+    }
+
+    public function getCoachId(){
+        return $this->coachId;
+    }
+
     // Setters
     public function setIdAthlete($idAthlete) {
         $this->idAthlete = $idAthlete;
@@ -86,6 +96,14 @@ class AthleteEntity {
     public function setDateNaissance($dateNaissance) {
         $this->dateNaissance = $dateNaissance;
     }
+
+    public function setIsCoach($isCoach){
+        $this->isCoach = $isCoach;
+    }
+
+    public function setCoachId($coachId){
+        $this->coachId = $coachId;
+    }
 }
 
 ?>

Sources/src/data/core/database/AthleteGateway.php

@@ -4,68 +4,97 @@ namespace Database;
 use \PDO;
 
 class AthleteGateway {
-    private $connection;
+    private Connexion $connection;
 
     public function __construct(Connexion $connection) {
         $this->connection = $connection;
     }
 
-    public function getAthlete() {
+    public function getAthlete(): array
+    {
         $query = "SELECT * FROM Athlete";
         return $this->connection->executeWithErrorHandling($query);
     }
 
-    public function getAthleteById(int $userId) {
+    public function getAthleteById(int $userId): array
+    {
         $query = "SELECT * FROM Athlete WHERE idAthlete = :id";
         $params = [':id' => [$userId, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByName(string $name) {
+    public function getAthleteByName(string $name): array
+    {
         $query = "SELECT * FROM Athlete WHERE nom = :name";
         $params = [':name' => [$name, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByFirstName(string $firstName) {
+    public function getAthleteByFirstName(string $firstName): array
+    {
         $query = "SELECT * FROM Athlete WHERE prenom = :firstName";
         $params = [':firstName' => [$firstName, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByEmail(string $email) {
+    public function getAthleteByEmail(string $email): array
+    {
         $query = "SELECT * FROM Athlete WHERE email = :email";
         $params = [':email' => [$email, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByGender(string $gender) {
+    public function getAthleteByGender(string $gender): array
+    {
         $query = "SELECT * FROM Athlete WHERE sexe = :gender";
         $params = [':gender' => [$gender, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByHeight(int $height) {
+    public function getAthleteByHeight(int $height): array
+    {
         $query = "SELECT * FROM Athlete WHERE taille = :height";
         $params = [':height' => [$height, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByWeight(int $weight) {
+    public function getAthleteByWeight(int $weight): array
+    {
         $query = "SELECT * FROM Athlete WHERE poids = :weight";
         $params = [':weight' => [$weight, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getAthleteByBirthDate(string $birthdate) {
+    public function getAthleteByBirthDate(string $birthdate): array
+    {
         $query = "SELECT * FROM Athlete WHERE dateNaissance = :birthdate";
         $params = [':birthdate' => [$birthdate, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function addAthlete(AthleteEntity $athlete) {
+    public function getAthleteByIsCoachTrue(): array
-        $query = "INSERT INTO Athlete (nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance) 
+    {
-                  VALUES (:nom, :prenom, :email, :sexe, :taille, :poids, :motDePasse, :dateNaissance)";
+        $query = "SELECT * FROM Athlete WHERE isCoach = TRUE";
+        return $this->connection->executeWithErrorHandling($query);
+    }
+
+    public function getAthleteByIsCoachFalse(): array
+    {
+        $query = "SELECT * FROM Athlete WHERE isCoach = FALSE";
+        return $this->connection->executeWithErrorHandling($query);
+    }
+
+    public function getAthleteByCoachId(int $coachId): array
+    {
+        $query = "SELECT * FROM Athlete WHERE coachId = :coachId";
+        $params = [':coachId' => [$coachId, PDO::PARAM_INT]];
+        return $this->connection->executeWithErrorHandling($query, $params);
+    }
+
+    public function addAthlete(AthleteEntity $athlete): array
+    {
+        $query = "INSERT INTO Athlete (nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance, isCoach, coachId) 
+                  VALUES (:nom, :prenom, :email, :sexe, :taille, :poids, :motDePasse, :dateNaissance, :isCoach, :coachId)";
 
         $params = [
             ':nom' => $athlete->getNom(),
@@ -75,16 +104,19 @@ class AthleteGateway {
             ':taille' => $athlete->getTaille(),
             ':poids' => $athlete->getPoids(),
             ':motDePasse' => $athlete->getMotDePasse(),
-            ':dateNaissance' => $athlete->getDateNaissance(), 
+            ':dateNaissance' => $athlete->getDateNaissance(),
+            ':isCoach' => $athlete->getIsCoach(),
+            ':coachId' => $athlete->getCoachId(),
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function updateAthlete(AthleteEntity $oldAthlete, AthleteEntity $newAthlete) {
+    public function updateAthlete(AthleteEntity $oldAthlete, AthleteEntity $newAthlete): array
+    {
         $query = "UPDATE Athlete 
                   SET nom = :nom, prenom = :prenom, email = :email, sexe = :sexe,
-                  taille = :taille, poids = :poids, motDePasse = :motDePasse, dateNaissance = :dateNaissance
+                  taille = :taille, poids = :poids, motDePasse = :motDePasse, dateNaissance = :dateNaissance, isCoach = :isCoach, coachId = :coachId
                   WHERE idAthlete = :idAthlete";
 
         $params = [
@@ -96,13 +128,16 @@ class AthleteGateway {
             ':taille' => $newAthlete->getTaille(),
             ':poids' => $newAthlete->getPoids(),
             ':motDePasse' => $newAthlete->getMotDePasse(),
-            ':dateNaissance' => $newAthlete->getDateNaissance(), 
+            ':dateNaissance' => $newAthlete->getDateNaissance(),
+            ':isCoach' => $athlete->getIsCoach(),
+            ':coachId' => $athlete->getCoachId(),
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function deleteAthlete(int $idAthlete) {
+    public function deleteAthlete(int $idAthlete): array
+    {
         $query = "DELETE FROM Athlete WHERE idAthlete = :idAthlete";
 
         $params = [

Sources/src/data/core/database/AthleteMapper.php

@@ -8,7 +8,7 @@ use Model\Role;
 use Model\Athlete;
 
 class AthleteMapper {
-    public function fromSqlToEntity(array $data): array {
+    public function athleteSqlToEntity(array $data): array {
         $athleteEntities = [];
 
         foreach ($data as $athleteData) {
@@ -49,6 +49,12 @@ class AthleteMapper {
             if (isset($athleteData['dateNaissance'])) {
                 $athlete->setDateNaissance($athleteData['dateNaissance']);
             }
+            if (isset($athleteData['isCoach'])) {
+                $athlete->setIsCoach($athleteData['isCoach']);
+            }
+            if (isset($athleteData['coachId'])) {
+                $athlete->setCoachId($athleteData['coachId']);
+            }
 
             $athleteEntities[] = $athlete;
         }
@@ -59,8 +65,8 @@ class AthleteMapper {
     public function athleteEntityToModel(AthleteEntity $athleteEntity): User {
         $role = new Athlete(); // Utilisez la classe Athlete
 
-        $dateSpecifique = $athleteEntity->getDateNaissance();
+        $dateSpecific = $athleteEntity->getDateNaissance();
-        $date = new DateTime($dateSpecifique);
+        $date = new DateTime($dateSpecific);
 
         $user = new User(
             $athleteEntity->getIdAthlete(),
@@ -71,6 +77,7 @@ class AthleteMapper {
             $athleteEntity->getSexe(),
             $athleteEntity->getTaille(),
             $athleteEntity->getPoids(),
+            $athleteEntity->getDateNaissance(),
             $date,
             $role
         );
@@ -90,6 +97,8 @@ class AthleteMapper {
         $ath->setPoids($user->getPoids());
         $ath->setMotDePasse($user->getMotDePasse());
         $ath->setDateNaissance($user->getDateNaissance());
+        $ath->setIsCoach(FALSE);
+        $ath->setCoachId(NULL);
 
         return $ath;
     }

Sources/src/data/core/database/CoachEntity.php

@@ -4,50 +4,15 @@ namespace Database;
 
 class CoachEntity {
     private $idCoach;
-    private $nom;
+    private $athleteId;
-    private $prenom;
-    private $email;
-    private $sexe;
-    private $taille;
-    private $poids;
-    private $motDePasse;
-    private $dateNaissance;
 
     // Getters
     public function getIdCoach() {
         return $this->idCoach;
     }
 
-    public function getNom() {
+    public function getAthleteId() {
-        return $this->nom;
+        return $this->athleteId;
-    }
-
-    public function getPrenom() {
-        return $this->prenom;
-    }
-
-    public function getEmail() {
-        return $this->email;
-    }
-
-    public function getSexe() {
-        return $this->sexe;
-    }
-
-    public function getTaille() {
-        return $this->taille;
-    }
-
-    public function getPoids() {
-        return $this->poids;
-    }
-
-    public function getMotDePasse() {
-        return $this->motDePasse;
-    }
-
-    public function getDateNaissance() {
-        return $this->dateNaissance;
     }
 
     // Setters
@@ -55,37 +20,10 @@ class CoachEntity {
         $this->idCoach = $idCoach;
     }
 
-    public function setNom($nom) {
+    public function setAthleteId($athleteId) {
-        $this->nom = $nom;
+        $this->athleteId = $athleteId;
     }
 
-    public function setPrenom($prenom) {
-        $this->prenom = $prenom;
-    }
-
-    public function setEmail($email) {
-        $this->email = $email;
-    }
-
-    public function setSexe($sexe) {
-        $this->sexe = $sexe;
-    }
-
-    public function setTaille($taille) {
-        $this->taille = $taille;
-    }
-
-    public function setPoids($poids) {
-        $this->poids = $poids;
-    }
-
-    public function setMotDePasse($motDePasse) {
-        $this->motDePasse = $motDePasse;
-    }
-
-    public function setDateNaissance($dateNaissance) {
-        $this->dateNaissance = $dateNaissance;
-    }
 }
 
 ?>

Sources/src/data/core/database/CoachGateway.php

@@ -10,93 +10,96 @@ class CoachGateway {
         $this->connection = $connection;
     }
 
-    public function getCoach() {
+    public function getCoach(): array
+    {
         $query = "SELECT * FROM Coach";
         return $this->connection->executeWithErrorHandling($query);
     }
 
-    public function getCoachById(int $userId) {
+    public function getCoachById(int $userId): array
+    {
         $query = "SELECT * FROM Coach WHERE idCoach = :id";
         $params = [':id' => [$userId, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByName(string $name) {
+    public function getAthleteByCoachId(int $coachId): array
-        $query = "SELECT * FROM Coach WHERE nom = :name";
+    {
+        $query = "SELECT * FROM Athlete a, Coach c WHERE a.coachId = :id AND a.isCoach = TRUE";
+        $params = [':id' => [$coachId, PDO::PARAM_INT]];
+        return $this->connection->executeWithErrorHandling($query, $params);
+    }
+
+    public function getCoachByName(string $name): array
+    {
+        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.nom = :name";
         $params = [':name' => [$name, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByFirstName(string $firstName) {
+    public function getCoachByFirstName(string $firstName): array
-        $query = "SELECT * FROM Coach WHERE prenom = :firstName";
+    {
+        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.prenom = :firstName";
         $params = [':firstName' => [$firstName, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByEmail(string $email) {
+    public function getCoachByEmail(string $email): array
-        $query = "SELECT * FROM Coach WHERE email = :email";
+    {
+        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.email = :email";
         $params = [':email' => [$email, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByGender(string $gender) {
+    public function getCoachByGender(string $gender): array
-        $query = "SELECT * FROM Coach WHERE sexe = :gender";
+    {
+        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.sexe = :gender";
         $params = [':gender' => [$gender, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByHeight(int $height) {
+    public function getCoachByHeight(int $height): array
-        $query = "SELECT * FROM Coach WHERE taille = :height";
+    {
+        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.taille = :height";
         $params = [':height' => [$height, PDO::PARAM_INT]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function getCoachByBirthDate(string $birthdate) {
+    public function getCoachByBirthDate(string $birthdate): array
-        $query = "SELECT * FROM Coach WHERE dateNaissance = :birthdate";
+    {
+        $query = "SELECT * FROM Coach c, Athlete a WHERE c.athleteId = a.idAthlete AND a.dateNaissance = :birthdate";
         $params = [':birthdate' => [$birthdate, PDO::PARAM_STR]];
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function addCoach(CoachEntity $coach) {
+    public function addCoach(CoachEntity $coach): array
-        $query = "INSERT INTO Coach (nom, prenom, email, sexe, taille, poids, motDePasse, dateNaissance) 
+    {
-                  VALUES (:nom, :prenom, :email, :sexe, :taille, :poids, :motDePasse, :dateNaissance)";
+        $query = "INSERT INTO Coach (athleteId) 
+                  VALUES (:athleteId)";
 
         $params = [
-            ':nom' => $coach->getNom(),
+            ':athleteId' => $coach->getAthleteId(),
-            ':prenom' => $coach->getPrenom(),
-            ':email' => $coach->getEmail(),
-            ':sexe' => $coach->getSexe(),
-            ':taille' => $coach->getTaille(),
-            ':poids' => $coach->getPoids(),
-            ':motDePasse' => $coach->getMotDePasse(),
-            ':dateNaissance' => $coach->getDateNaissance(), 
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function updateCoach(CoachEntity $oldCoach, CoachEntity $newCoach) {
+    public function updateCoach(CoachEntity $oldCoach, CoachEntity $newCoach): array
+    {
         $query = "UPDATE Coach 
-                  SET nom = :nom, prenom = :prenom, email = :email, sexe = :sexe,
+                  SET athleteId = :athleteId
-                  taille = :taille, poids = :poids, motDePasse = :motDePasse, dateNaissance = :dateNaissance
                   WHERE idCoach = :idCoach";
 
         $params = [
             ':idCoach' => $oldCoach->getIdCoach(),
-            ':nom' => $newCoach->getNom(),
+            ':athleteId' => $newCoach->getAthleteId(),
-            ':prenom' => $newCoach->getPrenom(),
-            ':email' => $newCoach->getEmail(),
-            ':sexe' => $newCoach->getSexe(),
-            ':taille' => $newCoach->getTaille(),
-            ':poids' => $newCoach->getPoids(),
-            ':motDePasse' => $newCoach->getMotDePasse(),
-            ':dateNaissance' => $newCoach->getDateNaissance(), 
         ];
 
         return $this->connection->executeWithErrorHandling($query, $params);
     }
 
-    public function deleteCoach(int $idCoach) {
+    public function deleteCoach(int $idCoach): array
+    {
         $query = "DELETE FROM Coach WHERE idCoach = :idCoach";
 
         $params = [

Sources/src/data/core/database/CoachMapper.php

@@ -1,6 +1,7 @@
 <?php
 
 namespace Database;
+use Model\CoachAthlete;
 use Model\User;
 use \PDO;
 use \DateTime;
@@ -8,34 +9,48 @@ use Model\Role;
 use Model\Coach;
 
 class CoachMapper {
-    public function map(array $data) {
+    public function coachSqlToEntity(array $data): array {
-        $coach = new CoachEntity();
+        $coachEntities = [];
-        $coach->setIdCoach($data['idCoach']);
+
-        $coach->setNom($data['nom']);
+        foreach ($data as $coachData) {
-        $coach->setPrenom($data['prenom']);
+            $coach = new CoachEntity();
-        $coach->setEmail($data['email']);
+
-        $coach->setSexe($data['sexe']);
+            if (isset($coachData['idCoach'])) {
-        $coach->setTaille($data['taille']);
+                $coach->setIdCoach($coachData['idCoach']);
-        $coach->setPoids($data['poids']);
+            }
-        $coach->setMotDePasse($data['motDePasse']);
+
-        $coach->setDateNaissance($data['dateNaissance']);
+            if (isset($coachData['athleteId'])) {
-        
+                $coach->setAthleteId($coachData['athleteId']);
-        return $coach;
+            }
+
+            $coachEntities[] = $coach;
+        }
+
+        return $coachEntities;
     }
 
     public function CoachEntityToModel(CoachEntity $coachEntity):User{
-        $role = "Coach";
+        $role = new CoachAthlete();
+
+        $idCoach = $coachEntity->getIdCoach();
+
+        $ath = getAthleteByCoachId($idCoach);
+        $athlete = athleteSqlToEntity($ath);
+
+        $dateSpecific = $athlete->getDateNaissance();
+        $date = new DateTime($dateSpecific);
 
         $user = new User(
             $coachEntity->getIdCoach(),
-            $coachEntity->getNom(),
+            $athlete->getNom(),
-            $coachEntity->getPrenom(),
+            $athlete->getPrenom(),
-            $coachEntity->getEmail(),
+            $athlete->getEmail(),
-            $coachEntity->getMotDePasse(),
+            $athlete->getMotDePasse(),
-            $coachEntity->getSexe(),
+            $athlete->getSexe(),
-            $coachEntity->getTaille(),
+            $athlete->getTaille(),
-            $coachEntity->getPoids(),
+            $athlete->getPoids(),
-            $coachEntity->getDateNaissance(),
+            $athlete->getDateNaissance(),
+            $date,
             $role
         );
 
@@ -46,17 +61,10 @@ class CoachMapper {
 
         $coach = new CoachEntity();
         $coach->setIdCoach($user->getId());
-        $coach->setNom($user->getNom());
+        $coach->setAthleteId($user->getId());
-        $coach->setPrenom($user->getPrenom());
-        $coach->setEmail($user->getEmail());
-        $coach->setSexe($user->getSexe());
-        $coach->setTaille($user->getTaille());
-        $coach->setPoids($user->getPoids());
-        $coach->setMotDePasse($user->getMotDePasse());
-        $coach->setDateNaissance($user->getDateNaissance());
 
         return $coach;
     }
 }
-
 ?>
+

Sources/src/data/model/manager/UserManager.php

@@ -91,7 +91,6 @@ class UserManager
         if (in_array($newFriend, $this->currentUser->getRole()->getUsersList())) {
             throw new \Exception("Already friend");
         }
-        var_dump("====================1=========================");
         if($this->relationshipService->sendRequest($this->currentUser, $newFriend)){
             return true;
         };

Sources/tests/GatewayTest.php

@@ -0,0 +1,217 @@
+<?php
+use PHPUnit\Framework\TestCase;
+
+
+//use Database\{Connexion, AthleteGateway,AthleteEntity};
+use Database\AthleteEntity;
+use Database\AthleteGateway;
+use Database\Connexion;
+use Database\AthleteMapper;
+use Database\CoachGateway;
+use Database\CoachEntity;
+use Database\CoachMapper;
+
+class GatewayTest extends TestCase {
+
+    //Partie concernant les Athlètes
+
+    public function testGetAthlete() {
+
+        //$dsn = "pgsql:host=londres;port=8888;dbname=dbkemonteiro2;user=kemonteiro2;password=Mdp";
+
+        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+        $username = "kemonteiro2";
+        $password = "#Phpmyadmin63";
+
+        $connexion = new Connexion($dsn,$username,$password);
+
+
+        $athleteGateway = new AthleteGateway($connexion);
+        $result = $athleteGateway->getAthlete();
+        //var_dump($result);
+    }
+
+    /* Fonctionne mais en commentaire pour pas add et del a chaque fois
+    public function testAddAthlete(){
+        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+        $username = "kemonteiro2";
+        $password = "#Phpmyadmin63";
+
+        $connexion = new Connexion($dsn,$username,$password);
+
+
+        $athleteGateway = new AthleteGateway($connexion);
+
+        $dateSpecifique = "2023-11-26";
+        $timestamp = strtotime($dateSpecifique);
+        $dateSQL = date("Y-m-d", $timestamp);
+
+        $athleteEntity = new AthleteEntity();
+        $athleteEntity->setNom('John');
+        $athleteEntity->setPrenom('Doe');
+        $athleteEntity->setIdAthlete(1234);
+        $athleteEntity->setEmail('kevin.monteiro@gmail.fr');
+        $athleteEntity->setSexe('H');
+        $athleteEntity->setTaille(169);
+        $athleteEntity->setPoids(69);
+        $athleteEntity->setMotDePasse('motdepasse');
+        $athleteEntity->setDateNaissance($dateSQL);
+
+        $result2 = $athleteGateway->addAthlete($athleteEntity);
+    }
+
+
+    public function testDeleteAthlete(){
+        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+        $username = "kemonteiro2";
+        $password = "#Phpmyadmin63";
+
+        $connexion = new Connexion($dsn,$username,$password);
+
+        $athleteGateway = new AthleteGateway($connexion);
+        $result = $athleteGateway->deleteAthlete( //idAthlete );
+        var_dump($result);
+
+    }*/
+
+    public function testUpdateAthlete(){
+        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+        $username = "kemonteiro2";
+        $password = "#Phpmyadmin63";
+
+        $connexion = new Connexion($dsn,$username,$password);
+
+        $athleteGateway = new AthleteGateway($connexion);
+
+        $dateSpecifique = "2004-08-26";
+        $timestamp = strtotime($dateSpecifique);
+        $dateSQL = date("Y-m-d", $timestamp);
+
+        $athleteEntity = new AthleteEntity();
+        $athleteEntity->setNom('John');
+        $athleteEntity->setPrenom('Doe');
+        $athleteEntity->setIdAthlete(13);
+        $athleteEntity->setEmail('kevin.monteiro@gmail.fr');
+        $athleteEntity->setSexe('H');
+        $athleteEntity->setTaille(169);
+        $athleteEntity->setPoids(69);
+        $athleteEntity->setMotDePasse('motdepasse');
+        $athleteEntity->setDateNaissance($dateSQL);
+        $athleteEntity->setIsCoach(FALSE);
+        $athleteEntity->setCoachId(NULL);
+
+        $athleteEntity2 = new AthleteEntity();
+        $athleteEntity2->setNom('Monteiro');
+        $athleteEntity2->setPrenom('Kevin');
+        $athleteEntity2->setIdAthlete(13);
+        $athleteEntity2->setEmail('kevin.monteiro@gmail.fr');
+        $athleteEntity2->setSexe('H');
+        $athleteEntity2->setTaille(169);
+        $athleteEntity2->setPoids(69);
+        $athleteEntity2->setMotDePasse('motdepasse');
+        $athleteEntity2->setDateNaissance($dateSQL);
+        $athleteEntity2->setIsCoach(TRUE);
+        $athleteEntity2->setCoachId(1);
+
+        $result = $athleteGateway->updateAthlete($athleteEntity, $athleteEntity2);
+    }
+
+    //Partie concernant les Coachs
+
+    public function testGetCoach() {
+
+        //$dsn = "pgsql:host=londres;port=8888;dbname=dbkemonteiro2;user=kemonteiro2;password=Mdp";
+
+        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+        $username = "kemonteiro2";
+        $password = "#Phpmyadmin63";
+
+        $connexion = new Connexion($dsn,$username,$password);
+
+
+        $coachGateway = new CoachGateway($connexion);
+        $result = $coachGateway->getCoach();
+        var_dump($result);
+    }
+    /*
+        //Fonctionne PAS A PARTIR DE LA
+        public function testAddCoach(){
+            $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+            $username = "kemonteiro2";
+            $password = "#Phpmyadmin63";
+
+            $connexion = new Connexion($dsn,$username,$password);
+
+
+            $coachGateway = new CoachGateway($connexion);
+
+            $dateSpecifique = "2023-11-26";
+            $timestamp = strtotime($dateSpecifique);
+            $dateSQL = date("Y-m-d", $timestamp);
+
+            $coachEntity = new CoachEntity();
+            $coachEntity->setNom('John');
+            $coachEntity->setPrenom('Doe');
+            $coachEntity->setIdCoach(1234);
+            $coachEntity->setEmail('kevin.monteiro@gmail.fr');
+            $coachEntity->setSexe('H');
+            $coachEntity->setTaille(169);
+            $coachEntity->setPoids(69);
+            $coachEntity->setMotDePasse('motdepasse');
+            $coachEntity->setDateNaissance($dateSQL);
+
+            $result2 = $coachGateway->addCoach($coachEntity);
+        }
+
+
+        public function testDeleteAthlete(){
+            $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+            $username = "kemonteiro2";
+            $password = "#Phpmyadmin63";
+
+            $connexion = new Connexion($dsn,$username,$password);
+
+            $athleteGateway = new AthleteGateway($connexion);
+            $result = $athleteGateway->deleteAthlete( //idAthlete );
+            var_dump($result);
+
+        }*/
+    /*
+        public function testUpdateAthlete(){
+            $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+            $username = "kemonteiro2";
+            $password = "#Phpmyadmin63";
+
+            $connexion = new Connexion($dsn,$username,$password);
+
+            $athleteGateway = new AthleteGateway($connexion);
+
+            $dateSpecifique = "2004-08-26";
+            $timestamp = strtotime($dateSpecifique);
+            $dateSQL = date("Y-m-d", $timestamp);
+
+            $athleteEntity = new AthleteEntity();
+            $athleteEntity->setNom('John');
+            $athleteEntity->setPrenom('Doe');
+            $athleteEntity->setIdAthlete(13);
+            $athleteEntity->setEmail('kevin.monteiro@gmail.fr');
+            $athleteEntity->setSexe('H');
+            $athleteEntity->setTaille(169);
+            $athleteEntity->setPoids(69);
+            $athleteEntity->setMotDePasse('motdepasse');
+            $athleteEntity->setDateNaissance($dateSQL);
+
+            $athleteEntity2 = new AthleteEntity();
+            $athleteEntity2->setNom('Monteiro');
+            $athleteEntity2->setPrenom('Kevin');
+            $athleteEntity2->setIdAthlete(13);
+            $athleteEntity2->setEmail('kevin.monteiro@gmail.fr');
+            $athleteEntity2->setSexe('H');
+            $athleteEntity2->setTaille(169);
+            $athleteEntity2->setPoids(69);
+            $athleteEntity2->setMotDePasse('motdepasse');
+            $athleteEntity2->setDateNaissance($dateSQL);
+
+            $result = $athleteGateway->updateAthlete($athleteEntity, $athleteEntity2);
+        }*/
+}

Sources/tests/MapperTest.php

@@ -0,0 +1,43 @@
+<?php
+use PHPUnit\Framework\TestCase;
+
+use Model\User;
+use Database\AthleteEntity;
+use Database\AthleteGateway;
+use Database\Connexion;
+use Database\AthleteMapper;
+
+class MapperTest extends TestCase {
+
+    public function testMapperAthlete() {
+
+        //$dsn = "pgsql:host=londres;port=8888;dbname=dbkemonteiro2;user=kemonteiro2;password=Mdp";
+
+        $dsn = "mysql:host=londres;dbname=dbkemonteiro2;";
+        $username = "kemonteiro2";
+        $password = "#Phpmyadmin63";
+
+        $connexion = new Connexion($dsn,$username,$password);
+
+
+        $athleteGateway = new AthleteGateway($connexion);
+        $result = $athleteGateway->getAthlete();
+
+        $map = new AthleteMapper ();
+        //SQL To AthleteEntity
+        $athleteEntity = $map->athleteSqlToEntity($result);
+
+
+        foreach($athleteEntity as $ath){
+
+            $result = $ath->getNom();
+            var_dump($result);
+            //Pour chaque AthleteEntity : Athlete Entity To User avec Role Athlete(Model)
+            $user = $map->athleteEntityToModel($ath);
+            var_dump($user->getId());
+            //Pour chaque Athlete du Model -> Athlete Entity
+            $res = $map->athleteToEntity($user);
+            var_dump($res->getIdAthlete());
+        }
+    }
+}