From 886e09669dd2cbdefeaa071c018e1fc7773c6ad1 Mon Sep 17 00:00:00 2001
From: keraudre <yann.keraudren@etu-upec.fr>
Date: Wed, 19 Jun 2024 14:13:25 +0200
Subject: [PATCH 1/4] ajout message de connexion
---
.../application/controllers/ConnexionController.php | 9 ++++++++-
codeigniter/application/views/connexion.php | 7 +++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/codeigniter/application/controllers/ConnexionController.php b/codeigniter/application/controllers/ConnexionController.php
index 044704b..b813b03 100644
--- a/codeigniter/application/controllers/ConnexionController.php
+++ b/codeigniter/application/controllers/ConnexionController.php
@@ -3,6 +3,8 @@ defined('BASEPATH') OR exit('No direct script access allowed');
class ConnexionController extends CI_Controller {
+ public $error_co = "12";
+
public function __construct() {
parent::__construct();
$this->load->helper(array('url', 'html'));
@@ -11,7 +13,7 @@ class ConnexionController extends CI_Controller {
public function connexion() {
$this->load->view('layout/header');
- $this->load->view('connexion');
+ $this->load->view('connexion', ['error_co' => $this->error_co]);
$this->load->view('layout/footer');
}
@@ -31,6 +33,11 @@ class ConnexionController extends CI_Controller {
redirect('../index.php');
} else {
$data['error_msg'] = "Email ou mot de passe incorrect.";
+ $this->error_co = "Email ou mot de passe incorrect.";
+ $this->load->view('layout/header');
+ $this->load->view('connexion', ['error_co' => $this->error_co]);
+ $this->load->view('layout/footer');
+
}
}
diff --git a/codeigniter/application/views/connexion.php b/codeigniter/application/views/connexion.php
index a94ba8b..f31725d 100644
--- a/codeigniter/application/views/connexion.php
+++ b/codeigniter/application/views/connexion.php
@@ -1,4 +1,3 @@
-
<section class="connexion">
<div class="authentification">
@@ -16,6 +15,10 @@
<button type="submit">Connexion</button>
</form>
+
+<?php
+ echo "$error_co";
+ ?>
</div>
@@ -37,7 +40,7 @@
<input type="email" id="email" name="email" placeholder="Entrez votre adresse email" required>
<label for="pass">Votre mot de passe*</label>
- <input type="password" id="pass" name="pass" placeholder="Entrez votre mdp" required>
+ <input type="password" id="pass" name="pass" minlength="8" title="8 caractères minimum" placeholder="Entrez votre mot de passe" required>
<input type="submit" value="M'inscrire" name="ok">
From e7aea25b91ba1a08bd4b8f14ed202f3cf0720563 Mon Sep 17 00:00:00 2001
From: keraudre <yann.keraudren@etu-upec.fr>
Date: Wed, 19 Jun 2024 14:22:13 +0200
Subject: [PATCH 2/4] ajout bouton message erreur de connexion
---
.../application/controllers/ConnexionController.php | 7 +------
codeigniter/application/views/connexion.php | 7 +++----
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/codeigniter/application/controllers/ConnexionController.php b/codeigniter/application/controllers/ConnexionController.php
index 738e1aa..f040fe9 100644
--- a/codeigniter/application/controllers/ConnexionController.php
+++ b/codeigniter/application/controllers/ConnexionController.php
@@ -3,7 +3,6 @@ defined('BASEPATH') OR exit('No direct script access allowed');
class ConnexionController extends CI_Controller {
- public $error_co = "12";
public function __construct() {
parent::__construct();
@@ -13,7 +12,7 @@ class ConnexionController extends CI_Controller {
public function connexion() {
$this->load->view('layout/header');
- $this->load->view('connexion', ['error_co' => $this->error_co]);
+ $this->load->view('connexion');
$this->load->view('layout/footer');
}
@@ -36,10 +35,6 @@ class ConnexionController extends CI_Controller {
}
} else {
$data['error_msg'] = "Email ou mot de passe incorrect.";
- $this->error_co = "Email ou mot de passe incorrect.";
- $this->load->view('layout/header');
- $this->load->view('connexion', ['error_co' => $this->error_co]);
- $this->load->view('layout/footer');
}
}
diff --git a/codeigniter/application/views/connexion.php b/codeigniter/application/views/connexion.php
index f31725d..ceb4695 100644
--- a/codeigniter/application/views/connexion.php
+++ b/codeigniter/application/views/connexion.php
@@ -15,10 +15,9 @@
<button type="submit">Connexion</button>
</form>
-
-<?php
- echo "$error_co";
- ?>
+ <?php if(isset($error_msg)): ?>
+ <div class="error_msg"><?= $error_msg ?></div>
+<?php endif; ?>
</div>
From 2a094b08aad9d98e35cd19ad87a0387dc832a8f7 Mon Sep 17 00:00:00 2001
From: keraudre <yann.keraudren@etu-upec.fr>
Date: Wed, 19 Jun 2024 14:45:06 +0200
Subject: [PATCH 3/4] mise en forme de la page playlist contenant les musiques
---
codeigniter/application/views/playlist_view.php | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/codeigniter/application/views/playlist_view.php b/codeigniter/application/views/playlist_view.php
index 2aa8ec8..d774170 100644
--- a/codeigniter/application/views/playlist_view.php
+++ b/codeigniter/application/views/playlist_view.php
@@ -9,11 +9,10 @@
<!-- Section pour afficher les chansons de son playlist -->
<?php if (!empty($songs)): ?>
- <section class="current-songs">
- <h5>Chansons actuelles :</h5>
- <ul>
+ <h5>Chansons actuelles :</h5>
+ <section class="list">
<?php foreach($songs as $song): ?>
- <li class="play">
+ <div><article>
<?= $song->name; ?>
<!-- Formulaire pour supprimer la chanson de la playlist -->
<form action="<?= site_url('playlist/remove_song'); ?>" method="post" style="display:inline;">
@@ -21,9 +20,8 @@
<input type="hidden" name="songId" value="<?= $song->id; ?>">
<button type="submit">Supprimer</button>
</form>
- </li>
+ </article></div>
<?php endforeach; ?>
- </ul>
</section>
<?php endif; ?>
From 9664beb70a08efdb1785e7b857e62bc19da2c345 Mon Sep 17 00:00:00 2001
From: charmett <charmett@localhost>
Date: Wed, 19 Jun 2024 14:54:36 +0200
Subject: [PATCH 4/4] plus joli
---
codeigniter/application/views/artistes_list.php | 8 ++++----
codeigniter/assets/style.css | 4 ++++
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/codeigniter/application/views/artistes_list.php b/codeigniter/application/views/artistes_list.php
index 479d738..639ad4e 100644
--- a/codeigniter/application/views/artistes_list.php
+++ b/codeigniter/application/views/artistes_list.php
@@ -24,9 +24,7 @@
<?php endif; ?>
</div>
-<?php if(isset($is_search) && $is_search): ?>
- <p>Nombre de résultats : <?php echo $num_results; ?></p>
-<?php endif; ?>
+
<section class="list">
@@ -52,8 +50,10 @@ foreach ($artistAlbums as $artistName => $albums) {
echo "</header>";
echo "<ul>";
foreach ($albums as $album) {
- echo "<li>" . anchor("music/view/{$album['albumId']}", $album['albumName']) . " - " . $album['year'] . "</li>";
+ echo anchor("music/view/{$album['albumId']}", $album['albumName']) . " - " . $album['year'] ;
+ echo "<br>";
echo "<button class='ajout-artistes' onclick=\"location.href='" . site_url("playlist/choix_playlist/{$album['albumId']}") . "'\">Ajouter</button>";
+ echo "<br>";
}
echo "</ul>";
echo "</article></div>";
diff --git a/codeigniter/assets/style.css b/codeigniter/assets/style.css
index 81bc277..24a2f46 100644
--- a/codeigniter/assets/style.css
+++ b/codeigniter/assets/style.css
@@ -266,3 +266,7 @@ margin-left: 50px;
.musics-album {
margin-bottom: 0;
}
+
+.error_msg{
+ color: red;
+}