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/accueil.css b/php/public/css/accueil.css index b8516c3..df44b3b 100755 --- a/php/public/css/accueil.css +++ b/php/public/css/accueil.css @@ -1,30 +1,148 @@ @import url(https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700&family=Share+Tech+Mono&display=swap); *{ - margin: 0; - padding: 0; box-sizing: border-box; font-family: 'Poppins', sans-serif; + margin: 0; } -body{ - display: inline; - justify-content: center; - align-items: center; - min-height: 100vh; - background: #fff; + +.main { + color: #212121; + font-size: 1rem; +} + +.title-banner{ + text-align: center; } -input{ +.banner-img{ + width: 100%; + height: 250px; + object-fit: cover; +} + +.banner { position: relative; - outline: none; - padding: 10px 20px; - border-radius: 10px; - letter-spacing: 1px; - font-size: 0.85em; - background-color: #00DBFF; +} + +.title-banner { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + background-color: rgba(0, 0, 0, 0.5); color: #fff; - cursor: pointer; + padding: 10px; + border-radius: 5px; +} + +.title-banner .title{ + font-size: 35px; + color: #00DBFF; + font-weight: bold; +} + +.title-banner .subtitle{ + font-size: 20px; + color: #fff; +} + +.title-banner .description{ + font-size: 15px; + color: #fff; +} + +.slideshow-container { + position: relative; + max-width: 70%; + margin: 0 auto; + padding: 30px; +} + +.slide { + width: 100%; + height: 350px; + border-radius: 20px; + border: #212121 1px solid; +} + +.slide-content { + display: flex; + width: 100%; +} + +.slide-img, +.slide-info { + width: 50%; + overflow: hidden; +} + +.slide-info{ + padding: 15px; +} + +.slide-title{ + font-size: 20px; + font-weight: bold; +} + +.slide-info .button{ + color: #00DBFF; + font-size: 14px; + padding: 5px; text-transform: uppercase; - font-weight: 600; + border-radius: 15px; + border: #00DBFF 2px solid; + display: inline-block; margin-top: 10px; +} + +.slide-img img{ + height: 350px; + border-radius: 20px; +} + +.prevButton, .nextButton { + position: absolute; + top: 50%; + transform: translateY(-50%); + font-size: 24px; + background-color: black; + color: white; + padding: 8px 16px; border: none; -} \ No newline at end of file + cursor: pointer; +} + +.prevButton { + left: 0; +} + +.nextButton { + right: 0; +} +.search{ + background-color: #212121; + padding: 50px 30px; + display: flex; + justify-content: center; + align-items: center; +} + +.search .search-bar{ + border-radius: 10px; + height: 40px; + width: calc(100% - 50px); + margin-right: 10px; +} + +.search .search-button{ + display: flex; + justify-content: center; + align-items: center; + width: 40px; + height: 40px; + border-radius: 10px; + background: #fff; + color: #212121; + vertical-align: middle; +} diff --git a/php/public/css/connexion.css b/php/public/css/connexion.css index 4c14d1d..fceb9de 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 0e277c4..b0192c6 100755 --- a/php/src/controleur/UtilisateurControleur.php +++ b/php/src/controleur/UtilisateurControleur.php @@ -147,8 +147,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]); } protected function inscription_success() diff --git a/php/src/modele/OffreModele.php b/php/src/modele/OffreModele.php index d37c17a..c16cf9d 100644 --- a/php/src/modele/OffreModele.php +++ b/php/src/modele/OffreModele.php @@ -95,7 +95,7 @@ class OffreModele $profilGw = new ProfilGateway(new Connection(DB_HOST,DB_USER,DB_PASS)); $resProfl = $profilGw->getProfilById($row['offreur']); - $alumni = new Alumni($resal[0]['mail'],$resal[0]['mdp'],$resal[0]['role'],$resProfl[0]['nom'],$resProfl[0]["prenom"]); + $alumni = new Alumni($resal[0]['id'],$resal[0]['mail'],$resal[0]['mdp'],$resal[0]['role'],$resProfl[0]['nom'],$resProfl[0]["prenom"]); $date = \DateTime::createFromFormat('Y-m-d', $row['date']); diff --git a/php/templates/accueil.html b/php/templates/accueil.html index 0e83968..e7bfa6d 100755 --- a/php/templates/accueil.html +++ b/php/templates/accueil.html @@ -7,7 +7,6 @@ Alica - Accueil -
{% include 'menu.html' %} @@ -33,8 +32,69 @@ {% endif %} +
+ +
+ {% for event in eventsList %} +
+
+ +
+
+
{{event.date}}
+
{{event.titre}}
+
{{event.description}}
+ S'inscrire +
+
+ {% endfor %} + + +
+
+ + + + +
+
+ + + + diff --git a/php/templates/connection.html b/php/templates/connection.html index c199201..01ded33 100755 --- a/php/templates/connection.html +++ b/php/templates/connection.html @@ -6,57 +6,64 @@ Alica - Connexion + -
-
-

Connexion

-
- Identifiant -
-
- +
+ {% include 'menu.html' %} +
+
+ +

Connexion

+
+ Email +
+
+ +
+
-
-
-
- Mot de passe -
-
- +
+ Mot de passe +
+
+ +
+
-
-
- Mot de passe oublié ? + Mot de passe oublié ? +
+
+ +
+
+
- +
+ +
- -
-
-
- -
-
-
- {% if dVueErreur is not empty %} -
-
-
-
    - {% for erreur in dVueErreur %} -
  • {{ erreur }}
    • - {% endfor %} -
+ {% if dVueErreur is not empty %} +
+
+
+
    + {% for erreur in dVueErreur %} +
  • {{ erreur }}
    • + {% endfor %} +
+
+ {% endif %}
- {% endif %} -
- - +
+ {% include 'footer.html' %} +
- \ No newline at end of file + + + \ No newline at end of file diff --git a/php/templates/inscription.html b/php/templates/inscription.html index a22ee4b..3873434 100755 --- a/php/templates/inscription.html +++ b/php/templates/inscription.html @@ -7,81 +7,79 @@ -
-
-

S'inscrire

-
- Prénom : -
-
- -
-