keraudre/SAE_DEV2.2_2024
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of grond.iut-fbleau.fr:keraudre/SAE_DEV2.2_2024

Browse Source
This commit is contained in:
Thomas FOLLEA 2024-06-19 14:55:51 +02:00
commit 0bdee7aeed
5 changed files with 18 additions and 12 deletions

2
codeigniter/application/controllers/ConnexionController.php

@ -3,6 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
class ConnexionController extends CI_Controller { class ConnexionController extends CI_Controller {
public function __construct() { public function __construct() {
parent::__construct(); parent::__construct();
$this->load->helper(array('url', 'html')); $this->load->helper(array('url', 'html'));
@ -36,6 +37,7 @@ class ConnexionController extends CI_Controller {
} }
} else { } else {
$data['error_msg'] = "Email ou mot de passe incorrect."; $data['error_msg'] = "Email ou mot de passe incorrect.";
} }
} }

8
codeigniter/application/views/artistes_list.php

@ -24,9 +24,7 @@
<?php endif; ?> <?php endif; ?>
</div> </div>
<?php if(isset($is_search) && $is_search): ?>
<p>Nombre de résultats : <?php echo $num_results; ?></p>
<?php endif; ?>
<section class="list"> <section class="list">
@ -52,8 +50,10 @@ foreach ($artistAlbums as $artistName => $albums) {
echo "</header>"; echo "</header>";
echo "<ul>"; echo "<ul>";
foreach ($albums as $album) { 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 "<button class='ajout-artistes' onclick=\"location.href='" . site_url("playlist/choix_playlist/{$album['albumId']}") . "'\">Ajouter</button>";
echo "<br>";
} }
echo "</ul>"; echo "</ul>";
echo "</article></div>"; echo "</article></div>";

6
codeigniter/application/views/connexion.php

@ -1,4 +1,3 @@
<section class="connexion"> <section class="connexion">
<div class="authentification"> <div class="authentification">
@ -16,6 +15,9 @@
<button type="submit">Connexion</button> <button type="submit">Connexion</button>
</form> </form>
<?php if(isset($error_msg)): ?>
<div class="error_msg"><?= $error_msg ?></div>
<?php endif; ?>
</div> </div>
@ -37,7 +39,7 @@
<input type="email" id="email" name="email" placeholder="Entrez votre adresse email" required> <input type="email" id="email" name="email" placeholder="Entrez votre adresse email" required>
<label for="pass">Votre mot de passe*</label> <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"> <input type="submit" value="M'inscrire" name="ok">

10
codeigniter/application/views/playlist_view.php

@ -9,11 +9,10 @@
<!-- Section pour afficher les chansons de son playlist --> <!-- Section pour afficher les chansons de son playlist -->
<?php if (!empty($songs)): ?> <?php if (!empty($songs)): ?>
<section class="current-songs"> <h5>Chansons actuelles :</h5>
<h5>Chansons actuelles :</h5> <section class="list">
<ul>
<?php foreach($songs as $song): ?> <?php foreach($songs as $song): ?>
<li class="play"> <div><article>
<?= $song->name; ?> <?= $song->name; ?>
<!-- Formulaire pour supprimer la chanson de la playlist --> <!-- Formulaire pour supprimer la chanson de la playlist -->
<form action="<?= site_url('playlist/remove_song'); ?>" method="post" style="display:inline;"> <form action="<?= site_url('playlist/remove_song'); ?>" method="post" style="display:inline;">
@ -21,9 +20,8 @@
<input type="hidden" name="songId" value="<?= $song->id; ?>"> <input type="hidden" name="songId" value="<?= $song->id; ?>">
<button type="submit">Supprimer</button> <button type="submit">Supprimer</button>
</form> </form>
</li> </article></div>
<?php endforeach; ?> <?php endforeach; ?>
</ul>
</section> </section>
<?php endif; ?> <?php endif; ?>

4
codeigniter/assets/style.css

@ -266,3 +266,7 @@ margin-left: 50px;
.musics-album { .musics-album {
margin-bottom: 0; margin-bottom: 0;
} }
.error_msg{
color: red;
}