From 253fd100d8b39d0631e0d104f9cf88a382b7b5b6 Mon Sep 17 00:00:00 2001 From: boutaric Date: Tue, 11 Jun 2024 16:12:33 +0200 Subject: [PATCH] css menu create + playlist --- ci/application/config/config.php | 2 +- ci/application/controllers/Playlist.php | 3 ++- ci/application/views/Welcome.php | 14 +++++----- ci/application/views/create_playlist.php | 31 +++++++++++++++++++---- ci/application/views/layout/footer.php | 6 ++--- ci/application/views/layout/header.php | 4 +-- ci/application/views/song_album_list.php | 2 -- ci/application/views/song_playlist.php | 17 +++++++++++-- ci/assets/album.css | 1 + ci/assets/img/musique.png | Bin 0 -> 18322 bytes ci/assets/img/musique1.png | Bin 0 -> 16329 bytes 11 files changed, 57 insertions(+), 23 deletions(-) create mode 100644 ci/assets/img/musique.png create mode 100644 ci/assets/img/musique1.png diff --git a/ci/application/config/config.php b/ci/application/config/config.php index f248cde..e947623 100644 --- a/ci/application/config/config.php +++ b/ci/application/config/config.php @@ -23,7 +23,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); | a PHP script and you can easily do that on your own. | */ -$config['base_url'] = '/~brigitte/SAEWEB2.2/ci/'; +$config['base_url'] = '/~boutaric/SAEWEB2.2/ci/'; /* |-------------------------------------------------------------------------- diff --git a/ci/application/controllers/Playlist.php b/ci/application/controllers/Playlist.php index 5a7acc6..d3037a2 100644 --- a/ci/application/controllers/Playlist.php +++ b/ci/application/controllers/Playlist.php @@ -24,6 +24,7 @@ class Playlist extends CI_Controller { public function SongPlaylist($playlist_id){ $songPlaylists = $this->model_music->getSongOfPlaylist($playlist_id); + $songs = $this->model_music->getSongOfAlbum($playlist_id); $playlists = $this->model_music->getPlaylist(); // Récupère toutes les playlists $id_playlist = null; // Initialise $id_playlist à null foreach ($playlists as $playlist_item) { @@ -32,7 +33,7 @@ class Playlist extends CI_Controller { break; } } - $this->load->view('song_playlist', ['songPlaylists' => $songPlaylists, 'id_playlist' => $id_playlist]); + $this->load->view('song_playlist', ['songPlaylists' => $songPlaylists, 'id_playlist' => $id_playlist, 'songs'=>$songs]); } public function delete($playlist_id) { diff --git a/ci/application/views/Welcome.php b/ci/application/views/Welcome.php index 5949a35..91e1475 100644 --- a/ci/application/views/Welcome.php +++ b/ci/application/views/Welcome.php @@ -10,7 +10,7 @@
- SpotiFly + alt="SpotiFly">

SpotiFly : envole-toi au rythme de la musique !

@@ -66,7 +66,7 @@
- Description de l'image 3 + alt="Description de l'image 2">

La Cognition

Découvrez notre nouveaux cube v3 qui peut avoir la voix de votre choix.

@@ -76,7 +76,7 @@
- Description de l'image 4 + alt="Description de l'image 2">

Statistiques

"Découvrez les statistiques de notre application de musique : des millions d'utilisateurs s'immergent dans une expérience audio immersive, créant des milliers de playlists et explorant une multitude de genres musicaux, tout en bénéficiant d'un mois gratuit dès l'abonnement !"

@@ -105,19 +105,19 @@

diff --git a/ci/application/views/create_playlist.php b/ci/application/views/create_playlist.php index ce0be49..470bf44 100644 --- a/ci/application/views/create_playlist.php +++ b/ci/application/views/create_playlist.php @@ -1,6 +1,27 @@ -
Créer une nouvelle Playlist
-
- - - +
+
+
+ alt="Description de l'image 2"> +
+

Créer une nouvelle Playlist

+ + + + +
+
+
+
+
+ alt="Description de l'image 2"> +
+

Créer une playlist aléatoire

+ + + + +
+
+
+
diff --git a/ci/application/views/layout/footer.php b/ci/application/views/layout/footer.php index f5253c0..af1e0f9 100644 --- a/ci/application/views/layout/footer.php +++ b/ci/application/views/layout/footer.php @@ -28,19 +28,19 @@

diff --git a/ci/application/views/layout/header.php b/ci/application/views/layout/header.php index 0094a76..bbc1bf8 100644 --- a/ci/application/views/layout/header.php +++ b/ci/application/views/layout/header.php @@ -12,12 +12,12 @@
+ alt="Description de l'image 2">