Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nielsfaber/alarmo
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.7.4
Choose a base ref
...
head repository: nielsfaber/alarmo
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Loading
Showing with 14,507 additions and 6,014 deletions.
  1. +55 −0 .github/ISSUE_TEMPLATE/bug-report.yml
  2. +0 −30 .github/ISSUE_TEMPLATE/bug_report.md
  3. +2 −5 .github/workflows/build.yaml
  4. +4 −4 .github/workflows/stale.yaml
  5. +156 −81 README.md
  6. +84 −70 custom_components/alarmo/__init__.py
  7. +497 −315 custom_components/alarmo/alarm_control_panel.py
  8. +204 −67 custom_components/alarmo/automations.py
  9. +2 −3 custom_components/alarmo/card.py
  10. +99 −60 custom_components/alarmo/const.py
  11. +66 −0 custom_components/alarmo/event.py
  12. +1 −0 custom_components/alarmo/frontend/.npmrc
  13. +8 −5 custom_components/alarmo/frontend/.prettierrc
  14. +2,029 −1,610 custom_components/alarmo/frontend/dist/alarm-panel.js
  15. +77 −49 custom_components/alarmo/frontend/localize/languages/ca.json
  16. +569 −0 custom_components/alarmo/frontend/localize/languages/cs.json
  17. +569 −0 custom_components/alarmo/frontend/localize/languages/da.json
  18. +569 −0 custom_components/alarmo/frontend/localize/languages/de.json
  19. +85 −57 custom_components/alarmo/frontend/localize/languages/en.json
  20. +108 −80 custom_components/alarmo/frontend/localize/languages/es.json
  21. +75 −47 custom_components/alarmo/frontend/localize/languages/et.json
  22. +140 −112 custom_components/alarmo/frontend/localize/languages/fr.json
  23. +189 −161 custom_components/alarmo/frontend/localize/languages/it.json
  24. +85 −57 custom_components/alarmo/frontend/localize/languages/nl.json
  25. +569 −0 custom_components/alarmo/frontend/localize/languages/ru.json
  26. +569 −0 custom_components/alarmo/frontend/localize/languages/sk.json
  27. +569 −0 custom_components/alarmo/frontend/localize/languages/sv.json
  28. +569 −0 custom_components/alarmo/frontend/localize/languages/vi.json
  29. +569 −0 custom_components/alarmo/frontend/localize/languages/zh-Hans.json
  30. +569 −0 custom_components/alarmo/frontend/localize/languages/zh-Hant.json
  31. +35 −11 custom_components/alarmo/frontend/localize/localize.ts
  32. +6 −4 custom_components/alarmo/frontend/package.json
  33. +70 −129 custom_components/alarmo/frontend/src/alarm-panel.ts
  34. +24 −0 custom_components/alarmo/frontend/src/common/modes.ts
  35. +79 −0 custom_components/alarmo/frontend/src/common/navigation.ts
  36. +65 −0 custom_components/alarmo/frontend/src/components/alarmo-chip-set.ts
  37. +214 −0 custom_components/alarmo/frontend/src/components/alarmo-chip.ts
  38. +0 −142 custom_components/alarmo/frontend/src/components/alarmo-chips.ts
  39. +17 −32 ...omponents/alarmo/frontend/src/components/{collapsible-section.ts → alarmo-collapsible-section.ts}
  40. +178 −0 custom_components/alarmo/frontend/src/components/alarmo-collapsible.ts
  41. +0 −148 custom_components/alarmo/frontend/src/components/alarmo-multi-entity-select.ts
  42. +0 −130 custom_components/alarmo/frontend/src/components/alarmo-multi-select.ts
  43. +265 −79 custom_components/alarmo/frontend/src/components/alarmo-select.ts
  44. +33 −30 custom_components/alarmo/frontend/src/components/alarmo-selector.ts
  45. +5 −4 custom_components/alarmo/frontend/src/components/{settings-row.ts → alarmo-settings-row.ts}
  46. +303 −28 custom_components/alarmo/frontend/src/components/alarmo-table.ts
  47. +54 −23 custom_components/alarmo/frontend/src/components/{time-slider.ts → alarmo-time-slider.ts}
  48. +26 −14 custom_components/alarmo/frontend/src/const.ts
  49. +350 −193 custom_components/alarmo/frontend/src/data/actions.ts
  50. +92 −21 custom_components/alarmo/frontend/src/data/sensors.ts
  51. +2 −2 custom_components/alarmo/frontend/src/data/websockets.ts
  52. +7 −9 custom_components/alarmo/frontend/src/dialogs/confirm-delete-dialog.ts
  53. +40 −33 custom_components/alarmo/frontend/src/dialogs/create-area-dialog.ts
  54. +108 −73 custom_components/alarmo/frontend/src/dialogs/create-sensor-group-dialog.ts
  55. +13 −11 custom_components/alarmo/frontend/src/dialogs/edit-master-dialog.ts
  56. +6 −6 custom_components/alarmo/frontend/src/dialogs/error-dialog.ts
  57. +19 −27 custom_components/alarmo/frontend/src/dialogs/manage-sensor-groups-dialog.ts
  58. +63 −0 custom_components/alarmo/frontend/src/fire_event.ts
  59. +150 −31 custom_components/alarmo/frontend/src/helpers.ts
  60. +37 −0 custom_components/alarmo/frontend/src/load-ha-elements.ts
  61. +0 −30 custom_components/alarmo/frontend/src/load-ha-form.js
  62. +17 −66 custom_components/alarmo/frontend/src/styles.ts
  63. +1 −1 custom_components/alarmo/frontend/src/subscribe-mixin.ts
  64. +69 −12 custom_components/alarmo/frontend/src/types.ts
  65. +256 −196 custom_components/alarmo/frontend/src/views/actions/automation-editor-card.ts
  66. +547 −248 custom_components/alarmo/frontend/src/views/actions/notification-editor-card.ts
  67. +119 −164 custom_components/alarmo/frontend/src/views/actions/view-actions.ts
  68. +211 −175 custom_components/alarmo/frontend/src/views/codes/user-editor-card.ts
  69. +126 −92 custom_components/alarmo/frontend/src/views/codes/view-codes.ts
  70. +220 −133 custom_components/alarmo/frontend/src/views/general/alarm-mode-card.ts
  71. +19 −13 custom_components/alarmo/frontend/src/views/general/area-config-card.ts
  72. +71 −73 custom_components/alarmo/frontend/src/views/general/mqtt-config-card.ts
  73. +75 −82 custom_components/alarmo/frontend/src/views/general/view-general.ts
  74. +108 −93 custom_components/alarmo/frontend/src/views/sensors/add-sensors-card.ts
  75. +338 −198 custom_components/alarmo/frontend/src/views/sensors/sensor-editor-card.ts
  76. +187 −113 custom_components/alarmo/frontend/src/views/sensors/sensors-overview-card.ts
  77. +27 −18 custom_components/alarmo/frontend/src/views/sensors/view-sensors.ts
  78. +2 −11 custom_components/alarmo/helpers.py
  79. +8 −0 custom_components/alarmo/icons.json
  80. +9 −9 custom_components/alarmo/manifest.json
  81. +23 −11 custom_components/alarmo/mqtt.py
  82. +7 −3 custom_components/alarmo/panel.py
  83. +221 −139 custom_components/alarmo/sensors.py
  84. +19 −21 custom_components/alarmo/services.yaml
  85. +81 −62 custom_components/alarmo/store.py
  86. +75 −0 custom_components/alarmo/translations/de.json
  87. +75 −0 custom_components/alarmo/translations/en.json
  88. +75 −0 custom_components/alarmo/translations/es.json
  89. +75 −0 custom_components/alarmo/translations/fr.json
  90. +95 −50 custom_components/alarmo/websockets.py
  91. +3 −8 hacs.json
55 changes: 55 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Bug report
description: Create a report to help improve Alarmo
labels: bug
body:
- type: markdown
attributes:
value: |
Thank you for taking the effort to fill in all relevant details.
Please make sure to include sufficient information for me to reproduce the issue, otherwise I can't help you.
- type: checkboxes
id: checklist
attributes:
label: Checklist
description: "Before opening a bug report, please check the following:"
options:
- label: I am using the latest version of Alarmo (latest version can be found [here](https://github.com/nielsfaber/alarmo/releases/latest))
required: true
- label: I checked for similar existing requests (both open and closed) before posting.
required: true
- type: input
id: alarmo-version
attributes:
label: Alarmo Version
description: "Which version of Alarmo are you running? You can see it in the top-right corner in the Alarmo configuration panel in HA."
placeholder: "v1.0.0"
validations:
required: true
- type: input
id: hass-version
attributes:
label: HA Version
description: "Which version of HA are you running? You can see under Configuration -> Settings -> Info."
placeholder: "2021.1"
validations:
required: true
- type: textarea
id: bug-description
attributes:
label: Bug description
description: What happened and what did you expect instead?
validations:
required: true
- type: textarea
id: steps
attributes:
label: Steps to reproduce
description: Which steps did you take to see this bug?
validations:
required: true
- type: textarea
id: logs
attributes:
label: Relevant log output
description: If applicable, provide relevant log output. No need for backticks here.
render: shell
30 changes: 0 additions & 30 deletions .github/ISSUE_TEMPLATE/bug_report.md

This file was deleted.

7 changes: 2 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


on:
release:
types: [published]
@@ -21,9 +19,8 @@ jobs:
cd custom_components/alarmo/
zip ../../alarmo.zip ./* frontend/dist/* -x '.*'
- uses: gacts/upload-to-release@master
- uses: JasonEtco/upload-to-release@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
file: ./alarmo.zip
type: application/zip
args: ./alarmo.zip application/zip
8 changes: 4 additions & 4 deletions .github/workflows/stale.yaml
Original file line number Diff line number Diff line change
@@ -11,9 +11,9 @@ jobs:
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days'
stale-pr-message: 'This pull request is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days'
days-before-stale: 30
days-before-close: 7
stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 14 days'
stale-pr-message: 'This pull request is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 14 days'
days-before-stale: 60
days-before-close: 14
operations-per-run: 500
exempt-issue-labels: 'will pick this up at some point'
Loading