From 3151b4e38198d3dbbfa0909edd1eb4513a63d872 Mon Sep 17 00:00:00 2001 From: Christian Maddox Date: Fri, 11 Oct 2024 11:30:50 -0400 Subject: [PATCH] Remove gl_eink_double. (#2241) --- assets/css/gl_eink_double.scss | 31 ----- assets/src/apps/gl_eink_double.tsx | 38 ------ assets/src/apps/v2/gl_eink.tsx | 12 +- assets/src/components/admin/admin_tables.tsx | 6 +- .../bottom_takeover_body.tsx | 0 .../flex_zone_takeover.tsx | 0 .../{gl_eink_double => gl_eink}/line_map.tsx | 0 .../normal_body.tsx | 0 .../normal_screen.tsx | 0 .../top_takeover_body.tsx | 0 assets/webpack.config.js | 1 - lib/screens/screen_data.ex | 1 - .../controllers/screen_controller.ex | 2 +- test/fixtures/config.json | 125 ------------------ 14 files changed, 8 insertions(+), 208 deletions(-) delete mode 100644 assets/css/gl_eink_double.scss delete mode 100644 assets/src/apps/gl_eink_double.tsx rename assets/src/components/v2/{gl_eink_double => gl_eink}/bottom_takeover_body.tsx (100%) rename assets/src/components/v2/{gl_eink_double => gl_eink}/flex_zone_takeover.tsx (100%) rename assets/src/components/v2/{gl_eink_double => gl_eink}/line_map.tsx (100%) rename assets/src/components/v2/{gl_eink_double => gl_eink}/normal_body.tsx (100%) rename assets/src/components/v2/{gl_eink_double => gl_eink}/normal_screen.tsx (100%) rename assets/src/components/v2/{gl_eink_double => gl_eink}/top_takeover_body.tsx (100%) diff --git a/assets/css/gl_eink_double.scss b/assets/css/gl_eink_double.scss deleted file mode 100644 index 73a55f1b6..000000000 --- a/assets/css/gl_eink_double.scss +++ /dev/null @@ -1,31 +0,0 @@ -@import "https://rsms.me/inter/inter.css"; - -@import "fonts"; - -@import "base/base_departure_time"; -@import "base/base_departure_destination"; -@import "eink/base_route_pill"; - -@import "connection_error"; -@import "digital_bridge"; -@import "fare_info"; -@import "flex_zone"; -@import "full_screen_takeover"; -@import "global_alert"; -@import "eink/green_line/header"; -@import "eink/green_line/inline_alert"; -@import "nearby_departures"; -@import "screen_container"; -@import "screen_page"; -@import "takeover_alert"; - -@import "eink/green_line/departures"; - -@import "eink/green_line/double/line_map"; -@import "eink/green_line/double/departures"; - -@import "eink/loading"; - -body { - margin: 0; -} diff --git a/assets/src/apps/gl_eink_double.tsx b/assets/src/apps/gl_eink_double.tsx deleted file mode 100644 index 93e06ca0b..000000000 --- a/assets/src/apps/gl_eink_double.tsx +++ /dev/null @@ -1,38 +0,0 @@ -import initSentry from "Util/sentry"; -initSentry("gl_eink_double"); - -require("../../css/gl_eink_double.scss"); - -import React from "react"; -import ReactDOM from "react-dom"; -import { BrowserRouter as Router, Route, Switch } from "react-router-dom"; - -import ScreenContainer, { - ScreenLayout, -} from "Components/eink/green_line/double/screen_container"; - -import { - AuditScreenPage, - MultiScreenPage, - ScreenPage, -} from "Components/eink/screen_page"; - -const App = (): JSX.Element => { - return ( - - - - - - - - - - - - - - ); -}; - -ReactDOM.render(, document.getElementById("app")); diff --git a/assets/src/apps/v2/gl_eink.tsx b/assets/src/apps/v2/gl_eink.tsx index 2c3d9b632..643bc850c 100644 --- a/assets/src/apps/v2/gl_eink.tsx +++ b/assets/src/apps/v2/gl_eink.tsx @@ -12,18 +12,18 @@ import { BrowserRouter as Router, Route, Switch } from "react-router-dom"; import ScreenPage from "Components/v2/screen_page"; import { MappingContext } from "Components/v2/widget"; -import NormalScreen from "Components/v2/gl_eink_double/normal_screen"; +import NormalScreen from "Components/v2/gl_eink/normal_screen"; import TakeoverScreen from "Components/v2/takeover_screen"; -import NormalBody from "Components/v2/gl_eink_double/normal_body"; +import NormalBody from "Components/v2/gl_eink/normal_body"; import TakeoverBody from "Components/v2/eink/takeover_body"; -import TopTakeoverBody from "Components/v2/gl_eink_double/top_takeover_body"; -import BottomTakeoverBody from "Components/v2/gl_eink_double/bottom_takeover_body"; +import TopTakeoverBody from "Components/v2/gl_eink/top_takeover_body"; +import BottomTakeoverBody from "Components/v2/gl_eink/bottom_takeover_body"; import OneMedium from "Components/v2/eink/flex/one_medium"; import Placeholder from "Components/v2/placeholder"; import FareInfoFooter from "Components/v2/eink/fare_info_footer"; import NormalHeader from "Components/v2/eink/gl_normal_header"; import Departures from "Components/v2/departures"; -import LineMap from "Components/v2/gl_eink_double/line_map"; +import LineMap from "Components/v2/gl_eink/line_map"; import EvergreenContent from "Components/v2/evergreen_content"; import NoData from "Components/v2/eink/no_data"; import DeparturesNoData from "Components/v2/eink/departures_no_data"; @@ -44,7 +44,7 @@ import SimulationScreenPage from "Components/v2/simulation_screen_page"; import EinkSubwayStatus from "Components/v2/subway_status/eink_subway_status"; import WidgetPage from "Components/v2/widget_page"; import TopAndFlexTakeoverBody from "Components/v2/eink/top_and_flex_takeover"; -import FlexZoneTakeoverBody from "Components/v2/gl_eink_double/flex_zone_takeover"; +import FlexZoneTakeoverBody from "Components/v2/gl_eink/flex_zone_takeover"; const TYPE_TO_COMPONENT = { screen_normal: NormalScreen, diff --git a/assets/src/components/admin/admin_tables.tsx b/assets/src/components/admin/admin_tables.tsx index 1ff2452a9..4bd62ae08 100644 --- a/assets/src/components/admin/admin_tables.tsx +++ b/assets/src/components/admin/admin_tables.tsx @@ -73,11 +73,7 @@ const AllScreensTable = (): JSX.Element => { Cell: EditableSelect, Filter: SelectColumnFilter, filter: "includes", - FormCell: buildFormSelect([ - "gl_eink_single", - "gl_eink_double", - "solari_eink", - ]), + FormCell: buildFormSelect(["gl_eink_single", "solari_eink"]), }, { Header: "Disabled", diff --git a/assets/src/components/v2/gl_eink_double/bottom_takeover_body.tsx b/assets/src/components/v2/gl_eink/bottom_takeover_body.tsx similarity index 100% rename from assets/src/components/v2/gl_eink_double/bottom_takeover_body.tsx rename to assets/src/components/v2/gl_eink/bottom_takeover_body.tsx diff --git a/assets/src/components/v2/gl_eink_double/flex_zone_takeover.tsx b/assets/src/components/v2/gl_eink/flex_zone_takeover.tsx similarity index 100% rename from assets/src/components/v2/gl_eink_double/flex_zone_takeover.tsx rename to assets/src/components/v2/gl_eink/flex_zone_takeover.tsx diff --git a/assets/src/components/v2/gl_eink_double/line_map.tsx b/assets/src/components/v2/gl_eink/line_map.tsx similarity index 100% rename from assets/src/components/v2/gl_eink_double/line_map.tsx rename to assets/src/components/v2/gl_eink/line_map.tsx diff --git a/assets/src/components/v2/gl_eink_double/normal_body.tsx b/assets/src/components/v2/gl_eink/normal_body.tsx similarity index 100% rename from assets/src/components/v2/gl_eink_double/normal_body.tsx rename to assets/src/components/v2/gl_eink/normal_body.tsx diff --git a/assets/src/components/v2/gl_eink_double/normal_screen.tsx b/assets/src/components/v2/gl_eink/normal_screen.tsx similarity index 100% rename from assets/src/components/v2/gl_eink_double/normal_screen.tsx rename to assets/src/components/v2/gl_eink/normal_screen.tsx diff --git a/assets/src/components/v2/gl_eink_double/top_takeover_body.tsx b/assets/src/components/v2/gl_eink/top_takeover_body.tsx similarity index 100% rename from assets/src/components/v2/gl_eink_double/top_takeover_body.tsx rename to assets/src/components/v2/gl_eink/top_takeover_body.tsx diff --git a/assets/webpack.config.js b/assets/webpack.config.js index 37219fd36..93f30bb9e 100644 --- a/assets/webpack.config.js +++ b/assets/webpack.config.js @@ -117,7 +117,6 @@ module.exports = (env, argv) => { entry: { polyfills: "./src/polyfills.js", gl_eink_single: "./src/apps/gl_eink_single.tsx", - gl_eink_double: "./src/apps/gl_eink_double.tsx", solari: "./src/apps/solari.tsx", admin: "./src/apps/admin.tsx", bus_eink_v2: "./src/apps/v2/bus_eink.tsx", diff --git a/lib/screens/screen_data.ex b/lib/screens/screen_data.ex index 69ac3277e..0a3fbe286 100644 --- a/lib/screens/screen_data.ex +++ b/lib/screens/screen_data.ex @@ -8,7 +8,6 @@ defmodule Screens.ScreenData do @modules_by_app_id %{ gl_eink_single: Screens.GLScreenData, - gl_eink_double: Screens.GLScreenData, solari: Screens.SolariScreenData } diff --git a/lib/screens_web/controllers/screen_controller.ex b/lib/screens_web/controllers/screen_controller.ex index 13abc9961..536fdcb3e 100644 --- a/lib/screens_web/controllers/screen_controller.ex +++ b/lib/screens_web/controllers/screen_controller.ex @@ -6,7 +6,7 @@ defmodule ScreensWeb.ScreenController do alias ScreensConfig.Screen @default_app_id :solari - @app_ids ~w[gl_eink_single gl_eink_double solari]a + @app_ids ~w[gl_eink_single solari]a @app_id_strings Enum.map(@app_ids, &Atom.to_string/1) plug(:body_class) diff --git a/test/fixtures/config.json b/test/fixtures/config.json index 7b605a3f4..0a660b6d6 100644 --- a/test/fixtures/config.json +++ b/test/fixtures/config.json @@ -577,31 +577,6 @@ "tags": [], "vendor": "c3ms" }, - "213": { - "app_id": "gl_eink_double", - "app_params": { - "direction_id": 1, - "headway_mode": false, - "nearby_departures": ["1276", "1292"], - "platform_id": "70230", - "psa_config": { - "default_list": { - "paths": [], - "type": "double" - }, - "scheduled_overrides": [] - }, - "route_id": "Green-C", - "service_level": 1, - "stop_id": "place-bcnwa" - }, - "device_id": "100102", - "disabled": false, - "name": "100102 Wash Sq EB GL06", - "refresh_if_loaded_before": "2020-10-13T16:54:42.832348Z", - "tags": [], - "vendor": "gds" - }, "102": { "app_id": "gl_eink_single", "app_params": { @@ -627,81 +602,6 @@ "tags": [], "vendor": "mercury" }, - "204": { - "app_id": "gl_eink_double", - "app_params": { - "direction_id": 0, - "headway_mode": false, - "nearby_departures": ["1276", "1292"], - "platform_id": "70229", - "psa_config": { - "default_list": { - "paths": [], - "type": "double" - }, - "scheduled_overrides": [] - }, - "route_id": "Green-C", - "service_level": 1, - "stop_id": "place-bcnwa" - }, - "device_id": "100097", - "disabled": false, - "name": "100097 Wash Sq WB GL08", - "refresh_if_loaded_before": "2020-10-13T16:54:42.832348Z", - "tags": [], - "vendor": "gds" - }, - "203": { - "app_id": "gl_eink_double", - "app_params": { - "direction_id": 1, - "headway_mode": false, - "nearby_departures": ["1276", "1292"], - "platform_id": "70230", - "psa_config": { - "default_list": { - "paths": [], - "type": "double" - }, - "scheduled_overrides": [] - }, - "route_id": "Green-C", - "service_level": 1, - "stop_id": "place-bcnwa" - }, - "device_id": "100098", - "disabled": false, - "name": "100098 Wash Sq EB GL05", - "refresh_if_loaded_before": "2020-10-13T16:54:42.832348Z", - "tags": [], - "vendor": "gds" - }, - "216": { - "app_id": "gl_eink_double", - "app_params": { - "direction_id": 0, - "headway_mode": false, - "nearby_departures": ["51317", "71391"], - "platform_id": "70245", - "psa_config": { - "default_list": { - "paths": [], - "type": "double" - }, - "scheduled_overrides": [] - }, - "route_id": "Green-E", - "service_level": 1, - "stop_id": "place-mfa" - }, - "device_id": "100101", - "disabled": false, - "name": "100101 MFA WB GL09", - "refresh_if_loaded_before": "2020-10-13T16:54:42.832348Z", - "tags": [], - "vendor": "gds" - }, "310": { "app_id": "solari", "app_params": { @@ -1664,31 +1564,6 @@ "tags": [], "vendor": "mercury" }, - "206": { - "app_id": "gl_eink_double", - "app_params": { - "direction_id": 0, - "headway_mode": false, - "nearby_departures": ["51317", "71391"], - "platform_id": "70245", - "psa_config": { - "default_list": { - "paths": [], - "type": "double" - }, - "scheduled_overrides": [] - }, - "route_id": "Green-E", - "service_level": 1, - "stop_id": "place-mfa" - }, - "device_id": "002013", - "disabled": false, - "name": "002013 MFA WB GL10", - "refresh_if_loaded_before": "2020-10-13T16:44:59.406651Z", - "tags": [], - "vendor": "mercury" - }, "312": { "app_id": "solari", "app_params": {