Commit 27422ed0 authored by Kylian ou Nathan's avatar Kylian ou Nathan
Browse files

Up

parent 4fa3683d
......@@ -61,10 +61,9 @@ $route['connexion'] = 'Authentification/connexion';
$route['inscription'] = 'Authentification/inscription';
$route['mot_de_passe_oublie'] = 'Authentification/mot_de_passe_oublie';
$route['camera/add'] = 'Camera/add';
$route['camera/edit/(:any)'] = 'Camera/edit/$1';
$route['camera/view/(:any)'] = 'Camera/view/$1';
$route['camera'] = 'Camera/show';
$route['camera'] = 'Camera/list';
$route['capteur/edit'] = 'Capteur/edit';
$route['capteur/edit/(:any)'] = 'Capteur/edit/$1';
......@@ -76,6 +75,8 @@ $route['profil'] = 'Profil/list';
$route['resume/show'] = 'Resume/show';
$route['api/(:any)/(:any)'] = 'API/init';
$route['404_override'] = '';
$route['translate_uri_dashes'] = FALSE;
<?php
class API extends CI_Controller{
public function __construct(){
parent::__construct();
$this->load->helper("url_helper");
}
public function init() {
echo "GET :<br>";
var_dump($_GET);
echo "<br><br>POST :<br>";
var_dump($_POST);
}
}
?>
\ No newline at end of file
......@@ -8,19 +8,22 @@ class Camera extends CI_Controller{
}
public function show(){
$this->load->view('camera/show');
public function list(){
$this->load->view('camera/list');
}
public function add(){
$this->load->view('camera/add');
public function edit($id = "new"){
$data["new"] = true;
$this->load->view('camera/edit', $data);
}
public function edit(){
$this->load->view('camera/edit');
public function view($id){
$this->load->view('camera/view');
}
public function view(){
public function delete($id){
$this->load->view('camera/view');
}
}
......
......@@ -32,12 +32,22 @@
</div>
</div>
<div class="red_intrusion l_r">
<div class="left">
<div class="left intrusion_detected in_red_intrusion">
<i class='uil uil-shield-exclamation'></i>
<p>Une intrusion a été détectée</p>
<p class="detailIntrusion">Intrusion le 05/11/2019 à 15:41</p>
<p class="detailIntrusion">Détectée via le capteur "Porte d'entrée".</p>
<p>Voir les caméras</p>
</div>
<div class="left in_red_intrusion">
<p class="detailIntrusion">Intrusion le 05/11/2019 à 15:41, détectée via le capteur "Porte d'entrée".</p>
</div>
<a class="go_to_camera l_r in_red_intrusion" href="<?= base_url("/camera") ?>">
<div class="left">
<i class='uil uil-camera'></i>
<p>Voir les caméras</p>
</div>
<div class="right">
<i class='uil uil-angle-right'></i>
</div>
</a>
</div>
</section>
<section class="maison">
......@@ -104,7 +114,7 @@
<i class='uil uil-angle-right'></i>
</div>
</a>
<a href="<?= base_url("/camera/show") ?>" class="simple_button_link l_r blue">
<a href="<?= base_url("/camera") ?>" class="simple_button_link l_r blue">
<div class="left">
<i class='uil uil-camera'></i>
<div class="title">Voir les caméras</div>
......
<!DOCTYPE html>
<html lang="fr">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>add camera - LockHome</title>
<link rel="stylesheet" href="<?= base_url() ?>/static/camera.css">
<link rel="stylesheet" href="<?= base_url() ?>/static/commun.css">
<link href="https://fonts.googleapis.com/css?family=Roboto:400,500,700&display=swap" rel="stylesheet">
<link rel="stylesheet" href="https://unicons.iconscout.com/release/v2.0.1/css/unicons.css">
</head>
<body>
<header class="l_r">
<div class="left">
<a href="<?= base_url("/camera/show") ?>">
<i class='uil uil-angle-left'></i>
</a>
<div class="title">Ajouter un caméra</div>
</div>
</header>
<main>
<h6 class="big">Nom</h6>
<label for="Nom" class="input l_r">
<div class="left">
<i class='uil uil-processor'></i>
<input id="Nom" type="text" placeholder="Cuisine.." />
</div>
</label>
<h6 class="big">Adresse IP locale</h6>
<label for="IP" class="input l_r">
<div class="left">
<i class='uil uil-processor'></i>
<input id="IP" type="text" placeholder="192.168.2..." />
</div>
</label>
</main>
</body>
</html>
<?php
<!DOCTYPE html>
<html lang="fr">
echo "PAGE EDITION DE CAMERA A FAIRE !!!!!!!!!!"
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Edition caméra - LockHome</title>
<link rel="stylesheet" href="<?=base_url()?>/static/liste_capteur.css">
<link rel="stylesheet" href="<?=base_url()?>/static/commun.css">
<link href="https://fonts.googleapis.com/css?family=Roboto:400,500,700&display=swap" rel="stylesheet">
<link rel="stylesheet" href="https://unicons.iconscout.com/release/v2.0.1/css/unicons.css">
</head>
?>
\ No newline at end of file
<body>
<header class="l_r">
<div class="left">
<a href="<?=base_url("/camera")?>">
<i class='uil uil-angle-left'></i>
</a>
<div class="title"><?= ($new ? "Ajouter une caméra" : ("Caméra : " . $nom) )?></div>
</div>
<div class="right">
<button type="submit" form="EditCamera" class="blue">
<i class='uil uil-check'></i>
</button>
</div>
</header>
<main>
<form id="EditCamera" action="<?= base_url("/camera/edit/" . ($new ? "new" : $id))?>" method="post">
<h6 class="big">Nom</h6>
<label for="NOM" class="input l_r">
<div class="left">
<i class='uil uil-webcam'></i>
<input name="nom" required type="text" value="<?=isset($nom) ? $nom : ""?>" placeholder="Nom de la caméra" />
</div>
</label>
<h6 class="big">Adresse IP locale</h6>
<label for="IP" class="input l_r">
<div class="left">
<i class='uil uil-wifi'></i>
<input name="ip" required pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$" type="text" value="<?=isset($ip) ? $ip : ""?>" placeholder="192.168.4..." />
</div>
</label>
<?php if (!$new) {?>
<a href="<?=base_url("/camera/delete/" . $id)?>" class="simple_button_link l_r red bottom">
<div class="left">
<i class='uil uil-trash-alt'></i>
<div class="title">Supprimer cette camera</div>
</div>
</a>
<?php }?>
</form>
</main>
</body>
</html>
......@@ -5,9 +5,9 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Liste des caméras - LockHome</title>
<link rel="stylesheet" href="<?= base_url() ?>/static/camera.css">
<link rel="stylesheet" href="<?= base_url() ?>/static/commun.css">
<title>Caméras - LockHome</title>
<link rel="stylesheet" href="<?=base_url("/static/liste_capteur.css")?>">
<link rel="stylesheet" href="<?=base_url("/static/commun.css")?>">
<link href="https://fonts.googleapis.com/css?family=Roboto:400,500,700&display=swap" rel="stylesheet">
<link rel="stylesheet" href="https://unicons.iconscout.com/release/v2.0.1/css/unicons.css">
</head>
......@@ -15,19 +15,31 @@
<body>
<header class="l_r">
<div class="left">
<a href="<?= base_url("/accueil") ?>">
<a href="<?=base_url("/accueil")?>">
<i class='uil uil-angle-left'></i>
</a>
<div class="title">Liste des caméras</div>
</div>
</header>
<main>
<h6>Vous souhaitez ajouter une caméra ?</h6>
<a href="<?=base_url("/camera/edit")?>" class="simple_button_link l_r blue">
<div class="left">
<i class='uil uil-plus-circle'></i>
<div class="title">Ajouter une caméra</div>
</div>
<div class="right">
<i class='uil uil-angle-right'></i>
</div>
</a>
<h6 class="big">Liste des caméras</h6>
<a href="<?= base_url("/camera/view/?id=1") ?>" class="image_button_link black">
<img src="static/ressources/cuisine.png" alt="Une caméra">
<a href="<?=base_url("/camera/view/1")?>" class="image_button_link">
<img src="/static/ressources/cuisine.png" alt="Une caméra">
<div class="button l_r">
<div class="left">
<i class='uil uil-webcam'></i>
<i class='uil uil-camera'></i>
<p class="title">Cuisine</p>
</div>
<div class="right">
......@@ -36,11 +48,11 @@
</div>
</a>
<a href="<?= base_url("/camera/view/?id=2") ?>" class="image_button_link black">
<img src="static/ressources/garden.jpg" alt="Une caméra">
<a href="<?=base_url("/camera/view/2")?>" class="image_button_link">
<img src="/static/ressources/garden.jpg" alt="Une caméra">
<div class="button l_r">
<div class="left">
<i class='uil uil-webcam'></i>
<i class='uil uil-camera'></i>
<p class="title">Cuisine</p>
</div>
<div class="right">
......@@ -49,16 +61,6 @@
</div>
</a>
<h6>Vous souhaitez ajouter une caméra ?</h6>
<a href="<?= base_url("/camera/add") ?>" class="simple_button_link l_r blue">
<div class="left">
<i class='uil uil-plus-circle'></i>
<div class="title">Ajouter une caméra</div>
</div>
<div class="right">
<i class='uil uil-angle-right'></i>
</div>
</a>
</main>
</body>
</html>
<?php
<!DOCTYPE html>
<html lang="fr">
echo "PAGE VOIR CONTENU DE CAMERA A FAIRE !!!!!!!!!!"
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Caméra : Cuisine - LockHome</title>
<link rel="stylesheet" href="<?=base_url()?>/static/camera.css">
<link rel="stylesheet" href="<?=base_url()?>/static/commun.css">
<link href="https://fonts.googleapis.com/css?family=Roboto:400,500,700&display=swap" rel="stylesheet">
<link rel="stylesheet" href="https://unicons.iconscout.com/release/v2.0.1/css/unicons.css">
</head>
?>
\ No newline at end of file
<body>
<header class="l_r">
<div class="left">
<a href="<?=base_url("/camera/list")?>">
<i class='uil uil-angle-left'></i>
</a>
<div class="title">Caméra : Cuisine</div>
</div>
<div class="right">
<button type="submit" form="EditCapteur" class="blue">
<i class='uil uil-pen'></i>
</button>
</div>
</header>
<main>
<h6 class="big">En temps réel</h6>
<img src="<?= base_url("/static/ressources/garden.jpg") ?>" />
<h6 class="big">Vidéos</h6>
<table>
<thead>
<td>Filmé le</td>
<td>Durée</td>
<td>Action</td>
</thead>
<tr>
<td>16/12/2019 à 23h00</td>
<td>15 min</td>
<td><i class='uil uil-play'></i></td>
</tr>
<tr>
<td>16/12/2019 à 19h00</td>
<td>5 min</td>
<td><i class='uil uil-play'></i></td>
</tr>
</table>
</main>
</body>
</html>
......@@ -27,41 +27,42 @@
</div>
</header>
<main>
<form id="EditCapteur" action="<?= base_url("/capteur/edit/" . ($new ? "new" : $id))?>" method="post">
<form id="EditCapteur" action="<?= base_url("/capteur/edit/" . ($new ? "new" : $id))?>" method="post">
<h6 class="big">Nom</h6>
<label for="NOM" class="input l_r">
<div class="left">
<i class='uil uil-processor'></i>
<input name="nom" required type="text" value="<?=isset($nom) ? $nom : ""?>" placeholder="Nom du capteur" />
</div>
</label>
<h6 class="big">Adresse IP locale</h6>
<label for="IP" class="input l_r">
<div class="left">
<i class='uil uil-wifi'></i>
<input name="ip" required pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$" type="text" value="<?=isset($ip) ? $ip : ""?>" placeholder="192.168.4..." />
</div>
</label>
<h6 class="big">Type du capteur</h6>
<select id="TYPE_DU_CAPTEUR" required name="type">
<option <?= $new ? "selected" : "" ?> disabled value="ouverture">Veuillez choisir le type du capteur</option>
<option <?= isset($type) && $type == "ouverture" ? "selected" : "" ?> value="ouverture">Capteur d'ouverture</option>
<option <?= isset($type) && $type == "vibration" ? "selected" : "" ?> value="vibration">Capteur de vibration</option>
<option <?= isset($type) && $type == "infrarouge" ? "selected" : "" ?> value="infrarouge">Capteur infrarouge</option>
</select>
<h6 class="big">Nom</h6>
<label for="NOM" class="input l_r">
<div class="left">
<i class='uil uil-processor'></i>
<input name="nom" required type="text" value="<?=isset($nom) ? $nom : ""?>" placeholder="Nom du capteur" />
</div>
</label>
<?php if (!$new) {?>
<a href="<?=base_url("/capteur/delete/" . $id)?>" class="simple_button_link l_r red bottom">
<h6 class="big">Adresse IP locale</h6>
<label for="IP" class="input l_r">
<div class="left">
<i class='uil uil-trash-alt'></i>
<div class="title">Supprimer ce capteur</div>
<i class='uil uil-wifi'></i>
<input name="ip" required pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$" type="text" value="<?=isset($ip) ? $ip : ""?>" placeholder="192.168.4..." />
</div>
</a>
<?php }?>
</label>
<h6 class="big">Type du capteur</h6>
<select id="TYPE_DU_CAPTEUR" required name="type">
<option <?= $new ? "selected" : "" ?> disabled value="ouverture">Veuillez choisir le type du capteur</option>
<option <?= isset($type) && $type == "ouverture" ? "selected" : "" ?> value="ouverture">Capteur d'ouverture</option>
<option <?= isset($type) && $type == "vibration" ? "selected" : "" ?> value="vibration">Capteur de vibration</option>
<option <?= isset($type) && $type == "infrarouge" ? "selected" : "" ?> value="infrarouge">Capteur infrarouge</option>
</select>
<?php if (!$new) {?>
<a href="<?=base_url("/capteur/delete/" . $id)?>" class="simple_button_link l_r red bottom">
<div class="left">
<i class='uil uil-trash-alt'></i>
<div class="title">Supprimer ce capteur</div>
</div>
</a>
<?php }?>
</form>
</main>
</body>
......
......@@ -22,7 +22,7 @@
</div>
</header>
<main>
<h6>Vous souhaitez créer un nouveau profil ?</h6>
<h6>Vous souhaitez créer un profil ?</h6>
<a href="<?= base_url("profil/new") ?>" class="simple_button_link l_r blue">
<div class="left">
<i class='uil uil-plus-circle'></i>
......
p {
margin: 0px;
margin: 0px;
}
a{
color: black;
a {
color: black;
}
body{
position: relative;
display: block;
height: 100vh;
width: 100%;
padding: 0;
margin: 0;
font-family: 'Roboto', sans-serif;
body {
position: relative;
display: block;
height: 100vh;
width: 100%;
padding: 0;
margin: 0;
font-family: 'Roboto', sans-serif;
}
header {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 50px;
background: white;
box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.15);
z-index: 10;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 50px;
background: white;
box-shadow: 0px 0px 4px rgba(0, 0, 0, 0.15);
z-index: 10;
}
header .title {
font-weight: 700;
font-weight: 700;
}
main{
flex: 1;
display: flex;
flex-direction: column;
align-items: center;
height: 100%;
padding-top: 50px;
overflow-y: scroll;
background: #F1F1F1;
box-sizing: border-box;
main {
flex: 1;
display: flex;
flex-direction: column;
align-items: center;
height: 100%;
padding-top: 50px;
overflow-y: scroll;
background: #F1F1F1;
box-sizing: border-box;
}
main .button, main .maison, main .simple_layout, main .first_button{
margin-top: 15px;
main .button,
main .maison,
main .simple_layout,
main .first_button {
margin-top: 15px;
}
.uil{
font-size: 24px;
.uil {
font-size: 24px;
}
.red_intrusion{
display: block;
flex-direction: column;
background: #E62929;
.red_intrusion {
flex-direction: column;
width: 100%;
border-radius: 5px;
display: block;
background: #E62929;
}
.green_intrusion{
display: none !important;
background: #27AE60;
.in_red_intrusion {
width: 100%;
}
.maison{
height: auto;
width: 90%;
text-decoration: none;
background: #FFFFFF;
border-radius: 5px;
box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.15);
.green_intrusion {
margin: 10px auto;
flex-direction: row;
width: 100%;
border-radius: 5px;
display: none !important;
background: #27AE60;
}
.intrusion_detected,
.go_to_camera {
font-size: 18px;
display: flex;
margin: 10px auto;
}
a.go_to_camera {
text-decoration: none;
color: white;
}
.maison {
height: auto;
width: 90%;
text-decoration: none;
background: #FFFFFF;
border-radius: 5px;
box-shadow: 0px 0px 2px rgba(0, 0, 0, 0.15);
}
.maison img{
border-top-left-radius: 5px;
border-top-right-radius: 5px;
width: 100%;
height: 200px;
object-fit: cover;
.maison img {
border-top-left-radius: 5px;
border-top-right-radius: 5px;
width: 100%;
height: 200px;
object-fit: cover;
}
.maison .maison_protege{
margin-top: 15px;
margin-bottom: 15px;
.maison .maison_protege {
margin-top: 15px;