update app and diagrams

Documents/Diagramme/DiagrammeDeClasses/README_accesDonnees.md

@@ -36,7 +36,7 @@ abstract class IGenericRepository {
     + addItem(item) : void
     + deleteItem(item) : bool
 }
-abstract class IUserRepository extends IGenericRepository {
+interface IUserRepository extends IGenericRepository {
 }
 interface INotificationRepository extends IGenericRepository {
 }

Sources/composer.json

@@ -32,7 +32,9 @@
         "altorouter/altorouter": "1.1.0",
         "vlucas/phpdotenv": "^5.5",
         "psr/container": "^2.0",
-        "adriangibbons/php-fit-file-analysis": "^3.2.0"
+        "adriangibbons/php-fit-file-analysis": "^3.2.0",
+      "ext-couchbase": "*",
+        "ext-pdo": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "*"

Sources/public/js/script2.js

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

Sources/src/app/controller/AthleteController.php

@@ -76,6 +76,7 @@ class AthleteController extends BaseController
     }
 
 
+
     #[Route(path: '/exercice', name: 'exercice', methods: ['GET'])] // 8
     public function exercice(): Response
     {

Sources/src/app/controller/AuthController.php

@@ -30,12 +30,12 @@ class AuthController extends BaseController
         }
         
         if($this->container->get(UserManager::class)->login($log,$mdp)){
-            return $this->redirectToRoute('/');
+            return $this->redirectToRoute('/home');
         }
         else{
             $error [] = "Erreur de connexion. Essayez encore";
         }
-        return $this->render('./page/login.html.twig', ['error' => $error]);
+        return $this->render('./page/home.html.twig', ['error' => $error]);
         
         
         
@@ -60,6 +60,46 @@ class AuthController extends BaseController
 
     }
 
+    #[Route('/logout', name: 'logout',methods: ['GET'])]
+    public function logout(IRequest $request): IResponse {
+
+        return $this->render('./page/login.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+
+    }
+
+    #[Route(path: '/regist', name: 'regist', methods: ['GET'])]
+    public function register2(): Response
+    {
+
+        // CONFIRMER LES DONNESS !!!!! IMPORTANT
+
+        return $this->render('./page/register.html.twig',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
+
     #[Route('/register', name: 'register' , methods:['GET'])]
     public function register(IRequest $request): IResponse
     {
@@ -115,10 +155,10 @@ class AuthController extends BaseController
             }
         }
 
-        return $this->render('/register.html.twig');
+        return $this->render('./page/register.html.twig');
     }
 
-    #[Route(path: '/mdp', name: 'mdp', methods: ['POST'])]
+    #[Route(path: '/mdp', name: 'motdepasse', methods: ['POST'])]
     public function mdp(string $ancienMotDePasse,string $nouveauMotDePasse,string $confirmerMotDePasse, IRequest $req): Response
     {
         

Sources/src/app/controller/Controller.php

@@ -22,7 +22,7 @@ class Controller extends BaseController
        $this->preference = new Preferences();
     }
     
-    #[Route(path: '/', name: 'home', methods: ['GET'])]
+    /*#[Route(path: '/', name: 'home', methods: ['GET'])]
     public function index(): Response
     {
         return $this->render('./page/index.html',[
@@ -38,25 +38,25 @@ class Controller extends BaseController
             'exos' => [],
             'member' => []
         ]);
-    }
+    }*/
-
+
-    #[Route(path: '/analyses', name: 'analyses', methods: ['GET'])]
+//    #[Route(path: '/analyses', name: 'analyses', methods: ['GET'])]
-    public function analyses(): Response
+//    public function analyses(): Response
-    {
+//    {
-        return $this->render('./page/analyze.html.twig',[
+//        return $this->render('./page/analyze.html.twig',[
-            'css' => $this->preference->getCookie(),
+//            'css' => $this->preference->getCookie(),
-            'pp' => "test2",
+//            'pp' => "test2",
-            'user' => "Doe",
+//            'user' => "Doe",
-            'role' => "Athlète",
+//            'role' => "Athlète",
-            'friendship' => [],
+//            'friendship' => [],
-            'analyzes' => [],
+//            'analyzes' => [],
-            'mails' => [],
+//            'mails' => [],
-            'users' => [],
+//            'users' => [],
-            'infoUser' => [],
+//            'infoUser' => [],
-            'exos' => [],
+//            'exos' => [],
-            'member' => []
+//            'member' => []
-        ]);
+//        ]);
-    }
+//    }
 
     #[Route(path: '/activity', name: 'activity', methods: ['GET'])]
     public function activity(): Response
@@ -435,7 +435,7 @@ class Controller extends BaseController
     }
 
 
-    #[Route(path: '/login', name: 'login', methods: ['POST'])]
+    /*#[Route(path: '/login', name: 'login', methods: ['POST'])]
     public function login(string $username,string $mdp, IRequest $req): Response
     {
         
@@ -454,9 +454,9 @@ class Controller extends BaseController
             'exos' => [],
             'member' => []
         ]);
-    }
+    }*/
 
-    #[Route(path: '/log', name: 'log', methods: ['GET'])]
+    /*#[Route(path: '/log', name: 'log', methods: ['GET'])]
     public function login2(): Response
     {
         
@@ -475,9 +475,9 @@ class Controller extends BaseController
             'exos' => [],
             'member' => []
         ]);
-    }
+    }*/
 
-    #[Route(path: '/register', name: 'register', methods: ['POST'])]
+    /*#[Route(path: '/register', name: 'register', methods: ['POST'])]
     public function register(string $username,string $mdp,string $confirmMdp,string $nom,string $prenom,string $dateNaissance,string $sexe,string $taille,string $poids, IRequest $req): Response
     {
         
@@ -496,28 +496,29 @@ class Controller extends BaseController
             'exos' => [],
             'member' => []
         ]);
-    }
+    }*/
-
+
-    #[Route(path: '/regist', name: 'regist', methods: ['GET'])]
+//    #[Route(path: '/regist', name: 'regist', methods: ['GET'])]
-    public function register2(): Response
+//    public function register2(): Response
-    {
+//    {
-        
+//
-       // CONFIRMER LES DONNESS !!!!! IMPORTANT
+//       // CONFIRMER LES DONNESS !!!!! IMPORTANT
+//
+//        return $this->render('./page/register.html.twig',[
+//            'css' => $this->preference->getCookie(),
+//            'pp' => "test2",
+//            'user' => "Doe",
+//            'role' => "Athlète",
+//            'friendship' => [],
+//            'analyzes' => [],
+//            'mails' => [],
+//            'users' => [],
+//            'infoUser' => [],
+//            'exos' => [],
+//            'member' => []
+//        ]);
+//    }
 
-        return $this->render('./page/register.html.twig',[
-            'css' => $this->preference->getCookie(),
-            'pp' => "test2",
-            'user' => "Doe",
-            'role' => "Athlète",
-            'friendship' => [],
-            'analyzes' => [],
-            'mails' => [],
-            'users' => [],
-            'infoUser' => [],
-            'exos' => [],
-            'member' => []
-        ]);
-    }
 
     #[Route(path: '/pass', name: 'pass', methods: ['GET'])]
     public function pass(): Response

Sources/src/app/controller/UserController.php

@@ -14,10 +14,27 @@ class UserController extends BaseController
 {
 
 
-    #[Route(path: '/', name: 'home', methods: ['GET'])]
+    #[Route(path: '/', name: 'index', methods: ['GET'])]
     public function index(): Response
     {
+        return $this->render('./page/index.html',[
+            'css' => $this->preference->getCookie(),
+            'pp' => "test2",
+            'user' => "Doe",
+            'role' => "Athlète",
+            'friendship' => [],
+            'analyzes' => [],
+            'mails' => [],
+            'users' => [],
+            'infoUser' => [],
+            'exos' => [],
+            'member' => []
+        ]);
+    }
 
+    #[Route(path: '/home', name: 'home', methods: ['GET'])]
+    public function home(): Response
+    {
         return $this->render('./page/home.html.twig',[
             'css' => $this->preference->getCookie(),
             'pp' => "test2",

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

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
+<head>
     <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" />
@@ -9,9 +9,9 @@
     <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>
+</head>
-    <body class="bg-primary">
+<body class="bg-primary">
-        <div id="layoutAuthentication">
+<div id="layoutAuthentication">
     <div id="layoutAuthentication_content">
         <main>
             {% block main %}
@@ -64,8 +64,8 @@
             </div>
         </footer>
     </div>
-        </div>
+</div>
-        <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/js/bootstrap.bundle.min.js" crossorigin="anonymous"></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="js/scripts.js"></script>
-    </body>
+</body>
 </html>

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

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

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

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

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

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

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

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

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

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

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

@@ -71,7 +71,7 @@ class ActiviteEntity {
     }
 
     // Setters
-    public function setIdActivite($idActivite) {
+    public function setIdActivite($idActivity) {
         $this->idActivity = $idActivity;
     }
 

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

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