Merge pull request #95 from berdosi/remove-dashboard
Remove Legacy Dashboard Widget (thanks @berdosi)master
e-alfred
GitHub
commit
ca3c5a3fde
|
|
@ -20,7 +20,4 @@
|
||||||
<settings>
|
<settings>
|
||||||
<admin>OCA\Weather\Settings\AdminSettings</admin>
|
<admin>OCA\Weather\Settings\AdminSettings</admin>
|
||||||
</settings>
|
</settings>
|
||||||
<dashboard>
|
|
||||||
<widget>OCA\Weather\Widgets\DefaultWidget</widget>
|
|
||||||
</dashboard>
|
|
||||||
</info>
|
</info>
|
||||||
|
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
.icon-weather {
|
|
||||||
background-image: url('../img/app-dark.svg');
|
|
||||||
}
|
|
||||||
.icon-weather-light {
|
|
||||||
background-image: url('../img/app.svg');
|
|
||||||
}
|
|
||||||
|
|
||||||
.weatherWidgetContents {
|
|
||||||
margin: 0 44px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.weatherWidgetContents h3.locationValue {
|
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
.weatherWidgetContents .weatherWidgetList {
|
|
||||||
display: flex;
|
|
||||||
padding: 0;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.weatherWidgetContents .weatherWidgetList .measurement,
|
|
||||||
.weatherWidgetContents .weatherWidgetList .value {
|
|
||||||
flex: 1 1 50%;
|
|
||||||
text-align: left;
|
|
||||||
min-width: 80px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.weatherWidgetContents .weatherWidgetList .measurement {
|
|
||||||
font-weight: bold;
|
|
||||||
}
|
|
||||||
|
|
||||||
.weatherWidgetContents .weaterWidgetList .measurement::after {
|
|
||||||
content:":";
|
|
||||||
}
|
|
||||||
|
|
||||||
.weatherWidgetContents .info {
|
|
||||||
position: absolute;
|
|
||||||
bottom: 11px;
|
|
||||||
left: 0;
|
|
||||||
margin: 22px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.weatherWidgetContents .info.error {
|
|
||||||
color: red;
|
|
||||||
color: var(--color-error);
|
|
||||||
}
|
|
||||||
78
js/widget.js
78
js/widget.js
|
|
@ -1,78 +0,0 @@
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @copyright Copyright (c) 2019, Balint Erdosi (erdosib@gmail.com)
|
|
||||||
*
|
|
||||||
* @license GNU AGPL version 3 or any later version
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** global: OCA */
|
|
||||||
/** global: net */
|
|
||||||
|
|
||||||
(function () {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @constructs Weather
|
|
||||||
*/
|
|
||||||
var Weather = function() {
|
|
||||||
}
|
|
||||||
|
|
||||||
Weather.prototype.divWeather = null;
|
|
||||||
Weather.prototype.init = function() {
|
|
||||||
this.getWeather();
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
Weather.prototype.getWeather = function() {
|
|
||||||
var request = {
|
|
||||||
widget: "weather",
|
|
||||||
request: "getWeather"
|
|
||||||
};
|
|
||||||
|
|
||||||
net.requestWidget(request, this.updateWeather);
|
|
||||||
}
|
|
||||||
|
|
||||||
Weather.prototype.updateWeather = function(result) {
|
|
||||||
var divWeather = document.querySelector("#widget-weather");
|
|
||||||
var divInfo = divWeather.querySelector(".info");
|
|
||||||
var temperatureRepresentationLookup = {
|
|
||||||
"kelvin": "°K",
|
|
||||||
"imperial":"°F",
|
|
||||||
"metric": "°C"
|
|
||||||
}
|
|
||||||
if (result.value.error) {
|
|
||||||
divInfo.classList.add("error");
|
|
||||||
divInfo.innerHTML = "Failed to update: " + result.value.error;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
divInfo.classList.remove("error");
|
|
||||||
divInfo.innerHTML = "";
|
|
||||||
divWeather.querySelector(".locationValue").innerHTML = result.value.location;
|
|
||||||
divWeather.querySelector(".temperatureValue").innerHTML = result.value.temperature;
|
|
||||||
divWeather.querySelector(".temperatureRepresentation").innerHTML = temperatureRepresentationLookup[result.value.metric]|| "ERROR";
|
|
||||||
divWeather.querySelector(".weatherValue").innerHTML = result.value.weather;
|
|
||||||
divWeather.querySelector(".humidityValue").innerHTML = result.value.humidity;
|
|
||||||
divWeather.querySelector(".windValue").innerHTML = result.value.wind;
|
|
||||||
} catch (e) {
|
|
||||||
divInfo.classList.add("error");
|
|
||||||
divInfo.innerHTML = "Failed to update some data.";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
OCA.DashBoard.Weather = Weather;
|
|
||||||
OCA.DashBoard.weather = new Weather();
|
|
||||||
})()
|
|
||||||
|
|
@ -1,167 +0,0 @@
|
||||||
<?php
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @copyright Copyright (c) 2019, Balint Erdosi (erdosib@gmail.com)
|
|
||||||
*
|
|
||||||
* @license GNU AGPL version 3 or any later version
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace OCA\Weather\Widgets;
|
|
||||||
|
|
||||||
use \OCP\AppFramework\App;
|
|
||||||
use \OCP\AppFramework\Http;
|
|
||||||
|
|
||||||
use \OCP\IContainer;
|
|
||||||
|
|
||||||
use OCP\Dashboard\Model\WidgetSetup;
|
|
||||||
use OCP\Dashboard\Model\WidgetTemplate;
|
|
||||||
use OCP\Dashboard\IDashboardWidget;
|
|
||||||
use OCP\Dashboard\Model\IWidgetRequest;
|
|
||||||
use OCP\Dashboard\Model\IWidgetConfig;
|
|
||||||
|
|
||||||
use \OCA\Weather\AppInfo\Application;
|
|
||||||
use \OCA\Weather\Controller\WeatherController;
|
|
||||||
|
|
||||||
use \OCP\IL10N;
|
|
||||||
use \OCP\ILogger;
|
|
||||||
|
|
||||||
class DefaultWidget implements IDashboardWidget {
|
|
||||||
|
|
||||||
const WIDGET_ID = 'weather';
|
|
||||||
|
|
||||||
|
|
||||||
/** @var IL19N */
|
|
||||||
private $l10n;
|
|
||||||
private $logger;
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* DefaultWidget constructor
|
|
||||||
* @param IL10N $l10n
|
|
||||||
*/
|
|
||||||
public function __construct(ILogger $logger, IL10N $l10n) {
|
|
||||||
$this->l10n = $l10n;
|
|
||||||
$this->logger = $logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public function getId(): string {
|
|
||||||
return self::WIDGET_ID;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public function getName(): string {
|
|
||||||
return $this->l10n->t('Weather');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public function getDescription(): string {
|
|
||||||
return $this->l10n->t('Watch the weather directly on your Nextcloud.');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return WidgetTemplate
|
|
||||||
*/
|
|
||||||
public function getWidgetTemplate(): WidgetTemplate {
|
|
||||||
$template = new WidgetTemplate();
|
|
||||||
$template->addCss('widget')
|
|
||||||
->addJs('widget')
|
|
||||||
->setIcon('icon-weather')
|
|
||||||
->setContent('widget')
|
|
||||||
->setInitFunction('OCA.DashBoard.weather.getWeather');
|
|
||||||
return $template;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return WidgetTemplate
|
|
||||||
*/
|
|
||||||
public function getWidgetSetup(): WidgetSetup {
|
|
||||||
$setup = new WidgetSetup();
|
|
||||||
$setup->addSize(WidgetSetup::SIZE_TYPE_MIN, 2, 1);
|
|
||||||
$setup->addSize(WidgetSetup::SIZE_TYPE_MAX, 4, 5);
|
|
||||||
$setup->addSize(WidgetSetup::SIZE_TYPE_DEFAULT, 2, 3);
|
|
||||||
$setup->addDelayedJob('OCA.DashBoard.weather.getWeather', 600);
|
|
||||||
return $setup;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param IWidgetConfig $settings
|
|
||||||
*/
|
|
||||||
public function loadWidget(IWidgetConfig $settings) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param IWidgetRequest $request
|
|
||||||
*/
|
|
||||||
public function requestWidget(IWidgetRequest $request) {
|
|
||||||
if ($request->getRequest() === 'getWeather') {
|
|
||||||
$app = new Application();
|
|
||||||
$container = $app->getContainer();
|
|
||||||
$weatherController = $container->query('OCA\Weather\Controller\WeatherController');
|
|
||||||
$cityController = $container->query('OCA\Weather\Controller\CityController');
|
|
||||||
$settingsController = $container->query('OCA\Weather\Controller\SettingsController');
|
|
||||||
|
|
||||||
$allCities = json_decode($cityController->getAll()->render(), true);
|
|
||||||
|
|
||||||
if (count($allCities) == 0) {
|
|
||||||
$request->addResult('error', $this->l10n->t('Please make sure you select cities in the Weather app.'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$homeCityId = $allCities['home'];
|
|
||||||
$homeCityArray = array_filter(
|
|
||||||
$allCities['cities'],
|
|
||||||
function($city) use ($homeCityId) {
|
|
||||||
return $city['id'] === $homeCityId;
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
if (count($homeCityArray) != 1) {
|
|
||||||
$request->addResult('error', $this->l10n->t('Please make sure you select a home city in the Weather app.'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$homeCity = array_pop($homeCityArray)['name'];
|
|
||||||
|
|
||||||
$resultJSONResponse = $weatherController->get($homeCity);
|
|
||||||
if ($resultJSONResponse->getStatus() != Http::STATUS_OK) {
|
|
||||||
$request->addResult('error', $this->l10n->t('Failed to get city weather informations. Please contact your administrator'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$result = json_decode($resultJSONResponse->render(), true);
|
|
||||||
$metric = json_decode($settingsController->metricGet()->render(), true)['metric'];
|
|
||||||
|
|
||||||
$request->addResult('location', $homeCity);
|
|
||||||
$request->addResult('temperature', $result['main']['temp']);
|
|
||||||
$request->addResult('metric', $metric);
|
|
||||||
$request->addResult('weather', $result['weather'][0]['description']);
|
|
||||||
$request->addResult('humidity', $result['main']['humidity']);
|
|
||||||
$request->addResult('wind', $result['wind']['speed']);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
<?php
|
|
||||||
|
|
||||||
?>
|
|
||||||
|
|
||||||
<div id="widget-weather" class="weatherWidgetContents">
|
|
||||||
<h3 class="locationValue"></h3>
|
|
||||||
<div class="info"><?php p($l->t('Updating widget…')); ?></div>
|
|
||||||
<dl class="weatherWidgetList">
|
|
||||||
<dt class="measurement"><?php p($l->t('Temperature')); ?></dt>
|
|
||||||
<dd class="value"><span class="temperatureValue"></span> <span class="temperatureRepresentation"></span></dd>
|
|
||||||
|
|
||||||
<dt class="measurement"><?php p($l->t('Cloudiness')); ?></dt>
|
|
||||||
<dd class="value"><span class="weatherValue"></span></dd>
|
|
||||||
|
|
||||||
<dt class="measurement"><?php p($l->t('Humidity')); ?></dt>
|
|
||||||
<dd class="value"><span class="humidityValue"></span> %</dd>
|
|
||||||
|
|
||||||
<dt class="measurement"><?php p($l->t('Wind')); ?></dt>
|
|
||||||
<dd class="value"><span class="windValue"></span> m/s</dd>
|
|
||||||
</dl>
|
|
||||||
</div>
|
|
||||||
Loading…
Reference in New Issue