fix: palette First

amplience · Oct 7, 2024 · a11be92 · a11be92
1 parent 4c1835b
commit a11be92
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 18 deletions.
diff --git a/components/cms-modern/Container/Container.tsx b/components/cms-modern/Container/Container.tsx
@@ -11,14 +11,14 @@ interface ContainerProps {
 const Container = ({ contentTypes = [], fixedContentPallete = [] }: ContainerProps) => {
     return (
         <Box>
-            {contentTypes.map((item, index: number) => {
+            {fixedContentPallete.map((item, index: number) => {
                 return (
                     <Box key={index}>
                         <ContentBlock content={item} />
                     </Box>
                 );
             })}
-            {fixedContentPallete.map((item, index: number) => {
+            {contentTypes.map((item, index: number) => {
                 return (
                     <Box key={index}>
                         <ContentBlock content={item} />

diff --git a/components/cms-modern/ContentPage/ContentPage.tsx b/components/cms-modern/ContentPage/ContentPage.tsx
@@ -24,21 +24,14 @@ const ContentPage = ({
             <Typography variant="body1" component="p">
                 {seo.description}
             </Typography>
-            {contentTypes.map((item, index: number) => {
-                return (
-                    <Box key={index}>
-                        <ContentBlock content={item} />
-                    </Box>
-                );
-            })}
-            {contentPallete.map((item, index: number) => {
+            {fixedContentPallete.map((item, index: number) => {
                 return (
                     <Box key={index}>
                         <ContentBlock content={item} />
                     </Box>
                 );
             })}
-            {fixedContentPallete.map((item, index: number) => {
+            {contentTypes.map((item, index: number) => {
                 return (
                     <Box key={index}>
                         <ContentBlock content={item} />

diff --git a/components/cms-modern/ThemeWrapper/ThemeWrapper.tsx b/components/cms-modern/ThemeWrapper/ThemeWrapper.tsx
@@ -17,14 +17,14 @@ const ThemeWrapper = ({ theme, components = [], fixedContentPallete = [] }: Them
     return (
         <WithCMSTheme themes={themes} themeOverride={theme}>
             <Box>
-                {components.map((item, index: number) => {
+                {fixedContentPallete.map((item, index: number) => {
                     return (
                         <Box key={index}>
                             <ContentBlock content={item} />
                         </Box>
                     );
                 })}
-                {fixedContentPallete.map((item, index: number) => {
+                {components.map((item, index: number) => {
                     return (
                         <Box key={index}>
                             <ContentBlock content={item} />

diff --git a/pages/category/[slug].tsx b/pages/category/[slug].tsx
@@ -126,11 +126,10 @@ function CategoryPage(props: InferGetServerSidePropsType<typeof getServerSidePro
 
                 {/* Additional Components */}
                 <div>
-                    {compact(components).map((content, index: number) => (
+                    {compact(fixedContentPallete).map((content, index: number) => (
                         <ContentBlock key={index} content={content} />
                     ))}
-
-                    {compact(fixedContentPallete).map((content, index: number) => (
+                    {compact(components).map((content, index: number) => (
                         <ContentBlock key={index} content={content} />
                     ))}
 

diff --git a/pages/page/[...slug].tsx b/pages/page/[...slug].tsx
@@ -47,10 +47,10 @@ export default function LandingPage({ content, slots }: InferGetServerSidePropsT
             {slots.filter(notNull).map((slot: CmsContent, index: number) => (
                 <ContentBlock content={slot} type="SLOT" key={index} />
             ))}
-            {content?.page?.components
+            {content?.page?.fixedContentPallete
                 ?.filter(notNull)
                 .map((content: CmsContent, index: number) => <ContentBlock content={content} key={index} />)}
-            {content?.page?.fixedContentPallete
+            {content?.page?.components
                 ?.filter(notNull)
                 .map((content: CmsContent, index: number) => <ContentBlock content={content} key={index} />)}
         </div>