Compare commits

...

48 Commits

Author SHA1 Message Date
Anna BOUDOUL df38d77797 rendu
2 years ago
Anna BOUDOUL 4cb5f69436 merge and task done management
2 years ago
Anna BOUDOUL d0b7bcc83d test
2 years ago
Nicolas FRANCO 227cfa0942 fixed data null bug
2 years ago
Nicolas FRANCO 0b6a1ae665 erreur date format
2 years ago
Nicolas FRANCO 3c164338f7 error view fixed
2 years ago
Nicolas FRANCO 6183b2df04 Merge branch 'action&exception' of https://codefirst.iut.uca.fr/git/anna.boudoul/ProjetPHP into action&exception
2 years ago
Anna BOUDOUL dd8ae7ce1b other corrections
2 years ago
Nicolas FRANCO 1ef0dc68d7 Merge branch 'action&exception' of https://codefirst.iut.uca.fr/git/anna.boudoul/ProjetPHP into action&exception
2 years ago
Nicolas FRANCO 9eb1041ce7 connection error management
2 years ago
Anna BOUDOUL 11db506471 Correcting view error
2 years ago
Anna BOUDOUL 17092eec6a changes
2 years ago
Anna BOUDOUL 8d166927ae merge and changes
2 years ago
Anna BOUDOUL 549a68e30f task date saved
2 years ago
Nicolas FRANCO 561d27f4c9 all private task/list manipulation redirecting to myList instead of Home
2 years ago
Anna BOUDOUL 682cc8abd0 erase private list
2 years ago
Anna BOUDOUL 544c3cf283 merge again
2 years ago
Anna BOUDOUL ab67871e2b small changes to frontctrl
2 years ago
Nicolas FRANCO 4966402b38 fin actions
2 years ago
Anna BOUDOUL fbabc27785 merge
2 years ago
Anna BOUDOUL 9b27bb4b11 correcting list delete (delete task from this list as well)
2 years ago
Anna BOUDOUL 27e7cfa63f exception management again
2 years ago
Anna BOUDOUL 719916c2cb erase list action
2 years ago
Nicolas FRANCO a40e051ffb log out works (made some changes on controllers and gateway deconnection function)
2 years ago
Nicolas FRANCO 93020c97e4 correction findUser
2 years ago
Anna BOUDOUL 58e6442b48 Merge branch 'visitor-controller' of https://codefirst.iut.uca.fr/git/anna.boudoul/ProjetPHP into action&exception
2 years ago
Nicolas FRANCO 82e9331652 erase taks and complete task
2 years ago
Anna BOUDOUL 2534d9bf30 about action
2 years ago
Anna BOUDOUL 898626dc57 Start of exception management
2 years ago
Nicolas FRANCO d216c395f2 addList working with view
2 years ago
Nicolas FRANCO 4516560c70 fixed merge conflicts
2 years ago
Nicolas FRANCO f99970514e merge prep
2 years ago
Anna BOUDOUL db3e5db096 view task
2 years ago
Nicolas FRANCO 9ea620fa47 add list view working
2 years ago
Anna BOUDOUL fc60b17097 View about
2 years ago
Anna BOUDOUL 15bc35ab0a correcting bugs TabVues
2 years ago
Anna BOUDOUL 770cc345af TabVues
2 years ago
Anna BOUDOUL aaeb0ab80d Error view
2 years ago
Anna BOUDOUL 2f8076669c Merging error left corrected
2 years ago
Anna BOUDOUL 6b1c67a410 Merging
2 years ago
Anna BOUDOUL f04cfc060b Validation correction
2 years ago
Anna BOUDOUL 62924b327d Validation start
2 years ago
Nicolas FRANCO 03a4766c92 navigation in all existing pages
2 years ago
Nicolas FRANCO 3c93d6e282 fixed merge conflicts
2 years ago
Nicolas FRANCO 000f06f7e4 navigation works
2 years ago
Anna BOUDOUL 912b14e5b3 correcting a few bugs
2 years ago
Anna BOUDOUL 19a7a10262 merging
2 years ago
Nicolas FRANCO 25af41e0b8 index.php first try
2 years ago

@ -7,7 +7,7 @@
private int $dc; // done counter # juste visuelle??
function __construct($nom, $owner="",$dc=0,$id=0) {
if($id=0)
if($id==0)
$this->id = (int)null;
else
$this->id = $id;

@ -10,11 +10,11 @@
private string $idlist; // # id associating task to list
private bool $isDone; // # si la tache est complete
function __construct($titre,$description,$priorite,$idl,$dateDeb="",$dateFin="",$isDone=false,$id=0) {
function __construct($titre,$description,$priorite,$idl,$dateDeb=null,$dateFin=null,$isDone=false,$id=0) {
# if id = 0, on veut donc creer une nouvelle tache
# qui n'est pas encore dans la base de donnée et donc
# le id sera fait avec le auto increment
if($id=0)
if($id==0)
$this->set_id((int)null);
else
$this->set_id($id);
@ -24,6 +24,7 @@
$this->set_dateDeb($dateDeb);
$this->set_dateFin($dateFin);
$this->set_idlist($idl);
$this->set_isDone($isDone);
}
function get_id() {

@ -0,0 +1,52 @@
Anna BOUDOUL
Nicolas FRANCO
#### Ce qui a été fait depuis l'oral:
- fonction `loadPrivateList` de la classe `TaskModel`
* utilise deux nouvelles fonctions: `findUserList` et `findListTask` du gateway pour charger les listes privées d'un user
- fonction `loadPublicLists` de la classe `TaskModel`
* utilise deux fonctions: `findPublicList` et `findListTask` du gateway pour charger les listes publiques
- vue home.php
* correction de la fonction `isConnected` qui est nécessaire dans cette vue
- contrôleur user
* constructeur
* méthode `deconnexion` associée à l'action `deconnecter`
* méthode `newListPrivate` associée à l'action `creerListePriv`
* méthode `loadListePriv` associée à l'action `voirListePriv`
* méthode `erasePrivList` associée à l'action `supprimerListePriv`
- vue connection.php
- vue newList.php
- vue register.php
- vue about.php
- vue newTask.php
- vue homePriv.php
- fin de la vue erreur.php
- navigation entre les pages avec `href=index.php?action=...`
- classe Validation
- utilisation de la classe validation dans le code
- "binding" des bouttons avec les actions correspondantes (pour les deux controlleurs, visitor et user)
- tableau de vues et tableau des messages d'erreurs
- corrections de bugs
#### Ce qui reste à faire
Nous avions envisagé de permettre à l'utilisateur d'afficher de plus amples informations sur les tâches, comme leurs dates de début et de fin et leur description, à l'aide d'un bouton sur nos vue home et home privé cependant nous n'avons pas eu le temps de le faire et par souci d'esthétisme et de lisibilité nous n'avons pas mis toutes ces informations dans le tableau des tâches pour chaque liste.
Nous souhaitions également afficher un compte des tâches faites sur le nombre de tâches total par liste mais nous n'avons pas eu le temps de terminer cette fonctionnalité.
Nous avons tout de même conservé les attributs qui étaient censés être utilisés dans ces fonctionnalités dans notre base de données et dans nos classes métiers en vue d'une possible amélioration de notre site.
#### Plus de détails
* vous pouvez trouver plus de détail sur notre dépot git disponible ici `https://codefirst.iut.uca.fr/git/anna.boudoul/ProjetPHP`, en regardant les commits qui ont été fait tout au long du projet.

@ -0,0 +1,33 @@
<?php
class Validation {
static function val_form_texte(&$texte, &$TMessage) {
if (!isset($texte)||$texte=="") {
$TMessage[] ="Empty fields";
$texte="";
}
if ($texte != filter_var($texte, FILTER_SANITIZE_STRING))
{
$TMessage[]="Attempt to inject code (security attack)";
$texte="";
}
}
static function val_form_mdp(&$mdp, &$TMessage) {
if (!isset($mdp)||$mdp=="") {
$TMessage[] ="Password not specified";
$mdp="";
}
if ($mdp != filter_var($mdp, FILTER_SANITIZE_SPECIAL_CHARS))
{
$TMessage[] ="Password must not contain special characters";
$mdp="";
}
}
}
?>

@ -1,7 +1,21 @@
<?php
//gen
require('dal/Connection.php');
$rep=__DIR__.'/../';
require('dal/Connection.php');
$con = new Connection('mysql:host=localhost;dbname=dbanboudoul', 'anboudoul', 'achanger');
//$con = new Connection('mysql:host=localhost;dbname=phpproject', 'nifranco', 'achanger');
$con = new Connection('mysql:host=localhost;dbname=dbanboudoul', 'anboudoul', 'mdpMYSQL');
$TMessage = array();
$TabVues = array();
$TabVues["erreur"] = "view/erreur.php";
$TabVues["home"] = "view/home.php";
$TabVues["connection"] = "view/connection.php";
$TabVues["register"] = "view/register.php";
$TabVues["newList"] = "view/newList.php";
$TabVues["liste"] = "view/liste.php";
$TabVues["about"] = "view/about.php";
$TabVues["prives"] = "view/privHome.php";
?>

@ -1,38 +1,44 @@
<?php
require_once('../model/UserModel.php');
require_once("config/config.php");
require("model/UserModel.php");
class FrontController
class FrontCtrl
{
//private UserModel $ursMdl;
//private $action_User;
private UserModel $usrMdl;
private $action_User;
private bool $isUser;
private $TabVues;
function __construct(){
function __construct(&$con, $TabVues){
session_start();
$ursMdl = new UserModel();
$this->TabVues = $TabVues;
$this->usrMdl = new UserModel($con);
$this->action_User = array('deconnecter', 'voirListePriv', 'creerListePriv', 'supprimerListePriv');
try{
$user = $this->usrMdl.isConnected(); // cette fonction retourne quoi?
$action = $_REQUEST['action'];
$this->isUser = $this->usrMdl->isConnected();
$action = $_REQUEST['action'] ?? null;
if(($i = array_search($action,$action_User)) !== false){ # si action dans la liste d'actions user
if(!$user){ # si pas conncter
if(($i = array_search($action,$this->action_User)) !== false){ # si action dans la liste d'actions user
if(!$this->isUser){ # si pas conncter
# appel controlleur visiteur avec action connecter
require("VisitCtrl.php");
$visitCtrl = new VisitCtrl();
require("VisitorCtrl.php");
$visitCtrl = new VisitorCtrl($con, $this->TabVues, $this->isUser);
$visitCtrl->goconnexion();
} else { # sinon
# handle action avec controlleur user
require("UserCtrl.php");
$userCtrl = new UserCtrl();
$userCtrl = new UserCtrl($con, $this->TabVues);
}
} else { # sinon forcement action visiteur
# appel controlleur visiteur avec l'action
require("VisitCtrl.php");
$visitCtrl = new VisitCtrl();
require("VisitorCtrl.php");
$visitCtrl = new VisitorCtrl($con, $this->TabVues, $this->isUser);
}
} catch (Exception $e){ // verifier si catch bon
require("../view/erreur.php");
$TMessage[] = $e->getMessage();
require($this->TabVues["erreur"]);
}
}
}

@ -1,5 +1,5 @@
<?php
require_once("../model/TaskModel.php");
require_once("model/TaskModel.php");
class UserCtrl
{
@ -7,57 +7,71 @@ class UserCtrl
private $con;
private $taskModel;
private $userModel;
private $TabVues;
public function __construct(Connection $con){
public function __construct(Connection $con, $TabVues){
$this->TabVues = $TabVues;
$this->con = $con;
$this->userModel = new UserModel($this->con);
$this->taskModel = new TaskModel($this->con);
// try{
// $action=$_REQUEST['action'];
// switch($action){
// // voir les listes privees
// case 'voirListePriv':
// $this->loadListePriv();
// break;
try{
$action=$_REQUEST['action'];
switch($action){
// voir les listes privees
case 'voirListePriv':
$this->loadListePriv();
break;
// // ajouter une liste privee
// case 'creerListePriv':
// $this->newListPrivate();
// break;
// case 'deconnecter':
// $this->deconnexion();
// break;
// ajouter une liste privee
case 'creerListePriv':
$this->newListPrivate();
break;
// supprimer une liste privee
case 'supprimerListePriv':
$this->erasePrivList();
break;
case 'deconnecter':
$this->deconnexion();
break;
default:
$TMessage[] = 'Unexpected error';
require($this->TabVues["erreur"]);
break;
// }
// } catch(Exception $e) {
// require("../view/erreur.php");
// }
}
} catch(Exception $e) {
$TMessage[] = $e->getMessage();
require($this->TabVues["erreur"]);
}
}
public function loadListePriv(){
$name = "Liste privée";
// $TabList[] = new ListTask(0, "Projet PHP");
// $TabList[] = new ListTask(1, "Projet Blazor");
$TabList = $this->taskModel->loadPrivateLists($_SESSION['login']);
require("../view/liste.php");
$user = $_SESSION['login'];
$private_lists = $this->taskModel->loadPrivateLists($user);
require($this->TabVues["prives"]);
}
public function newListPrivate(){
$nom=$_POST['listeNom'];
// $nom = "New List";
$this->taskModel->addList($nom,$_SESSION['login']);
$this->taskModel->addList($_POST['listName'],$_SESSION['login']);
$this->loadListePriv();
}
function erasePrivList(){
$this->taskModel->supList($_POST['listId']);
$this->loadListePriv();
}
function loadHome(){
$user = false;
$public_lists = $this->taskModel->loadPublicLists();
require("../view/home.php");
require($this->TabVues["home"]);
}
public function deconnexion(){
$usrModel->deconnexion();
loadHome();
$this->userModel->deconnexion();
header("Location:index.php");
}
}
?>

@ -1,15 +1,25 @@
<?php
require_once("../model/TaskModel.php");
require("model/TaskModel.php");
class VisitorCtrl
{
private $taskModel;
private $userModel;
function __construct($con){
private $isUser;
private $TabVues;
function __construct($con, $TabVues, $isUser){
$this->TabVues = $TabVues;
$this->isUser = $isUser;
$dvueErreur = array();
$taskModel = new TaskModel($con);
$userModel = new UserModel($con);
$this->taskModel = new TaskModel($con);
$this->userModel = new UserModel($con);
try{
$action = $_REQUEST['action'];
if(isset($_REQUEST['action']))
$action = $_REQUEST['action'];
else
$action = null;
switch($action){
case null:
$this->loadHome();
@ -20,17 +30,21 @@ class VisitorCtrl
$this->go_connection();
break;
case 'pageAbout':
$this->go_about();
break;
case 'connecter':
$this->connection();
# charge la vue de connexion
break;
case 'pageRegister':
$this->go_connection();
$this->go_register();
break;
case 'register':
$this->connection();
$this->register();
# charge la vue de connexion
break;
@ -62,56 +76,116 @@ class VisitorCtrl
# supprimer une tache
break;
case 'isDone':
$this->isDone();
break;
default:
#
$dvueErreur[] = 'Erreur inattendue';
require($rep.$vues['']);
$TMessage[] = 'Unexpected error';
require($this->TabVues["erreur"]);
$this->loadHome();
break;
}
} catch (Exception $e) {
require("../view/erreur.php");
}
function loadHome(){
$public_lists = $this->taskModel->loadPublicLists();
require("../view/home.php");
}
function go_connection(){
# rediriger vers la page de connection
var_dump($_POST);
$TMessage[] = $e->getMessage();
require($this->TabVues["erreur"]);
}
}
function loadHome(){
$public_lists = $this->taskModel->loadPublicLists();
# le if suivant est nécéssaire dans le cas ou l'action
# connection a été appeller. Dans ce cas, loadHome doit
# prendre en compte le user qui vient d'être ajouter a
# $_SESSION['login']
if(isset($_SESSION['login']) && $_SESSION['login'] != "")
$user = $_SESSION['login'];
else
$user = $this->isUser;
require($this->TabVues["home"]);
}
function connection(){
$this->userModel->connexion($user,$mdp);
}
function go_list(){
}
function go_connection(){
$user = $this->isUser;
require($this->TabVues["connection"]);
}
function makeList(){
function go_about(){
$user = $this->isUser;
require($this->TabVues["about"]);
}
function connection(){
$isCo = $this->userModel->connexion($_POST['username'],$_POST['password']);
if(!$isCo){
$TMessage[] = 'This user does not exist'; require($this->TabVues["erreur"]);
$this->loadHome();
}
else
$this->loadHome();
}
function eraseList(){
}
function go_register(){
$user = $this->isUser;
require($this->TabVues["register"]);
}
function go_task(){
function register(){
$this->userModel->ajouter($_POST['username'],$_POST['password']);
$this->go_connection();
}
function go_list(){
$user = $this->isUser;
require("view/newList.php");
}
}
function makeList(){
$this->taskModel->addList($_POST['listName']);
$this->loadHome();
}
function addTask(){
function eraseList(){
$this->taskModel->supList($_POST['listId']);
$this->loadHome();
}
}
function go_task(){
$user = $this->isUser;
if(isset($_POST['listId'])) $_SESSION['listId'] = $_POST['listId'];
if(isset($_POST['isPriv'])) $_SESSION['isPriv'] = $_POST['isPriv'];
require("view/newTask.php");
}
function eraseTask(){
function addTask(){
$this->taskModel->addTask($_POST['titreT'],$_POST['descT'],
$_POST['prioriteT'],$_SESSION['listId'],$_POST['dateDebT'],$_POST['dateFinT']);
}
if(isset($_SESSION['isPriv']) && $_SESSION['isPriv'])
header("Location:index.php?action=voirListePriv");
else
$this->loadHome();
}
function eraseTask(){
$this->taskModel->supTask($_POST['idT']);
if(!empty($_POST['isPriv']))
header("Location:index.php?action=voirListePriv");
else
$this->loadHome();
}
function isDone(){
if ($_POST['Tdone'])
$this->taskModel->modifTask($_POST['idT'],'isDone',false);
else
$this->taskModel->modifTask($_POST['idT'],'isDone',true);
if(!empty($_POST['isPriv']))
header("Location:index.php?action=voirListePriv");
else
$this->loadHome();
}
}
?>

@ -1,6 +1,7 @@
<?php
require_once("Connection.php");
include_once("../business/Task.php");
require_once("business/ListTask.php");
include_once("business/Task.php");
class TaskGateway
{
@ -15,18 +16,24 @@ class TaskGateway
// functions
// code de retour pour les fonctions i,u,d?
public function insertT(Task $t){
$query='INSERT INTO Tache VALUES (:id,:titre,:descript,NULL,NULL,:priorite,:idList,false)';
$query='INSERT INTO Tache VALUES (:id,:titre,:descript,:dateDeb,:dateFin,:priorite,:idList,false)';
if($t->get_dateDeb() == null)
$dateDeb = NULL;
else
$dateDeb = $t->get_dateDeb();
if($t->get_dateFin() == null)
$dateFin = NULL;
else
$dateFin = $t->get_dateFin();
$this->con->executeQuery($query, array(
':id'=> array($t->get_id(),PDO::PARAM_STR),
':titre'=> array($t->get_titre(),PDO::PARAM_STR),
':descript'=> array($t->get_description(),PDO::PARAM_STR),
':dateDeb'=> array($dateDeb,PDO::PARAM_STR),
':dateFin'=> array($dateFin,PDO::PARAM_STR),
':priorite'=> array($t->get_priorite(),PDO::PARAM_STR),
':idList'=> array($t->get_idList(),PDO::PARAM_STR) ));
/*Comment gerer les erreurs?
* si valeur existe deja
*/
}
public function update($table,$id,$element, $valeur){
@ -44,7 +51,8 @@ class TaskGateway
if($table == 'task'){
$query='DELETE FROM Tache WHERE id = :id';
} else {
$query='DELETE FROM uList WHERE id = :id';
$query='DELETE FROM uList WHERE id = :id;
DELETE FROM Tache WHERE idList = :id;';
}
$this->con->executeQuery($query, array(
':id'=>array($id,PDO::PARAM_STR)));
@ -112,6 +120,20 @@ class TaskGateway
':user'=> array($l->get_owner(),PDO::PARAM_STR)));
}
public function count($list){
$query='SELECT COUNT(*) from Tache where idList = :idList';
$this->con->executeQuery($query, array(
':idList' => array($list->get_id(),PDO::PARAM_INT)
));
$result = $this->con->getResults();
foreach($result as $row){
$taille = $row[0];
}
return $taille;
}
public function findUserList($user){
# pas réussit a faire une jointure optimale donc
# decomposé en plusieurs foncitons:

@ -47,8 +47,8 @@
$query = 'SELECT mdp FROM User WHERE login = :login';
$this->con->executeQuery($query, array(':login'=>array($login, PDO::PARAM_STR)));
$result = $this->con->getResults();
$hash = password_hash($result[0]['mdp'], PASSWORD_BCRYPT, array("cost" => 12));
if(password_verify($mdp, $hash))
if(empty($result[0][0])) return;
if(password_verify($mdp, $result[0][0]))
return $login;
}
}

@ -0,0 +1,58 @@
-- phpMyAdmin SQL Dump
-- version 5.2.0
-- https://www.phpmyadmin.net/
SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
START TRANSACTION;
SET time_zone = "+00:00";
-- --------------------------------------------------------
--
-- Structure de la table `tache`
--
DROP TABLE IF EXISTS `tache`;
CREATE TABLE IF NOT EXISTS `tache` (
`id` int NOT NULL AUTO_INCREMENT,
`titre` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`description` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`dateDebut` date DEFAULT NULL,
`dateFin` date DEFAULT NULL,
`priorite` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`idList` int NOT NULL,
`isDone` tinyint(1) NOT NULL,
PRIMARY KEY (`id`),
KEY `FK_list` (`idList`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-- --------------------------------------------------------
--
-- Structure de la table `ulist`
--
DROP TABLE IF EXISTS `ulist`;
CREATE TABLE IF NOT EXISTS `ulist` (
`id` int NOT NULL AUTO_INCREMENT,
`nom` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`user` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
`dc` int NOT NULL,
PRIMARY KEY (`id`),
KEY `FK_list_owner` (`user`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
-- --------------------------------------------------------
--
-- Structure de la table `user`
--
DROP TABLE IF EXISTS `user`;
CREATE TABLE IF NOT EXISTS `user` (
`login` varchar(250) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
`mdp` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL,
PRIMARY KEY (`login`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
COMMIT;

@ -1,9 +1,7 @@
<?php
require("config/config.php");
require('config/Validation.php');
require_once("controller/FrontCtrl.php");
require("erreur.php");
$fc = new FrontCtrl();
$TMessage = array();
$fc = new FrontCtrl($con, $TabVues);
?>

@ -1,6 +1,6 @@
<?php
include_once("../dal/TaskGateway.php");
include_once("../business/Task.php");
include_once("dal/TaskGateway.php");
include_once("business/Task.php");
class TaskModel
{
@ -13,7 +13,7 @@ class TaskModel
$this->gtw= new TaskGateway($con);
}
public function addTask($titre,$desc,$priorite,$idList,$dateDeb="",$dateFin="",$isDone=false,$id=0)
public function addTask($titre,$desc,$priorite,$idList,$dateDeb=null,$dateFin=null,$isDone=false,$id=0)
{
$t = new Task($titre,$desc,$priorite,$idList,$dateDeb,$dateFin,$isDone,$id);
$this->gtw->insertT($t);
@ -43,6 +43,7 @@ class TaskModel
/* LIST FUNCTIONS */
public function addList($nom,$owner="",$dc=0,$id=0)
{
Validation::val_form_texte($owner, $TMessage);
$l = new ListTask($nom,$owner,$dc);
$this->gtw->insertL($l);
// retourne quoi? con->lastInsertId() ??
@ -52,6 +53,11 @@ class TaskModel
{
$this->gtw->update('list',$id,$element,$valeur);
}
public function size($list){
$taille = $this->gtw->count($list);
return $taille;
}
public function supList($id)
{

@ -1,5 +1,8 @@
<?php
require('../business/User.php');
require('business/User.php');
require('dal/UserGateway.php');
require_once("config/config.php");
class UserModel{
private $con;
private $gat;
@ -10,43 +13,52 @@
}
function connexion($login, $mdp){
Validation::val_form_texte($login, $TMessage);
Validation::val_form_mdp($mdp, $TMessage);
$result = $this->gat->findUser($login, $mdp);
if(!isset($result)) echo 'not set works';
// if (isset($result))
// {
// $_SESSION['login'] = $result;
// }
if(!isset($result)){
return false;
} else {
$_SESSION['login'] = $result;
return true;
}
}
function deconnexion(){
session_unset();
session_destroy();
$_SESSION = array();
}
function isConnected($login){ //teste rôle dans la session, retourne instance dobjet ou booleen
if(isset($_SESSION['login'])){
function isConnected(){ //teste rôle dans la session, retourne instance dobjet ou booleen
Validation::val_form_texte($_SESSION['login'], $TMessage);
if(isset($_SESSION['login']) && $_SESSION['login']!="")
return true;
} else {
else
return false;
}
}
function ajouter($login, $mdp){
Validation::val_form_texte($login, $TMessage);
Validation::val_form_mdp($mdp, $TMessage);
$user = $this->findByLogin($login);
if (empty($user))
$this->gat->create($login, $mdp);
}
function supprimer($login){
Validation::val_form_texte($login, $TMessage);
$this->gat->delete($login);
}
function modifMdp($login, $mdp){
Validation::val_form_texte($login, $TMessage);
Validation::val_form_mdp($mdp, $TMessage);
$this->gat->updateMdp($login, $mdp);
}
function findByLogin($login){
Validation::val_form_texte($login, $TMessage);
$user = null;
if ($login !== " " && $login != null )
{
@ -59,6 +71,8 @@
}
function modifLogin($oldLogin, $newLogin){
Validation::val_form_texte($oldLogin, $TMessage);
Validation::val_form_texte($newLogin, $TMessage);
$user = $this->findByLogin($oldLogin);
if (empty($user))
$this->gat->updateLogin($oldLogin, $newLogin);

@ -1,9 +1,9 @@
<?php
require_once("../business/Task.php");
require_once("../business/ListTask.php");
require_once("../dal/TaskGateway.php");
require_once("../model/TaskModel.php");
require_once("../controller/VisitorCtrl.php");
require_once("business/Task.php");
require_once("business/ListTask.php");
require_once("dal/TaskGateway.php");
require_once("controller/VisitorCtrl.php");
require_once("dal/Connection.php");
//echo "<h1>2do test</h1>";
# Test de la Gateway Tache
@ -11,8 +11,7 @@ require_once("../controller/VisitorCtrl.php");
# $t = new Task(5,'tacheNotErr','desc.','urgent','001');
# connection
include("credentials.php");
$con = new Connection('mysql:host=localhost;dbname=dbanboudoul', 'anboudoul', 'mdpMYSQL');
$con = new Connection('mysql:host=localhost;dbname=phpproject', 'nifranco', 'achanger');
# gateway
// $t = new Task(3,'richarlison voltar pro flu','desc.','urgent','0');
@ -40,6 +39,7 @@ $con = new Connection('mysql:host=localhost;dbname=dbanboudoul', 'anboudoul', 'm
# Test LOAD PRIVATE TASKS
$mt= new TaskModel($con);
$mt->addList('Nicolas2do');
# Test LOAD PRIVATE TASKS
// $mt= new TaskModel($con);
// $mt->addList('private','nifranco');
@ -87,28 +87,31 @@ require('../controller/UserCtrl.php');
// Test Modèle User
//$mu = new UserModel($con);
//$res = $mu->connexion('nifranco','achanger');
//var_dump($res);
$mdl = new UserModel($con);
// $mdl->ajouter('Anna', 'unmdptrescomplique');
// $mdl->modifLogin('Anna', 'Aeryn');
// $mdl->modifMdp('Aeryn', 'wtfmec');
// $mdl->supprimer('Aeryn');
$mdl->connexion('Aeryn', 'wtfmec');
// $mdl->connexion('Aeryn', 'wtfmec');
$mt->addList("Test Liste");
$mt->addList("Liste publique");
$mt->addList("Liste privée", "Aeryn");
$mt->addList("Projet de PHP", "Aeryn");
$mt->addList("Projet Blazor", "Aeryn");
$mt->addList("Projet de PHP", "RicharlisonR9");
$mt->addList("Projet Blazor", "RicharlisonR9");
// $mt->addList("Test Liste");
// $mt->addList("Liste publique");
// $mt->addList("Liste privée", "Aeryn");
// $mt->addList("Projet de PHP", "Aeryn");
// $mt->addList("Projet Blazor", "Aeryn");
// $mt->addList("Projet de PHP", "RicharlisonR9");
// $mt->addList("Projet Blazor", "RicharlisonR9");
// TEST USER CONTROLLER
session_start();
$_SESSION['login'] = 'RicharlisonR9';
$usrctrl = new UserCtrl($con);
$usrctrl->loadHome();
// session_start();
// $_SESSION['login'] = 'RicharlisonR9';
// $usrctrl = new UserCtrl($con);
// $usrctrl->loadHome();

@ -0,0 +1,74 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="" />
<meta name="author" content="" />
<!-- Core theme CSS (includes Bootstrap)-->
<link href="view/css/home.css" rel="stylesheet" />
</head>
<body>
<div class="d-flex" id="wrapper">
<!-- Sidebar-->
<div class="border-end bg-white" id="sidebar-wrapper">
<div class="sidebar-heading border-bottom bg-light">2do</div>
<div class="list-group list-group-flush">
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php">Home</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageListe">New List +</a>
<?php
if($user){
echo '<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=voirListePriv">My Lists &#128274;</a>';
}
?>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageAbout">About</a>
</div>
</div>
<!-- Page content wrapper-->
<div id="page-content-wrapper">
<!-- Top navigation-->
<nav class="navbar navbar-expand-lg navbar-light bg-light border-bottom">
<div class="container-fluid">
<button class="btn btn-primary" id="sidebarToggle">Toggle Menu</button>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ms-auto mt-2 mt-lg-0">
<?php
if($user){
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=deconnecter">Log out</a></li>';
} else {
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=pageConnection">Log In</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=pageRegister">Register</a></li>';
}
?>
</ul>
</div>
</div>
</nav>
<!--Contenu de la page ici-->
<div class="container-fluid">
<center>
<div class="col-lg-4 mb-5 mb-lg-0 text-center">
<div>
<div class="rounded-5 shadow-3-soft p-4" style="background-color: #fff9f2">
<div class="border-top border-dark mx-auto" style="width: 100px"></div>
<p class="text-muted mt-4 mb-2">2Do</p>
<p class="h5 mb-4" style="color: #344e41">A PHP project</p>
<p class="pb-4 mb-4">
A little PHP project realised by two french students studying Computer Science at the IUT of
Clermont Auvergne in France. The main goal of this project was to create a little To Do List
using the PHP language. We hope that you will find it useful.
</p>
</div>
</div>
</div>
</center>
</div>
</div>
</div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
<!-- Core theme JS-->
<script src="../view/js/home.js"></script>
</body>
</html>

@ -6,7 +6,7 @@
<meta name="description" content="" />
<meta name="author" content="" />
<!-- Core theme CSS (includes Bootstrap)-->
<link href="../view/css/home.css" rel="stylesheet" />
<link href="view/css/home.css" rel="stylesheet" />
</head>
<body>
<div class="d-flex" id="wrapper">
@ -14,14 +14,14 @@
<div class="border-end bg-white" id="sidebar-wrapper">
<div class="sidebar-heading border-bottom bg-light">2do</div>
<div class="list-group list-group-flush">
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">Home</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">New List +</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php">Home</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageListe">New List +</a>
<?php
if($user){
echo '<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">My Lists &#128274;</a>';
echo '<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=voirListePriv">My Lists &#128274;</a>';
}
?>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">About</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageAbout">About</a>
</div>
</div>
<!-- Page content wrapper-->
@ -35,10 +35,10 @@
<ul class="navbar-nav ms-auto mt-2 mt-lg-0">
<?php
if($user){
echo '<li class="nav-item"><a class="nav-link" href="#!">Log out</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=deconnecter">Log out</a></li>';
} else {
echo '<li class="nav-item"><a class="nav-link" href="#!">Log In</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="#!">Register</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=pageRegister">Register</a></li>';
}
?>
</ul>
@ -48,21 +48,22 @@
<!--Contenue de la page ici-->
<div class="container-fluid">
<h1 class="text-center my-3 pb-3">Welcome back!</h1>
<form>
<form action="index.php" method="post">
<!-- Login input -->
<div class="form-outline mb-4 align-items-center">
<input type="email" id="form2Example1" class="form-control" />
<input name="username" type="text" id="form2Example1" class="form-control" required/>
<label class="form-label" for="form2Example1">Username</label>
</div>
<!-- Password input -->
<div class="form-outline mb-4">
<input type="password" id="form2Example2" class="form-control" />
<input name="password" type="password" id="form2Example2" class="form-control" required/>
<label class="form-label" for="form2Example2">Password</label>
</div>
<!-- Submit button -->
<button type="button" class="btn btn-primary btn-block mb-4" action="connecter">Sign in</button>
<button type="submit" class="btn btn-primary btn-block mb-4">Log In</button>
<input type="hidden" name="action" value="connecter" ></input>
</form>
</div>
@ -70,6 +71,6 @@
</div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
<!-- Core theme JS-->
<script src="../view/js/home.js"></script>
<script src="view/js/home.js"></script>
</body>
</html>

@ -1,5 +1,18 @@
<?php
foreach($TMessage as $err) {
echo $err . "<br/>";
}
?>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css"
rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65"
crossorigin="anonymous">
</head>
<body>
<?php
foreach($TMessage as $err) {
echo '<div class="alert alert-danger alert-dismissible d-flex align-items-center fade show">
<i class="bi-exclamation-octagon-fill"></i>
<strong class="mx-2">Error!</strong>' . $err . "</div>";
}
?>
</body>
</html>

@ -1 +0,0 @@
<a href="CtrlUser.php?action=exaction&id=1"

@ -6,7 +6,7 @@
<meta name="description" content="" />
<meta name="author" content="" />
<!-- Core theme CSS (includes Bootstrap)-->
<link href="../view/css/home.css" rel="stylesheet" />
<link href="view/css/home.css" rel="stylesheet" />
</head>
<body>
<div class="d-flex" id="wrapper">
@ -14,14 +14,14 @@
<div class="border-end bg-white" id="sidebar-wrapper">
<div class="sidebar-heading border-bottom bg-light">2do</div>
<div class="list-group list-group-flush">
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">Home</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">New List +</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php">Home</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageListe">New List +</a>
<?php
if($user){
echo '<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">My Lists &#128274;</a>';
echo '<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=voirListePriv">My Lists &#128274;</a>';
}
?>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">About</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageAbout">About</a>
</div>
</div>
<!-- Page content wrapper-->
@ -35,10 +35,10 @@
<ul class="navbar-nav ms-auto mt-2 mt-lg-0">
<?php
if($user){
echo '<li class="nav-item"><a class="nav-link" href="#!">Log out</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=deconnecter">Log out</a></li>';
} else {
echo '<li class="nav-item"><a class="nav-link" action="page_connection">Log In</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="#!">Register</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=pageConnection">Log In</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=pageRegister">Register</a></li>';
}
?>
</ul>
@ -59,12 +59,20 @@
<div class="col col-lg-9 col-xl-7">
<div class="card rounded-3"><div class="card rounded-3">
<div class="card-body p-4">
<form action="index.php" method="post" class="row row-cols-lg-auto g-3 justify-content-center align-items-center mb-4 pb-2">
<div class="col-12 position-absolute top-0 start-0">
<button type="submit" class="btn btn-danger">&#128465;</button>
<input type="hidden" name="listId" value="'.$l->get_id().'"></input>
<input type="hidden" name="action" value="supprimerListe"></input>
</div>
</form>
<h4 class="text-center my-3 pb-3">'.$l->get_nom().'</h4>
<form class="row row-cols-lg-auto g-3 justify-content-center align-items-center mb-4 pb-2">
<form action="index.php" method="post" class="row row-cols-lg-auto g-3 justify-content-center align-items-center mb-4 pb-2">
<div class="col-12">
<button type="submit" class="btn btn-primary">New task &#128221;</button>
<input type="hidden" name="listId" value="'.$l->get_id().'"></input>
<input type="hidden" name="action" value="pageTache"></input>
</div>
</form>
<table class="table mb-4">
@ -79,13 +87,41 @@
# IF NO TASKS, display NO TASKS
if(!empty($l->get_taches())){
foreach($l->get_taches() as $t){
if(!$t->get_isDone()){
echo '
<tr>
<td>'.$t->get_titre().'</td>
<td>'.$t->get_priorite().'</td>';
} else {
echo '
<tr>
<td><del>'.$t->get_titre().'</del></td>
<td><del>'.$t->get_priorite().'</del></td>';
}
echo '
<tr>
<td>'.$t->get_titre().'</td>
<td>'.$t->get_priorite().'</td>
<td>
<button type="submit" class="btn btn-success ms-1">Done</button>
<button type="submit" class="btn btn-danger">&#128465;</button>
<form action="index.php" method="post" class="d-inline-block">';
if(!$t->get_isDone()){
echo '<button type="submit" class="btn btn-success ms-1">&#10004;
<input type="hidden" name="idT" value="'.$t->get_id().'"></input>
<input type="hidden" name="Tdone" value="'.$t->get_isDone().'"></input>
<input type="hidden" name="action" value="isDone">
</button>';
} else {
echo '<button type="submit" class="btn btn-secondary ms-1">&#10006;
<input type="hidden" name="idT" value="'.$t->get_id().'"></input>
<input type="hidden" name="Tdone" value="'.$t->get_isDone().'"></input>
<input type="hidden" name="action" value="isDone">
</button>';
}
echo '
</form>
<form action="index.php" method="post" class="d-inline-block">
<button type="submit" class="btn btn-danger">&#128465;
<input type="hidden" name="idT" value="'.$t->get_id().'"></input>
<input type="hidden" name="action" value="supprimerTache">
</button>
</form>
</td>
</tr>';
}
@ -110,7 +146,7 @@
<!-- Bootstrap core JS-->
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
<!-- Core theme JS-->
<script src="../view/js/home.js"></script>
<script src="view/js/home.js"></script>
</body>
</html>

@ -14,14 +14,14 @@
<div class="border-end bg-white" id="sidebar-wrapper">
<div class="sidebar-heading border-bottom bg-light">2do</div>
<div class="list-group list-group-flush">
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">Home</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">New List +</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php">Home</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageListe">New List +</a>
<?php
if($user){
echo '<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">My Lists &#128274;</a>';
echo '<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=voirListePriv">My Lists &#128274;</a>';
}
?>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">About</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageAbout">About</a>
</div>
</div>
<!-- Page content wrapper-->
@ -35,10 +35,10 @@
<ul class="navbar-nav ms-auto mt-2 mt-lg-0">
<?php
if($user){
echo '<li class="nav-item"><a class="nav-link" href="#!">Log out</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=deconnecter">Log out</a></li>';
} else {
echo '<li class="nav-item"><a class="nav-link" href="#!">Log In</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="#!">Register</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=pageConnection">Log In</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=pageRegister">Register</a></li>';
}
?>
</ul>

@ -24,3 +24,12 @@ window.addEventListener('DOMContentLoaded', event => {
}
});
function hideShow() {
var x = document.getElementById("myDIV");
if (x.style.display === "none") {
x.style.display = "block";
} else {
x.style.display = "none";
}
}

@ -1,19 +0,0 @@
<!DOCTYPE html>
<html lang="fr">
<head>
<meta charset="utf-8" />
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css"
rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65"
crossorigin="anonymous">
</head>
<body>
<?php
echo '<h1>'.$name.'</h1><center>';
echo '<div class="list-group list-group-light">';
foreach($TabList as $liste){
echo '<button type="button" class="list-group-item list-group-item-action px-3 border-0">'.$liste->get_nom().'</button>';
}
echo '</div></center>';
?>
</body>
</html>

@ -1,41 +1,92 @@
<!DOCTYPE html>
<html lang="fr">
<html lang="en">
<head>
<meta charset="utf-8" />
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css"
rel="stylesheet" integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65"
crossorigin="anonymous">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="" />
<meta name="author" content="" />
<!-- Core theme CSS (includes Bootstrap)-->
<link href="view/css/home.css" rel="stylesheet" />
</head>
<body>
<section class="vh-100" style="background-color: #eee;">
<div class="container py-5 h-100">
<div class="row d-flex justify-content-center align-items-center h-100">
<div class="col col-lg-9 col-xl-7">
<div class="card rounded-3"><div class="card rounded-3">
<div class="card-body p-4">
<div class="d-flex" id="wrapper">
<!-- Sidebar-->
<div class="border-end bg-white" id="sidebar-wrapper">
<div class="sidebar-heading border-bottom bg-light">2do</div>
<div class="list-group list-group-flush">
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php">Home</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageListe">New List +</a>
<?php
if($user){
echo '<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=voirListePriv">My Lists &#128274;</a>';
}
?>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageAbout">About</a>
</div>
</div>
<!-- Page content wrapper-->
<div id="page-content-wrapper">
<!-- Top navigation-->
<nav class="navbar navbar-expand-lg navbar-light bg-light border-bottom">
<div class="container-fluid">
<button class="btn btn-primary" id="sidebarToggle">Toggle Menu</button>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ms-auto mt-2 mt-lg-0">
<?php
if($user){
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=deconnecter">Log out</a></li>';
} else {
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=pageConnection">Log In</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=pageRegister">Register</a></li>';
}
?>
</ul>
</div>
</div>
</nav>
<!--Contenue de la page ici-->
<div class="container-fluid">
<section class="vh-50" style="background-color: #eee;">
<div class="container py-5 h-100">
<div class="row d-flex justify-content-center align-items-center h-100">
<div class="col col-lg-9 col-xl-7">
<div class="card rounded-3"><div class="card rounded-3">
<div class="card-body p-4">
<h4 class="text-center my-3 pb-3">New List</h4>
<form class="row row-cols-lg-auto g-3 justify-content-center align-items-center mb-4 pb-2">
<div class="col-12">
<div class="form-outline">
<input type="text" id="form1" class="form-control" />
</div>
</div>
<h4 class="text-center my-3 pb-3">New List</h4>
<form action="index.php" class="row row-cols-lg-auto g-3 justify-content-center align-items-center mb-4 pb-2" method="post">
<div class="col-12">
<div class="form-outline">
<input type="text" id="form1" class="form-control" name="listName" required/>
</div>
</div>
<div class="col-12">
<button type="submit" class="btn btn-primary">Save</button>
</div>
<button type="submit" class="btn btn-primary">Add</button>
<input type="hidden" name="action" value="creerListe"></input>
<?php
if($user){
echo '
<label for="privateRadio" class="form-check-label">
<input class="form-check-input" type="radio" name="action" value="creerListePriv"> Private &#128274
</label>';
}
?>
</form>
<div class="col-12">
<button type="submit" class="btn btn-primary">Make private &#128274;</button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
</section>
</div>
</div>
</section>
</div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
<!-- Core theme JS-->
<script src="view/js/home.js"></script>
</body>
</html>

@ -0,0 +1,100 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="" />
<meta name="author" content="" />
<!-- Core theme CSS (includes Bootstrap)-->
<link href="view/css/home.css" rel="stylesheet" />
</head>
<body>
<div class="d-flex" id="wrapper">
<!-- Sidebar-->
<div class="border-end bg-white" id="sidebar-wrapper">
<div class="sidebar-heading border-bottom bg-light">2do</div>
<div class="list-group list-group-flush">
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php">Home</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageListe">New List +</a>
<?php
if($user){
echo '<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=voirListePriv">My Lists &#128274;</a>';
}
?>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageAbout">About</a>
</div>
</div>
<!-- Page content wrapper-->
<div id="page-content-wrapper">
<!-- Top navigation-->
<nav class="navbar navbar-expand-lg navbar-light bg-light border-bottom">
<div class="container-fluid">
<button class="btn btn-primary" id="sidebarToggle">Toggle Menu</button>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ms-auto mt-2 mt-lg-0">
<?php
if($user){
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=deconnecter">Log out</a></li>';
} else {
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=pageConnection">Log In</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=pageRegister">Register</a></li>';
}
?>
</ul>
</div>
</div>
</nav>
<!--Contenue de la page ici-->
<div class="container-fluid">
<h4 class="text-center my-3 pb-3">New Task</h4>
<form method="post" action="index.php">
<div class="form-outline mb-4 align-items-center">
<label class="form-label" for="form2title">Name</label>
<input name="titreT" type="text" id="form2title" class="form-control" required minlength="0" maxlength="250"/>
</div>
<div class="form-outline mb-4">
<label class="form-label" for="form2description">Description</label>
<input name="descT" type="text" id="form2description" class="form-control" minlength="0" maxlength="250">
</div>
<div class="form-outline mb-4">
<label class="form-label" for="form2dateDeb">Starting date</label>
<input name="dateDebT" type="date" id="form2dateDeb" class="form-control">
</div>
<div class="form-outline mb-4">
<label class="form-label" for="form2dateFin">Ending date</label>
<input name="dateFinT" type="date" id="form2dateFin" class="form-control">
</div>
<!-- <div class="form-outline mb-4">
<input name="prioriteT" type="text" id="form2importance" class="form-control" />
<label class="form-label" for="form2importance">Importance</label>
</div> -->
<div class="form-outline mb-4">
<label class="form-label" for="form2importance">Importance</label>
<select name="prioriteT" id="form2importance" class="form-control">
<option value="">--Please choose an option--</option>
<option value="Urgent">Urgent</option>
<option value="Important">Important</option>
<option value="Medium">Medium</option>
<option value="Low">Low</option>
<option value="None">None</option>
</select>
</div>
<!-- Submit button -->
<button type="submit" class="btn btn-primary btn-block mb-4" >Save</button>
<input type="hidden" name="action" value="ajouterTache"></input>
</form>
</div>
</div>
</div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
<!-- Core theme JS-->
<script src="view/js/home.js"></script>
</body>
</html>

@ -0,0 +1,150 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="description" content="" />
<meta name="author" content="" />
<!-- Core theme CSS (includes Bootstrap)-->
<link href="view/css/home.css" rel="stylesheet" />
</head>
<body>
<div class="d-flex" id="wrapper">
<!-- Sidebar-->
<div class="border-end bg-white" id="sidebar-wrapper">
<div class="sidebar-heading border-bottom bg-light">2do</div>
<div class="list-group list-group-flush">
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php">Home</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageListe">New List +</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=voirListePriv">My Lists &#128274;</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageAbout">About</a>
</div>
</div>
<!-- Page content wrapper-->
<div id="page-content-wrapper">
<!-- Top navigation-->
<nav class="navbar navbar-expand-lg navbar-light bg-light border-bottom">
<div class="container-fluid">
<button class="btn btn-primary" id="sidebarToggle">Toggle Menu</button>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav ms-auto mt-2 mt-lg-0">
<li class="nav-item"><a class="nav-link" href="index.php?action=deconnecter">Log out</a></li>
</ul>
</div>
</div>
</nav>
<!-- Page content-->
<div class="container-fluid">
<h1 class="mt-4">My Lists</h1>
<?php
if(empty($private_lists)){
echo'
<div class="d-flex align-items-center justify-content-center">
<a href="index.php?action=pageListe" class="btn btn-default btn-lg"><span class="glyphicon glyphicon-envelope"></span>Add List &#10133;</a>
</div>';
}
foreach($private_lists as $l){
echo '
<section class="vh-0" style="background-color: #eee;">
<div class="container py-5 h-100">
<div class="row d-flex justify-content-center align-items-center h-100">
<div class="col col-lg-9 col-xl-7">
<div class="card rounded-3"><div class="card rounded-3">
<div class="card-body p-4">
<form action="index.php" method="post" class="row row-cols-lg-auto g-3 justify-content-center align-items-center mb-4 pb-2">
<div class="col-12 position-absolute top-0 start-0">
<button type="submit" class="btn btn-danger">&#128465;</button>
<input type="hidden" name="listId" value="'.$l->get_id().'"></input>
<input type="hidden" name="action" value="supprimerListePriv"></input>
</div>
</form>
<h4 class="text-center my-3 pb-3">'.$l->get_nom().'</h4>
<form action="index.php" method="post" class="row row-cols-lg-auto g-3 justify-content-center align-items-center mb-4 pb-2">
<div class="col-12">
<button type="submit" class="btn btn-primary">New task &#128221;</button>
<input type="hidden" name="listId" value="'.$l->get_id().'"></input>
<input type="hidden" name="action" value="pageTache"></input>
<input type="hidden" name="isPriv" value="true"></input>
</div>
</form>
<table class="table mb-4">
<thead>
<tr>
<th scope="col">Task</th>
<th scope="col">Importance</th>
<th scope="col">Actions</th>
</tr>
</thead>
<tbody>';
# IF NO TASKS, display NO TASKS
if(!empty($l->get_taches())){
foreach($l->get_taches() as $t){
if(!$t->get_isDone()){
echo '
<tr>
<td>'.$t->get_titre().'</td>
<td>'.$t->get_priorite().'</td>';
} else {
echo '
<tr>
<td><del>'.$t->get_titre().'</del></td>
<td><del>'.$t->get_priorite().'</del></td>';
}
echo '
<td>
<form action="index.php" method="post" class="d-inline-block">';
if(!$t->get_isDone()){
echo '<button type="submit" class="btn btn-success ms-1">&#10004;
<input type="hidden" name="idT" value="'.$t->get_id().'"></input>
<input type="hidden" name="Tdone" value="'.$t->get_isDone().'"></input>
<input type="hidden" name="action" value="isDone">
<input type="hidden" name="isPriv" value="true">
</button>';
} else {
echo '<button type="submit" class="btn btn-secondary ms-1">&#10006;
<input type="hidden" name="idT" value="'.$t->get_id().'"></input>
<input type="hidden" name="Tdone" value="'.$t->get_isDone().'"></input>
<input type="hidden" name="action" value="isDone">
<input type="hidden" name="isPriv" value="true">
</button>';
}
echo '
</form>
<form action="index.php" method="post" class="d-inline-block">
<button type="submit" class="btn btn-danger">&#128465;
<input type="hidden" name="idT" value="'.$t->get_id().'"></input>
<input type="hidden" name="action" value="supprimerTache">
<input type="hidden" name="isPriv" value="true">
</button>
</form>
</td>
</tr>';
}
} else {
echo '<h6 class="text-center my-3 pb-3">No tasks here yet!</h6>';
}
echo ' </tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</section>';
}
?>
</div>
</div>
</div>
<!-- Bootstrap core JS-->
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
<!-- Core theme JS-->
<script src="view/js/home.js"></script>
</body>
</html>

@ -6,7 +6,7 @@
<meta name="description" content="" />
<meta name="author" content="" />
<!-- Core theme CSS (includes Bootstrap)-->
<link href="../view/css/home.css" rel="stylesheet" />
<link href="view/css/home.css" rel="stylesheet" />
</head>
<body>
<div class="d-flex" id="wrapper">
@ -14,14 +14,14 @@
<div class="border-end bg-white" id="sidebar-wrapper">
<div class="sidebar-heading border-bottom bg-light">2do</div>
<div class="list-group list-group-flush">
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">Home</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">New List +</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php">Home</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageListe">New List +</a>
<?php
if($user){
echo '<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">My Lists &#128274;</a>';
echo '<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=voirListePriv">My Lists &#128274;</a>';
}
?>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="#!">About</a>
<a class="list-group-item list-group-item-action list-group-item-light p-3" href="index.php?action=pageAbout">About</a>
</div>
</div>
<!-- Page content wrapper-->
@ -35,9 +35,9 @@
<ul class="navbar-nav ms-auto mt-2 mt-lg-0">
<?php
if($user){
echo '<li class="nav-item"><a class="nav-link" href="#!">Log out</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=deconnecter">Log out</a></li>';
} else {
echo '<li class="nav-item"><a class="nav-link" href="#!">Log In</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="index.php?action=pageConnection">Log In</a></li>';
echo '<li class="nav-item"><a class="nav-link" href="#!">Register</a></li>';
}
?>
@ -48,21 +48,22 @@
<!--Contenue de la page ici-->
<div class="container-fluid">
<h2 class="text-center my-3 pb-3">Make private lists with a personnal account</h2>
<form>
<form action="index.php" method="post">
<!-- Login input -->
<div class="form-outline mb-4 align-items-center">
<input type="email" id="form2Example1" class="form-control" />
<input name="username" type="text" id="form2Example1" class="form-control" required/>
<label class="form-label" for="form2Example1">Username</label>
</div>
<!-- Password input -->
<div class="form-outline mb-4">
<input type="password" id="form2Example2" class="form-control" />
<input name="password" type="password" id="form2Example2" class="form-control" required/>
<label class="form-label" for="form2Example2">Password</label>
</div>
<!-- Submit button -->
<button type="button" class="btn btn-primary btn-block mb-4" action="register">Register</button>
<button type="submit" class="btn btn-primary btn-block mb-4">Register</button>
<input type="hidden" name="action" value="register" ></input>
</form>
</div>
@ -70,6 +71,6 @@
</div>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js"></script>
<!-- Core theme JS-->
<script src="../view/js/home.js"></script>
<script src="view/js/home.js"></script>
</body>
</html>
Loading…
Cancel
Save