Skip to content

Commit 7119db2

Browse files
authored
Merge pull request #120 from ungdev/dev
2026 Fixes n°2
2 parents c9bf6fa + e5b873a commit 7119db2

62 files changed

Lines changed: 2528 additions & 706 deletions

Some content is hidden

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

.github/ISSUE_TEMPLATE/bug.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: 🐛 Bug
2+
description: Signaler un bug
3+
title: "[Bug] "
4+
labels:
5+
- bug
6+
body:
7+
- type: textarea
8+
id: description
9+
attributes:
10+
label: Description
11+
description: Décris le bug rencontré.
12+
placeholder: Que s'est-il passé ?
13+
validations:
14+
required: true
15+
16+
- type: textarea
17+
id: reproduction
18+
attributes:
19+
label: Reproduction
20+
description: Indique les étapes pour reproduire le bug.
21+
placeholder: |
22+
1. Aller sur...
23+
2. Cliquer sur...
24+
3. ...
25+
validations:
26+
required: true
27+
28+
- type: textarea
29+
id: expected
30+
attributes:
31+
label: Comportement attendu
32+
placeholder: Ce qui devrait se produire...
33+
validations:
34+
required: true
35+
36+
- type: textarea
37+
id: actual
38+
attributes:
39+
label: Comportement actuel
40+
placeholder: Ce qui se produit actuellement...
41+
validations:
42+
required: true
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: ✨ Feature
2+
description: Proposer une nouvelle fonctionnalité
3+
title: "[Feature] "
4+
labels:
5+
- enhancement
6+
body:
7+
- type: textarea
8+
id: description
9+
attributes:
10+
label: Description
11+
description: Décris la fonctionnalité souhaitée.
12+
placeholder: Que veux-tu ajouter ?
13+
validations:
14+
required: true
15+
16+
- type: textarea
17+
id: reason
18+
attributes:
19+
label: Besoin
20+
description: Explique pourquoi cette fonctionnalité est nécessaire.
21+
placeholder: Pourquoi cette fonctionnalité est-elle utile ?
22+
validations:
23+
required: true
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: ♻️ Refactor
2+
description: Améliorer ou restructurer du code
3+
title: "[Refactor] "
4+
labels:
5+
- refactor
6+
body:
7+
- type: textarea
8+
id: description
9+
attributes:
10+
label: Description
11+
description: Décris ce qui doit être refactoré.
12+
placeholder: Qu'est-ce qui doit être modifié ?
13+
validations:
14+
required: true
15+
16+
- type: textarea
17+
id: reason
18+
attributes:
19+
label: Pourquoi ?
20+
description: Explique pourquoi ce refactor est nécessaire.
21+
placeholder: Pourquoi faut-il effectuer ce changement ?
22+
validations:
23+
required: true

backend/server.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import teamRoutes from './src/routes/team.routes';
2828
import tentRoutes from './src/routes/tent.routes';
2929
import userRoutes from './src/routes/user.routes';
3030
import bannedRoutes from './src/routes/banned.routes';
31-
import { server_port } from './src/utils/secret';
31+
import { server_port } from './src/shared/secrets/secrets';
3232
import { initQcmvss } from './src/database/initdb/initQcmvss';
3333

3434
dotenv.config();

backend/src/controllers/auth.controller.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import bcrypt from 'bcryptjs';
22
import bigInt from 'big-integer';
33
import { sign, verify } from 'jsonwebtoken';
4-
import type { EmailOptions } from '../../types/email';
4+
import type { EmailOptions } from '../types/email';
55
import { templateResetPassword } from '../email/email.registry';
66
import { compileTemplate } from '../email/email.renderer';
77
import * as auth_service from '../services/auth.service';
@@ -10,9 +10,9 @@ import * as email_service from '../services/email.service';
1010
import * as registration_service from '../services/registration.service';
1111
import * as role_service from '../services/role.service';
1212
import * as user_service from '../services/user.service';
13-
import { Error, Ok, Unauthorized } from '../utils/responses';
14-
import { email_from, jwtSecret, service_url } from '../utils/secret';
15-
import { decodeToken } from '../utils/token';
13+
import { Error, Ok, Unauthorized } from '../shared/http/responses';
14+
import { email_from, jwtSecret, service_url } from '../shared/secrets/secrets';
15+
import { decodeToken } from '../shared/utils/token';
1616
import type { AppRequestHandler } from '../types/http';
1717
import type {
1818
LoginBody,

backend/src/controllers/banned.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as banned_service from '../services/banned.service';
2-
import { Error, Ok } from '../utils/responses';
2+
import { Error, Ok } from '../shared/http/responses';
33
import type { AppRequestHandler } from '../types/http';
44
import type { BannedBody, BannedIdParams } from '../dto/banned.dto';
55

backend/src/controllers/bus.controller.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as bus_service from '../services/bus.service';
22
import { generateEmailHtml, sendEmail } from '../services/email.service';
3-
import { Error, Ok } from '../utils/responses';
4-
import { email_from } from '../utils/secret';
3+
import { Error, Ok } from '../shared/http/responses';
4+
import { email_from } from '../shared/secrets/secrets';
55
import type { AppRequestHandler } from '../types/http';
66

77
export const sendBusAttributionEmails: AppRequestHandler = async (_req, res) => {

backend/src/controllers/challenge.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as challenge_service from '../services/challenge.service';
2-
import { Created, Error, Ok, Unauthorized } from '../utils/responses';
2+
import { Created, Error, Ok, Unauthorized } from '../shared/http/responses';
33
import type { AppRequestHandler } from '../types/http';
44
import type {
55
CreateChallengeBody,

backend/src/controllers/discord.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as discord_service from '../services/discord.service';
2-
import { Error, Ok, ServiceUnavailable } from '../utils/responses';
2+
import { Error, Ok, ServiceUnavailable } from '../shared/http/responses';
33
import type { AppRequestHandler } from '../types/http';
44
import type { DiscordBody } from '../dto/discord.dto';
55

backend/src/controllers/email.controller.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import type { EmailOptions } from '../../types/email';
1+
import type { EmailOptions } from '../types/email';
22
import { defaultPreviewData } from '../email/email.preview-data';
33
import { generateEmailHtml, getRecipients, sendEmail } from '../services/email.service';
44
import * as registration_service from '../services/registration.service';
55
import * as user_service from '../services/user.service';
6-
import { Error, Ok } from '../utils/responses';
7-
import { email_from, service_url } from '../utils/secret';
8-
import { getLatestUploadedDocument } from '../utils/uploadDocuments';
6+
import { Error, Ok } from '../shared/http/responses';
7+
import { email_from, service_url } from '../shared/secrets/secrets';
8+
import { getLatestUploadedDocument } from '../shared/storage/uploadDocuments';
99
import type { AppRequestHandler } from '../types/http';
1010
import type { EmailRequestBody } from '../dto/email.dto';
1111

0 commit comments

Comments
 (0)