From 468eb7f0cf82b7ecf522f988a93647847009d803 Mon Sep 17 00:00:00 2001 From: Dermot Duffy Date: Sat, 18 Jun 2022 16:00:17 -0700 Subject: [PATCH 1/2] Convert Frigate card devcontainer to storage mode --- .devcontainer/config/.storage/lovelace | 104 ++++++++++++++++++ .../config/.storage/lovelace_resources | 14 +++ .devcontainer/config/configuration.yaml | 28 ----- .devcontainer/config/ui-lovelace.yaml | 15 --- .devcontainer/docker-compose.yml | 4 +- 5 files changed, 120 insertions(+), 45 deletions(-) create mode 100644 .devcontainer/config/.storage/lovelace create mode 100644 .devcontainer/config/.storage/lovelace_resources delete mode 100644 .devcontainer/config/configuration.yaml delete mode 100644 .devcontainer/config/ui-lovelace.yaml diff --git a/.devcontainer/config/.storage/lovelace b/.devcontainer/config/.storage/lovelace new file mode 100644 index 00000000..604e5a64 --- /dev/null +++ b/.devcontainer/config/.storage/lovelace @@ -0,0 +1,104 @@ +{ + "version": 1, + "minor_version": 1, + "key": "lovelace", + "data": { + "config": { + "title": "Frigate Card", + "views": [ + { + "theme": "Backend-selected", + "title": "Basic", + "path": "basic", + "badges": [], + "cards": [ + { + "type": "custom:frigate-card", + "name": "Frigate Card with Frigate Camera", + "cameras": [ + { + "camera_entity": "camera.big_buck_bunny", + "live_provider": "frigate-jsmpeg", + "id": "big_buck_bunny_jsmpeg" + }, + { + "camera_entity": "camera.big_buck_bunny", + "live_provider": "ha", + "id": "big_buck_bunny_ha" + }, + { + "camera_entity": "camera.demo_camera" + } + ] + } + ] + }, + { + "theme": "Backend-selected", + "title": "Menu", + "path": "menu", + "badges": [], + "cards": [ + { + "type": "custom:frigate-card", + "cameras": [ + { + "camera_entity": "camera.demo_camera", + "title": "Default" + } + ] + }, + { + "type": "custom:frigate-card", + "cameras": [ + { + "camera_entity": "camera.demo_camera", + "title": "Hidden" + } + ], + "menu": { + "style": "hidden" + } + }, + { + "type": "custom:frigate-card", + "cameras": [ + { + "camera_entity": "camera.demo_camera", + "title": "Overlay" + } + ], + "menu": { + "style": "overlay" + } + }, + { + "type": "custom:frigate-card", + "cameras": [ + { + "camera_entity": "camera.demo_camera", + "title": "Hover" + } + ], + "menu": { + "style": "hover" + } + }, + { + "type": "custom:frigate-card", + "cameras": [ + { + "camera_entity": "camera.demo_camera", + "title": "Outside" + } + ], + "menu": { + "style": "outside" + } + } + ] + } + ] + } + } +} diff --git a/.devcontainer/config/.storage/lovelace_resources b/.devcontainer/config/.storage/lovelace_resources new file mode 100644 index 00000000..f4b6b72e --- /dev/null +++ b/.devcontainer/config/.storage/lovelace_resources @@ -0,0 +1,14 @@ +{ + "version": 1, + "minor_version": 1, + "key": "lovelace_resources", + "data": { + "items": [ + { + "url": "http://localhost:41000/frigate-hass-card.js", + "type": "module", + "id": "00c459541bac4290af01c51bf9c06ba1" + } + ] + } +} diff --git a/.devcontainer/config/configuration.yaml b/.devcontainer/config/configuration.yaml deleted file mode 100644 index 0f07e864..00000000 --- a/.devcontainer/config/configuration.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -default_config: - -logger: - default: error - logs: - custom_components.frigate: debug - homeassistant.components.mqtt: error - -downloader: - download_dir: www - -homeassistant: - name: Home - latitude: 0 - longitude: 0 - elevation: 0 - unit_system: metric - currency: USD - time_zone: 'America/Los_Angeles' - -demo: - -lovelace: - mode: yaml - resources: - - url: http://localhost:41000/frigate-hass-card.js - type: module diff --git a/.devcontainer/config/ui-lovelace.yaml b/.devcontainer/config/ui-lovelace.yaml deleted file mode 100644 index d2134664..00000000 --- a/.devcontainer/config/ui-lovelace.yaml +++ /dev/null @@ -1,15 +0,0 @@ -views: - - cards: - - type: custom:frigate-card - name: Frigate Card with Frigate Camera - cameras: - - camera_entity: camera.demo - live_provider: frigate-jsmpeg - id: camera_demo_jsmpeg - - camera_entity: camera.demo - live_provider: ha - id: camera_demo_ha - - type: custom:frigate-card - name: Frigate Card with non-Frigate Camera - cameras: - - camera_entity: camera.demo_camera diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 5c19d6e1..253f7639 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -15,8 +15,8 @@ services: file: ./frigate-hass-integration/docker-compose.yml service: hass volumes: - - ./config/ui-lovelace.yaml:/config/ui-lovelace.yaml:ro - - ./config/configuration.yaml:/config/configuration.yaml:ro + - ./config/.storage/lovelace_resources:/config/preconfig/.storage/lovelace_resources + - ./config/.storage/lovelace:/config/preconfig/.storage/lovelace frigate: extends: file: ./frigate-hass-integration/docker-compose.yml From 6bdf8be208c05cc8fc0eb5646295bb3a4d68a4cf Mon Sep 17 00:00:00 2001 From: Dermot Duffy Date: Sun, 19 Jun 2022 00:11:03 +0000 Subject: [PATCH 2/2] Use the latest preconfig script --- .devcontainer/docker-compose.yml | 3 +-- .devcontainer/frigate-hass-integration | 2 +- .devcontainer/{config => preconfig}/.storage/lovelace | 0 .../{config => preconfig}/.storage/lovelace_resources | 0 4 files changed, 2 insertions(+), 3 deletions(-) rename .devcontainer/{config => preconfig}/.storage/lovelace (100%) rename .devcontainer/{config => preconfig}/.storage/lovelace_resources (100%) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 253f7639..985cb4fb 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -15,8 +15,7 @@ services: file: ./frigate-hass-integration/docker-compose.yml service: hass volumes: - - ./config/.storage/lovelace_resources:/config/preconfig/.storage/lovelace_resources - - ./config/.storage/lovelace:/config/preconfig/.storage/lovelace + - ./preconfig:/preconfig.d/02-card:ro frigate: extends: file: ./frigate-hass-integration/docker-compose.yml diff --git a/.devcontainer/frigate-hass-integration b/.devcontainer/frigate-hass-integration index 0218f561..62924076 160000 --- a/.devcontainer/frigate-hass-integration +++ b/.devcontainer/frigate-hass-integration @@ -1 +1 @@ -Subproject commit 0218f56165ebc6e28cbce4a2e10fad638039cf52 +Subproject commit 629240760133ef295b7f27524c6df7411696f3fb diff --git a/.devcontainer/config/.storage/lovelace b/.devcontainer/preconfig/.storage/lovelace similarity index 100% rename from .devcontainer/config/.storage/lovelace rename to .devcontainer/preconfig/.storage/lovelace diff --git a/.devcontainer/config/.storage/lovelace_resources b/.devcontainer/preconfig/.storage/lovelace_resources similarity index 100% rename from .devcontainer/config/.storage/lovelace_resources rename to .devcontainer/preconfig/.storage/lovelace_resources