Layout beta

README.md

@@ -70,7 +70,7 @@ This powerful combination gives you Astro's incredible performance and developer
 This is a **minimal, non-opinionated foundation** that demonstrates the ApostropheCMS + Astro integration without imposing design decisions on your project. You get the essential building blocks:
 
 - **Basic Page Types**: Home page, default content page, and simple blog structure
-- **Core Widgets**: Rich text, images, video, and a two-column layout widget
+- **Core Widgets**: Rich text, images, video, and a layout widget
 - **Clean Architecture**: Well-organized but unopinionated code structure
 - **Integration Examples**: Working demonstrations of content fetching and rendering
 

backend/modules/@apostrophecms/home-page/index.js

@@ -8,10 +8,10 @@ export default {
         type: 'area',
         options: {
           widgets: {
+            '@apostrophecms/layout': {},
             '@apostrophecms/rich-text': {},
             '@apostrophecms/image': {},
-            '@apostrophecms/video': {},
-            'two-column': {}
+            '@apostrophecms/video': {}
           }
         }
       },

backend/modules/@apostrophecms/layout-column-widget/index.js

@@ -0,0 +1,19 @@
+export default {
+  fields(self, options) {
+    return {
+      add: {
+        content: {
+          type: 'area',
+          label: 'Main Content',
+          options: {
+            widgets: {
+              '@apostrophecms/rich-text': {},
+              '@apostrophecms/image': {},
+              '@apostrophecms/video': {}
+            }
+          }
+        }
+      }
+    };
+  }
+};

backend/modules/default-page/index.js

@@ -9,10 +9,10 @@ export default {
         type: 'area',
         options: {
           widgets: {
+            '@apostrophecms/layout': {},
             '@apostrophecms/rich-text': {},
             '@apostrophecms/image': {},
-            '@apostrophecms/video': {},
-            'two-column': {}
+            '@apostrophecms/video': {}
           }
         }
       }

frontend/src/widgets/index.js

@@ -1,13 +1,15 @@
 import RichTextWidget from './RichTextWidget.astro';
 import ImageWidget from './ImageWidget.astro';
 import VideoWidget from './VideoWidget.astro';
-import TwoColumnWidget from './TwoColumnWidget.astro';
+import LayoutWidget from '@apostrophecms/apostrophe-astro/widgets/LayoutWidget.astro';
+import LayoutColumnWidget from '@apostrophecms/apostrophe-astro/widgets/LayoutColumnWidget.astro';
 
 const widgetComponents = {
   '@apostrophecms/rich-text': RichTextWidget,
   '@apostrophecms/image': ImageWidget,
   '@apostrophecms/video': VideoWidget,
-  'two-column': TwoColumnWidget
+  '@apostrophecms/layout': LayoutWidget,
+  '@apostrophecms/layout-column': LayoutColumnWidget
 };
 
 export default widgetComponents;