From f0a4f36a35d91f3631f42865c1a013ae6ade6093 Mon Sep 17 00:00:00 2001
From: keraudre <yann.keraudren@etu-upec.fr>
Date: Sat, 15 Jun 2024 19:27:24 +0200
Subject: [PATCH] correction du code et suppression des parties en trop

---
 codeigniter/application/config/routes.php     |  3 +-
 .../controllers/ConnexionController.php       | 33 +++++++++++++++++++
 codeigniter/application/views/connexion2.php  | 12 -------
 .../application/views/inscription2.php        | 24 --------------
 .../application/views/layout/header.php       | 23 +++++++------
 codeigniter/assets/style.css                  | 20 ++++++++++-
 6 files changed, 66 insertions(+), 49 deletions(-)
 delete mode 100644 codeigniter/application/views/connexion2.php
 delete mode 100644 codeigniter/application/views/inscription2.php

diff --git a/codeigniter/application/config/routes.php b/codeigniter/application/config/routes.php
index 3d780ab..35608bd 100644
--- a/codeigniter/application/config/routes.php
+++ b/codeigniter/application/config/routes.php
@@ -51,8 +51,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 */
 $route['default_controller'] = 'albums';
 $route['connexion'] = 'ConnexionController/connexion';
-$route['inscription'] = 'InscriptionController/inscription';
-$route['traitement'] = 'InscriptionController/traitement';
+$route['traitement'] = 'ConnexionController/traitement';
 $route['authentifier'] = 'ConnexionController/authentifier';
 $route['deconnexion'] = 'ConnexionController/deconnexion';
 $route['404_override'] = '';
diff --git a/codeigniter/application/controllers/ConnexionController.php b/codeigniter/application/controllers/ConnexionController.php
index 2790c49..f521bbc 100644
--- a/codeigniter/application/controllers/ConnexionController.php
+++ b/codeigniter/application/controllers/ConnexionController.php
@@ -38,6 +38,39 @@ class ConnexionController extends CI_Controller {
         }
     }
 
+
+
+    public function traitement() {
+        if(isset($_POST['ok'])){
+            $this->load->database();
+    
+
+            $prenom = ucfirst(strtolower($this->input->post('prenom')));
+            $nom = strtoupper($this->input->post('nom'));
+            $pseudo = $this->input->post('pseudo');
+            $mdp = $this->input->post('pass');
+            $email = $this->input->post('email');
+    
+            $data = array(
+                'pseudo' => $pseudo,
+                'nom' => $nom,
+                'prenom' => $prenom,
+                'mdp' => $mdp,
+                'email' => $email
+            );
+    
+            $this->db->insert('users', $data);
+
+            $this->session->set_userdata('pseudo', $pseudo);
+            redirect('../index.php');
+    
+
+            $this->load->view('layout/header');
+            $this->load->view('connexion', $data);
+            $this->load->view('layout/footer');
+        }
+    }
+
     public function deconnexion() {
         $this->session->unset_userdata('pseudo'); 
         $this->session->sess_destroy(); 
diff --git a/codeigniter/application/views/connexion2.php b/codeigniter/application/views/connexion2.php
deleted file mode 100644
index dc92fbf..0000000
--- a/codeigniter/application/views/connexion2.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<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/inscription2.php b/codeigniter/application/views/inscription2.php
deleted file mode 100644
index f7178e1..0000000
--- a/codeigniter/application/views/inscription2.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<h1>S'inscrire</h1>
-<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; ?>
\ No newline at end of file
diff --git a/codeigniter/application/views/layout/header.php b/codeigniter/application/views/layout/header.php
index f66bcb2..adca933 100644
--- a/codeigniter/application/views/layout/header.php
+++ b/codeigniter/application/views/layout/header.php
@@ -17,22 +17,25 @@
 	<ul>
 	  <li><strong>Music APP</strong></li>
 	</ul>
-	<ul class="option">
-	  <li><?=anchor('albums','Albums');?></li>
-          <li><?=anchor('artistes','Artistes');?></li>
-              <li><?=anchor('playlist','Playlist');?></li>
+	<div class="options">
+     <ul>
+     <li class="bouton"><?=anchor('albums','Albums');?></li>
+          <li class="bouton"><?=anchor('artistes','Artistes');?></li>
+              <li class="bouton"><?=anchor('playlist','Playlist');?></li>
 <?php if ($this->session->userdata('pseudo')) : /* Vérifier si l'utilisateur est connecté */ ?>
               
-              <li class="deroulant"><a><?= $this->session->userdata('pseudo'); ?></a>
+                  <li class="deroulant"><a><?= $this->session->userdata('pseudo'); ?></a>
                   <ul class="sous">
      
-     <li class="menu"><a href="#"><?= anchor('deconnexion', 'Se déconnecter'); ?></a></li>
+     <li><a><?= anchor('profil', 'Profil'); ?></a></li>
+         <li><a><?= anchor('deconnexion', 'Se déconnecter'); ?></a></li>
          </ul>
          </li>
-        <?php else : ?>
-            <li><?= anchor('connexion', 'Se connecter'); ?></li>
-        <?php endif; ?>
-  </ul>
+<?php else : ?>
+         <li><?= anchor('connexion', 'Se connecter'); ?></li>
+<?php endif; ?>
+                </ul>
+      </div>
   </nav>
   </body>
 </html>
diff --git a/codeigniter/assets/style.css b/codeigniter/assets/style.css
index 7156934..9a83995 100644
--- a/codeigniter/assets/style.css
+++ b/codeigniter/assets/style.css
@@ -35,8 +35,17 @@ main.container {
 }
 
 
-.option {
+.options {
     margin-right : 20px!important;
+    width: 400px;
+    height: 73.5px;
+    
+}
+
+.bouton {
+    width: 25%;
+    text-align: center;
+    height: 73.5px;
 }
 
 .sous {
@@ -45,6 +54,15 @@ main.container {
     border: solid 1px black;
     background-color: #283d5d;
     position: absolute;
+    top :60px;
+    right: 13px;
+}
+
+
+.sous li{
+    float: none;
+    text-align: right;
+    width: 100%;
 }
 
 nav > ul li:hover .sous{