diff --git a/assets/src/apps/v2/triptych.tsx b/assets/src/apps/v2/triptych.tsx index a7f57ad39..2e86b7f8e 100644 --- a/assets/src/apps/v2/triptych.tsx +++ b/assets/src/apps/v2/triptych.tsx @@ -46,7 +46,6 @@ const LOADING_LAYOUT = { const DISABLED_LAYOUT = { full_screen: { type: "no_data", - show_alternatives: true, }, type: "screen_normal", }; diff --git a/assets/src/components/v2/triptych/no_data.tsx b/assets/src/components/v2/triptych/no_data.tsx index 08b2ed281..7a2e1af47 100644 --- a/assets/src/components/v2/triptych/no_data.tsx +++ b/assets/src/components/v2/triptych/no_data.tsx @@ -1,24 +1,21 @@ import React, { ComponentType } from "react"; -import LcdNoData from "Components/v2/lcd/no_data"; +import { imagePath } from "Util/util"; interface Props { show_alternatives: boolean; } -const NoData: ComponentType = ({ - show_alternatives: showAlternatives, -}) => { - // TODO: We likely want to show something different from the usual when we fail to fetch data for this screen type. +const NoData: ComponentType = () => { return ( <>
- +
- +
- +
); diff --git a/assets/src/components/v2/triptych/page_load_no_data.tsx b/assets/src/components/v2/triptych/page_load_no_data.tsx index 770eab5ed..ab16050fe 100644 --- a/assets/src/components/v2/triptych/page_load_no_data.tsx +++ b/assets/src/components/v2/triptych/page_load_no_data.tsx @@ -1,17 +1,17 @@ import React, { ComponentType } from "react"; -import LcdPageLoadNoData from "Components/v2/lcd/page_load_no_data"; +import { imagePath } from "Util/util"; const PageLoadNoData: ComponentType = () => { return ( <>
- +
- +
- +
); diff --git a/assets/src/util/outfront.tsx b/assets/src/util/outfront.tsx index fffd40bad..3bdbfc999 100644 --- a/assets/src/util/outfront.tsx +++ b/assets/src/util/outfront.tsx @@ -123,7 +123,7 @@ const getTags = (): OFMTag[] | null => { }; const arrayConfigurationToTriptychPane = ( - arrayConfiguration: string | null, + arrayConfiguration: string | null ): TriptychPane | null => { switch (arrayConfiguration) { case "Triple-Left": @@ -154,7 +154,7 @@ interface MRAID { addEventListener( eventID: EventID, callback: () => void, - layoutID: LayoutID, + layoutID: LayoutID ): void; EVENTS: { ONSCREEN: EventID }; } @@ -205,9 +205,7 @@ export const __TEST_setFakeMRAID__ = (options: { // Be noisy about it so that we don't accidentally ship a package that calls this function. alert( - `Setting fake MRAID object for testing purposes: ${JSON.stringify( - options, - )}`, + `Setting fake MRAID object for testing purposes: ${JSON.stringify(options)}` ); // Since `window.parent.parent.parent...` returns itself if the window does not have a parent, we can just set the mraid object @@ -224,7 +222,7 @@ const BASE_MRAID: Pick = { addEventListener(eventID, callback, layoutID) { if (eventID == "fakeOnscreenEvent" && layoutID == "fakeLayoutID") { console.log( - "FakeMRAID: Setting fake ONSCREEN event to fire in 3 seconds", + "FakeMRAID: Setting fake ONSCREEN event to fire in 3 seconds" ); setTimeout(() => { @@ -233,7 +231,7 @@ const BASE_MRAID: Pick = { }, 2000); } else { throw new Error( - "FakeMRAID: Stubbed addEventListener method expected eventID of 'fakeOnscreenEvent' and layoutID of 'fakeLayoutID'", + "FakeMRAID: Stubbed addEventListener method expected eventID of 'fakeOnscreenEvent' and layoutID of 'fakeLayoutID'" ); } }, diff --git a/assets/static/images/loading-triptych.png b/assets/static/images/loading-triptych.png new file mode 100644 index 000000000..35ea5ce01 Binary files /dev/null and b/assets/static/images/loading-triptych.png differ diff --git a/assets/static/images/no-data-triptych.png b/assets/static/images/no-data-triptych.png new file mode 100644 index 000000000..3630154e5 Binary files /dev/null and b/assets/static/images/no-data-triptych.png differ