optimisation du code

This commit is contained in:
2024-05-30 13:49:35 +02:00
parent 046f3ed2e2
commit e390e7b393
34 changed files with 169 additions and 248 deletions

View File

@@ -28,22 +28,27 @@ class Albums extends CI_Controller {
$data['order_by'] = $order_by;
$data['genre_id'] = $genre_id;
$data['artist_id'] = $artist_id;
$data['title']= 'Albums - Onzeur';
$data['css']='assets/css/style';
// Récupérer les genres et les artistes pour les filtres
$data['genres'] = $this->model_music->getGenres();
$data['artists'] = $this->model_music->getArtists();
$this->load->view('layout/header_dark');
$this->load->view('albums_list', $data);
$this->load->view('layout/header_dark', $data);
$this->load->view('albums_list',$data);
$this->load->view('layout/footer_dark');
}
public function view($id){
$album = $this->model_music->get_album_by_id($id);
$data['album'] = $album;
$data['title'] = $album->name." - Details";
$data['css']='assets/css/album_view';
$this->load->view('layout/header_dark');
$this->load->view('album_view', $data);
$this->load->view('layout/header_dark', $data);
$this->load->view('album_view');
$this->load->view('layout/footer_dark');
}

View File

@@ -24,8 +24,10 @@ class Artiste extends CI_Controller {
$data['artiste'] = $artiste;
$data['albums'] = $albums;
$data['mostUsedGenre'] = $mostUsedGenre; // Passer $mostUsedGenre à la vue
$data['title']="Détails de l'artiste - Onzeur ".$artiste->name;
$data['css'] = 'assets/css/artiste_details';
$this->load->view('layout/header_dark');
$this->load->view('layout/header_dark', $data);
$this->load->view('artiste_details', $data);
$this->load->view('layout/footer_dark');
@@ -46,8 +48,10 @@ class Artiste extends CI_Controller {
// Charger la vue avec la liste des artistes
$data['artists'] = $artists;
$data['current_order'] = $order;
$data['title']="Détails de l'artiste - Onzeur ";
$data['css'] = 'assets/css/artists_list.css';
$this->load->view('layout/header_dark');
$this->load->view('layout/header_dark',$data);
$this->load->view('artists_list', $data);
$this->load->view('layout/footer_dark');
}

View File

@@ -17,7 +17,11 @@ class Contact extends CI_Controller {
}
public function index() {
$this->load->view('layout/header_dark');
$data['title']='Nous contacter - Onzeur';
$data['css']='assets/css/nous-contacter';
$this->load->view('layout/header_dark', $data);
$this->load->view('nous-contacter');
$this->load->view('layout/footer_dark');
}
@@ -110,11 +114,19 @@ class Contact extends CI_Controller {
</html>';
$mail->send();
$this->load->view('layout/header_dark');
$data['title']="Confirmation d'envoi - Onzeur";
$data['css']="assets/css/confirmation_mail";
$this->load->view('layout/header_dark',$data);
$this->load->view('confirmation_mail.php');
$this->load->view('layout/footer_dark');
} catch (Exception $e) {
$this->load->view('layout/header_dark');
$data['title']="Erreur d'envoi - Onzeur";
$data['css']="assets/css/erreur_mail";
$this->load->view('layout/header_dark', $data);
$this->load->view('erreur_mail.php');
$this->load->view('layout/footer_dark');
}
@@ -217,11 +229,19 @@ class Contact extends CI_Controller {
}
$mail->send();
$this->load->view('layout/header_dark');
$data['title']="Confirmation d'envoi - Onzeur";
$data['css']="assets/css/confirmation_mail";
$this->load->view('layout/header_dark',$data);
$this->load->view('confirmation_mail.php');
$this->load->view('layout/footer_dark');
} catch (Exception $e) {
$this->load->view('layout/header_dark');
$data['title']="Erreur d'envoi - Onzeur";
$data['css']="assets/css/erreur_mail";
$this->load->view('layout/header_dark', $data);
$this->load->view('erreur_mail.php');
$this->load->view('layout/footer_dark');
}

View File

@@ -9,7 +9,11 @@ class Errors extends CI_Controller {
public function error_404() {
$this->output->set_status_header('404');
$this->load->view('layout/header_dark');
$data['title'] = '404 - Page non trouvée';
$data['css']='assets/css/error_404.css';
$this->load->view('layout/header_dark', $data);
$this->load->view('error_404');
$this->load->view('layout/footer_dark');
}

View File

@@ -15,6 +15,9 @@ class Home extends CI_Controller {
$this->load->helper('url');
$this->load->helper('html');
$data['title']='Accueil - Onzeur';
$data['css']='assets/css/accueil';
// Appeler la fonction pour récupérer les couvertures d'albums
$data['covers'] = $this->Cover_model->get_covers();
@@ -23,8 +26,8 @@ class Home extends CI_Controller {
$data['avis'] = $this->Utilisateur_model->get_recent_avis();
// Charger la vue avec les données récupérées
$this->load->view('layout/header_dark');
$this->load->view('accueil', $data);
$this->load->view('layout/header_dark', $data);
$this->load->view('accueil',$data);
$this->load->view('layout/footer_dark');
}

View File

@@ -11,7 +11,10 @@ class MentionsLegales extends CI_Controller {
public function index()
{
$this->load->view('layout/header_dark');
$data['title']="Mentions Légales";
$data['css']="assets/css/mention-legals";
$this->load->view('layout/header_dark',$data);
$this->load->view('mentions-legals');
$this->load->view('layout/footer_dark');

View File

@@ -35,10 +35,13 @@ class Musiques extends CI_Controller {
$data['total_pages'] = $total_pages;
$data['current_page'] = $current_page;
$data['sort'] = $sort; // Passer la valeur de tri à la vue
$data['title']="Musiques - Onzeur";
$data['css']="assets/css/musiques_list";
// Charger la vue
$this->load->view('layout/header_dark');
$this->load->view('musiques_list', $data);
$this->load->view('layout/header_dark', $data);
$this->load->view('musiques_list',$data);
$this->load->view('layout/footer_dark');
}

View File

@@ -19,8 +19,12 @@ class Playlists extends CI_Controller {
// Vérifier si l'utilisateur est connecté
if ($user_id) {
$data['playlists'] = $this->Model_playlist->get_user_playlists($user_id);
$this->load->view('layout/header_dark');
$this->load->view('playlists_list', $data);
$data['title']="Liste des Playlists - Onzeur";
$data['css']="assets/css/playlists_list.css";
$this->load->view('layout/header_dark', $data);
$this->load->view('playlists_list',$data);
$this->load->view('layout/footer_dark');
} else {
redirect('utilisateur/connexion');
@@ -69,7 +73,11 @@ class Playlists extends CI_Controller {
redirect('utilisateur/connexion');
}
} else {
$this->load->view('layout/header_dark');
$data['title']="Créer une Nouvelle Playlist";
$data['css']="assets/css/playlist_create";
$this->load->view('layout/header_dark', $data);
$this->load->view('playlist_create');
$this->load->view('layout/footer_dark');
}
@@ -125,8 +133,12 @@ class Playlists extends CI_Controller {
// Récupérer toutes les musiques disponibles
$data['songs'] = $this->Model_music->get_all_songs();
$data['playlist_id'] = $playlist_id;
$this->load->view('layout/header_dark');
$this->load->view('playlist_add_song', $data);
$data['title']="Ajouter une Chanson à la Playlist";
$data['css']="assets/css/playlist_add_song";
$this->load->view('layout/header_dark', $data);
$this->load->view('playlist_add_song',$data);
$this->load->view('layout/footer_dark');
}
}
@@ -234,8 +246,12 @@ class Playlists extends CI_Controller {
} else {
$data['albums'] = $this->Model_music->get_all_albums();
$data['playlist_id'] = $playlist_id;
$this->load->view('layout/header_dark');
$this->load->view('playlist_add_album', $data);
$data['title']="Ajouter un Album à la Playlist";
$data['css']="assets/css/playlist_add_song";
$this->load->view('layout/header_dark', $data);
$this->load->view('playlist_add_album',$data);
$this->load->view('layout/footer_dark');
}
}
@@ -248,9 +264,14 @@ class Playlists extends CI_Controller {
// Charger les chansons de la playlist spécifique
$data['songs'] = $this->Model_playlist->get_songs_by_playlist($playlist_id);
$data['title']="Détails de la Playlist - Onzeur";
$data['css']="assets/css/playlist_view";
// Charger la vue pour afficher les détails de la playlist
$this->load->view('layout/header_dark');
$this->load->view('layout/header_dark', $data);
$this->load->view('playlist_view', $data);
$this->load->view('layout/footer_dark');
}
@@ -293,8 +314,12 @@ class Playlists extends CI_Controller {
// Récupérer tous les artistes disponibles
$data['artists'] = $this->Model_music->get_all_artists();
$data['playlist_id'] = $playlist_id;
$this->load->view('layout/header_dark');
$this->load->view('playlist_add_artist', $data);
$data['title']="Ajouter les musiques d'un Artiste à la Playlist";
$data['css']="assets/css/playlist_add_song";
$this->load->view('layout/header_dark', $data);
$this->load->view('playlist_add_artist',$data);
$this->load->view('layout/footer_dark');
}
}

View File

@@ -24,8 +24,11 @@ class Search extends CI_Controller {
$data['artistes'] = [];
$data['error'] = "La requête de recherche ne peut pas être vide.";
$this->load->view('layout/header_dark');
$this->load->view('search_results', $data);
$data['title']="Résultats de la recherche";
$data['css']="assets/css/search_results";
$this->load->view('layout/header_dark', $data);
$this->load->view('search_results',$data);
$this->load->view('layout/footer_dark');
return;
}
@@ -42,9 +45,12 @@ class Search extends CI_Controller {
$data['albums'] = $albums;
$data['genres'] = $genres;
$data['artistes'] = $artistes;
$data['title']="Résultats de la recherche";
$data['css']="assets/css/search_results";
$this->load->view('layout/header_dark');
$this->load->view('search_results', $data);
$this->load->view('layout/header_dark', $data);
$this->load->view('search_results',$data);
$this->load->view('layout/footer_dark');
}
}

View File

@@ -29,8 +29,12 @@ class Utilisateur extends CI_Controller {
));
if ($this->form_validation->run() == FALSE) {
$data['title']="Inscription";
$data['css']="assets/css/inscription";
// Charger la vue avec les erreurs
$this->load->view('layout/header_dark');
$this->load->view('layout/header_dark',$data);
$this->load->view('inscription');
$this->load->view('layout/footer_dark');
} else {
@@ -51,8 +55,12 @@ class Utilisateur extends CI_Controller {
redirect('utilisateur/connexion');
} else {
$data['error'] = 'Une erreur est survenue. Veuillez réessayer.';
$this->load->view('layout/header_dark');
$this->load->view('inscription', $data);
$data['title']="Inscription";
$data['css']="assets/css/inscription";
$this->load->view('layout/header_dark',$data);
$this->load->view('inscription',$data);
$this->load->view('layout/footer_dark');
}
}
@@ -392,8 +400,12 @@ class Utilisateur extends CI_Controller {
$this->form_validation->set_rules('password', 'Mot de passe', 'required');
if ($this->form_validation->run() == FALSE) {
$data['title']="Connexion";
$data['css']="assets/css/inscription";
// Charger la vue avec les erreurs
$this->load->view('layout/header_dark');
$this->load->view('layout/header_dark', $data);
$this->load->view('connexion');
$this->load->view('layout/footer_dark');
} else {
@@ -418,7 +430,11 @@ class Utilisateur extends CI_Controller {
redirect('utilisateur/dashboard');
} else {
$data['error'] = 'Email ou mot de passe incorrect.';
$this->load->view('layout/header_dark');
$data['title']="Connexion";
$data['css']="assets/css/inscription";
$this->load->view('layout/header_dark',$data);
$this->load->view('connexion', $data);
$this->load->view('layout/footer_dark');
}
@@ -446,8 +462,11 @@ class Utilisateur extends CI_Controller {
$data['user'] = $this->Utilisateur_model->get_user_by_id($user_id);
$data['avis'] = $this->Utilisateur_model->get_avis_by_user($user_id);
$data['title']="Dashboard - Onzeur";
$data['css']="assets/css/dashboard";
$this->load->view('layout/header_dark');
$this->load->view('layout/header_dark', $data);
$this->load->view('dashboard', $data);
$this->load->view('layout/footer_dark');
}
@@ -484,8 +503,11 @@ class Utilisateur extends CI_Controller {
// Récupérer à nouveau les données d'avis pour cet utilisateur
$data['user'] = $this->Utilisateur_model->get_user_by_id($user_id);
$data['avis'] = $this->Utilisateur_model->get_avis_by_user($user_id);
$data['title']="Dashboard - Onzeur";
$data['css']="assets/css/dashboard";
$this->load->view('layout/header_dark');
$this->load->view('layout/header_dark',$data);
$this->load->view('dashboard', $data);
$this->load->view('layout/footer_dark');
}
@@ -521,7 +543,11 @@ class Utilisateur extends CI_Controller {
}
$data['user'] = $this->Utilisateur_model->get_user_by_id($user_id);
$this->load->view('layout/header_dark');
$data['title']="Dashboard - Onzeur";
$data['css']="assets/css/dashboard";
$this->load->view('layout/header_dark', $data);
$this->load->view('dashboard', $data);
$this->load->view('layout/footer_dark');
}
@@ -551,7 +577,11 @@ class Utilisateur extends CI_Controller {
}
public function non_autorisee(){
$this->load->view('layout/header_dark');
$data['title']="Accès non autorisé - Onzeur";
$data['css']="assets/css/style.css";
$this->load->view('layout/header_dark', $data);
$this->load->view('non_autorisee');
$this->load->view('layout/footer_dark');
}