Merge branch 'main' of grond.iut-fbleau.fr:keraudre/SAE_DEV2.2_2024
This commit is contained in:
commit
0bdee7aeed
codeigniter
application
assets
@ -3,6 +3,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
|
||||
|
||||
class ConnexionController extends CI_Controller {
|
||||
|
||||
|
||||
public function __construct() {
|
||||
parent::__construct();
|
||||
$this->load->helper(array('url', 'html'));
|
||||
@ -36,6 +37,7 @@ class ConnexionController extends CI_Controller {
|
||||
}
|
||||
} else {
|
||||
$data['error_msg'] = "Email ou mot de passe incorrect.";
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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>";
|
||||
|
@ -1,4 +1,3 @@
|
||||
|
||||
<section class="connexion">
|
||||
|
||||
<div class="authentification">
|
||||
@ -16,6 +15,9 @@
|
||||
<button type="submit">Connexion</button>
|
||||
|
||||
</form>
|
||||
<?php if(isset($error_msg)): ?>
|
||||
<div class="error_msg"><?= $error_msg ?></div>
|
||||
<?php endif; ?>
|
||||
|
||||
</div>
|
||||
|
||||
@ -37,7 +39,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">
|
||||
|
||||
|
@ -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; ?>
|
||||
|
||||
|
@ -266,3 +266,7 @@ margin-left: 50px;
|
||||
.musics-album {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.error_msg{
|
||||
color: red;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user