diff --git a/.github/data/last_commit.txt b/.github/data/last_commit.txt index d00491fd7e5b..890f9ad29ad8 100644 --- a/.github/data/last_commit.txt +++ b/.github/data/last_commit.txt @@ -1 +1 @@ -1 +744cda39747b834277796fb4cdcb5d0f3f3d88d8 diff --git a/.github/workflows/design_preview.yaml b/.github/workflows/design_preview.yaml index 96b6cf442288..13ffb3c0eb49 100644 --- a/.github/workflows/design_preview.yaml +++ b/.github/workflows/design_preview.yaml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest # Skip running on forks since it won't have access to secrets # Skip running PRs without 'needs design preview' label - if: github.repository == 'home-assistant/frontend' && contains(github.event.pull_request.labels.*.name, 'needs design preview') + if: github.repository == 'my-smart-homes/cloned-frontend-ha' && contains(github.event.pull_request.labels.*.name, 'needs design preview') steps: - name: Check out files from GitHub uses: actions/checkout@v4.2.2 diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 7a4ee65b1b57..6b9081a8d826 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -36,10 +36,10 @@ jobs: - name: Install dependencies run: yarn install - - name: Download translations - run: ./script/translations_download - env: - LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }} + # - name: Download translations + # run: ./script/translations_download + # env: + # LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }} - name: Bump version run: script/version_bump.js nightly @@ -50,22 +50,22 @@ jobs: yarn install export SKIP_FETCH_NIGHTLY_TRANSLATIONS=1 script/build_frontend - rm -rf dist home_assistant_frontend.egg-info + rm -rf dist my_smart_homes_frontend.egg-info python3 -m build - - name: Archive translations - run: tar -czvf translations.tar.gz translations + # - name: Archive translations + # run: tar -czvf translations.tar.gz translations - name: Upload build artifacts uses: actions/upload-artifact@v4.4.3 with: name: wheels - path: dist/home_assistant_frontend*.whl + path: dist/my_smart_homes_frontend*.whl if-no-files-found: error - - name: Upload translations - uses: actions/upload-artifact@v4.4.3 - with: - name: translations - path: translations.tar.gz - if-no-files-found: error + # - name: Upload translations + # uses: actions/upload-artifact@v4.4.0 + # with: + # name: translations + # path: translations.tar.gz + # if-no-files-found: error diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 2eaf2b6a26f6..9a5e5f316e87 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -42,10 +42,10 @@ jobs: - name: Install dependencies run: yarn install - - name: Download Translations - run: ./script/translations_download - env: - LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }} + # - name: Download Translations + # run: ./script/translations_download + # env: + # LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }} - name: Build and release package run: | python3 -m pip install twine build @@ -71,13 +71,13 @@ jobs: # Sleep to give pypi time to populate the new version across mirrors sleep 240 version=$(echo "${{ github.ref }}" | awk -F"/" '{print $NF}' ) - echo "home-assistant-frontend==$version" > ./requirements.txt + echo "my-home-assistant-frontend==$version" > ./requirements.txt - - name: Build wheels - uses: home-assistant/wheels@2024.07.1 - with: - abi: cp312 - tag: musllinux_1_2 - arch: amd64 - wheels-key: ${{ secrets.WHEELS_KEY }} - requirements: "requirements.txt" + # - name: Build wheels + # uses: home-assistant/wheels@2024.07.1 + # with: + # abi: cp312 + # tag: musllinux_1_2 + # arch: amd64 + # wheels-key: ${{ secrets.WHEELS_KEY }} + # requirements: "requirements.txt" diff --git a/demo/src/configs/arsaboo/lovelace.ts b/demo/src/configs/arsaboo/lovelace.ts index 0c50123acef4..c51fd5b249a1 100644 --- a/demo/src/configs/arsaboo/lovelace.ts +++ b/demo/src/configs/arsaboo/lovelace.ts @@ -1,7 +1,7 @@ import type { DemoConfig } from "../types"; export const demoLovelaceArsaboo: DemoConfig["lovelace"] = (localize) => ({ - title: "Home Assistant", + title: "My Smart Homes", views: [ { icon: "hass:home-assistant", diff --git a/demo/src/configs/sections/entities.ts b/demo/src/configs/sections/entities.ts index 87163776e793..6a835c4b90e2 100644 --- a/demo/src/configs/sections/entities.ts +++ b/demo/src/configs/sections/entities.ts @@ -538,12 +538,13 @@ export const demoEntitiesSections: DemoConfig["entities"] = (localize) => latest_version: "12.1", release_summary: null, release_url: - "https://github.com/home-assistant/operating-system/commits/dev", + // "https://github.com/home-assistant/operating-system/commits/dev", + "https://github.com/my-smart-homes/operating-system/commits/dev", skipped_version: null, title: "Home Assistant Operating System", entity_picture: "https://brands.home-assistant.io/homeassistant/icon.png", - friendly_name: "Home Assistant Operating System Update", + friendly_name: "My Smart Homes Operating System Update", supported_features: 3, }, }, @@ -557,11 +558,12 @@ export const demoEntitiesSections: DemoConfig["entities"] = (localize) => latest_version: "2024.02.2", release_summary: null, release_url: - "https://github.com/home-assistant/supervisor/commits/main", + // "https://github.com/home-assistant/supervisor/commits/main", + "https://github.com/my-smart-homes/supervisor/commits/main", skipped_version: null, title: "Home Assistant Supervisor", entity_picture: "https://brands.home-assistant.io/hassio/icon.png", - friendly_name: "Home Assistant Supervisor Update", + friendly_name: "My Smart Homes Supervisor Update", supported_features: 1, }, }, @@ -574,12 +576,13 @@ export const demoEntitiesSections: DemoConfig["entities"] = (localize) => in_progress: false, latest_version: "2024.4.0", release_summary: null, - release_url: "https://github.com/home-assistant/core/commits/dev", + // release_url: "https://github.com/home-assistant/core/commits/dev", + release_url: "https://github.com/my-smart-homes/core/commits/dev", skipped_version: null, title: "Home Assistant Core", entity_picture: "https://brands.home-assistant.io/homeassistant/icon.png", - friendly_name: "Home Assistant Core Update", + friendly_name: "My Smart Homes Core Update", supported_features: 11, }, }, diff --git a/public/static/icons/favicon-1024x1024.png b/public/static/icons/favicon-1024x1024.png index ff2305532d76..40dd9c61cfbb 100644 Binary files a/public/static/icons/favicon-1024x1024.png and b/public/static/icons/favicon-1024x1024.png differ diff --git a/public/static/icons/favicon-16x16.png b/public/static/icons/favicon-16x16.png index 3e4cded17305..85db511ad4b2 100644 Binary files a/public/static/icons/favicon-16x16.png and b/public/static/icons/favicon-16x16.png differ diff --git a/public/static/icons/favicon-192x192.png b/public/static/icons/favicon-192x192.png index 5f644d2083c3..134bc5d5fb79 100644 Binary files a/public/static/icons/favicon-192x192.png and b/public/static/icons/favicon-192x192.png differ diff --git a/public/static/icons/favicon-32x32.png b/public/static/icons/favicon-32x32.png index 34adbe3e5892..e4916aef24f6 100644 Binary files a/public/static/icons/favicon-32x32.png and b/public/static/icons/favicon-32x32.png differ diff --git a/public/static/icons/favicon-384x384.png b/public/static/icons/favicon-384x384.png index 8ecdca876ca2..b30ec5ddd491 100644 Binary files a/public/static/icons/favicon-384x384.png and b/public/static/icons/favicon-384x384.png differ diff --git a/public/static/icons/favicon-512x512.png b/public/static/icons/favicon-512x512.png index 3ff438e6d54b..64cb752711d9 100644 Binary files a/public/static/icons/favicon-512x512.png and b/public/static/icons/favicon-512x512.png differ diff --git a/public/static/icons/favicon-apple-180x180.png b/public/static/icons/favicon-apple-180x180.png index 3a431359a45d..095962f6159e 100644 Binary files a/public/static/icons/favicon-apple-180x180.png and b/public/static/icons/favicon-apple-180x180.png differ diff --git a/public/static/icons/favicon.ico b/public/static/icons/favicon.ico index bed404857362..b0c33c58d654 100644 Binary files a/public/static/icons/favicon.ico and b/public/static/icons/favicon.ico differ diff --git a/public/static/icons/maskable_icon-128x128.png b/public/static/icons/maskable_icon-128x128.png index b6a9ead6ecc5..d422aaa47a35 100644 Binary files a/public/static/icons/maskable_icon-128x128.png and b/public/static/icons/maskable_icon-128x128.png differ diff --git a/public/static/icons/maskable_icon-192x192.png b/public/static/icons/maskable_icon-192x192.png index e7c0aa901914..2a6910849bcd 100644 Binary files a/public/static/icons/maskable_icon-192x192.png and b/public/static/icons/maskable_icon-192x192.png differ diff --git a/public/static/icons/maskable_icon-384x384.png b/public/static/icons/maskable_icon-384x384.png index 3819c4ef3567..70844d9f2b15 100644 Binary files a/public/static/icons/maskable_icon-384x384.png and b/public/static/icons/maskable_icon-384x384.png differ diff --git a/public/static/icons/maskable_icon-48x48.png b/public/static/icons/maskable_icon-48x48.png index 4a156aab241e..31d6425a3b4f 100644 Binary files a/public/static/icons/maskable_icon-48x48.png and b/public/static/icons/maskable_icon-48x48.png differ diff --git a/public/static/icons/maskable_icon-512x512.png b/public/static/icons/maskable_icon-512x512.png index 3bc8086f3207..43dacd757ef6 100644 Binary files a/public/static/icons/maskable_icon-512x512.png and b/public/static/icons/maskable_icon-512x512.png differ diff --git a/public/static/icons/maskable_icon-72x72.png b/public/static/icons/maskable_icon-72x72.png index a938f17e630d..eef92de1226a 100644 Binary files a/public/static/icons/maskable_icon-72x72.png and b/public/static/icons/maskable_icon-72x72.png differ diff --git a/public/static/icons/maskable_icon-96x96.png b/public/static/icons/maskable_icon-96x96.png index 01a41849667f..7499d114f138 100644 Binary files a/public/static/icons/maskable_icon-96x96.png and b/public/static/icons/maskable_icon-96x96.png differ diff --git a/public/static/icons/ohf.svg b/public/static/icons/ohf.svg index b6ef1172ca95..5228e865ea6e 100644 --- a/public/static/icons/ohf.svg +++ b/public/static/icons/ohf.svg @@ -1 +1,19 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + diff --git a/public/static/icons/tile-win-150x150.png b/public/static/icons/tile-win-150x150.png index 56aadb5630b1..e60b4ec81490 100644 Binary files a/public/static/icons/tile-win-150x150.png and b/public/static/icons/tile-win-150x150.png differ diff --git a/public/static/icons/tile-win-310x150.png b/public/static/icons/tile-win-310x150.png index 0e1425343119..e7e63d83de7b 100644 Binary files a/public/static/icons/tile-win-310x150.png and b/public/static/icons/tile-win-310x150.png differ diff --git a/public/static/icons/tile-win-310x310.png b/public/static/icons/tile-win-310x310.png index 8eb5e21ee1ec..5a353e99e582 100644 Binary files a/public/static/icons/tile-win-310x310.png and b/public/static/icons/tile-win-310x310.png differ diff --git a/public/static/icons/tile-win-70x70.png b/public/static/icons/tile-win-70x70.png index 7373c8cd1ba7..5dc958750ae0 100644 Binary files a/public/static/icons/tile-win-70x70.png and b/public/static/icons/tile-win-70x70.png differ diff --git a/public/static/images/ohf-badge.svg b/public/static/images/ohf-badge.svg index bbe9a15613d4..f1c82f9a80a1 100644 --- a/public/static/images/ohf-badge.svg +++ b/public/static/images/ohf-badge.svg @@ -1,66 +1,23 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - \ No newline at end of file + diff --git a/pyproject.toml b/pyproject.toml index 01f228165544..7d42dd0aea67 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ requires = ["setuptools~=75.1"] build-backend = "setuptools.build_meta" [project] -name = "home-assistant-frontend" +name = "my-smart-homes-frontend" version = "20241030.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" diff --git a/script/core b/script/core index c9848c46252c..891c0302a67e 100755 --- a/script/core +++ b/script/core @@ -12,7 +12,7 @@ if [ -z "${DEVCONTAINER}" ]; then fi # Default to installing (or upgrading to) dev branch -coreURL="https://github.com/home-assistant/core.git" +coreURL="https://github.com/my-smart-homes/core.git" ref="dev" while getopts "hr:s" opt; do diff --git a/src/components/ha-sidebar.ts b/src/components/ha-sidebar.ts index 1d1166050a6e..90821147d1d5 100644 --- a/src/components/ha-sidebar.ts +++ b/src/components/ha-sidebar.ts @@ -374,7 +374,7 @@ class HaSidebar extends SubscribeMixin(LitElement) { ? html` ${this.hass.localize("ui.sidebar.done")} ` - : html`
Home Assistant
`} + : html`
My Smart Homes
`} `; } diff --git a/src/data/blueprint.ts b/src/data/blueprint.ts index 5b8c816c6674..f2ceb8739fa9 100644 --- a/src/data/blueprint.ts +++ b/src/data/blueprint.ts @@ -93,7 +93,7 @@ export const getBlueprintSourceType = ( if (!sourceUrl) { return "local"; } - if (sourceUrl.includes("github.com/home-assistant")) { + if (sourceUrl.includes("github.com/my-smart-homes")) { return "homeassistant"; } return "community"; diff --git a/src/data/hassio/supervisor.ts b/src/data/hassio/supervisor.ts index 2f34c77f84ce..cc74a7fd70f8 100644 --- a/src/data/hassio/supervisor.ts +++ b/src/data/hassio/supervisor.ts @@ -203,6 +203,20 @@ export const fetchHassioLogs = async ( ); export const fetchHassioLogsFollow = async ( + hass: HomeAssistant, + provider: string, + signal: AbortSignal, + lines = 100 +) => + hass.callApiRaw( + "GET", + `hassio/${provider.includes("_") ? `addons/${provider}` : provider}/logs/follow?lines=${lines}`, + undefined, + undefined, + signal + ); + +export const fetchHassioLogsBootFollow = async ( hass: HomeAssistant, provider: string, signal: AbortSignal, @@ -222,7 +236,12 @@ export const getHassioLogDownloadUrl = (provider: string) => provider.includes("_") ? `addons/${provider}` : provider }/logs`; -export const getHassioLogDownloadLinesUrl = ( +export const getHassioLogDownloadLinesUrl = (provider: string, lines: number) => + `/api/hassio/${ + provider.includes("_") ? `addons/${provider}` : provider + }/logs?lines=${lines}`; + +export const getHassioLogBootDownloadLinesUrl = ( provider: string, lines: number, boot = 0 diff --git a/src/html/index.html.template b/src/html/index.html.template index 94efb29c0946..1da544de10e2 100644 --- a/src/html/index.html.template +++ b/src/html/index.html.template @@ -1,7 +1,7 @@ - Home Assistant + My Smart Homes <%= renderTemplate("_header.html.template") %> - + - + @@ -68,13 +68,36 @@
- - - + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/src/panels/config/dashboard/ha-config-dashboard.ts b/src/panels/config/dashboard/ha-config-dashboard.ts index 471bb9c09195..bfcbd1afaa15 100644 --- a/src/panels/config/dashboard/ha-config-dashboard.ts +++ b/src/panels/config/dashboard/ha-config-dashboard.ts @@ -134,6 +134,7 @@ class HaConfigDashboard extends SubscribeMixin(LitElement) { private _pages = memoizeOne((cloudStatus, isCloudLoaded) => { const pages: PageNavigation[] = []; + isCloudLoaded = false; if (isCloudLoaded) { pages.push({ component: "cloud", diff --git a/src/panels/config/ha-panel-config.ts b/src/panels/config/ha-panel-config.ts index 391f89418485..a691a044c8be 100644 --- a/src/panels/config/ha-panel-config.ts +++ b/src/panels/config/ha-panel-config.ts @@ -14,7 +14,6 @@ import { mdiMapMarkerRadius, mdiMathLog, mdiMemory, - mdiMicrophone, mdiNetwork, mdiNfcVariant, mdiPalette, @@ -94,12 +93,12 @@ export const configSections: { [name: string]: PageNavigation[] } = { iconColor: "#B1345C", component: "lovelace", }, - { - path: "/config/voice-assistants", - translationKey: "voice_assistants", - iconPath: mdiMicrophone, - iconColor: "#3263C3", - }, + // { + // path: "/config/voice-assistants", + // translationKey: "voice_assistants", + // iconPath: mdiMicrophone, + // iconColor: "#3263C3", + // }, { path: "/config/tags", translationKey: "tags", @@ -217,14 +216,14 @@ export const configSections: { [name: string]: PageNavigation[] } = { iconColor: "#616161", }, ], - voice_assistants: [ - { - path: "/config/voice-assistants", - translationKey: "ui.panel.config.dashboard.voice_assistants.main", - iconPath: mdiMicrophone, - iconColor: "#3263C3", - }, - ], + // voice_assistants: [ + // { + // path: "/config/voice-assistants", + // translationKey: "ui.panel.config.dashboard.voice_assistants.main", + // iconPath: mdiMicrophone, + // iconColor: "#3263C3", + // }, + // ], // Not used as a tab, but this way it will stay in the quick bar energy: [ { @@ -409,10 +408,10 @@ class HaPanelConfig extends SubscribeMixin(HassRouterPage) { tag: "ha-config-areas", load: () => import("./areas/ha-config-areas"), }, - "voice-assistants": { - tag: "ha-config-voice-assistants", - load: () => import("./voice-assistants/ha-config-voice-assistants"), - }, + // "voice-assistants": { + // tag: "ha-config-voice-assistants", + // load: () => import("./voice-assistants/ha-config-voice-assistants"), + // }, automation: { tag: "ha-config-automation", load: () => import("./automation/ha-config-automation"), @@ -429,10 +428,10 @@ class HaPanelConfig extends SubscribeMixin(HassRouterPage) { tag: "ha-config-tags", load: () => import("./tags/ha-config-tags"), }, - cloud: { - tag: "ha-config-cloud", - load: () => import("./cloud/ha-config-cloud"), - }, + // cloud: { + // tag: "ha-config-cloud", + // load: () => import("./cloud/ha-config-cloud"), + // }, devices: { tag: "ha-config-devices", load: () => import("./devices/ha-config-devices"), diff --git a/src/panels/config/info/ha-config-info.ts b/src/panels/config/info/ha-config-info.ts index 5deb9bd585a4..d31e31a6020c 100644 --- a/src/panels/config/info/ha-config-info.ts +++ b/src/panels/config/info/ha-config-info.ts @@ -27,7 +27,7 @@ import { documentationUrl } from "../../../util/documentation-url"; const JS_TYPE = __BUILD__; const JS_VERSION = __VERSION__; -const PAGES = [ +const _PAGES = [ { name: "change_log", path: "/latest-release-notes/", @@ -119,30 +119,34 @@ class HaConfigInfo extends LitElement { > -

Home Assistant

+

My Smart Homes