From e372d8d642c89df39d25b9f9c8a02552dc2fa9c8 Mon Sep 17 00:00:00 2001
From: stiti <moncef.stiti@gmail.com>
Date: Thu, 6 Jun 2024 18:28:40 +0200
Subject: [PATCH] Commit de marco

---
 .../application/controllers/Home.php              |  1 +
 .../application/controllers/Playlists.php         |  6 ++++--
 CodeIgniter-3.1.13/application/views/accueil.php  |  8 +++-----
 .../application/views/confirmation.php            |  4 ++--
 CodeIgniter-3.1.13/assets/css/accueil.css         | 15 ++++++++++++---
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/CodeIgniter-3.1.13/application/controllers/Home.php b/CodeIgniter-3.1.13/application/controllers/Home.php
index cc2853a..bab8c0e 100644
--- a/CodeIgniter-3.1.13/application/controllers/Home.php
+++ b/CodeIgniter-3.1.13/application/controllers/Home.php
@@ -6,6 +6,7 @@ class Home extends CI_Controller {
     public function __construct() {
         parent::__construct();
         $this->load->library('session');
+        $this->load->helper('html');
     }
 
     public function index() {
diff --git a/CodeIgniter-3.1.13/application/controllers/Playlists.php b/CodeIgniter-3.1.13/application/controllers/Playlists.php
index 15752d8..0b874f3 100644
--- a/CodeIgniter-3.1.13/application/controllers/Playlists.php
+++ b/CodeIgniter-3.1.13/application/controllers/Playlists.php
@@ -182,6 +182,8 @@ class Playlists extends CI_Controller {
     }
 
     public function generate_random() {
+        date_default_timezone_set('Europe/Paris');
+
         if (!$this->session->userdata('user_id')) {
             redirect('utilisateur/connexion');
         }
@@ -194,8 +196,8 @@ class Playlists extends CI_Controller {
             $songs = $this->Model_music->get_random_songs($nbrMusiqueAleatoire, $genre, $artist);
     
             $new_playlist = array(
-                'name' => 'Playlist aléatoire du ' . date('Y-m-d H:i:s'),
-                'description' => 'Une playlist avec ' . $nbrMusiqueAleatoire . ' musiques aléatoires.',
+                'name' => 'Playlist aléatoire',
+                'description' => 'Une playlist avec ' . $nbrMusiqueAleatoire . ' musiques aléatoires du ' . date('Y-m-d H:i:s'),
                 'utilisateur_id' => $this->session->userdata('user_id')
             );
     
diff --git a/CodeIgniter-3.1.13/application/views/accueil.php b/CodeIgniter-3.1.13/application/views/accueil.php
index 4c5cf78..9596f7a 100644
--- a/CodeIgniter-3.1.13/application/views/accueil.php
+++ b/CodeIgniter-3.1.13/application/views/accueil.php
@@ -1,14 +1,12 @@
-
-
     <div class="hero">
         <h1>Bienvenue sur Onzeur !</h1>
-        <p>Le service de création de playlist musical numéro 1 en France.</p>
-        <a href="<?php echo site_url('musiques'); ?>"><button type="button">Accéder à la musique</button></a>
+        <p class="textAccueil">Le service de création de playlist musical numéro 1 en France.</p>
+        <a class="bouton" href="<?php echo site_url('musiques'); ?>">Accéder à la musique</a>
     </div>
 
     <div class="container">
         <div>
-            <video width="100%" controls>
+            <video controls>
                 <source src="<?php echo base_url('assets/mp4/videoOnzeur.mp4'); ?>" type="video/mp4">
                 Votre navigateur ne supporte pas les vidéos.
             </video>
diff --git a/CodeIgniter-3.1.13/application/views/confirmation.php b/CodeIgniter-3.1.13/application/views/confirmation.php
index a299f7b..3758899 100644
--- a/CodeIgniter-3.1.13/application/views/confirmation.php
+++ b/CodeIgniter-3.1.13/application/views/confirmation.php
@@ -9,12 +9,12 @@
 <?php echo form_open('utilisateur/confirmer', array('class' => 'confirmation-form')); ?>
     <div>
         <label for="email">Email</label>
-        <input type="text" name="email" value="<?php echo set_value('email'); ?>">
+        <input type="text" id="email" name="email" value="<?php echo set_value('email'); ?>">
         <?php echo form_error('email'); ?>
     </div>
     <div>
         <label for="code">Code de confirmation</label>
-        <input type="text" name="code" value="<?php echo set_value('code'); ?>">
+        <input type="text" id="code" name="code" value="<?php echo set_value('code'); ?>">
         <?php echo form_error('code'); ?>
     </div>
     <div>
diff --git a/CodeIgniter-3.1.13/assets/css/accueil.css b/CodeIgniter-3.1.13/assets/css/accueil.css
index 0a777bb..8d537a4 100644
--- a/CodeIgniter-3.1.13/assets/css/accueil.css
+++ b/CodeIgniter-3.1.13/assets/css/accueil.css
@@ -5,11 +5,17 @@ body {
     padding: 0;
     color: #640875;
 }
+
 .container {
     width: 95%;
     margin: 0 auto;
     padding: 20px;
 }
+
+.container video{
+    width: 100%;
+}
+
 h1, h2, h3 {
     color: #444;
 }
@@ -99,7 +105,7 @@ h1, h2, h3 {
     cursor: pointer;
 }
 
-.hero button {
+.bouton {
     padding: 15px 40px;
     font-size: 1.2rem;
     background-color: #640875;
@@ -110,6 +116,10 @@ h1, h2, h3 {
     transition: background-color 0.3s;
 }
 
+.textAccueil{
+    padding-bottom: 20px;
+}
+
 .hero button:hover {
     background-color: #9f23b5;
 }
@@ -198,5 +208,4 @@ h1, h2, h3 {
     border: none;
     border-radius: 4px;
     cursor: pointer;
-}
-
+}
\ No newline at end of file