fix conflicts

.gitignore

@@ -8,9 +8,6 @@ ehthumbs_vista.db
 # Dump file
 *.stackdump
 
-# Folder config file
-[Dd]esktop.ini
-
 # Recycle Bin used on file shares
 $RECYCLE.BIN/
 
@@ -77,12 +74,6 @@ Temporary Items
 ##### GPG
 secring.*
 
-##### Dropbox
-# Dropbox settings and caches
-.dropbox
-.dropbox.attr
-.dropbox.cache
-
 ##### SynopsysVCS
 # Waveform formats
 *.vcd
@@ -165,23 +156,11 @@ Sessionx.vim
 
 # Temporary
 .netrwhist
-*~
 # Auto-generated tag files
 tags
 # Persistent undo
 [._]*.un~
 
-##### Emacs
-# -*- mode: gitignore; -*-
-*~
-\#*\#
-/.emacs.desktop
-/.emacs.desktop.lock
-*.elc
-auto-save-list
-tramp
-.\#*
-
 # Org-mode
 .org-id-locations
 *_archive
@@ -254,10 +233,6 @@ bh_unicode_properties.cache
 # https://packagecontrol.io/packages/sublime-github
 GitHub.sublime-settings
 
-##### Notepad++
-# Notepad++ backups #
-*.bak
-
 ##### TextMate
 *.tmproj
 *.tmproject
@@ -280,7 +255,6 @@ tmtags
 **/nbproject/Package-*.bash
 build/
 nbbuild/
-dist/
 nbdist/
 .nb-gradle/
 
@@ -289,27 +263,27 @@ nbdist/
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
 # User-specific stuff
-.idea/**/workspace.xml
+php/.idea/**/workspace.xml
-.idea/**/tasks.xml
+php/.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
+php/.idea/**/usage.statistics.xml
-.idea/**/dictionaries
+php/.idea/**/dictionaries
-.idea/**/shelf
+php/.idea/**/shelf
 
 # Generated files
-.idea/**/contentModel.xml
+php/.idea/**/contentModel.xml
 
 # Sensitive or high-churn files
-.idea/**/dataSources/
+php/.idea/**/dataSources/
-.idea/**/dataSources.ids
+php/.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
+php/.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
+php/.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
+php/.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
+php/.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
+php/.idea/**/dbnavigator.xml
 
 # Gradle
-.idea/**/gradle.xml
+php/.idea/**/gradle.xml
-.idea/**/libraries
+php/.idea/**/libraries
 
 # Gradle and Maven with auto-import
 # When using Gradle or Maven with auto-import, you should exclude module files,
@@ -328,7 +302,7 @@ nbdist/
 cmake-build-*/
 
 # Mongo Explorer plugin
-.idea/**/mongoSettings.xml
+php/.idea/**/mongoSettings.xml
 
 # File-based project format
 *.iws
@@ -343,7 +317,7 @@ out/
 atlassian-ide-plugin.xml
 
 # Cursive Clojure plugin
-.idea/replstate.xml
+php/.idea/replstate.xml
 
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
@@ -352,17 +326,15 @@ crashlytics-build.properties
 fabric.properties
 
 # Editor-based Rest Client
-.idea/httpRequests
+php/.idea/httpRequests
 
 # Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
+php/.idea/caches/build_file_checksums.ser
 
 ##### Eclipse
 .metadata
 bin/
 tmp/
-*.tmp
-*.bak
 *.swp
 *~.nib
 local.properties
@@ -376,12 +348,6 @@ local.properties
 # Locally stored "Eclipse launch configurations"
 *.launch
 
-# PyDev specific (Python IDE for Eclipse)
-*.pydevproject
-
-# CDT-specific (C/C++ Development Tooling)
-.cproject
-
 # CDT- autotools
 .autotools
 
@@ -410,11 +376,6 @@ local.properties
 .apt_generated/
 .apt_generated_test/
 
-# Scala IDE specific (Scala & Java development for Eclipse)
-.cache-main
-.scala_dependencies
-.worksheet
-
 # Uncomment this line if you wish to ignore the project description file.
 # Typically, this file would be tracked if it contains build/dependency configurations:
 #.project
@@ -452,12 +413,13 @@ gradle-app.setting
 # gradle/wrapper/gradle-wrapper.properties
 
 ##### Composer
-composer.phar
+php/composer.phar
-/vendor/
+php/composer
+php/vendor/
 
 # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
-composer.lock
+php/composer.lock
 
 ##### PHP CodeSniffer
 # gitignore for the PHP Codesniffer framework

README.md

@@ -1 +0,0 @@
-dqzdqd

php/public/css/connexion.css

@@ -12,13 +12,14 @@ a{
 
 body{
     display: flex;
+    flex-direction: column;
     justify-content: center;
     align-items: center;
     min-height: 100vh;
     background: #fff;
 }
 
-.container{
+.containerC{
     position: relative;
     width: 500px;
     min-height: 500px;
@@ -30,12 +31,13 @@ body{
     -10px -10px 20px #ccc;
     border-radius: 30px;
     padding: 50px;
+    margin: 50px;
 }
 form{
     position: relative;
     width: 100%;
 }
-.container h3{
+.containerC h3{
     color: #000;
     font-weight: 600;
     font-size: 2em;

php/public/css/inscription.css

@@ -12,13 +12,14 @@ a{
 
 body{
     display: flex;
+    flex-direction: column;
     justify-content: center;
     align-items: center;
     min-height: 100vh;
     background: #fff;
 }
 
-.container{
+.containerC{
     position: relative;
     width: 500px;
     min-height: 500px;
@@ -30,12 +31,13 @@ body{
     -10px -10px 20px #ccc;
     border-radius: 30px;
     padding: 50px;
+    margin: 50px;
 }
 form{
     position: relative;
     width: 100%;
 }
-.container h3{
+.containerC h3{
     color: #000;
     font-weight: 600;
     font-size: 2em;

php/src/controleur/UtilisateurControleur.php

@@ -87,8 +87,10 @@ class UtilisateurControleur
             $nom = null;
             $id = null;
         }
+        $userModel = new UtilisateurModele();
+        $evenements=$userModel->getEvenement();
         //aller sur la page d'accueil avec le nom et prenom de l'utilisateur
-        echo $twig->render('accueil.html', ['prenom' => $prenom, 'nom' => $nom, 'id' => $id]);
+        echo $twig->render('accueil.html', ['prenom' => $prenom, 'nom' => $nom, 'id' => $id,"eventsList"=>$evenements]);
     }
 
     public function consulterProfilLimite()

php/templates/accueil.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <link rel="stylesheet" type="text/css" href="{{dir}}/public/css/accueil.css">
+    <link rel="stylesheet" type="text/css" href="css/accueil.css">
     <title>Alica - Accueil</title>
   </head>
 
@@ -13,8 +13,6 @@
   <header>
     {% include 'menu.html' %}
   </header>
-
-  <div style="text-align: center">
   <h1>Accueil</h1>
   <!-- Bienvenu suivie du mail des informations sessions de l'utilisateur -->
   <p>{% if prenom and nom %}
@@ -36,10 +34,71 @@
     </div>
   </div>
   {% endif %}
+  <div class="main">
+    <div class="banner">
+      <img class="banner-img" src="assets/bandeau.png">
+      <div class="title-banner">
+        <div class="subtitle">Le réseau Alica te souhaite la bienvenue !</div>
+        <div class="title">Alica Info</div>
+        <div class="description">Nous sommes d’anciens étudiants à l’IUT d’Aubière qui aimerions créer un réseau d'anciens étudiants au travers d'un réseau alumni du département Informatique.</div>
+      </div>
+    </div>
   </div>
 
 
+    <div class="slideshow-container" id="evenements">
+      {% for event in eventsList %}
+      <div class="slide">
+        <div class="slide-img">
+          <img src="{{ event.image }}">
+        </div>
+        <div class="slide-info">
+          <div class="slide-date">{{event.date}}</div>
+          <div class="slide-title">{{event.titre}}</div>
+          <div class="slide-description">{{event.description}}</div>
+          <a href="index.php?action=" class="button">S'inscrire</a>
+        </div>
+      </div>
+      {% endfor %}
+      <button class="prevButton" onclick="plusDivs(-1)">&#10094;</button>
+      <button class="nextButton" onclick="plusDivs(1)">&#10095;</button>
+    </div>
+    <div class="search">
+      <input class="search-bar" type="text" placeholder=" Rechercher des alumni...">
+      <a class="search-button" href="index.php?action=consulterProfilLimite">
+        <ion-icon name="search-outline"></ion-icon>
+      </a>
+    </div>
+  </div>
   </body>
+<footer>
+  {% include 'footer.html' %}
+</footer>
 </html>
+<script type="module" src="https://unpkg.com/ionicons@5.5.2/dist/ionicons/ionicons.esm.js"></script>
+<script nomodule src="https://unpkg.com/ionicons@5.5.2/dist/ionicons/ionicons.js"></script>
+<script>
+  let bar = document.querySelector('.bars'), navItem = document.querySelector('.nav-items');
+
+  bar.addEventListener('click', () => {
+    navItem.classList.toggle('active');
+  });
+
+  var slideIndex = 1;
+  showDivs(slideIndex);
 
+  function plusDivs(n) {
+    showDivs(slideIndex += n);
+  }
 
+  function showDivs(n) {
+    var i;
+    var x = document.getElementsByClassName("slide");
+    if (n > x.length) {slideIndex = 1}
+    if (n < 1) {slideIndex = x.length}
+    for (i = 0; i < x.length; i++) {
+      x[i].style.display = "none";
+    }
+    x[slideIndex-1].style.display = "flex";
+  }
+</script>

php/templates/connection.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Alica - Connexion</title>
-    <link rel="stylesheet" type="text/css" href="{{dir}}/public/css/connexion.css">
+    <link rel="stylesheet" type="text/css" href="../public/css/connexion.css">
 </head>
 <body>
 

php/templates/inscription.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Alica - Inscription</title>
-    <link rel="stylesheet" type="text/css" href="{{dir}}/public/css/inscription.css">
+    <link rel="stylesheet" type="text/css" href="../public/css/inscription.css">
 </head>
 <body>
 <div class="container">
@@ -18,7 +18,6 @@
                 </div>
                 <label>
                     <input type="text" name="firstname" required>
-                </label>
                 </div>
             </div>
             <div class="CadreInput">
@@ -27,9 +26,7 @@
                     <div class="icon">
                         <ion-icon name="person"></ion-icon>
                     </div>
-                <label>
                     <input type="text" name="name" required>
-                </label>
                 </div>
             </div>
             <div class="CadreInput">
@@ -38,7 +35,6 @@
                     <div class="icon">
                         <ion-icon name="mail-outline"></ion-icon>
                     </div>
-                <label>
                     <input type="email" name="email" required>
                 </label>
             </div>

php/templates/offres.html

@@ -44,7 +44,7 @@
 
             <div class="col-12 col-md-9">
                 <h3>{{ offre.getNom() }}</h3>
-                <p>Julien Martin</p>
+                <p>Julien Martin</p><!-- A changer -->
             </div>
         </div>
         <div class="row">