update to agility/next

This commit is contained in:
Joel Varty
2021-06-09 23:17:19 -04:00
parent 17f458b45b
commit e836a5950f
26 changed files with 26612 additions and 6639 deletions

View File

@@ -1,20 +1,20 @@
import pageTemplates from "components/agility-pageTemplates"
const AgilityPage = (props:any) => {
const AgilityPage = ({ header, agilityProps, error, revalidate }: {header:any, agilityProps: any, error?: any, revalidate?: any}) => {
if (!props || !props.pageTemplateName) {
if (!agilityProps) {
console.error(`Page object or template was not found.`)
return null
}
let AgilityPageTemplate = pageTemplates(props.pageTemplateName)
let AgilityPageTemplate = pageTemplates(agilityProps.pageTemplateName)
if (! AgilityPageTemplate) {
console.error(`${props.pageTemplateName} not found.`)
console.error(`${agilityProps.pageTemplateName} not found.`)
return null
}
return (
<AgilityPageTemplate {...props} />
<AgilityPageTemplate {...agilityProps} />
)

View File

@@ -1,5 +1,5 @@
import React, { Component } from 'react';
import moduleComponents from "components/agility-modules"
import {getModule} from "components/agility-modules"
function ContentZone({ name, page, dynamicPageItem }) {
@@ -11,7 +11,7 @@ import moduleComponents from "components/agility-modules"
const modulesToRender = modules.map(m => {
const AgilityModule = moduleComponents(m.moduleName)
const AgilityModule = getModule(m.moduleName)
if (AgilityModule) {
return <AgilityModule key={m.item.contentID} page={page} dynamicPageItem={dynamicPageItem} {...m.item} />