Skip to content

Commit 4b94982

Browse files
github-actions[bot]github-actions[bot]
authored
Merged 'develop-G5' into 'auto-develop'.
2 parents d1b9d8e + 8065cdc commit 4b94982

8 files changed

Lines changed: 73 additions & 85 deletions

File tree

‎.github/CODEOWNERS‎

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/back-end/.eslintrc.js @AyakorK @Maghwyn @Loule95450
99
/back-end/.gitignore @Maghwyn @Loule95450
1010
/back-end/docker-compose.prod.yml @Maghwyn @Kevw94
11-
/back-end/package-lock.json @Maghwyn @Loule95450
11+
/back-end/package-lock.json @Maghwyn @AyakorK
1212
/back-end/src/app.controller.ts @Maghwyn @Loule95450
1313
/back-end/src/app.service.ts @Maghwyn @Kevw94
1414
/back-end/src/auth/ @Kevw94 @Maghwyn
@@ -26,7 +26,7 @@
2626
/back-end/src/base/articles/ @Maghwyn @TheoLandemaine
2727
/back-end/src/base/articles/articles.module.ts @Maghwyn
2828
/back-end/src/base/articles/events/ @Loule95450
29-
/back-end/src/base/articles/interfaces/articles.interface.ts @Maghwyn @Loule95450
29+
/back-end/src/base/articles/interfaces/articles.interface.ts @Maghwyn @Loule95450 @AyakorK
3030
/back-end/src/base/boards/boards.repository.ts @Maghwyn @Loule95450
3131
/back-end/src/base/boards/interfaces/boards.interface.ts @Maghwyn @Loule95450
3232
/back-end/src/base/calls/ @AyakorK @Maghwyn
@@ -45,21 +45,22 @@
4545
/back-end/src/base/CanvasRoom/interfaces/CanvasRoom.interface.ts @Maghwyn @Loule95450
4646
/back-end/src/base/canvasRoom/interfaces/ws.canvasRoom.interface.ts @Maghwyn @Kevw94
4747
/back-end/src/base/canvasRoom/utils/canvasRoom.projection.ts @Maghwyn
48-
/back-end/src/base/courses/courses.module.ts @Loule95450 @Maghwyn @Kevw94
48+
/back-end/src/base/courses/courses.module.ts @Loule95450 @Kevw94 @TheoLandemaine
4949
/back-end/src/base/courses/courses.service.ts @Maghwyn @AyakorK
5050
/back-end/src/base/courses/dto/coures.dto.ts @AyakorK
5151
/back-end/src/base/courses/interfaces/courses.interface.ts @AyakorK @Maghwyn
5252
/back-end/src/base/equipmentsLoan/interfaces/equipmentsLoan.interface.ts @Maghwyn
53-
/back-end/src/base/groups/ @Kevw94 @Loule95450 @Maghwyn
53+
/back-end/src/base/groups/groups.controller.ts @Loule95450 @Kevw94 @TheoLandemaine
5454
/back-end/src/base/groups/groups.module.ts @Maghwyn
5555
/back-end/src/base/groups/groups.repository.ts @Maghwyn @Loule95450
56+
/back-end/src/base/groups/groups.service.ts @AyakorK @Maghwyn @Loule95450
5657
/back-end/src/base/groups/interfaces/groups.interface.ts @Maghwyn @Loule95450
57-
/back-end/src/base/groups/utils/createProject.ts @TheoLandemaine
58-
/back-end/src/base/ideasComments/ideasComments.module.ts @Maghwyn @AyakorK
58+
/back-end/src/base/groups/utils/createProject.ts @TheoLandemaine @Loule95450
59+
/back-end/src/base/ideasComments/ideasComments.module.ts @RuKaSuu @Maghwyn
5960
/back-end/src/base/ideasComments/ideasComments.repository.ts @Maghwyn @AyakorK
6061
/back-end/src/base/ideasComments/interfaces/ideasComments.interface.ts @Maghwyn @AyakorK
6162
/back-end/src/base/ideasEquipments/ideasEquipments.repository.ts @Maghwyn @Loule95450
62-
/back-end/src/base/ideasEquipments/interfaces/ideasEquipments.interface.ts @Maghwyn @Loule95450
63+
/back-end/src/base/ideasEquipments/interfaces/ideasEquipments.interface.ts @Maghwyn @Loule95450 @Heloise-lelez
6364
/back-end/src/base/materials/ @Maghwyn @RuKaSuu
6465
/back-end/src/base/materials/dto/materials.dto.ts @Maghwyn @AyakorK
6566
/back-end/src/base/materials/interfaces/materials.interface.ts @Maghwyn @AyakorK
@@ -95,12 +96,14 @@
9596
/back-end/src/common/decorators/ws.catch.decorator.ts @Maghwyn @Kevw94
9697
/back-end/src/common/gateways/canvas.global.gateway.ts @Maghwyn
9798
/back-end/src/common/gateways/chat.global.gateway.ts @Maghwyn @AyakorK
99+
/back-end/src/common/gateways/ideasComment.global.gateway.ts @RuKaSuu
98100
/back-end/src/common/gateways/retrospective.global.gateway.ts @Maghwyn
99101
/back-end/src/common/guards/auth.guard.ts @Maghwyn
100102
/back-end/src/common/guards/role.guard.ts @Maghwyn @Kevw94
101103
/back-end/src/common/helpers/string.helper.ts @Loule95450 @Maghwyn
102104
/back-end/src/common/middlewares/socket.auth.middleware.ts @Maghwyn
103105
/back-end/src/common/middlewares/socket.chat.middleware.ts @Maghwyn @Loule95450
106+
/back-end/src/common/middlewares/socket.ideasComment.middleware.ts @RuKaSuu
104107
/back-end/src/common/providers/interfaces/events.interface.ts @Loule95450 @Maghwyn
105108
/back-end/src/common/providers/mailjet.provider.ts @Loule95450 @Maghwyn
106109
/back-end/src/common/validators/ @Kevw94 @Maghwyn
@@ -149,22 +152,19 @@
149152
/front-end/src/components/account/AccountProfile.vue @Maghwyn
150153
/front-end/src/components/account/AccountRelatedProfile.vue @Maghwyn
151154
/front-end/src/components/Agility.vue @Loule95450 @Thomlam
152-
/front-end/src/components/agility/ @AyakorK @Maghwyn
153-
/front-end/src/components/agility/AgilityCanvas.vue @Maghwyn
155+
/front-end/src/components/agility/ @Maghwyn
154156
/front-end/src/components/agility/AgilityCanvasUI.vue @Maghwyn @Loule95450
157+
/front-end/src/components/agility/AgilityProjectDisplay.vue @Maghwyn @AyakorK
155158
/front-end/src/components/agility/cards/ @Loule95450 @Maghwyn
156159
/front-end/src/components/agility/cards/AgilityProjectCard.vue @Maghwyn
157160
/front-end/src/components/agility/cards/AgilityTemplateCard.vue @Maghwyn @Kevw94
158161
/front-end/src/components/agility/modals/ @Maghwyn
159-
/front-end/src/components/agility/modals/Blueprint.vue @Maghwyn
160162
/front-end/src/components/agility/modals/Project.vue @Loule95450 @Maghwyn
161-
/front-end/src/components/agility/UI/ @Maghwyn
162163
/front-end/src/components/agility/UI/CanvasLoader.vue @Maghwyn @Kevw94
163164
/front-end/src/components/agility/UI/CanvasTabulation.vue @Maghwyn
164165
/front-end/src/components/agility/UI/ManageUser.vue @Maghwyn @Loule95450
165166
/front-end/src/components/agility/UI/MiroSelectionBox.vue @Maghwyn
166167
/front-end/src/components/agility/UI/SceneUI.vue @Maghwyn @Kevw94
167-
/front-end/src/components/agility/UI/ShareProject.vue @Maghwyn @AyakorK
168168
/front-end/src/components/agility/UI/TextAreaEditor.vue @TheoLandemaine
169169
/front-end/src/components/agility/UI/ToolsEditor.vue @Maghwyn
170170
/front-end/src/components/auth/ @Loule95450 @Maghwyn
@@ -173,7 +173,7 @@
173173
/front-end/src/components/auth/signin/AskCredentials.vue @Maghwyn @Loule95450
174174
/front-end/src/components/blog/ @Maghwyn @TheoLandemaine
175175
/front-end/src/components/blog/AddTutorial.vue @Maghwyn
176-
/front-end/src/components/blog/MarkdownViewer.vue @Maghwyn
176+
/front-end/src/components/blog/MarkdownViewer.vue @Maghwyn @Loule95450
177177
/front-end/src/components/common/ @Kevw94 @Maghwyn
178178
/front-end/src/components/common/buttons/Default.vue @Maghwyn @Loule95450
179179
/front-end/src/components/common/buttons/Icon.vue @Maghwyn @Kevw94
@@ -215,7 +215,7 @@
215215
/front-end/src/components/retrospective/Postit.vue @Maghwyn @AyakorK
216216
/front-end/src/components/retrospective/PrivateSection.vue @Maghwyn @Loule95450
217217
/front-end/src/components/retrospective/Timer.vue @Maghwyn @Kevw94 @Loule95450
218-
/front-end/src/components/retrospective/UpdatePostit.vue @Loule95450 @Maghwyn @Kevw94
218+
/front-end/src/components/retrospective/UpdatePostit.vue @AyakorK @Loule95450
219219
/front-end/src/components/retrospective/utils/ @Maghwyn
220220
/front-end/src/components/retrospective/utils/Overlay.vue @Loule95450
221221
/front-end/src/components/retrospective/utils/ShareRetro.vue @AyakorK
@@ -228,31 +228,24 @@
228228
/front-end/src/components/RollCallComponents/QrCode.vue @AyakorK @Maghwyn
229229
/front-end/src/components/scrum/Planning.vue @AyakorK
230230
/front-end/src/composables/ @Kevw94 @Maghwyn
231-
/front-end/src/composables/useSocketRetro.ts @Maghwyn
231+
/front-end/src/composables/useSocketRetro.ts @Maghwyn @AyakorK
232232
/front-end/src/config/config.ts @Maghwyn
233233
/front-end/src/interfaces/advanced-types.interface.ts @Loule95450 @Maghwyn
234234
/front-end/src/layout/app/AppLayout.vue @Maghwyn @Loule95450
235235
/front-end/src/layout/app/DrawerLayout.vue @Maghwyn @AyakorK
236236
/front-end/src/layout/home/ @Loule95450 @Maghwyn
237237
/front-end/src/lib/ @Loule95450
238238
/front-end/src/lib/pixi-tools-v2/ @Maghwyn
239-
/front-end/src/lib/pixi-tools-v2/blueprint/ @AyakorK @Maghwyn
240-
/front-end/src/lib/pixi-tools-v2/blueprint/empathyMap.ts @Maghwyn
241-
/front-end/src/lib/pixi-tools-v2/blueprint/personas.ts @Maghwyn
242-
/front-end/src/lib/pixi-tools-v2/class/framedContainer.ts @Maghwyn @Loule95450
243239
/front-end/src/lib/pixi-tools-v2/class/lineContainer.ts @Maghwyn @Loule95450
244240
/front-end/src/lib/pixi-tools-v2/class/selectionBox.ts @Kevw94 @Maghwyn
245241
/front-end/src/lib/pixi-tools-v2/class/socketManager.ts @Maghwyn @Loule95450
246-
/front-end/src/lib/pixi-tools-v2/class/textContainer.ts @TheoLandemaine
242+
/front-end/src/lib/pixi-tools-v2/class/textContainer.ts @TheoLandemaine @Loule95450
247243
/front-end/src/lib/pixi-tools-v2/model/ @Kevw94 @Maghwyn
248244
/front-end/src/lib/pixi-tools-v2/model/model-constructor/ @AyakorK @Maghwyn
249245
/front-end/src/lib/pixi-tools-v2/model/model-constructor/circle.ts @Maghwyn
250-
/front-end/src/lib/pixi-tools-v2/model/model-constructor/ellipse.ts @Maghwyn @AyakorK
251246
/front-end/src/lib/pixi-tools-v2/model/model-constructor/lineBezier.ts @Maghwyn
252-
/front-end/src/lib/pixi-tools-v2/model/model-constructor/polygon.ts @Maghwyn @Loule95450
253247
/front-end/src/lib/pixi-tools-v2/model/model-constructor/rectangle.ts @Maghwyn @Kevw94
254-
/front-end/src/lib/pixi-tools-v2/model/model-constructor/textArea.ts @TheoLandemaine
255-
/front-end/src/lib/pixi-tools-v2/model/model-constructor/tree.ts @Maghwyn @AyakorK
248+
/front-end/src/lib/pixi-tools-v2/model/model-constructor/textArea.ts @TheoLandemaine @Loule95450
256249
/front-end/src/lib/pixi-tools-v2/model/model-constructor/triangle.ts @Maghwyn @Loule95450
257250
/front-end/src/lib/pixi-tools-v2/model/template-ui.ts @Kevw94 @Maghwyn
258251
/front-end/src/lib/pixi-tools-v2/model/template.ts @Maghwyn @Loule95450
@@ -266,6 +259,7 @@
266259
/front-end/src/lib/pixi-tools-v2/types/pixi-aliases.ts @Kevw94 @Maghwyn
267260
/front-end/src/lib/pixi-tools-v2/types/pixi-ui.ts @Kevw94 @Maghwyn
268261
/front-end/src/lib/pixi-tools-v2/unsupported/ @Kevw94 @Maghwyn
262+
/front-end/src/lib/pixi-tools-v2/unsupported/lib_TextInput.ts @Maghwyn @AyakorK
269263
/front-end/src/lib/pixi-tools-v2/unsupported/textarea_html.ts @TheoLandemaine
270264
/front-end/src/lib/pixi-tools-v2/utils/ @Loule95450 @Maghwyn
271265
/front-end/src/lib/pixi-tools-v2/utils/colorsConvertor.ts @TheoLandemaine
@@ -288,13 +282,14 @@
288282
/front-end/src/main.ts @Maghwyn
289283
/front-end/src/router/guard.ts @Maghwyn
290284
/front-end/src/router/index.ts @Loule95450 @Maghwyn
291-
/front-end/src/store/ @Maghwyn
285+
/front-end/src/store/index.ts @Maghwyn
292286
/front-end/src/store/interfaces/ @Kevw94 @Maghwyn
293287
/front-end/src/store/interfaces/agility.interface.ts @Maghwyn
294288
/front-end/src/store/interfaces/article.interface.ts @Maghwyn @TheoLandemaine
295289
/front-end/src/store/interfaces/auth.interfaces.ts @Maghwyn @TheoLandemaine
296290
/front-end/src/store/interfaces/axios.interface.ts @Maghwyn
297291
/front-end/src/store/interfaces/cours.interface.ts @AyakorK @Kevw94
292+
/front-end/src/store/interfaces/material.interface.ts @Maghwyn
298293
/front-end/src/store/interfaces/openhouse.store.ts @Maghwyn @AyakorK
299294
/front-end/src/store/interfaces/project.interface.ts @Maghwyn
300295
/front-end/src/store/interfaces/template.interfaces.ts @Maghwyn
@@ -332,17 +327,19 @@
332327
/front-end/src/views/app/ @Loule95450 @Maghwyn
333328
/front-end/src/views/app/AgilityDashboard.vue @Maghwyn @AyakorK
334329
/front-end/src/views/app/AgilityInvitation.vue @Maghwyn @Loule95450
335-
/front-end/src/views/app/AgilityProject.vue @Maghwyn @AyakorK
330+
/front-end/src/views/app/AgilityProject.vue @Maghwyn
336331
/front-end/src/views/app/RelatedProfileView.vue @Maghwyn
337-
/front-end/src/views/calls/ @Maghwyn
332+
/front-end/src/views/calls/GroupsView.vue @Maghwyn
333+
/front-end/src/views/calls/RollCallView.vue @Maghwyn @AyakorK
338334
/front-end/src/views/CardArticleView.vue @TheoLandemaine
339335
/front-end/src/views/CoursDetailsView.vue @AyakorK
340336
/front-end/src/views/CourseView.vue @AyakorK
341337
/front-end/src/views/DisplayArticleView.vue @TheoLandemaine
342338
/front-end/src/views/EditArticleView.vue @Maghwyn
343339
/front-end/src/views/home/ @Loule95450 @Maghwyn
344-
/front-end/src/views/material-ideas/ @Loule95450 @Maghwyn
345-
/front-end/src/views/material-ideas/DraftPdf.vue @TheoLandemaine
340+
/front-end/src/views/material-ideas/ @Heloise-lelez @Loule95450 @Maghwyn
341+
/front-end/src/views/material-ideas/Comments.vue @Maghwyn @RuKaSuu @Loule95450
342+
/front-end/src/views/material-ideas/DraftPdf.vue @Loule95450
346343
/front-end/src/views/MaterialsApprouvalCenterView.vue @Loule95450 @Maghwyn
347344
/front-end/src/views/MaterialsView.vue @Maghwyn @RuKaSuu
348345
/front-end/src/views/NewRetrospective.vue @AyakorK @Kevw94 @TheoLandemaine
@@ -351,7 +348,6 @@
351348
/front-end/src/views/RetrospectiveInvitation.vue @AyakorK
352349
/front-end/src/views/RollCall.vue @AyakorK @Loule95450
353350
/front-end/src/views/ShowArticleView.vue @TheoLandemaine
354-
/front-end/src/views/SprintsView.vue @Maghwyn @Loule95450 @Kevw94
355351
/front-end/src/vite-env.d.ts @Maghwyn
356352
/front-end/tailwind.config.cjs @Maghwyn @TheoLandemaine
357353
/front-end/tsconfig.json @Loule95450 @Maghwyn

‎back-end/package-lock.json‎

Lines changed: 25 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎back-end/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
"dependencies": {
2525
"@nestjs/cli": "^9.5.0",
2626
"@nestjs/common": "^9.4.2",
27-
"@nestjs/config": "^2.3.2",
27+
"@nestjs/config": "^2.3.4",
2828
"@nestjs/core": "^9.4.2",
2929
"@nestjs/event-emitter": "^1.4.1",
3030
"@nestjs/jwt": "^10.0.3",
3131
"@nestjs/passport": "^9.0.3",
32-
"@nestjs/platform-express": "^9.4.2",
33-
"@nestjs/platform-socket.io": "^9.4.2",
32+
"@nestjs/platform-express": "^9.4.3",
33+
"@nestjs/platform-socket.io": "^9.4.3",
3434
"@nestjs/schedule": "^2.2.2",
3535
"@nestjs/websockets": "^9.4.2",
3636
"argon2": "^0.30.3",

‎front-end/package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎front-end/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"tailwindcss": "^3.3.2",
7878
"typescript": "^5.0.4",
7979
"vite": "^4.3.9",
80-
"vue-eslint-parser": "^9.3.0",
80+
"vue-eslint-parser": "^9.3.1",
8181
"vue-tsc": "^1.6.5"
8282
}
8383
}

‎front-end/src/views/MaterialsView.vue‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ import Bell from '@/components/common/svg/Bell.vue';
7878
import ApprouvalCenter from '@/components/materials/ApprouvalCenter.vue';
7979
import { useMaterialStore } from '@/store/modules/material.store';
8080
import { useRouter } from 'vue-router';
81+
import pdfMakeFonts from '@/utils/pdfMakeFonts';
8182
8283
// This file will register globalThis.pdfMake.vfs, the documentation does not explicity define the behavior
8384
// Unless you want to change the font, you don't need to assign pdfmake.vfs = globalThis.pdfMake.vfs.

‎front-end/src/views/material-ideas/DraftPdf.vue‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
</template>
2424

2525
<script>
26-
import pdfMake from 'pdfmake/build/pdfmake';
27-
import pdfFonts from 'pdfmake/build/vfs_fonts';
26+
// import pdfMake from 'pdfmake/build/pdfmake';
27+
// import pdfFonts from 'pdfmake/build/vfs_fonts';
2828
import CodingToolsLogo from '@/assets/images/CodingToolsLogo.png';
2929
import { useUserStore } from '@/store/modules/user.store';
3030
import { computed } from 'vue';
@@ -37,7 +37,9 @@ const userStore = useUserStore();
3737
const user = computed(() => authStore.user);
3838
const userId = computed(() => user.value._id);
3939
40-
pdfMake.vfs = pdfFonts.pdfMake.vfs;
40+
import { createPdf } from 'pdfmake/build/pdfmake';
41+
import * as _ from 'pdfmake/build/vfs_fonts.js';
42+
const fonts = globalThis.pdfMake.vfs ?? _.pdfMake.vfs;
4143
4244
const date = new Date().toLocaleDateString();
4345
let base64Image = null;
@@ -118,7 +120,7 @@ export default {
118120
},
119121
},
120122
};
121-
pdfMake.createPdf(docDefinition).download(`devis_${this.item.title}`);
123+
createPdf(docDefinition, null, null, fonts).download(`devis_${this.item.title}`);
122124
},
123125
},
124126
};

0 commit comments

Comments
 (0)