fulldev-ui 0.5.0-beta.2 → 0.5.0-beta.4

package/astro.config.ts

@@ -41,7 +41,6 @@ export default defineConfig({
         },
       },
       injectRoutes: true,
-      overrideComponents: true,
     }),
   ],
   redirects: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fulldev-ui",
-  "version": "0.5.0-beta.2",
+  "version": "0.5.0-beta.4",
   "description": "A component library built for Astro",
   "homepage": "https://ui.full.dev",
   "bugs": "https://github.com/fulldotdev/ui/issues",

package/pnpm-lock.yaml

@@ -20,6 +20,9 @@ dependencies:
   '@radix-ui/colors':
     specifier: ^3.0.0
     version: 3.0.0
+  '@rollup/plugin-yaml':
+    specifier: ^4.1.2
+    version: 4.1.2
   '@types/js-yaml':
     specifier: ^4.0.9
     version: 4.0.9
@@ -82,13 +85,13 @@ dependencies:
     version: 5.6.3
   unocss:
     specifier: ^0.63.4
-    version: 0.63.4(postcss@8.4.45)(vite@5.4.3)
+    version: 0.63.4(postcss@8.4.45)(vite@5.4.9)
   url:
     specifier: ^0.11.4
     version: 0.11.4
   vite-plugin-virtual:
     specifier: ^0.3.0
-    version: 0.3.0(vite@5.4.3)
+    version: 0.3.0(vite@5.4.9)
   zod:
     specifier: ^3.23.8
     version: 3.23.8
@@ -100,9 +103,6 @@ devDependencies:
   '@astrojs/check':
     specifier: ^0.9.4
     version: 0.9.4(prettier-plugin-astro@0.14.1)(prettier@3.3.3)(typescript@5.6.3)
-  '@rollup/plugin-yaml':
-    specifier: ^4.1.2
-    version: 4.1.2
   prettier:
     specifier: 3.3.3
     version: 3.3.3
@@ -1523,7 +1523,7 @@ packages:
       '@rollup/pluginutils': 5.1.0
       js-yaml: 4.1.0
       tosource: 2.0.0-alpha.3
-    dev: true
+    dev: false
 
   /@rollup/pluginutils@5.1.0:
     resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
@@ -1537,7 +1537,7 @@ packages:
       '@types/estree': 1.0.5
       estree-walker: 2.0.2
       picomatch: 2.3.1
-    dev: true
+    dev: false
 
   /@rollup/pluginutils@5.1.2:
     resolution: {integrity: sha512-/FIdS3PyZ39bjZlwqFnWqCOVnW7o963LtKMwQOD0NhQqw22gSr2YY1afu3FxRip4ZCZNsD5jq6Aaz6QV3D/Njw==}
@@ -1771,6 +1771,7 @@ packages:
 
   /@types/estree@1.0.5:
     resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
+    dev: false
 
   /@types/hast@3.0.4:
     resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
@@ -1824,7 +1825,7 @@ packages:
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
     dev: false
 
-  /@unocss/astro@0.63.4(vite@5.4.3):
+  /@unocss/astro@0.63.4(vite@5.4.9):
     resolution: {integrity: sha512-qu1uMDUT8lXU3mm5EjZpnizvjSYtfY0TTDivR5QNm1i3Xd+ErHfdfOpXdJ2mYvxv+X7C570//KUugkTI3Mb3kQ==}
     peerDependencies:
       vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
@@ -1834,8 +1835,8 @@ packages:
     dependencies:
       '@unocss/core': 0.63.4
       '@unocss/reset': 0.63.4
-      '@unocss/vite': 0.63.4(vite@5.4.3)
-      vite: 5.4.3(sass@1.80.2)
+      '@unocss/vite': 0.63.4(vite@5.4.9)
+      vite: 5.4.9(sass@1.80.2)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -2008,7 +2009,7 @@ packages:
       '@unocss/core': 0.63.4
     dev: false
 
-  /@unocss/vite@0.63.4(vite@5.4.3):
+  /@unocss/vite@0.63.4(vite@5.4.9):
     resolution: {integrity: sha512-YK0L177GD8Kx+JtfiCJy4YyBYckAXo4ogC8LZ+pYVNXDMN+F+XItpGI/ofLRaGIaewNg+MJgGY+CQZceABEAfg==}
     peerDependencies:
       vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
@@ -2021,7 +2022,7 @@ packages:
       chokidar: 3.6.0
       magic-string: 0.30.11
       tinyglobby: 0.2.9
-      vite: 5.4.3(sass@1.80.2)
+      vite: 5.4.9(sass@1.80.2)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -2226,6 +2227,7 @@ packages:
 
   /argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+    dev: false
 
   /aria-query@5.3.2:
     resolution: {integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==}
@@ -3020,6 +3022,7 @@ packages:
 
   /estree-walker@2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
+    dev: false
 
   /estree-walker@3.0.3:
     resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
@@ -3660,6 +3663,7 @@ packages:
     hasBin: true
     dependencies:
       argparse: 2.0.1
+    dev: false
 
   /jsesc@3.0.2:
     resolution: {integrity: sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==}
@@ -5693,7 +5697,7 @@ packages:
   /tosource@2.0.0-alpha.3:
     resolution: {integrity: sha512-KAB2lrSS48y91MzFPFuDg4hLbvDiyTjOVgaK7Erw+5AmZXNq4sFRVn8r6yxSLuNs15PaokrDRpS61ERY9uZOug==}
     engines: {node: '>=10'}
-    dev: true
+    dev: false
 
   /totalist@3.0.1:
     resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
@@ -5858,7 +5862,7 @@ packages:
       unist-util-visit-parents: 6.0.1
     dev: false
 
-  /unocss@0.63.4(postcss@8.4.45)(vite@5.4.3):
+  /unocss@0.63.4(postcss@8.4.45)(vite@5.4.9):
     resolution: {integrity: sha512-MQ/ktuJ2MoXBsd117DEONFubJRQN6Og4mQJLbT+0nna2aTW4jYJESJ479mJYWq/ajonxEaM+zrf8M92VIWxzEw==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -5870,7 +5874,7 @@ packages:
       vite:
         optional: true
     dependencies:
-      '@unocss/astro': 0.63.4(vite@5.4.3)
+      '@unocss/astro': 0.63.4(vite@5.4.9)
       '@unocss/cli': 0.63.4
       '@unocss/core': 0.63.4
       '@unocss/postcss': 0.63.4(postcss@8.4.45)
@@ -5886,8 +5890,8 @@ packages:
       '@unocss/transformer-compile-class': 0.63.4
       '@unocss/transformer-directives': 0.63.4
       '@unocss/transformer-variant-group': 0.63.4
-      '@unocss/vite': 0.63.4(vite@5.4.3)
-      vite: 5.4.3(sass@1.80.2)
+      '@unocss/vite': 0.63.4(vite@5.4.9)
+      vite: 5.4.9(sass@1.80.2)
     transitivePeerDependencies:
       - postcss
       - rollup
@@ -5938,51 +5942,12 @@ packages:
       vfile-message: 4.0.2
     dev: false
 
-  /vite-plugin-virtual@0.3.0(vite@5.4.3):
+  /vite-plugin-virtual@0.3.0(vite@5.4.9):
     resolution: {integrity: sha512-TOtrWw6jKrJNXfxhGRUiQzfAP1gRkYkVzMkJNjHUJ8idLuxf8eeeDKZKZHhdeYfaCc/87rv+KvWE2iCy1QInWA==}
     peerDependencies:
       vite: ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0
     dependencies:
-      vite: 5.4.3(sass@1.80.2)
-    dev: false
-
-  /vite@5.4.3(sass@1.80.2):
-    resolution: {integrity: sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': ^18.0.0 || >=20.0.0
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      sass-embedded: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      sass-embedded:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-    dependencies:
-      esbuild: 0.21.5
-      postcss: 8.4.45
-      rollup: 4.21.2
-      sass: 1.80.2
-    optionalDependencies:
-      fsevents: 2.3.3
+      vite: 5.4.9(sass@1.80.2)
     dev: false
 
   /vite@5.4.9(sass@1.80.2):

package/src/blocks/Contact.astro

@@ -13,35 +13,6 @@ import Tagline from 'fulldev-ui/components/Tagline.astro'
 import Text from 'fulldev-ui/components/Text.astro'
 import Textarea from 'fulldev-ui/components/Textarea.astro'
 
-// interface Channel {
-//   type: 'tel' | 'email' | 'address'
-//   text: string
-//   heading?: string
-//   icon?: string
-//   href?: string
-// }
-
-// interface FormField {
-//   type: 'text' | 'email' | 'tel' | 'textarea'
-//   name: string
-//   label: string
-//   required?: boolean
-// }
-
-// interface Form {
-//   fields: FormField[]
-//   button: string
-// }
-
-// type Props<As extends HTMLTag = 'section'> = ComponentProps<
-//   typeof Section<As>
-// > & {
-//   form: Form
-//   googleMaps?: string
-//   socials?: any
-//   channels: Channel[]
-// }
-
 const {
   heading,
   form,
@@ -53,7 +24,7 @@ const {
   position,
   image,
   channels,
-  level = 2,
+  level = 1,
   ...rest
 } = Astro.props
 ---
@@ -69,6 +40,7 @@ const {
       text={tagline}
     />
     <Heading
+      size={'sm'}
       level={level}
       text={heading}
     />
@@ -106,6 +78,7 @@ const {
       <Button
         type="submit"
         color="brand"
+        variant="primary"
         text={form.button}
       />
     </Form>
@@ -126,6 +99,10 @@ const {
         align-items: flex-start;
       }
 
+      > .column {
+        gap: var(--space-5);
+      }
+
       .channel + .channel {
         margin-top: var(--space-3) !important;
       }

package/src/blocks/Intro.astro

@@ -8,7 +8,7 @@ const { image, ...rest } = Astro.props
   class:list="intro"
   structure="column"
   size="sm"
-  level={2}
+  level={1}
   {...rest}
 />
 
@@ -16,6 +16,8 @@ const { image, ...rest } = Astro.props
   @layer fulldev {
     .intro {
       border-bottom: 1px solid var(--base-6);
+      padding-top: var(--space-7);
+      padding-bottom: var(--space-7);
     }
   }
 </style>

package/src/components/Card.astro

@@ -9,6 +9,7 @@ import Image from 'fulldev-ui/components/Image.astro'
 import Writeup from 'fulldev-ui/components/Writeup.astro'
 import type { GlobalProps } from 'fulldev-ui/types/global-props'
 import Icon from './Icon.astro'
+import Price from './Price.astro'
 
 interface Props
   extends GlobalProps,
@@ -22,9 +23,11 @@ interface Props
   variant?: ComponentProps<typeof Button>['variant']
   align?: ComponentProps<typeof Writeup>['align']
   icon?: ComponentProps<typeof Icon>['name']
+  price?: ComponentProps<typeof Price>['value']
   slug?: CollectionEntry<'pages'>['slug'] | undefined
   id?: any
   panel?: boolean | undefined
+  title?: ComponentProps<typeof Writeup>['heading']
 }
 
 const { slug } = Astro.props
@@ -47,12 +50,14 @@ const {
   heading,
   text,
   variant,
+  price,
   list,
   button,
   buttons,
   panel,
   image,
   icon,
+  title,
   images,
   position,
   ...rest
@@ -81,14 +86,15 @@ const {
   </slot>
   <slot name="writeup">
     <Writeup
+      heading={heading || title}
       {level}
       {rating}
       {badge}
       {tagline}
-      {heading}
       {text}
       {list}
     />
+    <Price value={price} />
   </slot>
   <slot name="buttons">
     <Button
@@ -121,12 +127,12 @@ const {
       &[href] {
         cursor: pointer;
 
-        > .root.image {
-          transition: all;
+        > .image {
+          transition: all 0.2s ease;
         }
 
         &:hover {
-          > .root.image {
+          > .image {
             opacity: 0.8;
           }
         }

package/src/components/Footer.astro

@@ -53,9 +53,8 @@ const {
 >
   <Element class:list="column">
     <Logo
-      id={logo}
-      src={logo}
       {company}
+      {...typeof logo === 'string' ? { src: logo } : logo}
     />
     <Text
       color="base"
@@ -110,6 +109,7 @@ const {
       align-items: flex-start;
       gap: var(--space-6);
       margin-top: auto;
+      margin-top: auto;
       border-top-width: 1px;
       border-color: var(--base-a6);
       background-color: var(--base-2);

package/src/components/Header.astro

@@ -40,9 +40,8 @@ const {
   {...rest}
 >
   <Logo
-    id={logo}
-    src={logo}
     {company}
+    {...typeof logo === 'string' ? { src: logo } : logo}
   />
   <Buttons
     {buttons}

package/src/components/Sidebar.astro

@@ -40,8 +40,8 @@ const {
   {open}
 >
   <Logo
-    src={logo}
-    company={company}
+    {company}
+    {...typeof logo === 'string' ? { src: logo } : logo}
   />
   {search && <Search />}
   <Element class:list="buttons">

package/src/components/Social.astro

@@ -26,3 +26,10 @@ const platform = () => {
   {variant}
   {href}
 />
+
+<style is:global lang="scss">
+  .social {
+    padding: 0 var(--space-3);
+    height: calc(var(--text-2) + 2 * var(--space-3));
+  }
+</style>

package/src/components/experimental/Form.astro

@@ -21,6 +21,8 @@ const { structure = 'column', ...rest } = Astro.props
 <style is:global lang="scss">
   .form {
     display: flex;
+    flex-direction: column;
+    gap: var(--space-4);
     width: 100%;
     max-width: calc(var(--space-4) * 44);
   }

package/src/content/pages/index.mdx

@@ -1,6 +1,5 @@
 ---
 presets: [base]
-component: PageLayout
 sidebar: false
 toc: false
 

package/src/content/presets/docs.yml

@@ -3,6 +3,7 @@ component: DocsLayout
 sidebar: true
 header: false
 banner: false
+toc: true
 
 navigation:
   company: Fulldev UI
@@ -49,11 +50,10 @@ navigation:
         - blocks/intro
         - blocks/posts
         - blocks/reviews
-    - heading: Layouts
-      buttons:
-        - layouts/layout
-        - layouts/pagelayout
-        - layouts/docslayout
+    # - heading: Layouts
+    #   buttons:
+    #     - layouts/layout
+    #     - layouts/docslayout
     - heading: Schemas
       buttons:
         - schemas/page

package/src/integration/index.ts

@@ -3,9 +3,6 @@ import type { AstroIntegration } from 'astro'
 import favicons from 'astro-favicons'
 import type { CollectionEntry } from 'astro:content'
 import merge from 'deepmerge'
-import fs from 'fs/promises'
-import yaml from 'js-yaml'
-import path from 'path'
 import virtual from 'vite-plugin-virtual'
 import { generateRadixColors } from './generate-colors'
 
@@ -21,7 +18,7 @@ interface Config {
   css?: string
   basePreset?: CollectionEntry<'presets'>['id']
   injectRoutes?: boolean
-  generateImageEntries?: boolean
+  // generateImageEntries?: boolean
   colors: {
     theme: 'light' | 'dark'
     light?: Color | undefined
@@ -38,7 +35,7 @@ const defaultConfig: Config = {
       brand: '#000',
     },
   },
-  generateImageEntries: false,
+  // generateImageEntries: false,
 }
 
 export default function fulldevIntegration(
@@ -174,33 +171,33 @@ export default function fulldevIntegration(
         // ----------------------
         // Generate image YAML files
         // ----------------------
-        if (config.generateImageEntries) {
-          const srcDir = path.join(process.cwd(), 'src')
-          const filesDir = path.join(srcDir, 'images')
-          const entriesDir = path.join(srcDir, 'content', 'images')
-
-          try {
-            await fs.mkdir(filesDir, { recursive: true })
-            await fs.mkdir(entriesDir, { recursive: true })
-
-            const files = await fs.readdir(filesDir)
-            files.forEach(async (file) => {
-              const filename = path.parse(file).name
-              const yamlPath = path.join(entriesDir, `${filename}.yml`)
-
-              try {
-                await fs.access(yamlPath)
-              } catch {
-                const yamlContent = yaml.dump({
-                  alt: '',
-                })
-                await fs.writeFile(yamlPath, yamlContent, 'utf8')
-              }
-            })
-          } catch (error) {
-            console.error('Error generating image YAML files:', error)
-          }
-        }
+        // if (config.generateImageEntries) {
+        //   const srcDir = path.join(process.cwd(), 'src')
+        //   const filesDir = path.join(srcDir, 'images')
+        //   const entriesDir = path.join(srcDir, 'content', 'images')
+
+        //   try {
+        //     await fs.mkdir(filesDir, { recursive: true })
+        //     await fs.mkdir(entriesDir, { recursive: true })
+
+        //     const files = await fs.readdir(filesDir)
+        //     files.forEach(async (file) => {
+        //       const filename = path.parse(file).name
+        //       const yamlPath = path.join(entriesDir, `${filename}.yml`)
+
+        //       try {
+        //         await fs.access(yamlPath)
+        //       } catch {
+        //         const yamlContent = yaml.dump({
+        //           alt: '',
+        //         })
+        //         await fs.writeFile(yamlPath, yamlContent, 'utf8')
+        //       }
+        //     })
+        //   } catch (error) {
+        //     console.error('Error generating image YAML files:', error)
+        //   }
+        // }
 
         // ----------------------
         // Inject routes

package/src/layouts/Layout.astro

@@ -1,6 +1,7 @@
 ---
 import type { ComponentProps, HTMLAttributes } from 'astro/types'
 import type { CollectionEntry } from 'astro:content'
+import Article from 'fulldev-ui/blocks/Article.astro'
 import Banner from 'fulldev-ui/blocks/Banner.astro'
 import Footer from 'fulldev-ui/blocks/Footer.astro'
 import Element from 'fulldev-ui/components/Element.astro'
@@ -77,14 +78,20 @@ const {
         />
       </slot>
       <main data-pagefind-body>
-        <slot />
-        <Sections {sections} />
+        <slot>
+          <Article />
+          <Sections {sections} />
+        </slot>
       </main>
       <slot name="toc">
-        <Toc
-          {render}
-          {...toc}
-        />
+        {
+          toc && (
+            <Toc
+              {render}
+              {...toc}
+            />
+          )
+        }
       </slot>
     </div>
     <slot name="footer">
@@ -105,25 +112,28 @@ const {
 
         body {
           --screen: 100vw;
+          display: flex;
+          flex-direction: column;
 
           background-color: var(--base-2);
           width: 100%;
+          min-height: 100vh;
           color: var(--base-11);
 
           .core {
             display: flex;
             position: relative;
+            flex-grow: 1;
+            height: 100%;
 
             main {
               --screen: 1280px;
-
               display: flex;
               flex: 1;
               flex-direction: column;
               background-color: var(--color-background);
               width: 100%;
               max-width: 100vw;
-              min-height: 100vh;
               overflow-x: hidden;
             }
           }

package/src/layouts/OverviewLayout.astro

@@ -6,16 +6,15 @@ import Intro from 'fulldev-ui/blocks/Intro.astro'
 import Products from 'fulldev-ui/blocks/Products.astro'
 import Sections from 'fulldev-ui/components/sections.astro'
 import Layout from 'fulldev-ui/layouts/Layout.astro'
-import { getCategoryPages } from 'fulldev-ui/utils/getCategoryPages'
-import { getChildPages } from 'fulldev-ui/utils/getChildPages.ts'
+import { getFolderChildren } from 'fulldev-ui/utils/getFolderChildren.ts'
+import { getReferenceChildren } from 'fulldev-ui/utils/getReferenceChildren'
 
 type Props = ComponentProps<typeof Layout>
 
 const { slug, sections, title, description } = Astro.props
 
-const childPages = await getChildPages(slug)
-const categoryPages = await getCategoryPages(slug)
-// const siblingPages = await getSiblingPages(slug)
+const folderChildren = await getFolderChildren(slug)
+const referenceChildren = await getReferenceChildren(slug)
 ---
 
 <Layout {...Astro.props}>
@@ -24,12 +23,14 @@ const categoryPages = await getCategoryPages(slug)
     text={description}
   />
   <Categories
-    cards={childPages}
+    component="Categories"
+    cards={folderChildren}
     structure="grid"
     panel
   />
   <Products
-    cards={categoryPages}
+    component="Products"
+    cards={referenceChildren}
     structure="grid"
   />
   <Article style={{ '--screen': '768px' }} />

package/src/schemas/components/footer.ts

@@ -22,3 +22,4 @@ export default z
     ),
   })
   .partial()
+  .passthrough()

package/src/schemas/components/header.ts

@@ -2,9 +2,12 @@ import { z } from 'astro:content'
 import buttons from './buttons'
 import logo from './logo'
 
-export default z
-  .object({
-    logo,
-    buttons,
-  })
-  .partial()
+export default z.boolean().or(
+  z
+    .object({
+      logo,
+      buttons,
+    })
+    .partial()
+    .passthrough()
+)

package/src/schemas/pageSchema.ts

@@ -1,12 +1,14 @@
 import { getEntries, getEntry, z } from 'astro:content'
 import { assign } from 'radash'
 import fulldevConfig from 'virtual:fulldev-ui/config'
+import footer from './components/footer'
+import header from './components/header'
 import image from './components/image'
 import images from './components/images'
 import sections from './components/sections'
-import categories from './utils/categories'
 import component from './utils/component'
 import navigation from './utils/navigation'
+import parents from './utils/parents'
 import pathSchema from './utils/pathSchema'
 
 const i18n = z
@@ -49,7 +51,7 @@ export default i18n.pipe(presets).pipe(
   z
     .object({
       component,
-      categories,
+      parents,
       theme: z.enum(['light', 'dark']),
       lang: z.string(),
       seo: z
@@ -63,11 +65,12 @@ export default i18n.pipe(presets).pipe(
       image,
       images,
       sections,
-      header: z.any(),
-      footer: z.any(),
+      header,
+      footer,
       navigation,
       toc: z.any(),
       sidebar: z.any(),
+      banner: z.any(),
     })
     .partial()
     .passthrough()

package/src/schemas/presetSchema.ts

@@ -1,13 +1,16 @@
 import { z } from 'astro:content'
+import footer from './components/footer'
+import header from './components/header'
 import image from './components/image'
 import sections from './components/sections'
-import categories from './utils/categories'
 import component from './utils/component'
+import navigation from './utils/navigation'
+import parents from './utils/parents'
 
 export default z
   .object({
     component,
-    categories,
+    parents,
     theme: z.enum(['light', 'dark']),
     lang: z.string(),
     seo: z
@@ -20,10 +23,11 @@ export default z
     description: z.string().optional(),
     image,
     sections,
-    header: z.any(),
-    footer: z.any(),
-    navigation: z.any(),
+    header,
+    footer,
+    navigation,
     toc: z.any(),
     sidebar: z.any(),
   })
   .partial()
+  .passthrough()

package/src/schemas/utils/navigation.ts

@@ -17,6 +17,7 @@
 // })
 
 import { z } from 'astro:content'
+import logo from '../components/logo'
 import pathSchema from '../utils/pathSchema'
 
 const button = pathSchema('pages').or(
@@ -43,7 +44,7 @@ const group = z
 
 export default z
   .object({
-    logo: z.string(),
+    logo,
     search: z.boolean(),
     sidebar: z.boolean(),
     toc: z.boolean(),

package/src/utils/{getChildPages.ts → getFolderChildren.ts}

@@ -1,7 +1,9 @@
 import { getCollection, type CollectionEntry } from 'astro:content'
 
 // Records that are in a folder with the current page's slug
-export const getChildPages = async (slug: CollectionEntry<'pages'>['slug']) =>
+export const getFolderChildren = async (
+  slug: CollectionEntry<'pages'>['slug']
+) =>
   (
     await getCollection(
       'pages',

package/src/utils/{getCategoryPages.ts → getReferenceChildren.ts}

@@ -1,11 +1,14 @@
 import { getCollection, type CollectionEntry } from 'astro:content'
 
 // Pages that reference the current page
-export const getCategoryPages = async (
+export const getReferenceChildren = async (
   slug: CollectionEntry<'pages'>['slug']
 ) =>
   (
     await getCollection('pages', (page) =>
-      page.data?.categories?.some((p: any) => p.slug === slug)
+      page.data?.parents?.some((p: any) => p.slug === slug)
     )
-  )?.map((page) => page.data)
+  )?.map(({ slug, data }) => ({
+    ...data,
+    href: `/${slug}/`,
+  }))

package/src/content/pages/layouts/pagelayout.mdx

@@ -1,21 +0,0 @@
----
-presets: [docs, blocks]
-
-title: PageLayout
----
-
-```astro live
----
-import Hero from 'fulldev-ui/blocks/Hero.astro'
-import PageLayout from 'fulldev-ui/layouts/PageLayout.astro'
----
-
-<PageLayout>
-  <Hero
-    heading="PageLayout"
-    text="The PageLayout component is used to wrap the content of a page."
-    align="center"
-    frame="viewport"
-  />
-</PageLayout>
-```

package/src/layouts/ContentLayout.astro

@@ -1,16 +0,0 @@
----
-import type { ComponentProps } from 'astro/types'
-import Article from 'fulldev-ui/blocks/Article.astro'
-import Layout from 'fulldev-ui/layouts/Layout.astro'
-
-type Props = ComponentProps<typeof Layout>
-
-const { sections, ...rest } = Astro.props
----
-
-<Layout
-  class:list="content-layout"
-  {...rest}
->
-  <Article />
-</Layout>

package/src/layouts/PageLayout.astro

@@ -1,15 +0,0 @@
----
-import type { ComponentProps } from 'astro/types'
-import Layout from 'fulldev-ui/layouts/Layout.astro'
-
-type Props = ComponentProps<typeof Layout>
-
-const { ...rest } = Astro.props
----
-
-<Layout
-  class:list="page-layout"
-  {...rest}
->
-  <slot />
-</Layout>

package/src/layouts/PostLayout.astro

@@ -1,21 +0,0 @@
----
-import type { ComponentProps } from 'astro/types'
-import Article from 'fulldev-ui/blocks/Article.astro'
-import Intro from 'fulldev-ui/blocks/Intro.astro'
-import Sections from 'fulldev-ui/components/sections.astro'
-import Layout from 'fulldev-ui/layouts/Layout.astro'
-
-type Props = ComponentProps<typeof Layout>
-
-const { render, sections, ...rest } = Astro.props
----
-
-<Layout {...Astro.props}>
-  <Intro
-    align="start"
-    {...rest}
-  />
-  <Article />
-  <Sections {sections} />
-  <slot />
-</Layout>