Skip to content

Commit c1a9cf8

Browse files
feat: updated to latest version
1 parent ff13acc commit c1a9cf8

File tree

8 files changed

+225
-25
lines changed

8 files changed

+225
-25
lines changed

apps/api-harmonization/package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@
2020
"generate:component": "turbo gen api-component"
2121
},
2222
"dependencies": {
23+
"@dxp/blocks.article": "^1.1.0",
24+
"@dxp/blocks.article-list": "^1.1.0",
25+
"@dxp/blocks.article-search": "^1.1.0",
2326
"@dxp/blocks.bento-grid": "^0.1.1",
27+
"@dxp/blocks.category": "^1.1.0",
28+
"@dxp/blocks.category-list": "^1.1.0",
2429
"@dxp/blocks.cta-section": "^0.1.2",
2530
"@dxp/blocks.document-list": "^0.1.1",
2631
"@dxp/blocks.faq": "^0.1.2",
@@ -31,8 +36,8 @@
3136
"@dxp/blocks.pricing-section": "^0.1.2",
3237
"@dxp/blocks.quick-links": "^0.1.1",
3338
"@dxp/configs.integrations": "*",
34-
"@dxp/framework": "^0.2.1",
35-
"@dxp/integrations.mocked": "^0.4.4",
39+
"@dxp/framework": "^0.3.0",
40+
"@dxp/integrations.mocked": "^0.5.0",
3641
"@dxp/utils.api-harmonization": "^0.0.5",
3742
"@nestjs/axios": "^4.0.0",
3843
"@nestjs/common": "^11.1.1",

apps/api-harmonization/src/app.module.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import { configuration } from '@dxp/api-harmonization/config/configuration';
2+
import * as ArticleList from '@dxp/blocks.article-list/api-harmonization';
3+
import * as ArticleSearch from '@dxp/blocks.article-search/api-harmonization';
4+
import * as Article from '@dxp/blocks.article/api-harmonization';
25
import * as BentoGrid from '@dxp/blocks.bento-grid/api-harmonization';
6+
import * as CategoryList from '@dxp/blocks.category-list/api-harmonization';
7+
import * as Category from '@dxp/blocks.category/api-harmonization';
38
import * as CtaSection from '@dxp/blocks.cta-section/api-harmonization';
49
import * as DocumentList from '@dxp/blocks.document-list/api-harmonization';
510
import * as Faq from '@dxp/blocks.faq/api-harmonization';
@@ -10,7 +15,6 @@ import * as MediaSection from '@dxp/blocks.media-section/api-harmonization';
1015
import * as PricingSection from '@dxp/blocks.pricing-section/api-harmonization';
1116
import * as QuickLinks from '@dxp/blocks.quick-links/api-harmonization';
1217
// BLOCK IMPORT
13-
1418
import { Auth } from '@dxp/configs.integrations';
1519
import { HttpModule } from '@nestjs/axios';
1620
import { MiddlewareConsumer, Module, NestModule } from '@nestjs/common';
@@ -65,6 +69,11 @@ export const AuthModuleBaseModule = AuthModule.Module.register(AppConfig);
6569
FeatureSectionGrid.Module.register(AppConfig),
6670
PricingSection.Module.register(AppConfig),
6771
DocumentList.Module.register(AppConfig),
72+
Category.Module.register(AppConfig),
73+
CategoryList.Module.register(AppConfig),
74+
Article.Module.register(AppConfig),
75+
ArticleSearch.Module.register(AppConfig),
76+
ArticleList.Module.register(AppConfig),
6877
// BLOCK REGISTER
6978
],
7079
providers: [

apps/api-harmonization/src/modules/page/page.mapper.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ export const mapArticle = (
5959
noFollow: false,
6060
},
6161
locales: [mainLocale],
62+
theme: article.theme,
6263
},
6364
data: {
6465
alternativeUrls: {},
@@ -68,6 +69,11 @@ export const mapArticle = (
6869
main: [
6970
{
7071
__typename: 'ArticleBlock',
72+
layout: {
73+
variant: 'full',
74+
spacing: 'none',
75+
background: 'none',
76+
},
7177
...article,
7278
},
7379
],

apps/api-harmonization/src/modules/page/page.model.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1+
import * as ArticleList from '@dxp/blocks.article-list/api-harmonization';
2+
import * as ArticleSearch from '@dxp/blocks.article-search/api-harmonization';
3+
import * as Article from '@dxp/blocks.article/api-harmonization';
14
import * as BentoGrid from '@dxp/blocks.bento-grid/api-harmonization';
5+
import * as CategoryList from '@dxp/blocks.category-list/api-harmonization';
6+
import * as Category from '@dxp/blocks.category/api-harmonization';
27
import * as CtaSection from '@dxp/blocks.cta-section/api-harmonization';
38
import * as DocumentList from '@dxp/blocks.document-list/api-harmonization';
49
import * as Faq from '@dxp/blocks.faq/api-harmonization';
@@ -72,4 +77,9 @@ export type Blocks =
7277
| BentoGrid.Model.BentoGridBlock['__typename']
7378
| CtaSection.Model.CtaSectionBlock['__typename']
7479
| FeatureSection.Model.FeatureSectionBlock['__typename']
75-
| Faq.Model.FaqBlock['__typename'];
80+
| Faq.Model.FaqBlock['__typename']
81+
| CategoryList.Model.CategoryListBlock['__typename']
82+
| ArticleList.Model.ArticleListBlock['__typename']
83+
| Category.Model.CategoryBlock['__typename']
84+
| Article.Model.ArticleBlock['__typename']
85+
| ArticleSearch.Model.ArticleSearchBlock['__typename'];

apps/frontend/package.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@
1414
},
1515
"dependencies": {
1616
"@dxp/api-harmonization": "*",
17+
"@dxp/blocks.article": "^1.1.0",
18+
"@dxp/blocks.article-list": "^1.1.0",
19+
"@dxp/blocks.article-search": "^1.1.0",
1720
"@dxp/blocks.bento-grid": "^0.1.1",
21+
"@dxp/blocks.category": "^1.1.0",
22+
"@dxp/blocks.category-list": "^1.1.0",
1823
"@dxp/blocks.cta-section": "^0.1.2",
1924
"@dxp/blocks.document-list": "^0.1.1",
2025
"@dxp/blocks.faq": "^0.1.2",
@@ -24,8 +29,8 @@
2429
"@dxp/blocks.media-section": "^0.1.3",
2530
"@dxp/blocks.pricing-section": "^0.1.2",
2631
"@dxp/blocks.quick-links": "^0.1.1",
27-
"@dxp/framework": "^0.2.1",
28-
"@dxp/integrations.mocked": "^0.4.4",
32+
"@dxp/framework": "^0.3.0",
33+
"@dxp/integrations.mocked": "^0.5.0",
2934
"@dxp/ui": "*",
3035
"@vercel/analytics": "^1.5.0",
3136
"@vercel/speed-insights": "^1.2.0",

apps/frontend/src/blocks/renderBlocks.tsx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
'use server';
22

33
import { Modules } from '@dxp/api-harmonization';
4+
import * as ArticleList from '@dxp/blocks.article-list/frontend';
5+
import * as ArticleSearch from '@dxp/blocks.article-search/frontend';
6+
import * as Article from '@dxp/blocks.article/frontend';
47
import * as BentoGrid from '@dxp/blocks.bento-grid/frontend';
8+
import * as CategoryList from '@dxp/blocks.category-list/frontend';
9+
import * as Category from '@dxp/blocks.category/frontend';
510
import * as CtaSection from '@dxp/blocks.cta-section/frontend';
611
import * as DocumentList from '@dxp/blocks.document-list/frontend';
712
import * as Faq from '@dxp/blocks.faq/frontend';
@@ -80,6 +85,16 @@ const renderBlock = (typename: string, blockProps: BlockProps) => {
8085
return <PricingSection.Renderer {...blockProps} />;
8186
case 'DocumentListBlock':
8287
return <DocumentList.Renderer {...blockProps} />;
88+
case 'CategoryListBlock':
89+
return <CategoryList.Renderer {...blockProps} />;
90+
case 'ArticleListBlock':
91+
return <ArticleList.Renderer {...blockProps} />;
92+
case 'CategoryBlock':
93+
return <Category.Renderer {...blockProps} renderBlocks={renderBlocks} />;
94+
case 'ArticleBlock':
95+
return <Article.Renderer {...blockProps} />;
96+
case 'ArticleSearchBlock':
97+
return <ArticleSearch.Renderer {...blockProps} />;
8398
// BLOCK REGISTER
8499
default:
85100
return null;

0 commit comments

Comments
 (0)