From 03741ab9ccfc52fec87b4b8435274004b451f2a3 Mon Sep 17 00:00:00 2001 From: Cykotech Date: Thu, 23 Jan 2025 22:27:51 -0500 Subject: [PATCH 1/2] Reorganize files into new directories --- src/components/{ => Layout}/Footer.tsx | 0 src/components/{ => Layout}/Header.tsx | 0 src/components/{Layout.tsx => Layout/index.tsx} | 4 ++-- src/main.tsx | 6 +++--- src/routes/About.tsx | 7 ------- src/routes/About/index.tsx | 7 +++++++ src/routes/Home.tsx | 15 --------------- src/{components => routes/Home}/CTA.tsx | 0 src/{components => routes/Home}/Features.tsx | 0 src/{components => routes/Home}/Hero.tsx | 0 src/{components => routes/Home}/Showcase.tsx | 0 src/routes/Home/index.tsx | 15 +++++++++++++++ 12 files changed, 27 insertions(+), 27 deletions(-) rename src/components/{ => Layout}/Footer.tsx (100%) rename src/components/{ => Layout}/Header.tsx (100%) rename src/components/{Layout.tsx => Layout/index.tsx} (69%) delete mode 100644 src/routes/About.tsx create mode 100644 src/routes/About/index.tsx delete mode 100644 src/routes/Home.tsx rename src/{components => routes/Home}/CTA.tsx (100%) rename src/{components => routes/Home}/Features.tsx (100%) rename src/{components => routes/Home}/Hero.tsx (100%) rename src/{components => routes/Home}/Showcase.tsx (100%) create mode 100644 src/routes/Home/index.tsx diff --git a/src/components/Footer.tsx b/src/components/Layout/Footer.tsx similarity index 100% rename from src/components/Footer.tsx rename to src/components/Layout/Footer.tsx diff --git a/src/components/Header.tsx b/src/components/Layout/Header.tsx similarity index 100% rename from src/components/Header.tsx rename to src/components/Layout/Header.tsx diff --git a/src/components/Layout.tsx b/src/components/Layout/index.tsx similarity index 69% rename from src/components/Layout.tsx rename to src/components/Layout/index.tsx index cb12b8b..a697a80 100644 --- a/src/components/Layout.tsx +++ b/src/components/Layout/index.tsx @@ -1,5 +1,5 @@ -import Header from "./Header"; -import Footer from "./Footer"; +import Header from "./Header.tsx"; +import Footer from "./Footer.tsx"; import { Outlet } from "react-router"; export default function Layout() { diff --git a/src/main.tsx b/src/main.tsx index f885389..d28a511 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -2,9 +2,9 @@ import { StrictMode } from "react"; import { createRoot } from "react-dom/client"; import { BrowserRouter, Routes, Route } from "react-router"; import "./index.css"; -import Layout from "./components/Layout.tsx"; -import Home from "./routes/Home.tsx"; -import About from "./routes/About.tsx"; +import Layout from "./components/Layout/index.tsx"; +import Home from "./routes/Home/index.tsx"; +import About from "./routes/About/index.tsx"; const root = document.getElementById("root"); diff --git a/src/routes/About.tsx b/src/routes/About.tsx deleted file mode 100644 index 223886b..0000000 --- a/src/routes/About.tsx +++ /dev/null @@ -1,7 +0,0 @@ -export default function About() { - return ( -
-

About page

-
- ); -} diff --git a/src/routes/About/index.tsx b/src/routes/About/index.tsx new file mode 100644 index 0000000..9586de7 --- /dev/null +++ b/src/routes/About/index.tsx @@ -0,0 +1,7 @@ +export default function About() { + return ( +
+

About Code Cafe

+
+ ); +} diff --git a/src/routes/Home.tsx b/src/routes/Home.tsx deleted file mode 100644 index 0c8f109..0000000 --- a/src/routes/Home.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import Hero from "../components/Hero"; -import Features from "../components/Features"; -import CTA from "../components/CTA"; -import Showcase from "../components/Showcase.tsx"; - -export default function Home() { - return ( - <> - - - - - - ); -} diff --git a/src/components/CTA.tsx b/src/routes/Home/CTA.tsx similarity index 100% rename from src/components/CTA.tsx rename to src/routes/Home/CTA.tsx diff --git a/src/components/Features.tsx b/src/routes/Home/Features.tsx similarity index 100% rename from src/components/Features.tsx rename to src/routes/Home/Features.tsx diff --git a/src/components/Hero.tsx b/src/routes/Home/Hero.tsx similarity index 100% rename from src/components/Hero.tsx rename to src/routes/Home/Hero.tsx diff --git a/src/components/Showcase.tsx b/src/routes/Home/Showcase.tsx similarity index 100% rename from src/components/Showcase.tsx rename to src/routes/Home/Showcase.tsx diff --git a/src/routes/Home/index.tsx b/src/routes/Home/index.tsx new file mode 100644 index 0000000..af1a203 --- /dev/null +++ b/src/routes/Home/index.tsx @@ -0,0 +1,15 @@ +import Hero from "./Hero.tsx"; +import Features from "./Features.tsx"; +import CTA from "./CTA.tsx"; +import Showcase from "./Showcase.tsx"; + +export default function Home() { + return ( + <> + + + + + + ); +} From 6e8afff9ce22ea65ddc6ae461d5eb04006eb3836 Mon Sep 17 00:00:00 2001 From: Cykotech Date: Fri, 24 Jan 2025 00:55:10 -0500 Subject: [PATCH 2/2] Fix import nits --- src/components/Layout/index.tsx | 4 ++-- src/main.tsx | 6 +++--- src/routes/Home/index.tsx | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/Layout/index.tsx b/src/components/Layout/index.tsx index a697a80..cb12b8b 100644 --- a/src/components/Layout/index.tsx +++ b/src/components/Layout/index.tsx @@ -1,5 +1,5 @@ -import Header from "./Header.tsx"; -import Footer from "./Footer.tsx"; +import Header from "./Header"; +import Footer from "./Footer"; import { Outlet } from "react-router"; export default function Layout() { diff --git a/src/main.tsx b/src/main.tsx index d28a511..e58bff0 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -2,9 +2,9 @@ import { StrictMode } from "react"; import { createRoot } from "react-dom/client"; import { BrowserRouter, Routes, Route } from "react-router"; import "./index.css"; -import Layout from "./components/Layout/index.tsx"; -import Home from "./routes/Home/index.tsx"; -import About from "./routes/About/index.tsx"; +import Layout from "./components/Layout"; +import Home from "./routes/Home"; +import About from "./routes/About"; const root = document.getElementById("root"); diff --git a/src/routes/Home/index.tsx b/src/routes/Home/index.tsx index af1a203..9c364b3 100644 --- a/src/routes/Home/index.tsx +++ b/src/routes/Home/index.tsx @@ -1,7 +1,7 @@ -import Hero from "./Hero.tsx"; -import Features from "./Features.tsx"; -import CTA from "./CTA.tsx"; -import Showcase from "./Showcase.tsx"; +import Hero from "./Hero"; +import Features from "./Features"; +import CTA from "./CTA"; +import Showcase from "./Showcase"; export default function Home() { return (