From 7744b2ee8cf4499255405a49b63efd16b9fd21e6 Mon Sep 17 00:00:00 2001 From: Danny Budzinski Date: Tue, 11 Jul 2023 22:25:34 +0200 Subject: [PATCH 1/6] chore: force loading default config --- .github/workflows/firebase-preview.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/firebase-preview.yml b/.github/workflows/firebase-preview.yml index 5ca1c0ef2..5c1e26968 100644 --- a/.github/workflows/firebase-preview.yml +++ b/.github/workflows/firebase-preview.yml @@ -12,7 +12,7 @@ jobs: - name: Build env: APP_PLAYER_LICENSE_KEY: ${{ secrets.PLAYER_LICENSE_KEY }} - run: yarn && MODE=preview yarn build + run: APP_DEFAULT_CONFIG_SOURCE=gnnuzabk yarn && MODE=preview yarn build - uses: FirebaseExtended/action-hosting-deploy@v0 with: repoToken: "${{ secrets.GITHUB_TOKEN }}" From 87d8209c0aa88c5c66041717749924cf57c110e9 Mon Sep 17 00:00:00 2001 From: Danny Budzinski Date: Tue, 11 Jul 2023 22:32:46 +0200 Subject: [PATCH 2/6] fix: hardcode config ID --- .github/workflows/firebase-preview.yml | 2 +- src/stores/SettingsController.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/firebase-preview.yml b/.github/workflows/firebase-preview.yml index 5c1e26968..5ca1c0ef2 100644 --- a/.github/workflows/firebase-preview.yml +++ b/.github/workflows/firebase-preview.yml @@ -12,7 +12,7 @@ jobs: - name: Build env: APP_PLAYER_LICENSE_KEY: ${{ secrets.PLAYER_LICENSE_KEY }} - run: APP_DEFAULT_CONFIG_SOURCE=gnnuzabk yarn && MODE=preview yarn build + run: yarn && MODE=preview yarn build - uses: FirebaseExtended/action-hosting-deploy@v0 with: repoToken: "${{ secrets.GITHUB_TOKEN }}" diff --git a/src/stores/SettingsController.ts b/src/stores/SettingsController.ts index be69834d9..ab5500b5c 100644 --- a/src/stores/SettingsController.ts +++ b/src/stores/SettingsController.ts @@ -19,7 +19,7 @@ export const initSettings = async () => { } // The ini file values will be used if provided, even if compile-time values are set - settings.defaultConfigSource ||= import.meta.env.APP_DEFAULT_CONFIG_SOURCE; + settings.defaultConfigSource = 'gnnuzabk'; settings.playerId ||= import.meta.env.APP_PLAYER_ID || OTT_GLOBAL_PLAYER_ID; settings.playerLicenseKey ||= import.meta.env.APP_PLAYER_LICENSE_KEY; From c6f9e03b80c2426b540de449b2971d32464d2389 Mon Sep 17 00:00:00 2001 From: Danny Budzinski Date: Tue, 11 Jul 2023 22:40:44 +0200 Subject: [PATCH 3/6] chore: testing --- index.html | 3 ++- public/test.html | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 public/test.html diff --git a/index.html b/index.html index ddda3a29f..72391f2f4 100644 --- a/index.html +++ b/index.html @@ -34,8 +34,9 @@ -
+ + diff --git a/public/test.html b/public/test.html new file mode 100644 index 000000000..6dab71d20 --- /dev/null +++ b/public/test.html @@ -0,0 +1,5 @@ + + +HELLO WORLD + + From 8bceb7d7429f35e5ecb6cce90cb8ec8e26e08259 Mon Sep 17 00:00:00 2001 From: Danny Budzinski Date: Tue, 11 Jul 2023 22:49:54 +0200 Subject: [PATCH 4/6] chore: testing --- public/test3.html | 5 +++++ src/components/Root/Root.tsx | 2 ++ 2 files changed, 7 insertions(+) create mode 100644 public/test3.html diff --git a/public/test3.html b/public/test3.html new file mode 100644 index 000000000..6dab71d20 --- /dev/null +++ b/public/test3.html @@ -0,0 +1,5 @@ + + +HELLO WORLD + + diff --git a/src/components/Root/Root.tsx b/src/components/Root/Root.tsx index 310bc6239..9f9f9214e 100644 --- a/src/components/Root/Root.tsx +++ b/src/components/Root/Root.tsx @@ -72,6 +72,8 @@ const Root: FC = () => { return ( <> + + {!configQuery.isError && !configQuery.isLoading && configQuery.data && } {/*Show the error page when error except in demo mode (the demo mode shows its own error)*/} {configQuery.isError && !IS_DEMO_OR_PREVIEW && ( From 8599bd935ba35a507feaac43a61e41e9c883a579 Mon Sep 17 00:00:00 2001 From: Danny Budzinski Date: Tue, 11 Jul 2023 22:52:54 +0200 Subject: [PATCH 5/6] chore: testing --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index 72391f2f4..57a88825f 100644 --- a/index.html +++ b/index.html @@ -32,6 +32,7 @@ + From b34242ee59e9aad450907484d36947a0b42b387b Mon Sep 17 00:00:00 2001 From: Danny Budzinski Date: Tue, 11 Jul 2023 22:55:27 +0200 Subject: [PATCH 6/6] chore: testing --- src/components/Root/Root.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Root/Root.tsx b/src/components/Root/Root.tsx index 9f9f9214e..32b7ff7bd 100644 --- a/src/components/Root/Root.tsx +++ b/src/components/Root/Root.tsx @@ -72,8 +72,8 @@ const Root: FC = () => { return ( <> - - + This is a test + Hello {!configQuery.isError && !configQuery.isLoading && configQuery.data && } {/*Show the error page when error except in demo mode (the demo mode shows its own error)*/} {configQuery.isError && !IS_DEMO_OR_PREVIEW && (