Skip to content

Supervisor add-on revamp and documentation addition #5528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
timmo001 wants to merge 4 commits into from
Closed

Supervisor add-on revamp and documentation addition #5528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ebf8d6c
Add Documentation to Addon Info
timmo001 Apr 12, 2020
9839870
Cleanup
timmo001 Apr 12, 2020
943549e
Setup add-on tab views
timmo001 Apr 12, 2020
7588f08
Fixes, changes
timmo001 Apr 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions hassio/src/addon-view/data/hassio-addon-sections.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import memoizeOne from "memoize-one";

import { HassioAddonDetails } from "../../../../src/data/hassio/addon";
import { PageNavigation } from "../../../../src/layouts/hass-tabs-subpage";

export const getAddonSections = memoizeOne(
(addon: HassioAddonDetails): PageNavigation[] => {
const sections: PageNavigation[] = [
{
component: "hassio-addon-info",
name: "Details",
path: `/hassio/addon/${addon.slug}/info`,
icon: "hassio:information-outline",
core: true,
},
];

if (addon && addon.version) {
if (addon.documentation) {
sections.push({
component: "hassio-addon-docs",
name: "Documentation",
path: `/hassio/addon/${addon.slug}/docs`,
icon: "hassio:book-outline",
core: true,
});
}
sections.push({
component: "hassio-addon-config",
name: "Configuration",
path: `/hassio/addon/${addon.slug}/config`,
icon: "hassio:settings-outline",
core: true,
});
if (addon.audio) {
sections.push({
component: "hassio-addon-audio",
name: "Audio",
path: `/hassio/addon/${addon.slug}/audio`,
icon: "hassio:speaker",
core: true,
});
}
if (addon.network) {
sections.push({
component: "hassio-addon-network",
name: "Network",
path: `/hassio/addon/${addon.slug}/network`,
icon: "hassio:lan",
core: true,
});
}
sections.push({
component: "hassio-addon-logs",
name: "Logs",
path: `/hassio/addon/${addon.slug}/logs`,
icon: "hassio:text",
core: true,
});
}

return sections;
}
);
141 changes: 89 additions & 52 deletions hassio/src/addon-view/hassio-addon-audio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
TemplateResult,
} from "lit-element";

import { HomeAssistant } from "../../../src/types";
import { HomeAssistant, Route } from "../../../src/types";
import {
HassioAddonDetails,
setHassioAddonOption,
Expand All @@ -28,11 +28,19 @@ import {
} from "../../../src/data/hassio/hardware";
import { hassioStyle } from "../resources/hassio-style";
import { haStyle } from "../../../src/resources/styles";
import { PageNavigation } from "../../../src/layouts/hass-tabs-subpage";

import "../../../src/layouts/hass-tabs-subpage";

@customElement("hassio-addon-audio")
class HassioAddonAudio extends LitElement {
@property() public hass!: HomeAssistant;
@property() public addon!: HassioAddonDetails;
@property() public narrow!: boolean;
@property() public isWide!: boolean;
@property() public showAdvanced!: boolean;
@property() public route!: Route;
@property() public sections!: PageNavigation[];
@property() private _error?: string;
@property() private _inputDevices?: HassioHardwareAudioDevice[];
@property() private _outputDevices?: HassioHardwareAudioDevice[];
Expand All @@ -41,57 +49,69 @@ class HassioAddonAudio extends LitElement {

protected render(): TemplateResult {
return html`
<paper-card heading="Audio">
<div class="card-content">
${this._error
? html`
<div class="errors">${this._error}</div>
`
: ""}

<paper-dropdown-menu
label="Input"
@iron-select=${this._setInputDevice}
>
<paper-listbox
slot="dropdown-content"
attr-for-selected="device"
.selected=${this._selectedInput}
>
${this._inputDevices &&
this._inputDevices.map((item) => {
return html`
<paper-item device=${item.device || ""}
>${item.name}</paper-item
>
`;
})}
</paper-listbox>
</paper-dropdown-menu>
<paper-dropdown-menu
label="Output"
@iron-select=${this._setOutputDevice}
>
<paper-listbox
slot="dropdown-content"
attr-for-selected="device"
.selected=${this._selectedOutput}
>
${this._outputDevices &&
this._outputDevices.map((item) => {
return html`
<paper-item device=${item.device || ""}
>${item.name}</paper-item
>
`;
})}
</paper-listbox>
</paper-dropdown-menu>
</div>
<div class="card-actions">
<mwc-button @click=${this._saveSettings}>Save</mwc-button>
<hass-tabs-subpage
.hass=${this.hass}
.narrow=${this.narrow}
.route=${this.route}
.tabs=${this.sections}
hassio
>
<div class="container">
<div class="content">
<paper-card heading="Audio">
<div class="card-content">
${this._error
? html`
<div class="errors">${this._error}</div>
`
: ""}

<paper-dropdown-menu
label="Input"
@iron-select=${this._setInputDevice}
>
<paper-listbox
slot="dropdown-content"
attr-for-selected="device"
.selected=${this._selectedInput}
>
${this._inputDevices &&
this._inputDevices.map((item) => {
return html`
<paper-item device=${item.device || ""}
>${item.name}</paper-item
>
`;
})}
</paper-listbox>
</paper-dropdown-menu>
<paper-dropdown-menu
label="Output"
@iron-select=${this._setOutputDevice}
>
<paper-listbox
slot="dropdown-content"
attr-for-selected="device"
.selected=${this._selectedOutput}
>
${this._outputDevices &&
this._outputDevices.map((item) => {
return html`
<paper-item device=${item.device || ""}
>${item.name}</paper-item
>
`;
})}
</paper-listbox>
</paper-dropdown-menu>
</div>
<div class="card-actions">
<mwc-button @click=${this._saveSettings}>Save</mwc-button>
</div>
</paper-card>
</div>
</div>
</paper-card>
</hass-tabs-subpage>
`;
}

Expand All @@ -100,7 +120,24 @@ class HassioAddonAudio extends LitElement {
haStyle,
hassioStyle,
css`
:host,
.container {
display: flex;
width: 100%;
justify-content: center;
}
.content {
display: flex;
width: 600px;
margin-bottom: 24px;
padding: 24px 0 32px;
flex-direction: column;
}
@media only screen and (max-width: 600px) {
.content {
max-width: 100%;
min-width: 100%;
}
}
paper-card,
paper-dropdown-menu {
display: block;
Expand Down
95 changes: 65 additions & 30 deletions hassio/src/addon-view/hassio-addon-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
query,
} from "lit-element";

import { HomeAssistant } from "../../../src/types";
import { HomeAssistant, Route } from "../../../src/types";
import {
HassioAddonDetails,
setHassioAddonOption,
Expand All @@ -26,11 +26,19 @@ import "../../../src/components/ha-yaml-editor";
// tslint:disable-next-line: no-duplicate-imports
import { HaYamlEditor } from "../../../src/components/ha-yaml-editor";
import { showConfirmationDialog } from "../../../src/dialogs/generic/show-dialog-box";
import { PageNavigation } from "../../../src/layouts/hass-tabs-subpage";

import "../../../src/layouts/hass-tabs-subpage";

@customElement("hassio-addon-config")
class HassioAddonConfig extends LitElement {
@property() public hass!: HomeAssistant;
@property() public addon!: HassioAddonDetails;
@property() public narrow!: boolean;
@property() public isWide!: boolean;
@property() public showAdvanced!: boolean;
@property() public route!: Route;
@property() public sections!: PageNavigation[];
@property() private _error?: string;
@property({ type: Boolean }) private _configHasChanged = false;

Expand All @@ -42,34 +50,46 @@ class HassioAddonConfig extends LitElement {
const valid = editor ? editor.isValid : true;

return html`
<paper-card heading="Config">
<div class="card-content">
<ha-yaml-editor
@value-changed=${this._configChanged}
></ha-yaml-editor>
${this._error
? html`
<div class="errors">${this._error}</div>
`
: ""}
${valid
? ""
: html`
<div class="errors">Invalid YAML</div>
`}
</div>
<div class="card-actions">
<mwc-button class="warning" @click=${this._resetTapped}>
Reset to defaults
</mwc-button>
<mwc-button
@click=${this._saveTapped}
.disabled=${!this._configHasChanged || !valid}
>
Save
</mwc-button>
<hass-tabs-subpage
.hass=${this.hass}
.narrow=${this.narrow}
.route=${this.route}
.tabs=${this.sections}
hassio
>
<div class="container">
<div class="content">
<paper-card heading="Config">
<div class="card-content">
<ha-yaml-editor
@value-changed=${this._configChanged}
></ha-yaml-editor>
${this._error
? html`
<div class="errors">${this._error}</div>
`
: ""}
${valid
? ""
: html`
<div class="errors">Invalid YAML</div>
`}
</div>
<div class="card-actions">
<mwc-button class="warning" @click=${this._resetTapped}>
Reset to defaults
</mwc-button>
<mwc-button
@click=${this._saveTapped}
.disabled=${!this._configHasChanged || !valid}
>
Save
</mwc-button>
</div>
</paper-card>
</div>
</div>
</paper-card>
</hass-tabs-subpage>
`;
}

Expand All @@ -78,8 +98,23 @@ class HassioAddonConfig extends LitElement {
haStyle,
hassioStyle,
css`
:host {
display: block;
.container {
display: flex;
width: 100%;
justify-content: center;
}
.content {
display: flex;
width: 600px;
margin-bottom: 24px;
padding: 24px 0 32px;
flex-direction: column;
}
@media only screen and (max-width: 600px) {
.content {
max-width: 100%;
min-width: 100%;
}
}
paper-card {
display: block;
Expand Down
Loading