diff --git a/codeigniter/application/controllers/InscriptionController.php b/codeigniter/application/controllers/InscriptionController.php index 324dc8e..b99d932 100644 --- a/codeigniter/application/controllers/InscriptionController.php +++ b/codeigniter/application/controllers/InscriptionController.php @@ -10,7 +10,7 @@ class InscriptionController extends CI_Controller { public function inscription() { $this->load->view('layout/header'); - $this->load->view('inscription'); + $this->load->view('connexion'); $this->load->view('layout/footer'); } @@ -38,7 +38,7 @@ class InscriptionController extends CI_Controller { $data['confirmation_message'] = "Inscription réussie ! Vous êtes maintenant inscrit."; $this->load->view('layout/header'); - $this->load->view('inscription', $data); + $this->load->view('connexion', $data); $this->load->view('layout/footer'); } } diff --git a/codeigniter/application/views/connexion.php b/codeigniter/application/views/connexion.php index dc92fbf..a94ba8b 100644 --- a/codeigniter/application/views/connexion.php +++ b/codeigniter/application/views/connexion.php @@ -1,12 +1,53 @@ -<h1>Se connecter</h1> -<form action="authentifier" method="POST"> - <label for="email">Email:</label> - <input type="email" id="email" name="email" required> - <label for="password">Mot de passe:</label> - <input type="password" id="password" name="password" required> - <button type="submit">Connexion</button> -</form> -<?php if(isset($error_msg)): ?> - <div class="error-message"><?= $error_msg ?></div> -<?php endif; ?> \ No newline at end of file +<section class="connexion"> + + <div class="authentification"> + + <h3> Déjà abonné </h3> + + <form action="authentifier" method="POST"> + + <label for="email">Email:</label> + <input type="email" id="email" name="email" placeholder="Entrez votre email" required> + + <label for="password">Mot de passe:</label> + <input type="password" id="password" name="password" placeholder="Entrez votre mot de passe" required> + + <button type="submit">Connexion</button> + + </form> + + </div> + + <div class="new"> + + <h3> Création de compte </h3> + + <form action="traitement" method="POST"> + <label for="nom">Votre nom*</label> + <input type="text" id="nom" name="nom" placeholder="Entrez votre nom" required> + + <label for="prenom">Votre prénom*</label> + <input type="text" id="prenom" name="prenom" placeholder="Entrez votre prénom" required> + + <label for="pseudo">Votre pseudo*</label> + <input type="text" id="pseudo" name="pseudo" placeholder="Entrez votre pseudo" required> + + <label for="email">Votre email*</label> + <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="submit" value="M'inscrire" name="ok"> + + </form> + +<?php if(isset($confirmation_message)): ?> + <div class="confirmation-message"><?= $confirmation_message ?></div> +<?php endif; ?> + + </div> +</section> + + diff --git a/codeigniter/application/views/connexion2.php b/codeigniter/application/views/connexion2.php new file mode 100644 index 0000000..dc92fbf --- /dev/null +++ b/codeigniter/application/views/connexion2.php @@ -0,0 +1,12 @@ +<h1>Se connecter</h1> +<form action="authentifier" method="POST"> + <label for="email">Email:</label> + <input type="email" id="email" name="email" required> + <label for="password">Mot de passe:</label> + <input type="password" id="password" name="password" required> + <button type="submit">Connexion</button> +</form> + +<?php if(isset($error_msg)): ?> + <div class="error-message"><?= $error_msg ?></div> +<?php endif; ?> \ No newline at end of file diff --git a/codeigniter/application/views/inscription.php b/codeigniter/application/views/inscription2.php similarity index 100% rename from codeigniter/application/views/inscription.php rename to codeigniter/application/views/inscription2.php diff --git a/codeigniter/application/views/layout/header.php b/codeigniter/application/views/layout/header.php index c539c92..aac08ac 100644 --- a/codeigniter/application/views/layout/header.php +++ b/codeigniter/application/views/layout/header.php @@ -19,13 +19,17 @@ </ul> <ul> <li><?=anchor('albums','Albums');?></li> - <li><?=anchor('artistes','Artistes');?></li> + <li><?=anchor('artistes','Artistes');?></li> <?php if ($this->session->userdata('pseudo')) : // Vérifier si l'utilisateur est connecté ?> - <li><?= $this->session->userdata('pseudo'); ?></li> - <li><?= anchor('deconnexion', 'Se déconnecter'); ?></li> + + <li class="deroulant"><?= $this->session->userdata('pseudo'); ?></li> + <ul class="sous"> + + <li><?= anchor('deconnexion', 'Se déconnecter'); ?></li> + </ul> + </li> <?php else : ?> <li><?= anchor('connexion', 'Se connecter'); ?></li> - <li><?= anchor('inscription', 'Inscription'); ?></li> <?php endif; ?> </ul> </nav> diff --git a/codeigniter/assets/style.css b/codeigniter/assets/style.css index 1efafa1..47d9a6f 100644 --- a/codeigniter/assets/style.css +++ b/codeigniter/assets/style.css @@ -25,7 +25,7 @@ section.list img { nav { position: fixed; width: 100%; - + background-color: #283d5d; top: 0; right: 0; } @@ -42,8 +42,16 @@ main.container { margin-right : 20px; } +.sous { + display: none; + box-shadow: 0px 1px 2px; + background-color: white; +} - +nav > ul li:hover .sous{ + display: block; +} + section.connexion { display: flex; justify-content: space-between;