diff --git a/frontend/app/[slug]/page.js b/frontend/app/[slug]/page.js
deleted file mode 100644
index 39dc59e..0000000
--- a/frontend/app/[slug]/page.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { notFound } from 'next/navigation'
-import directus from '~/lib/directus'
-
-async function getPage(slug) {
- try {
- const page = await directus.items('pages').readOne(slug)
- return page
- } catch (error) {
- notFound()
- }
-}
-
-export default async function DynamicPage({ params }) {
- const page = await getPage(params.slug)
-
- return (
-
- )
-}
diff --git a/frontend/app/layout.js b/frontend/app/layout.js
deleted file mode 100644
index 48fad57..0000000
--- a/frontend/app/layout.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import Header from '~/app/components/header'
-import Footer from '~/app/components/footer'
-import { Providers } from '~/app/providers'
-import { Container } from '~/app/ui'
-import directus from '~/lib/directus'
-
-async function getGlobals() {
- return directus.items('globals').readOne(process.env.GLOBALS_ID)
-}
-
-export async function generateMetadata() {
- const globals = await getGlobals()
-
- return {
- title: globals.meta_title,
- description: globals.meta_description,
- }
-}
-
-export default async function RootLayout({ children }) {
- const globals = await getGlobals()
-
- return (
-
-
-
-
-
- {children}
-
-
-
-
-
- )
-}
diff --git a/frontend/app/page.js b/frontend/app/page.js
deleted file mode 100644
index 0bddd57..0000000
--- a/frontend/app/page.js
+++ /dev/null
@@ -1,7 +0,0 @@
-export default async function Home() {
- return (
-
- {JSON.stringify(new Date(), null, 2)}
-
- )
-}
diff --git a/frontend/app/providers.js b/frontend/app/providers.js
deleted file mode 100644
index 871a2b8..0000000
--- a/frontend/app/providers.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { CacheProvider, ChakraProvider } from '~/app/ui'
-
-export function Providers({ children }) {
- return (
-
- {children}
-
- )
-}
diff --git a/frontend/app/ui.js b/frontend/app/ui.js
deleted file mode 100644
index 0c41b48..0000000
--- a/frontend/app/ui.js
+++ /dev/null
@@ -1,3 +0,0 @@
-'use client'
-export { CacheProvider, Link } from '@chakra-ui/next-js'
-export * from '@chakra-ui/react'
diff --git a/frontend/app/components/footer.js b/frontend/components/footer.js
similarity index 97%
rename from frontend/app/components/footer.js
rename to frontend/components/footer.js
index 4fbd0d6..05f966d 100644
--- a/frontend/app/components/footer.js
+++ b/frontend/components/footer.js
@@ -1,6 +1,4 @@
-'use client'
-
-import { Box, Flex, Link, Stack, useColorMode, useColorModeValue } from '~/app/ui'
+import { Box, Flex, Link, Stack, useColorMode, useColorModeValue } from '@chakra-ui/react'
export default function Footer({ siteName }) {
return (
diff --git a/frontend/app/components/header.js b/frontend/components/header.js
similarity index 90%
rename from frontend/app/components/header.js
rename to frontend/components/header.js
index 10b52c0..97e5aa8 100644
--- a/frontend/app/components/header.js
+++ b/frontend/components/header.js
@@ -1,7 +1,8 @@
'use client'
import { MoonIcon, SunIcon } from '@chakra-ui/icons'
-import { Box, Button, Flex, Heading, Link, Spacer, Stack, useColorMode, useColorModeValue } from '~/app/ui'
+import { Box, Button, Flex, Heading, Spacer, Stack, useColorMode, useColorModeValue } from '@chakra-ui/react'
+import { Link } from '@chakra-ui/next-js'
export default function Header({ siteName }) {
const { colorMode, toggleColorMode } = useColorMode()
diff --git a/frontend/components/layout.js b/frontend/components/layout.js
new file mode 100644
index 0000000..bd6adec
--- /dev/null
+++ b/frontend/components/layout.js
@@ -0,0 +1,47 @@
+import Header from '~/components/header'
+import Footer from '~/components/footer'
+
+import directus from '~/lib/directus'
+
+import { Html, Head, Main, NextScript } from 'next/document'
+
+// async function getGlobals() {
+// return directus.items('globals').readOne(process.env.GLOBALS_ID)
+// }
+
+// export async function generateMetadata() {
+// const globals = await getGlobals()
+
+// return {
+// title: globals.meta_title,
+// description: globals.meta_description,
+// }
+// }
+
+// export default async function RootLayout({ children }) {
+// const globals = await getGlobals()
+
+// return (
+//
+//
+//
+//
+//
+// {children}
+//
+//
+//
+//
+//
+// )
+// }
+
+export default function Layout({ children }) {
+ return (
+ <>
+
+ {children}
+
+
+ )
+}
diff --git a/frontend/pages/[slug]/index.js b/frontend/pages/[slug]/index.js
new file mode 100644
index 0000000..3c19668
--- /dev/null
+++ b/frontend/pages/[slug]/index.js
@@ -0,0 +1,38 @@
+import { notFound } from 'next/navigation'
+import directus from '~/lib/directus'
+
+export const getStaticPaths = async () => {
+ const { data: pages } = await directus.items('pages').readByQuery({
+ limit: 1,
+ })
+
+ return {
+ paths: pages.map((p) => ({ params: { slug: p.slug } })),
+ fallback: false, // false or "blocking"
+ }
+}
+
+export const getStaticProps = async ({ params }) => {
+ const { slug } = params
+
+ const {
+ data: [page],
+ } = await directus.items('pages').readByQuery({
+ limit: 1,
+ filter: {
+ slug: {
+ _eq: slug,
+ },
+ },
+ })
+ return { props: { page } }
+}
+
+export default function Page({ page }) {
+ return (
+
+ )
+}
diff --git a/frontend/pages/_app.js b/frontend/pages/_app.js
new file mode 100644
index 0000000..cb64e0f
--- /dev/null
+++ b/frontend/pages/_app.js
@@ -0,0 +1,12 @@
+import { ChakraProvider } from '@chakra-ui/react'
+import Layout from '~/components/layout'
+
+export default function MyApp({ Component, pageProps }) {
+ return (
+
+
+
+
+
+ )
+}
diff --git a/frontend/app/import/page.js b/frontend/pages/import/page.js
similarity index 100%
rename from frontend/app/import/page.js
rename to frontend/pages/import/page.js
diff --git a/frontend/pages/index.js b/frontend/pages/index.js
new file mode 100644
index 0000000..8c3433f
--- /dev/null
+++ b/frontend/pages/index.js
@@ -0,0 +1,7 @@
+export default function Home() {
+ return (
+
+ {JSON.stringify(new Date().toISOString().split('T').join(' ').substring(0, 16), null, 2)}
+
+ )
+}
diff --git a/frontend/app/vendors/[slug]/page.js b/frontend/pages/vendors/[slug]/page.js
similarity index 100%
rename from frontend/app/vendors/[slug]/page.js
rename to frontend/pages/vendors/[slug]/page.js
diff --git a/frontend/app/vendors/page.js b/frontend/pages/vendors/page.js
similarity index 89%
rename from frontend/app/vendors/page.js
rename to frontend/pages/vendors/page.js
index 97f3f8e..02667be 100644
--- a/frontend/app/vendors/page.js
+++ b/frontend/pages/vendors/page.js
@@ -1,4 +1,5 @@
-import { Card, CardBody, Heading, Image, Link, LinkBox, LinkOverlay, SimpleGrid } from '~/app/ui'
+import { Link } from '@chakra-ui/next-js'
+import { Card, CardBody, Heading, Image, LinkBox, LinkOverlay, SimpleGrid } from '@chakra-ui/react'
import directus from '~/lib/directus'
const PER_PAGE = 50