Skip to content

Commit f0b0363

Browse files
authored
Merge branch 'dev' into refactor/challenges
2 parents 42ab9d4 + 5038f83 commit f0b0363

126 files changed

Lines changed: 12345 additions & 2268 deletions

File tree

Some content is hidden

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

‎.github/workflows/ci.yaml‎

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,49 +54,61 @@ jobs:
5454

5555
build-api:
5656
runs-on: self-hosted
57-
if : github.event_name == 'pull_request'
57+
if: github.event_name == 'pull_request'
5858
needs:
5959
- lint-api
6060
steps:
6161
- name: Checkout repository
6262
uses: actions/checkout@v5
6363

64+
- name: Setup pnpm
65+
uses: pnpm/action-setup@v4
66+
with:
67+
version: 11
68+
6469
- name: Set up Node.js
6570
uses: actions/setup-node@v5
6671
with:
67-
node-version: '24'
72+
node-version: '23'
73+
cache: 'pnpm'
74+
cache-dependency-path: ./backend/pnpm-lock.yaml
6875

6976
- name: Install dependencies
7077
working-directory: ./backend
71-
run: |
72-
npm ci
78+
run: pnpm install --frozen-lockfile
7379

74-
- name: Build
80+
- name: Build
7581
working-directory: ./backend
76-
run: npm run build-test
82+
run: pnpm run build-test
7783

7884
build-front:
7985
runs-on: self-hosted
80-
if : github.event_name == 'pull_request'
86+
if: github.event_name == 'pull_request'
8187
needs:
8288
- lint-front
8389
steps:
8490
- name: Checkout repository
8591
uses: actions/checkout@v5
8692

93+
- name: Setup pnpm
94+
uses: pnpm/action-setup@v4
95+
with:
96+
version: 11
97+
8798
- name: Set up Node.js
8899
uses: actions/setup-node@v5
89100
with:
90-
node-version: '24'
101+
node-version: '23'
102+
cache: 'pnpm'
103+
cache-dependency-path: ./frontend/pnpm-lock.yaml
91104

92105
- name: Install dependencies
93106
working-directory: ./frontend
94-
run: |
95-
npm ci
107+
run: pnpm install --frozen-lockfile
96108

97109
- name: Build
98110
working-directory: ./frontend
99-
run: npm run build
111+
run: pnpm run build
100112

101113
deploy-api:
102114
runs-on: self-hosted
@@ -158,5 +170,20 @@ jobs:
158170
VITE_ROADBOOK_URL_FRENCH=${{ vars.ROADBOOK_URL_FRENCH }}
159171
VITE_ROADBOOK_URL_ENGLISH=${{ vars.ROADBOOK_URL_ENGLISH }}
160172
VITE_CAS_LOGIN_URL=${{ vars.CAS_LOGIN_URL }}
173+
VITE_ASSOCIATION_ADDRESS=${{ vars.ASSOCIATION_ADDRESS }}
174+
VITE_ASSOCIATION_EMAIL=${{ vars.ASSOCIATION_EMAIL }}
175+
VITE_ASSOCIATION_NAME=${{ vars.ASSOCIATION_NAME }}
176+
VITE_ASSOCIATION_PHONE=${{ vars.ASSOCIATION_PHONE }}
177+
VITE_ASSOCIATION_RNA=${{ vars.ASSOCIATION_RNA }}
178+
VITE_ASSOCIATION_RCS=${{ vars.ASSOCIATION_RCS }}
179+
VITE_BDE_ADDRESS=${{ vars.BDE_ADDRESS }}
180+
VITE_BDE_EMAIL=${{ vars.BDE_EMAIL }}
181+
VITE_BDE_NAME=${{ vars.BDE_NAME }}
182+
VITE_BDE_PHONE=${{ vars.BDE_PHONE }}
183+
VITE_BDE_RNA=${{ vars.BDE_RNA }}
184+
VITE_BDE_SIRET=${{ vars.BDE_SIRET }}
185+
VITE_BDE_SIREN=${{ vars.BDE_SIREN }}
186+
VITE_DPO_EMAIL=${{ vars.DPO_EMAIL }}
187+
VITE_DPO_NAME=${{ vars.DPO_NAME }}
161188
tags: |
162189
${{ secrets.REGISTRY_URL }}/integration/front:${{ github.ref == 'refs/heads/prod' && 'prod' || 'dev' }}

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@ frontend/dist/
66
backend/node_modules/
77
backend/uploads/
88
backend/exports/
9+
backend/dist
10+
11+
# Autres dossiers à ignorer
12+
.vscode/
913

1014
# Autres fichiers à ignorer
1115
.DS_Store
1216
*.log
1317
*.env
18+
*.pem
1419
google_credentials.json

‎backend/.env.example‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
API_UTT_AUTH_URL=
2+
API_UTT_ADMIS_URL=
3+
API_UTT_ADMIS_URL_ISMAJOR=
4+
API_UTT_USERNAME=
5+
API_UTT_PASSWORD=
6+
7+
AUTOMATION_TOKEN=
8+
9+
EMAIL_HOST=
10+
EMAIL_USER=
11+
EMAIL_PASSWORD=
12+
EMAIL_FROM=
13+
14+
CAS_VALIDATE_URL=
15+
CAS_LOGIN_URL=
16+
17+
DATABASE_URL=postgresql://admin:password@localhost:5432/integration-dev
18+
OUTSIDE_DATABASE_URL=postgresql://admin:password@localhost:5432/integration-dev
19+
20+
JWT_SECRET=
21+
22+
POSTGRES_PASSWORD=password
23+
POSTGRES_USER=admin
24+
POSTGRES_DB=integration-dev
25+
POSTGRES_HOST=localhost
26+
POSTGRES_PORT=5432
27+
28+
SERVER_PORT=4001
29+
SERVICE_URL=http://localhost:4001/
30+
31+
SHOTGUN_PASSWORD=vodka
32+
33+
SPREADSHEET_ID=

‎backend/.env.exemple‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
DATABASE_URL=postgresql://admin:password@localhost:5432/integration-dev
2+
OUTSIDE_DATABASE_URL=postgresql://admin:password@localhost:5432/integration-dev
3+
POSTGRES_PASSWORD=password
4+
POSTGRES_USER=admin
5+
POSTGRES_DB=integration-dev
6+
POSTGRES_HOST=localhost
7+
POSTGRES_PORT=5432
8+
SERVER_PORT=4001
9+
ZIMBRA_PASSWORD=codecode
10+
SHOTGUN_PASSWORD=vodka
11+
CAS_VALIDATE_URL=
12+
CAS_LOGIN_URL=

‎backend/.prettierrc‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"semi": true,
3+
"trailingComma": "all",
4+
"singleQuote": true,
5+
"printWidth": 120,
6+
"tabWidth": 4,
7+
"arrowParens": "always",
8+
"endOfLine": "lf",
9+
"bracketSameLine": true
10+
}

‎backend/Dockerfile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ WORKDIR /app
55
# Install system dependencies (including PostgreSQL client)
66
RUN apt-get update && apt-get install -y postgresql-client && apt-get clean && rm -rf /var/lib/apt/lists/*
77

8+
RUN corepack enable
9+
810
# Copy package files and install dependencies
9-
COPY package.json package-lock.json ./
10-
RUN npm install -g npm@latest && npm install
11+
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
12+
RUN pnpm install --frozen-lockfile
1113

1214
# Copy the rest of the application files
1315
COPY . .

‎backend/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "backend",
33
"version": "1.0.0",
44
"main": "index.js",
5+
"packageManager": "pnpm@11.0.0",
56
"scripts": {
67
"dev": "nodemon --watch src --ext ts --exec ts-node ./server.ts",
78
"migrate": "npx drizzle-kit generate && npx drizzle-kit migrate",

0 commit comments

Comments
 (0)