From d7ed76ae6ed707c0ce782e9d924459a63659ae36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20Markovi=C4=87?= Date: Wed, 14 Jun 2023 22:25:00 +0400 Subject: [PATCH] WIP: app -> pages --- frontend/app/[slug]/page.js | 22 --------- frontend/app/layout.js | 36 -------------- frontend/app/page.js | 7 --- frontend/app/providers.js | 9 ---- frontend/app/ui.js | 3 -- frontend/{app => }/components/footer.js | 4 +- frontend/{app => }/components/header.js | 3 +- frontend/components/layout.js | 47 +++++++++++++++++++ frontend/pages/[slug]/index.js | 38 +++++++++++++++ frontend/pages/_app.js | 12 +++++ frontend/{app => pages}/import/page.js | 0 frontend/pages/index.js | 7 +++ .../{app => pages}/vendors/[slug]/page.js | 0 frontend/{app => pages}/vendors/page.js | 3 +- 14 files changed, 109 insertions(+), 82 deletions(-) delete mode 100644 frontend/app/[slug]/page.js delete mode 100644 frontend/app/layout.js delete mode 100644 frontend/app/page.js delete mode 100644 frontend/app/providers.js delete mode 100644 frontend/app/ui.js rename frontend/{app => }/components/footer.js (97%) rename frontend/{app => }/components/header.js (90%) create mode 100644 frontend/components/layout.js create mode 100644 frontend/pages/[slug]/index.js create mode 100644 frontend/pages/_app.js rename frontend/{app => pages}/import/page.js (100%) create mode 100644 frontend/pages/index.js rename frontend/{app => pages}/vendors/[slug]/page.js (100%) rename frontend/{app => pages}/vendors/page.js (89%) 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 ( -
-

{page.title}

-
-
- ) -} 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} -