Skip to content
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

Jump to bottom

Temporary remove mwc-linear-progress import due to conflict #269 #270

Merged
merged 1 commit into from
Jan 14, 2024
Merged

Temporary remove mwc-linear-progress import due to conflict #269 #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Please enable sensors at least `sensor.[mower_name]_rssi`, `sensor.[mower_name]_
- Check if sensors available #264 by @Barma-lej in https://github.com/Barma-lej/landroid-card/pull/265
- Remove unused function `renderListMenu` by @Barma-lej in https://github.com/Barma-lej/landroid-card/pull/266
- Refactoring `renderStatus` by @Barma-lej in https://github.com/Barma-lej/landroid-card/pull/267
- Publish release 1.0.1 by @Barma-lej in https://github.com/Barma-lej/landroid-card/pull/268

**Full Changelog**: https://github.com/Barma-lej/landroid-card/compare/1.0.0...1.0.1

Expand Down
110 changes: 1 addition & 109 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "landroid-card",
"version": "1.0.0b1",
"version": "1.0.2",
"description": "Landroid lawnmower card for Home Assistant Lovelace UI",
"main": "dist/landroid-card.js",
"scripts": {
Expand Down Expand Up @@ -63,8 +63,7 @@
"rollup-plugin-postcss": "^4.0.2",
"rollup-plugin-postcss-lit": "^2.1.0",
"rollup-plugin-serve": "^3.0.0",
"semantic-release": "^22.0.12",
"@material/mwc-linear-progress": "^0.27.0"
"semantic-release": "^22.0.12"
},
"overrides": {
"semver": "~7.5.4"
Expand Down
36 changes: 18 additions & 18 deletions src/landroid-card.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import '@material/mwc-linear-progress';
// import '@material/mwc-linear-progress';
import { LitElement, html, nothing } from 'lit';
import {
fireEvent,
Expand Down Expand Up @@ -1131,9 +1131,9 @@ class LandroidCard extends LitElement {
return nothing;
}

const dailyProgress = this.getEntityObject(
consts.SENSOR_DAILY_PROGRESS_SUFFIX,
);
// const dailyProgress = this.getEntityObject(
// consts.SENSOR_DAILY_PROGRESS_SUFFIX,
// );

return html`
<div class="toolbar">
Expand All @@ -1146,22 +1146,22 @@ class LandroidCard extends LitElement {
>
<ha-icon icon="mdi:tools"></ha-icon>
</ha-icon-button>
${dailyProgress
? html`
<mwc-linear-progress
title="${dailyProgress.attributes
.friendly_name}: ${this.hass.formatEntityState(
dailyProgress,
)}"
aria-hidden="true"
role="progressbar"
progress="${dailyProgress.state / 100 || 0}"
>
</mwc-linear-progress>
`
: ''}
</div>
`;
// ${ dailyProgress
// ? html`
// <mwc-linear-progress
// title="${dailyProgress.attributes
// .friendly_name}: ${this.hass.formatEntityState(
// dailyProgress,
// )}"
// aria-hidden="true"
// role="progressbar"
// progress="${dailyProgress.state / 100 || 0}"
// >
// </mwc-linear-progress>
// `
// : ''}
}

render() {
Expand Down