diff --git a/Style/seeListStyle.css b/Style/seeListStyle.css index 962d5b4..ffda943 100644 --- a/Style/seeListStyle.css +++ b/Style/seeListStyle.css @@ -71,7 +71,7 @@ h2 { } /* The navigation menu links */ -.sidenav a { +.sidenav input { padding: 6px 8px 6px 16px; text-decoration: none; font-size: 25px; @@ -80,117 +80,7 @@ h2 { } /* When you mouse over the navigation links, change their color */ -.sidenav a:hover { - color: #f1f1f1; -} - -/* Style page content */ -.main { - margin-left: 160px; /* Same as the width of the sidebar */ - padding: 0px 10px; -} - -/* On smaller screens, where height is less than 450px, change the style of the sidebar (less padding and a smaller font size) */ -@media screen and (max-height: 450px) { - .sidenav {padding-top: 15px;} - .sidenav a {font-size: 18px;} -} - -body { - font-family: 'lato', sans-serif; -} -.container { - max-width: 1000px; - margin-left: auto; - margin-right: auto; - padding-left: 10px; - padding-right: 10px; -} - -h2 { - font-size: 26px; - margin: 20px 0; - text-align: center; -} - - li { - border-radius: 3px; - padding: 25px 30px; - display: flex; - justify-content: space-between; - margin-bottom: 25px; - } - .table-header { - background-color: #95A5A6; - font-size: 14px; - text-transform: uppercase; - letter-spacing: 0.03em; - } - .table-row { - background-color: #ffffff; - box-shadow: 0px 0px 9px 0px rgba(0,0,0,0.1); - } - .col-1 { - flex-basis: 15%; - } - .col-2 { - flex-basis: 50%; - } - .col-3 { - flex-basis: 15%; - } - .col-4 { - flex-basis: 10%; - } - .col-5 { - flex-basis: 5%; - } - .col-6 { - flex-basis: 100%; - } - - @media all and (max-width: 767px) { - .table-header { - display: none; - } - li { - display: block; - } - .col { - - flex-basis: 100%; - - } - .col { - display: flex; - padding: 10px 0; - } - } - -/* The sidebar menu */ -.sidenav { - height: 100%; /* Full-height: remove this if you want "auto" height */ - width: 160px; /* Set the width of the sidebar */ - position: fixed; /* Fixed Sidebar (stay in place on scroll) */ - z-index: 1; /* Stay on top */ - top: 0; /* Stay at the top */ - left: 0; - background-color: #111; /* Black */ - overflow-x: hidden; /* Disable horizontal scroll */ - padding-top: 20px; -} - -/* The navigation menu links */ -.sidenav a { - padding: 6px 8px 6px 16px; - text-decoration: none; - font-size: 25px; - color: #818181; - display: block; -} - -/* When you mouse over the navigation links, change their color */ -.sidenav a:hover { +.sidenav input:hover { color: #f1f1f1; } @@ -214,7 +104,7 @@ h2 { } /* Style the links inside the navigation bar */ -.topnav a { +.topnav input { float: right; color: #f2f2f2; text-align: center; @@ -224,13 +114,13 @@ h2 { } /* Change the color of links on hover */ -.topnav a:hover { +.topnav input:hover { background-color: #ddd; color: black; } /* Add a color to the active/current link */ -.topnav a.active { +.topnav input.active { background-color: #04AA6D; color: white; } \ No newline at end of file diff --git a/Vues/accueil.php b/Vues/accueil.php index ed6bfcf..6656bbe 100644 --- a/Vues/accueil.php +++ b/Vues/accueil.php @@ -24,7 +24,10 @@
- Se connecter +
+ + +
diff --git a/Vues/signIn.php b/Vues/signIn.php index 2617a29..049cf0f 100644 --- a/Vues/signIn.php +++ b/Vues/signIn.php @@ -13,26 +13,17 @@
- + + + +
-
-

log in via

- -
diff --git a/config/config.php b/config/config.php index 7728366..ca6d13c 100644 --- a/config/config.php +++ b/config/config.php @@ -11,6 +11,7 @@ $vues['erreur'] = 'Vues/erreur.php'; $vues['addList'] = 'Vues/addList.php'; $vues['addTask'] = 'Vues/addTask.php'; $vues['accueil'] = 'Vues/accueil.php'; +$vues['signIn'] = 'Vues/signIn.php'; $vues['accueilPrivate'] = 'Vues/accueilPrive.php'; $vues['connexion'] = 'Vues/connexion.php'; diff --git a/controllers/FrontController.php b/controllers/FrontController.php index 6841812..dbdea4b 100644 --- a/controllers/FrontController.php +++ b/controllers/FrontController.php @@ -4,7 +4,7 @@ class FrontController { public function __construct(){ $liste_actions_utilisateur = array('accessPrivateLists','crerListePv'); - $liste_actions_visiteur = array('goHome','changeCompletedTache','accessCreationTachePage','addTache','delTache','modifyList','accessCreationListePage','accessInscription','accessConnectionPage','creerListe','delListe','singIn','singUp','deconnection'); + $liste_actions_visiteur = array('goHome','changeCompletedTache','accessCreationTachePage','addTache','delTache','modifyList','accessCreationListePage','accessInscription','accessSignIn','creerListe','delListe','signIn','signUp','deconnection'); global $rep,$vues,$bd,$dataView,$styles,$assets; session_start(); try{ diff --git a/controllers/VisitorController.php b/controllers/VisitorController.php index 14a4e4c..b10f0db 100644 --- a/controllers/VisitorController.php +++ b/controllers/VisitorController.php @@ -20,11 +20,13 @@ class VisitorController { break; case "signIn": - $this->Connexion($login, $mdp); + $this->Connection($vues_erreur); break; - case "signUp": - $this->Inscription($login, $mdp); + $this->Inscription($vues_erreur); + break; + case "accessSignIn": + require($rep.$vues['signIn']); break; case "supprimerListe": @@ -82,19 +84,19 @@ class VisitorController { $dVueEreur= array(); } else{ - require($rep.$vues['singUp']); + require($rep.$vues['signUp']); } $_REQUEST['action']=null; $this->reinit(); } - public function Connexion(array $dVueEreur){ global $rep,$vues,$dataView; $username=$_POST['login']; $password=$_POST['mdp']; $dVueEreur=Validation::val_connexion($username,$password,$dVueEreur); if(!empty($dVueEreur)){ + require($rep.$vues['signIn']); } $model= new MdlUser(); diff --git a/gateway/ListeGateway.php b/gateway/ListeGateway.php index 7630987..a73849f 100644 --- a/gateway/ListeGateway.php +++ b/gateway/ListeGateway.php @@ -92,6 +92,7 @@ class ListeGateway } $listes[] = new Liste($row['id'], $row['name'],false, null, $taches); $taches = array(); +<<<<<<< HEAD /*$queryBug = "SELECT count(*) FROM Liste WHERE idCreator IS NULL"; $this->con->executeQuery($queryBug, array(':idListe' => array($idListe, PDO::PARAM_INT))); @@ -101,9 +102,10 @@ class ListeGateway break; } */ +======= +>>>>>>> cd1b36dfd8a0767bdf2fe5ed8a1c4626e0921507 } - echo "haaaaaaaaaaaaaaaa
"; } catch(PDOException $Exception) { echo 'erreur'; diff --git a/index.php b/index.php index b0d15f7..4825bdd 100644 --- a/index.php +++ b/index.php @@ -10,6 +10,6 @@ Autoload::charger(); // Construction du controleur //$cont=new FrontControleur(); -$_REQUEST['action']=NULL; +//$_REQUEST['action']=NULL; $cont= new FrontController(); ?>