Skip to content

Commit 269c936

Browse files
chore: updated to the latest version
1 parent bccdf80 commit 269c936

File tree

168 files changed

+29860
-26731
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+29860
-26731
lines changed

.gitattributes

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,8 @@
1313
*.jpg binary
1414
*.jpeg binary
1515
*.png binary
16+
*.gif binary
17+
*.webp binary
18+
19+
# Videos
20+
*.mp4 binary

apps/api-harmonization/.env.local

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
NODE_ENV=development
22
PORT=3001
33

4-
TELEMETRY_DISABLED=false
4+
TELEMETRY_DISABLED=
55

66
API_PREFIX=api
77

@@ -16,7 +16,7 @@ DEFAULT_PRODUCT_UNIT=PCS
1616
SUPPORTED_CURRENCIES=EUR,USD,PLN
1717
SUPPORTED_LOCALES=en,de,pl
1818

19-
FRONT_BASE_URLS=http://localhost:3000,http://localhost:6006
19+
FRONT_BASE_URLS=http://localhost:3000,https://localhost:3000,http://localhost:6006
2020

2121
MOCKED_INTEGRATION_DELAYS_ENABLED=true
2222

@@ -40,3 +40,13 @@ MEDUSAJS_PUBLISHABLE_API_KEY=
4040
MEDUSAJS_ADMIN_API_KEY=
4141

4242
SEARCH_ARTICLES_INDEX_NAME=mock
43+
44+
CF_TOKEN=
45+
CF_PREVIEW_TOKEN=
46+
CF_SPACE_ID=
47+
CF_ENV=
48+
CF_MANAGEMENT_TOKEN=
49+
50+
ZENDESK_API_URL=
51+
ZENDESK_API_TOKEN=
52+
ZENDESK_TOPIC_FIELD_ID=

apps/api-harmonization/CHANGELOG.md

Lines changed: 157 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,162 @@
11
# @o2s/api-harmonization
22

3+
## 1.12.0
4+
5+
### Minor Changes
6+
7+
- 2c780d5: add NotificationSummary and TicketSummary blocks
8+
- c27726a: added a new Product List block with list/tile form of presentation
9+
- 2c780d5: conditionally render button in InfoCard for improved layout
10+
11+
### Patch Changes
12+
13+
- 0354126: reworked turbo dev task to optimize CPU/RAM usage
14+
- Updated dependencies [2c780d5]
15+
- Updated dependencies [1653b74]
16+
- Updated dependencies [c27726a]
17+
- Updated dependencies [2c780d5]
18+
- Updated dependencies [0354126]
19+
- Updated dependencies [1653b74]
20+
- @o2s/blocks.notification-summary@1.0.0
21+
- @o2s/blocks.ticket-summary@1.0.0
22+
- @o2s/integrations.mocked@1.14.0
23+
- @o2s/framework@1.13.0
24+
- @o2s/configs.integrations@0.2.0
25+
- @o2s/blocks.ticket-list@1.3.0
26+
- @o2s/utils.frontend@0.2.0
27+
- @o2s/blocks.featured-service-list@1.1.1
28+
- @o2s/blocks.notification-details@1.1.1
29+
- @o2s/blocks.notification-list@1.2.1
30+
- @o2s/blocks.payments-history@1.1.1
31+
- @o2s/blocks.payments-summary@1.1.1
32+
- @o2s/utils.api-harmonization@0.1.2
33+
- @o2s/blocks.service-details@1.1.1
34+
- @o2s/blocks.article-search@1.1.2
35+
- @o2s/blocks.orders-summary@1.1.1
36+
- @o2s/blocks.ticket-details@1.1.1
37+
- @o2s/blocks.category-list@1.2.1
38+
- @o2s/blocks.order-details@1.1.1
39+
- @o2s/blocks.surveyjs-form@1.1.1
40+
- @o2s/blocks.ticket-recent@1.1.1
41+
- @o2s/blocks.article-list@1.2.1
42+
- @o2s/blocks.invoice-list@1.2.1
43+
- @o2s/blocks.service-list@1.1.1
44+
- @o2s/blocks.user-account@1.1.1
45+
- @o2s/blocks.quick-links@1.2.1
46+
- @o2s/blocks.order-list@1.2.1
47+
- @o2s/modules.surveyjs@0.2.2
48+
- @o2s/blocks.category@1.1.2
49+
- @o2s/blocks.article@1.2.1
50+
- @o2s/utils.logger@1.1.2
51+
- @o2s/blocks.faq@1.2.1
52+
- @o2s/telemetry@1.1.1
53+
54+
## 1.11.0
55+
56+
### Minor Changes
57+
58+
- 0d1b8cc: Added Live Preview support in blocks
59+
- 0d1b8cc: feat: added contentful integration
60+
61+
### Patch Changes
62+
63+
- 8ac0de9: added missing dependencies
64+
- b519464: updated dependencies
65+
- 38f7825: added healthchecks
66+
- Updated dependencies [0d1b8cc]
67+
- Updated dependencies [8ac0de9]
68+
- Updated dependencies [ac245c5]
69+
- Updated dependencies [b57d151]
70+
- Updated dependencies [b519464]
71+
- Updated dependencies [b1c47e8]
72+
- Updated dependencies [3da2e69]
73+
- Updated dependencies [d3bf68c]
74+
- @o2s/blocks.category-list@1.2.0
75+
- @o2s/blocks.article-list@1.2.0
76+
- @o2s/blocks.quick-links@1.2.0
77+
- @o2s/blocks.ticket-list@1.2.0
78+
- @o2s/blocks.article@1.2.0
79+
- @o2s/blocks.faq@1.2.0
80+
- @o2s/framework@1.12.0
81+
- @o2s/blocks.article-search@1.1.1
82+
- @o2s/utils.logger@1.1.1
83+
- @o2s/blocks.notification-list@1.2.0
84+
- @o2s/blocks.invoice-list@1.2.0
85+
- @o2s/integrations.mocked@1.13.0
86+
- @o2s/blocks.order-list@1.2.0
87+
- @o2s/blocks.category@1.1.1
88+
- @o2s/configs.integrations@0.1.1
89+
90+
## 1.10.0
91+
92+
### Minor Changes
93+
94+
- 9ad8658: made improvements to the way the code splitting to reduce the total size of JS bundles
95+
96+
### Patch Changes
97+
98+
- Updated dependencies [9ad8658]
99+
- Updated dependencies [9ad8658]
100+
- @o2s/blocks.featured-service-list@1.1.0
101+
- @o2s/blocks.notification-details@1.1.0
102+
- @o2s/blocks.notification-list@1.1.0
103+
- @o2s/blocks.payments-history@1.1.0
104+
- @o2s/blocks.payments-summary@1.1.0
105+
- @o2s/blocks.service-details@1.1.0
106+
- @o2s/blocks.article-search@1.1.0
107+
- @o2s/blocks.orders-summary@1.1.0
108+
- @o2s/blocks.ticket-details@1.1.0
109+
- @o2s/blocks.category-list@1.1.0
110+
- @o2s/blocks.order-details@1.1.0
111+
- @o2s/blocks.surveyjs-form@1.1.0
112+
- @o2s/blocks.ticket-recent@1.1.0
113+
- @o2s/blocks.article-list@1.1.0
114+
- @o2s/blocks.invoice-list@1.1.0
115+
- @o2s/blocks.service-list@1.1.0
116+
- @o2s/blocks.user-account@1.1.0
117+
- @o2s/blocks.quick-links@1.1.0
118+
- @o2s/blocks.ticket-list@1.1.0
119+
- @o2s/blocks.order-list@1.1.0
120+
- @o2s/blocks.category@1.1.0
121+
- @o2s/blocks.article@1.1.0
122+
- @o2s/blocks.faq@1.1.0
123+
- @o2s/integrations.mocked@1.12.0
124+
- @o2s/modules.surveyjs@0.2.0
125+
126+
## 1.9.4
127+
128+
### Patch Changes
129+
130+
- 4a42e9c: improvements for knowledge base blocks and layouts
131+
- Updated dependencies [4a42e9c]
132+
- @o2s/blocks.article-search@1.0.1
133+
- @o2s/blocks.article-list@1.0.1
134+
- @o2s/integrations.mocked@1.11.3
135+
- @o2s/blocks.category@1.0.1
136+
- @o2s/blocks.article@1.0.1
137+
- @o2s/framework@1.11.2
138+
139+
## 1.9.3
140+
141+
### Patch Changes
142+
143+
- 5f25529: added an option to set a page-based themes via CMS config
144+
- 5f25529: added stories for UI components
145+
- Updated dependencies [5f25529]
146+
- Updated dependencies [5f25529]
147+
- @o2s/framework@1.11.1
148+
- @o2s/blocks.category-list@1.0.1
149+
- @o2s/integrations.mocked@1.11.2
150+
- @o2s/blocks.quick-links@1.0.1
151+
152+
## 1.9.2
153+
154+
### Patch Changes
155+
156+
- d9a9500: fixed incorrect path to dist file after prod build
157+
- Updated dependencies [9c62515]
158+
- @o2s/integrations.mocked@1.11.1
159+
3160
## 1.9.1
4161

5162
### Patch Changes
@@ -145,7 +302,6 @@
145302
### Minor Changes
146303

147304
- 6949717: feat: updated resource integration - added product to the Resource model
148-
149305
- updated service-list and service-details blocks,
150306
- added sorting and filters to mocks,
151307

@@ -161,7 +317,6 @@
161317
### Minor Changes
162318

163319
- 027ed39: featuredServiceListBlock - list of available services
164-
165320
- added new UI componetnt from Shadcn - Switch,
166321
- extended ProductCard with action property,
167322
- implemented model and mock for FeatureServiceListBlock,
@@ -192,7 +347,6 @@
192347
### Minor Changes
193348

194349
- 1ee5be1: feat: aligned buttons - used ActionList component with dropdown menu
195-
196350
- used ActionList in the OrderDetailBlock to display buttons,
197351
- updated the mock and strapi - now an action is a Link,
198352
- used the format method from the string-template to inject a value into a string,
@@ -208,20 +362,17 @@
208362
### Minor Changes
209363

210364
- 565b63d: feat: fixed pagination issue in articleList
211-
212365
- added new mocked articles
213366
- implemented new additionalLink in ArticleList
214367

215368
- 5d16edf: orderDetails fixes:
216-
217369
- order model update - product is required now,
218370
- filtering moved to order mapper,
219371
- PayOnline button visible only when the order is overdue,
220372

221373
- 6225c14: remodeled how articles are kept in Strapi in order to suppport indexing them by search engines (e.g. Algolia) by separating them into their own content type
222374
- 61d4f2f: Added integration of services and assets with MedusaJS
223375
- f015c2b: New block ArticleSearch - Input field with suggestions to find appropriate article.
224-
225376
- added new UI component - Command,
226377
- added new articles mock,
227378
- added mock for ArticleSearchBlock,
@@ -257,7 +408,6 @@
257408

258409
- 05eea01: chore: update dependencies
259410
- 44653fb: feat: orderDetails page implemented
260-
261411
- added new UI component: InfoCard,
262412
- used InfoCard in PaymentsSummaryBlock, OrdersSummary and OrderDetails,
263413
- fixed ordersSummaryBlock integration with strapi,
@@ -307,14 +457,12 @@
307457
- 30f3524: added `OrdersSummary` block and reworked mocked orders to return random orders instead of them being hardcoded
308458
- 8b93cbf: feat: Integrated SurveyJS
309459
- 8d92afc: Help center pages and subpages implemented:
310-
311460
- Added new UI components InformativeCard, BlogCard, Author, ContentSection
312461
- Styled blocks, Article, Article List, Category, Category List
313462
- Added pagination to Category block
314463
- Made changes to mocks and models
315464

316465
- 30f3524: feat: implemented orderListBlock
317-
318466
- new page /orders,
319467
- added strapi integration for page /orders
320468
- new UI dropdown-menu component
@@ -323,7 +471,6 @@
323471
- 6d63cb1: feat: added surveyJS module
324472
- ba125d6: Added orders module
325473
- bb46536: feat: cases submission
326-
327474
- new component DynamicIcon - for loading icons dinamicly,
328475
- new component ActionLinks - for showing button list with dropdown-menu,
329476
- new pages: /contact-us, /submit-complaint, /request-device-maintenance,

apps/api-harmonization/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# https://turborepo.com/docs/guides/tools/docker
22
# https://github.com/vercel/turborepo/tree/main/examples/with-docker
33

4-
FROM node:22-alpine AS base
4+
FROM node:24-alpine AS base
55

66
FROM base AS builder
77
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
@@ -48,4 +48,4 @@ USER expressjs
4848

4949
COPY --from=installer /app .
5050

51-
CMD node apps/api-harmonization/dist/src/main.js
51+
CMD node apps/api-harmonization/dist/main.js

apps/api-harmonization/api/main.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
// this is a function used for serverless deployments
2-
//
3-
import { LoggerService } from '@o2s/utils.logger';
42
import { HttpAdapterHost, NestFactory } from '@nestjs/core';
53
import compression from 'compression';
64
import cookieParser from 'cookie-parser';
75
import helmet from 'helmet';
86

7+
import { LoggerService } from '@o2s/utils.logger';
8+
99
import { AppModule } from '../dist/app.module';
1010

1111
// Keep the app instance in memory for subsequent requests
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
export default {
2-
'*.{js,jsx,ts,tsx,css,scss}': ['prettier --write'],
3-
'*.{js,jsx,ts,tsx}': () => 'tsc --noEmit',
4-
};
1+
import { config } from '@o2s/lint-staged-config/base';
2+
3+
export default config;

apps/api-harmonization/nest-cli.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"collection": "@nestjs/schematics",
44
"sourceRoot": "src",
55
"compilerOptions": {
6-
"deleteOutDir": true
6+
"deleteOutDir": true,
7+
"builder": "swc"
78
}
89
}

0 commit comments

Comments
 (0)