SH/PHP_SMART_HOME_V3
SH
/
PHP_SMART_HOME_V3
6
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'dev' of https://git.steelants.cz/JonatanRek/PHP_SMART_HOME_V3 into dev

This commit is contained in:
JonatanRek 2020-02-11 15:09:51 +01:00
parent cb95a0f9b8 fc7689b5a6
commit a0fdd324e2
4 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.htaccess
View File

@ -2,7 +2,7 @@ Options -Indexes
Options -MultiViews -Indexes
RewriteEngine On
RewriteBase /vasek/home/
RewriteBase /
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
@ -10,8 +10,8 @@ RewriteCond %{REQUEST_FILENAME} !.css
RewriteCond %{REQUEST_FILENAME} !.js
RewriteRule (.*) index.php?url=$1 [QSA,L]
RewriteCond %{HTTPS} off
RewriteCond %{REQUEST_FILENAME} !api.php
RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
#RewriteCond %{HTTPS} off
#RewriteCond %{REQUEST_FILENAME} !api.php
#RewriteRule ^(.*)$ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]
AddType application/x-httpd-php .php .phtml

6
_FIRMWARE/firmwares/NodeMCU Sensor/ESP_OS_NODE_V3/ESP_OS_NODE_V3.ino
View File

@ -5,9 +5,9 @@
#include <ArduinoJson.h>
//Variables
const char* ssid = "";
const char* pasw = "";
const char* hwId = "";
const char* ssid = "Smart-Home";
const char* pasw = "S1pjg3684dcCPTUQ";
const char* hwId = "45235sadad";
const char* url = "http://dev.steelants.cz/vasek/home/api.php";
int unsuccessfulRounds = 0;

23
app/views/Home.php
View File

@ -7,6 +7,11 @@ class Home extends Template
{
global $userManager;
global $langMng;
$roomManager = new RoomManager();
$deviceManager = new DeviceManager();
$subDeviceManager = new SubDeviceManager();
$recordManager = new RecordManager();
$utilities = new Utilities();
if (!$userManager->isLogin()){
header('Location: ' . BASEDIR . 'login');
@ -15,7 +20,7 @@ class Home extends Template
$template = new Template('home');
//users instantialize
$users = UserManager::getUsers();
$users = $userManager->getUsers();
$template->prepare('users', $users);
//Users at home Info
@ -34,16 +39,16 @@ class Home extends Template
$roomsItems = [];
$roomsData = RoomManager::getAllRooms();
$roomsData = $roomManager->getAllRooms();
foreach ($roomsData as $roomKey => $roomsData) {
$devices = [];
$devicesData = DeviceManager::getAllDevicesInRoom($roomsData['room_id']);
$devicesData = $deviceManager->getAllDevicesInRoom($roomsData['room_id']);
foreach ($devicesData as $deviceKey => $deviceData) {
$subDevices = [];
$subDevicesData = SubDeviceManager::getAllSubDevices($deviceData['device_id']);
$subDevicesData = $subDeviceManager->getAllSubDevices($deviceData['device_id']);
foreach ($subDevicesData as $subDeviceKey => $subDeviceData) {
$events = RecordManager::getLastRecord($subDeviceData['subdevice_id'], 5);
$events = $recordManager->getLastRecord($subDeviceData['subdevice_id'], 5);
$eventsRaw = $events;
$connectionError = true;
@ -100,7 +105,7 @@ class Home extends Template
//parsing last values
$parsedValue = $replacementFalse;
if (Utilities::checkOperator($lastValue, $operator, $breakValue)) {
if ($utilities->checkOperator($lastValue, $operator, $breakValue)) {
$parsedValue = $replacementTrue;
}
@ -108,14 +113,14 @@ class Home extends Template
//parsing last events values
foreach ($events as $key => $value) {
$events[$key]['value'] = $replacementFalse;
if (Utilities::checkOperator($value['value'], $operator, $breakValue)) {
if ($utilities->checkOperator($value['value'], $operator, $breakValue)) {
$events[$key]['value'] = $replacementTrue;
}
}
}
$LastRecordTime = new DateTime($lastRecord['time']);
$niceTime = Utilities::ago($LastRecordTime);
$niceTime = $utilities->ago($LastRecordTime);
$interval = $LastRecordTime->diff(new DateTime());
$hours = $interval->format('%h');
@ -175,7 +180,7 @@ class Home extends Template
];
}
$rooms = RoomManager::getAllRooms();
$rooms = $roomManager->getAllRooms();
$template->prepare('baseDir', BASEDIR);
$template->prepare('debugMod', DEBUGMOD);
$template->prepare('title', 'Home');

8
manifest.json
View File

@ -3,18 +3,18 @@
"short_name": "Home",
"description": "Smart Home interface in PWA",
"lang": "cs-CZ",
"start_url": "/vasek/home/",
"scope": "/vasek/home/",
"start_url": "/",
"scope": "/",
"display": "fullscreen",
"orientation": "portrait",
"theme_color": "#182239",
"icons": [
{
"src": "/vasek/home/app/templates/images/icon-192x192.png",
"src": "/app/templates/images/icon-192x192.png",
"sizes": "192x192"
},
{
"src": "/vasek/home/app/templates/images/icon-512x512.png",
"src": "/app/templates/images/icon-512x512.png",
"sizes": "512x512"
}
],