+
Home
- {" "}
+
About
-
{children}
+
{children}
);
}
diff --git a/packages/ui/src/routeTree.gen.ts b/packages/ui/src/routeTree.gen.ts
index 0edc01b..e1a008c 100644
--- a/packages/ui/src/routeTree.gen.ts
+++ b/packages/ui/src/routeTree.gen.ts
@@ -8,56 +8,48 @@
// This file is auto-generated by TanStack Router
-import { createFileRoute } from '@tanstack/react-router'
-
// Import Routes
-import { Route as rootRoute } from './routes/__root'
-
-// Create Virtual Routes
-
-const AboutLazyImport = createFileRoute('/about')()
-const IndexLazyImport = createFileRoute('/')()
+import { Route as rootRoute } from "./routes/__root";
+import { Route as AboutImport } from "./routes/about";
+import { Route as IndexImport } from "./routes/index";
// Create/Update Routes
-const AboutLazyRoute = AboutLazyImport.update({
- path: '/about',
+const AboutRoute = AboutImport.update({
+ path: "/about",
getParentRoute: () => rootRoute,
-} as any).lazy(() => import('./routes/about.lazy').then((d) => d.Route))
+} as any);
-const IndexLazyRoute = IndexLazyImport.update({
- path: '/',
+const IndexRoute = IndexImport.update({
+ path: "/",
getParentRoute: () => rootRoute,
-} as any).lazy(() => import('./routes/index.lazy').then((d) => d.Route))
+} as any);
// Populate the FileRoutesByPath interface
-declare module '@tanstack/react-router' {
+declare module "@tanstack/react-router" {
interface FileRoutesByPath {
- '/': {
- id: '/'
- path: '/'
- fullPath: '/'
- preLoaderRoute: typeof IndexLazyImport
- parentRoute: typeof rootRoute
- }
- '/about': {
- id: '/about'
- path: '/about'
- fullPath: '/about'
- preLoaderRoute: typeof AboutLazyImport
- parentRoute: typeof rootRoute
- }
+ "/": {
+ id: "/";
+ path: "/";
+ fullPath: "/";
+ preLoaderRoute: typeof IndexImport;
+ parentRoute: typeof rootRoute;
+ };
+ "/about": {
+ id: "/about";
+ path: "/about";
+ fullPath: "/about";
+ preLoaderRoute: typeof AboutImport;
+ parentRoute: typeof rootRoute;
+ };
}
}
// Create and export the route tree
-export const routeTree = rootRoute.addChildren({
- IndexLazyRoute,
- AboutLazyRoute,
-})
+export const routeTree = rootRoute.addChildren({ IndexRoute, AboutRoute });
/* prettier-ignore-end */
@@ -72,10 +64,10 @@ export const routeTree = rootRoute.addChildren({
]
},
"/": {
- "filePath": "index.lazy.tsx"
+ "filePath": "index.tsx"
},
"/about": {
- "filePath": "about.lazy.tsx"
+ "filePath": "about.tsx"
}
}
}
diff --git a/packages/ui/src/routes/about.lazy.tsx b/packages/ui/src/routes/about.lazy.tsx
deleted file mode 100644
index 89b5e8f..0000000
--- a/packages/ui/src/routes/about.lazy.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import Layout from "@/layout";
-import { createLazyFileRoute } from "@tanstack/react-router";
-
-export const Route = createLazyFileRoute("/about")({
- component: About,
-});
-
-function About() {
- return
Hello /about!;
-}
diff --git a/packages/ui/src/routes/about.tsx b/packages/ui/src/routes/about.tsx
new file mode 100644
index 0000000..5dfd4d4
--- /dev/null
+++ b/packages/ui/src/routes/about.tsx
@@ -0,0 +1,16 @@
+import Layout from "@/layout";
+import { createFileRoute } from "@tanstack/react-router";
+
+export const Route = createFileRoute("/about")({
+ component: About,
+});
+
+function About() {
+ return (
+
+
+
About Page
+
+
+ );
+}
diff --git a/packages/ui/src/routes/index.lazy.tsx b/packages/ui/src/routes/index.lazy.tsx
deleted file mode 100644
index 339f3d9..0000000
--- a/packages/ui/src/routes/index.lazy.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import Layout from "@/layout";
-import { createLazyFileRoute } from "@tanstack/react-router";
-
-export const Route = createLazyFileRoute("/")({
- component: Index,
-});
-
-function Index() {
- return (
-
- Welcome Home!
-
- );
-}
diff --git a/packages/ui/src/routes/index.tsx b/packages/ui/src/routes/index.tsx
new file mode 100644
index 0000000..a60359a
--- /dev/null
+++ b/packages/ui/src/routes/index.tsx
@@ -0,0 +1,16 @@
+import Layout from "@/layout";
+import { createFileRoute } from "@tanstack/react-router";
+
+export const Route = createFileRoute("/")({
+ component: Index,
+});
+
+function Index() {
+ return (
+
+
+
Home Page
+
+
+ );
+}
From 85b732b66ebb29e47c1f01bac436e39c26680f38 Mon Sep 17 00:00:00 2001
From: MartinC <59508264+martinc1991@users.noreply.github.com>
Date: Mon, 3 Jun 2024 13:05:48 -0300
Subject: [PATCH 4/4] Put layout on _root layout
---
packages/ui/src/layout.tsx | 18 ------------------
packages/ui/src/routeTree.gen.ts | 24 ++++++++++++------------
packages/ui/src/routes/__root.tsx | 19 +++++++++++++++----
packages/ui/src/routes/about.tsx | 16 ----------------
packages/ui/src/routes/about/index.tsx | 13 +++++++++++++
packages/ui/src/routes/index.tsx | 9 +++------
6 files changed, 43 insertions(+), 56 deletions(-)
delete mode 100644 packages/ui/src/layout.tsx
delete mode 100644 packages/ui/src/routes/about.tsx
create mode 100644 packages/ui/src/routes/about/index.tsx
diff --git a/packages/ui/src/layout.tsx b/packages/ui/src/layout.tsx
deleted file mode 100644
index 28c3e74..0000000
--- a/packages/ui/src/layout.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Link } from "@tanstack/react-router";
-
-export default function Layout({ children }: { children: React.ReactNode }) {
- return (
-
-
-
- Home
-
-
- About
-
-
-
-
{children}
-
- );
-}
diff --git a/packages/ui/src/routeTree.gen.ts b/packages/ui/src/routeTree.gen.ts
index e1a008c..7a2290c 100644
--- a/packages/ui/src/routeTree.gen.ts
+++ b/packages/ui/src/routeTree.gen.ts
@@ -11,18 +11,18 @@
// Import Routes
import { Route as rootRoute } from "./routes/__root";
-import { Route as AboutImport } from "./routes/about";
import { Route as IndexImport } from "./routes/index";
+import { Route as AboutIndexImport } from "./routes/about/index";
// Create/Update Routes
-const AboutRoute = AboutImport.update({
- path: "/about",
+const IndexRoute = IndexImport.update({
+ path: "/",
getParentRoute: () => rootRoute,
} as any);
-const IndexRoute = IndexImport.update({
- path: "/",
+const AboutIndexRoute = AboutIndexImport.update({
+ path: "/about/",
getParentRoute: () => rootRoute,
} as any);
@@ -37,11 +37,11 @@ declare module "@tanstack/react-router" {
preLoaderRoute: typeof IndexImport;
parentRoute: typeof rootRoute;
};
- "/about": {
- id: "/about";
+ "/about/": {
+ id: "/about/";
path: "/about";
fullPath: "/about";
- preLoaderRoute: typeof AboutImport;
+ preLoaderRoute: typeof AboutIndexImport;
parentRoute: typeof rootRoute;
};
}
@@ -49,7 +49,7 @@ declare module "@tanstack/react-router" {
// Create and export the route tree
-export const routeTree = rootRoute.addChildren({ IndexRoute, AboutRoute });
+export const routeTree = rootRoute.addChildren({ IndexRoute, AboutIndexRoute });
/* prettier-ignore-end */
@@ -60,14 +60,14 @@ export const routeTree = rootRoute.addChildren({ IndexRoute, AboutRoute });
"filePath": "__root.tsx",
"children": [
"/",
- "/about"
+ "/about/"
]
},
"/": {
"filePath": "index.tsx"
},
- "/about": {
- "filePath": "about.tsx"
+ "/about/": {
+ "filePath": "about/index.tsx"
}
}
}
diff --git a/packages/ui/src/routes/__root.tsx b/packages/ui/src/routes/__root.tsx
index 60ab5c6..d17541f 100644
--- a/packages/ui/src/routes/__root.tsx
+++ b/packages/ui/src/routes/__root.tsx
@@ -1,4 +1,4 @@
-import { createRootRoute, Outlet } from "@tanstack/react-router";
+import { createRootRoute, Link, Outlet } from "@tanstack/react-router";
import React from "react";
const TanStackRouterDevtools =
@@ -12,9 +12,20 @@ const TanStackRouterDevtools =
export const Route = createRootRoute({
component: () => (
- <>
-
+
+
+
+ Home
+
+
+ About
+
+
+
+
+
+
-
+
),
});
diff --git a/packages/ui/src/routes/about.tsx b/packages/ui/src/routes/about.tsx
deleted file mode 100644
index 5dfd4d4..0000000
--- a/packages/ui/src/routes/about.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import Layout from "@/layout";
-import { createFileRoute } from "@tanstack/react-router";
-
-export const Route = createFileRoute("/about")({
- component: About,
-});
-
-function About() {
- return (
-
-
-
About Page
-
-
- );
-}
diff --git a/packages/ui/src/routes/about/index.tsx b/packages/ui/src/routes/about/index.tsx
new file mode 100644
index 0000000..996cdf7
--- /dev/null
+++ b/packages/ui/src/routes/about/index.tsx
@@ -0,0 +1,13 @@
+import { createFileRoute } from "@tanstack/react-router";
+
+export const Route = createFileRoute("/about/")({
+ component: About,
+});
+
+function About() {
+ return (
+
+
About Page
+
+ );
+}
diff --git a/packages/ui/src/routes/index.tsx b/packages/ui/src/routes/index.tsx
index a60359a..08e9105 100644
--- a/packages/ui/src/routes/index.tsx
+++ b/packages/ui/src/routes/index.tsx
@@ -1,4 +1,3 @@
-import Layout from "@/layout";
import { createFileRoute } from "@tanstack/react-router";
export const Route = createFileRoute("/")({
@@ -7,10 +6,8 @@ export const Route = createFileRoute("/")({
function Index() {
return (
-
-
-
Home Page
-
-
+
+
Home Page
+
);
}