From 41678424f0e8cd7b3bdac6dc9907d23476b34086 Mon Sep 17 00:00:00 2001
From: bruno <bruno@process.st>
Date: Sun, 17 Dec 2023 13:21:31 -0300
Subject: [PATCH] implementations + cleanup
---
web/src/App.tsx | 5 ++---
web/src/Routes.tsx | 13 ++++++++-----
web/src/features/navbar/navbar.spec.tsx | 2 +-
web/src/features/navbar/navbar.stories.tsx | 2 +-
web/src/features/navbar/navbar.tsx | 6 +++---
web/src/layouts/layout.tsx | 2 +-
web/src/pages/HomePage/home-page.stories.tsx | 12 ------------
web/src/pages/HomePage/index.ts | 1 -
web/src/pages/Patterns/index.ts | 2 +-
web/src/pages/Patterns/patterns-page.stories.tsx | 12 ------------
...{patterns-page.spec.tsx => patterns.spec.tsx} | 6 +++---
web/src/pages/Patterns/patterns.stories.tsx | 12 ++++++++++++
.../Patterns/{patterns-page.tsx => patterns.tsx} | 2 +-
.../fatal-error.tsx} | 3 ++-
web/src/pages/fatal-error/index.ts | 1 +
.../home-page.spec.tsx => home/home.spec.tsx} | 6 +++---
web/src/pages/home/home.stories.tsx | 12 ++++++++++++
.../{HomePage/home-page.tsx => home/home.tsx} | 2 +-
web/src/pages/home/index.ts | 1 +
.../implementations/implementations.spec.tsx | 12 ++++++++++++
.../implementations/implementations.stories.tsx | 12 ++++++++++++
.../pages/implementations/implementations.tsx | 16 ++++++++++++++++
web/src/pages/implementations/index.ts | 1 +
web/src/pages/not-found/index.ts | 1 +
.../NotFoundPage.tsx => not-found/not-found.tsx} | 2 +-
25 files changed, 96 insertions(+), 50 deletions(-)
delete mode 100644 web/src/pages/HomePage/home-page.stories.tsx
delete mode 100644 web/src/pages/HomePage/index.ts
delete mode 100644 web/src/pages/Patterns/patterns-page.stories.tsx
rename web/src/pages/Patterns/{patterns-page.spec.tsx => patterns.spec.tsx} (62%)
create mode 100644 web/src/pages/Patterns/patterns.stories.tsx
rename web/src/pages/Patterns/{patterns-page.tsx => patterns.tsx} (85%)
rename web/src/pages/{FatalErrorPage/FatalErrorPage.tsx => fatal-error/fatal-error.tsx} (97%)
create mode 100644 web/src/pages/fatal-error/index.ts
rename web/src/pages/{HomePage/home-page.spec.tsx => home/home.spec.tsx} (71%)
create mode 100644 web/src/pages/home/home.stories.tsx
rename web/src/pages/{HomePage/home-page.tsx => home/home.tsx} (88%)
create mode 100644 web/src/pages/home/index.ts
create mode 100644 web/src/pages/implementations/implementations.spec.tsx
create mode 100644 web/src/pages/implementations/implementations.stories.tsx
create mode 100644 web/src/pages/implementations/implementations.tsx
create mode 100644 web/src/pages/implementations/index.ts
create mode 100644 web/src/pages/not-found/index.ts
rename web/src/pages/{NotFoundPage/NotFoundPage.tsx => not-found/not-found.tsx} (97%)
diff --git a/web/src/App.tsx b/web/src/App.tsx
index 948c600..0d94bfc 100644
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@@ -4,14 +4,13 @@ import * as theme from 'config/chakra.config'
import { FatalErrorBoundary, RedwoodProvider } from '@redwoodjs/web'
import { RedwoodApolloProvider } from '@redwoodjs/web/apollo'
-import FatalErrorPage from 'src/pages/FatalErrorPage'
-
import { Layout } from './layouts'
+import { DevFatalError } from './pages/fatal-error'
const extendedTheme = extendTheme(theme)
const App = () => (
- <FatalErrorBoundary page={FatalErrorPage}>
+ <FatalErrorBoundary page={DevFatalError}>
<RedwoodProvider titleTemplate="%PageTitle | %AppTitle">
<ColorModeScript />
<ChakraProvider theme={extendedTheme}>
diff --git a/web/src/Routes.tsx b/web/src/Routes.tsx
index 8ed15b3..91d11c8 100644
--- a/web/src/Routes.tsx
+++ b/web/src/Routes.tsx
@@ -9,15 +9,18 @@
import { Router, Route } from '@redwoodjs/router'
-import { HomePage } from './pages/HomePage'
-import { PatternsPage } from './pages/Patterns'
+import { Home } from './pages/home'
+import { Implementations } from './pages/implementations'
+import { NotFound } from './pages/not-found'
+import { Patterns } from './pages/patterns'
const Routes = () => {
return (
<Router>
- <Route notfound page={NotFoundPage} />
- <Route path="/" page={HomePage} name="home" />
- <Route path="/patrones" page={PatternsPage} name="patterns" />
+ <Route notfound page={NotFound} />
+ <Route path="/" page={Home} name="home" />
+ <Route path="/patterns" page={Patterns} name="patterns" />
+ <Route path="/implementations" page={Implementations} name="implementations" />
</Router>
)
}
diff --git a/web/src/features/navbar/navbar.spec.tsx b/web/src/features/navbar/navbar.spec.tsx
index 4c1caf2..f12f886 100644
--- a/web/src/features/navbar/navbar.spec.tsx
+++ b/web/src/features/navbar/navbar.spec.tsx
@@ -1,6 +1,6 @@
import * as RTL from '@redwoodjs/testing/web'
-import { Navbar } from './navbar'
+import { Navbar } from '.'
describe('HomePage', () => {
it('renders successfully', () => {
diff --git a/web/src/features/navbar/navbar.stories.tsx b/web/src/features/navbar/navbar.stories.tsx
index 9080cc7..4d79000 100644
--- a/web/src/features/navbar/navbar.stories.tsx
+++ b/web/src/features/navbar/navbar.stories.tsx
@@ -1,6 +1,6 @@
import type { StoryObj } from '@storybook/react'
-import { Navbar } from './navbar'
+import { Navbar } from '.'
type Args = {}
diff --git a/web/src/features/navbar/navbar.tsx b/web/src/features/navbar/navbar.tsx
index 796891c..2d0723d 100644
--- a/web/src/features/navbar/navbar.tsx
+++ b/web/src/features/navbar/navbar.tsx
@@ -23,9 +23,9 @@ export const Navbar: React.FC = () => {
Componentes
</Text>
<Stack spacing="1">
- <NavButton label="Patrones" to="/patrones" />
- <NavButton label="Implementaciones" to="/implementaciones" />
- <NavButton label="Reportes" to="/reportes" />
+ <NavButton label="Patrones" to="/patterns" />
+ <NavButton label="Implementaciones" to="/implementations" />
+ <NavButton label="Reportes" to="/reports" />
<NavButton label="Test" to="/tests" />
</Stack>
</Stack>
diff --git a/web/src/layouts/layout.tsx b/web/src/layouts/layout.tsx
index 35e9390..c9bd342 100644
--- a/web/src/layouts/layout.tsx
+++ b/web/src/layouts/layout.tsx
@@ -5,7 +5,7 @@ import { Box, Container, Flex, HStack } from '@chakra-ui/react'
import { Navbar } from 'src/features/navbar'
import Routes from 'src/Routes'
-export const Layout: React.FC = () => {
+export const Layout = () => {
return (
<HStack>
<Box bgColor="teal.50">
diff --git a/web/src/pages/HomePage/home-page.stories.tsx b/web/src/pages/HomePage/home-page.stories.tsx
deleted file mode 100644
index 05b5ce7..0000000
--- a/web/src/pages/HomePage/home-page.stories.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { StoryObj } from '@storybook/react'
-
-import { HomePage } from './home-page'
-
-export default {
- component: HomePage,
- title: 'Home',
-}
-
-export const Default: StoryObj<typeof HomePage> = {
- render: () => <HomePage />,
-}
diff --git a/web/src/pages/HomePage/index.ts b/web/src/pages/HomePage/index.ts
deleted file mode 100644
index f98af6b..0000000
--- a/web/src/pages/HomePage/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './home-page'
diff --git a/web/src/pages/Patterns/index.ts b/web/src/pages/Patterns/index.ts
index ae6b662..0117504 100644
--- a/web/src/pages/Patterns/index.ts
+++ b/web/src/pages/Patterns/index.ts
@@ -1 +1 @@
-export * from './patterns-page'
+export * from './patterns'
diff --git a/web/src/pages/Patterns/patterns-page.stories.tsx b/web/src/pages/Patterns/patterns-page.stories.tsx
deleted file mode 100644
index 77a611d..0000000
--- a/web/src/pages/Patterns/patterns-page.stories.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { StoryObj } from '@storybook/react'
-
-import { PatternsPage } from './patterns-page'
-
-export default {
- component: PatternsPage,
- title: 'Patterns',
-}
-
-export const Default: StoryObj<typeof PatternsPage> = {
- render: () => <PatternsPage />,
-}
diff --git a/web/src/pages/Patterns/patterns-page.spec.tsx b/web/src/pages/Patterns/patterns.spec.tsx
similarity index 62%
rename from web/src/pages/Patterns/patterns-page.spec.tsx
rename to web/src/pages/Patterns/patterns.spec.tsx
index b2ead10..8f872b8 100644
--- a/web/src/pages/Patterns/patterns-page.spec.tsx
+++ b/web/src/pages/Patterns/patterns.spec.tsx
@@ -1,10 +1,10 @@
import * as RTL from '@redwoodjs/testing/web'
-import { PatternsPage } from './patterns-page'
+import { Patterns } from '.'
-describe('HomePage', () => {
+describe('Patterns page', () => {
it('renders successfully', () => {
- RTL.render(<PatternsPage />)
+ RTL.render(<Patterns />)
RTL.screen.getByText('Patrones')
RTL.screen.getByText(/contenido de patrones/i)
diff --git a/web/src/pages/Patterns/patterns.stories.tsx b/web/src/pages/Patterns/patterns.stories.tsx
new file mode 100644
index 0000000..5c680d5
--- /dev/null
+++ b/web/src/pages/Patterns/patterns.stories.tsx
@@ -0,0 +1,12 @@
+import type { StoryObj } from '@storybook/react'
+
+import { Patterns } from '.'
+
+export default {
+ component: Patterns,
+ title: 'Patterns page',
+}
+
+export const Default: StoryObj<typeof Patterns> = {
+ render: () => <Patterns />,
+}
diff --git a/web/src/pages/Patterns/patterns-page.tsx b/web/src/pages/Patterns/patterns.tsx
similarity index 85%
rename from web/src/pages/Patterns/patterns-page.tsx
rename to web/src/pages/Patterns/patterns.tsx
index 4f3003f..570187a 100644
--- a/web/src/pages/Patterns/patterns-page.tsx
+++ b/web/src/pages/Patterns/patterns.tsx
@@ -2,7 +2,7 @@ import React from 'react'
import { Text, Heading, Box } from '@chakra-ui/react'
-export const PatternsPage: React.FC = () => {
+export const Patterns = () => {
return (
<Box>
<Heading as="h1" size="xl" mb="6">
diff --git a/web/src/pages/FatalErrorPage/FatalErrorPage.tsx b/web/src/pages/fatal-error/fatal-error.tsx
similarity index 97%
rename from web/src/pages/FatalErrorPage/FatalErrorPage.tsx
rename to web/src/pages/fatal-error/fatal-error.tsx
index b2bb436..5773047 100644
--- a/web/src/pages/FatalErrorPage/FatalErrorPage.tsx
+++ b/web/src/pages/fatal-error/fatal-error.tsx
@@ -10,7 +10,8 @@
// This import will be automatically removed when building for production
import { DevFatalErrorPage } from '@redwoodjs/web/dist/components/DevFatalErrorPage'
-export default DevFatalErrorPage ||
+export const DevFatalError =
+ DevFatalErrorPage ||
(() => (
<main>
<style
diff --git a/web/src/pages/fatal-error/index.ts b/web/src/pages/fatal-error/index.ts
new file mode 100644
index 0000000..1ea5277
--- /dev/null
+++ b/web/src/pages/fatal-error/index.ts
@@ -0,0 +1 @@
+export * from './fatal-error'
diff --git a/web/src/pages/HomePage/home-page.spec.tsx b/web/src/pages/home/home.spec.tsx
similarity index 71%
rename from web/src/pages/HomePage/home-page.spec.tsx
rename to web/src/pages/home/home.spec.tsx
index c1eaa3b..6870e75 100644
--- a/web/src/pages/HomePage/home-page.spec.tsx
+++ b/web/src/pages/home/home.spec.tsx
@@ -1,10 +1,10 @@
import * as RTL from '@redwoodjs/testing/web'
-import { HomePage } from './home-page'
+import { Home } from '.'
-describe('HomePage', () => {
+describe('Home page', () => {
it('renders successfully', () => {
- RTL.render(<HomePage />)
+ RTL.render(<Home />)
RTL.screen.getByText(/welcome to my app/i)
RTL.screen.getByText(
diff --git a/web/src/pages/home/home.stories.tsx b/web/src/pages/home/home.stories.tsx
new file mode 100644
index 0000000..f4a62ac
--- /dev/null
+++ b/web/src/pages/home/home.stories.tsx
@@ -0,0 +1,12 @@
+import type { StoryObj } from '@storybook/react'
+
+import { Home } from '.'
+
+export default {
+ component: Home,
+ title: 'Home page',
+}
+
+export const Default: StoryObj<typeof Home> = {
+ render: () => <Home />,
+}
diff --git a/web/src/pages/HomePage/home-page.tsx b/web/src/pages/home/home.tsx
similarity index 88%
rename from web/src/pages/HomePage/home-page.tsx
rename to web/src/pages/home/home.tsx
index 58bb37c..3c7c104 100644
--- a/web/src/pages/HomePage/home-page.tsx
+++ b/web/src/pages/home/home.tsx
@@ -2,7 +2,7 @@ import React from 'react'
import { Box, Heading, Text } from '@chakra-ui/react'
-export const HomePage: React.FC = () => {
+export const Home = () => {
return (
<Box>
<Heading as="h1" size="xl" mb="6">
diff --git a/web/src/pages/home/index.ts b/web/src/pages/home/index.ts
new file mode 100644
index 0000000..30efad0
--- /dev/null
+++ b/web/src/pages/home/index.ts
@@ -0,0 +1 @@
+export * from './home'
diff --git a/web/src/pages/implementations/implementations.spec.tsx b/web/src/pages/implementations/implementations.spec.tsx
new file mode 100644
index 0000000..2706a01
--- /dev/null
+++ b/web/src/pages/implementations/implementations.spec.tsx
@@ -0,0 +1,12 @@
+import * as RTL from '@redwoodjs/testing/web'
+
+import { Implementations } from '.'
+
+describe('Implementations page', () => {
+ it('renders successfully', () => {
+ RTL.render(<Implementations />)
+
+ RTL.screen.getByText('Implementaciones')
+ RTL.screen.getByText(/contenido de implementaciones/i)
+ })
+})
diff --git a/web/src/pages/implementations/implementations.stories.tsx b/web/src/pages/implementations/implementations.stories.tsx
new file mode 100644
index 0000000..c1d4f36
--- /dev/null
+++ b/web/src/pages/implementations/implementations.stories.tsx
@@ -0,0 +1,12 @@
+import type { StoryObj } from '@storybook/react'
+
+import { Implementations } from '.'
+
+export default {
+ component: Implementations,
+ title: 'Implementations page',
+}
+
+export const Default: StoryObj<typeof Implementations> = {
+ render: () => <Implementations />,
+}
diff --git a/web/src/pages/implementations/implementations.tsx b/web/src/pages/implementations/implementations.tsx
new file mode 100644
index 0000000..53b78a5
--- /dev/null
+++ b/web/src/pages/implementations/implementations.tsx
@@ -0,0 +1,16 @@
+import React from 'react'
+
+import { Text, Heading, Box } from '@chakra-ui/react'
+
+export const Implementations = () => {
+ return (
+ <Box>
+ <Heading as="h1" size="xl" mb="6">
+ Implementaciones
+ </Heading>
+ <Text fontSize="lg" mb="4">
+ Contenido de implementaciones
+ </Text>
+ </Box>
+ )
+}
diff --git a/web/src/pages/implementations/index.ts b/web/src/pages/implementations/index.ts
new file mode 100644
index 0000000..3250235
--- /dev/null
+++ b/web/src/pages/implementations/index.ts
@@ -0,0 +1 @@
+export * from './implementations'
diff --git a/web/src/pages/not-found/index.ts b/web/src/pages/not-found/index.ts
new file mode 100644
index 0000000..ee9b462
--- /dev/null
+++ b/web/src/pages/not-found/index.ts
@@ -0,0 +1 @@
+export * from './not-found'
diff --git a/web/src/pages/NotFoundPage/NotFoundPage.tsx b/web/src/pages/not-found/not-found.tsx
similarity index 97%
rename from web/src/pages/NotFoundPage/NotFoundPage.tsx
rename to web/src/pages/not-found/not-found.tsx
index 92ef916..f50133d 100644
--- a/web/src/pages/NotFoundPage/NotFoundPage.tsx
+++ b/web/src/pages/not-found/not-found.tsx
@@ -1,4 +1,4 @@
-export default () => (
+export const NotFound = () => (
<main>
<style
dangerouslySetInnerHTML={{
--
GitLab