fulldev-ui 0.6.0-beta.2 → 0.6.0-beta.3

package/src/schemas/components/rating.ts

@@ -1,15 +1,10 @@
 import { z } from 'astro:content'
-import avatar from './avatar'
-import avatars from './avatars'
-import text from './text'
 
-export default z.number().or(
-  z
-    .object({
-      value: z.number(),
-      avatar,
-      avatars,
-      text,
-    })
-    .partial()
-)
+export const ratingSchema = z
+  .object({
+    score: z.number().optional(),
+    size: z.enum(['sm', 'md', 'lg']).default('md').optional(),
+  })
+  .strict()
+
+export type RatingSchema = z.infer<typeof ratingSchema>

package/src/schemas/components/sidebar.ts

@@ -1,16 +1,18 @@
 import { z } from 'astro:content'
-import logo from '../components/logo'
-import menu from '../components/menu'
-import heading from './heading'
-import themer from './themer'
+import { logoSchema } from '../components/logo'
+import { headingSchema } from './heading'
+import { linkSchema } from './link'
+import { menuSchema } from './menu'
 
-export default z
+export const sidebarSchema = z
   .object({
-    themer,
-    logo,
-    heading,
-    menu,
+    company: z.string().optional(),
+    logo: logoSchema.optional(),
+    heading: headingSchema.shape.text,
+    themer: z.boolean().optional(),
+    menus: menuSchema.array().optional(),
+    links: linkSchema.array().optional(),
   })
-  .partial()
-  .passthrough()
-  .optional()
+  .strict()
+
+export type SidebarSchema = z.infer<typeof sidebarSchema>

package/src/schemas/components/social.ts

@@ -1,3 +1,18 @@
 import { z } from 'astro:content'
+import { iconSchema } from './icon'
 
-export default z.string()
+export const socialSchema = z
+  .object({
+    icon: iconSchema.optional(),
+    text: z.string().optional(),
+    href: z.string().optional(),
+    target: z.literal('_blank').default('_blank').optional(),
+    size: z.enum(['sm', 'md', 'lg']).default('sm').optional(),
+    variant: z
+      .enum(['primary', 'secondary', 'outline', 'ghost'])
+      .default('secondary')
+      .optional(),
+  })
+  .strict()
+
+export type ButtonSchema = z.infer<typeof socialSchema>

package/src/schemas/components/tagline.ts

@@ -1,3 +1,9 @@
 import { z } from 'astro:content'
 
-export default z.string()
+export const taglineSchema = z
+  .object({
+    text: z.string().optional(),
+  })
+  .strict()
+
+export type TaglineSchema = z.infer<typeof taglineSchema>

package/src/schemas/docSchema.ts

@@ -1,9 +1,13 @@
 import { z } from 'astro:content'
-import title from 'fulldev-ui/schemas/fields/title'
+import { headSchema } from 'fulldev-ui/schemas/components/head.ts'
+import { imageSchema } from './imageSchema'
 
 export const docSchema = z
   .object({
-    title,
+    title: z.string().optional(),
+    description: z.string().optional(),
+    image: imageSchema.optional(),
+    head: headSchema.optional(),
   })
   .strict()
 

package/src/schemas/imageSchema.ts

@@ -1,6 +1,6 @@
 import { z } from 'astro:content'
 
-export default z
+export const imageSchema = z
   .object({
     id: z.string(),
     src: z.string(),
@@ -10,3 +10,32 @@ export default z
     format: z.string(),
   })
   .passthrough()
+
+export type ImageSchema = z.infer<typeof imageSchema>
+
+export const imageLoader = async () => {
+  const files = import.meta.glob('/src/images/**/*.{webp,png,jpg,jpeg,svg}', {
+    eager: true,
+  })
+  const entries = import.meta.glob('/src/images/**/*.{yml,yaml,json}', {
+    eager: true,
+  })
+
+  const allImages = Object.entries(files).map(([src, file]) => {
+    const id = src.split('/images/').pop()
+    const matchPath = Object.keys(entries).find(
+      (entry) => entry.split('.').shift() === src
+    ) as any
+    const matchFile = entries[matchPath]
+    const matchData = matchFile ? (matchFile as any).default : {}
+    const fileData = file ? (file as any).default : {}
+    return {
+      id,
+      ...fileData,
+      src,
+      ...matchData,
+    }
+  })
+
+  return allImages as any
+}

package/src/schemas/layoutSchema.ts

@@ -1,28 +1,22 @@
 import { z } from 'astro:content'
-import banner from 'fulldev-ui/schemas/components/banner'
-import footer from 'fulldev-ui/schemas/components/footer'
-import header from 'fulldev-ui/schemas/components/header'
-import sidebar from 'fulldev-ui/schemas/components/sidebar'
-import subheader from 'fulldev-ui/schemas/components/subheader'
-import seo from './fields/seo'
+import { footerSchema } from 'fulldev-ui/schemas/components/footer'
+import { headSchema } from 'fulldev-ui/schemas/components/head.ts'
+import { headerSchema } from 'fulldev-ui/schemas/components/header'
+import { linkSchema } from 'fulldev-ui/schemas/components/link.ts'
+import { sidebarSchema } from 'fulldev-ui/schemas/components/sidebar'
+import { bannerSchema } from './blocks/banner'
+import { navigationSchema } from './components/navigation'
 
 export const layoutSchema = z
   .object({
-    theme: z.any(),
-    code: z
-      .object({
-        head: z.string().optional(),
-        body: z.string().optional(),
-      })
-      .optional(),
-    seo,
-    banner,
-    header,
-    subheader,
-    footer,
-    sidebar,
+    head: headSchema.optional(),
+    banner: bannerSchema.optional(),
+    navigation: navigationSchema.optional(),
+    header: headerSchema.optional(),
+    subheader: linkSchema.array().optional(),
+    sidebar: sidebarSchema.optional(),
+    footer: footerSchema.optional(),
   })
   .strict()
-  .nullable()
 
 export type LayoutSchema = z.infer<typeof layoutSchema>

package/src/schemas/pageSchema.ts

@@ -1,19 +1,16 @@
 import { z } from 'astro:content'
-import title from 'fulldev-ui/schemas/fields/title'
-import sections from './components/sections'
-import description from './fields/description'
-import href from './fields/href'
-import image from './fields/image'
-import seo from './fields/seo'
+import { blockSchema } from 'fulldev-ui/schemas/components/block.ts'
+import { headSchema } from 'fulldev-ui/schemas/components/head.ts'
+import { imageSchema } from 'fulldev-ui/schemas/components/image.ts'
 
 export const pageSchema = z
   .object({
-    seo,
-    title,
-    description,
-    image,
-    sections,
-    href,
+    href: z.string().optional(),
+    title: z.string().optional(),
+    description: z.string().optional(),
+    image: imageSchema.optional(),
+    head: headSchema.optional(),
+    blocks: blockSchema.array().optional(),
   })
   .strict()
 

package/src/schemas/postSchema.ts

@@ -1,15 +1,13 @@
 import { z } from 'astro:content'
-import image from 'fulldev-ui/schemas/components/image'
-import sections from 'fulldev-ui/schemas/components/sections'
-import description from 'fulldev-ui/schemas/fields/description'
-import title from 'fulldev-ui/schemas/fields/title'
+import { headSchema } from 'fulldev-ui/schemas/components/head.ts'
+import { imageSchema } from 'fulldev-ui/schemas/components/image.ts'
 
 export const postSchema = z
   .object({
-    title,
-    description,
-    image,
-    sections,
+    title: z.string().optional(),
+    description: z.string().optional(),
+    image: imageSchema.optional(),
+    head: headSchema.optional(),
   })
   .strict()
 

package/src/schemas/productSchema.ts

@@ -1,22 +1,22 @@
 import { z } from 'astro:content'
-import categories from 'fulldev-ui/schemas/fields/categories'
-import description from 'fulldev-ui/schemas/fields/description'
-import images from 'fulldev-ui/schemas/fields/images'
-import title from 'fulldev-ui/schemas/fields/title'
-import order from './fields/order'
-import price from './fields/price'
-import soldout from './fields/soldout'
-import variants from './fields/variants'
+import { headSchema } from 'fulldev-ui/schemas/components/head.ts'
+import { imageSchema } from 'fulldev-ui/schemas/components/image.ts'
+import pathSchema from 'fulldev-ui/schemas/utils/pathSchema.ts'
+import { priceSchema } from './components/price'
 
-export const productSchema = z.object({
-  soldout,
-  order,
-  title,
-  description,
-  price,
-  categories,
-  images,
-  variants,
-})
+export const productSchema = z
+  .object({
+    title: z.string().optional(),
+    description: z.string().optional(),
+    image: imageSchema.optional(),
+    order: z.number().optional(),
+    price: priceSchema.shape.amount,
+    categories: pathSchema('categories').array().optional(),
+    images: imageSchema.array().optional(),
+    head: headSchema.optional(),
+    variants: z.record(z.string(), z.string().array()).optional(),
+    soldout: z.boolean().optional(),
+  })
+  .strict()
 
 export type ProductSchema = z.infer<typeof productSchema>

package/src/types/global-props.ts

@@ -5,12 +5,3 @@ export type GlobalProps = {
   size?: 'sm' | 'md' | 'lg' | string | number | null | undefined
   contrast?: boolean | undefined
 }
-
-// declare global {
-//   type GlobalProps = {
-//     theme?: 'light' | 'dark' | undefined
-//     color?: 'base' | 'brand' | undefined
-//     size?: 'sm' | 'md' | 'lg' | undefined
-//     contrast?: boolean | undefined
-//   }
-// }

package/src/types/{virtual-modules.d.ts → virtual.d.ts}

@@ -1,4 +1,4 @@
-declare module 'virtual:*' {
+declare module 'virtual:fulldev-ui/config' {
   import type { Config } from 'fulldev-ui/integration'
   const content: Config
   export default content

package/src/utils/getHref.ts

@@ -15,8 +15,9 @@ export function getHref(
   slug: CollectionEntry<ContentCollectionKey>['slug']
 ) {
   let href
-  if (slug === 'index') href = `/`
-  else if (slug) href = `/${routes[collection]}/${slug}/`
+  if (collection === 'pages' && slug === 'index') href = `/`
+  else if (slug === 'index') href = `/${routes[collection]}/`
+  else href = `/${routes[collection]}/${slug}/`
   href = href?.replace('//', '/')
   return href
 }

package/tsconfig.json

@@ -4,9 +4,7 @@
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "fulldev-ui/*": [
-        "src/*"
-      ]
+      "fulldev-ui/*": ["src/*"],
     }
   },
 }

package/src/blocks/Banner.astro

@@ -1,35 +0,0 @@
----
-import type { ComponentProps } from 'astro/types'
-import Element from 'fulldev-ui/components/Element.astro'
-import Text from 'fulldev-ui/components/Text.astro'
-
-type Props = {
-  size?: 'sm' | 'md' | 'lg' | undefined
-  text?: ComponentProps<typeof Text>['text']
-}
-
-const { size = 'sm', text, ...rest } = Astro.props
----
-
-<Element
-  class:list={'banner'}
-  as="header"
-  {size}
-  {...rest}
->
-  <Text text={text} />
-</Element>
-
-<style is:global>
-  @layer fulldev {
-    .banner {
-      @apply relative z-50 flex w-full items-center justify-center overflow-hidden bg-primary px-gutter text-center text-sm text-primary-foreground;
-      height: var(--banner-height);
-
-      &,
-      & ~ * {
-        --banner-height: 32px;
-      }
-    }
-  }
-</style>

package/src/blocks/Categories.astro

@@ -1,12 +0,0 @@
----
-import Section from 'fulldev-ui/components/Section.astro'
-
-const { ...rest } = Astro.props
----
-
-<Section
-  class:list="categories"
-  structure="grid"
-  position="inset"
-  {...rest}
-/>

package/src/blocks/Colleagues.astro

@@ -1,12 +0,0 @@
----
-import Section from 'fulldev-ui/components/Section.astro'
-
-const { ...rest } = Astro.props
----
-
-<Section
-  class:list="colleagues"
-  structure="grid"
-  position="inset"
-  {...rest}
-/>

package/src/blocks/Contact.astro

@@ -1,117 +0,0 @@
----
-import Channels from 'fulldev-ui/components/Channels.astro'
-import Element from 'fulldev-ui/components/Element.astro'
-import Form from 'fulldev-ui/components/Form.astro'
-import Heading from 'fulldev-ui/components/Heading.astro'
-import Image from 'fulldev-ui/components/Image.astro'
-import Paragraph from 'fulldev-ui/components/Paragraph.astro'
-import Socials from 'fulldev-ui/components/Socials.astro'
-import Tagline from 'fulldev-ui/components/Tagline.astro'
-
-const {
-  as = 'section',
-  size = 'md',
-  variant = 1,
-  heading,
-  form,
-  text,
-  tagline,
-  googleMaps,
-  paragraph,
-  buttons,
-  socials,
-  position,
-  image,
-  channels,
-  level = 1,
-  ...rest
-} = Astro.props
----
-
-<Element
-  class:list="contact"
-  {as}
-  {size}
-  {variant}
-  {...rest}
->
-  <Element class:list="contact-container">
-    <Element class:list="contact-segment">
-      <Element class:list="contact-content">
-        <Tagline text={tagline} />
-        <Heading
-          size={'sm'}
-          level={level}
-          text={heading}
-        />
-        <Paragraph text={paragraph} />
-      </Element>
-      <Channels {channels} />
-      <Socials {socials} />
-      <Form
-        action="/thank-you"
-        method="POST"
-        {...form}
-      />
-    </Element>
-    <Image
-      class:list="contact-image"
-      {position}
-      {...image}
-    />
-  </Element>
-</Element>
-
-<style is:global>
-  @layer fulldev {
-    .contact {
-      @apply relative w-full;
-
-      .contact-container {
-        @apply mx-auto flex h-full w-full flex-col;
-      }
-
-      .contact-segment {
-        @apply z-10 flex flex-col items-start gap-8;
-      }
-
-      .contact-content {
-        @apply flex max-w-screen-md flex-col gap-6;
-      }
-
-      &.dark {
-        @apply bg-background;
-      }
-
-      /* Narrow left aligned */
-      &.variant-1 {
-        .contact-container {
-          @apply max-w-screen-md px-gutter py-8;
-        }
-
-        .contact-segment {
-          @apply gap-8 py-16;
-        }
-
-        .content-image {
-          @apply rounded-lg;
-        }
-      }
-
-      /* Split */
-      &.variant-2 {
-        .contact-container {
-          @apply container gap-x-gutter gap-y-16 py-20 lg:grid lg:grid-cols-2 lg:items-center;
-        }
-
-        .contact-segment {
-          @apply max-w-xl;
-        }
-
-        .contact-image {
-          @apply rounded-lg;
-        }
-      }
-    }
-  }
-</style>

package/src/blocks/Content.astro

@@ -1,130 +0,0 @@
----
-import type { ComponentProps, HTMLAttributes, HTMLTag } from 'astro/types'
-import Badge from 'fulldev-ui/components/Badge.astro'
-import Buttons from 'fulldev-ui/components/Buttons.astro'
-import Element from 'fulldev-ui/components/Element.astro'
-import Heading from 'fulldev-ui/components/Heading.astro'
-import Image from 'fulldev-ui/components/Image.astro'
-import Lead from 'fulldev-ui/components/Lead.astro'
-import Paragraph from 'fulldev-ui/components/Paragraph.astro'
-import Rating from 'fulldev-ui/components/Rating.astro'
-import Tagline from 'fulldev-ui/components/Tagline.astro'
-
-interface Props extends HTMLAttributes<'section'> {
-  rating?: ComponentProps<typeof Rating> | undefined
-  badge?: ComponentProps<typeof Badge> | undefined
-  tagline?: ComponentProps<typeof Tagline>['text']
-  heading?: ComponentProps<typeof Heading>['text']
-  lead?: ComponentProps<typeof Lead>['text']
-  paragraph?: ComponentProps<typeof Paragraph>['text']
-  buttons?: ComponentProps<typeof Buttons>['buttons']
-  image?: ComponentProps<typeof Image>['id']
-  level?: ComponentProps<typeof Heading>['level']
-  as?: HTMLTag
-  size?: 'sm' | 'md' | 'lg' | undefined
-  variant?: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | undefined
-}
-
-const {
-  as = 'section',
-  size = 'md',
-  variant = 1,
-  level = 2,
-  rating,
-  tagline,
-  badge,
-  heading,
-  lead,
-  paragraph,
-  buttons,
-  image,
-  ...rest
-} = Astro.props
----
-
-<Element
-  class:list="content"
-  {as}
-  {size}
-  {variant}
-  {...rest}
->
-  <Element class:list="content-container">
-    <Element class:list="content-segment">
-      <Element class:list="content-content">
-        <Rating
-          {size}
-          {...rating}
-        />
-        <Tagline
-          text={tagline}
-          {size}
-        />
-        <Badge
-          {size}
-          {...badge}
-        />
-        <Heading
-          text={heading}
-          {level}
-          {size}
-        />
-        <Lead
-          text={lead}
-          {size}
-        />
-        <Paragraph
-          text={paragraph}
-          {size}
-        />
-        <slot name="content" />
-      </Element>
-      <Buttons
-        variant="secondary"
-        {size}
-        {buttons}
-      />
-      <slot name="segment" />
-    </Element>
-    <Image
-      class:list="content-image"
-      {...image}
-    />
-    <slot />
-  </Element>
-</Element>
-
-<style is:global>
-  @layer fulldev {
-    .content {
-      @apply relative w-full;
-
-      .content-container {
-        @apply flex h-full flex-col;
-      }
-
-      .content-segment {
-        @apply z-10 flex flex-col items-start gap-8;
-      }
-
-      .content-content {
-        @apply flex max-w-screen-md flex-col gap-6;
-      }
-
-      &.dark {
-        @apply bg-background;
-      }
-
-      /* Split */
-      &.variant-1 {
-        .content-container {
-          @apply container py-16 lg:grid lg:grid-cols-2 lg:items-center;
-        }
-
-        .content-image {
-          @apply rounded-lg;
-        }
-      }
-    }
-  }
-</style>

package/src/blocks/Cta.astro

@@ -1,13 +0,0 @@
----
-import Section from 'fulldev-ui/components/Section.astro'
-
-const { ...rest } = Astro.props
----
-
-<Section
-  class:list="cta"
-  variant="primary"
-  size="lg"
-  panel
-  {...rest}
-/>

package/src/blocks/Excerpt.astro

@@ -1,12 +0,0 @@
----
-import Section from 'fulldev-ui/components/Section.astro'
-
-const { ...rest } = Astro.props
----
-
-<Section
-  level={1}
-  size="lg"
-  variant="primary"
-  {...rest}
-/>