Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove gl_eink_double #2241

Merged
merged 1 commit into from
Oct 11, 2024
Merged

Remove gl_eink_double #2241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions assets/css/gl_eink_double.scss
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions assets/src/apps/gl_eink_double.tsx
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions assets/src/apps/v2/gl_eink.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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,
Expand Down
6 changes: 1 addition & 5 deletions assets/src/components/admin/admin_tables.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
0 ...2/gl_eink_double/bottom_takeover_body.tsx → ...nents/v2/gl_eink/bottom_takeover_body.tsx
View file
Open in desktop
File renamed without changes.
0 .../v2/gl_eink_double/flex_zone_takeover.tsx → ...ponents/v2/gl_eink/flex_zone_takeover.tsx
View file
Open in desktop
File renamed without changes.
0 ...components/v2/gl_eink_double/line_map.tsx → ...ts/src/components/v2/gl_eink/line_map.tsx
View file
Open in desktop
File renamed without changes.
0 ...ponents/v2/gl_eink_double/normal_body.tsx → ...src/components/v2/gl_eink/normal_body.tsx
View file
Open in desktop
File renamed without changes.
0 ...nents/v2/gl_eink_double/normal_screen.tsx → ...c/components/v2/gl_eink/normal_screen.tsx
View file
Open in desktop
File renamed without changes.
0 ...s/v2/gl_eink_double/top_takeover_body.tsx → ...mponents/v2/gl_eink/top_takeover_body.tsx
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion assets/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion lib/screens/screen_data.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion lib/screens_web/controllers/screen_controller.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
125 changes: 0 additions & 125 deletions test/fixtures/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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": {
Expand Down Expand Up @@ -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": {
Expand Down
Loading