diff --git a/ci/application/config/config.php b/ci/application/config/config.php index 3efe38d..bfc3804 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/config/migration.php b/ci/application/config/migration.php index 4b585a6..32d3d04 100644 --- a/ci/application/config/migration.php +++ b/ci/application/config/migration.php @@ -22,7 +22,7 @@ $config['migration_enabled'] = FALSE; | a timestamp. Options are: | | 'sequential' = Sequential migration naming (001_add_blog.php) -| 'timestamp' = Timestamp migration naming (20121031104401_add_blog.php) +| 'timestamp' = Timestamp migration naming arabe (20121031104401_add_blog.php) | Use timestamp format YYYYMMDDHHIISS. | | Note: If this configuration value is missing the Migration library diff --git a/ci/application/controllers/Albums.php b/ci/application/controllers/Albums.php index 8ef84c9..5e832c0 100644 --- a/ci/application/controllers/Albums.php +++ b/ci/application/controllers/Albums.php @@ -10,9 +10,9 @@ class Albums extends CI_Controller { public function index(){ $albums = $this->model_music->getAlbums(); - $this->load->view('layout/header_album'); + $this->load->view('layout/header'); $this->load->view('albums_list', ['albums' => $albums]); - $this->load->view('layout/footer_album'); + $this->load->view('layout/footer'); } public function view($album_id){ @@ -23,9 +23,9 @@ class Albums extends CI_Controller { log_message('debug', 'Songs: ' . print_r($songs, true)); - $this->load->view('layout/header_album'); + $this->load->view('layout/header'); $this->load->view('song_album_list', ['songs' => $songs]); - $this->load->view('layout/footer_album'); + $this->load->view('layout/footer'); } } ?> diff --git a/ci/application/controllers/Artistes.php b/ci/application/controllers/Artistes.php index 1c0b024..207e2be 100644 --- a/ci/application/controllers/Artistes.php +++ b/ci/application/controllers/Artistes.php @@ -9,16 +9,16 @@ class artistes extends CI_Controller { } public function index(){ $artistes = $this->model_music->getArtists(); - $this->load->view('layout/header_artistes'); + $this->load->view('layout/header'); $this->load->view('artistes_list',['artistes'=>$artistes]); - $this->load->view('layout/footer_artistes'); + $this->load->view('layout/footer'); } public function view($AlbumsOfArtistId){ - $AlbumsOfArtist = $this->model_music->getAlbumsOfArtist($AlbumsOfArtistId); - $this->load->view('layout/header_artistes'); - $this->load->view('albums_artist_list',['AlbumsOfArtist'=>$AlbumsOfArtist]); - $this->load->view('layout/footer_artistes'); + $AlbumsOfArtists = $this->model_music->getAlbumsOfArtist($AlbumsOfArtistId); + $this->load->view('layout/header'); + $this->load->view('albums_artist_list',['AlbumsOfArtists'=>$AlbumsOfArtists]); + $this->load->view('layout/footer'); } } \ No newline at end of file diff --git a/ci/application/controllers/Song.php b/ci/application/controllers/Song.php index 0161f08..77b552a 100644 --- a/ci/application/controllers/Song.php +++ b/ci/application/controllers/Song.php @@ -10,8 +10,8 @@ class Song extends CI_Controller { public function view($album_id){ $songs = $this->model_music->getSongOfAlbum($album_id); - $this->load->view('layout/header_song'); + $this->load->view('layout/header'); $this->load->view('song_album_list',['songs'=>$songs]); - $this->load->view('layout/footer_song'); + $this->load->view('layout/footer'); } } \ No newline at end of file diff --git a/ci/application/controllers/Welcome.php b/ci/application/controllers/Welcome.php index edd94e8..da8330f 100644 --- a/ci/application/controllers/Welcome.php +++ b/ci/application/controllers/Welcome.php @@ -8,8 +8,7 @@ class welcome extends CI_Controller { $this->load->model('model_music'); } public function index(){ - $this->load->view('layout/header'); - $this->load->view('layout/footer'); + $this->load->view('Welcome'); } } diff --git a/ci/application/views/Welcome.php b/ci/application/views/Welcome.php new file mode 100644 index 0000000..8fbee6c --- /dev/null +++ b/ci/application/views/Welcome.php @@ -0,0 +1,108 @@ + + + + + SpotiFly + + + +
+
+ + +
+ Connexion + S'inscrire +
+
+
+
+ SpotiFly +
+

SpotiFly : envole-toi au rythme de la musique !

+
+
+
+ +
+
+
+ Description de l'image 2 +
+

1 mois gratuit?

+

"Découvrez une expérience musicale sans limites avec notre offre exclusive : abonnez-vous dès aujourd'hui et bénéficiez d'un mois complet GRATUIT pour explorer notre vaste catalogue de musique. Plongez dans un univers de sonorités variées et profitez d'un accès illimité à vos artistes préférés, sans engagement ! Rejoignez-nous dès maintenant pour un mois d'exploration musicale sans pareil."

+
+
+
+
+
+ Description de l'image 3 +
+

La Cognition

+

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

+

Plongez dans une réalité où la cognition rencontre la technologie. Notre cube connecté va au-delà de l'ordinaire, réagissant à votre pensée et intégrant la puissance de la cognition pour une expérience holographique incomparable.

+
+
+
+
+
+ Description de l'image 4 +
+

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 !"

+
+
+
+
+ + + + + diff --git a/ci/application/views/albums_artist_list.php b/ci/application/views/albums_artist_list.php index 107f92b..d1d9c81 100644 --- a/ci/application/views/albums_artist_list.php +++ b/ci/application/views/albums_artist_list.php @@ -1,15 +1,16 @@ -
Albums of the artist
-
-
"; - echo "
"; - echo anchor("albums/view/{$AlbumOfArtists->id}","{$AlbumOfArtists->name}"); - echo "
"; - echo "
"; - echo "
"; -} -?> -
\ No newline at end of file +
Liste des albums
+
+
"; + echo "
"; + echo anchor("albums/view/{$AlbumsOfArtist->id}", "{$AlbumsOfArtist->name}"); + echo "
"; + echo "
"; + echo '' . $AlbumsOfArtist->name . ''; + echo "
$AlbumsOfArtist->year
"; + echo "
"; + } + ?> +
\ No newline at end of file diff --git a/ci/application/views/artistes_list.php b/ci/application/views/artistes_list.php index 4b263ad..98c7c51 100644 --- a/ci/application/views/artistes_list.php +++ b/ci/application/views/artistes_list.php @@ -1,5 +1,5 @@
Artists list
-
+
"; diff --git a/ci/application/views/layout/footer.php b/ci/application/views/layout/footer.php index 41babbe..3e5cdea 100644 --- a/ci/application/views/layout/footer.php +++ b/ci/application/views/layout/footer.php @@ -27,19 +27,19 @@

diff --git a/ci/application/views/layout/footer_album.php b/ci/application/views/layout/footer_album.php deleted file mode 100644 index a95094d..0000000 --- a/ci/application/views/layout/footer_album.php +++ /dev/null @@ -1,47 +0,0 @@ - - - - - MUSIC APP - - - - - - \ No newline at end of file diff --git a/ci/application/views/layout/footer_artistes.php b/ci/application/views/layout/footer_artistes.php deleted file mode 100644 index a95094d..0000000 --- a/ci/application/views/layout/footer_artistes.php +++ /dev/null @@ -1,47 +0,0 @@ - - - - - MUSIC APP - - - - - - \ No newline at end of file diff --git a/ci/application/views/layout/footer_song.php b/ci/application/views/layout/footer_song.php deleted file mode 100644 index a95094d..0000000 --- a/ci/application/views/layout/footer_song.php +++ /dev/null @@ -1,47 +0,0 @@ - - - - - MUSIC APP - - - - - - \ No newline at end of file diff --git a/ci/application/views/layout/header.php b/ci/application/views/layout/header.php index 2a8bc3c..6d33305 100644 --- a/ci/application/views/layout/header.php +++ b/ci/application/views/layout/header.php @@ -1,15 +1,18 @@ - + SpotiFly + + + -
+
-
-
- SpotiFly -
-

SpotiFly : envole-toi au rythme de la musique !

-
-
-
- -
-
-
- Description de l'image 2 -
-

1 mois gratuit?

-

"Découvrez une expérience musicale sans limites avec notre offre exclusive : abonnez-vous dès aujourd'hui et bénéficiez d'un mois complet GRATUIT pour explorer notre vaste catalogue de musique. Plongez dans un univers de sonorités variées et profitez d'un accès illimité à vos artistes préférés, sans engagement ! Rejoignez-nous dès maintenant pour un mois d'exploration musicale sans pareil."

-
-
-
-
-
- Description de l'image 3 -
-

La Cognition

-

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

-

Plongez dans une réalité où la cognition rencontre la technologie. Notre cube connecté va au-delà de l'ordinaire, réagissant à votre pensée et intégrant la puissance de la cognition pour une expérience holographique incomparable.

-
-
-
-
-
- Description de l'image 4 -
-

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 !"

-
-
-
-
- + + + 593; - - + + \ No newline at end of file diff --git a/ci/application/views/layout/header_album.php b/ci/application/views/layout/header_album.php deleted file mode 100644 index bbf3cbd..0000000 --- a/ci/application/views/layout/header_album.php +++ /dev/null @@ -1,33 +0,0 @@ - - - - - SpotiFly - - - - -
-
- - -
- Connexion - S'inscrire -
-
- - - - \ No newline at end of file diff --git a/ci/application/views/layout/header_artistes.php b/ci/application/views/layout/header_artistes.php deleted file mode 100644 index 4d6a9d1..0000000 --- a/ci/application/views/layout/header_artistes.php +++ /dev/null @@ -1,32 +0,0 @@ - - - - - SpotiFly - - - -
-
- - -
- Connexion - S'inscrire -
-
- - - - \ No newline at end of file diff --git a/ci/application/views/layout/header_song.php b/ci/application/views/layout/header_song.php deleted file mode 100644 index 4d6a9d1..0000000 --- a/ci/application/views/layout/header_song.php +++ /dev/null @@ -1,32 +0,0 @@ - - - - - SpotiFly - - - -
-
- - -
- Connexion - S'inscrire -
-
- - - - \ No newline at end of file diff --git a/ci/application/views/welcome_message.php b/ci/application/views/welcome_message.php deleted file mode 100644 index 9db22bc..0000000 --- a/ci/application/views/welcome_message.php +++ /dev/null @@ -1,100 +0,0 @@ - - - - - Welcome to CodeIgniter - - - - - -
-

Welcome to CodeIgniter!

- -
-

The page you are looking at is being generated dynamically by CodeIgniter.

- -

If you would like to edit this page you'll find it located at:

- application/views/welcome_message.php - -

The corresponding controller for this page is found at:

- application/controllers/Welcome.php - -

If you are exploring CodeIgniter for the very first time, you should start by reading the User Guide.

-
- -

Page rendered in {elapsed_time} seconds. ' . CI_VERSION . '' : '' ?>

-
- - - diff --git a/ci/assets/album.css b/ci/assets/album.css index e489864..4dc7e21 100644 --- a/ci/assets/album.css +++ b/ci/assets/album.css @@ -1,4 +1,3 @@ -/* assets/albums_style.css */ .container { display: flex; flex-wrap: wrap; @@ -9,11 +8,12 @@ .album { box-sizing: border-box; - width: 18%; + width: 18%; margin-bottom: 20px; border: 1px solid #ccc; border-radius: 10px; padding: 10px; + margin-top: 50px; text-align: center; background-color: #f9f9f9; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1); diff --git a/ci/assets/artiste.css b/ci/assets/artiste.css new file mode 100644 index 0000000..9a3e5b4 --- /dev/null +++ b/ci/assets/artiste.css @@ -0,0 +1,50 @@ +/* artiste.css */ + +/* Corps principal */ +body { + font-family: Arial, sans-serif; + background-color: #f4f4f4; + margin: 0; + padding: 0; +} + +/* Conteneur principal */ +.container { + width: 80%; + margin: auto; + overflow: hidden; +} + +/* Section des artistes */ +.artiste { + display: flex; + flex-direction: column; + align-items: center; + margin-top: 20px; +} + +/* Style des liens des artistes */ +.artiste a { + display: block; + width: 80%; + border: 1px solid #ddd; + padding: 10px; + margin: 10px 0; + text-align: center; + background-color: #fff; + text-decoration: none; + color: #333; + border-radius: 5px; + transition: background-color 0.3s, border-color 0.3s; +} + +/* Effet au survol des liens des artistes */ +.artiste a:hover { + background-color: #f0f0f0; + border-color: #ccc; +} + +/* Couleur des liens visités */ +.artiste a:visited { + color: #333; +} diff --git a/ci/assets/img/Instagram.png b/ci/assets/img/Instagram.png new file mode 100644 index 0000000..16880f8 Binary files /dev/null and b/ci/assets/img/Instagram.png differ diff --git a/ci/assets/img/Logo1.png b/ci/assets/img/Logo1.png new file mode 100644 index 0000000..8372437 Binary files /dev/null and b/ci/assets/img/Logo1.png differ diff --git a/ci/assets/img/Logo2.png b/ci/assets/img/Logo2.png new file mode 100644 index 0000000..1085397 Binary files /dev/null and b/ci/assets/img/Logo2.png differ diff --git a/ci/assets/img/logo_page.png b/ci/assets/img/logo_page.png new file mode 100644 index 0000000..9079ebd Binary files /dev/null and b/ci/assets/img/logo_page.png differ diff --git a/ci/assets/img/twitter.png b/ci/assets/img/twitter.png new file mode 100644 index 0000000..bb26c70 Binary files /dev/null and b/ci/assets/img/twitter.png differ diff --git a/ci/assets/song.css b/ci/assets/song.css new file mode 100644 index 0000000..fcf4c42 --- /dev/null +++ b/ci/assets/song.css @@ -0,0 +1,22 @@ +/* Style de la liste des chansons */ +.list { + display: flex; + flex-direction: column; + align-items: center; + margin: 20px; +} + +.list div { + width: 100%; + max-width: 600px; + margin: 10px 0; + border: 1px solid #ccc; + padding: 15px; + box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); + background-color: #f9f9f9; +} + +.short-text { + font-size: 18px; + font-weight: bold; +} diff --git a/ci/assets/style.css b/ci/assets/style.css index 115186a..3faf578 100644 --- a/ci/assets/style.css +++ b/ci/assets/style.css @@ -14,15 +14,17 @@ body { } .navbar { background-color: black; - padding: 20px; /* Ajuste la valeur de padding selon tes besoins */ + padding: 20px; display: flex; justify-content: space-between; align-items: center; position: fixed; width: 100%; top: 0; - z-index: 1000; + z-index: 1000; + box-sizing: border-box; } + .bouton a{ color: #FFF; text-decoration: none; @@ -103,8 +105,8 @@ body { } #Page img { - width: 400px; - height: 400PX; + width: 1000px; + height: 500PX; } .text-page { @@ -212,20 +214,21 @@ img { max-width: 100%; height: auto; } + .footer { background-color: black; color: white; - padding: 20px; + padding: 20px; text-align: center; - margin-top: 20px; + margin-top: 20px; + width: 100%; + box-sizing: border-box; } - - .footer-content { display: flex; justify-content: space-around; + flex-wrap: wrap; } - .footer-section { text-align: center; margin: 10px;