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

package/src/content/{docs → pages/docs}/components.mdx

@@ -1,11 +1,9 @@
 ---
+_layout: doc
 title: Components
+description: Features shared across components.
 ---
 
-# Components
-
-Features shared across components.
-
 ## Slots versus props
 
 You can use either slots or props. Props are recommended as they are type safe and work better in combination with content collections.

package/src/content/{docs → pages/docs}/customization.mdx

@@ -1,4 +1,5 @@
 ---
+_layout: doc
 title: Customization
 ---
 

package/src/content/{docs → pages/docs}/frameworks.mdx

@@ -1,4 +1,5 @@
 ---
+_layout: doc
 title: Frameworks
 ---
 

package/src/content/{docs → pages/docs}/generating-pages.mdx

@@ -1,4 +1,5 @@
 ---
+_layout: doc
 title: Generating Pages
 ---
 

package/src/content/{docs → pages/docs}/index.mdx

@@ -1,11 +1,9 @@
 ---
+_layout: doc
 title: Introduction
+description: Everything you need to rapidly build content-driven websites. Components, blocks, layouts and complete page generation.
 ---
 
-# Introduction
-
-Everything you need to rapidly build content-driven websites. Components, blocks, layouts and complete page generation.
-
 ## Why we built it
 
 After repeatedly encountering the same challenges in [our company's](https://full.dev) client projects, we decided to build this library. After successfully using it in production websites, we decided to open-source it to help others facing similar problems.

package/src/content/{docs → pages/docs}/installation.mdx

@@ -1,4 +1,5 @@
 ---
+_layout: doc
 title: Installation
 ---
 

package/src/content/{docs → pages/docs}/layouts.mdx

@@ -1,4 +1,5 @@
 ---
+_layout: doc
 title: Layouts
 ---
 

package/src/content/pages/index.mdx

@@ -1,62 +1,54 @@
 ---
-seo:
+head:
   title: Fulldev UI - Astro component and block library, open-source
   description: Make websites rapidly with pre-built components and blocks.
-  image: og-image.png
+  image: /og-image.png
 
 title: Home
 
-sections:
-  - component: Hero
+blocks:
+  - _block: Hero1
     badge:
-      text: 'Introducing v0.5: page building & generation'
+      text: 'Introducing v0.6: layouts & pagebuilding'
       href: /overview/installation/
     heading: Build complete websites with this Astro UI library
-    # heading: The Astro UI library to build complete websites
-    lead: 'Everything you need to rapidly build content-driven websites. Components, blocks, layouts and complete page generation.'
+    paragraph: 'Everything you need to rapidly build content-driven websites. Components, blocks, layouts and complete page generation.'
     buttons:
       - text: Get Started
         href: /docs/
       - text: GitHub
         href: https://github.com/fulldotdev/ui
         icon: brand-github
-    image: block-code.png
+        target: _blank
 
-  - component: Content
-    color: brand
-    label: Blocks
+  - _block: Feature1
+    tagline: Blocks
     heading: Use pre-built blocks with just props
     paragraph: We created a great gallery of blocks to build content sites with a modern look and feel, all of our blocks are build with components from the library to achieve a consistent look.
-    image: block-code.png
+    image: /block-code.png
     buttons:
-      - href: /blocks
+      - href: /blocks/
         icon: layout
         text: View blocks
 
-  - component: Content
-    color: brand
-    label: Components
+  - _block: Feature1
+    tagline: Components
     heading: Or build your own, with easy to use components
     paragraph: Our rich set of components make it easy to build your own blocks with great customizability through props and global theming.
-    image: component-code.png
-    reverse: odd
+    image: /component-code.png
     buttons:
-      - href: /components/badge
+      - text: View components
+        href: /components/badge/
         icon: code
-        text: View components
 
-  - component: Cta
-    size: lg
-    variant: primary
+  - _block: Cta1
     heading: Build content websites in a fraction of time
-    lead: A library of components and blocks to build content sites, fast.
+    paragraph: A library of components and blocks to build content sites, fast.
     buttons:
       - text: Get Started
-        href: /overview/installation
-        color: brand
+        href: /overview/installation/
       - text: Github
         href: https://github.com/fulldotdev/ui
-        target: _blank
         icon: brand-github
-        color: brand
+        target: _blank
 ---

package/src/content/{categories/mugs.md → pages/posts/post.md}

@@ -1,5 +1,5 @@
 ---
-title: Mug
+title: Post
 description: Lorem ipsum dolor sit
 ---
 

package/src/content/{products → pages/products}/product.md

@@ -1,8 +1,8 @@
 ---
-title: My Product Title
-categories: 
-  - mugs
-description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec auctor, libero at lacinia ferment
+title: Product
+parents: 
+  - categories/category
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit.
 price: 90
 images: 
   - placeholder.webp

package/src/css/theme.css

@@ -89,5 +89,7 @@
     --chart-3: 30 80% 55%;
     --chart-4: 280 65% 60%;
     --chart-5: 340 75% 55%;
+
+    color-scheme: dark;
   }
 }

package/src/images/favicon/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square150x150logo src="/favicon/mstile-150x150.png"/>
+      <TileColor>#fff</TileColor>
+    </tile>
+  </msapplication>
+</browserconfig>

package/src/images/favicon/favicon.svg

@@ -0,0 +1,16 @@
+<svg width="758" height="758" viewBox="0 0 758 758" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_45_5)">
+<rect width="758" height="758" fill="#FF5500"/>
+<rect x="-133" y="-133" width="1024" height="1024" fill="url(#paint0_radial_45_5)"/>
+<path d="M269.363 565C264.945 565 261.363 561.419 261.363 557V200.637C261.363 196.218 264.945 192.637 269.363 192.637H499.909C504.327 192.637 507.909 196.218 507.909 200.637V249.546C507.909 253.964 504.327 257.546 499.909 257.546H348.091C343.672 257.546 340.091 261.128 340.091 265.546V338.273C340.091 342.691 343.672 346.273 348.091 346.273H483.545C487.963 346.273 491.545 349.855 491.545 354.273V403.182C491.545 407.6 487.963 411.182 483.545 411.182H348.091C343.672 411.182 340.091 414.764 340.091 419.182V557C340.091 561.419 336.509 565 332.091 565H269.363Z" fill="#EEEEEC"/>
+</g>
+<defs>
+<radialGradient id="paint0_radial_45_5" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(379 379) rotate(45) scale(724.077)">
+<stop stop-color="#111110" stop-opacity="0.2"/>
+<stop offset="0.9" stop-color="#111110" stop-opacity="0"/>
+</radialGradient>
+<clipPath id="clip0_45_5">
+<rect width="758" height="758" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/src/images/favicon/manifest.webmanifest

@@ -0,0 +1,30 @@
+{
+  "name": "Fulldev UI",
+  "short_name": "Fulldev UI",
+  "description": "Fulldev UI",
+  "dir": "auto",
+  "lang": "en-GB",
+  "display": "standalone",
+  "display_override": [
+    "window-controls-overlay",
+    "standalone"
+  ],
+  "orientation": "any",
+  "start_url": "/?homescreen=1",
+  "background_color": "#fff",
+  "theme_color": "#fff",
+  "icons": [
+    {
+      "src": "/favicon/android-chrome-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "any"
+    },
+    {
+      "src": "/favicon/android-chrome-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "maskable"
+    }
+  ]
+}

package/src/images/favicon/safari-pinned-tab.svg

@@ -0,0 +1,16 @@
+<svg width="758" height="758" viewBox="0 0 758 758" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_45_5)">
+<rect width="758" height="758" fill="#FF5500"/>
+<rect x="-133" y="-133" width="1024" height="1024" fill="url(#paint0_radial_45_5)"/>
+<path d="M269.363 565C264.945 565 261.363 561.419 261.363 557V200.637C261.363 196.218 264.945 192.637 269.363 192.637H499.909C504.327 192.637 507.909 196.218 507.909 200.637V249.546C507.909 253.964 504.327 257.546 499.909 257.546H348.091C343.672 257.546 340.091 261.128 340.091 265.546V338.273C340.091 342.691 343.672 346.273 348.091 346.273H483.545C487.963 346.273 491.545 349.855 491.545 354.273V403.182C491.545 407.6 487.963 411.182 483.545 411.182H348.091C343.672 411.182 340.091 414.764 340.091 419.182V557C340.091 561.419 336.509 565 332.091 565H269.363Z" fill="#EEEEEC"/>
+</g>
+<defs>
+<radialGradient id="paint0_radial_45_5" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(379 379) rotate(45) scale(724.077)">
+<stop stop-color="#111110" stop-opacity="0.2"/>
+<stop offset="0.9" stop-color="#111110" stop-opacity="0"/>
+</radialGradient>
+<clipPath id="clip0_45_5">
+<rect width="758" height="758" fill="white"/>
+</clipPath>
+</defs>
+</svg>

package/src/images/favicon/yandex-browser-manifest.json

@@ -0,0 +1,9 @@
+{
+  "version": "1.0",
+  "api_version": 1,
+  "layout": {
+    "logo": "/favicon/yandex-browser-50x50.png",
+    "color": "#fff",
+    "show_title": true
+  }
+}

package/src/integration/index.ts

@@ -5,9 +5,14 @@ import favicons from 'astro-favicons'
 import liveCode from 'astro-live-code'
 import robotsTxt from 'astro-robots-txt'
 import { envField } from 'astro/config'
+import fs from 'fs'
+import yaml from 'js-yaml'
+import path from 'path'
+import { assign } from 'radash'
 import tailwindcss from 'tailwindcss'
 import tailwindcssNesting from 'tailwindcss/nesting'
 import { loadEnv } from 'vite'
+import virtual from 'vite-plugin-virtual'
 import tailwindConfig from '../../tailwind.config.ts'
 
 interface Config {
@@ -15,10 +20,15 @@ interface Config {
   company?: string
   css?: string
   injectRoutes?: boolean
+  cloudcannon?: boolean
+  cart?: boolean
+  overrides?: {
+    [k: string]: string
+  }
 }
 
 export default function fulldevIntegration(
-  config?: Partial<Config> | undefined
+  config: Partial<Config> | undefined
 ): AstroIntegration {
   return {
     name: '/integration',
@@ -64,6 +74,16 @@ export default function fulldevIntegration(
             }),
           ],
           vite: {
+            resolve: {
+              alias: {
+                ...config?.overrides,
+              },
+            },
+            plugins: [
+              virtual({
+                'virtual:fulldev-ui/config': config ?? {},
+              }),
+            ],
             css: {
               postcss: {
                 plugins: [tailwindcss(tailwindConfig), tailwindcssNesting],
@@ -88,6 +108,7 @@ export default function fulldevIntegration(
               }),
             ],
           })
+
         // ----------------------
         // Inject routes
         // ----------------------
@@ -96,22 +117,6 @@ export default function fulldevIntegration(
             pattern: '/[...page]',
             entrypoint: 'fulldev-ui/pages/[...page].astro',
           })
-          injectRoute({
-            pattern: '/[...doc]',
-            entrypoint: 'fulldev-ui/pages/[...doc].astro',
-          })
-          injectRoute({
-            pattern: '/[...category]',
-            entrypoint: 'fulldev-ui/pages/[...category].astro',
-          })
-          injectRoute({
-            pattern: '/[...post]',
-            entrypoint: 'fulldev-ui/pages/[...post].astro',
-          })
-          injectRoute({
-            pattern: '/[...product]',
-            entrypoint: 'fulldev-ui/pages/[...product].astro',
-          })
         }
 
         // ----------------------
@@ -119,6 +124,10 @@ export default function fulldevIntegration(
         // ----------------------
         config?.css && injectScript('page-ssr', `import "${config?.css}";`)
 
+        // ----------------------
+        // merge Cloudcannon configs
+        // ----------------------
+
         // ----------------------
         // Generate image YAML files
         // ----------------------
@@ -150,6 +159,28 @@ export default function fulldevIntegration(
         //   }
         // }
       },
+      'astro:build:done': async () => {
+        if (config?.cloudcannon) {
+          const __dirname = path.dirname(new URL(import.meta.url).pathname)
+          const libDir = path.join(__dirname, '../../cloudcannon.config.yml')
+          const userDir = path.join(process.cwd(), 'cloudcannon.config.yml')
+
+          console.log({ libDir, userDir })
+
+          const libConfig = yaml.load(
+            fs.readFileSync(path.resolve(libDir), 'utf8')
+          )
+
+          const userConfig = yaml.load(
+            fs.readFileSync(path.resolve(userDir), 'utf8')
+          )
+
+          const mergedConfig = assign(libConfig || {}, userConfig || {})
+          const yamlContent = yaml.dump(mergedConfig)
+
+          await fs.promises.writeFile(userDir, yamlContent, 'utf8')
+        }
+      },
     },
   }
 }

package/src/layouts/{CategoryLayout.astro → Category.astro}

@@ -1,25 +1,28 @@
 ---
+import type { ComponentProps } from 'astro/types'
 import type { CollectionEntry } from 'astro:content'
 import { getCollection } from 'astro:content'
-import Intro from 'fulldev-ui/blocks/Intro.astro'
-import Products from 'fulldev-ui/blocks/Products.astro'
+import Products1 from 'fulldev-ui/blocks/Products1.astro'
 import Carousel from 'fulldev-ui/components/Carousel.astro'
 import Element from 'fulldev-ui/components/Element.astro'
+import Layout from 'fulldev-ui/components/Layout.astro'
 import Prose from 'fulldev-ui/components/Prose.astro'
 import Select from 'fulldev-ui/components/Select.astro'
-import Layout from 'fulldev-ui/layouts/Layout.astro'
-import { getHref } from 'fulldev-ui/utils/getHref'
+import type { PageSchema } from 'fulldev-ui/schemas/page.ts'
+import { getHref } from 'fulldev-ui/utils/getHref.ts'
 
-type Props = CollectionEntry<'categories'>
+interface Props extends ComponentProps<typeof Layout>, PageSchema {
+  render: CollectionEntry<'pages'>['render']
+  slug: CollectionEntry<'pages'>['slug']
+}
 
-const { render, slug } = Astro.props
-const { title, description } = Astro.props.data
+const { render, slug, title, description } = Astro.props
 
-const categories = await getCollection('categories', ({ data }) =>
+const categories = await getCollection('pages', ({ data }) =>
   data.categories?.some((c) => c.slug.includes(slug))
 )
 
-const products = await getCollection('products', ({ data }) =>
+const products = await getCollection('pages', ({ data }) =>
   data.categories?.some((c) => c.slug.includes(slug))
 )
 
@@ -70,18 +73,21 @@ const sorts = [
   })
 </script>
 
-<Layout {...Astro.props}>
-  <Intro
+<Layout
+  class:list="category"
+  {...Astro.props}
+>
+  <!-- <Intro1
     heading={title}
-    paragraph={description}
-  />
+    text={description}
+  /> -->
   <Carousel>
     {
       categories.map((category) => (
         <Element
           as="a"
           class:list="item"
-          href={getHref('categories', category.slug)}
+          href={getHref(category.slug)}
         >
           {category.data.title}
         </Element>
@@ -99,7 +105,7 @@ const sorts = [
   </Element>
   {
     sorts.map((sort: any) => (
-      <Products
+      <Products1
         class:list={sort.option !== 'Aanbevolen' ? 'hide' : ''}
         products={sort.products}
       />

package/src/layouts/Doc.astro

@@ -0,0 +1,70 @@
+---
+import type { ComponentProps } from 'astro/types'
+import type { CollectionEntry } from 'astro:content'
+import Footer from 'fulldev-ui/blocks/Footer.astro'
+import Header from 'fulldev-ui/blocks/Header.astro'
+import Container from 'fulldev-ui/components/Container.astro'
+import Element from 'fulldev-ui/components/Element.astro'
+import Heading from 'fulldev-ui/components/Heading.astro'
+import Layout from 'fulldev-ui/components/Layout.astro'
+import Paragraph from 'fulldev-ui/components/Paragraph.astro'
+import Prose from 'fulldev-ui/components/Prose.astro'
+import Sidebar from 'fulldev-ui/components/Sidebar.astro'
+import Toc from 'fulldev-ui/components/Toc.astro'
+import type { PageSchema } from 'fulldev-ui/schemas/page.ts'
+
+interface Props extends ComponentProps<typeof Layout>, PageSchema {
+  render: CollectionEntry<'pages'>['render']
+}
+
+const { header, sidebar, render, title, description, footer } = Astro.props
+
+const { Content } = await render()
+---
+
+<Layout
+  class:list="doc"
+  {...Astro.props}
+>
+  <Header
+    {...sidebar}
+    {...header}
+  />
+  <Container class:list="doc-container">
+    <Sidebar {...sidebar} />
+    <Element
+      class:list="doc-main"
+      as="main"
+    >
+      <Prose>
+        <Heading
+          as="h1"
+          size="4xl"
+          text={title}
+        />
+        <Paragraph
+          muted
+          size="lg"
+          text={description}
+        />
+        <Content />
+      </Prose>
+      <Toc {render} />
+    </Element>
+  </Container>
+  <Footer {...footer} />
+</Layout>
+
+<style is:global>
+  @layer fulldev {
+    .doc {
+      .doc-container {
+        @apply flex gap-x-gutter;
+      }
+
+      .doc-main {
+        @apply flex grow justify-evenly gap-x-gutter;
+      }
+    }
+  }
+</style>

package/src/layouts/Job.astro

@@ -0,0 +1,62 @@
+---
+import type { ComponentProps } from 'astro/types'
+import type { CollectionEntry } from 'astro:content'
+import { getEntries } from 'astro:content'
+import Content3 from 'fulldev-ui/blocks/Content3.astro'
+import Footer from 'fulldev-ui/blocks/Footer.astro'
+import Header from 'fulldev-ui/blocks/Header.astro'
+import Block from 'fulldev-ui/components/Block.astro'
+import Element from 'fulldev-ui/components/Element.astro'
+import Layout from 'fulldev-ui/components/Layout.astro'
+import type { PageSchema } from 'fulldev-ui/schemas/page.ts'
+import { getHref } from 'fulldev-ui/utils/getHref.ts'
+
+interface Props extends ComponentProps<typeof Layout>, PageSchema {
+  render: CollectionEntry<'pages'>['render']
+}
+
+const {
+  title,
+  description,
+  list,
+  button,
+  buttons,
+  header,
+  sidebar,
+  render,
+  parents,
+  blocks,
+  footer,
+} = Astro.props
+
+const parentEntries = parents && (await getEntries(parents))
+
+const { Content } = await render()
+---
+
+<Layout
+  class:list="job"
+  {...Astro.props}
+>
+  <Header
+    {...sidebar}
+    {...header}
+  />
+  <Element as="main">
+    <Content3
+      badges={parentEntries?.map((parent) => ({
+        text: parent.data.title,
+        href: getHref(parent.slug),
+      }))}
+      heading={title}
+      paragraph={description}
+      {list}
+      {button}
+      {buttons}
+    >
+      <Content />
+    </Content3>
+    {blocks?.map((block) => <Block {...block} />)}
+  </Element>
+  <Footer {...footer} />
+</Layout>