Update 'Sources/config/config.php'

.drone.yml

@@ -0,0 +1,90 @@
+kind: pipeline
+type: docker
+name: HeartWave
+
+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
+      - ./vendor/bin/phpunit tests
+
+  # Sonar static code analisis deployment
+  # TODO : use an image that already have unzip
+  - name: code-analysis
+    image: php:8.1-cli
+    environment:
+      SONAR_TOKEN:
+        from_secret: SONAR_TOKEN
+    commands:
+      - apt-get update && apt-get install -y curl unzip
+      - export SONAR_SCANNER_VERSION=4.7.0.2747
+      - export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION-linux
+      - curl --create-dirs -sSLo $HOME/.sonar/sonar-scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-$SONAR_SCANNER_VERSION-linux.zip
+      - unzip -o $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
+      - export PATH=$SONAR_SCANNER_HOME/bin:$PATH
+      - export SONAR_SCANNER_OPTS="-server"
+      - 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/
+
+  - 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
+    when:
+      status: [ success ]
+      ref:
+        include:
+          - refs/tags/*-demo
+    commands:
+      - sh ./notifymail.sh
+    depends_on: [ docker-build-and-push ]
+
+

Documents/Diagramme/BDD/MLD.plantuml

@@ -11,7 +11,6 @@ entity "Athlète" as athlete {
     poids
     motDePasse
     dateNaissance
-    isCoach 
 }
 
 entity "Amitié" as friendship{
@@ -29,7 +28,11 @@ entity "Notification" as notif {
     #athleteId
 }
 
-
+entity "Coach" as coach {
+    {static} idCoach
+    // attributs spécifiques au coach
+    #athleteId
+}
 
 entity "Statistique" as stats {
     {static} idStatistique
@@ -49,7 +52,7 @@ entity "Entraînement" as training {
     latitude
     longitude
     feedback
-    #athleteId
+    #coachId
 }
 
 entity "Participe" as takepart {
@@ -98,12 +101,13 @@ entity "FréquenceCardiaque" as fc {
 activity --> athlete
 activity --> source
 activity <-- fc
+coach --> athlete
 athlete <-- source
 stats --> athlete
 takepart --> athlete
 takepart --> training
 friendship --> athlete
 notif --> athlete
-athlete <-- training
+coach <-- training
 athlete <-- friendship
 @enduml

Documents/Diagramme/BDD/README_BDD.md

@@ -4,6 +4,56 @@
 
 # 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
@@ -129,9 +179,10 @@ athlete <-- friendship
 
 ```plantuml
 @startuml
-
+skinparam classAttributeIconSize 0
-class Athlete {
+package MCD{
-    idAthlete
+entity "Athlete" as athlete {
+    {static} idAthlete
     username
     nom
     prenom
@@ -144,65 +195,45 @@ class Athlete {
     isCoach
 }
 
-class Amitie {
+entity "Notification" as notif {
-    idAthlete1
+    {static} idNotif
-    idAthlete2
-}
-
-class Notification {
-    idNotif
     message
     date
     statut
     urgence
-    athleteId
+    #athleteId
-}
-
-class Envoi {
-    idAthlete
-    idNotif
 }
 
-class Statistique {
+entity "Statistique" as stats {
-    idStatistique
+    {static} idStatistique
     poids
     fcMoyenne
     fcMax
     caloriesBruleesMoy
     date 
-    athleteId
+    #athleteId
 }
 
-class Entrainement {
+entity "Entrainement" as training {
-    idEntrainement
+    {static} idEntrainement
     date
     description
     latitude
     longitude
     feedback
-    athleteId
+    #athleteId
-}
-
-class Participe {
-    athleteId
-    entrainementId
-}
-
-class Donne {
-    coachId
-    entrainementId
 }
 
-class SourceDonnee {
+entity "SourceDonnee" as source {
-    idSource
+    {static} idSource
     type 
     modele
     precision
-    athleteId
+    #athleteId
 }  
 
-class Activite {
+entity "Activite" as activity {
-    idActivite
+    {static} idActivité
     type
     date
     heureDeDebut
@@ -215,29 +246,31 @@ class Activite {
     maximum
     minimum
     temperatureMoyenne
-    athleteId
+    #athleteId 
-    sourceId
+    #sourceId
 }
 
-class FrequenceCardiaque {
+entity "FréquenceCardiaque" as fc {
-    idFc
+    {static} idFc
     altitude
-    temps
+    temps : time
-    temperature
+    température    
     bpm
     longitude
     latitude
-    activiteId
+    #activitéId
 }
 
-Athlete "1" --o "0..*" Amitie
+}
-Athlete "1" --o "0..*" Notification
+activity "0..n" --- "1..1" athlete : réalise
-Athlete "1" --o "0..*" Statistique
+activity "1..n" --- "1..1" source : possede
-Athlete "1" --o "0..*" Entrainement
+activity "1..1" --- "1..n" fc : enregistre
-Entrainement "0..*" --o "0..*" Athlete : Participants
+athlete "1..n" --- "0..1" source : possede
-Entrainement "0..*" --o "0..*" Athlete : Coachs
+stats "0..n" --- "1..1" athlete : possede
-Athlete "1" --o "0..*" SourceDonnee
+training "0..n" --- "1..n" athlete : participe
-Activite "1" --o "0..*" FrequenceCardiaque
+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, Statistiques, et interagir avec différentes Sources de Données.
+- Un Athlète peut enregistrer plusieurs Activités, possède des Statistiques, et une Sources de Données qui est la plus utilisé.
 
 - Les Entraînements sont liés aux Utilisateurs, permettant une planification efficace.
 
-- Les Notifications informent les Utilisateurs des événements importants.
+- Les Notifications informent les Utilisateurs des événements importants tels qu'une demande d'amis ou une notification d'avertissement de ban.
 
 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, garantissant une interaction claire et ordonnée.
+- **RelationshipRequestRepository :** Facilite la gestion des demandes de relations entre utilisateurs (amitiés), garantissant une interaction claire et ordonnée au sein de l'application.
 
 - **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
-abstract class IGenericRepository {
+interface 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 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.
+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.
 
 **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 peut enregistrer des statistiques liées à ses activités sportives.
+- **Athlète (Athlete) :** Un type spécialisé d'utilisateur qui possède 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 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 la vision 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 statistiques liées à ses activités.
+- Un Athlète peut enregistrer plusieurs activités afin d'avoir des statistiques liées à celle-ci.
 
 **Objectif Principal :**
 
-- 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. 
+- 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. 
 
 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. 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 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 :
 
 ## 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 ! 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.
+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.
 
 **Acteurs Principaux :**
 
-- Utilisateur (User) : Représente un individu inscrit sur notre plateforme, avec la capacité d'importer des fichiers .fit.
+- Utilisateur (User) : Représente un individu inscrit sur notre plateforme.
-- 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.  
+- 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.  
 
 **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, 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.
+- 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.
 
 **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

@@ -21,3 +21,6 @@
 - [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)
+
+## Base de Données
+- [MLD](BDD/README_BDD.md)

README.md

@@ -71,7 +71,8 @@ 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) - Langages
+* [XAMPP : X, Apache, MySQL, Perl, PHP](https://www.apachefriends.org/fr/index.html) - Languages
+* [PostgreSQL](https://www.postgresql.org/) - Base de Donnée
   
 ## Getting Started
 1. Cloner le répos

Sources/composer.json

@@ -18,14 +18,13 @@
             "Shared\\": "src/shared",
             "App\\Router\\": "src/app/router",
             "App\\Controller\\": "src/app/controller",
-            "App\\Router\\Response\\": "src/app/router/response",
+            "App\\Router\\Response\\" : "src/app/router/response",
-            "App\\Router\\Middleware\\": "src/app/router/middleware",
+            "App\\Router\\Middleware\\" : "src/app/router/middleware",
-            "App\\Router\\Request\\": "src/app/router/request",
+            "App\\Router\\Request\\" : "src/app/router/request",
             "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/" 
-            "Database\\": "src/data/core/database"
         }
     },
     "require": {
@@ -33,12 +32,7 @@
         "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": "*"
-    },
-    "config": {
-        "process-timeout": 2000
     },
     "require-dev": {
         "phpunit/phpunit": "*"
@@ -46,6 +40,6 @@
     "scripts": {
         "dev": "php -S localhost:8080 -t public -d display_errors=1 -d error_reporting=E_ALL",
         "dev:console": "export APP_ENV=console && php public/index.php",
-        "dev:html": "export APP_ENV=html && php -S localhost:8080 -t public -d display_errors=1 -d error_reporting=E_ALL"
+        "dev:html" : "export APP_ENV=html && php -S localhost:8080 -t public -d display_errors=1 -d error_reporting=E_ALL"
     }
 }

Sources/config/.htaccess

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

Sources/config/Dockerfile

@@ -1,17 +1,31 @@
-FROM php:8.2-fpm
+FROM php:8.2-apache as base
 # 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 . /var/www/
+# Copy configs
+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
 
-WORKDIR /var/www/
+# add sources code
+COPY . /app
+
+ENV VOLUME_PATH /app/public
 
 RUN composer install
+
+EXPOSE 80
+
+CMD ["apache2-foreground"]

Sources/config/config.php

@@ -5,18 +5,18 @@ 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';
 // const DB_USER = $_ENV['DB_USER'] ?? 'toto';
 // const DB_PASSWORD = $_ENV['DB_PASSWORD'] ?? 'achanger';
-define("APP_ENV", getenv('APP_ENV'));
+define("APP_ENV", 'development');
 
-const DB_SERVER = 'mysql';
 const DB_HOST = 'localhost';
-const DB_DATABASE = 'sae_3';
+const DB_DATABASE = 'heartTrack';
-const DB_USER = 'Perederii';
+const DB_USER = 'toto';
-const DB_PASSWORD = '';
+const DB_PASSWORD = 'achanger';
 //const APP_ENV = 'console';
 
-const DSN = DB_SERVER . ":host=" . DB_HOST . ";dbname=" . DB_DATABASE;
+const DSN = "mysql:host=" . DB_HOST . ";dbname=" . DB_DATABASE;

Sources/config/httpd.conf

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

Sources/config/nginx.conf

@@ -1,28 +1,19 @@
 server {
     listen 80;
-    index index.php;
+    index index.php index.html index.htm;
-    root /var/www/public;
+    root /usr/share/nginx/html;
     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 / {
-      try_files $uri $uri/ /index.php?$query_string;
+      root /usr/share/nginx/html;
+      try_files $uri /index.php;
     }
-
 }

Sources/config/virtual-host.conf

@@ -0,0 +1,39 @@
+<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

@@ -12,7 +12,7 @@ use Manager\DataManager;
 use Repository\IUserRepository;
 use Shared\ArgumentControllerResolver;
 use Shared\IArgumentResolver;
-use Network\AuthService;
+use Stub\AuthService;
 use Stub\NotificationRepository;
 use Stub\TrainingRepository;
 use Stub\UserRepository;
@@ -30,13 +30,13 @@ use Network\RelationshipService;
 use Network\INotificationService;
 use Stub\NotificationService;
 
-use App\Router\Session;
+
 use Stub\StubData;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
 use Shared\IHashPassword;
 use Shared\HashPassword;
-use Shared\Log;
+
 
 $appFactory = new AppCreator();
 $appFactory->registerService(IArgumentResolver::class, ArgumentControllerResolver::class);
@@ -54,6 +54,7 @@ $appFactory->registerService(IUserRepository::class, UserRepository::class);
 
 
 
+
 $appFactory->registerService(\Twig\Loader\LoaderInterface::class, function() {
     return new FilesystemLoader(__DIR__ . '/../src/app/views/Templates');
 });
@@ -64,12 +65,4 @@ $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($appFactory->getDicontainer()->get(IAuthService::class) ));
-    $app->mapControllers();
-    $app->run(RequestFactory::createFromGlobals());
-}
 

Sources/public/js/script2.js

@@ -1,34 +0,0 @@
-/*!
-* 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

@@ -1,34 +0,0 @@
-/*!
-* 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/App.php

@@ -29,6 +29,9 @@ class App
 
     private FrontController $frontController;
 
+    private Session $session;
+
+
     public function __construct(string $appName, int $version, \App\Container $diContainer)
     {
         $this->appName = $appName;
@@ -36,7 +39,7 @@ class App
         $this->container = $diContainer;
         $this->router = new Router("");
         $this->frontController = new FrontController($this->router,$this->container);
-        Session::getInstance();
+        $this->session = Session::getInstance();
     }
 
     public function use(IHttpMiddleware $middleware)
@@ -139,7 +142,7 @@ class App
                 $route = $attribute->newInstance();
 
                 $this->router->addControllerRoute(
-                    $route->getMethods(),
+                    implode('|', $route->getMethods()),
                     $prefix . $route->getPath(),
                     $controllerClass,
                     $method->getName(),

Sources/src/app/AppCreator.php

@@ -24,13 +24,6 @@ class AppCreator
         return $this;
     }
 
-    public function registerSingleton(string $serviceId, $service): self
-    {
-        $this->container->set($serviceId, $service, Container::SINGLETON);
-        $this->services[] = $serviceId;
-        return $this;
-    }
-
     /**
      * Create an instance or perform actions based on the current application environment.
      *
@@ -40,7 +33,6 @@ class AppCreator
     {
         // Check the application environment
         switch (APP_ENV) {
-
             case 'console':
                 // Load the Console.php file in case of the 'console' environment
                 require_once __DIR__ . '/../console/Console.php';
@@ -48,6 +40,7 @@ class AppCreator
             case 'development':
                 // Create a new instance of the App class in the 'development' environment
                 return new App("HeartTrack", 1, $this->container);
+                break;
             case 'html':
                 // Load the index.test.php file in case of the 'html' environment
                 require_once __DIR__ . '/index.test.php';
@@ -60,6 +53,7 @@ class AppCreator
     }
 
 
+
     function AddControllers($namespacePrefix = 'App\Controller', $pathToControllers = __DIR__ . '/controller'): self
     {
         $controllerFiles = glob($pathToControllers . '/*.php');
@@ -77,8 +71,7 @@ class AppCreator
             if ($reflectionClass->isSubclassOf(BaseController::class)) {
                 // Register in DI container
                 $this->container->set($fullClassName, function () use ($fullClassName) {
-                    /** @var $controllerInstance * */
+                    $controllerInstance = new $fullClassName();
-                    $controllerInstance = $this->container->resolve($fullClassName);
                     $controllerInstance->setContainer($this->container);
                     return $controllerInstance;
                 });
@@ -88,15 +81,11 @@ class AppCreator
 
         return $this;
     }
+
     public function getServiceRegistered(): array
     {
         return $this->services;
     }
-
-    public function getDicontainer()
-    {
-        return $this->container;
-    }
 }
 
 

Sources/src/app/Container.php

@@ -11,45 +11,31 @@ class Container implements ContainerInterface
 {
     private array $entries = [];
 
-    const SINGLETON = 'singleton';
-    const TRANSIENT = 'transient';
-  
     public function get(string $id)
     {
+        
         if ($this->has($id)) {
             $entry = $this->entries[$id];
-
+            if (is_callable($entry)) {                
-            if ($entry['lifecycle'] === self::SINGLETON) {
+                return $entry($this);
-                if ($entry['instance'] === null) {
-                    $entry['instance'] = $this->resolve($entry['concrete']);
-                }
-                return $entry['instance'];
             }
             
-            if (is_callable($entry['concrete'])) {                
+            $id = $entry;
-                return $entry['concrete']($this);
-            }
-            
-            return $this->resolve($entry['concrete']);
         }
 
         return $this->resolve($id);
     }
 
 
-
     public function has(string $id): bool
     {
         return isset($this->entries[$id]);
     }
 
-    public function set(string $id, callable|string $concrete, string $lifecycle = self::TRANSIENT): void
+    public function set(string $id, callable|string $concrete): void
     {
-        $this->entries[$id] = [
+        $this->entries[$id] = $concrete;
-            'concrete' => $concrete,
+
-            'lifecycle' => $lifecycle,
-            'instance' => null
-        ];
     }
 
     public function resolve(string $id)

Sources/src/app/controller/AthleteController.php

@@ -2,19 +2,6 @@
 
 namespace App\Controller;
 
-use Database\ActivityGateway;
-use Database\ActivityMapper;
-use Database\AnalyzeGateway;
-use Database\AthleteEntity;
-use Database\AthleteMapper;
-use Database\EntrainementGateway;
-use Database\EntrainementMapper;
-use Database\NotificationEntity;
-use Database\NotificationGateway;
-use Database\NotificationMapper;
-use DateTime;
-use Model\Notification;
-use Shared\Validation;
 use App\Container;
 use App\Router\Request\IRequest;
 use App\Router\Response\Response;
@@ -22,272 +9,87 @@ use Shared\Attributes\Route;
 use Twig\Environment;
 use Data\Core\Preferences;
 use Shared\Log;
-use Manager\UserManager;
-use Database\Connexion;
-use Database\AthleteGateway;
 
 class AthleteController extends BaseController
 {
 
-    private Environment $twig;
+    #[Route(path: '/search-ath', name: 'search-ath', methods: ['GET'])]
-    protected Preferences $preference;
-//    private UserManager $userMgr;
-
-    public function __construct()
-    {
-       $this->preference = new Preferences();
-//       $this->userMgr = $manager;
-    }
-
-//    #[Route(path: '/search-user', name: 'search-user', methods: ['GET'])]
-//    public function searchUser(string $username, IRequest $req): Response
-//    {
-//        $taberror = [];
-//        if(!Validation::val_string($username)){
-//            print("Nom invalide.");
-//        }
-//        else {
-//            try {
-//                $athleteGateway = new AthleteGateway(new Connexion("mysql:host=localhost;dbname=sae_3", "Perederii", ""));
-////                $listSearch=$this->container->get(UserManager::class)->searchUsersByName($username);
-//                $listSearch = $athleteGateway->getAthlete();
-//                $map = new AthleteMapper ();
-//                $athleteEntity = $map->athleteSqlToEntity($listSearch);
-//                foreach ($athleteEntity as $entity) {
-//                    $users = $map->athleteEntityToModel($entity);
-//                    $listUsers[$i++]=['nom' => $users->getNom(), 'prenom'=>$users->getPrenom(), 'img'=>'john_doe'];
-//                }
-//
-//                $i=0;
-//                foreach ($users as $user){
-//                    echo "<h1> HELLO </h1>";
-//                    $listUsers[$i++]=['nom' => $user->getNom(), 'prenom'=>$user->getPrenom(), 'img'=>'john_doe', 'username'=>$user->getUsername()];
-//                }
-//                echo "<h1> HEllO </h1>";
-//                //$currentUser=$this->container->get(UserManager::class)->getCurrentUser();
-//                //$currentUser=$_SESSION['user'];
-//                $response = $this->render('./page/addfriend.html.twig',[
-//                    'css' => $_COOKIE['preferences'],
-//                    'pp' => "test",
-//                    'user' => 'johndoe',//$currentUser->getUsername(),
-//                    'role' => 'Athlete',//$currentUser->getRole(),
-//                    'users' => $listUsers
-//                ]);
-//            } catch (\Throwable $th) {
-//                throw $th;
-//                return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
-//            }
-//        }
-//        return $response;
-//
-//    }
-
-    #[Route(path: '/search-user', name: 'search-user', methods: ['GET'])]
     public function searchUser(string $username, IRequest $req): Response
     {
         $taberror = [];
-        if (!Validation::val_string($username)) {
+        $utiliArray = [
-            print("Nom invalide.");
+            [
-        } else {
+                'nom' => 'John',
-            try {
+                'prenom' => 'Doe',
-                $athleteGateway = new AthleteGateway(new Connexion(DSN, DB_USER, DB_PASSWORD));
+                'img' => 'john_doe',
-                if($username==null){
+                'username' => 'johndoe',
-                    $listSearch=$athleteGateway->getAthlete();
+            ],
-                } else {
+            [
-                    $listSearch = $athleteGateway->getAthleteByName($username);
+                'nom' => 'Alice',
-                }
+                'prenom' => 'Smith',
-                $map = new AthleteMapper();
+                'img' => 'alice_smith',
-                $athleteEntity = $map->athleteSqlToEntity($listSearch);
+                'username' => 'alicesmith',
-                $listUsers = [];
+            ],
-                foreach ($athleteEntity as $entity) {
+        ];
-                    $user = $map->athleteEntityToModel($entity);
+        // if(!Validation::val_string($name)){
-                    $listUsers[] = ['idathlete' => number_format($user->getId(), 1), 'nom' => $user->getNom(),
-                        'prenom' => $user->getPrenom(),'email' => $user->getEmail(), 'sexe' => $user->getSexe(),
-                        'taille' => $user->getTaille(), 'poids' => $user->getPoids(), 'motdepasse' => $user->getMotDePasse(),
-                        'datenaissance' => $user->getDateNaissance(), 'iscoach' => $user->getRole(), 'img' => 'test',
-                        'username' => $user->getUsername()];
-                }
-
-                $response = $this->render('./page/addfriend.html.twig',[
-                    'css' => $_COOKIE['preferences'],
-                    'pp' => 'test',
-                    'user' => 'John',//$currentUser->getUsername(),
-                    'role' => 'Athlete',//$currentUser->getRole(),
-                    'users' => $listUsers
-                ]);
-
-            } catch (\Throwable $th) {
-                throw $th;
-                return $this->render("addfriend.html.twig", ['tabError' => $taberror]);
-            }
-        }
-        return $response;
-    }
-
-    #[Route(path: '/analyze', name: 'analyze_details', methods: ['GET'])]
-    public function activityDetails(int $id): Response
-    {
-        try {
-            // Utilisez $id pour récupérer les détails de l'activité depuis la base de données
-//            $activityGateway = new ActivityGateway(new Connexion(DSN, DB_USER, DB_PASSWORD));
-//            $activityEntity = $activityGateway->getActivityById($id); // Assurez-vous d'avoir une méthode similaire dans votre gateway
-
-            $analyzeGateway = new AnalyzeGateway(new Connexion(DSN, DB_USER, DB_PASSWORD));
-            $analyzeEntity = $analyzeGateway->getFrequenceCardiaqueByIdActivity($id);
-
-            $response = $this->render('./page/analyze.html.twig', [
-                'css' => $this->preference->getCookie(),
-                'pp' => "test2",
-                'user' => 'johndoe',//$currentUser->getUsername(),
-                'role' => 'Athlete',//$currentUser->getRole(),
-                'friendship' => [],
-                'activity' => [],
-                'analyzes' => $analyzeEntity,
-            ]);
-        } catch (\Throwable $th) {
-            throw $th;
-            return $this->render("./page/analyze.html.twig", ['tabError' => $taberror]);
-        }
-        return $response;
-    }
-
-//
-//    #[Route(path: '/analyses/{id}', name: 'analyses', methods: ['GET'])]
-//    public function analyses(): Response
-//    {
-//        try {
-//            $activityGateway = new ActivityGateway(new Connexion(DSN, DB_USER, DB_PASSWORD));
-//            $listSearch = $activityGateway->getActivity();
-//            $map = new ActivityMapper();
-//            $activityGateway = $map->activitySqlToEntity($listSearch);
-//            $listActivity = [];
-//            foreach ($activityGateway as $entity) {
-//                $activity = $map->activityEntityToModel($entity);
-//                $listActivity[] = ['idactivity' => number_format($activity->getIdActivity(), 1), 'type' => $activity->getType(),
-//                    'date' => $activity->getDate()->format("D j F Y"), 'heureDebut' => $activity->getHeureDebut()->format("H\h i"), 'heureFin' => $activity->getHeureFin()->format("H\h i"),
-//                    'effortRessenti' => $activity->getEffortRessenti(), 'variabilite' => $activity->getVariability(), 'variance' => $activity->getVariance(),
-//                    'ecartType' => $activity->getStandardDeviation(), 'moyenne' => $activity->getAverage(),
-//                    'max' => $activity->getMaximum(), 'min' => $activity->getMinimum(), 'temperature' =>$activity->getAvrTemperature()];
-//            }
-//
-//            $response = $this->render('./page/analyze.html.twig',[
-//                'css' => $this->preference->getCookie(),
-//                'pp' => "test2",
-//                'user' => 'johndoe',//$currentUser->getUsername(),
-//                'role' => 'Athlete',//$currentUser->getRole(),
-//                'friendship' => [],
-//                'analyzes' => $listActivity,
-//                'mails' => [],
-//                'users' => [],
-//                'infoUser' => [],
-//                'exos' => [],
-//                'member' => []
-//            ]);
-//        } catch (\Throwable $th) {
-//            throw $th;
-//            return $this->render("./page/analyze.html.twig", ['tabError' => $taberror]);
-//        }
-//        return $response;
-//    }
-
-    #[Route(path: '/activity', name: 'activity', methods: ['GET'])]
-    public function activity(): Response
-    {
         try {
-            $activityGateway = new ActivityGateway(new Connexion(DSN, DB_USER, DB_PASSWORD));
+            //code...
-            $listSearch = $activityGateway->getActivity();
+            //     $model->userMgr->getUser($name);
-            $map = new ActivityMapper();
+            return $this->render('./page/addfriend.html.twig', [
-            $activityGateway = $map->activitySqlToEntity($listSearch);
-            $listActivity = [];
-            foreach ($activityGateway as $entity) {
-                $activity = $map->activityEntityToModel($entity);
-                $listActivity[] = ['idactivity' => number_format($activity->getIdActivity()), 'type' => $activity->getType(),
-                    'date' => $activity->getDate()->format("D j F Y"), 'heureDebut' => $activity->getHeureDebut()->format("H\h i"), 'heureFin' => $activity->getHeureFin()->format("H\h i"),
-                    'effortRessenti' => $activity->getEffortRessenti(), 'variabilite' => $activity->getVariability(), 'variance' => $activity->getVariance(),
-                    'ecartType' => $activity->getStandardDeviation(), 'moyenne' => $activity->getAverage(),
-                    'max' => $activity->getMaximum(), 'min' => $activity->getMinimum(), 'temperature' => $activity->getAvrTemperature()];
-            }
-
-            $response = $this->render('./page/activity.html.twig', [
                 'css' => $this->preference->getCookie(),
                 'pp' => "test2",
-                'user' => 'johndoe',//$currentUser->getUsername(),
+                'user' => "Doe",
-                'role' => 'Athlete',//$currentUser->getRole(),
+                'role' => "Athlète",
                 'friendship' => [],
-                'analyzes' => $listActivity,
+                'analyzes' => [],
                 'mails' => [],
-                'users' => [],
+                'users' => $utiliArray,
                 'infoUser' => [],
                 'exos' => [],
-                'member' => []
+                'member' => [],
+                'responce' => "Notification d'ajout envoyée à $username"
             ]);
         } catch (\Throwable $th) {
-            throw $th;
+            //throw $th;
-            return $this->render("./page/analyze.html.twig", ['tabError' => $taberror]);
+            // return $this->render("addfriend.html.twig", ['tabError' => $taberror ]);
         }
-        return $response;
+        // }
+
     }
 
-    #[Route(path: '/exercice', name: 'exercice', methods: ['GET'])] // 8
+    #[Route(path: '/analyses', name: 'analyses', methods: ['GET'])]
-    public function exercice(): Response
+    public function analyses(): Response
     {
-        try {
+        return $this->render('./page/analyze.html.twig', [
-            $entrainementGateway = new EntrainementGateway(new Connexion(DSN, DB_USER, DB_PASSWORD));
+            'css' => $this->preference->getCookie(),
-            $listSearch = $entrainementGateway->getEntrainements();
+            'pp' => "test2",
-            $map = new EntrainementMapper();
+            'user' => "Doe",
-            $entrainementEntity = $map->entrainementSqlToEntity($listSearch);
+            'role' => "Athlète",
-
+            'friendship' => [],
-            $listUsers = [];
+            'analyzes' => [],
-            foreach ($entrainementEntity as $entity) {
+            'mails' => [],
-                $training = $map->entrainementEntityToModel($entity);
+            'users' => [],
-                $listUsers[] = ['idTraining' => number_format($training->getId(), 1), 'date' => $training->getDate()->format("D j F Y"),
+            'infoUser' => [],
-                    'location' => $training->getLocation(), 'description' => $training->getDescription(),
+            'exos' => [],
-                    'feedback' => $training->getFeedback()];
+            'member' => []
-            }
+        ]);
-
-            $response = $this->render('./page/exercice.html.twig',[
-                'css' => $this->preference->getCookie(),
-                'pp' => "test2",
-                'user' => 'johndoe',//$currentUser->getUsername(),
-                'role' => 'Athlete',//$currentUser->getRole(),
-                'friendship' => [],
-                'analyzes' => [],
-                'mails' => [],
-                'users' => [],
-                'infoUser' => [],
-                'exos' => $listUsers,
-                'member' => []
-            ]);
-
-        } catch (\Throwable $th) {
-            throw $th;
-            return $this->render("addfriend.html.twig", ['tabError' => $taberror]);
-        }
-        return $response;
     }
 
-    #[Route(path: '/exercices', name: 'exercices', methods: ['POST'])] // 8
+
-    public function exercices(String $type, String $intensite, String $date, IRequest $req): Response
+    #[Route(path: '/exercice', name: 'exercice', methods: ['GET'])] // 8
+    public function exercice(): Response
     {
-        $exercicesArray = [
+        return $this->render('./page/exercice.html.twig', [
-            [
-                'date' => $date,
-                'type' => $type,
-                'intensite' => $intensite,
-                'status' => 'A venir',
-            ]
-        ];
-        return $this->render('./page/exercice.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
-            'user' => 'johndoe',//$currentUser->getUsername(),
+            'user' => "Doe",
-            'role' => 'Athlete',//$currentUser->getRole(),
+            'role' => "Athlète",
             'friendship' => [],
             'analyzes' => [],
             'mails' => [],
             'users' => [],
             'infoUser' => [],
-            'exos' => $exercicesArray,
+            'exos' => [],
             'member' => []
         ]);
     }
@@ -295,81 +97,54 @@ class AthleteController extends BaseController
     #[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 {
-            $athleteGateway = new AthleteGateway(new Connexion(DSN, DB_USER, DB_PASSWORD));
+            //code...
-            $map = new AthleteMapper();
+            //     $model->userMgr->addFriend($name);
-            $userSearched = $athleteGateway->getAthleteByFirstName("Bryan");
+            return $this->render('./page/addfriend.html.twig', [
-            $athleteEntity = $map->athleteSqlToEntity($userSearched);
-            $users=[];
-            foreach ($athleteEntity as $user) {
-//                $this->userMgr->getCurrentUser()->addFriend($user);
-//                $currentUser->addFriend($user);
-                $users = ['nom' => $user->getNom(), 'prenom' => $user->getPrenom(), 'img' => 'test', 'username' => $user->getUsername()];
-            }
-            $notif = new NotificationGateway(new Connexion(DSN, DB_USER, DB_PASSWORD));
-            $mapper = new NotificationMapper();
-            $date = new DateTime();
-            $myNotif = new Notification(21, "Demande d'ami de la part de " . $users['nom'], $date, true, 7, 1);
-            $notif->addNotification($mapper->notificationToEntity($myNotif));
-            return $this->render('./page/addfriend.html.twig',[
                 'css' => $this->preference->getCookie(),
                 'pp' => "test2",
-                'user' => 'johndoe',//$currentUser->getUsername(),
+                'user' => "Doe",
-                'role' => 'Athlete',//$currentUser->getRole(),
+                'role' => "Athlète",
                 'friendship' => [],
                 'analyzes' => [],
                 'mails' => [],
-                'users' => $users,
+                'users' => $utiliArray,
                 'infoUser' => [],
                 'exos' => [],
                 'member' => [],
                 'responce' => "Notification d'ajout envoyée à $username"
             ]);
         } 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
-    {
-        try {
-            $athleteGateway = new AthleteGateway(new Connexion(DSN, DB_USER, DB_PASSWORD));
-            $map=new AthleteMapper();
-            $friendEntity = $athleteGateway->getAthlete();
-            $listUserEntity = $map->athleteSqlToEntity($friendEntity);
 
-            $friendList = [];
-            foreach ($listUserEntity as $userEntity) {
-                $friendList[] = ['nom' => $userEntity->getNom(), 'prenom' => $userEntity->getPrenom(), 'img' => 'test', 'username' => 'test'];
-            }
 
-            $response = $this->render('./page/addfriend.html.twig',[
-                'css' => $this->preference->getCookie(),
-                'pp' => "test2",
-                'user' => 'John',//$currentUser->getUsername(),
-                'role' => 'Athlete',//$currentUser->getRole(),
-                'friendship' => [],
-                'analyzes' => [],
-                'mails' => [],
-                'users' => $friendList,
-                'infoUser' => [],
-                'exos' => [],
-                'member' => [],
-            ]);
 
-        } catch (\Throwable $th) {
-            throw $th;
-            return $this->render("addfriend.html.twig", ['tabError' => $taberror]);
-        }
-        return $response;
-    }
     
-    /*#[Route(path: '/friendlist', name: 'friendlist', methods: ['POST'])]
+    #[Route(path: '/friend', name: 'friend', methods: ['GET'])]
-    public function friendlist(string $username, IRequest $req): Response
+    public function friend(): Response
     {
-        $friendList = [
+        $utiliArray = [
             [
                 'nom' => 'John',
                 'prenom' => 'Doe',
@@ -383,58 +158,19 @@ class AthleteController extends BaseController
                 'username' => 'alicesmith',
             ],
         ];
-        // TODO 
+        return $this->render('./page/addfriend.html.twig',[
-
-        // -> Enlever ou bloquer un utilisateur en fonction de son username
-        //$friendList = currentUser->getFriends();
-        return $this->render('./page/friend.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
-            'user' => 'johndoe',//$currentUser->getUsername(),
+            'user' => "Doe",
-            'role' => 'Athlete',//$currentUser->getRole(),
+            'role' => "Athlète",
-            'friendship' => $friendList,
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => $utiliArray,
+            'infoUser' => [],
+            'exos' => [],
+            'member' => [],
         ]);
-    }*/
-
-    #[Route(path: '/friendlist', name: 'friendlist2', methods: ['GET'])]
-    public function friendlist2(): Response
-    {
-        try {
-            $athleteGateway = new AthleteGateway(new Connexion(DSN, DB_USER, DB_PASSWORD));
-            $map=new AthleteMapper();
-            $friendEntity = $athleteGateway->getListIdFriends(1/*$currentUser->getId()*/);
-
-            $friendList = [];
-            $listUserEntity = [];
-            foreach($friendEntity as $users) {
-                if ($users['idathlete1']==1/*$currentUser->getId()*/){
-                    $user=(int)$users['idathlete2'];
-                } else {
-                    $user=(int)$users['idathlete1'];
-                }
-                $listUserEntity[] = $map->athleteSqlToEntity($athleteGateway->getAthleteById(1));
-            }
-            foreach ($listUserEntity as $user) {
-                $friendList[] = ['nom' => $user[0]->getNom(), 'prenom' => $user[0]->getPrenom(), 'img' => 'test', 'username' => 'test'];
-            }
-
-            $response = $this->render('./page/friend.html.twig',[
-                'css' => $this->preference->getCookie(),
-                'pp' => "test2",
-                'user' => "Doe",
-                'role' => "Athlète",
-                'friendship' => $friendList,
-            ]);
-
-        } catch (\Throwable $th) {
-            throw $th;
-            return $this->render("addfriend.html.twig", ['tabError' => $taberror]);
-        }
-        return $response;
     }
 
-    // #[Route(path: '/delete-friend', name: 'delete-friend', methods: ['POST'])]
-    
 }
-
-?>

Sources/src/app/controller/AuthController.php

@@ -4,179 +4,144 @@ namespace App\Controller;
 
 use App\Container;
 use App\Router\Request\IRequest;
-use App\Router\Response\RedirectResponse;
 use App\Router\Response\Response;
 use App\Router\Response\IResponse;
 
-use App\Router\Session;
+use Couchbase\UserManager;
-use Database\AthleteGateway;
-use Database\AthleteMapper;
-use Database\Connexion;
-use Manager\UserManager;
 use Shared\Attributes\Route;
 use Shared\Validation;
 use Twig\Environment;
 use Data\Core\Preferences;
 use Shared\Log;
-use function PHPUnit\Framework\isEmpty;
 
 class AuthController extends BaseController
 {
-    private UserManager $userMgr;
+
-    public function __construct(UserManager $manager){
-        parent::__construct();
-        $this->userMgr =  $manager;
-    }
 
     #[Route('/login', name: 'login',methods: ['POST'])]
-    public function login(string $email,string $password, IRequest $request): IResponse {
+    public function login(IRequest $request): IResponse {
-        $error = [];
         
+        $error = [];
         try {
-            $log=$email; // should check email with verrify email
+            $log=Validation::clean_string($request->getBody()['email']);
-            $mdp=Validation::clean_string($password);
+            $mdp=Validation::clean_string($request->getBody()['password']);
-            if($this->userMgr->login($log,$mdp)){
-//                Log::dd($this->userMgr->getCurrentUser());
-//                $athleteGateway = new AthleteGateway(new Connexion(DSN, DB_USER, DB_PASSWORD));
-//                $user = $athleteGateway->getUserByEmail($email);
-//                $map = new AthleteMapper();
-//                $userEntity = $map->athleteSqlToEntity($user);
-//
-//                $users = ['username' => $userEntity[0]->getUsername(), 'nom' => $userEntity[0]->getNom(),
-//                    'prenom' => $userEntity[0]->getPrenom(),'email' => $userEntity[0]->getEmail(), 'sexe' => $userEntity[0]->getSexe(),
-//                    'taille' => $userEntity[0]->getTaille(), 'poids' => $userEntity[0]->getPoids(), 'motdepasse' => $userEntity[0]->getMotDePasse(),
-//                    'datenaissance' => $userEntity[0]->getDateNaissance(), 'iscoach' => $userEntity[0]->getIsCoach(), 'img' => 'test'];
-                return $this->render('./page/home.html.twig', [
-                    'css' => $this->preference->getCookie(),
-                    'pp' => 'test',
-//                    'user' => $this->userMgr->getCurrentUser()->getUsername(),
-//                    'role' => $this->userMgr->getCurrentUser()->getRole()
-                ]);
-            }
-            else{
-                $error [] = "Erreur de connexion. Essayez encore"; 
-
-                return $this->render('./page/login.html.twig',[
-                    'css' => $this->preference->getCookie(),
-                    'login_error'=> $error,
-                ]);
-            }
-
-            // should only cath a type of Exception not all
         } catch (\Throwable $th) {
-            $error [] =$th->getMessage();
+            $error = "Wrong cred";
-            return $this->render('./page/login.html.twig',[
+        }
-                'css' => $this->preference->getCookie(),
-                'login_error'=> $error,
-            ]);
         
+        if($this->container->get(UserManager::class)->login($log,$mdp)){
+            return $this->redirectToRoute('/');
         }
+        else{
+            $error [] = "Erreur de connexion. Essayez encore"; 
+        }
+        return $this->render('./page/login.html.twig', ['error' => $error]);
+        
+        
         
     }
-    #[Route('/login', name: 'login2',methods: ['GET'])]
+
-    public function login2(IRequest $request): IResponse {
+    #[Route('/log', name: 'baseLog',methods: ['GET'])]
+    public function index(IRequest $request): IResponse { 
 
         return $this->render('./page/login.html.twig',[
-            'css' => $this->preference->getCookie()
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
         ]);
 
     }
-    #[Route('/register', name: 'register2' , methods:['GET'])]
-    public function register2(IRequest $request): IResponse{
-        return $this->render('./page/register.html.twig',[
-            'css' => $this->preference->getCookie()
-        ]);
-    }
 
-    #[Route('/register', name: 'register' , methods:['POST'])]
+    #[Route('/register', name: 'register' , methods:['GET'])]
-    public function register(
+    public function register(IRequest $request): IResponse
-        string $nom,
-        string $prenom,
-        string $username,
-        string $mail,
-        string $motDePasse,
-        string $sexe,
-        float $taille,
-        float $poids,
-        string $dateNaissance,
-        string $roleName,
-        IRequest $request): IResponse
     {
-        $error = [];
+        if ($request->getMethod() == 'POST') {
+            $nom = $request->getBody()['nom'];
+    
+            $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'];
+
 
-        try {
             $registrationData = [
                 'nom' => $nom,
                 'prenom' => $prenom,
                 'username' => $username,
-                'email' => $mail,
+                'email' => $email,
                 'sexe' => $sexe,
                 'taille' => $taille,
                 'poids' => $poids,
-                'dateNaissance' =>  $dateNaissance,
+                'dateNaissance' => $dateNaissance,
                 'roleName' => $roleName
             ];
 
-            if ($this->userMgr->register($mail, $motDePasse, $registrationData) ) {
+            try {
-                return new RedirectResponse('/');
+                if ($this->container->get(UserManager::class)->register($email, $motDePasse, $registrationData)) {
-            } else {
+                    return $this->redirectToRoute('/');
-                $error [] = 'L\'inscription a échoué. Veuillez réessayer.';
+                } else {
             
-                return $this->render('./page/register.html.twig',[
+                    $error [] = 'L\'inscription a échoué. Veuillez réessayer.';
-                    'css' => $this->preference->getCookie(),
+                }
-                    'register_error'=> $error,
+            } catch (\Exception $e) {
-                ]);
+                $error [] = 'Erreur lors de l\'inscription: ' . $e->getMessage(); 
             }
-        } catch (\Throwable $e) {
-            $error [] =$e->getMessage();
-
-            return $this->render('./page/register.html.twig', ['css' => $this->preference->getCookie(),"register_error" => $error ]);
-
         }
 
-
+        return $this->render('/register.html.twig');
     }
 
-//string $ancienMotDePasse,string $nouveauMotDePasse,string $confirmerMotDePasse,
+    #[Route(path: '/mdp', name: 'mdp', methods: ['POST'])]
-
+    public function mdp(string $ancienMotDePasse,string $nouveauMotDePasse,string $confirmerMotDePasse, IRequest $req): Response
-    #[Route(path: '/forgetPassword', name: 'forget-password2', methods: ['GET'])]
-    public function forgetPassword2(IRequest $request): IResponse
     {
-        return $this->render('./page/password.html.twig',[
-            'css' => $this->preference->getCookie(),
-        ]);
-    }
         
-    #[Route(path: '/forgetPassword', name: 'forget-password', methods: ['POST'])]
+       // CONFIRMER LES DONNESS !!!!! IMPORTANT
-    public function forgetPassword(string $mail, IRequest $request): IResponse
-    {
 
-        return $this->render('./page/password.html.twig',[
+        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: '/logout', name: 'logout', methods: ['GET'])]
-    public function logout(IRequest $request): IResponse
-    {
-        $error = [];
-
-        try {
    
-            if($this->userMgr->deconnecter()){
-                return new RedirectResponse('/');
-            }
-            else{
-                $error [] = "Erreur de deconnexion. Essayez encore"; 
-                return new RedirectResponse('/');
-            }
 
-        } catch (\Throwable $th) {
-            $error [] =$th->getMessage();
-            return new RedirectResponse('/');
-        }       
-    }
     
 }
 ?>

Sources/src/app/controller/BaseController.php

@@ -8,14 +8,13 @@ use App\Router\Response\RedirectResponse;
 use App\Router\Response\Response;
 use Psr\Container\ContainerInterface;
 
-use Shared\Log;
+
 abstract class BaseController
 {
 
     protected Preferences $preference;
 
     public function __construct(){
-
         $this->preference = new Preferences();
     }
     protected ContainerInterface $container;
@@ -63,5 +62,18 @@ abstract class BaseController
         return new RedirectResponse($url, $status);
     }
 
+    protected function redirectToRoute(string $route, array $parameters = [], int $status = 302): RedirectResponse
+    {
+        return $this->redirect($this->generateUrl($route, $parameters), $status);
+    }
+
+    /*
+     * TODO : Should hanle ierror if the route is not existing
+     * */
+    protected function generateUrl(string $route, array $parameters = []): string
+    {
+        return $this->container->get(\App\Router\Router::class)->generate($route, $parameters);
+    }
+
 
 }

Sources/src/app/controller/CoachController.php

@@ -1,35 +1,49 @@
 <?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 Manager\DataManager;
+// 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
-{
 
-//    private ICoachManager $coachManager;
+// #[Route(path: '/coach', name: 'coach')]
-//    private $security;
+// class CoachController extends BaseController
-//    private Environment $twig;
+// {
-    protected Preferences $preference;
 
-    public function __construct()
+//     private ICoachManager $coachManager;
-    {
+//     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
 //     {
@@ -37,145 +51,41 @@ class CoachController extends BaseController
 //         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' => "Coach",
+//         'role' => "Athlète",
-            '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
@@ -211,4 +121,4 @@ class CoachController extends BaseController
 //     // }
 
     
-}
+// }

Sources/src/app/controller/Controller.php

@@ -1,423 +0,0 @@
-<?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
-//{
-//
-//    #[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: '/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: '/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: '/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: '/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: '/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/FrontController.php

@@ -48,7 +48,6 @@ class FrontController {
              $this->handleError(404, $e->getMessage());
         }
         catch(\Throwable $e){
-            Log::dd($e->getLine() . $e->getFile() . $e->getMessage() );
             $this->handleError(501, $e->getMessage());
         }
     }
@@ -66,7 +65,7 @@ class FrontController {
     // TODO : Don't work need Antoine help
     private function handleError(int $statusCode, $message) : void {
         if (!$this->container->has(\Twig\Environment::class)) {
-            throw new \LogicException('You cannot use the "renderView" method if the Twig Bundle is not available. Try running "composer require ".');
+            throw new \LogicException('You cannot use the "renderView" method if the Twig Bundle is not available. Try running "composer require symfony/twig-bundle".');
         }
 
         $response = new Response($this->container->get(\Twig\Environment::class)->render('./error/error.html.twig',['title'=> $message , "code" => $statusCode, "name" => $message, "descr" => $message ]),$statusCode);

Sources/src/app/controller/HeartRateController.php

@@ -1,94 +1,36 @@
 <?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\IResponse;
+// use App\Router\Response\Response;
-use App\Router\Response\RedirectResponse;
+// use Shared\Attributes\Route;
-use App\Router\Response\Response;
+// use Twig\Environment;
-use Manager\ActivityManager;
+// use Data\Core\Preferences;
-use Shared\Attributes\Route;
+// use Shared\Log;
-use Twig\Environment;
+
-use Data\Core\Preferences;
+// class HeartRateController extends BaseController
-use Shared\Log;
+// {
-
+
-class HeartRateController extends BaseController
+
-{
+//     #[Route(path: '/import', name: 'import', methods: ['GET'])]
-    private ActivityManager $activityMgr;
+//     public function import(): Response
-
+//     {
-    public function __construct(ActivityManager $manager)
+//         return $this->render('./page/import.html.twig',[
-    {
+//             'css' => $this->preference->getCookie(),
-        parent::__construct();
+//             'pp' => "test2",
-        $this->activityMgr = $manager;
+//             'user' => "Doe",
-    }
+//             'role' => "Athlète",
-
+//             'friendship' => [],
-    #[Route(path: '/import', name: 'import', methods: ['GET'])]
+//             'analyzes' => [],
-    public function import(): Response
+//             'mails' => [],
-    {
+//             'users' => [],
-        return $this->render('./page/import.html.twig', [
+//             'infoUser' => [],
-            'css' => $this->preference->getCookie(),
+//             'exos' => [],
-            'pp' => "test2",
+//             'member' => []
-            'user' => "Doe",
+//         ]);
-            'role' => "Athlète",
+//     }
-            'friendship' => [],
+
-            'analyzes' => [],
+    
-            'mails' => [],
+// }
-            'users' => [],
-            'infoUser' => [],
-            'exos' => [],
-            'member' => []
-        ]);
-    }
-    
-    #[Route(path: '/upload', name: 'upload', methods: ['POST'])]
-    public function uploadFile(string $activityType, int $effort, IRequest $req): IResponse
-    {
-        $error = $this->validateRequest($effort);
-        if (!empty($error)) {
-            return $this->renderError($error);
-        }
-
-        $tmp_file = $_FILES['uploaded_file']['tmp_name'];
-        if (!$this->isValidFile($tmp_file)) {
-            return $this->renderError(['Failed to get file be sure that you provide the file']);
-        }
-
-        $content = file_get_contents($tmp_file);
-        try {
-
-            if ($this->activityMgr->uploadFile($activityType, 5, $content)) {
-                return new RedirectResponse('/home');
-            }
-        } catch (\Exception $e) {
-            return $this->renderError([$e->getMessage()]);
-        }
-
-        return $this->renderError(['Failed to save activity.']);
-    }
-
-    private function validateRequest(int $effort): array
-    {
-        $error = [];
-        if ($effort < 0 || $effort > 5) {
-            $error[] = 'Invalid effort level.';
-        }
-        $fileExtension = pathinfo($_FILES['uploaded_file']['name'], PATHINFO_EXTENSION);
-        if ($fileExtension !== 'fit') {
-            $error[] = 'Invalid file type. Only .fit files are allowed.';
-        }
-        return $error;
-    }
-
-    private function isValidFile(string $tmp_file): bool
-    {
-        return file_exists($tmp_file) && is_uploaded_file($tmp_file);
-    }
-
-    private function renderError(array $error): Response
-    {
-        // Consolidez la logique de rendu ici
-        return $this->render('./error/error.html.twig', ['title'=> "Failed" , "code" => 400, "name" => "error import", "descr" => $error[0] ], new Response('$error', 400));
-
-    }
-}

Sources/src/app/controller/SocialController.php

@@ -1,66 +1,19 @@
 <?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 Database\AthleteGateway;
+// use App\Router\Response\IResponse;
-use Database\AthleteMapper;
-use Database\Connexion;
-use Database\NotificationGateway;
-use Database\NotificationMapper;
-use Shared\Attributes\Route;
-use Twig\Environment;
-use Data\Core\Preferences;
-use Shared\Log;
 
-class SocialController extends BaseController
+// use Shared\Attributes\Route;
-{
+// use Twig\Environment;
-    protected Preferences $preference;
+// use Data\Core\Preferences;
+// use Shared\Log;
 
-    public function __construct(){
-        $this->preference = new Preferences();
-    }
 
-    #[Route(path: '/notification', name: 'notification', methods: ['GET'])]
-    public function mail(): Response
-    {
-        try {
-            $notificationGateway = new NotificationGateway(new Connexion(DSN, DB_USER, DB_PASSWORD));
-            $listSearch = $notificationGateway->getNotifications();
-            $map = new NotificationMapper();
-            $notificationEntity = $map->notificationSqlToEntity($listSearch);
 
-            $listUsers = [];
+// #[Route(path: '/coach', name: 'coach')]
-
+// class CoachController extends BaseController
-            foreach ($notificationEntity as $entity) {
+// {
-                $notification = $map->notificationEntityToModel($entity);
-                $listUsers[] = ['idnotif' => $notification->getId(), 'message' => $notification->getMessage(),
-                    'date' => $notification->getDate()->format("D j F Y"),'statut' => $notification->getStatut(), 'urgence' => $notification->getUrgence(),
-                    'idathlete' => $notification->getToUserId()];
-            }
-
-            $response = $this->render('./page/notification.html.twig',[
-                'css' => $this->preference->getCookie(),
-                'pp' => "test2",
-                'user' => "Doe",
-                'role' => "Athlète",
-                'friendship' => [],
-                'analyzes' => [],
-                'mails' => $listUsers,
-                'users' => [],
-                'infoUser' => [],
-                'exos' => [],
-                'member' => []
-            ]);
-
-        } catch (\Throwable $th) {
-            throw $th;
-            return $this->render("notification.html.twig", ['tabError' => $taberror]);
-        }
-        return $response;
-    }
-
-    
-}

Sources/src/app/controller/UserController.php

@@ -4,147 +4,20 @@ namespace App\Controller;
 
 use App\Container;
 use App\Router\Request\IRequest;
-use App\Router\Response\RedirectResponse;
 use App\Router\Response\Response;
-use App\Router\Response\IResponse;
-
-use App\Router\Session;
-use DateInterval;
-use DateTime;
-use Manager\UserManager;
 use Shared\Attributes\Route;
-use Shared\Validation;
 use Twig\Environment;
 use Data\Core\Preferences;
 use Shared\Log;
-use function PHPUnit\Framework\isEmpty;
-use Database\Athletegateway;
-use Database\Connexion;
 
 class UserController extends BaseController
 {
 
-    private UserManager $userMgr;
-    public function __construct(UserManager $manager){
-        parent::__construct();
-        $this->userMgr =  $manager;
-    }
 
-    #[Route(path: '/', name: 'index', methods: ['GET'])]
+    #[Route(path: '/', name: 'home', 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
-    {
-        $athleteGateway = new AthleteGateway(new Connexion(DSN, DB_USER, DB_PASSWORD));
-        $activity = $athleteGateway->getListActivity('1');//$currentUser->getId()
-
-//        $charts = [];
-//        $i = 0;
-//        while ($i <= 12) {
-//            if ($activity[$i]['mois'] == null) {
-//                $activity[$i]['mois'] = $i;
-//                $activity[$i]['nbactivite'] = 0;
-//            } elseif (($indice = intval($activity[$i]['mois'])) != $i) {
-//                $temp = $activity[$i]; // Stocker temporairement les données actuelles
-//                $activity[$i]['mois'] = $i;
-//                $activity[$i]['nbactivite'] = 0;
-//                $activity[$indice]['mois'] = $indice;
-//                $activity[$indice]['nbactivite'] = $temp['nbactivite']; // Restaurer les données
-//            }
-//            $charts[] = ['act' => $activity[$i]['nbactivite'], 'mois' => $activity[$i]['mois']];
-//            $i++;
-//        }
-
-        $charts = [];
-        $monthNames = [
-            'Janvier', 'Fevrier', 'Mars', 'Avril', 'Mai', 'Juin',
-            'Juillet', 'Aout', 'Septembre', 'Octobre', 'Novembre', 'Decembre'
-        ];
-
-        $currentDate = new DateTime();
-        $interval = new DateInterval('P1M'); // Période d'un mois
-
-        for ($i = 0; $i < 12; $i++) {
-            $currentMonth = $currentDate->format('n'); // Format numérique du mois (1 à 12)
-            $currentMonthName = $monthNames[$currentMonth - 1]; // Mois correspondant dans le tableau
         
-            // Recherche de l'indice du mois dans le tableau $activity
-            $activityIndex = null;
-            for ($j = 0; $j < count($activity); $j++) {
-                if (!empty($activity[$j]['mois']) && $activity[$j]['mois'] == $currentMonth) {
-                    $activityIndex = $j;
-                    break;
-                }
-            }
-
-            // Récupération du nombre d'activités et réinitialisation à 0
-            $nbActivity = isset($activityIndex) ? $activity[$activityIndex]['nbactivite'] : 0;
-            if (isset($activityIndex)) {
-                $activity[$activityIndex]['nbactivite'] = 0;
-            }
-//            Log::dd($currentMonth);
-            $charts[] = ['act' => $nbActivity, 'mois' => $currentMonth];
-            $currentDate->sub($interval);
-        }
-
-// Inverser l'ordre des éléments si nécessaire
-        $charts = array_reverse($charts);
-
-//        Log::dd($charts);
-
-//
-//        $charts = [];
-//        $monthNames = [
-//            'Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin',
-//            'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre'
-//        ];
-//
-//        $currentDate = new DateTime();
-//        $interval = new DateInterval('P1M'); // Période d'un mois
-//
-//        for ($i = 0; $i < 12; $i++) {
-////            $currentDate; // Soustraire un mois
-////            Log::dd($currentDate);
-//            $currentMonth = $currentDate->format('n'); // Format numérique du mois (1 à 12)
-////            Log::dd($currentMonth);
-//            $currentMonthName = $monthNames[$currentMonth - 1]; // Mois correspondant dans le tableau
-//            for($j = 12; $j > 0; $j--) {
-//                if(!empty($activity[$j]['mois']) || $activity[$j]['mois'] == $currentMonth) {
-//                    $nbAct = $activity[$j]['nbactivite'];
-//                    $activity[$j]['nbactivite'] = 0;
-////                    Log::dd($activity);
-//                    break;
-//                }
-//            }
-//
-//            $nbActivity = isset($nbAct) ? $nbAct : 0;
-////            Log::dd($nbActivity);
-//
-//            $charts[] = ['act' => $nbActivity, 'mois' => $currentMonthName];
-//            $currentDate->sub($interval);
-//        }
-//        Log::dd($charts);
-
-// Inverser l'ordre des éléments si nécessaire
-//        $charts = array_reverse($charts);
-//
-//        Log::dd($charts);
         return $this->render('./page/home.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",
@@ -152,7 +25,6 @@ class UserController extends BaseController
             'role' => "Athlète",
             'friendship' => [],
             'analyzes' => [],
-            'charts' => $charts,
             'mails' => [],
             'users' => [],
             'infoUser' => [],
@@ -180,28 +52,10 @@ 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);
@@ -221,25 +75,4 @@ class UserController extends BaseController
         ]);
     }
     
-//    #[Route(path: '/logout', name: 'logout', methods: ['GET'])]
-//    public function logout(IRequest $request): IResponse
-//    {
-//        $error = [];
-//
-//        try {
-//
-//            if($this->userMgr->deconnecter()){
-//                return new RedirectResponse('/');
-//            }
-//            else{
-//                $error [] = "Erreur de deconnexion. Essayez encore";
-//                return new RedirectResponse('/');
-//            }
-//
-//        } catch (\Throwable $th) {
-//            $error [] =$th->getMessage();
-//            return new RedirectResponse('/');
-//        }
-//    }
-    
 }

Sources/src/app/router/Router.php

@@ -1,15 +1,12 @@
 <?php
 
 namespace App\Router;
-
 use App\Router\Request\IRequest;
-
 /**
  * Router class to manage a collection of routes in the application.
  * It provides functionalities to add routes and check if a given URL matches any of the defined routes.
  */
-class Router
+class Router {
-{
 
     /**
      * The base path for routing.
@@ -37,8 +34,7 @@ class Router
      *
      * @param string $path The base path for the router.
      */
-    public function __construct(string $path = "/PHP/project/index.php")
+    public function __construct(string $path = "/PHP/project/index.php") {
-    {
         $this->path = $path;
         $this->routes = new \AltoRouter();
     }
@@ -50,8 +46,7 @@ class Router
      * @param Route $route The route object.
      * @throws \InvalidArgumentException If method is not supported.
      */
-    public function add(string $method, Route $route)
+    public function add(string $method, Route $route) {
-    {
         if (!in_array($method, self::$verbs)) {
             throw new \InvalidArgumentException("Method not supported");
         }
@@ -60,27 +55,19 @@ class Router
     
     /**
      * Adds a route for a controller action.
-     * TODO : the problème is that AltoRouter is a map so i can't have mutilple Route just by doing this:(i need to find a logic to resolve this beavior)     #[Route('/login', name: 'login',methods: ['POST','GET'])]
+     *
-     * @param string|array $methods HTTP method.
+     * @param string $method The HTTP method.
      * @param string $path The path for the route.
      * @param mixed $controller The controller object.
      * @param string $action The action method in the controller.
      * @param string $name (Optional) The name of the route.
      * @throws \InvalidArgumentException If method is not supported.
      */
-    public function addControllerRoute(string|array $methods, string $path, $controller, string $action, string $name = '')
+    public function addControllerRoute(string $method, string $path, $controller, string $action, string $name = '') {
-    {
+        if (!in_array($method, self::$verbs)) {
-
+            throw new \InvalidArgumentException("Method not supported");
-        if (is_string($methods)) {
-            $methods = [$methods]; // Convert to an array if it's a string
-        }
-
-        foreach ($methods as $method) {
-            if (!in_array($method, self::$verbs)) {
-                throw new \InvalidArgumentException("Method not supported");
-            }
-            $this->routes->map($method, $path, [$controller, $action], $name);
         }
+        $this->routes->map($method, $path, [$controller, $action], $name);
     }
 
     // TODO: Implement the extractParams method.
@@ -93,8 +80,7 @@ class Router
      * @param callable $callable The callback function.
      * @param string $name The name of the route.
      */
-    public function get(string $path, callable $callable, $name)
+    public function get(string $path, callable $callable, $name) {
-    {
         $this->routes->map('GET', $path, $callable, $name);
     }
 
@@ -106,8 +92,7 @@ class Router
      * @param IRequest $request The request object.
      * @return array|null The matched route or null if no match.
      */
-    public function match(IRequest $request): ?array
+    public function match(IRequest $request): ?array {
-    {
         return $this->routes->match($request->getRequestUri(), $request->getMethod()) ?: null;
     }
 
@@ -116,15 +101,14 @@ class Router
      *
      * @return array The array of routes.
      */
-    public function getRoutes()
+    public function getRoutes() {
-    {
         return []; // TODO: Implement the actual logic to return routes.
     }
 
 
-    public function generate(string $routeName, array $params = array()): string
+    public function generate (string $routeName, array $params = array()): string
     {
-        return $this->routes->generate($routeName, $params);
+        return $this->routes->generate($routeName,$params);
     }
 
 }

Sources/src/app/router/Session.php

@@ -111,7 +111,8 @@ class Session
         if ( $this->sessionState == self::SESSION_STARTED )
         {
             $this->sessionState = !session_destroy();
-            session_unset(); // Clear all session variables            
+            unset( $_SESSION );
+            
             return !$this->sessionState;
         }
         

Sources/src/app/router/middleware/AuthMiddleware.php

@@ -2,24 +2,26 @@
 
 namespace App\Router\Middleware;
 use App\Router\Session;
-use Network\IAuthService;
 use Shared\Log;
 use App\Router\Request\IRequest;
 use App\Router\Response\RedirectResponse;
 class AuthMiddleware extends Middleware {
-
-    private IAuthService $auth;
-    public function __construct(IAuthService $auth) {
-        $this->auth = $auth;
-    }
     public function handle(IRequest $request, callable $next) {
-        $excludedUrls = ['/login', '/register','/forgetPassword', '/'];
+        // if (isset($_SESSION['user'])) {
-//        Log::dd($this->auth->getCurrentUser());
+        //     $resp =new RedirectResponse("/");
-        if ($this->auth->getCurrentUser() === null && !in_array($request->getRequestUri(), $excludedUrls)) {
+        //     $resp->send();
-            $resp = new RedirectResponse("/login");
+        //     exit;
-            $resp->send();
+        // }
-            exit;
+//         La page n’est pas redirigée correctement
-        }        
+
+// Firefox a détecté que le serveur redirige la demande pour cette adresse d’une manière qui n’aboutira pas.
+
+//     La cause de ce problème peut être la désactivation ou le refus des cookies.
+        // if (!isset($_SESSION['user'])) {
+        //     $resp =new RedirectResponse("/log");
+        //     $resp->send();
+        //     exit;
+        // }
         return parent::handle($request, $next);
     }
 }

Sources/src/app/router/response/RedirectResponse.php

@@ -2,9 +2,6 @@
 
 namespace App\Router\Response;
 
-use App\Router\Session;
-use Shared\Log;
-
 class RedirectResponse implements IResponse
 {
     private $content;
@@ -52,7 +49,6 @@ class RedirectResponse implements IResponse
 
     public function send(): void
     {
-
         http_response_code($this->statusCode);
 
         foreach ($this->headers as $name => $value) {

Sources/src/app/router/response/Response.php

@@ -1,8 +1,6 @@
 <?php
 namespace App\Router\Response;
 
-use Shared\Log;
-
 class Response implements IResponse {
     private string $content;
     private int $statusCode;

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

@@ -1,6 +1,5 @@
 <!DOCTYPE html>
 <html lang="en">
-{#<<<<<<< HEAD#}
     <head>
         <meta charset="utf-8" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
@@ -35,78 +34,38 @@
                                                 <input class="form-check-input" id="inputRememberPassword" type="checkbox" value="" />
                                                 <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="btn btn-primary" href="index.html">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>
-{#<head>#}
+                                    </div>
-{#    <meta charset="utf-8" />#}
-{#    <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="description" content="" />#}
-{#    <meta name="author" content="" />#}
-{#    <title>{% block title %}{% endblock %}</title>#}
-{#    <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>#}
-{#</head>#}
-{#<body class="bg-primary">#}
-{#<div id="layoutAuthentication">#}
-{#    <div id="layoutAuthentication_content">#}
-{#        <main>#}
-{#            {% block main %}#}
-{#                <div class="container">#}
-{#                    <div class="row justify-content-center">#}
-{#                        <div class="col-lg-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-body">#}
-{#                                    <form>#}
-{#                                        <div class="form-floating mb-3">#}
-{#                                            <input class="form-control" id="inputEmail" type="email" placeholder="nom@exemple.com" />#}
-{#                                            <label for="inputEmail">Adresse eMail</label>#}
-{#                                        </div>#}
-{#                                        <div class="form-floating mb-3">#}
-{#                                            <input class="form-control" id="inputPassword" type="password" placeholder="Mot de passe" />#}
-{#                                            <label for="inputPassword">Mot de passe</label>#}
-{#                                        </div>#}
-{#                                        <div class="form-check mb-3">#}
-{#                                            <input class="form-check-input" id="inputRememberPassword" type="checkbox" value="" />#}
-{#                                            <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="btn btn-primary" href="index.html">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>#}
-{#>>>>>>> origin/merged_PLE#}
                                 </div>
                             </div>
                         </div>
                     </div>
-                </div>
+                    {% endblock %}
-            {% endblock %}
+                </main>
-        </main>
+            </div>
-    </div>
+            <div id="layoutAuthentication_footer">
-    <div id="layoutAuthentication_footer">
+                <footer class="py-4 bg-light mt-auto">
-        <footer class="py-4 bg-light mt-auto">
+                    <div class="container-fluid px-4">
-            <div class="container-fluid px-4">
+                        <div class="d-flex align-items-center justify-content-between small">
-                <div class="d-flex align-items-center justify-content-between small">
+                            <div class="text-muted">Copyright &copy; HeartTrack 2023</div>
-                    <div class="text-muted">Copyright &copy; HeartTrack 2023</div>
+                            <div>
-                    <div>
+                                <a href="#">Politique de confidentialité</a>
-                        <a href="#">Politique de confidentialité</a>
+                                &middot;
-                        &middot;
+                                <a href="#">Termes &amp; Conditions d'utilisations</a>
-                        <a href="#">Termes &amp; Conditions d'utilisations</a>
+                            </div>
+                        </div>
                     </div>
-                </div>
+                </footer>
             </div>
-        </footer>
+        </div>
-    </div>
+        <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>
-<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></script>
+    </body>
-<script src="js/scripts.js"></script>
-</body>
 </html>

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

@@ -7,12 +7,9 @@
         <meta name="description" content="Accueil" />
         <meta name="author" content="PINAGOT Antoine" />
         <title>{% block title %}{% endblock %}</title>
-        <link href="https://unpkg.com/tailwindcss@^2/dist/tailwind.min.css" rel="stylesheet">
-
         <link href="https://cdn.jsdelivr.net/npm/simple-datatables@7.1.2/dist/style.min.css" rel="stylesheet" />
-        <link href="/css/{% block css %}styles{% endblock %}.css" rel="stylesheet" />
+        <link href="/css/{% block css %}style{% endblock %}.css" rel="stylesheet" />
         <script src="https://use.fontawesome.com/releases/v6.3.0/js/all.js" crossorigin="anonymous"></script>
-        <link rel="stylesheet" href="https://unpkg.com/leaflet/dist/leaflet.css" />
     </head>
 <body class="sb-nav-fixed">
     <nav class="sb-topnav navbar navbar-expand navbar-dark bg-dark">
@@ -38,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="/">Déconnexion</a></li>
+                        <li><a class="dropdown-item" href="/logout">Déconnexion</a></li>
                     </ul>
                 </li>
             </ul>
@@ -49,7 +46,7 @@
                     <div class="sb-sidenav-menu">
                         <div class="nav">
                             <div class="sb-sidenav-menu-heading">Menu</div>
-                            <a class="nav-link" href="/home">
+                            <a class="nav-link" href="/">
                                 <div class="sb-nav-link-icon"><img src="/assets/img/house.png"></div>
                                 Accueil
                             </a>
@@ -58,9 +55,9 @@
                                 <div class="sb-nav-link-icon"><img src="/assets/img/sprinter.png"></div>
                                 Exercices
                             </a>
-                            <a class="nav-link" href="/activity">
+                            <a class="nav-link" href="/analyses">
                                 <div class="sb-nav-link-icon"><i class="fas fa-chart-area"></i></div>
-                                Activités
+                                Analyses
                             </a>
                             <div class="sb-sidenav-menu-heading">Social</div>
                             <a class="nav-link" href="/friendlist">
@@ -71,7 +68,7 @@
                                 <div class="sb-nav-link-icon"><img src="/assets/img/coaching.png"></div>
                                 Coaching
                             </a>
-                            <a class="nav-link" href="/notification">
+                            <a class="nav-link" href="/mail">
                                 <div class="sb-nav-link-icon"><img src="/assets/img/letter.png"></div>
                                 Messagerie
                             </a>

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

@@ -21,7 +21,7 @@
                                     <h1 class="display-1">{% block nb %}{% endblock %}</h1>
                                     <p class="lead">{% block name %}{% endblock %}</p>
                                     <p>{% block descr %}{% endblock %}</p>
-                                    <a href="/home">
+                                    <a href="/">
                                         <i class="fas fa-arrow-left me-1"></i>
                                         Retour à l'accueil
                                     </a>

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

@@ -4,84 +4,30 @@
 
 {% block css %}{{css}}{% endblock %}
 
-{% block title %}Analyses - HearthTrack{% endblock %}
+{% block title %}Exercices - HearthTrack{% endblock %}
 
 {% block user %}{{user}} - {{role}}{% endblock %}
 
 {% block body %}
-    <div class="container-fluid px-4">
+<div class="container-fluid px-4">
-        <h1 class="mt-4">Analyses</h1>
+    <h1 class="mt-4">Exercices</h1>
         <ol class="breadcrumb mb-4">
-            <li class="breadcrumb-item"><a href="/home">Accueil</a></li>
+            <li class="breadcrumb-item"><a href="/">Accueil</a></li>
-            <li class="breadcrumb-item active">Analyses</li>
+            <li class="breadcrumb-item active">Exercices</li>
         </ol>
-        <div class="card-body">
-            <div class="datatable-container">
-                <table id="datatablesSimple" class="datatable-table">
-                    <thead>
-                    <tr>
-                        <th>Date</th>
-                        <th>Heure de début</th>
-                        <th>Heure de fin</th>
-                        <th>Type</th>
-                        <th>effort ressenti</th>
-                        <th>Variabilité</th>
-                        <th>Variance</th>
-                        <th>Ecart type</th>
-                        <th>Moyenne</th>
-                        <th>Maximum</th>
-                        <th>Minimum</th>
-                        <th>Temperature moyenne</th>
-                        <th></th>
-                    </tr>
-                    </thead>
-                    <tfoot>
-                    <tr>
-                        <th>Date</th>
-                        <th>Heure de début</th>
-                        <th>Heure de fin</th>
-                        <th>Type</th>
-                        <th>effort ressenti</th>
-                        <th>Variabilité</th>
-                        <th>Variance</th>
-                        <th>Ecart type</th>
-                        <th>Moyenne</th>
-                        <th>Maximum</th>
-                        <th>Minimum</th>
-                        <th>Temperature moyenne</th>
-                    </tr><tr></tr>
         
-                    </tfoot>
+            <div class="card-body">
-                    <tbody>
+                            <div class="datatable-container">                                
-                    {% for analyze in analyzes %}
+                            	<form method="post" action="/exercices">
-                        <tr>
+                                    Type : <input type="text" name="type"/>
-                            <td>{{analyze.date}}</td>
+                                    Intensité : <input type="text" name="intensite"/>
-                            <td>{{analyze.heureDebut}}</td>
+                                    Date : <input type="text" name="date"/>
-                            <td>{{analyze.heureFin}}</td>
+                                    <button class="btn btn-primary btn-mrg" id="btnNavbarSearch" type="submit">Ajouter l'exercice</button>
-                            <td>{{analyze.type}}</td>
+                                </form>
-                            <td>{{analyze.effortRessenti}}</td>
+                            </div>
-                            <td>{{analyze.variabilite}}</td>
+                        </div>
-                            <td>{{analyze.variance}}</td>
+                </div>
-                            <td>{{analyze.ecartType}}</td>
+          </div>
-                            <td>{{analyze.moyenne}} Bpm</td>
-                            <td>{{analyze.max}} Bpm</td>
-                            <td>{{analyze.min}} Bpm</td>
-                            <td>{{analyze.temperature}} °C</td>
-                            <td><a href="/analyze?id={{ analyze.idactivity }}">En savoir plus</a></td>
-                        </tr>
-                    {% endfor %}
-                    </tbody>
-                </table>
-            </div>
-        </div>
     </div>
-    </div>
+    <h1>{{responce}}</h1>
-    </div>
-{% endblock %}
-
-{% block script %}
-    <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>
-    <script src="https://cdn.jsdelivr.net/npm/simple-datatables@7.1.2/dist/umd/simple-datatables.min.js" crossorigin="anonymous"></script>
-    <script src="js/datatables-simple-demo.js"></script>
 {% endblock %}

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

@@ -12,7 +12,7 @@
 <div class="container-fluid px-4">
     <h1 class="mt-4">Liste d'ami</h1>
         <ol class="breadcrumb mb-4">
-            <li class="breadcrumb-item"><a href="/home">Accueil</a></li>
+            <li class="breadcrumb-item"><a href="/">Accueil</a></li>
             <li class="breadcrumb-item active">Ami</li>
         </ol>
         

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

@@ -12,7 +12,7 @@
 <div class="container-fluid px-4">
     <h1 class="mt-4">Coaching</h1>
         <ol class="breadcrumb mb-4">
-            <li class="breadcrumb-item"><a href="/home">Accueil</a></li>
+            <li class="breadcrumb-item"><a href="/">Accueil</a></li>
             <li class="breadcrumb-item active">Coaching</li>
         </ol>
         

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

@@ -4,151 +4,63 @@
 
 {% block css %}{{css}}{% endblock %}
 
-{% block title %}Exercices - HearthTrack{% endblock %}
+{% block title %}Analyses - HearthTrack{% endblock %}
 
 {% block user %}{{user}} - {{role}}{% endblock %}
 
 {% block body %}
-    <div class="container-fluid px-4">
+<div class="container-fluid px-4">
-        <h1 class="mt-4">Exercices</h1>
+    <h1 class="mt-4">Analyses</h1>
         <ol class="breadcrumb mb-4">
-            <li class="breadcrumb-item"><a href="/home">Accueil</a></li>
+            <li class="breadcrumb-item"><a href="/">Accueil</a></li>
-            <li class="breadcrumb-item active">Exercices</li>
+            <li class="breadcrumb-item active">Analyses</li>
-            <script src="https://unpkg.com/leaflet/dist/leaflet.js"></script>
         </ol>
-        <div class="card-body">
+                             <div class="card-body">
-{#            <table id="datatablesSimple" class="datatable-table">#}
+                            <div class="datatable-container">                                
-{#                <thead>#}
+                            	<table id="datatablesSimple" class="datatable-table">
-{#                <tr>#}
+                                    <thead>
-{#                    <th>id FC</th>#}
+                                        <tr>
-{#                    <th>altitude</th>#}
+                                            <th>Date</th>
-{#                    <th>temps</th>#}
+                                            <th>Type</th>
-{#                    <th>Temperature</th>#}
+                                            <th>BMP</th>
-{#                    <th>bpm</th>#}
+                                            <th>KM/H</th>
-{#                    <th>longitude</th>#}
+                                            <th>Distance</th>
-{#                    <th>latitude</th>#}
+                                            <th></th>
-{#                    <th>activiteid</th>#}
+                                        </tr>
-{#                    <th></th>#}
+                                    </thead>
-{#                </tr>#}
+                                    <tfoot>
-{#                </thead>#}
+                                        <tr>
-{#                {% for analyze in analyzes %}#}
+                                            <th>Date</th>
-{#                <tbody>#}
+                                            <th>Type</th>
-{#                    <tr>#}
+                                            <th>BPM</th>
-{#                        <td>{{analyze.idfc}}</td>#}
+                                            <th>KM/H</th>
-{#                        <td>{{analyze.altitude}}</td>#}
+                                            <th>Distance</th>
-{#                        <td>{{analyze.temps}}</td>#}
+                                            </tr><tr></tr>
-{#                        <td>{{analyze.temperature}}</td>#}
-{#                        <td>{{analyze.bpm}}</td>#}
-{#                        <td>{{analyze.longitude}}</td>#}
-{#                        <td>{{analyze.latitude}}</td>#}
-{#                        <td>{{analyze.activiteid}}</td>#}
-{#                        <td><a href="/home">Home</a></td>#}
-{#                    </tr>#}
-{#                </tbody>#}
-{#                {% endfor %}#}
-{#            </table>#}
-{#            <div>#}
-{#                <canvas id="myChart" width="400" height="200">#}
-{#                    <p>Hello Fallback World</p>#}
-{#                </canvas>#}
-{#            </div>#}
-{#            <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>#}
-{#            <script>#}
-{#                const ctx = document.getElementById('myChart');#}
                                         
-{#                new Chart(ctx, {#}
+                                    </tfoot>
-{#                    type: 'line',#}
+                                    <tbody>
-{#                    data: {#}
+                                    {% for analyze in analyzes %}
-{#                        labels: [#}
+                                        <tr>
-{#                            {% for analyze in analyzes %}#}
+                                            <td>{{analyze.date}}</td>
-{#                                {{analyze.temps}}#}
+                                            <td>{{analyze.type}}</td>
-{#                            {% endfor %}#}
+                                            <td>{{analyze.bpm}}</td>
-{#                        ],#}
+                                            <td>{{analyze.kmh}} Km/H</td>
-{#                        datasets: [{#}
+                                            <td>{{analyze.distance}} Km</td>
-{#                            label: 'Batement par minute',#}
+                                            <td><a href="#about">En savoir plus</a></td>
-{#                            data: [#}
+                                        </tr>
-{#                                {% for analyze in analyzes %}#}
+                                        {% endfor %}
-{#                                    {{analyze.bpm}}#}
+                                    </tbody>
-{#                                {% endfor %}#}
+                                </table>
-{#                            ],#}
+                            </div>
-{#                            borderWidth: 1#}
+                        </div>
-{#                        }]#}
+                </div>
-{#                    },#}
+          </div>
-{#                    options: {#}
-{#                        scales: {#}
-{#                            y: {#}
-{#                                beginAtZero: true#}
-{#                            }#}
-{#                        }#}
-{#                    }#}
-{#                });#}
-{#            </script>#}
-            <div>
-                <canvas id="myChart" height="50">
-                    <p>Hello Fallback World</p>
-                </canvas>
-            </div>
-            <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-            <script>
-                const ctx = document.getElementById('myChart');
-                const labels = [
-                    {% for analyze in analyzes %}
-                    '{{ analyze.temps }}',
-                    {% endfor %}
-                ];
-                const data = [
-                    {% for analyze in analyzes %}
-                    {{ analyze.bpm }},
-                    {% endfor %}
-                ];
-
-                new Chart(ctx, {
-                    type: 'line',
-                    data: {
-                        labels: labels,
-                        datasets: [{
-                            label: 'Batement par minute',
-                            data: data,
-                            borderWidth: 1,
-                            tension: 0.2,
-                            fill: false,
-                            borderColor: 'rgb(255, 0, 0)'
-                        }]
-                    },
-                    options: {
-                        scales: {
-                            y: {
-                                beginAtZero: false
-                            }
-                        }
-                    }
-                });
-            </script>
-            <div class="card-body">
-                <div id="map" style="height: 500px;"></div>
-                <script>
-                    document.addEventListener("DOMContentLoaded", function () {
-                        {#var lat = {{ analyze.latitude }}#}
-                        var map = L.map('map').setView([45.75771709151474, 3.113484980409329], 14);
-                        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-                            attribution: '© OpenStreetMap contributors'
-                        }).addTo(map);
-
-                        {% for analyze in analyzes %}
-                        var marker = L.marker([{{ analyze.latitude }}, {{ analyze.longitude }}]).addTo(map);
-                        marker.bindPopup(`
-                            <strong>Date:</strong> {{ analyze.temps }}<br>
-                            <strong>FC:</strong> {{ analyze.bpm }}<br>
-                            <strong>Altitude:</strong> {{ analyze.altitude }}<br>
-                            <strong>Temperature:</strong> {{ analyze.temperature }}
-                        `);
-                        {% endfor %}
-                    });
-                </script>
-            </div>
-        </div>
-    </div>
     </div>
-    </div>
+{% endblock %}
-    <h1>{{responce}}</h1>
+
+{% block script %}
+		<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>
+        <script src="https://cdn.jsdelivr.net/npm/simple-datatables@7.1.2/dist/umd/simple-datatables.min.js" crossorigin="anonymous"></script>
+        <script src="js/datatables-simple-demo.js"></script>
 {% endblock %}

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

@@ -13,7 +13,7 @@
 <div class="container-fluid px-4">
     <h1 class="mt-4">Coaching</h1>
         <ol class="breadcrumb mb-4">
-            <li class="breadcrumb-item"><a href="/home">Accueil</a></li>
+            <li class="breadcrumb-item"><a href="/">Accueil</a></li>
             <li class="breadcrumb-item active">Coaching</li>
         </ol>
         <style>.btn-mrg{margin:15px; margin-left:83%}</style>

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

@@ -9,11 +9,10 @@
 {% block user %}{{user}} - {{role}}{% endblock %}
 
 {% block body %}
-
 <div class="container-fluid px-4">
     <h1 class="mt-4">Exercices</h1>
         <ol class="breadcrumb mb-4">
-            <li class="breadcrumb-item"><a href="/home">Accueil</a></li>
+            <li class="breadcrumb-item"><a href="/">Accueil</a></li>
             <li class="breadcrumb-item active">Exercices</li>
         </ol>
         <style>.btn-mrg{margin:15px; margin-left:85%}</style>
@@ -26,39 +25,18 @@
                                     <thead>
                                         <tr>
                                             <th>Date</th>
-                                            <th>Description</th>
+                                            <th>Type</th>
-                                            <th>Localisation</th>
+                                            <th>Intensité prévue</th>
-                                            <th>FeedBack</th>
+                                            <th>Status</th>
                                         </tr>
                                     </thead>
                                     <tbody>
-                                    <script src="https://unpkg.com/leaflet/dist/leaflet.js"></script>
                                     {% for exo in exos %}
                                         <tr>
-                                            <td>{{ exo.date }}</td>
+                                            <td>{{exo.date}}</td>
-                                            <td>{{ exo.description }}</td>
+                                            <td>{{exo.type}}</td>
-                                            <td>
+                                            <td>{{exo.intensite}}</td>
-                                                <div id="map-{{ loop.index }}"
+                                            <td>{{exo.status}}</td>
-                                                     data-lat=45.758285982369415
-                                                     data-lng=3.110223414416445
-                                                     style="height: 300px; width: 650px;"></div>
-                                                <script>
-                                                    document.addEventListener("DOMContentLoaded", function() {
-                                                        var map{{ loop.index }} = L.map('map-{{ loop.index }}').setView([45.75771709151474, 3.113484980409329], 14);
-                                                        L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-                                                            attribution: '© OpenStreetMap contributors'
-                                                        }).addTo(map{{ loop.index }});
-
-                                                        var marker{{ loop.index }} = L.marker([45.75771709151474, 3.113484980409329]).addTo(map{{ loop.index }});
-                                                        marker{{ loop.index }}.bindPopup(`
-                                                            <strong>Date:</strong> {{ exo.date }}<br>
-                                                            <strong>Description:</strong> {{ exo.description }}<br>
-                                                            <strong>Feedback:</strong> {{ exo.feedback }}
-                                                        `);
-                                                    });
-                                                </script>
-                                            </td>
-                                            <td>{{ exo.feedback }}</td>
                                         </tr>
                                     {% endfor %}
                                     </tbody>

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

@@ -12,7 +12,7 @@
 <div class="container-fluid px-4">
     <h1 class="mt-4">Liste d'ami</h1>
         <ol class="breadcrumb mb-4">
-            <li class="breadcrumb-item"><a href="/home">Accueil</a></li>
+            <li class="breadcrumb-item"><a href="/">Accueil</a></li>
             <li class="breadcrumb-item active">Ami</li>
         </ol>
         <style>.btn-mrg{margin:15px; margin-left:87%}</style>
@@ -26,7 +26,7 @@
                             	<table id="datatablesSimple" class="datatable-table">
                                 {% if friendship is empty %}
                                         <p>Vous n'avez aucun ami.</p>
-                                {% else %}
+                                    {% else %}
                                     <thead>
                                         <tr>
                                             <th></th>

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

@@ -21,85 +21,8 @@
                                         <i class="fas fa-chart-area me-1"></i>
                                         Stastiques globales
                                     </div>
-                                    <div>
+                                    <div class="card-body">
-                                        <canvas id="myChart" height="50" width="100">
+                                        {# <canvas id="myAreaChart" width="100%" height="40"></canvas> #}
-                                            <p>Hello Fallback World</p>
-                                        </canvas>
-                                    </div>
-                                    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-                                    <script>
-                                        const ctx = document.getElementById('myChart');
-                                        const labels = [
-                                            {% for chart in charts %}
-                                                {{ chart.mois }},
-                                            {% endfor %}
-                                        ];
-                                        const data = [
-                                            {% for chart in charts %}
-                                                {{ chart.act }},
-                                            {% endfor %}
-                                        ];
-
-                                        new Chart(ctx, {
-                                            type: 'line',
-                                            data: {
-                                                labels: labels,
-                                                datasets: [{
-                                                    label: 'Activité du mois',
-                                                    data: data,
-                                                    borderWidth: 1,
-                                                    tension: 0.2,
-                                                    fill: false,
-                                                    borderColor: 'rgb(255, 0, 0)'
-                                                }]
-                                            },
-                                            options: {
-                                                scales: {
-                                                    x: {
-                                                        // type: 'linear', // Utiliser une échelle linéaire pour les mois
-                                                        position: 'bottom'
-                                                    },
-                                                    y: {
-                                                        beginAtZero: true
-                                                    }
-                                                }
-                                            }
-                                        });
-
-                                        {#const ctx = document.getElementById('myChart');#}
-                                        {#const labels = [#}
-                                        {#    {% for chart in charts %}#}
-                                        {#    '{{ chart.mois }}',#}
-                                        {#    {% endfor %}#}
-                                        {#];#}
-                                        {#const data = [#}
-                                        {#    {% for chart in charts %}#}
-                                        {#    {{ chart.act }},#}
-                                        {#    {% endfor %}#}
-                                        {#];#}
-
-                                        {#new Chart(ctx, {#}
-                                        {#    type: 'line',#}
-                                        {#    data: {#}
-                                        {#        labels: labels,#}
-                                        {#        datasets: [{#}
-                                        {#            label: 'Activité du mois',#}
-                                        {#            data: data,#}
-                                        {#            borderWidth: 1,#}
-                                        {#            tension: 0.2,#}
-                                        {#            fill: false,#}
-                                        {#            borderColor: 'rgb(255, 0, 0)'#}
-                                        {#        }]#}
-                                        {#    },#}
-                                        {#    options: {#}
-                                        {#        scales: {#}
-                                        {#            y: {#}
-                                        {#                beginAtZero: true#}
-                                        {#            }#}
-                                        {#        }#}
-                                        {#    }#}
-                                        {#});#}
-                                    </script>
                                     </div>
                                 </div>
                             </div>

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

@@ -9,57 +9,34 @@
 {% block user %}{{user}} - {{role}}{% endblock %}
 
 {% block body %}
-    <div class="container-fluid px-4">
+<div class="container-fluid px-4">
-        <h1 class="mt-4">Importer</h1>
+                        <h1 class="mt-4">Importer</h1>
-        <ol class="breadcrumb mb-4">
+                        <ol class="breadcrumb mb-4">
-            <li class="breadcrumb-item"><a href="/">Accueil</a></li>
+                            <li class="breadcrumb-item"><a href="home.html">Accueil</a></li>
-            <li class="breadcrumb-item active">Importer</li>
+                            <li class="breadcrumb-item active">Importer</li>
-        </ol>
+                        </ol>
-        <div class="flex items-center justify-center">
+
-            <div class="sm:max-w-lg w-full p-10 bg-white rounded-xl z-10 ">
+                        <div class="row">
-                <div class="text-center">
+                            <div class="col">
-                    <h2 class="mt-5 text-3xl font-bold text-gray-900">
+                                <div class="card mb-4">
-                        Importer un fichier .fit !
+                                    <div class="card-header">
-                    </h2>
+                                        <img src="/assets/img/bupload.png"></i>
-                    <p class="mt-2 text-sm text-gray-400">Let's go</p>
+                                        Importer un fichier .fit
-                </div>
+                                    </div>
-                <form class="mt-8 space-y-3" action="/upload" method="POST" enctype="multipart/form-data">
+                                    <div class="card-body">
-                    <div class="grid grid-cols-1 space-y-2">
+                                    
-                        <label class="text-sm font-bold text-gray-500 tracking-wide">Veuillez renseigner le type d'activité</label>
+                                        <div style="text-align:center; margin-bottom: 15px;">
-                        <input class="text-base p-2 border border-gray-300 rounded-lg focus:outline-none focus:border-indigo-500" type="text" name="activityType" placeholder="Course à pied">
+                                            <label for="file-input">
-                    </div>
+                                                <img src="/assets/img/uploadW.svg"/>
-                    <div class="grid grid-cols-1 space-y-2">
+                                            </label>
-                        <label class="text-sm font-bold text-gray-500 tracking-wide">Effort Level (0-5)</label>
+                                            <form action="/analyses" method="post">
-                        <input class="text-base p-2 border border-gray-300 rounded-lg focus:outline-none focus:border-indigo-500" type="number" name="effort" min="0" max="5" placeholder="Enter effort level (0-5)">
+                                                <input id="file-input" type="file" name="fileToUpload" value=""style="visibility: hidden;  width:0;  height:0;"/> 
-                    </div>
+                                                <input type="submit" value="Soumettre le fichier" name="submit"/>  
-                    <div class="grid grid-cols-1 space-y-2">
+                                            </form>
-                        <label class="text-sm font-bold text-gray-500 tracking-wide">Attach Document</label>
+                                        </div>
-                        <div class="flex items-center justify-center w-full">
-                            <label class="flex flex-col rounded-lg border-4 border-dashed w-full h-60 p-10 group text-center cursor-pointer">
-                                <div class="h-full w-full text-center flex flex-col items-center justify-center items-center  ">
-                                    <div class="flex flex-auto max-h-48 w-2/5 mx-auto -mt-10">
-                                        <img class="has-mask h-36 object-center" src="https://img.freepik.com/free-vector/image-upload-concept-landing-page_52683-27130.jpg?size=338&ext=jpg" alt="freepik image">
                                     </div>
-                                    <p class="pointer-none text-gray-500 "><span class="text-sm">Drag and drop</span> files here <br /> or
-                                        <span class="text-blue-600 hover:underline">select a file</span>
-                                        from your computer</p>
                                 </div>
-                                <input type="file" class="hidden" id="file-input" name="uploaded_file" accept=".fit">
+                            </div>
-                            </label>
+                        </div>
-                            <p id="file-name-display" class="text-sm text-gray-500"></p>
                         </div>
-                    </div>
-                    <p class="text-sm text-gray-300">
-                        <span>File type: .fit</span>
-                    </p>
-                    <div class="flex justify-center">
-                        <button type="submit" class="my-5 w-3/4 flex justify-center bg-blue-500 text-gray-100 p-4  rounded-full tracking-wide
-                                    font-semibold  focus:outline-none focus:shadow-outline hover:bg-blue-600 shadow-lg cursor-pointer transition ease-in duration-300">
-                            Upload
-                        </button>
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
 {% endblock %}

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

@@ -1,296 +1 @@
-<!--<<<<<<< HEAD-->
+<a  href="/log">Se connecter</button>
-<!--<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="/login">Se connecter</a></li>
-                        <li class="nav-item"><a class="nav-link me-lg-3" href="/register">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 mobile 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>
-<!--&gt;>>>>>> origin/merged_PLE-->

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

@@ -1,79 +1,40 @@
 {% extends "authbase.html.twig" %}
 
-{% block css %}{{ css }}{% endblock %}
+{% block css %}{{css}}{% endblock %}
 
 {% block title %}Connexion - HearthTrack{% endblock %}
 
 {% block main %}
-{#<<<<<<< HEAD#}
+                    <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>
-                        {% if login_error %}
+                                            <div class="form-floating mb-3">
-                            {% for value in login_error %}
+                                                <input class="form-control" id="inputEmail" type="email" placeholder="nom@exemple.com" />
-                                <div class="alert alert-danger" role="alert">
+                                                <label for="inputEmail">Adresse eMail</label>
-                                    {{ value }}
+                                            </div>
-{#=======#}
+                                            <div class="form-floating mb-3">
-{#                    <div class="container">#}
+                                                <input class="form-control" id="inputPassword" type="password" placeholder="Mot de passe" />
-{#                        <div class="row justify-content-center">#}
+                                                <label for="inputPassword">Mot de passe</label>
-{#                            <div class="col-lg-5">#}
+                                            </div>
-{#                                <div class="card shadow-lg border-0 rounded-lg mt-5">#}
+                                            <div class="form-check mb-3">
-{#                                    <div class="card-header"><h3 class="text-center font-weight-light my-4">Connexion</h3></div>#}
+                                                <input class="form-check-input" id="inputRememberPassword" type="checkbox" value="" />
-{#                                    <div class="card-body">#}
+                                                <label class="form-check-label" for="inputRememberPassword">Mémoriser le mot de passe</label>
-{#                                        <form>#}
+                                            </div>
-{#                                            <div class="form-floating mb-3">#}
+                                            <div class="d-flex align-items-center justify-content-between mt-4 mb-0">
-{#                                                <input class="form-control" id="inputEmail" type="email" placeholder="nom@exemple.com" />#}
+                                                <a class="small" href="password.html">Mot de passe oublié ?</a>
-{#                                                <label for="inputEmail">Adresse eMail</label>#}
+                                                <a class="btn btn-primary" href="index.html">Se connecter</a>
-{#                                            </div>#}
+                                            </div>
-{#                                            <div class="form-floating mb-3">#}
+                                        </form>
-{#                                                <input class="form-control" id="inputPassword" type="password" placeholder="Mot de passe" />#}
+                                    </div>
-{#                                                <label for="inputPassword">Mot de passe</label>#}
+                                    <div class="card-footer text-center py-3">
-{#                                            </div>#}
+                                        <div class="small"><a href="register.html">Besoin d'un compte ? Inscrivez-vous !</a></div>
-{#                                            <div class="form-check mb-3">#}
+                                    </div>
-{#                                                <input class="form-check-input" id="inputRememberPassword" type="checkbox" value="" />#}
-{#                                                <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="/pass">Mot de passe oublié ?</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="/regist">Besoin d'un compte ? Inscrivez-vous !</a></div>#}
-{#                                    </div>#}
-{#>>>>>>> origin/merged_PLE#}
                                 </div>
-                            {% endfor %}
-                        {% endif %}
-
-                        <form method="post" action="/login">
-                            <div class="form-floating mb-3">
-                                <input class="form-control" id="email" name="email" type="text" placeholder="Nom d'utilisateur" />
-                                <label for="email">Nom d'utilisateur</label>
-                            </div>
-                            <div class="form-floating mb-3">
-                                <input class="form-control" id="password" name="password" type="password" placeholder="Mot de passe" />
-                                <label for="password">Mot de passe</label>
-                            </div>
-                            <div class="form-check mb-3">
-                                <input class="form-check-input" id="inputRememberPassword" type="checkbox" value="" />
-                                <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">
+                        </div>
-                                <a class="small" href="/forgetPassword">Mot de passe oublié ?</a>
-                                <button class="btn btn-primary" type="submit">Se connecter</button>
-                            </div>
-                        </form>
-                    </div>
-                    <div class="card-footer text-center py-3">
-                        <div class="small"><a href="/register">Besoin d'un compte ? Inscrivez-vous !</a></div>
                     </div>
-                </div>
+                    {% endblock %}
-            </div>
-        </div>
-    </div>
-{% endblock %}

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

@@ -23,16 +23,14 @@
                                             <th>Lu</th>
                                             <th>De:</th>
                                             <th>Description</th>
-                                            <th>Date</th>
                                         </tr>
                                     </thead>
                                     <tbody>
                                     {% for mail in mails %}
                                         <tr>
-                                            <td><img src="/assets/img/verif/{{mail.idnotif}}.png" width="25px" height="25px"></td>
+                                            <td><img src="/assets/img/verif/{{mail.lu}}.png" width="25px" height="25px"></td>
-                                            <td>{{mail.idathlete}}</td>
+                                            <td>{{mail.nom}} {{mail.prenom}}</td>
                                             <td><a href="#">{{mail.message}}</a></td>
-                                            <td>{{ mail.date }}</td>
                                         </tr>
                                         {% endfor %}
                                     </tbody>

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

@@ -12,31 +12,19 @@
                                     <div class="card-header"><h3 class="text-center font-weight-light my-4">Récupération du mot de passe</h3></div>
                                     <div class="card-body">
                                         <div class="small mb-3 text-muted">Entrez votre adresse eMail pour recevoir un lien pour changer de mot de passe</div>
-{#<<<<<<< HEAD#}
+                                        <form method="post" action="/password">
-                                        <form method="post" action="/">
-{#=======#}
-{#                                        <form method="post" action="/password">#}
-{#>>>>>>> origin/merged_PLE#}
                                             <div class="form-floating mb-3">
                                                 <input class="form-control" id="email" name="email" type="email" placeholder="name@example.com" />
                                                 <label for="email">Adresse eMail</label>
                                             </div>
                                             <div class="d-flex align-items-center justify-content-between mt-4 mb-0">
-{#<<<<<<< HEAD#}
+                                                <a class="small" href="/log">Retour à la connexion</a>
-                                                <a class="small" href="/login">Retour à la connexion</a>
+                                                <button class="btn btn-primary" type="submit">Réinitialiser votre mot de passe</a>
-{#=======#}
-{#                                                <a class="small" href="/log">Retour à la connexion</a>#}
-{#>>>>>>> origin/merged_PLE#}
-                                                <button class="btn btn-primary" type="submit">Réinitialiser votre mot de passe</button>
                                             </div>
                                         </form>
                                     </div>
                                     <div class="card-footer text-center py-3">
-{#<<<<<<< HEAD#}
+                                        <div class="small"><a href="/regist">Besoin d'un compte ? Inscrivez-vous !</a></div>
-                                        <div class="small"><a href="/register">Besoin d'un compte ? Inscrivez-vous !</a></div>
-{#=======#}
-{#                                        <div class="small"><a href="/regist">Besoin d'un compte ? Inscrivez-vous !</a></div>#}
-{#>>>>>>> origin/merged_PLE#}
                                     </div>
                                 </div>
                             </div>

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

@@ -12,7 +12,7 @@
 <div class="container-fluid px-4">
                         <h1 class="mt-4">Profile</h1>
                         <ol class="breadcrumb mb-4">
-            <li class="breadcrumb-item"><a href="/home">Accueil</a></li>
+            <li class="breadcrumb-item"><a href="/">Accueil</a></li>
             <li class="breadcrumb-item active">Profile</li>
         </ol>
                         <div class="row">