Revert lovelace as default (#2237)

* Revert lovelace as default

* Better text
This commit is contained in:
Paulus Schoutsen 2018-12-10 08:57:51 +01:00 committed by GitHub
parent 4f0a965573
commit f9182e5453
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 8 deletions

View File

@ -7,6 +7,9 @@
/** Icon to use when no icon specified for domain. */ /** Icon to use when no icon specified for domain. */
export const DEFAULT_DOMAIN_ICON = "hass:bookmark"; export const DEFAULT_DOMAIN_ICON = "hass:bookmark";
/** Panel to show when no panel is picked. */
export const DEFAULT_PANEL = "states";
/** Domains that have a state card. */ /** Domains that have a state card. */
export const DOMAINS_WITH_CARD = [ export const DOMAINS_WITH_CARD = [
"climate", "climate",

View File

@ -10,6 +10,7 @@ import "../home-assistant-main";
import "../ha-init-page"; import "../ha-init-page";
import "../../resources/ha-style"; import "../../resources/ha-style";
import registerServiceWorker from "../../util/register-service-worker"; import registerServiceWorker from "../../util/register-service-worker";
import { DEFAULT_PANEL } from "../../common/const";
import HassBaseMixin from "./hass-base-mixin"; import HassBaseMixin from "./hass-base-mixin";
import AuthMixin from "./auth-mixin"; import AuthMixin from "./auth-mixin";
@ -94,7 +95,7 @@ class HomeAssistant extends ext(PolymerElement, [
} }
computePanelUrl(routeData) { computePanelUrl(routeData) {
return (routeData && routeData.panel) || "lovelace"; return (routeData && routeData.panel) || DEFAULT_PANEL;
} }
panelUrlChanged(newPanelUrl) { panelUrlChanged(newPanelUrl) {

View File

@ -11,6 +11,7 @@ import "./partial-panel-resolver";
import EventsMixin from "../mixins/events-mixin"; import EventsMixin from "../mixins/events-mixin";
import NavigateMixin from "../mixins/navigate-mixin"; import NavigateMixin from "../mixins/navigate-mixin";
import { computeRTL } from "../common/util/compute_rtl"; import { computeRTL } from "../common/util/compute_rtl";
import { DEFAULT_PANEL } from "../common/const";
import(/* webpackChunkName: "ha-sidebar" */ "../components/ha-sidebar"); import(/* webpackChunkName: "ha-sidebar" */ "../components/ha-sidebar");
import(/* webpackChunkName: "voice-command-dialog" */ "../dialogs/ha-voice-command-dialog"); import(/* webpackChunkName: "voice-command-dialog" */ "../dialogs/ha-voice-command-dialog");
@ -98,7 +99,7 @@ class HomeAssistantMain extends NavigateMixin(EventsMixin(PolymerElement)) {
ready() { ready() {
super.ready(); super.ready();
this._defaultPage = localStorage.defaultPage || "lovelace"; this._defaultPage = localStorage.defaultPage || DEFAULT_PANEL;
this.addEventListener("hass-open-menu", () => this.handleOpenMenu()); this.addEventListener("hass-open-menu", () => this.handleOpenMenu());
this.addEventListener("hass-close-menu", () => this.handleCloseMenu()); this.addEventListener("hass-close-menu", () => this.handleCloseMenu());
this.addEventListener("hass-start-voice", (ev) => this.addEventListener("hass-start-voice", (ev) =>
@ -135,7 +136,7 @@ class HomeAssistantMain extends NavigateMixin(EventsMixin(PolymerElement)) {
connectedCallback() { connectedCallback() {
super.connectedCallback(); super.connectedCallback();
if (document.location.pathname === "/") { if (document.location.pathname === "/") {
this.navigate(`/${localStorage.defaultPage || "lovelace"}`, true); this.navigate(`/${localStorage.defaultPage || DEFAULT_PANEL}`, true);
} }
} }

View File

@ -20,6 +20,7 @@ import formatTime from "../../common/datetime/format_time";
import EventsMixin from "../../mixins/events-mixin"; import EventsMixin from "../../mixins/events-mixin";
import LocalizeMixin from "../../mixins/localize-mixin"; import LocalizeMixin from "../../mixins/localize-mixin";
const OPT_IN_PANEL = "lovelace";
let registeredDialog = false; let registeredDialog = false;
class HaPanelDevInfo extends EventsMixin(LocalizeMixin(PolymerElement)) { class HaPanelDevInfo extends EventsMixin(LocalizeMixin(PolymerElement)) {
@ -164,7 +165,7 @@ class HaPanelDevInfo extends EventsMixin(LocalizeMixin(PolymerElement)) {
</template> </template>
</p> </p>
<p> <p>
<a href='/states'>Go back to the old states page</a> <a href='/lovelace'>Try out the new Lovelace UI</a>
<div id="love" style="cursor:pointer;" on-click="_toggleDefaultPage">[[_defaultPageText()]]</div <div id="love" style="cursor:pointer;" on-click="_toggleDefaultPage">[[_defaultPageText()]]</div
</p> </p>
</div> </div>
@ -364,15 +365,15 @@ class HaPanelDevInfo extends EventsMixin(LocalizeMixin(PolymerElement)) {
_defaultPageText() { _defaultPageText() {
return `>> ${ return `>> ${
localStorage.defaultPage === "states" ? "Remove" : "Set" localStorage.defaultPage === OPT_IN_PANEL ? "Remove" : "Set"
} the old states as default page on this device <<`; } ${OPT_IN_PANEL} as default page on this device <<`;
} }
_toggleDefaultPage() { _toggleDefaultPage() {
if (localStorage.defaultPage === "states") { if (localStorage.defaultPage === OPT_IN_PANEL) {
delete localStorage.defaultPage; delete localStorage.defaultPage;
} else { } else {
localStorage.defaultPage = "states"; localStorage.defaultPage = OPT_IN_PANEL;
} }
this.$.love.innerText = this._defaultPageText(); this.$.love.innerText = this._defaultPageText();
} }