Merge pull request #107 from alexstocker/0.1-nc-devel

Update Release 0.1.4 for Nextcloud
alexstocker · Jan 5, 2024 · 515d867 · 515d867
2 parents 40bb9cc + d2dd451
commit 515d867
Show file tree

Hide file tree

Showing 20 changed files with 300 additions and 337 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # SensorLogger
 
+### 0.1.4nc UNRELEASED
+  * Fixed [NOREF] Error on create device type within device details sidebar
+  * Fixed [NOREF] Navigation
+  * Added [NOREF] NC28 Support
+  * Added [NOREF] NC27 Support
+  * Added [NOREF] NC26 Support
+  * Added [NOREF] NC25 Support
+  * Added [NOREF] NC24 Support. Closing #106 #100 #92 #80 #101
+  * Fixed [NOREF] Migration on dropping non exisiting sensorlogger_devices_unique_idx
+  * [NOREF] Cleanup
+  * Fixed #101 DB Queries. Make use of queryBuilder. 
+  * Fixed #103 Migration Version000010Date20190206183552. Drop index before setting new. Thanx @stefan123t for the hint
+  * Fixed #103 Devices::getDevices contributed by @stefan123t
+  * Added #101 PHP 8 and #100 NC23 Support
+  * #98 Modified App description
+
 ### 0.1.3nc RELEASED
   * updated to support Nextcloud 20
 

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 ### Latest Stable Release
 - owncloud [0.1.0](https://github.com/alexstocker/sensorlogger/releases/tag/0.1.0)
-- nextcloud [0.1.3nc](https://github.com/alexstocker/sensorlogger/releases/tag/0.1.3nc)
+- nextcloud [0.1.4nc](https://github.com/alexstocker/sensorlogger/releases/tag/0.1.4nc)
 
 ### Latest Stable Branches
 - owncloud [0.1-stable](https://github.com/alexstocker/sensorlogger/tree/0.1-stable)
@@ -14,12 +14,12 @@
 
 ### Upcoming Versions
 - owncloud 0.1.1
-- nextcloud 0.1.4
+- nextcloud 0.1.5
 
 Read more [SensorLogger WIKI](https://github.com/alexstocker/sensorlogger/wiki/)
 
-![SensorLogger for nextcloud Dashboard](https://www.html5live.at/wp-content/uploads/2019/05/sensorlogger-nc14-dashboard.png)
+![SensorLogger for nextcloud Dashboard](https://www.html5live.at/wp-content/uploads/2024/01/sensorlogger-nc28-dashboard.png)
 
-![SensorLogger for nextcloud Widget Sidebar](https://www.html5live.at/wp-content/uploads/2019/05/sensorlogger-nc16-widget-sidebar.png)
+![SensorLogger for nextcloud Widget Sidebar](https://www.html5live.at/wp-content/uploads/2024/01/sensorlogger-nc28-widget-sidebar.png)
 
-![SensorLogger for nectcloud Device Details](https://www.html5live.at/wp-content/uploads/2019/05/sensorlogger-nc16-device-edit.png)
+![SensorLogger for nectcloud Device Details](https://www.html5live.at/wp-content/uploads/2024/04/sensorlogger-nc28-device-edit.png)
diff --git a/appinfo/app.php b/appinfo/app.php
@@ -25,18 +25,18 @@
 use OCP\AppFramework\App;
 use OCP\Util;
 
-require_once __DIR__ . '/autoload.php';
+//require_once __DIR__ . '/autoload.php';
 
-\OCP\App::registerAdmin('sensorlogger', 'admin');
+//\OCP\App::registerAdmin('sensorlogger', 'admin');
 
-\OC::$server->getNavigationManager()->add(function () {
-	$urlGenerator = \OC::$server->getURLGenerator();
-	$l = \OC::$server->getL10N('sensorlogger');
-	return [
-		'id' => 'sensorlogger',
-		'order' => 10,
-		'href' => $urlGenerator->linkToRoute('sensorlogger.sensorlogger.index'),
-		'icon' => $urlGenerator->imagePath('sensorlogger', 'app.svg'),
-		'name' => $l->t('SensorLogger'),
-	];
-});
+//\OC::$server->getNavigationManager()->add(function () {
+//	$urlGenerator = \OC::$server->getURLGenerator();
+//	$l = \OC::$server->getL10N('sensorlogger');
+//	return [
+//		'id' => 'sensorlogger',
+//		'order' => 10,
+//		'href' => $urlGenerator->linkToRoute('sensorlogger.sensorlogger.index'),
+//		'icon' => $urlGenerator->imagePath('sensorlogger', 'app.svg'),
+//		'name' => $l->t('SensorLogger'),
+//	];
+//});
diff --git a/appinfo/autoload.php b/appinfo/autoload.php
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -2,14 +2,26 @@
 <info>
     <id>sensorlogger</id>
     <name>Sensorlogger</name>
-    <description>SensorLogger for ownCloud enables users to log data provided by sensor devices</description>
+    <description>SensorLogger for nextcloud enables users to log data provided by sensor devices
+		such as temperatur, humidity, VOCs, pressure etc. SensorLogger for nextcloud can be used
+		to log almost any raw or aggregated data. Other examples of usage: fan speed, disk usage,
+		uptime, iops, water level, voltage, luminosity, rainfall and many many more.</description>
     <licence>AGPL</licence>
     <author>Alexander Stocker</author>
-    <version>0.1.3</version>
+    <version>0.1.4</version>
     <namespace>SensorLogger</namespace>
     <category>tools</category>
     <ocsid>174814</ocsid>
 
+    <navigations>
+        <navigation>
+            <name>SensorLogger</name>
+            <route>sensorlogger.SensorLogger.index</route>
+            <icon>app.svg</icon>
+            <order>10</order>
+        </navigation>
+    </navigations>
+
     <types>
         <logging/>
     </types>
@@ -24,12 +36,13 @@
     <bugs>https://github.com/alexstocker/sensorlogger/issues</bugs>
     <website>https://www.html5live.at/sensorlogger/</website>
     <summary>Log data from any type of sensor and visualize it</summary>
-    <screenshot>https://www.html5live.at/wp-content/uploads/2019/05/sensorlogger-nc14-dashboard.png</screenshot>
-    <screenshot>https://www.html5live.at/wp-content/uploads/2019/05/sensorlogger-nc16-widget-sidebar.png</screenshot>
-    <screenshot>https://www.html5live.at/wp-content/uploads/2019/05/sensorlogger-nc16-device-edit.png</screenshot>
+    <screenshot>https://www.html5live.at/wp-content/uploads/2024/01/sensorlogger-nc28-dashboard.png</screenshot>
+    <screenshot>https://www.html5live.at/wp-content/uploads/2024/01/sensorlogger-nc28-widget-sidebar.png</screenshot>
+    <screenshot>https://www.html5live.at/wp-content/uploads/2024/01/sensorlogger-nc28-device-edit.png</screenshot>
     <dependencies>
-        <nextcloud min-version="15" max-version="20"/>
+        <nextcloud min-version="15" max-version="28"/>
         <database min-version="5.7">mysql</database>
-        <php min-version="7.0" max-version="7.3"/>
+        <php min-version="7.0" max-version="8.2"/>
     </dependencies>
+    <use-migrations>true</use-migrations>
 </info>
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -2,86 +2,86 @@
 
 return [
     'routes' => [
-        ['name' => 'sensorlogger#index', 'url' => '/', 'verb' => 'GET'],
-        ['name' => 'sensorlogger#getWidgetTypes', 'url' => 'widgetTypeList', 'verb' => 'GET'],
-        ['name' => 'sensorlogger#createWidget', 'url' => 'saveWidget', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#deleteWidget', 'url' => 'deleteWidget/{id}', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#deleteDevice', 'url' => 'deleteDevice/{id}', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#deleteDeviceType', 'url' => 'deleteDeviceType/{id}', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#deleteDeviceGroup', 'url' => 'deleteDeviceGroup/{id}', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#deleteDataType', 'url' => 'deleteDataType/{id}', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#wipeOutDevice', 'url' => 'wipeOutDevice', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#deleteLog', 'url' => 'deleteLog/{id}', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#showList', 'url' => 'showList', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#showDeviceData', 'url' => 'showDeviceData/{id}', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#showDeviceDetails', 'url' => 'showDeviceDetails/{id}', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#updateDevice', 'url' => 'updateDevice/{id}', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#createDeviceType', 'url' => 'createDeviceType', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#createDeviceGroup', 'url' => 'createDeviceGroup', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#showDashboard', 'url' => 'showDashboard', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#deviceList', 'url' => 'deviceList', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#deviceTypeList', 'url' => 'deviceTypeList', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#deviceGroupList', 'url' => 'deviceGroupList', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#dataTypeList', 'url' => 'dataTypeList', 'verb' => 'POST'],
-        ['name' => 'sensorlogger#deviceChart', 'url' => 'deviceChart/{id}', 'verb' => 'GET'],
-        ['name' => 'sensorlogger#chartData', 'url' => 'chartData/{id}', 'verb' => 'GET'],
-        ['name' => 'sensorlogger#chartDataLastLog', 'url' => 'lastLog/{id}', 'verb' => 'GET'],
-        ['name' => 'sensorlogger#maxLastLog', 'url' => 'maxLog/{id}/{param}', 'verb' => 'GET'],
-        ['name' => 'sensorlogger#sharingIn', 'url' => 'sharingIn', 'verb' => 'GET'],
-        ['name' => 'sensorlogger#sharingOut', 'url' => 'sharingOut', 'verb' => 'GET'],
-        ['name' => 'sensorlogger#sharedLink', 'url' => 'sharedLink', 'verb' => 'GET'],
+        ['name' => 'SensorLogger#index', 'url' => '/', 'verb' => 'GET'],
+        ['name' => 'SensorLogger#getWidgetTypes', 'url' => 'widgetTypeList', 'verb' => 'GET'],
+        ['name' => 'SensorLogger#createWidget', 'url' => 'saveWidget', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#deleteWidget', 'url' => 'deleteWidget/{id}', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#deleteDevice', 'url' => 'deleteDevice/{id}', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#deleteDeviceType', 'url' => 'deleteDeviceType/{id}', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#deleteDeviceGroup', 'url' => 'deleteDeviceGroup/{id}', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#deleteDataType', 'url' => 'deleteDataType/{id}', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#wipeOutDevice', 'url' => 'wipeOutDevice', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#deleteLog', 'url' => 'deleteLog/{id}', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#showList', 'url' => 'showList', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#showDeviceData', 'url' => 'showDeviceData/{id}', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#showDeviceDetails', 'url' => 'showDeviceDetails/{id}', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#updateDevice', 'url' => 'updateDevice/{id}', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#createDeviceType', 'url' => 'createDeviceType', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#createDeviceGroup', 'url' => 'createDeviceGroup', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#showDashboard', 'url' => 'showDashboard', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#deviceList', 'url' => 'deviceList', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#deviceTypeList', 'url' => 'deviceTypeList', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#deviceGroupList', 'url' => 'deviceGroupList', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#dataTypeList', 'url' => 'dataTypeList', 'verb' => 'POST'],
+        ['name' => 'SensorLogger#deviceChart', 'url' => 'deviceChart/{id}', 'verb' => 'GET'],
+        ['name' => 'SensorLogger#chartData', 'url' => 'chartData/{id}', 'verb' => 'GET'],
+        ['name' => 'SensorLogger#chartDataLastLog', 'url' => 'lastLog/{id}', 'verb' => 'GET'],
+        ['name' => 'SensorLogger#maxLastLog', 'url' => 'maxLog/{id}/{param}', 'verb' => 'GET'],
+        ['name' => 'SensorLogger#sharingIn', 'url' => 'sharingIn', 'verb' => 'GET'],
+        ['name' => 'SensorLogger#sharingOut', 'url' => 'sharingOut', 'verb' => 'GET'],
+        ['name' => 'SensorLogger#sharedLink', 'url' => 'sharedLink', 'verb' => 'GET'],
         [
-            'name' => 'apisensorlogger#preflighted_cors',
+            'name' => 'SensorLoggerApi#preflighted_cors',
             'url' => '/api/v1/{path}',
             'verb' => 'OPTIONS',
             'requirements' => ['path' => '.+']
         ],
         [
-            'name' => 'apisensorlogger#createLog',
+            'name' => 'SensorLoggerApi#createLog',
             'url' => '/api/v1/createlog/',
             'verb' => 'POST',
             //'requirements' => ['path' => '.+'],
         ],
         [
-            'name' => 'apisensorlogger#registerDevice',
+            'name' => 'SensorLoggerApi#registerDevice',
             'url' => '/api/v1/registerdevice/',
             'verb' => 'POST',
             //'requirements' => ['path' => '.+'],
         ],
         [
-            'name' => 'apisensorlogger#getDeviceDataTypes',
+            'name' => 'SensorLoggerApi#getDeviceDataTypes',
             'url' => '/api/v1/getdevicedatatypes/',
             'verb' => 'POST',
             //'requirements' => ['path' => '.+'],
         ],
         [
-            'name' => 'apisensorlogger#getDeviceTypes',
+            'name' => 'SensorLoggerApi#getDeviceTypes',
             'url' => '/api/v1/getdevicetypes/',
             'verb' => 'POST',
             //'requirements' => ['path' => '.+'],
         ],
         [
-            'name' => 'apisensorlogger#getAllShares',
+            'name' => 'SensorLoggerApi#getAllShares',
             'url' => '/api/v1/shares',
             'verb' => 'GET'
         ],
         [
-            'name' => 'apisensorlogger#createShare',
+            'name' => 'SensorLoggerApi#createShare',
             'url' => '/api/v1/shares/create',
             'verb' => 'POST'
         ],
         [
-            'name' => 'apisensorlogger#getShare',
+            'name' => 'SensorLoggerApi#getShare',
             'url' => '/api/v1/shares/{id}/get',
             'verb' => 'GET'
         ],
         [
-            'name' => 'apisensorlogger#updateShare',
+            'name' => 'SensorLoggerApi#updateShare',
             'url' => '/api/v1/shares/{id}/update',
             'verb' => 'PUT'
         ],
         [
-            'name' => 'apisensorlogger#deleteShare',
+            'name' => 'SensorLoggerApi#deleteShare',
             'url' => '/api/v1/shares/{id}/delete',
             'verb' => 'DELETE'
         ]

diff --git a/css/style.css b/css/style.css
@@ -41,7 +41,7 @@ span.center {
 
 #app-sidebar div.content-wrapper div.footer {
 	border-top: 1px solid #D3D3D3;
-	bottom: 0;
+	/*bottom: 0;*/
 	box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5) inset;
 	height: 65px;
 	left: 0;

diff --git a/lib/Application.php b/lib/Application.php