Permalink
Browse files

UI updates: Updated old customerA app (now called smart-building-v1) …

…and cleanup of component dependencies
  • Loading branch information...
richturner committed Feb 11, 2019
1 parent c279ca4 commit 44db9409341a2fab53b61ea95ffa544e1a026a6c
Showing with 1,818 additions and 480 deletions.
  1. +0 −9 ui/app/manager/index.html
  2. +0 −15 ui/app/realmA-new/build.gradle
  3. +0 −18 ui/app/realmA-new/index.html
  4. +0 −30 ui/app/realmA-new/package.json
  5. +0 −11 ui/app/realmA/.bowerrc
  6. +0 −16 ui/app/realmA/package.json
  7. 0 ui/app/{realmA → smart-building-v1}/build.gradle
  8. +8 −8 ui/app/{realmA → smart-building-v1}/index.html
  9. +11 −0 ui/app/smart-building-v1/package.json
  10. BIN ui/app/{realmA/smart-building → smart-building-v1/smart-home}/img/co2.png
  11. BIN ui/app/{realmA/smart-building → smart-building-v1/smart-home}/img/eye.png
  12. BIN ui/app/{realmA/smart-building → smart-building-v1/smart-home}/img/eye_large.png
  13. BIN ui/app/{realmA/smart-building → smart-building-v1/smart-home}/img/eye_large_active.png
  14. BIN ui/app/{realmA/smart-building → smart-building-v1/smart-home}/img/home_large_energy.png
  15. BIN ui/app/{realmA/smart-building → smart-building-v1/smart-home}/img/home_on.png
  16. BIN ui/app/{realmA/smart-building → smart-building-v1/smart-home}/img/humidity.png
  17. BIN ui/app/smart-building-v1/smart-home/img/lightbulb.png
  18. BIN ui/app/{realmA/smart-building → smart-building-v1/smart-home}/img/star.png
  19. BIN ui/app/{realmA/smart-building → smart-building-v1/smart-home}/img/temperature.png
  20. BIN ui/app/{realmA/smart-building → smart-building-v1/smart-home}/img/ventilation.png
  21. +85 −0 ui/app/smart-building-v1/smart-home/locales.json
  22. +59 −46 ui/app/{realmA/smart-building → smart-building-v1/smart-home}/smart-home-app.html
  23. +28 −0 ui/app/smart-building-v1/smart-home/smart-home-body.html
  24. +88 −68 ui/app/{realmA/smart-building → smart-building-v1/smart-home}/smart-home-climate.html
  25. +2 −2 ui/app/{realmA/smart-building → smart-building-v1/smart-home}/smart-home-component.html
  26. +123 −74 ...lmA/smart-building/smart-home-energy.html → smart-building-v1/smart-home/smart-home-control.html}
  27. +67 −0 ui/app/smart-building-v1/smart-home/smart-home-energy.html
  28. +91 −0 ui/app/smart-building-v1/smart-home/smart-home-footer.html
  29. +7 −20 ui/app/{realmA/smart-building → smart-building-v1/smart-home}/smart-home-header.html
  30. +246 −0 ui/app/smart-building-v1/smart-home/smart-home-scenes.html
  31. +7 −7 ui/app/{realmA/smart-building → smart-building-v1/smart-home}/smart-home-section.html
  32. +121 −0 ui/app/smart-building-v1/smart-home/smart-home-security.html
  33. +107 −88 ui/app/{realmA/smart-building → smart-building-v1/smart-home}/smart-home-settings.html
  34. +11 −11 ui/app/{realmA/smart-building → smart-building-v1/smart-home}/smart-home-smart.html
  35. +26 −0 ui/app/smart-building-v1/smart-home/smart-home-style.html
  36. +7 −7 ui/app/{realmA/smart-building → smart-building-v1/smart-home}/smart-home-temperature-select.html
  37. +1 −1 ui/component/core/package.json
  38. +1 −1 ui/component/model/package.json
  39. +3 −0 ui/component/or-bottom-navigation/README.md
  40. +8 −0 ui/component/or-bottom-navigation/README.txt
  41. +57 −0 ui/component/or-bottom-navigation/index.html
  42. +17 −0 ui/component/or-bottom-navigation/license.txt
  43. +20 −0 ui/component/or-bottom-navigation/package.json
  44. +205 −0 ui/component/or-bottom-navigation/src/or-bottom-navigation.ts
  45. +12 −0 ui/component/or-bottom-navigation/src/or-navigation-item.ts
  46. +10 −0 ui/component/or-bottom-navigation/tsconfig.json
  47. +2 −2 ui/component/or-header/package.json
  48. +13 −15 ui/component/or-header/src/index.ts
  49. +2 −4 ui/component/or-header/src/or-header-style.ts
  50. +1 −1 ui/component/or-map/package.json
  51. +1 −1 ui/component/rest/package.json
  52. +1 −1 ui/demo/demo-core/package.json
  53. +1 −1 ui/demo/demo-or-header/package.json
  54. +1 −1 ui/demo/demo-or-map/package.json
  55. +1 −1 ui/demo/demo-rest/package.json
  56. +367 −21 ui/yarn.lock

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -1,38 +1,38 @@
<!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">
<meta name="viewport" content="width=device-width, initial-scale=1.0,maximum-scale=1, user-scalable=no">
<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 */
or-app > * {
visibility: hidden;
}
/* Styles for the SmartBuilding app */
/* Styles for the SmartHome app */
html, body {
margin: 0;
min-height: 100vh;
overflow: hidden;
}
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>

@@ -0,0 +1,11 @@
{
"name": "customerA",
"version": "3.0.0",
"homepage": "http://openremote.com/",
"author": "OpenRemote Inc. <support@openremote.io>",
"description": "OpenRemote SmartHome Example App",
"main": "index.html",
"license": "AGPL-3.0-or-later",
"dependencies": {
}
}
Binary file not shown.
@@ -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"
}
}
Oops, something went wrong.

0 comments on commit 44db940

Please sign in to comment.