Merge pull request #104 from alexstocker/0.1-devel

Update Release 0.1.1
alexstocker · Dec 16, 2021 · d132980 · d132980
2 parents f215d32 + 91c895d
commit d132980
Show file tree

Hide file tree

Showing 99 changed files with 3,445 additions and 15,827 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
 bin/*
+vendor/*
+builds/*
 package.json
-
+composer.lock
+.php_cs.cache
+.php_cs.dist
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
-# SensorLogger
+# SensorLogger for owncloud
 
+### 0.1.1 RELEASED
+  * Added #101 PHP 8 Support
+  * Fixed creating device groups and types on the fly within device details sidebar
+  * Reworked and cleaned up JS #11
+  * Added #51 make dashboard widgets position persistant
+  * Modified #85 Allow 0 value @Kixunil
+  * Changed Dashboard request type to GET
+  * Changed LogList request type to GET
+  * Changed DeviceList request type to GET
+  * Changed DeviceTypeList request type to GET
+  * Changed DeviceGroupList request type to GET
+  * Changed DataTypeList request type to GET
+
 ### 0.1.0.1 RELEASED
   * Fixed problem in deployment pipeline causing broken owncloud marketplace archive. #76 Thanx to @ibaranov-cp
 
@@ -16,7 +29,7 @@
   * Added some more data validation #69 @vitoller
   * Modified registerDevice set deviceType optional
   * Modified registerDevice set deviceGroup optional
-  * Modified registerDevice set deviceParentGroup optional 
+  * Modified registerDevice set deviceParentGroup optional
   * Modified Device Sidebar content by adding some Labels
   * Modified Device Sidebar Select boxes by making the ability to create on the fly more visible
   * Added Share/Edit Icons to Devices. Removed Delete Icon because of already existing wipeOut action in Sidebar. #19 #74
@@ -30,7 +43,7 @@
   * Added some more data validation #69 @vitoller
   * Removed obsolete and undefined properties in LogExtended
   * Adding some more requirements
-  
+
 ### 0.0.10 REVOKED
 
 ### 0.0.9 RELEASED
@@ -61,7 +74,7 @@
   * Add CONTRIBUTING.md
   * Added CODE_OF_CONDUCT.md
   * Updated README
-  
+
 ### 0.0.5
   * Fixed missing Select2 on oc v10.0.3, added DataTypes::deleteDeviceDataTypesByDeviceId, SensorDevices::isDeletable
   * Added missing DataTypes::getDataTypesByUserId

diff --git a/README.md b/README.md
@@ -13,21 +13,23 @@
 - nextcloud [0.1-nc-devel](https://github.com/alexstocker/sensorlogger/tree/0.1-nc-devel)
 
 ### Upcoming Versions
-- owncloud 0.1.1
-- nextcloud 0.1.1
+- owncloud 0.1.2
+- nextcloud 0.1.4
 
-Read more [SensorLogger WIKI](https://github.com/alexstocker/sensorlogger/wiki/)
+### Development Environments
+- SensorLogger for Owncloud (docker, composer) - https://github.com/alexstocker/owncloud-docker-development
+- SensorLogger for Nextcloud - n.a.
 
-![SensorLogger Dashboard](https://www.html5live.at/wp-content/uploads/2018/05/sensorlogger_oc_dashboard_widget_livedata_001.png)
+Read more [SensorLogger WIKI](https://github.com/alexstocker/sensorlogger/wiki/)
 
-![SensorLogger Chart](http://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_chart_0.png)
+![SensorLogger Dashboard](https://www.html5live.at/wp-content/uploads/2021/12/sensorlogger-dashboard_oc.png)
 
-![SensorLogger Chart1](http://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_chart_1.png)
+![SensorLogger List](https://www.html5live.at/wp-content/uploads/2021/12/sensorlogger-list-data_oc.png)
 
-![SensorLogger Chart2](http://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_chart_2.png)
+![SensorLogger Devices](https://www.html5live.at/wp-content/uploads/2021/12/sensorlogger-devices_oc.png)
 
-![SensorLogger List](http://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_list-1.png)
+![SensorLogger Device Details](https://www.html5live.at/wp-content/uploads/2021/12/sensorlogger-device-details_oc.png)
 
-![SensorLogger Devices](http://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_devices-1.png)
+![SensorLogger Device Types](https://www.html5live.at/wp-content/uploads/2021/12/sensorlogger-device-types_oc.png)
 
-![SensorLogger Device details](http://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_deviceDetails_edit.png)
+![SensorLogger Device Groups](https://www.html5live.at/wp-content/uploads/2021/12/sensorlogger-device-groups_oc.png)
diff --git a/appinfo/Migrations/Version20190206015000.php b/appinfo/Migrations/Version20190206015000.php
@@ -7,7 +7,8 @@
 /**
  * Auto-generated migration step: Please modify to your needs!
  */
-class Version20190206015000 implements ISchemaMigration {
+class Version20190206015000 implements ISchemaMigration
+{
 
     /** @var  string */
     private $prefix;
@@ -17,7 +18,8 @@ class Version20190206015000 implements ISchemaMigration {
      * @param array $options
      * @return Schema
      */
-    public function changeSchema(Schema $schema, array $options) {
+    public function changeSchema(Schema $schema, array $options)
+    {
         $this->prefix = $options['tablePrefix'];
 
         if (!$schema->hasTable($this->prefix.'sensorlogger_logs')) {
@@ -191,5 +193,4 @@ public function changeSchema(Schema $schema, array $options) {
         }
         return $schema;
     }
-
 }
diff --git a/appinfo/Migrations/Version20190206015249.php b/appinfo/Migrations/Version20190206015249.php
@@ -7,7 +7,8 @@
 /**
  * Auto-generated migration step: Please modify to your needs!
  */
-class Version20190206015249 implements ISchemaMigration {
+class Version20190206015249 implements ISchemaMigration
+{
 
     /** @var  string */
     private $prefix;
@@ -16,11 +17,12 @@ class Version20190206015249 implements ISchemaMigration {
      * @param array $options
      * @throws \Doctrine\DBAL\Schema\SchemaException
      */
-	public function changeSchema(Schema $schema, array $options) {
+    public function changeSchema(Schema $schema, array $options)
+    {
         $this->prefix = $options['tablePrefix'];
         if ($schema->hasTable("{$this->prefix}sensorlogger_devices")) {
             $table = $schema->getTable("{$this->prefix}sensorlogger_devices");
-            $table->addUniqueIndex(['user_id','uuid'],'sensorlogger_devices_unique_idx');
+            $table->addUniqueIndex(['user_id','uuid'], 'sensorlogger_devices_unique_idx');
         }
     }
 }
diff --git a/appinfo/app.php b/appinfo/app.php
@@ -31,15 +31,15 @@
 
 
 \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'),
-	];
+    $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
@@ -16,4 +16,4 @@
 /**
  * Additional autoloader registration, e.g. registering composer autoloaders
  */
-// require_once __DIR__ . '/../vendor/autoload.php';
+// require_once __DIR__ . '/../vendor/autoload.php';
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -2,10 +2,13 @@
 <info>
     <id>sensorlogger</id>
     <name>Sensorlogger</name>
-    <description>SensorLogger for ownCloud enables users to log data provided by sensor devices</description>
+    <description>SensorLogger for owncloud enables users to log data provided by sensor devices
+        such as temperatur, humidity, VOCs, pressure etc. SensorLogger for owncloud 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.0.1</version>
+    <version>0.1.1</version>
     <namespace>SensorLogger</namespace>
     <category>tools</category>
     <ocsid>174814</ocsid>
@@ -25,25 +28,23 @@
     <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/2018/05/sensorlogger_oc_dashboard_widget_livedata_001.png</screenshot>
+    <screenshot>https://www.html5live.at/wp-content/uploads/2021/12/sensorlogger-dashboard_oc.png</screenshot>
 
-    <screenshot>https://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_chart_0.png</screenshot>
+    <screenshot>https://www.html5live.at/wp-content/uploads/2021/12/sensorlogger-list-data_oc.png</screenshot>
 
-    <screenshot>https://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_chart_1.png</screenshot>
+    <screenshot>https://www.html5live.at/wp-content/uploads/2021/12/sensorlogger-devices_oc.png</screenshot>
 
-    <screenshot>http://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_chart_2.png</screenshot>
+    <screenshot>https://www.html5live.at/wp-content/uploads/2021/12/sensorlogger-device-details_oc.png</screenshot>
 
-    <screenshot>https://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_list-1.png</screenshot>
+    <screenshot>https://www.html5live.at/wp-content/uploads/2021/12/sensorlogger-device-types_oc.png</screenshot>
 
-    <screenshot>https://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_devices-1.png</screenshot>
-
-    <screenshot>https://www.html5live.at/wp-content/uploads/2017/03/sensorlogger_deviceDetails_edit.png</screenshot>
+    <screenshot>https://www.html5live.at/wp-content/uploads/2021/12/sensorlogger-device-groups_oc.png</screenshot>
 
     <dependencies>
         <owncloud min-version="10" max-version="11"/>
-        <nextcloud min-version="14" max-version="15"/>
+        <nextcloud min-version="14" max-version="21"/>
         <database min-version="5.7">mysql</database>
-        <php min-version="7.0" max-version="7.2"/>
+        <php min-version="7.0" max-version="8.0"/>
     </dependencies>
     <use-migrations>true</use-migrations>
 </info>
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -7,24 +7,25 @@
         ['name' => 'sensorlogger#index', 'url' => '/', 'verb' => 'GET'],
         ['name' => 'sensorlogger#getWidgetTypes', 'url' => 'widgetTypeList', 'verb' => 'GET'],
         ['name' => 'sensorlogger#createWidget', 'url' => 'saveWidget', 'verb' => 'POST'],
+		['name' => 'sensorlogger#updateWidgetSettings', 'url' => 'updateWidgetSettings', '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#showList', 'url' => 'logList', 'verb' => 'GET'],
         ['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#showDashboard', 'url' => 'dashboard', 'verb' => 'GET'],
+        ['name' => 'sensorlogger#deviceList', 'url' => 'deviceList', 'verb' => 'GET'],
+        ['name' => 'sensorlogger#deviceTypeList', 'url' => 'deviceTypeList', 'verb' => 'GET'],
+        ['name' => 'sensorlogger#deviceGroupList', 'url' => 'deviceGroupList', 'verb' => 'GET'],
+        ['name' => 'sensorlogger#dataTypeList', 'url' => 'dataTypeList', 'verb' => 'GET'],
         ['name' => 'sensorlogger#deviceChart', 'url' => 'deviceChart/{id}', 'verb' => 'GET'],
         ['name' => 'sensorlogger#chartData', 'url' => 'chartData/{id}', 'verb' => 'GET'],
         ['name' => 'sensorlogger#chartDataLastLog', 'url' => 'lastLog/{id}', 'verb' => 'GET'],
@@ -88,4 +89,4 @@
             'verb' => 'DELETE'
         ]
     ]
-];
+];
diff --git a/composer.json b/composer.json
@@ -0,0 +1,20 @@
+{
+    "name": "alexstocker/sensorlogger",
+    "description": "SensorLogger for owncloud",
+    "type": "project",
+    "version": "0.1.1",
+    "license": "AGPL",
+    "minimum-stability": "dev",
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/alexstocker/sensorlogger.git"
+        }
+    ],
+    "require": {
+        "php": ">=7.2"
+    },
+    "require-dev": {},
+    "autoload": {},
+    "autoload-dev": {}
+}