Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI updates: Updated old customerA app (now called smart-building-v1) and cleanup of component dependencies

Rich Turner44db9409341a
diff --git a/ui/app/manager/index.html b/ui/app/manager/index.html
deleted file mode 100644
index 55c07651c..000000000
--- a/ui/app/manager/index.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!doctype html>
-<html>
-<head>
- <title>Manager</title>
-</head>
-<body>
-<h1>The OpenRemote manager application</h1>
-</body>
-</html>
\ No newline at end of file
diff --git a/ui/app/realmA-new/build.gradle b/ui/app/realmA-new/build.gradle
deleted file mode 100644
index 5c00acaa9..000000000
--- a/ui/app/realmA-new/build.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-task build {
- dependsOn npmBuild
-}
-
-task installDist(type: Copy) {
- dependsOn build
- from project.buildDir
- into "${project(':deployment').projectDir}/manager/app/${projectDir.name}"
-}
-
-task clean() {
- doLast {
- delete "${project(':deployment').projectDir}/manager/app/${projectDir.name}"
- }
-}
\ No newline at end of file
diff --git a/ui/app/realmA-new/index.html b/ui/app/realmA-new/index.html
deleted file mode 100644
index beb93acdf..000000000
--- a/ui/app/realmA-new/index.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-<head>
- <title>Tenant A</title>
-</head>
-<body>
-<h1>The OpenRemote console application of the <code>master</code> tenant</h1>
-<p>
- This is a placeholder. Put your frontend application here, it will be loaded by the OpenRemote console.
-</p>
-<p>
- On your OpenRemote installation, edit the HTML content in <code>deployment/manager/consoles/master/</code>.
-</p>
-<p>
- You can duplicate the <code>master</code> directory to create new console applications for other tenants/realms.
-</p>
-</body>
-</html>
\ No newline at end of file
diff --git a/ui/app/realmA-new/package.json b/ui/app/realmA-new/package.json
deleted file mode 100644
index a4a6cb881..000000000
--- a/ui/app/realmA-new/package.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "name": "@openremote/app-tenantA",
- "version": "1.0.0",
- "description": "Built in demo console application",
- "private": true,
- "scripts": {
- "build": "echo \"No build\" && exit 0",
- "test": "echo \"No tests\" && exit 0"
- },
- "author": "OpenRemote",
- "license": "AGPL-3.0-or-later",
- "dependencies": {
- "@openremote/core": "^1.0.0",
- "lit-html": "^0.12.0"
- },
- "devDependencies": {
- "@babel/core": "^7.1.2",
- "@babel/preset-env": "^7.1.0",
- "awesome-typescript-loader": "^5.2.1",
- "babel-loader": "^8.0.4",
- "copy-webpack-plugin": "^4.6.0",
- "file-loader": "^2.0.0",
- "html-webpack-plugin": "^3.2.0",
- "raw-loader": "^0.5.1",
- "typescript": "^3.1.6",
- "webpack": "^4.24.0",
- "webpack-cli": "^3.1.2",
- "webpack-dev-server": "^3.1.10"
- }
-}
diff --git a/ui/app/realmA/.bowerrc b/ui/app/realmA/.bowerrc
deleted file mode 100644
index 2ce13e005..000000000
--- a/ui/app/realmA/.bowerrc
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "ignoredDependencies": [
- "polymer",
- "iron-flex-layout",
- "app-localize-behavior",
- "app-route",
- "moment",
- "intl",
- "chart.js"
- ]
-}
\ No newline at end of file
diff --git a/ui/app/realmA/package.json b/ui/app/realmA/package.json
deleted file mode 100644
index 06988745f..000000000
--- a/ui/app/realmA/package.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
- "name": "smarthome-example",
- "version": "3.0.0",
- "homepage": "http://openremote.com/",
- "description": "OpenRemote SmartBuilding Example App",
- "main": "index.html",
- "author": "OpenRemote",
- "license": "AGPL-3.0-or-later",
- "ignore": [
- "**/.*",
- "test",
- "tests"
- ],
- "dependencies": {
- }
-}
\ No newline at end of file
diff --git a/ui/app/realmA/build.gradle b/ui/app/smart-building-v1/build.gradle
similarity index 100%
rename from ui/app/realmA/build.gradle
rename to ui/app/smart-building-v1/build.gradle
diff --git a/ui/app/realmA/index.html b/ui/app/smart-building-v1/index.html
similarity index 76%
rename from ui/app/realmA/index.html
rename to ui/app/smart-building-v1/index.html
index 33308eb4e..3ac55b11c 100644
--- a/ui/app/realmA/index.html
+++ b/ui/app/smart-building-v1/index.html
@@ -1,7 +1,7 @@
<!doctype html>
<html>
<head>
- <title>OpenRemote SmartBuilding Example</title>
+ <title>OpenRemote SmartHome Example</title>
<!-- Some sensible meta tags -->
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
@@ -9,14 +9,14 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
- <!-- The language of the SmartBuilding app -->
+ <!-- The language of the SmartHome app -->
<meta name="or-language" content="en">
<!-- ############## Required: Load WebComponents polyfill and components ############### -->
<script src="/static/node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
- <!-- Load the SmartBuilding app -->
- <link rel="import" href="/console/tenantA/smart-building/smart-building-app.html">
+ <!-- Load the SmartHome app -->
+ <link rel="import" href="/console/customerA/smart-home/smart-home-app.html">
<style type="text/css">
/* Recommended: Avoid flickering during loading/styling by hiding children of or-app */
@@ -24,7 +24,7 @@
visibility: hidden;
}
- /* Styles for the SmartBuilding app */
+ /* Styles for the SmartHome app */
html, body {
margin: 0;
min-height: 100vh;
@@ -32,7 +32,7 @@
}
body {
- background: var(--theme-mediumgrey);
+ background: var(--theme-white);
font-family: 'Open Sans', 'Roboto', Helvetica, Arial, Lucida, sans-serif;
}
</style>
@@ -43,11 +43,11 @@
<or-app login tenant-realm="tenantA" console-auto-enable="true">
- <smart-building-app>
+ <smart-home-app>
<!-- You can override the logo
<img slot="logo" height="20" src="mylogo.png"/>
-->
- </smart-building-app>
+ </smart-home-app>
</or-app>
diff --git a/ui/app/smart-building-v1/package.json b/ui/app/smart-building-v1/package.json
new file mode 100644
index 000000000..306346121
--- /dev/null
+++ b/ui/app/smart-building-v1/package.json
@@ -0,0 +1,11 @@
+{
+ "name": "customerA",
+ "version": "3.0.0",
+ "homepage": "http://openremote.com/",
+ "author": "OpenRemote Inc. <[email protected]>",
+ "description": "OpenRemote SmartHome Example App",
+ "main": "index.html",
+ "license": "AGPL-3.0-or-later",
+ "dependencies": {
+ }
+}
\ No newline at end of file
diff --git a/ui/app/realmA/smart-building/img/co2.png b/ui/app/smart-building-v1/smart-home/img/co2.png
similarity index 100%
rename from ui/app/realmA/smart-building/img/co2.png
rename to ui/app/smart-building-v1/smart-home/img/co2.png
diff --git a/ui/app/realmA/smart-building/img/eye.png b/ui/app/smart-building-v1/smart-home/img/eye.png
similarity index 100%
rename from ui/app/realmA/smart-building/img/eye.png
rename to ui/app/smart-building-v1/smart-home/img/eye.png
diff --git a/ui/app/realmA/smart-building/img/eye_large.png b/ui/app/smart-building-v1/smart-home/img/eye_large.png
similarity index 100%
rename from ui/app/realmA/smart-building/img/eye_large.png
rename to ui/app/smart-building-v1/smart-home/img/eye_large.png
diff --git a/ui/app/realmA/smart-building/img/eye_large_active.png b/ui/app/smart-building-v1/smart-home/img/eye_large_active.png
similarity index 100%
rename from ui/app/realmA/smart-building/img/eye_large_active.png
rename to ui/app/smart-building-v1/smart-home/img/eye_large_active.png
diff --git a/ui/app/realmA/smart-building/img/home_large_energy.png b/ui/app/smart-building-v1/smart-home/img/home_large_energy.png
similarity index 100%
rename from ui/app/realmA/smart-building/img/home_large_energy.png
rename to ui/app/smart-building-v1/smart-home/img/home_large_energy.png
diff --git a/ui/app/realmA/smart-building/img/home_on.png b/ui/app/smart-building-v1/smart-home/img/home_on.png
similarity index 100%
rename from ui/app/realmA/smart-building/img/home_on.png
rename to ui/app/smart-building-v1/smart-home/img/home_on.png
diff --git a/ui/app/realmA/smart-building/img/humidity.png b/ui/app/smart-building-v1/smart-home/img/humidity.png
similarity index 100%
rename from ui/app/realmA/smart-building/img/humidity.png
rename to ui/app/smart-building-v1/smart-home/img/humidity.png
diff --git a/ui/app/smart-building-v1/smart-home/img/lightbulb.png b/ui/app/smart-building-v1/smart-home/img/lightbulb.png
new file mode 100644
index 000000000..7016167dc
Binary files /dev/null and b/ui/app/smart-building-v1/smart-home/img/lightbulb.png differ
diff --git a/ui/app/realmA/smart-building/img/star.png b/ui/app/smart-building-v1/smart-home/img/star.png
similarity index 100%
rename from ui/app/realmA/smart-building/img/star.png
rename to ui/app/smart-building-v1/smart-home/img/star.png
diff --git a/ui/app/realmA/smart-building/img/temperature.png b/ui/app/smart-building-v1/smart-home/img/temperature.png
similarity index 100%
rename from ui/app/realmA/smart-building/img/temperature.png
rename to ui/app/smart-building-v1/smart-home/img/temperature.png
diff --git a/ui/app/realmA/smart-building/img/ventilation.png b/ui/app/smart-building-v1/smart-home/img/ventilation.png
similarity index 100%
rename from ui/app/realmA/smart-building/img/ventilation.png
rename to ui/app/smart-building-v1/smart-home/img/ventilation.png
diff --git a/ui/app/smart-building-v1/smart-home/locales.json b/ui/app/smart-building-v1/smart-home/locales.json
new file mode 100644
index 000000000..4072f9eb9
--- /dev/null
+++ b/ui/app/smart-building-v1/smart-home/locales.json
@@ -0,0 +1,85 @@
+{
+ "en": {
+ "scenes": "Scenes",
+ "control": "Bediening",
+ "climate": "Climate",
+ "energy": "Energy",
+ "security": "Alarm",
+ "settings": "Settings",
+ "messages": "Received messages",
+ "contact": "Send message",
+ "language": "Select language"
+ },
+ "nl": {
+ "scenes": "Scenes",
+ "control": "Bediening",
+ "climate": "Klimaat",
+ "energy": "Energie",
+ "security": "Alarm",
+ "settings": "Instellingen",
+ "messages": "Ontvangen berichten",
+ "contact": "Melding maken",
+ "language": "Taal kiezen",
+ "Morning": "Ochtend",
+ "Day": "Dag",
+ "Evening": "Avond",
+ "Night": "Nacht",
+ "Automatically switch scenes": "Automatisch scenes wisselen",
+ "Lighting":"Verlichting",
+ "Living room stand": "Woonkamer staande",
+ "Living room ceiling": "Woonkamer plafond",
+ "Appliances": "Apparaten",
+ "Washing machine": "Wasmachine",
+ "Dishwasher": "Vaatwasser",
+ "Temperature": "Temperatuur",
+ "Kitchen": "Keuken",
+ "Living Room": "Woonkamer",
+ "Hallway": "Gang",
+ "Bedroom": "Slaapkamer",
+ "Bathroom": "Badkamer",
+ "Ventilation": "Ventilatie",
+ "Ventilation Mode": "Ventilation Mode",
+ "Speed": "Snelheid",
+ "Auto": "Auto",
+ "Low": "Laag",
+ "Medium": "Medium",
+ "High": "Hoog",
+ "Carbon Dioxide": "Kooldioxide",
+ "Humidity": "Luchtvochtigheid",
+ "Electricity": "Elektriciteit",
+ "Current usage": "Huidig verbruik",
+ "Solar and battery": "Zon and batterij",
+ "Mains": "Netstroom",
+ "Solar energy": "zonne-energie",
+ "Mains and solar energy usage": "Gebruik zonne-energie en netstroom",
+ "Warm water": "Warm water",
+ "Total": "Totaal",
+ "Tap water": "Tapwater",
+ "Heating": "Verwarming",
+ "Tap water and heating usage": "Gebruik tapwater en verwarming",
+ "From": "Van",
+ "To": "Tot",
+ "Date": "Datum",
+ "Activity": "Activiteit",
+ "No activity": "Geen activiteit",
+ "On": "Aan",
+ "Off": "Uit",
+ "Log out": "Uitloggen",
+ "Weekly schedule": "Weekschema",
+ "Vacation": "Vakantie",
+ "On vacation until": "op Vakantie tot",
+ "Scene configuration": "Scene configuratie",
+ "Temperature settings": "Temperatuur",
+ "Setpoint": "Setpoint",
+ "Alarm settings": "Alarm instellingen",
+ "Enabled": "Actief",
+ "Select": "Kiezen",
+ "Monday": "Maandag",
+ "Tuesday": "Dinsdag",
+ "Wednesday": "Woensdag",
+ "Thursday": "Donderdag",
+ "Friday": "Vrijdag",
+ "Saturday": "Zaterdag",
+ "Sunday": "Zondag"
+ }
+}
diff --git a/ui/app/realmA/smart-building/smart-home-app.html b/ui/app/smart-building-v1/smart-home/smart-home-app.html
similarity index 60%
rename from ui/app/realmA/smart-building/smart-home-app.html
rename to ui/app/smart-building-v1/smart-home/smart-home-app.html
index 4b27f5dfe..2750a8eb1 100644
--- a/ui/app/realmA/smart-building/smart-home-app.html
+++ b/ui/app/smart-building-v1/smart-home/smart-home-app.html
@@ -3,87 +3,96 @@
<!-- You can add other dependencies in package.json and then load them here -->
-<link rel="import" href="smart-building-component.html">
-<link rel="import" href="smart-building-style.html">
-<link rel="import" href="smart-building-header.html">
-<link rel="import" href="smart-building-body.html">
-<link rel="import" href="smart-building-scenes.html">
-<link rel="import" href="smart-building-energy.html">
-<link rel="import" href="smart-building-security.html">
-<link rel="import" href="smart-building-climate.html">
-<link rel="import" href="smart-building-settings.html">
-
-<dom-module id="smart-building-app">
+<link rel="import" href="smart-home-component.html">
+<link rel="import" href="smart-home-style.html">
+<link rel="import" href="smart-home-header.html">
+<link rel="import" href="smart-home-body.html">
+<link rel="import" href="smart-home-scenes.html">
+<link rel="import" href="smart-home-control.html">
+<link rel="import" href="smart-home-energy.html">
+<link rel="import" href="smart-home-security.html">
+<link rel="import" href="smart-home-climate.html">
+<link rel="import" href="smart-home-settings.html">
+<link rel="import" href="smart-home-footer.html">
+
+<dom-module id="smart-home-app">
<template>
- <style include="smart-building-style">
+ <style include="smart-home-style">
:host {
min-height: 100vh;
}
+
+ smart-home-body {
+ margin-bottom: 51px;
+ }
</style>
<app-location use-hash-as-path route="{{appLocation}}"></app-location>
- <smart-building-header active-nav="[[view]]" hide-nav$="[[isActiveView(view, 'settings')]]">
+ <smart-home-header active-nav="[[view]]">
<template is="dom-if" if="[[!isActiveView(view, 'settings')]]">
<slot slot="leftItem"
name="logo">
- <a href="http://www.openremote.com/"
- class="layout horizontal center"
- style=" text-decoration: none;">
- <svg style="pointer-events: none; display: block; width: 2em; height:2em; margin-right: 0.4em;"
- viewBox="0 0 24 24" preserveAspectRatio="xMidYMid meet">
- <path fill="#ffffff"
- d="M11.93,21.851c-5.551,0-10.066-4.515-10.066-10.065h2.108c0,4.388,3.57,7.958,7.958,7.958 c4.387,0,7.958-3.57,7.958-7.958c0-4.388-3.57-7.958-7.958-7.958V1.72c5.55,0,10.066,4.517,10.066,10.066 C21.996,17.336,17.48,21.851,11.93,21.851L11.93,21.851z"/>
- <path fill="#919194"
- d="M10.406,19.088c-1.95-0.406-3.626-1.549-4.717-3.215s-1.469-3.66-1.062-5.61 c0.407-1.951,1.55-3.626,3.217-4.718c1.667-1.092,3.659-1.469,5.61-1.062c4.027,0.84,6.62,4.799,5.779,8.825l-2.063-0.429 c0.603-2.889-1.257-5.73-4.147-6.333c-1.4-0.292-2.829-0.022-4.025,0.762C7.802,8.091,6.982,9.293,6.69,10.693 c-0.291,1.398-0.021,2.828,0.762,4.024c0.783,1.196,1.985,2.016,3.385,2.307L10.406,19.088L10.406,19.088z"/>
- <path fill="#cccccc"
- d="M11.936,16.622c-0.082,0-0.164-0.001-0.245-0.004c-1.29-0.065-2.478-0.628-3.346-1.585 c-0.868-0.958-1.31-2.195-1.246-3.487l2.104,0.105c-0.036,0.728,0.214,1.427,0.704,1.967c0.488,0.54,1.16,0.858,1.888,0.894 c0.725,0.033,1.426-0.213,1.966-0.703c0.541-0.489,0.858-1.159,0.895-1.887c0.075-1.503-1.088-2.787-2.591-2.862l0.105-2.104 c2.664,0.132,4.724,2.406,4.592,5.07c-0.064,1.291-0.628,2.478-1.585,3.345C14.28,16.183,13.137,16.622,11.936,16.622L11.936,16.622 z"/>
- </svg>
- <span style="color: var(--theme-white); font-size: 1.1em;">OpenRemote</span>
- </a>
+ <span style="color: var(--theme-white); font-size: 1.1em;">{{localize(view)}}</span>
</slot>
<a slot="rightItem"
- href="#settings"><span class$="[[icon('cog')]]"></span></a>
+ href="#settings"><span class$="[[icon('ellipsis-v')]]"></span></a>
</template>
<template is="dom-if" if="[[isActiveView(view, 'settings')]]">
<a slot="leftItem"
- href="#scenes"><span class$="[[icon('arrow-left')]]"></span>[[localize('Settings')]]</a>
+ href="#scenes"><span class$="[[icon('arrow-left')]]"></span>[[localize('Settings')]]
+ </a>
<div slot="rightItem"
- on-click="logout"><span class$="[[icon('sign-out')]]"></span>[[localize('Log out')]]
+ on-click="logout"><span class$="[[icon('sign-out-alt')]]"></span>[[localize('Log out')]]
</div>
</template>
- </smart-building-header>
+ </smart-home-header>
- <smart-building-body>
+ <smart-home-body>
- <smart-building-scenes hidden$="[[!isActiveView(view, 'scenes')]]"
- residence="[[residence]]"></smart-building-scenes>
+ <smart-home-scenes hidden$="[[!isActiveView(view, 'scenes')]]"
+ residence="[[residence]]"></smart-home-scenes>
- <smart-building-energy hidden$="[[!isActiveView(view, 'energy')]]"
+ <smart-home-control hidden$="[[!isActiveView(view, 'control')]]"
residence="[[residence]]"
- rooms="[[rooms]]"></smart-building-energy>
+ rooms="[[rooms]]"></smart-home-control>
- <smart-building-security hidden$="[[!isActiveView(view, 'security')]]"
+ <smart-home-energy hidden$="[[!isActiveView(view, 'energy')]]"
+ residence="[[residence]]"
+ rooms="[[rooms]]"></smart-home-energy>
+
+ <smart-home-security hidden$="[[!isActiveView(view, 'security')]]"
residence="[[residence]]"
- rooms="[[rooms]]"></smart-building-security>
+ rooms="[[rooms]]"></smart-home-security>
- <smart-building-climate hidden$="[[!isActiveView(view, 'climate')]]"
+ <smart-home-climate hidden$="[[!isActiveView(view, 'climate')]]"
residence="[[residence]]"
- rooms="[[rooms]]"></smart-building-climate>
+ rooms="[[rooms]]"></smart-home-climate>
+
+ <smart-home-settings hidden$="[[!isActiveView(view, 'settings')]]"
+ residence="[[residence]]"></smart-home-settings>
- <smart-building-settings hidden$="[[!isActiveView(view, 'settings')]]"
- residence="[[residence]]"></smart-building-settings>
+ <smart-home-messages hidden$="[[!isActiveView(view, 'messsages')]]"
+ residence="[[residence]]"></smart-home-messages>
- </smart-building-body>
+ <smart-home-contact hidden$="[[!isActiveView(view, 'contact')]]"
+ residence="[[residence]]"></smart-home-contact>
+
+ <smart-home-language hidden$="[[!isActiveView(view, 'language')]]"
+ residence="[[residence]]"></smart-home-language>
+
+ </smart-home-body>
+
+ <smart-home-footer active-nav="[[view]]" hide-nav$="[[hideFooter(view)]]" />
</template>
<script>
- class SmartBuildingApp extends SmartBuildingComponent {
+ class SmartHomeApp extends SmartHomeComponent {
static get is() {
- return "smart-building-app";
+ return "smart-home-app";
}
static get properties() {
@@ -159,6 +168,10 @@
);
}
+ hideFooter(view) {
+ return super.isActiveView(view, 'settings') || super.isActiveView(view, 'messages') || super.isActiveView(view, 'contact') || super.isActiveView(view, 'language');
+ }
+
onServiceAttributeEvent(e) {
// Use attribute event to update residence or room asset attribute value/valueTimestamp
if (!e.attributeState)
@@ -182,7 +195,7 @@
}
}
- defineAppElement(SmartBuildingApp, SmartBuildingApp.is, "SmartBuildingApp");
+ defineAppElement(SmartHomeApp, SmartHomeApp.is, "SmartHomeApp");
</script>
</dom-module>
diff --git a/ui/app/smart-building-v1/smart-home/smart-home-body.html b/ui/app/smart-building-v1/smart-home/smart-home-body.html
new file mode 100644
index 000000000..66954a681
--- /dev/null
+++ b/ui/app/smart-building-v1/smart-home/smart-home-body.html
@@ -0,0 +1,28 @@
+<link rel="import" href="smart-home-component.html">
+<link rel="import" href="smart-home-style.html">
+
+<dom-module id="smart-home-body">
+ <template>
+ <style include="smart-home-style">
+ </style>
+
+ <slot></slot>
+
+ </template>
+
+ <script>
+ class SmartHomeBody extends SmartHomeComponent {
+ static get is() {
+ return "smart-home-body";
+ }
+
+ ready() {
+ super.ready();
+ this.shadowRoot.host.classList.add("scroll", "layout", "vertical");
+ }
+ }
+
+ defineAppElement(SmartHomeBody, SmartHomeBody.is, "SmartHomeBody");
+ </script>
+
+</dom-module>
diff --git a/ui/app/realmA/smart-building/smart-home-climate.html b/ui/app/smart-building-v1/smart-home/smart-home-climate.html
similarity index 65%
rename from ui/app/realmA/smart-building/smart-home-climate.html
rename to ui/app/smart-building-v1/smart-home/smart-home-climate.html
index e4836599c..c9cd082bb 100644
--- a/ui/app/realmA/smart-building/smart-home-climate.html
+++ b/ui/app/smart-building-v1/smart-home/smart-home-climate.html
@@ -1,12 +1,11 @@
-<link rel="import" href="smart-building-component.html">
-<link rel="import" href="smart-building-style.html">
-<link rel="import" href="smart-building-section.html">
-<link rel="import" href="smart-building-smart.html">
-<link rel="import" href="smart-building-temperature-select.html">
+<link rel="import" href="smart-home-component.html">
+<link rel="import" href="smart-home-style.html">
+<link rel="import" href="smart-home-section.html">
+<link rel="import" href="smart-home-temperature-select.html">
-<dom-module id="smart-building-climate">
+<dom-module id="smart-home-climate">
<template>
- <style include="smart-building-style">
+ <style include="smart-home-style">
.roomLabel {
padding: 0 10px;
@@ -29,71 +28,48 @@
}
</style>
- <smart-building-smart residence="[[residence]]"></smart-building-smart>
+ <div id="page-container">
- <smart-building-section>
- <template is="dom-repeat" items="[[roomsTemperature]]">
- <div class="layout horizontal center roomItem">
- <div class="layout vertical center-center">
- <img height="30" src="smart-building/img/temperature.png"/>
- </div>
- <div class="flex layout horizontal center roomLabel">
- [[localize(item.roomName)]]
- </div>
- <template is="dom-if" if="[[item.roomHasTargetTemperature]]">
- <div class="targetTemperature">
- <smart-building-temperature-select
- temperature="[[item.targetTemperature]]"
- on-change="onTargetTemperatureChange"
- temperature-format="[[item.targetTemperatureFormat]]"></smart-building-temperature-select>
- </div>
- </template>
- <template is="dom-if" if="[[item.roomHasCurrentTemperature]]">
- <div class="attributeValue">
- [[formatAttributeValue(item.currentTemperatureFormat, item.currentTemperature)]]
- </div>
- </template>
+ <template is="dom-if" if="[[roomsTemperature]]">
+ <div class="layout horizontal center heading">
+ <span>[[localize('Temperature')]]</span>
</div>
- </template>
- </smart-building-section>
- <smart-building-section>
- <template is="dom-repeat" items="[[roomsCO2]]">
- <div class="layout horizontal center roomItem">
- <div class="layout vertical center-center">
- <img height="30" src="smart-building/img/co2.png"/>
- </div>
- <div class="flex layout horizontal center roomLabel">
- [[localize(item.roomName)]]
- </div>
- <div class="attributeValue">
- [[formatAttributeValue(item.co2LevelFormat, item.co2Level)]]
- </div>
+ <div class="section">
+ <template is="dom-repeat" items="[[roomsTemperature]]">
+ <div class="layout horizontal center roomItem">
+ <div class="layout vertical center-center">
+ <img height="30" src="smart-home/img/temperature.png"/>
+ </div>
+ <div class="flex layout horizontal center roomLabel">
+ [[localize(item.roomName)]]
+ </div>
+ <template is="dom-if" if="[[item.roomHasTargetTemperature]]">
+ <div class="targetTemperature">
+ <smart-home-temperature-select
+ temperature="[[item.targetTemperature]]"
+ on-change="onTargetTemperatureChange"
+ temperature-format="[[item.targetTemperatureFormat]]"></smart-home-temperature-select>
+ </div>
+ </template>
+ <template is="dom-if" if="[[item.roomHasCurrentTemperature]]">
+ <div class="attributeValue">
+ [[formatAttributeValue(item.currentTemperatureFormat, item.currentTemperature)]]
+ </div>
+ </template>
+ </div>
+ </template>
</div>
</template>
- </smart-building-section>
- <smart-building-section>
- <template is="dom-repeat" items="[[roomsHumidity]]">
- <div class="layout horizontal center roomItem">
- <div class="layout vertical center-center">
- <img height="30" src="smart-building/img/humidity.png"/>
- </div>
- <div class="flex layout horizontal center roomLabel">
- [[localize(item.roomName)]]
- </div>
- <div class="attributeValue">
- [[formatAttributeValue(item.humidityFormat, item.humidity)]]
- </div>
- </div>
- </template>
- </smart-building-section>
+ <div class="layout horizontal center heading">
+ <span>[[localize('Ventilation')]]</span>
+ </div>
- <template is="dom-if" if="[[ventilationMode]]">
- <smart-building-section>
+ <div class="section">
<div class="layout horizontal center ventilationItem">
<div class="layout vertical center-center">
- <img height="30" src="smart-building/img/ventilation.png"/>
+ <img height="30" src="smart-home/img/ventilation.png"/>
</div>
<div class="flex layout horizontal ventilationLabel">
[[localize('Ventilation')]]
@@ -110,15 +86,59 @@
</div>
</div>
</div>
- </smart-building-section>
- </template>
+ </div>
+
+ <template is="dom-if" if="[[roomsCO2]]">
+ <div class="layout horizontal center heading">
+ <span>CO<sup>2</sup></span>
+ </div>
+
+ <div class="section">
+ <template is="dom-repeat" items="[[roomsCO2]]">
+ <div class="layout horizontal center roomItem">
+ <div class="layout vertical center-center">
+ <img height="30" src="smart-home/img/co2.png"/>
+ </div>
+ <div class="flex layout horizontal center roomLabel">
+ [[localize(item.roomName)]]
+ </div>
+ <div class="attributeValue">
+ [[formatAttributeValue(item.co2LevelFormat, item.co2Level)]]
+ </div>
+ </div>
+ </template>
+ </div>
+ </template>
+
+ <template is="dom-if" if="[[roomsHumidity]]">
+ <div class="layout horizontal center heading">
+ <span>[[localize('Humidity')]]</span>
+ </div>
+
+ <div class="section">
+ <template is="dom-repeat" items="[[roomsHumidity]]">
+ <div class="layout horizontal center roomItem">
+ <div class="layout vertical center-center">
+ <img height="30" src="smart-home/img/humidity.png"/>
+ </div>
+ <div class="flex layout horizontal center roomLabel">
+ [[localize(item.roomName)]]
+ </div>
+ <div class="attributeValue">
+ [[formatAttributeValue(item.humidityFormat, item.humidity)]]
+ </div>
+ </div>
+ </template>
+ </div>
+ </template>
+ </div>
</template>
<script>
- class SmartBuildingClimate extends SmartBuildingComponent {
+ class SmartHomeClimate extends SmartHomeComponent {
static get is() {
- return "smart-building-climate";
+ return "smart-home-climate";
}
static get properties() {
@@ -267,7 +287,7 @@
}
}
- defineAppElement(SmartBuildingClimate, SmartBuildingClimate.is, "SmartBuildingClimate");
+ defineAppElement(SmartHomeClimate, SmartHomeClimate.is, "SmartHomeClimate");
</script>
</dom-module>
diff --git a/ui/app/realmA/smart-building/smart-home-component.html b/ui/app/smart-building-v1/smart-home/smart-home-component.html
similarity index 72%
rename from ui/app/realmA/smart-building/smart-home-component.html
rename to ui/app/smart-building-v1/smart-home/smart-home-component.html
index 9cb4483e9..7f7c7e769 100644
--- a/ui/app/realmA/smart-building/smart-home-component.html
+++ b/ui/app/smart-building-v1/smart-home/smart-home-component.html
@@ -1,6 +1,6 @@
-<dom-module id="smart-building-component">
+<dom-module id="smart-home-component">
<script>
- class SmartBuildingComponent extends OpenRemoteComponent {
+ class SmartHomeComponent extends OpenRemoteComponent {
static get properties() {
return {
diff --git a/ui/app/realmA/smart-building/smart-home-energy.html b/ui/app/smart-building-v1/smart-home/smart-home-control.html
similarity index 52%
rename from ui/app/realmA/smart-building/smart-home-energy.html
rename to ui/app/smart-building-v1/smart-home/smart-home-control.html
index d56786426..1c788c1e5 100644
--- a/ui/app/realmA/smart-building/smart-home-energy.html
+++ b/ui/app/smart-building-v1/smart-home/smart-home-control.html
@@ -1,11 +1,11 @@
-<link rel="import" href="smart-building-component.html">
-<link rel="import" href="smart-building-style.html">
-<link rel="import" href="smart-building-section.html">
-<link rel="import" href="smart-building-smart.html">
+<link rel="import" href="smart-home-component.html">
+<link rel="import" href="smart-home-style.html">
+<link rel="import" href="smart-home-section.html">
+<link rel="import" href="smart-home-temperature-select.html">
-<dom-module id="smart-building-energy">
+<dom-module id="smart-home-control">
<template>
- <style include="smart-building-style">
+ <style include="smart-home-style">
.smartSwitchItem {
margin: 10px 0;
@@ -29,84 +29,81 @@
</style>
- <smart-building-smart residence="[[residence]]"></smart-building-smart>
+ <div id="page-container">
+ <div class="layout horizontal center heading">
+ <span>[[localize('Lighting')]]</span>
+ </div>
- <smart-building-section>
- <template is="dom-repeat" items="[[smartSwitches]]">
- <div class="layout horizontal center smartSwitchItem">
- <div><img height="30" src="smart-building/img/home_on.png"/></div>
- <div class="flex layout horizontal smartSwitchLabel">
- [[item.label]]
- </div>
- <div class="layout horizontal smartSwitchMode">
- <div class="or-Select">
- <select value="{{item.mode::change}}"
- on-change="onSmartSwitchModeChange"
- title="[[localize('Mode')]]">
- <option value="NOW_ON">[[localize('Now on')]]</option>
- <option value="ON_AT">[[localize('On at')]]</option>
- <option value="READY_AT">[[localize('Ready at')]]</option>
- </select>
- </div>
- </div>
- <template is="dom-if" if="[[item.hourMinuteVisible]]">
- <div class="layout horizontal center">
- <template is="dom-if" if="[[item.hourMinuteTomorrow]]">
- <div class="smartSwitchTomorrow">([[localize('tomorrow')]])</div>
+ <div class="section">
+ <template is="dom-repeat" items="[[lights]]">
+ <template is="dom-if" if="[[isLightType(item, 'BOOLEAN')]]">
+ <div class="layout horizontal center smartSwitchItem">
+ <div><img height="30" src="smart-home/img/lightbulb.png"/></div>
+ <div class="flex layout horizontal smartSwitchLabel">
+ [[item.label]]
+ </div>
+ <template is="dom-if" if="[[isLightType(item, 'BOOLEAN')]]">
+ <div class="layout horizontal smartSwitchMode">
+ <or-checkbox checked="[[item.value]]"
+ on-change="onLightChange"></or-checkbox>
+ </div>
+ </template>
+ <template is="dom-if" if="[[isLightType(item, 'NUMBER')]]">
+ <div class="layout horizontal center">
+ <span>SLIDER</span>
+ </div>
</template>
- <input class="or-Input or-InputTime smartSwitchTimeInput"
- title="[[localize('Begin/end of cycle')]]"
- type="time"
- step="60"
- required
- value="{{item.hourMinute::input}}"
- on-input="onSmartSwitchHourMinuteChange"/>
</div>
</template>
- </div>
- </template>
- </smart-building-section>
-
- <!-- TODO This section is not functional, not bound to any assets
- <smart-building-section>
- <div class="layout horizontal center">
- <div class="flex" style="position: relative; padding-left: 10px;">
- <div style="position: absolute;">
- <div style="position: relative; left: 40px; top: 65px;">12%</div>
- <div style="position: relative; top: 65px; left: 41px; font-size: x-small;">[[localize('Green')]]</div>
- </div>
- <img width="110" height="110" src="smart-building/img/home_large_energy.png"/>
- </div>
- <div class="layout vertical" style="font-size: smaller; margin-right: 5px;">
-
- <div class="layout horizontal" style="margin: 5px 0;">
- <div class="flex" style="padding-right: 20px;">[[localize('Usage today')]]</div>
- <div>418W</div>
- </div>
-
- <div class="layout horizontal" style="margin: 5px 0; color: var(--theme-mediumgrey)">
- <div class="flex">[[localize('Zone & Battery')]]</div>
- <div>9%</div>
- </div>
+ </template>
+ </div>
- <div style="margin-bottom:5px;width:87%;height:10px; background-color: var(--theme-lightgreen);"></div>
- <div class="" style="width:17%;height:10px; background-color: var(--theme-mediumgrey)"></div>
+ <div class="layout horizontal center heading">
+ <span>[[localize('Appliances')]]</span>
+ </div>
- <div class="layout horizontal" style="margin: 5px 0; color: var(--theme-mediumgrey)">
- <div class="flex">[[localize('Grid')]]</div>
- <div>91%</div>
+ <div class="section">
+ <template is="dom-repeat" items="[[smartSwitches]]">
+ <div class="layout horizontal center smartSwitchItem">
+ <div><img height="30" src="smart-home/img/home_on.png"/></div>
+ <div class="flex layout horizontal smartSwitchLabel">
+ [[item.label]]
+ </div>
+ <div class="layout horizontal smartSwitchMode">
+ <div class="or-Select">
+ <select value="{{item.mode::change}}"
+ on-change="onSmartSwitchModeChange"
+ title="[[localize('Mode')]]">
+ <option value="NOW_ON">[[localize('Now on')]]</option>
+ <option value="ON_AT">[[localize('On at')]]</option>
+ <option value="READY_AT">[[localize('Ready at')]]</option>
+ </select>
+ </div>
+ </div>
+ <template is="dom-if" if="[[item.hourMinuteVisible]]">
+ <div class="layout horizontal center">
+ <template is="dom-if" if="[[item.hourMinuteTomorrow]]">
+ <div class="smartSwitchTomorrow">([[localize('tomorrow')]])</div>
+ </template>
+ <input class="or-Input or-InputTime smartSwitchTimeInput"
+ title="[[localize('Begin/end of cycle')]]"
+ type="time"
+ step="60"
+ required
+ value="{{item.hourMinute::input}}"
+ on-input="onSmartSwitchHourMinuteChange"/>
+ </div>
+ </template>
</div>
- </div>
+ </template>
</div>
- </smart-building-section>
- -->
-
+ </div>
</template>
<script>
- class SmartBuildingEnergy extends SmartBuildingComponent {
+ class SmartHomeControl extends SmartHomeComponent {
static get is() {
- return "smart-building-energy";
+ return "smart-home-control";
}
static get properties() {
@@ -115,6 +112,10 @@
type: Array,
computed: "computeSmartSwitches(rooms.*)"
},
+ lights: {
+ type: Array,
+ computed: "computeLights(rooms.*)"
+ },
smartSwitchHourMinuteChangeDebouncer: {
type: Object,
value: {}
@@ -122,6 +123,55 @@
}
}
+ computeLights() {
+ let lights = [];
+ if (!this.rooms)
+ return lights;
+ this.rooms.forEach(room => {
+ Object.keys(room.attributes).forEach(attr => {
+ if (attr.startsWith("lights")) {
+ lights.push(
+ {
+ roomId: room.id,
+ name: attr,
+ label: this.getLightsLabel(room.name, room.attributes[attr]),
+ type: room.attributes[attr].type,
+ value: room.attributes[attr].value
+ }
+ )
+ }
+ })
+ })
+ return lights;
+ }
+
+ getLightsLabel(roomName, attribute) {
+ let name = roomName;
+
+ if (attribute && attribute.meta) {
+ for (let i = 0; i < attribute.meta.length; i++) {
+ let metaItem = attribute.meta[i];
+ if (metaItem.name === "urn:openremote:asset:meta:label") {
+ name = metaItem.value;
+ }
+ }
+ }
+
+ return this.localize(name);
+ }
+
+ isLightType(item, type) {
+ return item.type === type;
+ }
+
+ onLightChange(e) {
+ let light = e.model.item;
+ let value = e.detail;
+ this.sendAttributeEvent(
+ light.roomId, light.name, value
+ );
+ }
+
computeSmartSwitches() {
let smartSwitches = [];
if (!this.rooms)
@@ -222,10 +272,9 @@
return hourMinuteMoment ? hourMinuteMoment.valueOf() : null;
}
-
}
- defineAppElement(SmartBuildingEnergy, SmartBuildingEnergy.is, "SmartBuildingEnergy");
+ defineAppElement(SmartHomeControl, SmartHomeControl.is, "SmartHomeControl");
</script>
</dom-module>
diff --git a/ui/app/smart-building-v1/smart-home/smart-home-energy.html b/ui/app/smart-building-v1/smart-home/smart-home-energy.html
new file mode 100644
index 000000000..fce42ac5f
--- /dev/null
+++ b/ui/app/smart-building-v1/smart-home/smart-home-energy.html
@@ -0,0 +1,67 @@
+<link rel="import" href="smart-home-component.html">
+<link rel="import" href="smart-home-style.html">
+<link rel="import" href="smart-home-section.html">
+
+<dom-module id="smart-home-energy">
+ <template>
+ <style include="smart-home-style">
+
+
+ </style>
+
+ <!-- TODO This section is not functional, not bound to any assets
+ <smart-home-section>
+ <div class="layout horizontal center">
+ <div class="flex" style="position: relative; padding-left: 10px;">
+ <div style="position: absolute;">
+ <div style="position: relative; left: 40px; top: 65px;">12%</div>
+ <div style="position: relative; top: 65px; left: 41px; font-size: x-small;">[[localize('Green')]]</div>
+ </div>
+ <img width="110" height="110" src="smart-home/img/home_large_energy.png"/>
+ </div>
+ <div class="layout vertical" style="font-size: smaller; margin-right: 5px;">
+
+ <div class="layout horizontal" style="margin: 5px 0;">
+ <div class="flex" style="padding-right: 20px;">[[localize('Usage today')]]</div>
+ <div>418W</div>
+ </div>
+
+ <div class="layout horizontal" style="margin: 5px 0; color: var(--theme-mediumgrey)">
+ <div class="flex">[[localize('Zone & Battery')]]</div>
+ <div>9%</div>
+ </div>
+
+ <div style="margin-bottom:5px;width:87%;height:10px; background-color: var(--theme-lightgreen);"></div>
+ <div class="" style="width:17%;height:10px; background-color: var(--theme-mediumgrey)"></div>
+
+ <div class="layout horizontal" style="margin: 5px 0; color: var(--theme-mediumgrey)">
+ <div class="flex">[[localize('Grid')]]</div>
+ <div>91%</div>
+ </div>
+ </div>
+ </div>
+ </smart-home-section>
+ -->
+
+ </template>
+
+ <script>
+ class SmartHomeEnergy extends SmartHomeComponent {
+ static get is() {
+ return "smart-home-energy";
+ }
+
+ static get properties() {
+ return {
+
+ }
+ }
+
+
+
+ }
+
+ defineAppElement(SmartHomeEnergy, SmartHomeEnergy.is, "SmartHomeEnergy");
+ </script>
+
+</dom-module>
diff --git a/ui/app/smart-building-v1/smart-home/smart-home-footer.html b/ui/app/smart-building-v1/smart-home/smart-home-footer.html
new file mode 100644
index 000000000..226102d4c
--- /dev/null
+++ b/ui/app/smart-building-v1/smart-home/smart-home-footer.html
@@ -0,0 +1,91 @@
+<link rel="import" href="smart-home-component.html">
+<link rel="import" href="smart-home-style.html">
+
+<dom-module id="smart-home-footer">
+ <template>
+ <style include="smart-home-style">
+
+ .footer {
+ font-size: 25px;
+ position: fixed;
+ bottom: 0px;
+ left: 0px;
+ right: 0px;
+ background-color: var(--theme-white);
+ box-shadow: 0px 5px 5px -3px rgba(0, 0, 0, 0.2), 0px 8px 10px 1px rgba(0, 0, 0, 0.14), 0px 3px 14px 2px rgba(0, 0, 0, 0.12);
+ }
+
+ .headerItem ::slotted(*) {
+ color: var(--theme-white);
+ text-decoration: none;
+ font-size: 20px;
+ cursor: pointer;
+ }
+
+ .nav {
+ background-color: var(--theme-white);
+ }
+
+ .navItem {
+ color: var(--theme-mediumgrey);
+ text-align: center;
+ padding: 10px;
+ cursor: pointer;
+ text-decoration: none;
+ border-top: 3px solid transparent;
+ border-bottom: 3px solid transparent;
+ }
+
+ .navItem.active {
+ color: var(--theme-black);
+ font-weight: 600;
+ }
+
+ </style>
+
+ <template is="dom-if" if="[[!hideNav]]">
+ <div class="footer flex-none layout horizontal nav">
+ <a href="#scenes" class$="[[getNavItemClass(activeNav, 'scenes')]]"><span class$="[[icon('th-large')]]"></span></a>
+ <a href="#control" class$="[[getNavItemClass(activeNav, 'control')]]"><span class$="[[icon('lightbulb')]]"></span></a>
+ <a href="#climate" class$="[[getNavItemClass(activeNav, 'climate')]]"><span class$="[[icon('thermometer-half')]]"></span></a>
+ <a href="#energy" class$="[[getNavItemClass(activeNav, 'energy')]]"><span class$="[[icon('burn')]]"></span></a>
+ <a href="#security" class$="[[getNavItemClass(activeNav, 'security')]]"><span class$="[[icon('shield-alt')]]"></span></a>
+ </div>
+ </template>
+
+ </template>
+
+ <script>
+ class SmartHomeFooter extends SmartHomeComponent {
+ static get is() {
+ return "smart-home-footer";
+ }
+
+ static get properties() {
+ return {
+ hideNav: {
+ type: Boolean,
+ value: false
+ },
+ activeNav: {
+ type: String
+ },
+ }
+ }
+
+ ready() {
+ super.ready();
+ this.shadowRoot.host.classList.add("flex-none", "layout", "vertical");
+ }
+
+ getNavItemClass(active, item) {
+ return active === item
+ ? "flex layout horizontal center-center navItem active"
+ : "flex layout horizontal center-center navItem";
+ }
+ }
+
+ defineAppElement(SmartHomeFooter, SmartHomeFooter.is, "SmartHomeFooter");
+ </script>
+
+</dom-module>
diff --git a/ui/app/realmA/smart-building/smart-home-header.html b/ui/app/smart-building-v1/smart-home/smart-home-header.html
similarity index 65%
rename from ui/app/realmA/smart-building/smart-home-header.html
rename to ui/app/smart-building-v1/smart-home/smart-home-header.html
index 8394ff65f..3306696c6 100644
--- a/ui/app/realmA/smart-building/smart-home-header.html
+++ b/ui/app/smart-building-v1/smart-home/smart-home-header.html
@@ -1,9 +1,9 @@
-<link rel="import" href="smart-building-component.html">
-<link rel="import" href="smart-building-style.html">
+<link rel="import" href="smart-home-component.html">
+<link rel="import" href="smart-home-style.html">
-<dom-module id="smart-building-header">
+<dom-module id="smart-home-header">
<template>
- <style include="smart-building-style">
+ <style include="smart-home-style">
.header {
background-color: var(--theme-darkgrey);
@@ -54,29 +54,16 @@
</div>
</div>
- <template is="dom-if" if="[[!hideNav]]">
- <div class="flex-none layout horizontal nav">
- <a href="#scenes" class$="[[getNavItemClass(activeNav, 'scenes')]]">{{localize('Home')}}</a>
- <a href="#energy" class$="[[getNavItemClass(activeNav, 'energy')]]">{{localize('Energy')}}</a>
- <a href="#security" class$="[[getNavItemClass(activeNav, 'security')]]">{{localize('Security')}}</a>
- <a href="#climate" class$="[[getNavItemClass(activeNav, 'climate')]]">{{localize('Climate')}}</a>
- </div>
- </template>
-
</template>
<script>
- class SmartBuildingHeader extends SmartBuildingComponent {
+ class SmartHomeHeader extends SmartHomeComponent {
static get is() {
- return "smart-building-header";
+ return "smart-home-header";
}
static get properties() {
return {
- hideNav: {
- type: Boolean,
- value: false
- },
activeNav: {
type: String
},
@@ -95,7 +82,7 @@
}
}
- defineAppElement(SmartBuildingHeader, SmartBuildingHeader.is, "SmartBuildingHeader");
+ defineAppElement(SmartHomeHeader, SmartHomeHeader.is, "SmartHomeHeader");
</script>
</dom-module>
diff --git a/ui/app/smart-building-v1/smart-home/smart-home-scenes.html b/ui/app/smart-building-v1/smart-home/smart-home-scenes.html
new file mode 100644
index 000000000..1cabf0f48
--- /dev/null
+++ b/ui/app/smart-building-v1/smart-home/smart-home-scenes.html
@@ -0,0 +1,246 @@
+<link rel="import" href="smart-home-component.html">
+<link rel="import" href="smart-home-style.html">
+<link rel="import" href="smart-home-section.html">
+
+<dom-module id="smart-home-scenes">
+ <template>
+ <style include="smart-home-style">
+
+ .scene-container {
+ margin: 0 10px;
+ }
+
+ .scene-container > div {
+ position: relative;
+ padding-bottom: 50%;
+ width: 50%;
+ }
+
+ .sceneItem {
+ position: absolute;
+ left: 0;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ margin: 10px;
+ border-radius: 0.2em;
+ cursor: pointer;
+ padding: 5%;
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ background-color: var(--theme-darkgrey);
+ color: var(--theme-white);
+ }
+
+ .scene-item-content-container {
+ position: relative;
+ width: 100%;
+ height: 100%;
+ }
+
+ .scene-temp-container {
+ position: absolute;
+ right: 0;
+ top: 0;
+ }
+
+ .scene-name-and-time-container {
+ position: absolute;
+ left: 0;
+ bottom: 0;
+ }
+
+ .scene-content-container > div {
+ margin: 5px;
+ }
+
+ .scene-name {
+ font-weight: 600;
+ }
+
+ .scene-time, .scene-temp {
+ font-size: small;
+ }
+
+ .scene-temp {
+ font-weight: 600;
+ }
+
+ .scene-alarm {
+ visibility: hidden;
+ font-size: larger;
+ }
+
+ .scene-alarm.enabled {
+ visibility: inherit;
+ }
+
+ .scene-temp, .scene-alarm {
+ text-align: center;
+ }
+
+ .or-Icon {
+ margin: 0;
+ }
+
+ .sceneItem.selected {
+ background-color: var(--theme-lightgreen);
+ color: var(--theme-darkgrey);
+ }
+
+ .sceneItem.active {
+ background-color: var(--theme-lightgreen);
+ color: var(--theme-black);
+ }
+
+ </style>
+
+ <div class="layout horizontal center-center" style="margin: 20px;">
+ <!-- Means enabling/disabling automatic scene switching based on schedule -->
+ <div class="flex layout horizontal smartLabel">[[localize('Automatically switch scenes')]]</div>
+ <div class="layout horizontal">
+ <or-checkbox checked="[[residence.attributes.sceneTimerEnabled.value]]"
+ on-change="onSmartToggleChange"></or-checkbox>
+ </div>
+ </div>
+
+ <div class="layout horizontal center-center scene-container">
+ <div>
+ <div id="MORNING"
+ class$="layout horizontal center-center sceneItem [[getItemClass(residence.attributes.lastExecutedScene.value, 'MORNING')]]"
+ on-click="switchScene">
+ <div class="scene-item-content-container">
+ <div class="scene-temp-container scene-content-container">
+ <div class="scene-temp">[[residence.attributes.morningSceneTargetTemperature.value]]&deg;</div>
+ <div class$="scene-alarm [[getAlarmClass(residence.attributes.morningSceneAlarmEnabled.value)]]"><span class$="[[icon('shield-alt')]]"></span></div>
+ </div>
+ <div class="scene-name-and-time-container scene-content-container">
+ <div class="scene-name">[[localize('Morning')]]</div>
+ <div class="scene-time">[[getSceneTime(residence.attributes, 'morning')]]</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div>
+ <div id="DAY"
+ class$="layout horizontal center-center sceneItem [[getItemClass(residence.attributes.lastExecutedScene.value, 'DAY')]]"
+ on-click="switchScene">
+ <div class="scene-item-content-container">
+ <div class="scene-temp-container scene-content-container">
+ <div class="scene-temp">[[residence.attributes.daySceneTargetTemperature.value]]&deg;</div>
+ <div class$="scene-alarm [[getAlarmClass(residence.attributes.daySceneAlarmEnabled.value)]]"><span class$="[[icon('shield-alt')]]"></span></div>
+ </div>
+ <div class="scene-name-and-time-container scene-content-container">
+ <div class="scene-name">[[localize('Day')]]</div>
+ <div class="scene-time">[[getSceneTime(residence.attributes, 'day')]]</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layout horizontal center-center scene-container">
+ <div>
+ <div id="EVENING"
+ class$="layout horizontal center-center sceneItem [[getItemClass(residence.attributes.lastExecutedScene.value, 'EVENING')]]"
+ on-click="switchScene">
+ <div class="scene-item-content-container">
+ <div class="scene-temp-container scene-content-container">
+ <div class="scene-temp">[[residence.attributes.eveningSceneTargetTemperature.value]]&deg;</div>
+ <div class$="scene-alarm [[getAlarmClass(residence.attributes.eveningSceneAlarmEnabled.value)]]"><span class$="[[icon('shield-alt')]]"></span></div>
+ </div>
+ <div class="scene-name-and-time-container scene-content-container">
+ <div class="scene-name">{{localize('Evening')}}</div>
+ <div class="scene-time">[[getSceneTime(residence.attributes, 'evening')]]</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div>
+ <div id="NIGHT"
+ class$="layout horizontal center-center sceneItem [[getItemClass(residence.attributes.lastExecutedScene.value, 'NIGHT')]]"
+ on-click="switchScene">
+ <div class="scene-item-content-container">
+ <div class="scene-temp-container scene-content-container">
+ <div class="scene-temp">[[residence.attributes.nightSceneTargetTemperature.value]]&deg;</div>
+ <div class$="scene-alarm [[getAlarmClass(residence.attributes.nightSceneAlarmEnabled.value)]]"><span class$="[[icon('shield-alt')]]"></span></div>
+ </div>
+ <div class="scene-name-and-time-container scene-content-container">
+ <div class="scene-name">{{localize('Night')}}</div>
+ <div class="scene-time">[[getSceneTime(residence.attributes, 'night')]]</div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ </template>
+
+ <script>
+ class SmartHomeScenes extends SmartHomeComponent {
+ static get is() {
+ return "smart-home-scenes";
+ }
+
+ getItemClass(lastExecutedScene, item) {
+ return lastExecutedScene === item ? "active" : "";
+ }
+
+ getAlarmClass(enabled) {
+ return enabled ? "enabled" : "";
+ }
+
+ getSceneTime(attributes, scene) {
+ if (!attributes) {
+ return;
+ }
+
+ let now = moment();
+ let today = now.format("dddd");
+ let nextScene = "";
+ let nextSceneDay = today;
+
+ switch (scene) {
+ case "morning":
+ nextScene = "day";
+ break;
+ case "day":
+ nextScene = "evening";
+ break;
+ case "evening":
+ nextScene = "night";
+ break;
+ case "night":
+ nextScene = "morning";
+ nextSceneDay = now.add(1, "days").format("dddd");
+ break;
+ }
+
+ let start = attributes[scene + "SceneTime" + today.toUpperCase()].value;
+ let end = attributes[nextScene + "SceneTime" + nextSceneDay.toUpperCase()].value;
+ return moment(start, "HH:mm:ss").format("HH:mm") + " - " + moment(end, "HH:mm:ss").format("HH:mm");
+ }
+
+ switchScene(e) {
+ let sceneItem = e.currentTarget;
+ sceneItem.classList.add("selected");
+ this.sendAttributeEvent(
+ this.residence.id, sceneItem.id.toLowerCase() + "Scene", "REQUEST_START"
+ );
+ }
+
+ onSmartToggleChange(e) {
+ this.sendAttributeEvent(
+ this.residence.id, e.detail ? "enableSceneTimer" : "disableSceneTimer", "REQUEST_START"
+ );
+ }
+ }
+
+ defineAppElement(SmartHomeScenes, SmartHomeScenes.is, "SmartHomeScenes");
+ </script>
+
+</dom-module>
diff --git a/ui/app/realmA/smart-building/smart-home-section.html b/ui/app/smart-building-v1/smart-home/smart-home-section.html
similarity index 86%
rename from ui/app/realmA/smart-building/smart-home-section.html
rename to ui/app/smart-building-v1/smart-home/smart-home-section.html
index 3a3fc2665..fc20cffd0 100644
--- a/ui/app/realmA/smart-building/smart-home-section.html
+++ b/ui/app/smart-building-v1/smart-home/smart-home-section.html
@@ -1,9 +1,9 @@
-<link rel="import" href="smart-building-component.html">
-<link rel="import" href="smart-building-style.html">
+<link rel="import" href="smart-home-component.html">
+<link rel="import" href="smart-home-style.html">
-<dom-module id="smart-building-section">
+<dom-module id="smart-home-section">
<template>
- <style include="smart-building-style">
+ <style include="smart-home-style">
:host {
background-color: var(--theme-white);
border-radius: 10px;
@@ -59,9 +59,9 @@
</template>
<script>
- class SmartBuildingSection extends SmartBuildingComponent {
+ class SmartHomeSection extends SmartHomeComponent {
static get is() {
- return "smart-building-section";
+ return "smart-home-section";
}
static get properties() {
@@ -87,7 +87,7 @@
}
}
- defineAppElement(SmartBuildingSection, SmartBuildingSection.is, "SmartBuildingSection");
+ defineAppElement(SmartHomeSection, SmartHomeSection.is, "SmartHomeSection");
</script>
</dom-module>
diff --git a/ui/app/smart-building-v1/smart-home/smart-home-security.html b/ui/app/smart-building-v1/smart-home/smart-home-security.html
new file mode 100644
index 000000000..082476009
--- /dev/null
+++ b/ui/app/smart-building-v1/smart-home/smart-home-security.html
@@ -0,0 +1,121 @@
+<link rel="import" href="smart-home-component.html">
+<link rel="import" href="smart-home-style.html">
+<link rel="import" href="smart-home-section.html">
+<link rel="import" href="/static/src/or-checkbox/or-checkbox.html">
+
+<dom-module id="smart-home-security">
+ <template>
+ <style include="smart-home-style">
+
+ .alarm {
+ margin: 10px 0;
+ }
+
+ .residencePresenceStatus {
+ padding: 10px 20px;
+ }
+
+ .roomLabel {
+ padding: 0 10px;
+ }
+
+ .presenceStatus {
+ color: var(--theme-mediumgrey);
+ }
+
+ .roomPresenceStatusItem {
+ margin: 10px 0;
+ }
+
+ </style>
+
+ <div id="page-container">
+
+ <div class="section">
+ <div class="layout horizontal center alarm">
+ <template is="dom-if" if="[[residence.attributes.presenceDetected.value]]">
+ <img height="60" src="smart-home/img/eye_large_active.png"/>
+ </template>
+ <template is="dom-if" if="[[!residence.attributes.presenceDetected.value]]">
+ <img height="60" src="smart-home/img/eye_large.png"/>
+ </template>
+ <div class="flex layout vertical residencePresenceStatus">
+ <div>[[localize('Alarm')]]</div>
+ <div class="presenceStatus">
+ [[computePresenceStatus(residence.attributes.presenceDetected.value)]]
+ </div>
+ </div>
+ <div class="layout horizontal">
+ <or-checkbox checked="[[residence.attributes.alarmEnabled.value]]"
+ on-change="onAlarmEnabledChange"></or-checkbox>
+ </div>
+ </div>
+ </div>
+
+ <div class="section">
+ <div class="layout vertical">
+ <template is="dom-repeat" items="[[roomsPresenceStatus]]">
+ <div class="layout horizontal center roomPresenceStatusItem">
+ <div class="layout vertical center-center">
+ <img height="30" src="smart-home/img/eye.png"/>
+ </div>
+ <div class="flex layout horizontal roomLabel">
+ [[localize(item.roomName)]]
+ </div>
+ <div class="presenceStatus">
+ [[computePresenceStatus(item.presenceDetected)]]
+ </div>
+ </div>
+ </template>
+ </div>
+ </div>
+ </div>
+
+ </template>
+
+ <script>
+ class SmartHomeSecurity extends SmartHomeComponent {
+ static get is() {
+ return "smart-home-security";
+ }
+
+ static get properties() {
+ return {
+ roomsPresenceStatus: {
+ type: Array,
+ computed: "computeRoomsPresenceStatus(rooms.*)"
+ }
+ }
+ }
+
+ onAlarmEnabledChange(e) {
+ this.sendAttributeEvent(
+ this.residence.id, "alarmEnabled", e.detail
+ );
+ }
+
+ computePresenceStatus(presenceDetected) {
+ return presenceDetected === true ? this.localize("Activity") : this.localize("No activity");
+ }
+
+ computeRoomsPresenceStatus(rooms) {
+ let roomsPresenceStatus = [];
+ if (!this.rooms)
+ return roomsPresenceStatus;
+ this.rooms.forEach(room => {
+ if ("presenceDetected" in room.attributes) {
+ roomsPresenceStatus.push({
+ roomId: room.id,
+ roomName: room.name,
+ presenceDetected: room.attributes.presenceDetected.value
+ });
+ }
+ })
+ return roomsPresenceStatus;
+ }
+ }
+
+ defineAppElement(SmartHomeSecurity, SmartHomeSecurity.is, "SmartHomeSecurity");
+ </script>
+
+</dom-module>
diff --git a/ui/app/realmA/smart-building/smart-home-settings.html b/ui/app/smart-building-v1/smart-home/smart-home-settings.html
similarity index 51%
rename from ui/app/realmA/smart-building/smart-home-settings.html
rename to ui/app/smart-building-v1/smart-home/smart-home-settings.html
index 40279061b..4bf0fa999 100644
--- a/ui/app/realmA/smart-building/smart-home-settings.html
+++ b/ui/app/smart-building-v1/smart-home/smart-home-settings.html
@@ -1,12 +1,16 @@
-<link rel="import" href="smart-building-component.html">
-<link rel="import" href="smart-building-style.html">
-<link rel="import" href="smart-building-section.html">
-<link rel="import" href="smart-building-temperature-select.html">
+<link rel="import" href="smart-home-component.html">
+<link rel="import" href="smart-home-style.html">
+<link rel="import" href="smart-home-section.html">
+<link rel="import" href="smart-home-temperature-select.html">
<link rel="import" href="/static/src/or-checkbox/or-checkbox.html">
-<dom-module id="smart-building-settings">
+<dom-module id="smart-home-settings">
<template>
- <style include="smart-building-style">
+ <style include="smart-home-style">
+ smart-home-section {
+ margin: 10px 0 20px 0;
+ }
+
.infoLabel {
font-size: smaller;
font-style: italic;
@@ -37,118 +41,133 @@
}
.row .field .or-InputTime {
- max-width: 4.4em;
+ max-width: 3em;
+ text-align: center;
padding: 0 0.2em;
}
</style>
- <smart-building-section title="[[localize('Vacation')]]" collapsed>
- <div class="layout horizontal center" style="margin-bottom: 10px;">
- <div class="flex">[[localize('On vacation until')]]</div>
- <input class="or-Input or-InputDate"
- title="[[localize('End of vacation')]]"
- type="date"
- empty$="[[vacationUntilEmpty]]"
- value="[[vacationUntil]]"
- on-input="onVacationUntilChange"/>
+ <div id="page-container">
+ <div class="layout horizontal center heading">
+ <span>[[localize('Weekly schedule')]]</span>
</div>
- </smart-building-section>
- <smart-building-section title="[[localize('Weekly Schedule')]]" collapsed>
- <div class="layout horizontal">
- <div class="layout horizontal first row">
- <div class="first field">[[localize('Scene')]]</div>
+ <smart-home-section class="section">
+ <div class="layout horizontal">
+ <div class="layout horizontal first row">
+ <div class="first field">[[localize('Scene')]]</div>
+ </div>
+ <template is="dom-repeat" items="{{scenes}}" as="scene">
+ <div class="flex layout horizontal center-center first row">
+ <div class="field">[[localize(scene.label)]]</div>
+ </div>
+ </template>
</div>
- <template is="dom-repeat" items="{{scenes}}" as="scene">
- <div class="flex layout horizontal center-center first row">
- <div class="field">[[localize(scene.label)]]</div>
+ <template is="dom-repeat" items="{{weekdays}}" as="weekday">
+ <div class="layout horizontal">
+ <div class="layout horizontal center row">
+ <div class="first field">[[localize(weekday)]]</div>
+ </div>
+ <template is="dom-repeat" items="{{scenes}}" as="scene">
+ <div class="flex layout horizontal center-center row">
+ <div class="field">
+ <input class="or-Input or-InputTime"
+ title="[[localize('Scene start time')]]"
+ type="time"
+ step="60"
+ required
+ value="[[getSceneTime(residence.attributes, weekday, scene.name)]]"
+ on-input="onSceneTimeChange"/>
+ </div>
+ </div>
+ </template>
</div>
</template>
+ </smart-home-section>
+
+ <div class="layout horizontal center heading">
+ <span>[[localize('Vacation')]]</span>
</div>
- <template is="dom-repeat" items="{{weekdays}}" as="weekday">
+ <div class="section">
+ <div class="layout horizontal center" style="margin-bottom: 10px;">
+ <div class="flex">[[localize('On vacation until')]]</div>
+ <input class="or-Input or-InputDate"
+ title="[[localize('End of vacation')]]"
+ type="date"
+ empty$="[[vacationUntilEmpty]]"
+ value="[[vacationUntil]]"
+ on-input="onVacationUntilChange"/>
+ </div>
+ </div>
+
+ <div class="layout horizontal center heading">
+ <span>[[localize('Scene configuration')]]</span>
+ </div>
+
+ <div class="section">
+
+ <div class="layout horizontal" style="margin-top: 20px;">
+ <div class="layout horizontal first row">
+ <div class="first field">[[localize('Climate')]]</div>
+ </div>
+ <template is="dom-repeat" items="{{scenes}}" as="scene">
+ <div class="flex layout horizontal center-center first row">
+ <div class="field">[[localize(scene.label)]]</div>
+ </div>
+ </template>
+ </div>
<div class="layout horizontal">
<div class="layout horizontal center row">
- <div class="first field">[[localize(weekday)]]</div>
+ <div class="first field">[[localize('Temperature')]]</div>
</div>
<template is="dom-repeat" items="{{scenes}}" as="scene">
<div class="flex layout horizontal center-center row">
<div class="field">
- <input class="or-Input or-InputTime"
- title="[[localize('Scene start time')]]"
- type="time"
- step="60"
- required
- value="[[getSceneTime(residence.attributes, weekday, scene.name)]]"
- on-input="onSceneTimeChange"/>
+ <smart-home-temperature-select
+ temperature="[[getSceneTemperature(residence.attributes, scene.name)]]"
+ on-change="onSceneTemperatureChange"
+ temperature-format="%0f° C"></smart-home-temperature-select>
</div>
</div>
</template>
</div>
- </template>
- </smart-building-section>
+ </div>
- <smart-building-section title="[[localize('Scene Configuration')]]" collapsed>
- <div class="layout horizontal">
- <div class="layout horizontal first row">
- <div class="first field">[[localize('Alarm')]]</div>
- </div>
- <template is="dom-repeat" items="{{scenes}}" as="scene">
- <div class="flex layout horizontal center-center first row">
- <div class="field">[[localize(scene.label)]]</div>
+ <div class="section">
+ <div class="layout horizontal">
+ <div class="layout horizontal first row">
+ <div class="first field">[[localize('Alarm')]]</div>
</div>
- </template>
- </div>
- <div class="layout horizontal">
- <div class="layout horizontal center row">
- <div class="first field">[[localize('Enabled')]]</div>
- </div>
- <template is="dom-repeat" items="{{scenes}}" as="scene">
- <div class="flex layout horizontal center-center row">
- <div class="field">
- <or-checkbox checked="[[getAlarmEnabled(residence.attributes, scene.name)]]"
- on-change="onAlarmEnabledChange"></or-checkbox>
+ <template is="dom-repeat" items="{{scenes}}" as="scene">
+ <div class="flex layout horizontal center-center first row">
+ <div class="field">[[localize(scene.label)]]</div>
</div>
- </div>
- </template>
- </div>
-
- <div class="layout horizontal" style="margin-top: 20px;">
- <div class="layout horizontal first row">
- <div class="first field">[[localize('Climate')]]</div>
+ </template>
</div>
- <template is="dom-repeat" items="{{scenes}}" as="scene">
- <div class="flex layout horizontal center-center first row">
- <div class="field">[[localize(scene.label)]]</div>
+ <div class="layout horizontal">
+ <div class="layout horizontal center row">
+ <div class="first field">[[localize('Enabled')]]</div>
</div>
- </template>
- </div>
- <div class="layout horizontal">
- <div class="layout horizontal center row">
- <div class="first field">[[localize('Temperature')]]</div>
- </div>
- <template is="dom-repeat" items="{{scenes}}" as="scene">
- <div class="flex layout horizontal center-center row">
- <div class="field">
- <smart-building-temperature-select
- temperature="[[getSceneTemperature(residence.attributes, scene.name)]]"
- on-change="onSceneTemperatureChange"
- temperature-format="%0f° C"></smart-building-temperature-select>
+ <template is="dom-repeat" items="{{scenes}}" as="scene">
+ <div class="flex layout horizontal center-center row">
+ <div class="field">
+ <or-checkbox checked="[[getAlarmEnabled(residence.attributes, scene.name)]]"
+ on-change="onAlarmEnabledChange"></or-checkbox>
+ </div>
</div>
- </div>
- </template>
- </div>
-
- </smart-building-section>
+ </template>
+ </div>
- <div class="layout horizontal center-center infoLabel">[[residence.name]]</div>
+ </div>
+ </div>
</template>
<script>
- class SmartBuildingSettings extends SmartBuildingComponent {
+ class SmartHomeSettings extends SmartHomeComponent {
static get is() {
- return "smart-building-settings";
+ return "smart-home-settings";
}
static get properties() {
@@ -164,8 +183,8 @@
scenes: {
type: Array,
value: [
- {name: "home", label: "At Home"},
- {name: "away", label: "Away"},
+ {name: "morning", label: "Morning"},
+ {name: "day", label: "Day"},
{name: "evening", label: "Evening"},
{name: "night", label: "Night"},
]
@@ -248,7 +267,7 @@
}
}
- defineAppElement(SmartBuildingSettings, SmartBuildingSettings.is, "SmartBuildingSettings");
+ defineAppElement(SmartHomeSettings, SmartHomeSettings.is, "SmartHomeSettings");
</script>
</dom-module>
diff --git a/ui/app/realmA/smart-building/smart-home-smart.html b/ui/app/smart-building-v1/smart-home/smart-home-smart.html
similarity index 66%
rename from ui/app/realmA/smart-building/smart-home-smart.html
rename to ui/app/smart-building-v1/smart-home/smart-home-smart.html
index d36563dc2..269601eda 100644
--- a/ui/app/realmA/smart-building/smart-home-smart.html
+++ b/ui/app/smart-building-v1/smart-home/smart-home-smart.html
@@ -1,19 +1,19 @@
-<link rel="import" href="smart-building-component.html">
-<link rel="import" href="smart-building-style.html">
-<link rel="import" href="smart-building-section.html">
+<link rel="import" href="smart-home-component.html">
+<link rel="import" href="smart-home-style.html">
+<link rel="import" href="smart-home-section.html">
<link rel="import" href="/static/src/or-checkbox/or-checkbox.html">
-<dom-module id="smart-building-smart">
+<dom-module id="smart-home-smart">
<template>
- <style include="smart-building-style">
+ <style include="smart-home-style">
.smartLabel {
margin: 0 10px;
}
</style>
- <smart-building-section>
+ <smart-home-section>
<div class="layout horizontal center">
- <img height="30" src="smart-building/img/star.png"/>
+ <img height="30" src="smart-home/img/star.png"/>
<!-- "All Smart" currently means enabling/disabling automatic scene switching based on schedule -->
<div class="flex layout horizontal smartLabel">[[localize('All Smart')]]</div>
<div class="layout horizontal">
@@ -21,14 +21,14 @@
on-change="onSmartToggleChange"></or-checkbox>
</div>
</div>
- </smart-building-section>
+ </smart-home-section>
</template>
<script>
- class SmartBuildingSmart extends SmartBuildingComponent {
+ class SmartHomeSmart extends SmartHomeComponent {
static get is() {
- return "smart-building-smart";
+ return "smart-home-smart";
}
ready() {
@@ -43,7 +43,7 @@
}
}
- defineAppElement(SmartBuildingSmart, SmartBuildingSmart.is, "SmartBuildingSmart");
+ defineAppElement(SmartHomeSmart, SmartHomeSmart.is, "SmartHomeSmart");
</script>
</dom-module>
diff --git a/ui/app/smart-building-v1/smart-home/smart-home-style.html b/ui/app/smart-building-v1/smart-home/smart-home-style.html
new file mode 100644
index 000000000..1499e46e8
--- /dev/null
+++ b/ui/app/smart-building-v1/smart-home/smart-home-style.html
@@ -0,0 +1,26 @@
+<dom-module id="smart-home-style">
+ <template>
+ <style include="or-style">
+
+ #page-container {
+ padding: 10px 15px 0 15px;
+ }
+
+ .section {
+ padding-bottom: 10px;
+ }
+
+ .heading {
+ color: var(--theme-darkgrey);
+ font-weight: 600;
+ margin: 20px -2px 10px -2px;
+ }
+
+ .heading > span {
+ padding: 0 2px 4px 2px;
+ border-bottom: 3px solid;
+ border-color: var(--theme-lightgreen);
+ }
+ </style>
+ </template>
+</dom-module>
\ No newline at end of file
diff --git a/ui/app/realmA/smart-building/smart-home-temperature-select.html b/ui/app/smart-building-v1/smart-home/smart-home-temperature-select.html
similarity index 79%
rename from ui/app/realmA/smart-building/smart-home-temperature-select.html
rename to ui/app/smart-building-v1/smart-home/smart-home-temperature-select.html
index 555e8da6f..65334173e 100644
--- a/ui/app/realmA/smart-building/smart-home-temperature-select.html
+++ b/ui/app/smart-building-v1/smart-home/smart-home-temperature-select.html
@@ -1,9 +1,9 @@
-<link rel="import" href="smart-building-component.html">
-<link rel="import" href="smart-building-style.html">
+<link rel="import" href="smart-home-component.html">
+<link rel="import" href="smart-home-style.html">
-<dom-module id="smart-building-temperature-select">
+<dom-module id="smart-home-temperature-select">
<template>
- <style include="smart-building-style">
+ <style include="smart-home-style">
</style>
<div class="or-Select">
@@ -20,9 +20,9 @@
</template>
<script>
- class SmartBuildingTemperatureSelect extends SmartBuildingComponent {
+ class SmartHomeTemperatureSelect extends SmartHomeComponent {
static get is() {
- return "smart-building-temperature-select";
+ return "smart-home-temperature-select";
}
static get properties() {
@@ -62,7 +62,7 @@
}
}
- defineAppElement(SmartBuildingTemperatureSelect, SmartBuildingTemperatureSelect.is, "SmartBuildingTemperatureSelect");
+ defineAppElement(SmartHomeTemperatureSelect, SmartHomeTemperatureSelect.is, "SmartHomeTemperatureSelect");
</script>
</dom-module>
diff --git a/ui/component/core/package.json b/ui/component/core/package.json
index a0b2208e7..2b504fd70 100644
--- a/ui/component/core/package.json
+++ b/ui/component/core/package.json
@@ -18,6 +18,6 @@
},
"devDependencies": {
"tslint": "^5.11.0",
- "typescript": "^3.1.6"
+ "typescript": "^3.2.2"
}
}
diff --git a/ui/component/model/package.json b/ui/component/model/package.json
index 5d19c20fa..3155a82cb 100644
--- a/ui/component/model/package.json
+++ b/ui/component/model/package.json
@@ -12,7 +12,7 @@
"license": "AGPL-3.0-or-later",
"dependencies": {},
"devDependencies": {
- "typescript": "^3.1.6"
+ "typescript": "^3.2.2"
},
"files": [
"dist"
diff --git a/ui/component/or-bottom-navigation/README.md b/ui/component/or-bottom-navigation/README.md
new file mode 100644
index 000000000..88b6c43d1
--- /dev/null
+++ b/ui/component/or-bottom-navigation/README.md
@@ -0,0 +1,3 @@
+A Pen created at CodePen.io. You can find this one at https://codepen.io/eskimojo14/pen/PEVjBJ.
+
+ A recreation of the [Bottom navigation](https://material.io/guidelines/components/bottom-navigation.html) bar from Material Design
\ No newline at end of file
diff --git a/ui/component/or-bottom-navigation/README.txt b/ui/component/or-bottom-navigation/README.txt
new file mode 100644
index 000000000..68fffbef8
--- /dev/null
+++ b/ui/component/or-bottom-navigation/README.txt
@@ -0,0 +1,8 @@
+A Pen created at CodePen.io. You can find this one at https://codepen.io/eskimojo14/pen/PEVjBJ.
+
+ A recreation of the [Bottom navigation](https://material.io/guidelines/components/bottom-navigation.html) bar from Material Design
+
+This is just a temporary package until the official components are released:
+
+https://github.com/material-components/material-components-web/tree/master/packages
+https://github.com/material-components/material-components-web-components/tree/master/packages
\ No newline at end of file
diff --git a/ui/component/or-bottom-navigation/index.html b/ui/component/or-bottom-navigation/index.html
new file mode 100644
index 000000000..0cedcfcef
--- /dev/null
+++ b/ui/component/or-bottom-navigation/index.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html lang="en" class="mdc-typography">
+
+<head>
+ <meta charset="UTF-8">
+ <title>Material Design Bottom Navigation</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css">
+
+ <link rel='stylesheet' href='https://fonts.googleapis.com/icon?family=Material+Icons'>
+<link rel='stylesheet' href='https://fonts.googleapis.com/css?family=Roboto'>
+<link rel='stylesheet' href='https://unpkg.com/material-components-web@latest/dist/material-components-web.css'>
+<link rel='stylesheet' href='https://fonts.googleapis.com/css?family=Roboto+Mono'>
+
+ <link rel="stylesheet" href="css/style.css">
+
+
+</head>
+
+<body>
+
+<div class="mdc-bottom-navigation mdc-bottom-navigation--shifting">
+ <nav class="mdc-bottom-navigation__list">
+ <span class="mdc-bottom-navigation__list-item">
+ <span class="material-icons mdc-bottom-navigation__list-item__icon">tv</span>
+ <span class="mdc-bottom-navigation__list-item__text">Movies and TV</span>
+ </span>
+ <span class="mdc-bottom-navigation__list-item mdc-bottom-navigation__list-item--activated">
+ <span class="material-icons mdc-bottom-navigation__list-item__icon">music_note</span>
+ <span class="mdc-bottom-navigation__list-item__text">Music</span>
+ </span>
+ <span class="mdc-bottom-navigation__list-item">
+ <span class="material-icons mdc-bottom-navigation__list-item__icon">book</span>
+ <span class="mdc-bottom-navigation__list-item__text">Books</span>
+ </span>
+ <span class="mdc-bottom-navigation__list-item">
+ <span class="material-icons mdc-bottom-navigation__list-item__icon">
+ <svg style="width:24px;height:24px" viewBox="0 0 24 24">
+ <path fill="#000000" d="M20,11H4V8H20M20,15H13V13H20M20,19H13V17H20M11,19H4V13H11M20.33,4.67L18.67,3L17,4.67L15.33,3L13.67,4.67L12,3L10.33,4.67L8.67,3L7,4.67L5.33,3L3.67,4.67L2,3V19A2,2 0 0,0 4,21H20A2,2 0 0,0 22,19V3L20.33,4.67Z" />
+ </svg>
+ </span>
+ <span class="mdc-bottom-navigation__list-item__text">Newstand</span>
+ </span>
+ </nav>
+</div>
+ <script src='https://unpkg.com/material-components-web@latest/dist/material-components-web.js'></script>
+
+
+
+ <script src="js/index.js"></script>
+
+
+
+
+</body>
+
+</html>
diff --git a/ui/component/or-bottom-navigation/license.txt b/ui/component/or-bottom-navigation/license.txt
new file mode 100644
index 000000000..9c69bad81
--- /dev/null
+++ b/ui/component/or-bottom-navigation/license.txt
@@ -0,0 +1,17 @@
+
+
+<!--
+Copyright (c) 2019 by EskiMojo14 (https://codepen.io/eskimojo14/pen/PEVjBJ)
+
+
+Fork of an original work by EskiMojo14 (https://codepen.io/eskimojo14/pen/aEPxxV)
+
+
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+-->
+
diff --git a/ui/component/or-bottom-navigation/package.json b/ui/component/or-bottom-navigation/package.json
new file mode 100644
index 000000000..502509a55
--- /dev/null
+++ b/ui/component/or-bottom-navigation/package.json
@@ -0,0 +1,20 @@
+{
+ "name": "@openremote/or-bottom-navigation",
+ "version": "1.0.0",
+ "description": "Temporary bottom navigation component",
+ "main": "dist/or-bottom-navigation.js",
+ "types": "src/or-bottom-navigation.ts",
+ "scripts": {
+ "build": "npx tsc",
+ "test": "echo \"No tests\" && exit 0"
+ },
+ "author": "OpenRemote",
+ "license": "AGPL-3.0-or-later",
+ "dependencies": {
+
+ },
+ "devDependencies": {
+ "tslint": "^5.11.0",
+ "typescript": "^3.2.2"
+ }
+}
diff --git a/ui/component/or-bottom-navigation/src/or-bottom-navigation.ts b/ui/component/or-bottom-navigation/src/or-bottom-navigation.ts
new file mode 100644
index 000000000..333412ede
--- /dev/null
+++ b/ui/component/or-bottom-navigation/src/or-bottom-navigation.ts
@@ -0,0 +1,205 @@
+import {LitElement, html, css, query, customElement, property} from "lit-element";
+import "./or-navigation-item";
+import { FlattenedNodesObserver } from "@polymer/polymer/lib/utils/flattened-nodes-observer";
+import {OrNavigationItem} from "./or-navigation-item";
+
+@customElement("or-bottom-navigation")
+export class OrBottomNavigation extends LitElement {
+
+ static _iconsCss: HTMLLinkElement | null = null;
+ static iconsUrl = "https://fonts.googleapis.com/icon?family=Material+Icons";
+
+ protected _observer?: FlattenedNodesObserver;
+
+ protected _temp: number[] = [1,2,3,4];
+
+ @property({type: Array})
+ protected _virtualItems: OrNavigationItem[] = [];
+
+ @query("slot")
+ private _itemsSlot!: HTMLSlotElement;
+
+ constructor() {
+ super();
+
+ if (OrBottomNavigation._iconsCss === null) {
+ let elem = document.createElement("link");
+ elem.href = OrBottomNavigation.iconsUrl;
+ elem.rel = "stylesheet";
+ OrBottomNavigation._iconsCss = elem;
+ window.document.head.appendChild(OrBottomNavigation._iconsCss);
+ }
+ }
+
+ static styles = css`
+ .mdc-bottom-navigation {
+ position: fixed;
+ bottom: 0px;
+ height: 56px;
+ background-color: var(--mdc-theme-background, #fff);
+ width: 100%;
+ box-shadow: 0px 5px 5px -3px rgba(0, 0, 0, 0.2), 0px 8px 10px 1px rgba(0, 0, 0, 0.14), 0px 3px 14px 2px rgba(0, 0, 0, 0.12);
+ overflow: hidden;
+ z-index: 8;
+ }
+ .mdc-bottom-navigation__list {
+ display: flex;
+ justify-content: center;
+ height: 100%;
+ }
+ .mdc-bottom-navigation__list-item {
+ flex: 1 1 0;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: flex-start;
+ padding: 0 12px;
+ min-width: 60px;
+ max-width: 168px;
+ box-sizing: border-box;
+ color: var(--mdc-theme-text-secondary-on-background, rgba(0, 0, 0, 0.54));
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ }
+ .mdc-bottom-navigation__list-item__icon {
+ padding-top: 8px;
+ pointer-events: none;
+ transition-property: padding-top, color;
+ transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+ transition-duration: 100ms;
+ }
+ .mdc-bottom-navigation__list-item__icon path {
+ fill: var(--mdc-theme-text-secondary-on-background, rgba(0, 0, 0, 0.54));
+ }
+ .mdc-bottom-navigation__list-item__text {
+ margin-top: auto;
+ padding-bottom: 10px;
+ font-size: 0.75rem;
+ pointer-events: none;
+ transition-property: font-size, color;
+ transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+ transition-duration: 100ms;
+ }
+ .mdc-bottom-navigation__list-item--activated .mdc-bottom-navigation__list-item__icon {
+ padding-top: 6px;
+ }
+ .mdc-bottom-navigation__list-item--activated .mdc-bottom-navigation__list-item__text {
+ font-size: 0.875rem;
+ }
+ .mdc-bottom-navigation__list-item--activated .mdc-bottom-navigation__list-item__icon, .mdc-bottom-navigation__list-item--activated .mdc-bottom-navigation__list-item__text {
+ color: var(--mdc-theme-primary, #6200ee);
+ }
+ .mdc-bottom-navigation__list-item--activated .mdc-bottom-navigation__list-item__icon path, .mdc-bottom-navigation__list-item--activated .mdc-bottom-navigation__list-item__text path {
+ fill: var(--mdc-theme-primary, #6200ee);
+ }
+ .mdc-bottom-navigation--shifting .mdc-bottom-navigation__list-item {
+ min-width: 56px;
+ max-width: 96px;
+ transition-property: min-width, max-width;
+ transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+ transition-duration: 100ms;
+ }
+ .mdc-bottom-navigation--shifting .mdc-bottom-navigation__list-item .mdc-bottom-navigation__list-item__icon {
+ padding-top: 16px;
+ transition-property: padding-top;
+ }
+ .mdc-bottom-navigation--shifting .mdc-bottom-navigation__list-item .mdc-bottom-navigation__list-item__text {
+ position: absolute;
+ line-height: 10px;
+ bottom: 0;
+ opacity: 0;
+ transition-property: opacity, font-size;
+ }
+ .mdc-bottom-navigation--shifting .mdc-bottom-navigation__list-item--activated {
+ min-width: 96px;
+ max-width: 168px;
+ }
+ .mdc-bottom-navigation--shifting .mdc-bottom-navigation__list-item--activated .mdc-bottom-navigation__list-item__icon {
+ padding-top: 8px;
+ transition-property: padding-top;
+ }
+ .mdc-bottom-navigation--shifting .mdc-bottom-navigation__list-item--activated .mdc-bottom-navigation__list-item__text {
+ white-space: nowrap;
+ opacity: 1;
+ }
+ `;
+
+ connectedCallback(): void {
+ super.connectedCallback();
+ // var lists = document.querySelectorAll('.mdc-bottom-navigation__list');
+ // var activatedClass = 'mdc-bottom-navigation__list-item--activated';
+ // for (var i = 0, list; list = lists[i]; i++) {
+ // list.addEventListener('click', function(event) {
+ // var el = event.target;
+ // while (!el.classList.contains('mdc-bottom-navigation__list-item') && el) {
+ // el = el.parentNode;
+ // }
+ // if (el) {
+ // var selectRegex = /.*(demo-card-\d).*/;
+ // var activatedItem = document.querySelector('.' + event.target.parentElement.parentElement.parentElement.className.replace(selectRegex, '$1') + ' .' + activatedClass);
+ // if (activatedItem) {
+ // activatedItem.classList.remove(activatedClass);
+ // }
+ // event.target.classList.add(activatedClass);
+ // }
+ // });
+ // }
+ }
+
+ firstUpdated() {
+ this._observer = new FlattenedNodesObserver(this._itemsSlot!, (info) => {
+ this._onAdd(info.addedNodes);
+ this._onRemove(info.removedNodes);
+ });
+ }
+
+ disconnectedCallback(): void {
+ super.disconnectedCallback();
+ }
+
+ protected render() {
+ return html`
+ ${OrBottomNavigation.iconsUrl ? html `<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">` : null}
+ <div class="mdc-bottom-navigation mdc-bottom-navigation--shifting">
+ <nav class="mdc-bottom-navigation__list">
+ <slot></slot>
+ <div>
+ ${this._virtualItems.map(navItem => OrBottomNavigation._virtualTemplate(navItem))}
+ </div>
+ </nav>
+ </div>
+ `;
+ }
+
+ private _onAdd(nodes: Element[]) {
+ nodes.forEach((node) => {
+ if (node instanceof OrNavigationItem) {
+ this._virtualItems.push(node);
+ this.requestUpdate();
+ }
+ });
+ }
+
+ private _onRemove(nodes: Element[]) {
+ nodes.forEach((node) => {
+ if (node instanceof OrNavigationItem) {
+ let index = this._virtualItems.indexOf(node);
+ if (index >= 0) {
+ this._virtualItems.slice(index, 1);
+ this.requestUpdate();
+ }
+ }
+ });
+ }
+
+ protected static _virtualTemplate(navItem: OrNavigationItem) {
+ return html`
+ <span class="mdc-bottom-navigation__list-item">
+ ${navItem.icon ? html`<span class="material-icons mdc-bottom-navigation__list-item__icon">${navItem.icon}</span>` : null}
+ ${navItem.text ? html`<span class="material-icons mdc-bottom-navigation__list-item__text">${navItem.text}</span>` : null}
+ </span>
+ `;
+ }
+}
\ No newline at end of file
diff --git a/ui/component/or-bottom-navigation/src/or-navigation-item.ts b/ui/component/or-bottom-navigation/src/or-navigation-item.ts
new file mode 100644
index 000000000..fe19b4193
--- /dev/null
+++ b/ui/component/or-bottom-navigation/src/or-navigation-item.ts
@@ -0,0 +1,12 @@
+import {customElement, LitElement, property} from "lit-element";
+
+@customElement("or-navigation-item")
+export class OrNavigationItem extends LitElement {
+
+ @property({type: String})
+ icon: string | null = null;
+
+ @property({type: String})
+ text: string | null = null;
+}
+
diff --git a/ui/component/or-bottom-navigation/tsconfig.json b/ui/component/or-bottom-navigation/tsconfig.json
new file mode 100644
index 000000000..badeac3f8
--- /dev/null
+++ b/ui/component/or-bottom-navigation/tsconfig.json
@@ -0,0 +1,10 @@
+{
+ "extends": "../../tsconfig",
+ "compilerOptions": {
+ "outDir": "./dist/",
+ "rootDir": "src"
+ },
+ "include": [
+ "./src"
+ ]
+}
\ No newline at end of file
diff --git a/ui/component/or-header/package.json b/ui/component/or-header/package.json
index 7a56efbe0..2fefdd7b5 100644
--- a/ui/component/or-header/package.json
+++ b/ui/component/or-header/package.json
@@ -11,7 +11,7 @@
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
"dependencies": {
- "lit-element": "^2.0.0-rc.2"
+ "lit-element": "^2.0.1"
},
"devDependencies": {
"@polymer/decorators": "^3.0.0",
@@ -20,7 +20,7 @@
"css-loader": "^2.0.0",
"style-loader": "^0.23.1",
"tslint": "^5.11.0",
- "typescript": "^3.1.6",
+ "typescript": "^3.2.2",
"wct-browser-legacy": "^1.0.0"
}
}
diff --git a/ui/component/or-header/src/index.ts b/ui/component/or-header/src/index.ts
index 27143ac98..b89bed8cd 100644
--- a/ui/component/or-header/src/index.ts
+++ b/ui/component/or-header/src/index.ts
@@ -1,4 +1,7 @@
-import {LitElement, html, property} from 'lit-element';
+import {OrHeaderStyle} from "@openremote/or-header/src/or-header-style";
+import {LitElement, html, css, property} from 'lit-element';
+
+const menuIcon = html`<svg height="24" viewBox="0 0 24 24" width="24"><path d="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"></path></svg>`;
const menu = html`<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" xmlns:xlink="http://www.w3.org/1999/xlink" enable-background="new 0 0 24 24">
<g>
@@ -21,10 +24,8 @@ class OrHeader extends LitElement {
@property({type: String})
private logo = '';
- protected render() {
- return html`
- <style>
- app-header {
+ static styles = css `
+ #app-header {
position: absolute;
top: 0;
left: 0;
@@ -56,8 +57,7 @@ class OrHeader extends LitElement {
margin-left: auto;
margin-right: 20px;
}
-
-
+
app-drawer {
z-index: 999999;
position: absolute;
@@ -115,9 +115,12 @@ class OrHeader extends LitElement {
display: block;
}
}
- </style>
+ `;
+
+ protected render() {
+ return html`
<!-- Header -->
- <app-header condenses reveals effects="waterfall">
+ <div id="app-header">
<div class="toolbar-top">
<div><img id="logo" src="${this.logo}" /></div>
<!-- This gets hidden on a small screen-->
@@ -130,7 +133,7 @@ class OrHeader extends LitElement {
<button class="menu-btn" title="Menu" @click="${this._menuButtonClicked}">${this._drawerOpened ? close : menu}</button>
</div>
- </app-header>
+ </div>
<app-drawer ?opened="${this._drawerOpened}" @click="${this._close}">
<nav class="drawer-list">
@@ -143,11 +146,6 @@ class OrHeader extends LitElement {
`;
}
-
- constructor() {
- super();
- }
-
private _close () {
this._drawerOpened = false;
}
diff --git a/ui/component/or-header/src/or-header-style.ts b/ui/component/or-header/src/or-header-style.ts
index b05facb3c..7c1542158 100644
--- a/ui/component/or-header/src/or-header-style.ts
+++ b/ui/component/or-header/src/or-header-style.ts
@@ -1,6 +1,5 @@
-import {html} from 'lit-element';
-export const OrHeaderStyle = html`
-<style>
+import {css} from 'lit-element';
+export const OrHeaderStyle = css`
or-header a, a:link, a:visited {
text-decoration: none !important;
}
@@ -71,5 +70,4 @@ export const OrHeaderStyle = html`
[slot="desktop-left"] > a[selected] {
border-bottom: 4px solid #A3BDD0;
}
-</style>
`;
diff --git a/ui/component/or-map/package.json b/ui/component/or-map/package.json
index bdc7d16da..aba62f863 100644
--- a/ui/component/or-map/package.json
+++ b/ui/component/or-map/package.json
@@ -24,7 +24,7 @@
"css-loader": "^2.0.0",
"style-loader": "^0.23.1",
"tslint": "^5.11.0",
- "typescript": "^3.1.6",
+ "typescript": "^3.2.2",
"wct-browser-legacy": "^1.0.0"
}
}
diff --git a/ui/component/rest/package.json b/ui/component/rest/package.json
index 7b0d8dd03..4b732f956 100644
--- a/ui/component/rest/package.json
+++ b/ui/component/rest/package.json
@@ -17,7 +17,7 @@
"devDependencies": {
"@types/es6-promise": "^3.3.0",
"tslint": "^5.11.0",
- "typescript": "^3.1.6"
+ "typescript": "^3.2.2"
},
"files": [
"dist"
diff --git a/ui/demo/demo-core/package.json b/ui/demo/demo-core/package.json
index ef4f81e70..c8c0a67e9 100644
--- a/ui/demo/demo-core/package.json
+++ b/ui/demo/demo-core/package.json
@@ -25,7 +25,7 @@
"html-webpack-plugin": "^3.2.0",
"raw-loader": "^0.5.1",
"shx": "^0.3.2",
- "typescript": "^3.1.6",
+ "typescript": "^3.2.2",
"tslint": "^5.11.0",
"webpack": "^4.24.0",
"webpack-cli": "^3.1.2",
diff --git a/ui/demo/demo-or-header/package.json b/ui/demo/demo-or-header/package.json
index c8dff8538..251689b78 100644
--- a/ui/demo/demo-or-header/package.json
+++ b/ui/demo/demo-or-header/package.json
@@ -33,7 +33,7 @@
"shx": "^0.3.2",
"style-loader": "^0.23.1",
"tslint": "^5.11.0",
- "typescript": "^3.1.6",
+ "typescript": "^3.2.2",
"url-loader": "^1.1.2",
"webpack": "^4.24.0",
"webpack-cli": "^3.1.2",
diff --git a/ui/demo/demo-or-map/package.json b/ui/demo/demo-or-map/package.json
index 3a754dfdd..5d8520ace 100644
--- a/ui/demo/demo-or-map/package.json
+++ b/ui/demo/demo-or-map/package.json
@@ -34,7 +34,7 @@
"shx": "^0.3.2",
"style-loader": "^0.23.1",
"tslint": "^5.11.0",
- "typescript": "^3.1.6",
+ "typescript": "^3.2.2",
"url-loader": "^1.1.2",
"webpack": "^4.24.0",
"webpack-cli": "^3.1.2",
diff --git a/ui/demo/demo-rest/package.json b/ui/demo/demo-rest/package.json
index a49c8c2f2..595982b7c 100644
--- a/ui/demo/demo-rest/package.json
+++ b/ui/demo/demo-rest/package.json
@@ -25,7 +25,7 @@
"html-webpack-plugin": "^3.2.0",
"raw-loader": "^0.5.1",
"shx": "^0.3.2",
- "typescript": "^3.1.6",
+ "typescript": "^3.2.2",
"tslint": "^5.11.0",
"webpack": "^4.24.0",
"webpack-cli": "^3.1.2",
diff --git a/ui/yarn.lock b/ui/yarn.lock
index 3997081ee..cce53dc39 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -1003,6 +1003,32 @@
lodash "^4.17.10"
to-fast-properties "^2.0.0"
+"@fortawesome/fontawesome-common-types@^0.2.14":
+ version "0.2.14"
+ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.14.tgz#0eb86a77ac88e8c12c48591735283f0bf0ea5606"
+ integrity sha512-LOcvERCI96KioXSIfOYN4IATv2ROJOyf72dYnpoWfOIkuyLp45oMej1kL03kYdzvktLCzYhykgHwiu6nkg9Xbw==
+
+"@fortawesome/fontawesome-svg-core@^1.2.12":
+ version "1.2.14"
+ resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.14.tgz#48fde5fbfa223cffd5fac9c0402cfbe87605a7d0"
+ integrity sha512-T1qCqkwm9PuvK53J64D1ovfrOTa1kG+SrHNj5cFst/rrskhCnbxpRdbqFIdc/thmXC0ebBX8nOUyja2/mrxe4g==
+ dependencies:
+ "@fortawesome/fontawesome-common-types" "^0.2.14"
+
+"@fortawesome/free-regular-svg-icons@^5.6.3":
+ version "5.7.1"
+ resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.7.1.tgz#eab182769eef910f961ed4c3a581ebd9934b4b38"
+ integrity sha512-JFLJ4M11lZEfi+bmfJdWGVUe5fvmr5k/bqshN7VbJZvEJ6i12Yr6uaByQUM0U1tgw+hJkd8xAwVvKxpJ2HDVTA==
+ dependencies:
+ "@fortawesome/fontawesome-common-types" "^0.2.14"
+
+"@fortawesome/free-solid-svg-icons@^5.6.3":
+ version "5.7.1"
+ resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.7.1.tgz#df41b8643383862a2af93456e7129e5ffc0fb7ae"
+ integrity sha512-5V/Q+JoPzuiIHW2JwmZGvE9bHguvNJKa7611DPo51uIvYv9LweX/SnDF+HC23X2W5T3myHhnGi+EZJTmidAmyg==
+ dependencies:
+ "@fortawesome/fontawesome-common-types" "^0.2.14"
+
"@mapbox/[email protected]":
version "0.2.2"
resolved "https://registry.yarnpkg.com/@mapbox/geojson-area/-/geojson-area-0.2.2.tgz#18d7814aa36bf23fbbcc379f8e26a22927debf10"
@@ -1052,6 +1078,17 @@
resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe"
integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==
+"@polymer/app-layout@^3.0.0":
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/@polymer/app-layout/-/app-layout-3.0.2.tgz#8a6f3c87b405635fd3547db82db8dbb6c51b6bf9"
+ integrity sha512-qKcQHj72uGxGoetjnNQ7pg4F6Da4U5jKBzZy0VRmDuZMUPDmtIqHaIgC5K6B4y+xUag0gkV9ce72Q3hNaK9y+g==
+ dependencies:
+ "@polymer/iron-flex-layout" "^3.0.0-pre.26"
+ "@polymer/iron-media-query" "^3.0.0-pre.26"
+ "@polymer/iron-resizable-behavior" "^3.0.0-pre.26"
+ "@polymer/iron-scroll-target-behavior" "^3.0.0-pre.26"
+ "@polymer/polymer" "^3.0.0"
+
"@polymer/decorators@^3.0.0":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@polymer/decorators/-/decorators-3.0.0.tgz#e4212ac976d9abd1210f560b6e1be4165c1c0183"
@@ -1074,7 +1111,7 @@
"@polymer/polymer" "^3.0.0"
"@polymer/prism-element" "^3.0.0-pre.25"
-"@polymer/iron-flex-layout@^3.0.0-pre.25":
+"@polymer/iron-flex-layout@^3.0.0-pre.25", "@polymer/iron-flex-layout@^3.0.0-pre.26":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@polymer/iron-flex-layout/-/iron-flex-layout-3.0.1.tgz#36f9e1a8eb792d279b2bc75d362628721ad37f0c"
dependencies:
@@ -1086,6 +1123,27 @@
dependencies:
"@polymer/polymer" "^3.0.0"
+"@polymer/iron-media-query@^3.0.0-pre.26":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@polymer/iron-media-query/-/iron-media-query-3.0.1.tgz#5cd8a1c1e8c9b8bafd3dd5da14e0f8d2cfa76d83"
+ integrity sha512-czUX1pm1zfmfcZtq5J57XFkcobBv08Y50exp0/3v8Bos5VL/jv2tU0RwiTfDBxUMhjicGbgwEBFQPY2V5DMzyw==
+ dependencies:
+ "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-resizable-behavior@^3.0.0-pre.26":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@polymer/iron-resizable-behavior/-/iron-resizable-behavior-3.0.1.tgz#e284348ed7c1c7e263f7039297532fa954025ea2"
+ integrity sha512-FyHxRxFspVoRaeZSWpT3y0C9awomb4tXXolIJcZ7RvXhMP632V5lez+ch5G5SwK0LpnAPkg35eB0LPMFv+YMMQ==
+ dependencies:
+ "@polymer/polymer" "^3.0.0"
+
+"@polymer/iron-scroll-target-behavior@^3.0.0-pre.26":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@polymer/iron-scroll-target-behavior/-/iron-scroll-target-behavior-3.0.1.tgz#29fa644b320fb29ab6c68eb6d08a6520157764ac"
+ integrity sha512-xg1WanG25BIkQE8rhuReqY9zx1K5M7F+YAIYpswEp5eyDIaZ1Y3vUmVeQ3KG+hiSugzI1M752azXN7kvyhOBcQ==
+ dependencies:
+ "@polymer/polymer" "^3.0.0"
+
"@polymer/marked-element@^3.0.0-pre.25":
version "3.0.1"
resolved "https://registry.yarnpkg.com/@polymer/marked-element/-/marked-element-3.0.1.tgz#56add62080404dea142c055977807ae9ca773a89"
@@ -1276,6 +1334,11 @@
"@webassemblyjs/wast-parser" "1.7.11"
"@xtuc/long" "4.2.1"
+"@webcomponents/html-imports@^1.2.0":
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/@webcomponents/html-imports/-/html-imports-1.2.0.tgz#4213aae60faf47b6c47cc145dff4dc530ae6c2c4"
+ integrity sha512-EIy8RqSfsoJ5Tk2wsfaSX4IKhXg8oYCq/xVEz8LEELXhv5tup/iZ/SInoz8SLtZGFP+vjUh2oRsgkUMhbrr0GQ==
+
"@webcomponents/shadycss@^1.5.2":
version "1.5.2"
resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.5.2.tgz#ad72f43000c39ba4ac61e625131f34f4b7cfe55f"
@@ -1624,6 +1687,11 @@ boolbase@~1.0.0:
resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+ version "4.1.3"
+ resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"
+ integrity sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==
+
brace-expansion@^1.1.7:
version "1.1.11"
resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -1647,6 +1715,16 @@ braces@^2.3.0, braces@^2.3.1:
split-string "^3.0.2"
to-regex "^3.0.1"
+brfs@^1.4.4:
+ version "1.6.1"
+ resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"
+ integrity sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==
+ dependencies:
+ quote-stream "^1.0.1"
+ resolve "^1.1.5"
+ static-module "^2.2.0"
+ through2 "^2.0.0"
+
brorand@^1.0.1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
@@ -1733,6 +1811,11 @@ browserslist@^4.3.4:
electron-to-chromium "^1.3.92"
node-releases "^1.1.1"
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
+ integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=
+
buffer-from@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
@@ -2080,7 +2163,7 @@ content-type@~1.0.4:
resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
-convert-source-map@^1.1.0:
+convert-source-map@^1.1.0, convert-source-map@^1.5.1:
version "1.6.0"
resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
@@ -2338,6 +2421,11 @@ deep-extend@^0.6.0:
resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+deep-is@~0.1.3:
+ version "0.1.3"
+ resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
+ integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
+
default-gateway@^2.6.0:
version "2.7.2"
resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
@@ -2522,6 +2610,13 @@ [email protected]:
dom-serializer "0"
domelementtype "1"
+duplexer2@~0.1.4:
+ version "0.1.4"
+ resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
+ integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
+ dependencies:
+ readable-stream "^2.0.2"
+
duplexify@^3.4.2, duplexify@^3.6.0:
version "3.6.1"
resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
@@ -2668,6 +2763,30 @@ [email protected], escape-string-regexp@^1.0.2, escape-string-regexp@^1
version "1.0.5"
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+escodegen@^1.8.1:
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.0.tgz#b27a9389481d5bfd5bec76f7bb1eb3f8f4556589"
+ integrity sha512-IeMV45ReixHS53K/OmfKAIztN/igDHzTJUhZM3k1jMhIZWjk45SMwAtBsEXiJp3vSPmTcu6CXn7mDvFHRN66fw==
+ dependencies:
+ esprima "^3.1.3"
+ estraverse "^4.2.0"
+ esutils "^2.0.2"
+ optionator "^0.8.1"
+ optionalDependencies:
+ source-map "~0.6.1"
+
+escodegen@~1.9.0:
+ version "1.9.1"
+ resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"
+ integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==
+ dependencies:
+ esprima "^3.1.3"
+ estraverse "^4.2.0"
+ esutils "^2.0.2"
+ optionator "^0.8.1"
+ optionalDependencies:
+ source-map "~0.6.1"
+
eslint-scope@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.0.tgz#50bf3071e9338bcdc43331794a0cb533f0136172"
@@ -2681,6 +2800,11 @@ esm@^3.0.84:
resolved "https://registry.yarnpkg.com/esm/-/esm-3.0.84.tgz#bb108989f4673b32d4f62406869c28eed3815a63"
integrity sha512-SzSGoZc17S7P+12R9cg21Bdb7eybX25RnIeRZ80xZs+VZ3kdQKzqTp2k4hZJjR7p9l0186TTXSgrxzlMDBktlw==
+esprima@^3.1.3:
+ version "3.1.3"
+ resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
+ integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=
+
esprima@^4.0.0:
version "4.0.1"
resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -2698,7 +2822,7 @@ esrecurse@^4.1.0:
dependencies:
estraverse "^4.1.0"
-estraverse@^4.1.0, estraverse@^4.1.1:
+estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=
@@ -2834,6 +2958,16 @@ extglob@^2.0.4:
snapdragon "^0.8.1"
to-regex "^3.0.1"
+falafel@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"
+ integrity sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=
+ dependencies:
+ acorn "^5.0.0"
+ foreach "^2.0.5"
+ isarray "0.0.1"
+ object-keys "^1.0.6"
+
fast-async@^6.3.8:
version "6.3.8"
resolved "https://registry.yarnpkg.com/fast-async/-/fast-async-6.3.8.tgz#031b9e1d5a84608b117b3e7c999ad477ed2b08a2"
@@ -2852,6 +2986,11 @@ fast-json-stable-stringify@^2.0.0:
resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
+fast-levenshtein@~2.0.4:
+ version "2.0.6"
+ resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+ integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+
fastparse@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
@@ -2965,6 +3104,11 @@ for-in@^1.0.2:
resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+foreach@^2.0.5:
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+ integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+
version "1.1.1"
resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.1.1.tgz#5ed3ccd636551097383465d996199100e86161e9"
@@ -3054,7 +3198,7 @@ geojson-rewind@^0.3.0:
minimist "1.2.0"
sharkdown "^0.1.0"
-geojson-vt@^3.2.1:
+geojson-vt@^3.2.0, geojson-vt@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/geojson-vt/-/geojson-vt-3.2.1.tgz#f8adb614d2c1d3f6ee7c4265cad4bbf3ad60c8b7"
integrity sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==
@@ -3364,6 +3508,16 @@ https-browserify@^1.0.0:
resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
+i18next-xhr-backend@^1.5.1:
+ version "1.5.1"
+ resolved "https://registry.yarnpkg.com/i18next-xhr-backend/-/i18next-xhr-backend-1.5.1.tgz#50282610780c6a696d880dfa7f4ac1d01e8c3ad5"
+ integrity sha512-9OLdC/9YxDvTFcgsH5t2BHCODHEotHCa6h7Ly0EUlUC7Y2GS09UeoHOGj3gWKQ3HCqXz8NlH4gOrK3NNc9vPuw==
+
+i18next@^14.1.1:
+ version "14.1.1"
+ resolved "https://registry.yarnpkg.com/i18next/-/i18next-14.1.1.tgz#d569aff68c088151f09fcb0cb6f44b36d62731d3"
+ integrity sha512-HItn9RHLyrDqe6pw6qXMYHGPHNc3y1FZndJfBlD6k4sRS0FAlYLvqCDVIWFc1XultBgsv348TtvL/lleG6JgBg==
+
version "0.4.23"
resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
@@ -3754,6 +3908,11 @@ json5@^2.1.0:
dependencies:
minimist "^1.2.0"
+kdbush@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-2.0.1.tgz#90c6128e3001ac68c550d7c9e2f222c0269666f1"
+ integrity sha512-9KqSdmWCkBIisFIGclT0FRagKhI7IVbMyUjsxCFG0Ly1Dg6whlxJ7b9lrq8ifk3X/fGeJzok1R75LQfZTfA5zQ==
+
kdbush@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-3.0.0.tgz#f8484794d47004cc2d85ed3a79353dbe0abc2bf0"
@@ -3800,22 +3959,30 @@ [email protected]:
resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.0.2.tgz#fa4fbcb7844944fc2bfb0bcf9ca0dea13463ca21"
integrity sha1-+k+8t4RJRPwr+wvPnKDeoTRjyiE=
-lit-element@^2.0.0-rc.2:
- version "2.0.0-rc.2"
- resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.0.0-rc.2.tgz#5975c3b282ce47937de861b48456036df71f422b"
- integrity sha512-yP6mX23n8WUYXpS2RJUL87DSZYQY327YrnqFiSyPe9aSzjgJ5Jy3In3itzjeiFOT8Od4VKLM7u6bLG9tGFO1pw==
+levn@~0.3.0:
+ version "0.3.0"
+ resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+ integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
dependencies:
- lit-html "^1.0.0-rc.2"
+ prelude-ls "~1.1.2"
+ type-check "~0.3.2"
+
+lit-element@^2.0.1:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.0.1.tgz#9ec5871d3b64487f432c7c071df80ef031d7091b"
+ integrity sha512-2bu3B2ZYUZgntvOgu3i5mRK8geo45CLUwxwJEYK54hyednoJasjiTZPB13NBg1D+hNM2JfmWTWJnh1QEUQv7zw==
+ dependencies:
+ lit-html "^1.0.0"
lit-html@^0.12.0:
version "0.12.0"
resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-0.12.0.tgz#d994420fda74744f9d4a79401b086de929643e6a"
integrity sha512-NyFgq8yTlGEjUFQOmNnK/kj+ZdDVJzTwsLunNSewGiOns7SjuJi6ymCCqzZZ81uW2VwEmliMbOlFZc9QmOJPLA==
-lit-html@^1.0.0-rc.2:
- version "1.0.0-rc.2"
- resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.0.0-rc.2.tgz#b9c904520fe005d349aa737a86d83645d97d5a89"
- integrity sha512-4bq34lhVmwWly1zBXicOBJLOwaWfjOVbchEEmFnZLuztxjh5wRd2WqV0URX8Q47MQ7PaIjn/eXyTRKsYhSAeRw==
+lit-html@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.0.0.tgz#3dc3781a8ca68a9b5c2ff2a61e263662b9b2267b"
+ integrity sha512-oeWlpLmBW3gFl7979Wol2LKITpmKTUFNn7PnFbh6YNynF61W74l6x5WhwItAwPRSATpexaX1egNnRzlN4GOtfQ==
loader-runner@^2.3.0:
version "2.3.1"
@@ -3942,7 +4109,7 @@ [email protected]:
version "1.3.2"
resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"
-loose-envify@^1.0.0:
+loose-envify@^1.0.0, loose-envify@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -3962,6 +4129,13 @@ lru-cache@^4.1.1, lru-cache@^4.1.3:
pseudomap "^1.0.2"
yallist "^3.0.2"
+magic-string@^0.22.4:
+ version "0.22.5"
+ resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
+ integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
+ dependencies:
+ vlq "^0.2.2"
+
make-dir@^1.0.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -3988,6 +4162,36 @@ map-visit@^1.0.0:
dependencies:
object-visit "^1.0.0"
+mapbox-gl@^0.50.0:
+ version "0.50.0"
+ resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.50.0.tgz#49f44149f02fdd25ab64a2ec4efc7a11a5c96f55"
+ integrity sha512-rr/fP1mlsQBtAE3JaYenSFM5tYRzYaSU1j7KsrPtICSHMzAUMrsl1TlnC5JpMbcZu6nu8R2GFTJ8hYsoBsX9Bg==
+ dependencies:
+ "@mapbox/geojson-types" "^1.0.2"
+ "@mapbox/jsonlint-lines-primitives" "^2.0.2"
+ "@mapbox/mapbox-gl-supported" "^1.4.0"
+ "@mapbox/point-geometry" "^0.1.0"
+ "@mapbox/tiny-sdf" "^1.1.0"
+ "@mapbox/unitbezier" "^0.0.0"
+ "@mapbox/vector-tile" "^1.3.1"
+ "@mapbox/whoots-js" "^3.1.0"
+ brfs "^1.4.4"
+ csscolorparser "~1.0.2"
+ earcut "^2.1.3"
+ geojson-rewind "^0.3.0"
+ geojson-vt "^3.2.0"
+ gl-matrix "^2.6.1"
+ grid-index "^1.0.0"
+ minimist "0.0.8"
+ murmurhash-js "^1.0.0"
+ pbf "^3.0.5"
+ potpack "^1.0.1"
+ quickselect "^1.0.0"
+ rw "^1.3.3"
+ supercluster "^4.1.1"
+ tinyqueue "^1.1.0"
+ vt-pbf "^3.0.1"
+
mapbox-gl@^0.52.0-beta.1:
version "0.52.0-beta.1"
resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.52.0-beta.1.tgz#e53a93c12daf4f94fd6a786d63ce0f7a6d9676cd"
@@ -4069,6 +4273,13 @@ [email protected]:
resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"
+ integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=
+ dependencies:
+ source-map "^0.5.6"
+
methods@~1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
@@ -4158,7 +4369,7 @@ [email protected]:
version "0.0.8"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
[email protected], minimist@^1.2.0:
[email protected], minimist@^1.1.3, minimist@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
@@ -4241,6 +4452,18 @@ mocha@^3.4.2:
mkdirp "0.5.1"
supports-color "3.1.2"
+moment-es6@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/moment-es6/-/moment-es6-1.0.0.tgz#552fcf405d62565b0a1fe84e6c1e697ac79332df"
+ integrity sha1-VS/PQF1iVlsKH+hObB5peseTMt8=
+ dependencies:
+ moment "*"
+
+moment@*, moment@^2.22.2:
+ version "2.24.0"
+ resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
+ integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
+
move-concurrently@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -4498,7 +4721,12 @@ object-copy@^0.1.0:
define-property "^0.2.5"
kind-of "^3.0.3"
-object-keys@^1.0.11, object-keys@^1.0.12:
+object-inspect@~1.4.0:
+ version "1.4.1"
+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"
+ integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
+
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.0.6:
version "1.0.12"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
@@ -4565,6 +4793,18 @@ opn@^5.1.0:
dependencies:
is-wsl "^1.1.0"
+optionator@^0.8.1:
+ version "0.8.2"
+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
+ integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
+ dependencies:
+ deep-is "~0.1.3"
+ fast-levenshtein "~2.0.4"
+ levn "~0.3.0"
+ prelude-ls "~1.1.2"
+ type-check "~0.3.2"
+ wordwrap "~1.0.0"
+
original@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
@@ -4875,6 +5115,11 @@ potpack@^1.0.1:
resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.1.tgz#d1b1afd89e4c8f7762865ec30bd112ab767e2ebf"
integrity sha512-15vItUAbViaYrmaB/Pbw7z6qX2xENbFSTA7Ii4tgbPtasxm5v6ryKhKtL91tpWovDJzTiZqdwzhcFBCwiMVdVw==
+prelude-ls@~1.1.2:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+ integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+
pretty-error@^2.0.2:
version "2.1.1"
resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"
@@ -4984,6 +5229,11 @@ punycode@^2.1.0:
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+pwa-helpers@^0.9.0:
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/pwa-helpers/-/pwa-helpers-0.9.0.tgz#88bc7c60842c7179ab643d337ab20bb252e5bf9d"
+ integrity sha512-lFj0udSHHqEJdf+SmAp8Y9yRJ8s1ieQIbvt4mWXn6NXUOO9ntLXNLBi8PMJGBPkc32cG4nJ6yuJrHzOxC5ZTXw==
+
version "6.5.2"
resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
@@ -5009,6 +5259,15 @@ quickselect@^1.0.0:
resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-1.1.1.tgz#852e412ce418f237ad5b660d70cffac647ae94c2"
integrity sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ==
+quote-stream@^1.0.1, quote-stream@~1.0.2:
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"
+ integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=
+ dependencies:
+ buffer-equal "0.0.1"
+ minimist "^1.1.3"
+ through2 "^2.0.0"
+
randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:
version "2.0.6"
resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.6.tgz#d302c522948588848a8d300c932b44c24231da80"
@@ -5054,7 +5313,7 @@ rc@^1.2.7:
minimist "^1.2.0"
strip-json-comments "~2.0.1"
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:
version "2.3.6"
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -5110,6 +5369,19 @@ redeyed@~0.4.0:
dependencies:
esprima "~1.0.4"
+redux-thunk@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
+ integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==
+
+redux@^4.0.0:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"
+ integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==
+ dependencies:
+ loose-envify "^1.4.0"
+ symbol-observable "^1.2.0"
+
regenerate-unicode-properties@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
@@ -5233,6 +5505,11 @@ requires-port@^1.0.0:
resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+reselect@^3.0.1:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"
+ integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=
+
resolve-cwd@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"
@@ -5257,6 +5534,13 @@ resolve-url@^0.2.1:
resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+resolve@^1.1.5:
+ version "1.10.0"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
+ integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
+ dependencies:
+ path-parse "^1.0.6"
+
resolve@^1.1.6, resolve@^1.3.2:
version "1.8.1"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
@@ -5466,6 +5750,11 @@ sha.js@^2.4.0, sha.js@^2.4.8:
inherits "^2.0.1"
safe-buffer "^5.0.1"
+shallow-copy@~0.0.1:
+ version "0.0.1"
+ resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"
+ integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=
+
sharkdown@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/sharkdown/-/sharkdown-0.1.0.tgz#61d4fe529e75d02442127cc9234362265099214f"
@@ -5693,6 +5982,13 @@ stacky@^1.3.1:
chalk "^1.1.1"
lodash "^3.0.0"
+static-eval@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.0.tgz#0e821f8926847def7b4b50cda5d55c04a9b13864"
+ integrity sha512-6flshd3F1Gwm+Ksxq463LtFd1liC77N/PX1FVVc3OzL3hAmo2fwHFbuArkcfi7s9rTNsLEhcRmXGFZhlgy40uw==
+ dependencies:
+ escodegen "^1.8.1"
+
static-extend@^0.1.1:
version "0.1.2"
resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
@@ -5701,6 +5997,26 @@ static-extend@^0.1.1:
define-property "^0.2.5"
object-copy "^0.1.0"
+static-module@^2.2.0:
+ version "2.2.5"
+ resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf"
+ integrity sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==
+ dependencies:
+ concat-stream "~1.6.0"
+ convert-source-map "^1.5.1"
+ duplexer2 "~0.1.4"
+ escodegen "~1.9.0"
+ falafel "^2.1.0"
+ has "^1.0.1"
+ magic-string "^0.22.4"
+ merge-source-map "1.0.4"
+ object-inspect "~1.4.0"
+ quote-stream "~1.0.2"
+ readable-stream "~2.3.3"
+ shallow-copy "~0.0.1"
+ static-eval "^2.0.0"
+ through2 "~2.0.3"
+
"statuses@>= 1.4.0 < 2":
version "1.5.0"
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
@@ -5810,6 +6126,13 @@ style-loader@^0.23.1:
loader-utils "^1.1.0"
schema-utils "^1.0.0"
+supercluster@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-4.1.1.tgz#cf13c3b28a3fb3db5290bfad7f524e244bd4ce78"
+ integrity sha512-sF0FfUOPFp96DKzwWFLeQOEqqKu2PpcesxAFeFsknA/q7g7igVVn/p3NI2XHEghNSyDAqunKNKqAbqNO8+7NDQ==
+ dependencies:
+ kdbush "^2.0.1"
+
supercluster@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-5.0.0.tgz#2a5a9b1ffbd0d6180dea10039d78b5d95fdb8f27"
@@ -5834,6 +6157,11 @@ supports-color@^5.1.0, supports-color@^5.3.0, supports-color@^5.5.0:
dependencies:
has-flag "^3.0.0"
+symbol-observable@^1.2.0:
+ version "1.2.0"
+ resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
+ integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
+
tapable@^1.0.0, tapable@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.0.tgz#0d076a172e3d9ba088fd2272b2668fb8d194b78c"
@@ -5875,7 +6203,7 @@ terser@^3.8.1:
source-map "~0.6.1"
source-map-support "~0.5.6"
-through2@^2.0.0:
+through2@^2.0.0, through2@~2.0.3:
version "2.0.5"
resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -5989,6 +6317,13 @@ [email protected]:
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
+type-check@~0.3.2:
+ version "0.3.2"
+ resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+ integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+ dependencies:
+ prelude-ls "~1.1.2"
+
version "0.1.1"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"
@@ -6010,9 +6345,10 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-typescript@^3.1.6:
- version "3.1.6"
- resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
+typescript@^3.2.2:
+ version "3.3.1"
+ resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.3.1.tgz#6de14e1db4b8a006ac535e482c8ba018c55f750b"
+ integrity sha512-cTmIDFW7O0IHbn1DPYjkiebHxwtCMU+eTy30ZtJNBPF9j2O1ITu5XH2YnBeVRKWHqF+3JQwWJv0Q0aUgX8W7IA==
version "3.4.9"
@@ -6197,6 +6533,11 @@ vary@~1.1.2:
resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+vlq@^0.2.2:
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
+ integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
+
version "0.0.4"
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
@@ -6399,6 +6740,11 @@ wide-align@^1.1.0:
dependencies:
string-width "^1.0.2 || 2"
+wordwrap@~1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
+ integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
+
worker-farm@^1.5.2:
version "1.6.0"
resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"