fulldev-ui 0.4.29 → 0.5.0-beta.1

package/src/images/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/integration/generate-colors.ts

@@ -1,3 +1,5 @@
+// Below code is taken from Radix UI, therefore it does not satisfy Astro strictest tsconfig.
+// @ts-nocheck
 import * as RadixColors from '@radix-ui/colors'
 import BezierEasing from 'bezier-easing'
 import Color from 'colorjs.io'

package/src/integration/index.ts

@@ -1,5 +1,10 @@
+import viteYaml from '@rollup/plugin-yaml'
 import type { AstroIntegration } from 'astro'
+import favicons from 'astro-favicons'
 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'
 
@@ -10,12 +15,16 @@ type Color = {
 }
 
 interface Config {
+  favicon?: string
+  company?: string
   css?: string
   injectRoutes?: boolean
+  overrideComponents?: boolean
+  generateImageEntries?: boolean
   colors: {
     theme: 'light' | 'dark'
-    light?: Color
-    dark?: Color
+    light?: Color | undefined
+    dark?: Color | undefined
   }
 }
 
@@ -28,11 +37,13 @@ const defaultConfig: Config = {
       brand: '#000',
     },
   },
+  generateImageEntries: false,
 }
+
 export default function fulldevIntegration(
-  userConfig?: Partial<Config>
+  userConfig?: Partial<Config> | undefined
 ): AstroIntegration {
-  const config = merge(defaultConfig ?? {}, userConfig ?? {})
+  const config = merge(defaultConfig, userConfig ?? {})
 
   return {
     name: '/integration',
@@ -44,6 +55,21 @@ export default function fulldevIntegration(
         injectRoute,
       }) => {
         // ----------------------
+        // Inject favicon integration
+        // ----------------------
+        config.favicon &&
+          config.company &&
+          updateConfig({
+            integrations: [
+              favicons({
+                path: 'favicon',
+                masterPicture: config.favicon,
+                appName: config.company,
+                appShortName: config.company,
+              }),
+            ],
+          })
+        // ----------------------
         // Inject css
         // ----------------------
         config?.css && injectScript('page-ssr', `import "${config?.css}";`)
@@ -64,7 +90,7 @@ export default function fulldevIntegration(
           const scaleToString = (
             scale: any,
             palette: 'base' | 'brand',
-            alpha?: boolean
+            alpha?: boolean | undefined
           ) =>
             scale
               .map(
@@ -123,11 +149,14 @@ export default function fulldevIntegration(
         updateConfig({
           vite: {
             plugins: [
+              viteYaml(),
               virtual({
                 'virtual:astro/config': `export default ${JSON.stringify(astroConfig)}`,
-                'virtual:fulldev-ui/config': `export default ${JSON.stringify(config)}`,
+                'virtual:fulldev-ui/config': `export default ${JSON.stringify({
+                  ...config,
+                })}`,
                 'virtual:colors.css': css,
-              }),
+              }) as any,
             ],
             css: {
               preprocessorOptions: {
@@ -141,6 +170,37 @@ export default function fulldevIntegration(
 
         injectScript('page-ssr', `import "virtual:colors.css";`)
 
+        // ----------------------
+        // 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)
+          }
+        }
+
         // ----------------------
         // Inject routes
         // ----------------------

package/src/layouts/BlockLayout.astro

@@ -1,24 +1,19 @@
 ---
-import type { CollectionEntry } from 'astro:content'
+import type { ComponentProps } from 'astro/types'
 import Intro from 'fulldev-ui/blocks/Intro.astro'
 import Layout from 'fulldev-ui/layouts/Layout.astro'
 
-type Props = CollectionEntry<'pages'>
+type Props = ComponentProps<typeof Layout>
 
-const { data, render } = Astro.props
+const { render, title, sections, ...rest } = Astro.props
 const { Content } = await render()
 ---
 
-<Layout {...Astro.props}>
-  <Intro
-    variant="ghost"
-    size="md"
-    style={{
-      paddingBottom: '0px',
-      borderColor: 'transparent',
-    }}
-    {...data}
-  />
-  <Content />
-  <slot />
+<Layout
+  class:list="block-layout"
+  {render}
+  {...rest}
+>
+  <Intro heading={title} />
+  {Content && <Content />}
 </Layout>

package/src/layouts/ContactLayout.astro

@@ -0,0 +1,21 @@
+---
+import type { ComponentProps } from 'astro/types'
+import Sections from 'fulldev-ui/components/sections.astro'
+import Layout from 'fulldev-ui/layouts/Layout.astro'
+import Contact from '../blocks/Contact.astro'
+
+type Props = ComponentProps<typeof Layout> & {
+  contactProps: ComponentProps<typeof Contact>
+}
+
+const { render, sections, contactProps, ...rest } = Astro.props
+---
+
+<Layout {...Astro.props}>
+  <Contact
+    level={1}
+    {...rest}
+  />
+  <Sections {sections} />
+  <slot />
+</Layout>

package/src/layouts/ContentLayout.astro

@@ -0,0 +1,16 @@
+---
+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/DocsLayout.astro

@@ -0,0 +1,85 @@
+---
+import type { ComponentProps } from 'astro/types'
+import Button from 'fulldev-ui/components/Button.astro'
+import Element from 'fulldev-ui/components/Element.astro'
+import Prose from 'fulldev-ui/components/experimental/Prose.astro'
+import Layout from 'fulldev-ui/layouts/Layout.astro'
+import { crush } from 'radash'
+
+type Props = ComponentProps<typeof Layout>
+
+const { render, slug, navigation, ...rest } = Astro.props
+const { Content } = await render()
+
+const flatButtons = crush((navigation as any)?.buttons ?? {})
+const slugs = Object.entries(flatButtons)
+  .map(([key, value]) => (key.endsWith('.slug') ? value : null))
+  .filter(Boolean)
+const slugIndex = slugs.findIndex((val) => val === slug)
+
+const prevSlug = slugs[slugIndex - 1]
+const nextSlug = slugs[slugIndex + 1]
+---
+
+<Layout
+  class:list="docs-layout"
+  {render}
+  {slug}
+  {navigation}
+  {...rest}
+>
+  <Prose>
+    {Content && <Content />}
+    <Element class:list={['prev-next', { 'next-only': !prevSlug }]}>
+      <Button
+        if={prevSlug}
+        slug={prevSlug}
+        icon="arrow-left"
+        variant="secondary"
+      />
+      <Button
+        if={nextSlug}
+        slug={nextSlug}
+        icon="arrow-right"
+        variant="secondary"
+        reverse={true}
+      />
+    </Element>
+  </Prose>
+</Layout>
+
+<style lang="scss" is:global>
+  @layer fulldev {
+    .docs-layout {
+      .prose {
+        --screen: 768px;
+        padding: var(--space-6) var(--gutter);
+        color: var(--color-12);
+
+        > h1 + p {
+          color: var(--color-11);
+        }
+
+        > a,
+        > p > a {
+          color: var(--brand-11);
+
+          &:hover {
+            color: var(--brand-12);
+          }
+        }
+
+        .prev-next {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-top: var(--space-7);
+
+          &.next-only {
+            justify-content: flex-end;
+          }
+        }
+      }
+    }
+  }
+</style>

package/src/layouts/Layout.astro

@@ -1,169 +1,147 @@
 ---
+import type { ComponentProps, HTMLAttributes } from 'astro/types'
 import type { CollectionEntry } from 'astro:content'
-import Block from 'fulldev-ui/components/Block.astro'
-import Blocks from 'fulldev-ui/components/Blocks.astro'
-import Button from 'fulldev-ui/components/Button.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'
 import Head from 'fulldev-ui/components/Head.astro'
 import Header from 'fulldev-ui/components/Header.astro'
+import Sections from 'fulldev-ui/components/sections.astro'
 import Sidebar from 'fulldev-ui/components/Sidebar.astro'
 import Toc from 'fulldev-ui/components/Toc.astro'
-import NavigationButtons from '../components/docs/NavigationButtons.astro'
-
-type Props = Partial<CollectionEntry<'pages'>> & {
-  class?: string
-  theme?: 'light' | 'dark'
-}
-
-const { slug, data, theme, class: classes, render } = Astro.props
-const { logo, header, footer, footers, channels, sidebar, toc } = data || {}
-
-const { headings } = render ? await render() : { headings: [] }
-
-const h2Headings = headings.filter((heading: any) => heading.depth === 2)
+import type { GlobalProps } from 'fulldev-ui/types/global-props'
+
+type Props = GlobalProps &
+  HTMLAttributes<'html'> & {
+    render: CollectionEntry<'pages'>['render']
+    slug: CollectionEntry<'pages'>['slug']
+    header?: ComponentProps<typeof Header>
+    footer?: ComponentProps<typeof Footer>
+    sections?: ComponentProps<typeof Sections>['sections']
+    banner?: any
+    toc?: any
+    sidebar?: any
+    navigation?: any
+    themeselect?: any
+    code?: {
+      head?: string
+      body?: string
+    }
+    title?: string
+    description?: string
+    image?: string
+    seo?: {
+      title?: string
+      description?: string
+      image?: string
+    }
+  }
+
+const {
+  render,
+  header,
+  navigation,
+  footer,
+  sidebar,
+  toc,
+  sections,
+  theme,
+  banner,
+  code,
+  themeselect,
+  ...rest
+} = Astro.props
 ---
 
 <!doctype html>
-<html
-  lang="nl"
-  class:list={[
-    slug,
-    {
-      'theme-dark': theme === 'dark',
-      'theme-light': theme === 'light',
-    },
-  ]}
->
+<html {...rest}>
   <Head {...Astro.props} />
-  <body
-    class:list={[
-      classes,
-      {
-        'has-sidebar': sidebar,
-        'has-toc': toc,
-        'theme-dark': theme === 'dark',
-        'theme-light': theme === 'light',
-      },
-    ]}
-  >
-    <Header {...header} />
+  <Element as="body">
+    <slot name="banner">
+      <Banner text={banner} />
+    </slot>
+    <slot name="header">
+      <Header
+        open={header}
+        {...navigation}
+        {themeselect}
+        {...header}
+      />
+    </slot>
     <div class="core">
-      <Sidebar {sidebar} />
+      <slot name="sidebar">
+        <Sidebar
+          open={sidebar}
+          {...navigation}
+          {...sidebar}
+        />
+      </slot>
       <main data-pagefind-body>
+        <slot />
+        <Sections {sections} />
+      </main>
+      <slot name="toc">
         <Toc
-          toc={toc}
-          headings={h2Headings}
+          {render}
+          {...toc}
         />
-        <div class="blocks">
-          <slot />
-          <NavigationButtons {sidebar} />
-        </div>
-      </main>
+      </slot>
     </div>
+    <slot name="footer">
+      <Footer {...footer} />
+    </slot>
+    <Fragment set:html={code?.body} />
 
-    {
-      channels?.whatsapp && (
-        <Button
-          variant="primary"
-          color="brand"
-          icon="brand-whatsapp"
-          size="lg"
-          href={`https://wa.me/${channels.whatsapp}`}
-          style={{
-            position: 'fixed',
-            right: 'var(--space-4)',
-            bottom: 'var(--space-4)',
-            backgroundColor: '#46A758',
-          }}
-        />
-      )
-    }
-    <Block
-      _bookshop_name="Footer"
-      {logo}
-      {...footer}
-    />
-    <Blocks {...footers} />
-
-    <Fragment set:html={data?.code?.body} />
     <style lang="scss" is:global>
       @layer fulldev {
-        :root {
-          --screen: 1536px;
-          --gutter: max(4vw, calc(100vw - var(--screen)) / 2);
-          --gutter-left: var(--gutter);
-          --gutter-right: var(--gutter);
-          --sidebar-width: 0px;
-          --toc-width: 0px;
-          --header-height: calc(
-            var(--text-2) + 2 * var(--space-4) + 2 * var(--space-3)
-          );
-        }
-
-        html,
-        body {
-          box-sizing: border-box;
-          margin: 0;
-          background-color: var(--color-background);
-          padding: 0;
+        html {
           width: 100%;
           min-height: 100vh;
-          color: var(--base-11);
+          scroll-behavior: smooth;
           color-scheme: var(--color-scheme);
           font-size: var(--text-2);
-          font-family: var(--font-family);
+          font-family: 'Inter', sans-serif;
         }
 
         body {
-          display: flex;
-          flex-direction: column;
+          --screen: 100vw;
 
-          @media (min-width: 1024px) {
-            &.has-sidebar .core {
-              --gutter-left: var(--space-6);
-              --sidebar-width: calc(var(--gutter) + 200px);
-
-              display: grid;
-              grid-template-columns: var(--sidebar-width) minmax(0, 1fr);
-            }
-
-            &.has-toc main {
-              --gutter-right: var(--space-6);
-              --toc-width: calc(var(--gutter) + 200px);
-
-              display: grid;
-              grid-template-columns: minmax(0, 1fr) var(--toc-width);
-            }
-          }
-
-          .header {
-            width: 100%;
-            height: var(--header-height);
-          }
+          background-color: var(--base-2);
+          width: 100%;
+          color: var(--base-11);
 
           .core {
-            .sidebar {
-              position: sticky;
-              top: 0;
-              padding-left: var(--gutter);
-            }
+            display: flex;
+            position: relative;
 
             main {
-              .toc {
-                position: sticky;
-                top: 0;
-                order: 1;
-                padding-right: var(--gutter);
-              }
-
-              .blocks {
-                display: flex;
-                flex-direction: column;
-                width: 100%;
-              }
+              --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;
             }
           }
         }
       }
     </style>
-  </body>
+  </Element>
 </html>
+
+<script>
+  const setTheme = (document: Document) => {
+    const theme = localStorage.getItem('theme') || ''
+    document.body.classList.add(`theme-${theme}`)
+  }
+
+  setTheme(document)
+
+  document.addEventListener('astro:before-swap', (event) => {
+    setTheme(event.newDocument)
+  })
+</script>

package/src/layouts/OverviewLayout.astro

@@ -1,45 +1,35 @@
 ---
-import type { CollectionEntry } from 'astro:content'
-import Block from 'fulldev-ui/components/Block.astro'
-import Blocks from 'fulldev-ui/components/Blocks.astro'
-import Prose from 'fulldev-ui/components/experimental/Prose.astro'
-import Section from 'fulldev-ui/components/Section.astro'
+import type { ComponentProps } from 'astro/types'
+import Article from 'fulldev-ui/blocks/Article.astro'
+import Categories from 'fulldev-ui/blocks/Categories.astro'
+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'
 
-type Props = CollectionEntry<'pages'>
+type Props = ComponentProps<typeof Layout>
 
-const { data, render } = Astro.props
-const { sections, blocks, children, references } = data
-const { Content } = await render()
+const { slug, render, sections, children, ...rest } = Astro.props
+
+const childPages = await getChildPages(slug)
+const categoryPages = await getCategoryPages(slug)
+// const siblingPages = await getSiblingPages(slug)
 ---
 
 <Layout {...Astro.props}>
-  <Block
-    _bookshop_name="Hero"
-    size="lg"
-    {...data}
-  />
-  <Block
-    _bookshop_name="Categories"
-    source="children"
+  <Intro {...rest} />
+  <Categories
+    pages={childPages}
     structure="grid"
-    {...children ?? {}}
+    panel
   />
-  <Block
-    _bookshop_name="ProductDeck"
-    heading={data.title && references
-      ? `Alle ${data.title.toLowerCase()}`
-      : undefined}
-    source="references"
+  <Products
+    pages={categoryPages}
     structure="grid"
-    {...references ?? {}}
   />
-  <Section style={{ '--screen': '768px' }}>
-    <Prose id="prose">
-      <Content />
-    </Prose>
-  </Section>
-  <Blocks {...sections} />
-  <Blocks {...blocks} />
+  <Article style={{ '--screen': '768px' }} />
+  <Sections {sections} />
   <slot />
 </Layout>