Skip to content

Commit 916fcaa

Browse files
chore: improved prettier rules and reformatted the code
1 parent ca33e9a commit 916fcaa

20 files changed

+42
-33
lines changed

.changeset/rich-moments-boil.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@o2s/prettier-config': patch
3+
'@o2s/integrations.strapi-cms': patch
4+
---
5+
6+
improved prettier rules and reformatted the code

packages/configs/prettier-config/api.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ const config = {
1818
'@o2s/api-harmonization/pages',
1919
'@o2s/api-harmonization/blocks',
2020
'@o2s/api-harmonization/components',
21+
'@/generated',
2122
'@/modules',
2223
'@/blocks',
2324
'@/auth',

packages/configs/prettier-config/frontend.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const config = {
1414
'@o2s/frontend',
1515
'@/api',
1616
'@/sdk',
17+
'@/actions',
1718
'@/utils',
1819
'@/auth',
1920
'@/i18n',

packages/integrations/strapi-cms/src/modules/articles/articles.mapper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { Articles } from '@o2s/framework/modules';
22

3+
import { ArticleFragment, ArticleSimpleFragment, CategoryFragment } from '@/generated/strapi';
4+
35
import { mapMedia } from '@/modules/cms/mappers/cms.media.mapper';
46
import { mapRoles } from '@/modules/cms/mappers/cms.roles.mapper';
57

6-
import { ArticleFragment, ArticleSimpleFragment, CategoryFragment } from '@/generated/strapi';
7-
88
export const mapCategory = (data: CategoryFragment): Articles.Model.Category => {
99
return {
1010
id: data.documentId,

packages/integrations/strapi-cms/src/modules/cms/cms.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import { Observable, concatMap, forkJoin, from, map, mergeMap, of } from 'rxjs';
88
// eslint-disable-next-line @typescript-eslint/no-unused-vars
99
import { Auth, CMS, Cache, Models } from '@o2s/framework/modules';
1010

11+
import { PageFragment } from '@/generated/strapi';
12+
1113
import { Service as GraphqlService } from '@/modules/graphql';
1214

1315
import { mapArticleListBlock } from './mappers/blocks/cms.article-list.mapper';
@@ -43,7 +45,6 @@ import { mapNotFoundPage } from './mappers/cms.not-found-page.mapper';
4345
import { mapOrganizationList } from './mappers/cms.organization-list.mapper';
4446
import { mapPage } from './mappers/cms.page.mapper';
4547
import { mapSurvey } from './mappers/cms.survey.mapper';
46-
import { PageFragment } from '@/generated/strapi';
4748

4849
@Injectable()
4950
export class CmsService implements CMS.Service {

packages/integrations/strapi-cms/src/modules/cms/mappers/blocks/cms.category.mapper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { NotFoundException } from '@nestjs/common';
22

33
import { CMS } from '@o2s/framework/modules';
44

5-
import { mapSlot } from '../cms.page.mapper';
6-
75
import { GetComponentQuery } from '@/generated/strapi';
86

7+
import { mapSlot } from '../cms.page.mapper';
8+
99
export const mapCategoryBlock = (data: GetComponentQuery, _baseUrl: string): CMS.Model.CategoryBlock.CategoryBlock => {
1010
const component = data.component!.content[0];
1111
const configurableTexts = data.configurableTexts!;

packages/integrations/strapi-cms/src/modules/cms/mappers/blocks/cms.featured-service-list.mapper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { NotFoundException } from '@nestjs/common';
22

33
import { CMS } from '@o2s/framework/modules';
44

5-
import { mapPagination } from '../cms.pagination.mapper';
6-
75
import { GetComponentQuery } from '@/generated/strapi';
86

7+
import { mapPagination } from '../cms.pagination.mapper';
8+
99
export const mapFeaturedServiceListBlock = (
1010
data: GetComponentQuery,
1111
): CMS.Model.FeaturedServiceListBlock.FeaturedServiceListBlock => {

packages/integrations/strapi-cms/src/modules/cms/mappers/blocks/cms.invoice-list.mapper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import { NotFoundException } from '@nestjs/common';
22

33
import { CMS } from '@o2s/framework/modules';
44

5+
import { GetComponentQuery } from '@/generated/strapi';
6+
57
import { mapFields } from '../cms.fieldMapping.mapper';
68
import { mapFilters } from '../cms.filters.mapper';
79
import { mapPagination } from '../cms.pagination.mapper';
810
import { mapTable } from '../cms.table.mapper';
911

10-
import { GetComponentQuery } from '@/generated/strapi';
11-
1212
export const mapInvoiceListBlock = (data: GetComponentQuery): CMS.Model.InvoiceListBlock.InvoiceListBlock => {
1313
const component = data.component!.content[0];
1414
const configurableTexts = data.configurableTexts!;

packages/integrations/strapi-cms/src/modules/cms/mappers/blocks/cms.notification-list.mapper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import { NotFoundException } from '@nestjs/common';
22

33
import { CMS } from '@o2s/framework/modules';
44

5+
import { GetComponentQuery } from '@/generated/strapi';
6+
57
import { mapFields } from '../cms.fieldMapping.mapper';
68
import { mapFilters } from '../cms.filters.mapper';
79
import { mapPagination } from '../cms.pagination.mapper';
810
import { mapTable } from '../cms.table.mapper';
911

10-
import { GetComponentQuery } from '@/generated/strapi';
11-
1212
export const mapNotificationListBlock = (
1313
data: GetComponentQuery,
1414
): CMS.Model.NotificationListBlock.NotificationListBlock => {

packages/integrations/strapi-cms/src/modules/cms/mappers/blocks/cms.order-details.mapper.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import { NotFoundException } from '@nestjs/common';
22

33
import { CMS } from '@o2s/framework/modules';
44

5+
import { GetComponentQuery } from '@/generated/strapi';
6+
57
import { mapFields } from '../cms.fieldMapping.mapper';
68
import { mapFilters } from '../cms.filters.mapper';
79
import { mapInfoCard } from '../cms.information-card.mapper';
810
import { mapPagination } from '../cms.pagination.mapper';
911
import { mapTable } from '../cms.table.mapper';
1012

11-
import { GetComponentQuery } from '@/generated/strapi';
12-
1313
export const mapOrderDetailsBlock = (data: GetComponentQuery): CMS.Model.OrderDetailsBlock.OrderDetailsBlock => {
1414
const component = data.component!.content[0];
1515
const configurableTexts = data.configurableTexts!;

0 commit comments

Comments
 (0)