tree shaking, reorg

thomassth · Aug 23, 2024 · 55cccef · 55cccef
1 parent 3e429b6
commit 55cccef
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 22 deletions.
diff --git a/src/components/accordions/StopAccordions.tsx b/src/components/accordions/StopAccordions.tsx
@@ -87,7 +87,6 @@ export function YRTStopAccordions(props: {
             name={lineStop.name}
             operator="YRT"
           />
-          {lineStop.name}
         </div>
       </AccordionPanel>
     );

diff --git a/src/lab/YRTheader.tsx → src/lab/yrt/YRTheader.tsx b/src/lab/YRTheader.tsx → src/lab/yrt/YRTheader.tsx
@@ -5,7 +5,7 @@ import { Link, Outlet } from "react-router-dom";
 
 import styles from "./yrt.module.css";
 
-export default function YRTHeader() {
+export function YRTHeader() {
   const { t } = useTranslation();
 
   return (

diff --git a/src/lab/YRTline.tsx → src/lab/yrt/YRTline.tsx b/src/lab/YRTline.tsx → src/lab/yrt/YRTline.tsx
@@ -2,11 +2,11 @@ import { Accordion, Title2 } from "@fluentui/react-components";
 import { useEffect, useState } from "react";
 import { useLocation, useParams } from "react-router-dom";
 
-import { YRTStopAccordions } from "../components/accordions/StopAccordions";
-import { YRTBadge } from "../components/badges";
-import { LineList, LineRequest } from "../models/yrt";
+import { YRTStopAccordions } from "../../components/accordions/StopAccordions.js";
+import { YRTBadge } from "../../components/badges.js";
+import { LineList, LineRequest } from "../../models/yrt.js";
 
-export default function YRTLine() {
+export function YRTLine() {
   const params = useParams();
 
   const [response, setResponse] = useState<LineRequest>({});

diff --git a/src/lab/YRTlines.tsx → src/lab/yrt/YRTlines.tsx b/src/lab/YRTlines.tsx → src/lab/yrt/YRTlines.tsx
@@ -2,10 +2,10 @@ import { Card, Text } from "@fluentui/react-components";
 import { useEffect, useState } from "react";
 import { Link } from "react-router-dom";
 
-import { YRTBadge } from "../components/badges";
-import { LineItem, LinesRequest } from "../models/yrt";
+import { YRTBadge } from "../../components/badges.js";
+import { LineItem, LinesRequest } from "../../models/yrt.js";
 
-export default function YRTLines() {
+export function YRTLines() {
   const [response, setResponse] = useState<LinesRequest>({});
   const [lineList, setLineList] = useState<LineItem[]>();
   const [directions, setDirections] = useState<Map<number, string>>(new Map());

diff --git a/src/lab/YRTstop.tsx → src/lab/yrt/YRTstop.tsx b/src/lab/YRTstop.tsx → src/lab/yrt/YRTstop.tsx
@@ -2,12 +2,12 @@ import { Text, Title2 } from "@fluentui/react-components";
 import { useEffect, useState } from "react";
 import { useParams } from "react-router-dom";
 
-import { YRTBadge } from "../components/badges";
-import { CountdownSec } from "../components/countdown/CountdownSec";
-import { CountdownItems, StopRequest } from "../models/yrt";
+import { YRTBadge } from "../../components/badges.js";
+import { CountdownSec } from "../../components/countdown/CountdownSec.js";
+import { CountdownItems, StopRequest } from "../../models/yrt.js";
 import styles from "./yrt.module.css";
 
-export default function YRT() {
+export function YRTStop() {
   const params = useParams();
   const stopNum = parseInt(`${params.stopId}`);
 

diff --git a/src/lab/yrt.module.css → src/lab/yrt/yrt.module.css b/src/lab/yrt.module.css → src/lab/yrt/yrt.module.css
diff --git a/src/routes/MainRouter.tsx b/src/routes/MainRouter.tsx
@@ -3,10 +3,8 @@ import { createBrowserRouter } from "react-router-dom";
 import App from "../App.js";
 import { BookmarkPage } from "../components/bookmarks/Bookmark.js";
 import { Settings } from "../components/settings/Settings.js";
-import YRTHeader from "../lab/YRTheader.js";
-import YRTLine from "../lab/YRTline.js";
-import YRTLines from "../lab/YRTlines.js";
-import YRT from "../lab/YRTstop.js";
+import { YRTHeader } from "../lab/yrt/YRTheader.js";
+import { YRTLines } from "../lab/yrt/YRTlines.js";
 import About from "./About.js";
 import Error from "./Error.js";
 import Home from "./Home.js";
@@ -30,10 +28,19 @@ export const router = createBrowserRouter([
         Component: YRTHeader,
         children: [
           { index: true, Component: YRTLines },
-          { path: "lines/:lineId", Component: YRTLine },
+          {
+            path: "lines/:lineId",
+            async lazy() {
+              const { YRTLine } = await import("../lab/yrt/YRTline.js");
+              return { Component: YRTLine };
+            },
+          },
           {
             path: "stops/:stopId",
-            Component: YRT,
+            async lazy() {
+              const { YRTStop } = await import("../lab/yrt/YRTstop.js");
+              return { Component: YRTStop };
+            },
           },
         ],
         errorElement: <Error />,
@@ -43,10 +50,16 @@ export const router = createBrowserRouter([
         children: [
           { index: true, Component: LineSearch },
           {
-            path: "lines/:lineId",
+            path: "lines",
             children: [
-              { index: true, Component: Line },
-              { path: ":stopNum", Component: LineStopPrediction },
+              { index: true, Component: LineSearch },
+              {
+                path: ":lineId",
+                children: [
+                  { index: true, Component: Line },
+                  { path: ":stopNum", Component: LineStopPrediction },
+                ],
+              },
             ],
           },
           {