From efa9789a2a8a9e24bb430c2584ae9367d5b9200e Mon Sep 17 00:00:00 2001 From: johannes-hernehult Date: Tue, 9 Jun 2026 21:08:12 +0200 Subject: [PATCH] refactor: bootstrap app shell with routing and layout --- package-lock.json | 17 +-- package.json | 2 +- src/App.css | 184 ------------------------ src/App.tsx | 138 ++++-------------- src/components/not-found/NotFound.tsx | 12 ++ src/features/guides/routes/Guide.tsx | 10 ++ src/features/guides/routes/NewGuide.tsx | 7 + src/index.css | 111 -------------- src/{features/guides => lib}/schemas.ts | 0 src/main.tsx | 15 +- src/router.tsx | 26 ++++ src/styles/App.css | 0 src/styles/index.css | 0 13 files changed, 92 insertions(+), 430 deletions(-) delete mode 100644 src/App.css create mode 100644 src/components/not-found/NotFound.tsx create mode 100644 src/features/guides/routes/Guide.tsx create mode 100644 src/features/guides/routes/NewGuide.tsx delete mode 100644 src/index.css rename src/{features/guides => lib}/schemas.ts (100%) create mode 100644 src/styles/App.css create mode 100644 src/styles/index.css diff --git a/package-lock.json b/package-lock.json index cbaaf15..fbc7892 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "idb": "^8.0.3", "react": "^19.2.6", "react-dom": "^19.2.6", - "react-router-dom": "^7.17.0", + "react-router": "^7.17.0", "zod": "^4.4.3", "zustand": "^5.0.14" }, @@ -2357,21 +2357,6 @@ } } }, - "node_modules/react-router-dom": { - "version": "7.17.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.17.0.tgz", - "integrity": "sha512-fyU2yjGups/hE6Xz0I5ZYbVL8Gx29eCjgpHaRaTaVU+OOAdfRX05KsvyRm0GO8YQwOkhpU3MurW1jyMUJn+zSw==", - "dependencies": { - "react-router": "7.17.0" - }, - "engines": { - "node": ">=20.0.0" - }, - "peerDependencies": { - "react": ">=18", - "react-dom": ">=18" - } - }, "node_modules/rolldown": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.1.0.tgz", diff --git a/package.json b/package.json index a050fa5..eefc917 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "idb": "^8.0.3", "react": "^19.2.6", "react-dom": "^19.2.6", - "react-router-dom": "^7.17.0", + "react-router": "^7.17.0", "zod": "^4.4.3", "zustand": "^5.0.14" }, diff --git a/src/App.css b/src/App.css deleted file mode 100644 index f90339d..0000000 --- a/src/App.css +++ /dev/null @@ -1,184 +0,0 @@ -.counter { - font-size: 16px; - padding: 5px 10px; - border-radius: 5px; - color: var(--accent); - background: var(--accent-bg); - border: 2px solid transparent; - transition: border-color 0.3s; - margin-bottom: 24px; - - &:hover { - border-color: var(--accent-border); - } - &:focus-visible { - outline: 2px solid var(--accent); - outline-offset: 2px; - } -} - -.hero { - position: relative; - - .base, - .framework, - .vite { - inset-inline: 0; - margin: 0 auto; - } - - .base { - width: 170px; - position: relative; - z-index: 0; - } - - .framework, - .vite { - position: absolute; - } - - .framework { - z-index: 1; - top: 34px; - height: 28px; - transform: perspective(2000px) rotateZ(300deg) rotateX(44deg) rotateY(39deg) - scale(1.4); - } - - .vite { - z-index: 0; - top: 107px; - height: 26px; - width: auto; - transform: perspective(2000px) rotateZ(300deg) rotateX(40deg) rotateY(39deg) - scale(0.8); - } -} - -#center { - display: flex; - flex-direction: column; - gap: 25px; - place-content: center; - place-items: center; - flex-grow: 1; - - @media (max-width: 1024px) { - padding: 32px 20px 24px; - gap: 18px; - } -} - -#next-steps { - display: flex; - border-top: 1px solid var(--border); - text-align: left; - - & > div { - flex: 1 1 0; - padding: 32px; - @media (max-width: 1024px) { - padding: 24px 20px; - } - } - - .icon { - margin-bottom: 16px; - width: 22px; - height: 22px; - } - - @media (max-width: 1024px) { - flex-direction: column; - text-align: center; - } -} - -#docs { - border-right: 1px solid var(--border); - - @media (max-width: 1024px) { - border-right: none; - border-bottom: 1px solid var(--border); - } -} - -#next-steps ul { - list-style: none; - padding: 0; - display: flex; - gap: 8px; - margin: 32px 0 0; - - .logo { - height: 18px; - } - - a { - color: var(--text-h); - font-size: 16px; - border-radius: 6px; - background: var(--social-bg); - display: flex; - padding: 6px 12px; - align-items: center; - gap: 8px; - text-decoration: none; - transition: box-shadow 0.3s; - - &:hover { - box-shadow: var(--shadow); - } - .button-icon { - height: 18px; - width: 18px; - } - } - - @media (max-width: 1024px) { - margin-top: 20px; - flex-wrap: wrap; - justify-content: center; - - li { - flex: 1 1 calc(50% - 8px); - } - - a { - width: 100%; - justify-content: center; - box-sizing: border-box; - } - } -} - -#spacer { - height: 88px; - border-top: 1px solid var(--border); - @media (max-width: 1024px) { - height: 48px; - } -} - -.ticks { - position: relative; - width: 100%; - - &::before, - &::after { - content: ''; - position: absolute; - top: -4.5px; - border: 5px solid transparent; - } - - &::before { - left: 0; - border-left-color: var(--border); - } - &::after { - right: 0; - border-right-color: var(--border); - } -} diff --git a/src/App.tsx b/src/App.tsx index a66b5ef..239f419 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,122 +1,38 @@ -import { useState } from 'react' -import reactLogo from './assets/react.svg' -import viteLogo from './assets/vite.svg' -import heroImg from './assets/hero.png' -import './App.css' +import { Outlet } from "react-router"; +import "./styles/App.css"; +import { Link } from "react-router"; function App() { - const [count, setCount] = useState(0) + const guides = [ + { id: 1, title: "Guide 1" }, + { id: 2, title: "Guide 2" }, + { id: 3, title: "Guide 3" }, + ]; return ( <> -
-
- - React logo - Vite logo -
-
-

Get started

-

- Edit src/App.tsx and save to test HMR -

-
- -
+
+

+ SnapSteps +

+ +
+
+ +
+ - ) + ); } -export default App +export default App; diff --git a/src/components/not-found/NotFound.tsx b/src/components/not-found/NotFound.tsx new file mode 100644 index 0000000..ebefee5 --- /dev/null +++ b/src/components/not-found/NotFound.tsx @@ -0,0 +1,12 @@ +import { Link } from "react-router"; + +export default function NotFound() { + return ( +
+

404 - Not Found

+

The page you are looking for does not exist.

+ + Go back to home +
+ ); +} diff --git a/src/features/guides/routes/Guide.tsx b/src/features/guides/routes/Guide.tsx new file mode 100644 index 0000000..3c8e6af --- /dev/null +++ b/src/features/guides/routes/Guide.tsx @@ -0,0 +1,10 @@ +import { useParams } from "react-router"; + +export default function Guide() { + const { id } = useParams(); + return ( +
+

Guide {id}

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

New Guide

+
+ ); +} diff --git a/src/index.css b/src/index.css deleted file mode 100644 index 5fb3313..0000000 --- a/src/index.css +++ /dev/null @@ -1,111 +0,0 @@ -:root { - --text: #6b6375; - --text-h: #08060d; - --bg: #fff; - --border: #e5e4e7; - --code-bg: #f4f3ec; - --accent: #aa3bff; - --accent-bg: rgba(170, 59, 255, 0.1); - --accent-border: rgba(170, 59, 255, 0.5); - --social-bg: rgba(244, 243, 236, 0.5); - --shadow: - rgba(0, 0, 0, 0.1) 0 10px 15px -3px, rgba(0, 0, 0, 0.05) 0 4px 6px -2px; - - --sans: system-ui, 'Segoe UI', Roboto, sans-serif; - --heading: system-ui, 'Segoe UI', Roboto, sans-serif; - --mono: ui-monospace, Consolas, monospace; - - font: 18px/145% var(--sans); - letter-spacing: 0.18px; - color-scheme: light dark; - color: var(--text); - background: var(--bg); - font-synthesis: none; - text-rendering: optimizeLegibility; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - - @media (max-width: 1024px) { - font-size: 16px; - } -} - -@media (prefers-color-scheme: dark) { - :root { - --text: #9ca3af; - --text-h: #f3f4f6; - --bg: #16171d; - --border: #2e303a; - --code-bg: #1f2028; - --accent: #c084fc; - --accent-bg: rgba(192, 132, 252, 0.15); - --accent-border: rgba(192, 132, 252, 0.5); - --social-bg: rgba(47, 48, 58, 0.5); - --shadow: - rgba(0, 0, 0, 0.4) 0 10px 15px -3px, rgba(0, 0, 0, 0.25) 0 4px 6px -2px; - } - - #social .button-icon { - filter: invert(1) brightness(2); - } -} - -#root { - width: 1126px; - max-width: 100%; - margin: 0 auto; - text-align: center; - border-inline: 1px solid var(--border); - min-height: 100svh; - display: flex; - flex-direction: column; - box-sizing: border-box; -} - -body { - margin: 0; -} - -h1, -h2 { - font-family: var(--heading); - font-weight: 500; - color: var(--text-h); -} - -h1 { - font-size: 56px; - letter-spacing: -1.68px; - margin: 32px 0; - @media (max-width: 1024px) { - font-size: 36px; - margin: 20px 0; - } -} -h2 { - font-size: 24px; - line-height: 118%; - letter-spacing: -0.24px; - margin: 0 0 8px; - @media (max-width: 1024px) { - font-size: 20px; - } -} -p { - margin: 0; -} - -code, -.counter { - font-family: var(--mono); - display: inline-flex; - border-radius: 4px; - color: var(--text-h); -} - -code { - font-size: 15px; - line-height: 135%; - padding: 4px 8px; - background: var(--code-bg); -} diff --git a/src/features/guides/schemas.ts b/src/lib/schemas.ts similarity index 100% rename from src/features/guides/schemas.ts rename to src/lib/schemas.ts diff --git a/src/main.tsx b/src/main.tsx index bef5202..bf0b715 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -1,10 +1,11 @@ -import { StrictMode } from 'react' -import { createRoot } from 'react-dom/client' -import './index.css' -import App from './App.tsx' +import { StrictMode } from "react"; +import { createRoot } from "react-dom/client"; +import { RouterProvider } from "react-router"; +import { router } from "./router.tsx"; +import "./styles/index.css"; -createRoot(document.getElementById('root')!).render( +createRoot(document.getElementById("root")!).render( - + , -) +); diff --git a/src/router.tsx b/src/router.tsx index e69de29..958328e 100644 --- a/src/router.tsx +++ b/src/router.tsx @@ -0,0 +1,26 @@ +import { createBrowserRouter } from "react-router"; +import App from "./App.tsx"; +import NewGuide from "./features/guides/routes/NewGuide.tsx"; +import NotFound from "./components/not-found/NotFound.tsx"; +import Guide from "./features/guides/routes/Guide.tsx"; + +export const router = createBrowserRouter([ + { + path: "/", + Component: App, + children: [ + { + path: "/new-guide", + Component: NewGuide, + }, + { + path: "/guide/:id", + Component: Guide, + }, + ], + }, + { + path: "*", + Component: NotFound, + }, +]); diff --git a/src/styles/App.css b/src/styles/App.css new file mode 100644 index 0000000..e69de29 diff --git a/src/styles/index.css b/src/styles/index.css new file mode 100644 index 0000000..e69de29