Enhance site layout rendering and integrate shared components

- Added read-only access to shared frontend components in `docker-compose.app.yml`.
- Updated TypeScript configuration in `tsconfig.app.json` and `tsconfig.json` to support path mapping for shared components.
- Modified CSS imports in `index.css` to accommodate shared styles.
- Refactored layout rendering logic in `layoutRenderer.tsx` to utilize shared layout components for various site layouts.
- Improved template rendering in `templateEngine.tsx` by integrating shared block components for better consistency and maintainability.
This commit is contained in:
IGNY8 VPS (Salman)
2025-11-18 20:33:31 +00:00
parent 0eb039e1a7
commit adc681af8c
8 changed files with 342 additions and 246 deletions

Binary file not shown.

View File

@@ -116,6 +116,7 @@ services:
volumes:
- /data/app/igny8/sites:/app:rw
- /data/app/sites-data:/sites:ro # Read-only access to deployed sites
- /data/app/igny8/frontend:/frontend:ro # Read-only access to shared components
networks: [igny8_net]
labels:
- "com.docker.compose.project=igny8-app"

View File

@@ -1,3 +1,7 @@
/* Import shared component styles */
/* Note: Using relative path since @shared alias may not work in CSS */
/* These will be imported via JavaScript instead */
:root {
font-family: 'Inter', 'Inter var', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
color: #0f172a;

View File

@@ -2,6 +2,9 @@ import { StrictMode } from 'react';
import { createRoot } from 'react-dom/client';
import App from './App.tsx';
import './index.css';
// Import shared component styles - Vite alias @shared resolves to frontend/src/components/shared
import '@shared/blocks/blocks.css';
import '@shared/layouts/layouts.css';
createRoot(document.getElementById('root')!).render(
<StrictMode>

View File

@@ -2,20 +2,29 @@
* Layout Renderer
* Phase 5: Sites Renderer & Publishing
*
* Renders different layout types for sites.
* Renders different layout types for sites using shared components.
*/
import React from 'react';
import type { SiteDefinition } from '../types';
import { renderTemplate } from './templateEngine';
import {
DefaultLayout,
MinimalLayout,
MagazineLayout,
EcommerceLayout,
PortfolioLayout,
BlogLayout,
CorporateLayout,
} from '@shared/layouts';
export type LayoutType =
| 'default'
| 'centered'
| 'sidebar'
| 'grid'
| 'magazine'
| 'minimal'
| 'fullwidth';
| 'magazine'
| 'ecommerce'
| 'portfolio'
| 'blog'
| 'corporate';
/**
* Render site layout based on site definition.
@@ -24,18 +33,18 @@ export function renderLayout(siteDefinition: SiteDefinition): React.ReactElement
const layoutType = siteDefinition.layout as LayoutType;
switch (layoutType) {
case 'centered':
return renderCenteredLayout(siteDefinition);
case 'sidebar':
return renderSidebarLayout(siteDefinition);
case 'grid':
return renderGridLayout(siteDefinition);
case 'magazine':
return renderMagazineLayout(siteDefinition);
case 'minimal':
return renderMinimalLayout(siteDefinition);
case 'fullwidth':
return renderFullwidthLayout(siteDefinition);
case 'magazine':
return renderMagazineLayout(siteDefinition);
case 'ecommerce':
return renderEcommerceLayout(siteDefinition);
case 'portfolio':
return renderPortfolioLayout(siteDefinition);
case 'blog':
return renderBlogLayout(siteDefinition);
case 'corporate':
return renderCorporateLayout(siteDefinition);
case 'default':
default:
return renderDefaultLayout(siteDefinition);
@@ -44,154 +53,55 @@ export function renderLayout(siteDefinition: SiteDefinition): React.ReactElement
/**
* Default layout: Standard header, content, footer.
* Uses shared DefaultLayout component with fully styled modern design.
*/
function renderDefaultLayout(siteDefinition: SiteDefinition): React.ReactElement {
// Find home page for hero
const homePage = siteDefinition.pages.find(p => p.slug === 'home');
const heroBlock = homePage?.blocks?.find(b => b.type === 'hero');
const hero: React.ReactNode = heroBlock ? (renderTemplate(heroBlock) as React.ReactNode) : undefined;
// Render all pages as sections (excluding hero from home page if it exists)
const sections = siteDefinition.pages
.filter((page) => page.status !== 'draft')
.map((page) => {
// Filter out hero block if it's the home page (already rendered as hero)
const blocksToRender = page.slug === 'home' && heroBlock
? page.blocks?.filter(b => b.type !== 'hero') || []
: page.blocks || [];
return (
<div className="layout-default">
<header className="site-header">
<nav className="site-navigation">
{renderNavigation(siteDefinition.navigation)}
</nav>
</header>
<main className="site-main">
{renderPages(siteDefinition.pages)}
</main>
<footer className="site-footer">
<p>&copy; {new Date().getFullYear()} {siteDefinition.name}</p>
</footer>
<div key={page.id} className="page" data-page-slug={page.slug}>
{page.slug !== 'home' && <h2>{page.title}</h2>}
{blocksToRender.length > 0 ? (
blocksToRender.map((block, index) => (
<div key={index} className="block" data-block-type={block.type}>
{renderTemplate(block)}
</div>
))
) : page.slug !== 'home' ? (
<p>No content available for this page.</p>
) : null}
</div>
);
}
});
/**
* Centered layout: Content centered with max-width.
*/
function renderCenteredLayout(siteDefinition: SiteDefinition): React.ReactElement {
return (
<div className="layout-centered">
<header className="site-header">
<nav className="site-navigation">
{renderNavigation(siteDefinition.navigation)}
</nav>
</header>
<main className="site-main" style={{ maxWidth: '1200px', margin: '0 auto', padding: '2rem' }}>
{renderPages(siteDefinition.pages)}
</main>
<footer className="site-footer">
<p>&copy; {new Date().getFullYear()} {siteDefinition.name}</p>
</footer>
</div>
);
}
/**
* Sidebar layout: Sidebar navigation with main content.
*/
function renderSidebarLayout(siteDefinition: SiteDefinition): React.ReactElement {
return (
<div className="layout-sidebar">
<aside className="site-sidebar">
<nav className="site-navigation">
{renderNavigation(siteDefinition.navigation)}
</nav>
</aside>
<main className="site-main">
{renderPages(siteDefinition.pages)}
</main>
</div>
);
}
/**
* Grid layout: Grid-based page layout.
*/
function renderGridLayout(siteDefinition: SiteDefinition): React.ReactElement {
return (
<div className="layout-grid">
<header className="site-header">
<nav className="site-navigation">
{renderNavigation(siteDefinition.navigation)}
</nav>
</header>
<main className="site-main" style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(300px, 1fr))', gap: '2rem', padding: '2rem' }}>
{renderPages(siteDefinition.pages)}
</main>
</div>
);
}
/**
* Magazine layout: Multi-column magazine style.
*/
function renderMagazineLayout(siteDefinition: SiteDefinition): React.ReactElement {
return (
<div className="layout-magazine">
<header className="site-header">
<h1>{siteDefinition.name}</h1>
<nav className="site-navigation">
{renderNavigation(siteDefinition.navigation)}
</nav>
</header>
<main className="site-main" style={{ display: 'grid', gridTemplateColumns: '2fr 1fr', gap: '2rem', padding: '2rem' }}>
{renderPages(siteDefinition.pages)}
</main>
</div>
<DefaultLayout
hero={hero as any}
sections={sections}
/>
);
}
/**
* Minimal layout: Clean, minimal design.
* Uses shared MinimalLayout component.
*/
function renderMinimalLayout(siteDefinition: SiteDefinition): React.ReactElement {
return (
<div className="layout-minimal">
<main className="site-main" style={{ padding: '4rem 2rem', maxWidth: '800px', margin: '0 auto' }}>
{renderPages(siteDefinition.pages)}
</main>
</div>
);
}
/**
* Fullwidth layout: Full-width content.
*/
function renderFullwidthLayout(siteDefinition: SiteDefinition): React.ReactElement {
return (
<div className="layout-fullwidth">
<header className="site-header">
<nav className="site-navigation">
{renderNavigation(siteDefinition.navigation)}
</nav>
</header>
<main className="site-main" style={{ width: '100%' }}>
{renderPages(siteDefinition.pages)}
</main>
</div>
);
}
/**
* Render navigation items.
*/
function renderNavigation(navigation: SiteDefinition['navigation']): React.ReactElement {
return (
<ul style={{ listStyle: 'none', display: 'flex', gap: '1rem', padding: 0 }}>
{navigation.map((item) => (
<li key={item.slug}>
<a href={`/${item.slug}`}>{item.label}</a>
</li>
))}
</ul>
);
}
/**
* Render pages.
*/
function renderPages(pages: SiteDefinition['pages']): React.ReactElement[] {
// Filter pages - include ready, generating, and deployed statuses
// Only exclude draft status
return pages
const mainContent = (
<>
{siteDefinition.pages
.filter((page) => page.status !== 'draft')
.map((page) => (
<div key={page.id} className="page" data-page-slug={page.slug}>
@@ -202,10 +112,168 @@ function renderPages(pages: SiteDefinition['pages']): React.ReactElement[] {
{renderTemplate(block)}
</div>
))
) : (
<p>No content available for this page.</p>
)}
) : null}
</div>
));
))}
</>
);
return (
<MinimalLayout>
{mainContent}
</MinimalLayout>
);
}
/**
* Magazine layout: Editorial, content-focused.
* Uses shared MagazineLayout component.
*/
function renderMagazineLayout(siteDefinition: SiteDefinition): React.ReactElement {
const mainContent = (
<>
{siteDefinition.pages
.filter((page) => page.status !== 'draft')
.map((page) => (
<div key={page.id} className="page" data-page-slug={page.slug}>
{page.blocks && page.blocks.length > 0 ? (
page.blocks.map((block, index) => (
<div key={index} className="block" data-block-type={block.type}>
{renderTemplate(block)}
</div>
))
) : null}
</div>
))}
</>
);
return (
<MagazineLayout
mainContent={mainContent}
/>
);
}
/**
* Ecommerce layout: Product-focused.
* Uses shared EcommerceLayout component.
*/
function renderEcommerceLayout(siteDefinition: SiteDefinition): React.ReactElement {
const mainContent = (
<>
{siteDefinition.pages
.filter((page) => page.status !== 'draft')
.map((page) => (
<div key={page.id} className="page" data-page-slug={page.slug}>
{page.blocks && page.blocks.length > 0 ? (
page.blocks.map((block, index) => (
<div key={index} className="block" data-block-type={block.type}>
{renderTemplate(block)}
</div>
))
) : null}
</div>
))}
</>
);
return (
<EcommerceLayout
mainContent={mainContent}
/>
);
}
/**
* Portfolio layout: Showcase.
* Uses shared PortfolioLayout component.
*/
function renderPortfolioLayout(siteDefinition: SiteDefinition): React.ReactElement {
const mainContent = (
<>
{siteDefinition.pages
.filter((page) => page.status !== 'draft')
.map((page) => (
<div key={page.id} className="page" data-page-slug={page.slug}>
{page.blocks && page.blocks.length > 0 ? (
page.blocks.map((block, index) => (
<div key={index} className="block" data-block-type={block.type}>
{renderTemplate(block)}
</div>
))
) : null}
</div>
))}
</>
);
return (
<PortfolioLayout
mainContent={mainContent}
/>
);
}
/**
* Blog layout: Content-first.
* Uses shared BlogLayout component.
*/
function renderBlogLayout(siteDefinition: SiteDefinition): React.ReactElement {
const mainContent = (
<>
{siteDefinition.pages
.filter((page) => page.status !== 'draft')
.map((page) => (
<div key={page.id} className="page" data-page-slug={page.slug}>
{page.blocks && page.blocks.length > 0 ? (
page.blocks.map((block, index) => (
<div key={index} className="block" data-block-type={block.type}>
{renderTemplate(block)}
</div>
))
) : null}
</div>
))}
</>
);
return (
<BlogLayout
mainContent={mainContent}
/>
);
}
/**
* Corporate layout: Business.
* Uses shared CorporateLayout component.
*/
function renderCorporateLayout(siteDefinition: SiteDefinition): React.ReactElement {
const mainContent = (
<>
{siteDefinition.pages
.filter((page) => page.status !== 'draft')
.map((page) => (
<div key={page.id} className="page" data-page-slug={page.slug}>
{page.blocks && page.blocks.length > 0 ? (
page.blocks.map((block, index) => (
<div key={index} className="block" data-block-type={block.type}>
{renderTemplate(block)}
</div>
))
) : null}
</div>
))}
</>
);
return (
<CorporateLayout
mainContent={mainContent}
/>
);
}
// Note: Navigation and page rendering are now handled within each layout component

View File

@@ -3,9 +3,24 @@
* Phase 5: Sites Renderer & Publishing
*
* Renders blocks using shared components from the component library.
* Uses fully styled modern components from @shared.
*/
import React from 'react';
import type { Block } from '../types';
import {
HeroBlock,
FeatureGridBlock,
TestimonialsBlock,
CTABlock,
ServicesBlock,
StatsPanel,
TextBlock,
QuoteBlock,
ContactFormBlock,
ImageGalleryBlock,
VideoBlock,
ProductsBlock,
} from '@shared/blocks';
/**
* Render a block using the template engine.
@@ -76,36 +91,36 @@ export function renderTemplate(block: Block | any): React.ReactElement {
}
/**
* Render hero block.
* Render hero block using shared HeroBlock component.
*/
function renderHeroBlock(data: Record<string, any>): React.ReactElement {
// Handle both API format (heading/subheading) and template format (title/subtitle)
const title = data.heading || data.title || 'Hero Title';
const subtitle = data.subheading || data.subtitle;
const content = Array.isArray(data.content) ? data.content.join(' ') : data.content;
return (
<section className="block-hero" style={{ padding: '4rem 2rem', textAlign: 'center', background: data.background || '#f0f0f0' }}>
<h1>{title}</h1>
{subtitle && <p style={{ fontSize: '1.2rem', color: '#666', marginTop: '1rem' }}>{subtitle}</p>}
{content && <p style={{ marginTop: '1rem' }}>{content}</p>}
{data.buttonText && (
<a href={data.buttonLink || '#'} className="button" style={{ display: 'inline-block', marginTop: '2rem', padding: '0.75rem 1.5rem', background: '#007bff', color: 'white', textDecoration: 'none', borderRadius: '4px' }}>
{data.buttonText}
</a>
)}
</section>
<HeroBlock
title={title}
subtitle={subtitle}
ctaLabel={data.buttonText || data.ctaLabel}
onCtaClick={data.buttonLink || data.ctaLink ? () => window.location.href = (data.buttonLink || data.ctaLink) : undefined}
supportingContent={content ? <p>{content}</p> : undefined}
/>
);
}
/**
* Render text block.
* Render text block using shared TextBlock component.
*/
function renderTextBlock(data: Record<string, any>): React.ReactElement {
const content = Array.isArray(data.content) ? data.content.join(' ') : data.content;
return (
<div className="block-text" style={{ padding: '2rem' }}>
{data.content && <div dangerouslySetInnerHTML={{ __html: data.content }} />}
</div>
<TextBlock
title={data.heading || data.title}
content={content || ''}
align={data.align || 'left'}
/>
);
}
@@ -274,62 +289,52 @@ function renderAccordionBlock(data: Record<string, any>): React.ReactElement {
}
/**
* Render features block.
* Render features block using shared FeatureGridBlock component.
*/
function renderFeaturesBlock(data: Record<string, any>): React.ReactElement {
const heading = data.heading || data.title || 'Features';
const subheading = data.subheading || data.subtitle;
const heading = data.heading || data.title;
const content = Array.isArray(data.content) ? data.content : [];
const layout = data.layout || 'two-column';
const columns = layout === 'two-column' ? 2 : layout === 'three-column' ? 3 : 3;
// Convert content array to features array
const features = content.map((item: string) => ({
title: item.split(':')[0] || item,
description: item.includes(':') ? item.split(':').slice(1).join(':').trim() : undefined,
}));
return (
<section className="block-features" style={{ padding: '3rem 2rem', background: data.background || 'transparent' }}>
{heading && <h2 style={{ textAlign: 'center', marginBottom: '1rem' }}>{heading}</h2>}
{subheading && <p style={{ textAlign: 'center', color: '#666', marginBottom: '2rem' }}>{subheading}</p>}
<div style={{
display: 'grid',
gridTemplateColumns: layout === 'two-column' ? 'repeat(2, 1fr)' : 'repeat(3, 1fr)',
gap: '2rem',
maxWidth: '1200px',
margin: '0 auto'
}}>
{content.map((item: string, index: number) => (
<div key={index} style={{ padding: '1.5rem', border: '1px solid #eee', borderRadius: '8px' }}>
<p>{item}</p>
</div>
))}
</div>
</section>
<FeatureGridBlock
heading={heading}
features={features}
columns={columns as 2 | 3 | 4}
/>
);
}
/**
* Render testimonials block.
* Render testimonials block using shared TestimonialsBlock component.
*/
function renderTestimonialsBlock(data: Record<string, any>): React.ReactElement {
const heading = data.heading || data.title || 'Testimonials';
const subheading = data.subheading || data.subtitle;
const title = data.heading || data.title;
const subtitle = data.subheading || data.subtitle;
const content = Array.isArray(data.content) ? data.content : [];
const layout = data.layout || 'cards';
// Convert content array to testimonials array
const testimonials = content.map((item: string) => ({
quote: item,
author: 'Customer', // Default author if not provided
}));
return (
<section className="block-testimonials" style={{ padding: '3rem 2rem', background: data.background || '#f9f9f9' }}>
{heading && <h2 style={{ textAlign: 'center', marginBottom: '1rem' }}>{heading}</h2>}
{subheading && <p style={{ textAlign: 'center', color: '#666', marginBottom: '2rem' }}>{subheading}</p>}
<div style={{
display: 'grid',
gridTemplateColumns: layout === 'cards' ? 'repeat(auto-fit, minmax(300px, 1fr))' : '1fr',
gap: '2rem',
maxWidth: '1200px',
margin: '0 auto'
}}>
{content.map((item: string, index: number) => (
<div key={index} style={{ padding: '2rem', background: 'white', borderRadius: '8px', boxShadow: '0 2px 4px rgba(0,0,0,0.1)' }}>
<p style={{ fontStyle: 'italic', marginBottom: '1rem' }}>"{item}"</p>
</div>
))}
</div>
</section>
<TestimonialsBlock
title={title}
subtitle={subtitle}
testimonials={testimonials}
columns={layout === 'cards' ? 3 : 1}
variant={layout === 'cards' ? 'card' : 'default'}
/>
);
}
@@ -357,70 +362,79 @@ function renderFAQBlock(data: Record<string, any>): React.ReactElement {
}
/**
* Render CTA (Call to Action) block.
* Render CTA (Call to Action) block using shared CTABlock component.
*/
function renderCTABlock(data: Record<string, any>): React.ReactElement {
const heading = data.heading || data.title || 'Call to Action';
const subheading = data.subheading || data.subtitle;
const title = data.heading || data.title || 'Call to Action';
const subtitle = data.subheading || data.subtitle;
const content = Array.isArray(data.content) ? data.content[0] : data.content;
return (
<section className="block-cta" style={{ padding: '4rem 2rem', textAlign: 'center', background: data.background || '#007bff', color: 'white' }}>
{heading && <h2 style={{ marginBottom: '1rem' }}>{heading}</h2>}
{subheading && <p style={{ marginBottom: '2rem', fontSize: '1.1rem' }}>{subheading}</p>}
{content && <p style={{ marginBottom: '2rem' }}>{content}</p>}
{data.buttonText && (
<a href={data.buttonLink || '#'} style={{ display: 'inline-block', padding: '1rem 2rem', background: 'white', color: '#007bff', textDecoration: 'none', borderRadius: '4px', fontWeight: 'bold' }}>
{data.buttonText}
</a>
)}
</section>
<CTABlock
title={title}
subtitle={subtitle}
primaryCtaLabel={data.buttonText || data.ctaLabel}
primaryCtaLink={data.buttonLink || data.ctaLink}
backgroundImage={data.backgroundImage}
variant={data.layout === 'full-width' ? 'centered' : 'default'}
>
{content && <p>{content}</p>}
</CTABlock>
);
}
/**
* Render services block.
* Render services block using shared ServicesBlock component.
*/
function renderServicesBlock(data: Record<string, any>): React.ReactElement {
const heading = data.heading || data.title || 'Services';
const subheading = data.subheading || data.subtitle;
const title = data.heading || data.title;
const subtitle = data.subheading || data.subtitle;
const content = Array.isArray(data.content) ? data.content : [];
// Convert content array to services array
const services = content.map((item: string) => ({
title: item.split(':')[0] || item,
description: item.includes(':') ? item.split(':').slice(1).join(':').trim() : undefined,
}));
return (
<section className="block-services" style={{ padding: '3rem 2rem' }}>
{heading && <h2 style={{ marginBottom: '1rem' }}>{heading}</h2>}
{subheading && <p style={{ color: '#666', marginBottom: '2rem' }}>{subheading}</p>}
<div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(250px, 1fr))', gap: '2rem' }}>
{content.map((item: string, index: number) => (
<div key={index} style={{ padding: '1.5rem', border: '1px solid #ddd', borderRadius: '8px' }}>
<p>{item}</p>
</div>
))}
</div>
</section>
<ServicesBlock
title={title}
subtitle={subtitle}
services={services}
columns={3}
variant="card"
/>
);
}
/**
* Render stats block.
* Render stats block using shared StatsPanel component.
*/
function renderStatsBlock(data: Record<string, any>): React.ReactElement {
const heading = data.heading || data.title || 'Statistics';
const subheading = data.subheading || data.subtitle;
const content = Array.isArray(data.content) ? data.content : [];
// Convert content array to stats array
const stats = content.map((item: string) => {
// Try to parse "Label: Value" format
const parts = item.split(':');
if (parts.length >= 2) {
return {
label: parts[0].trim(),
value: parts.slice(1).join(':').trim(),
};
}
return {
label: item,
value: '',
};
});
return (
<section className="block-stats" style={{ padding: '3rem 2rem', background: data.background || '#f9f9f9' }}>
{heading && <h2 style={{ textAlign: 'center', marginBottom: '1rem' }}>{heading}</h2>}
{subheading && <p style={{ textAlign: 'center', color: '#666', marginBottom: '2rem' }}>{subheading}</p>}
<div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fit, minmax(200px, 1fr))', gap: '2rem', maxWidth: '1200px', margin: '0 auto' }}>
{content.map((item: string, index: number) => (
<div key={index} style={{ textAlign: 'center', padding: '1.5rem' }}>
<p style={{ fontSize: '1.1rem' }}>{item}</p>
</div>
))}
</div>
</section>
<StatsPanel
heading={data.heading || data.title}
stats={stats}
/>
);
}

View File

@@ -14,6 +14,12 @@
"noEmit": true,
"jsx": "react-jsx",
/* Path mapping */
"baseUrl": ".",
"paths": {
"@shared/*": ["../frontend/src/components/shared/*"]
},
/* Linting */
"strict": true,
"noUnusedLocals": true,

View File

@@ -7,7 +7,7 @@
"compilerOptions": {
"baseUrl": ".",
"paths": {
"@shared/*": ["../frontend/src/components/shared/*"]
"@shared/*": ["../frontend/src/components/shared/*", "/frontend/src/components/shared/*"]
}
}
}