diff --git a/.gitignore b/.gitignore
index 426c53c..600b07e 100755
--- a/.gitignore
+++ b/.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
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
+php/.idea/**/workspace.xml
+php/.idea/**/tasks.xml
+php/.idea/**/usage.statistics.xml
+php/.idea/**/dictionaries
+php/.idea/**/shelf
# Generated files
-.idea/**/contentModel.xml
+php/.idea/**/contentModel.xml
# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
+php/.idea/**/dataSources/
+php/.idea/**/dataSources.ids
+php/.idea/**/dataSources.local.xml
+php/.idea/**/sqlDataSources.xml
+php/.idea/**/dynamic.xml
+php/.idea/**/uiDesigner.xml
+php/.idea/**/dbnavigator.xml
# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
+php/.idea/**/gradle.xml
+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
-/vendor/
+php/composer.phar
+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
diff --git a/README.md b/README.md
index a51568b..e69de29 100755
--- a/README.md
+++ b/README.md
@@ -1 +0,0 @@
-dqzdqd
\ No newline at end of file
diff --git a/php/public/assets/bandeau.png b/php/public/assets/bandeau.png
new file mode 100644
index 0000000..ba1261e
Binary files /dev/null and b/php/public/assets/bandeau.png differ
diff --git a/php/public/css/connexion.css b/php/public/css/connexion.css
index 77eb512..1853cc0 100755
--- a/php/public/css/connexion.css
+++ b/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;
diff --git a/php/public/css/inscription.css b/php/public/css/inscription.css
index 4c14d1d..fceb9de 100755
--- a/php/public/css/inscription.css
+++ b/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;
diff --git a/php/src/controleur/UtilisateurControleur.php b/php/src/controleur/UtilisateurControleur.php
index f198fcb..dda7372 100755
--- a/php/src/controleur/UtilisateurControleur.php
+++ b/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()
diff --git a/php/templates/accueil.html b/php/templates/accueil.html
index a17b7a6..e947817 100755
--- a/php/templates/accueil.html
+++ b/php/templates/accueil.html
@@ -3,7 +3,7 @@
-
+
Alica - Accueil
@@ -13,8 +13,6 @@
{% include 'menu.html' %}
-
-
Accueil
{% if prenom and nom %}
@@ -36,10 +34,71 @@
{% endif %}
+
+
+
+
+
Le réseau Alica te souhaite la bienvenue !
+
Alica Info
+
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.
+
+
+
+ {% for event in eventsList %}
+
+
+
+
+
+
{{event.date}}
+
{{event.titre}}
+
{{event.description}}
+
S'inscrire
+
+
+ {% endfor %}
+
❮
+
❯
+
+
+