From 115be859b65acd80aee4b00e1a8865f2e8da3ecb Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Tue, 3 Feb 2015 23:16:53 -0800 Subject: [PATCH] Frontend now build on top of home-assistant-js --- .gitmodules | 3 + homeassistant/components/frontend/__init__.py | 4 +- homeassistant/components/frontend/version.py | 2 +- .../frontend/www_static/frontend.html | 72 ++- .../frontend/www_static/polymer/bower.json | 1 - .../cards/state-card-configurator.html | 1 - .../polymer/cards/state-card-content.html | 2 +- .../polymer/cards/state-card-display.html | 1 - .../polymer/cards/state-card-thermostat.html | 1 - .../polymer/cards/state-card-toggle.html | 23 +- .../www_static/polymer/cards/state-card.html | 2 +- .../polymer/components/entity-list.html | 13 +- .../polymer/components/events-list.html | 14 +- .../polymer/components/recent-states.html | 13 +- .../polymer/components/services-list.html | 14 +- .../polymer/components/state-cards.html | 22 +- .../polymer/components/state-timeline.html | 13 +- .../polymer/dialogs/event-fire-dialog.html | 4 +- .../polymer/dialogs/more-info-dialog.html | 8 +- .../polymer/dialogs/service-call-dialog.html | 10 +- .../polymer/dialogs/state-set-dialog.html | 4 +- .../polymer/home-assistant-api.html | 554 +++--------------- .../www_static/polymer/home-assistant-js | 1 + .../www_static/polymer/home-assistant.html | 48 ++ .../{ => layouts}/home-assistant-main.html | 83 +-- .../polymer/layouts/login-form.html | 129 ++++ .../polymer/layouts/partial-states.html | 38 ++ .../more-infos/more-info-configurator.html | 13 +- .../polymer/more-infos/more-info-content.html | 3 +- .../polymer/more-infos/more-info-group.html | 6 +- .../polymer/more-infos/more-info-light.html | 13 +- .../polymer/more-infos/more-info-sun.html | 4 +- .../www_static/polymer/splash-login.html | 157 ----- scripts/build_frontend | 2 +- scripts/build_js | 9 + scripts/dev_js | 9 + 36 files changed, 467 insertions(+), 829 deletions(-) create mode 160000 homeassistant/components/frontend/www_static/polymer/home-assistant-js create mode 100644 homeassistant/components/frontend/www_static/polymer/home-assistant.html rename homeassistant/components/frontend/www_static/polymer/{ => layouts}/home-assistant-main.html (51%) create mode 100644 homeassistant/components/frontend/www_static/polymer/layouts/login-form.html create mode 100644 homeassistant/components/frontend/www_static/polymer/layouts/partial-states.html delete mode 100644 homeassistant/components/frontend/www_static/polymer/splash-login.html create mode 100755 scripts/build_js create mode 100755 scripts/dev_js diff --git a/.gitmodules b/.gitmodules index b9cf022a8f4..6e49e76698a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,6 @@ [submodule "homeassistant/external/noop"] path = homeassistant/external/noop url = https://github.com/balloob/noop.git +[submodule "homeassistant/components/frontend/www_static/polymer/home-assistant-js"] + path = homeassistant/components/frontend/www_static/polymer/home-assistant-js + url = https://github.com/balloob/home-assistant-js.git diff --git a/homeassistant/components/frontend/__init__.py b/homeassistant/components/frontend/__init__.py index 4829efeaf09..f00fb38809b 100644 --- a/homeassistant/components/frontend/__init__.py +++ b/homeassistant/components/frontend/__init__.py @@ -58,7 +58,7 @@ def _handle_get_root(handler, path_match, data): handler.end_headers() if handler.server.development: - app_url = "polymer/splash-login.html" + app_url = "polymer/home-assistant.html" else: app_url = "frontend-{}.html".format(version.VERSION) @@ -83,7 +83,7 @@ def _handle_get_root(handler, path_match, data): "" "" - "" + "" "").format(app_url, auth)) diff --git a/homeassistant/components/frontend/version.py b/homeassistant/components/frontend/version.py index 007e0b48108..dbceb89dd58 100644 --- a/homeassistant/components/frontend/version.py +++ b/homeassistant/components/frontend/version.py @@ -1,2 +1,2 @@ """ DO NOT MODIFY. Auto-generated by build_frontend script """ -VERSION = "954620894f13782f17ae7443f0df4ffc" +VERSION = "dae175210dab23f9c383a593d8e97d9b" diff --git a/homeassistant/components/frontend/www_static/frontend.html b/homeassistant/components/frontend/www_static/frontend.html index fd547eae3e8..6bed4ce121a 100644 --- a/homeassistant/components/frontend/www_static/frontend.html +++ b/homeassistant/components/frontend/www_static/frontend.html @@ -1,9 +1,10 @@ - - + + + - - - - + + - + diff --git a/homeassistant/components/frontend/www_static/polymer/bower.json b/homeassistant/components/frontend/www_static/polymer/bower.json index c4cca5e9c02..87f67773985 100644 --- a/homeassistant/components/frontend/www_static/polymer/bower.json +++ b/homeassistant/components/frontend/www_static/polymer/bower.json @@ -34,7 +34,6 @@ "paper-dropdown": "polymer/paper-dropdown#~0.5.4", "paper-item": "polymer/paper-item#~0.5.4", "paper-slider": "polymer/paper-slider#~0.5.4", - "moment": "~2.8.4", "color-picker-element": "~0.0.2", "google-apis": "GoogleWebComponents/google-apis#~0.4.2" } diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card-configurator.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card-configurator.html index 19d0f6340c1..6cfd062ba8d 100644 --- a/homeassistant/components/frontend/www_static/polymer/cards/state-card-configurator.html +++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card-configurator.html @@ -1,4 +1,3 @@ - diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card-content.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card-content.html index c27d5f07e8b..b54ada9883a 100644 --- a/homeassistant/components/frontend/www_static/polymer/cards/state-card-content.html +++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card-content.html @@ -5,7 +5,7 @@ - +