Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #26

Open
wants to merge 90 commits into
base: main
Choose a base branch
from
Open

Dev #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
3c3afe3
[feat] relovers basics
gael-pri Oct 24, 2024
ded47f0
backend test environment initialization
aglevillayer Oct 24, 2024
2dbb789
[feat] resolvers basics part 2
gael-pri Oct 24, 2024
281ee2f
[feat] resolvers and mutations
gael-pri Nov 26, 2024
a9177f8
Delete .env
gael-pri Nov 28, 2024
e43952d
feat-1664-adding CI
LucieMena Nov 28, 2024
75b4bb4
added vitest for backend with coverage
LucieMena Nov 28, 2024
f04764b
fix front unit test
LucieMena Nov 28, 2024
758749d
fix github workflows
LucieMena Dec 4, 2024
41665bc
pulling App.test.tsx
LucieMena Dec 4, 2024
f3c5824
pulling App.test.tsx
LucieMena Dec 4, 2024
3532a0f
change example.spec.ts title to PulseForm
LucieMena Dec 4, 2024
5561be7
Merge branch 'dev' into feat-1664-CI
LucieMena Dec 4, 2024
d74b19b
pulled from dev
LucieMena Dec 4, 2024
2a40403
Merge pull request #18 from WildCodeSchool/feat-1372-back_test_enviro…
aglevillayer Dec 5, 2024
fa8d9a6
typage de GroupList class
LucieMena Dec 5, 2024
62bb774
Merge branch 'dev' into feat-1664-CI
LucieMena Dec 5, 2024
8ee130b
fix test
LucieMena Dec 5, 2024
6fac7d7
fix test back
LucieMena Dec 5, 2024
f4f929f
remove vite.config.ts from backend
LucieMena Dec 5, 2024
d337065
test environment initialization
aglevillayer Oct 24, 2024
ba45783
feat(7692)-added entities and enums
Cyrildab Oct 24, 2024
1373a05
remove dead code
Cyrildab Oct 24, 2024
2e45820
added new entities
Cyrildab Nov 27, 2024
e678ad9
resolved commentaries
Cyrildab Nov 28, 2024
e218b72
added modifications
Cyrildab Nov 28, 2024
30cb3a9
[feat] Config and start project init from docker and component main a…
blackstars64 Oct 24, 2024
1b08f8e
[feat] Config and start project init from docker and component main a…
blackstars64 Oct 24, 2024
136e723
[feat] Config and start project init from docker and component main a…
blackstars64 Oct 24, 2024
64bec2c
[feat] add Landing Page for first mobile scss - added generic BasicBu…
blackstars64 Oct 24, 2024
d3405c4
[feat] Landing page add version desctop for landing component
blackstars64 Nov 27, 2024
13bd618
[feat] Landing page - Correction review
blackstars64 Nov 28, 2024
ac9599a
update test
blackstars64 Nov 28, 2024
880c197
[feat] Config and start project init from docker and component main a…
blackstars64 Oct 24, 2024
af54c6f
[feat] add Landing Page for first mobile scss - added generic BasicBu…
blackstars64 Oct 24, 2024
3609267
[feat] Landing page add version desctop for landing component
blackstars64 Nov 27, 2024
e785482
backend test environment initialization
aglevillayer Oct 24, 2024
6cd9060
Change resolvers after branch entities was merged
gael-pri Nov 29, 2024
2ed49d7
Change resolvers after branch entities was merged
gael-pri Nov 29, 2024
fb980e3
Resolvers adapted with new entities
gael-pri Dec 5, 2024
aae98d6
Merge branch 'dev' into feat-1854-create_resolvers_queries_mutations
gael-pri Dec 5, 2024
a7cd5a8
delete testResolver.ts
LucieMena Dec 6, 2024
107f522
comment out resolver code in index.ts
LucieMena Dec 6, 2024
1a2cb07
[Fix] Add registerEnumType for TypeGraphQL
gael-pri Dec 6, 2024
18d465d
added code quality check wih Biome
LucieMena Dec 6, 2024
deee025
test
LucieMena Jan 8, 2025
ef55559
remove code_quality.yml for now
LucieMena Jan 8, 2025
f684582
Merge branch 'main' of github.com:WildCodeSchool/cdajs-2405-projet-pu…
LucieMena Jan 8, 2025
8c357ee
Merge pull request #19 from WildCodeSchool/feat-1664-CI
LucieMena Jan 8, 2025
0cb2953
fix e2e playwright testing
LucieMena Jan 8, 2025
7b0fac4
[fix]resolvers and add input type
gael-pri Jan 9, 2025
262247d
Merge branch 'dev' into feat-1854-create_resolvers_queries_mutations
gael-pri Jan 9, 2025
2b6d295
Update Exercice.test.ts
gael-pri Jan 9, 2025
e5d06c9
[fix] err - Update Exercice.test.ts
gael-pri Jan 9, 2025
e8fd5ee
Merge pull request #20 from WildCodeSchool/feat-1854-create_resolvers…
gael-pri Jan 9, 2025
684191d
Merge pull request #21 from WildCodeSchool/bug-feat-1664-CI-e2e-playw…
LucieMena Jan 14, 2025
a1f7dc5
[Feat-1664-CI-pre-commit] : Mise en place du hook precommit (#23)
LucieMena Feb 4, 2025
7308c4b
Add workflow for github action
gael-pri Feb 4, 2025
9bad0c6
Merge pull request #25 from WildCodeSchool/feat-2902-CD_VPS
gael-pri Feb 4, 2025
e2c5fe6
Fix biome
gael-pri Feb 4, 2025
c692dc0
Fix without biome
gael-pri Feb 4, 2025
5fdb0b7
Merge pull request #27 from WildCodeSchool/feat-2902-CD_VPS
gael-pri Feb 4, 2025
709ed3e
Add step singn in
blackstars64 Jan 10, 2025
3bbc5f0
[fix] fix in docker
blackstars64 Feb 4, 2025
293bfa7
Merge pull request #28 from WildCodeSchool/feat-5410-sign_up_step
blackstars64 Feb 5, 2025
8ef1566
Add deployement workflow
gael-pri Feb 5, 2025
6470a2d
Merge pull request #29 from WildCodeSchool/feat-5629-publishing
gael-pri Feb 5, 2025
06e09e2
Add deployement workflow
gael-pri Feb 5, 2025
71b46d7
Merge pull request #30 from WildCodeSchool/feat-5629-publishing
gael-pri Feb 5, 2025
dc75468
fix tabs in biome config
blackstars64 Feb 5, 2025
ae6cdd5
Merge pull request #32 from WildCodeSchool/fix-biome_tab
blackstars64 Feb 5, 2025
0bb5642
[Feat 177] : router and skeleton for ExercisePage & HomePage (#33)
LucieMena Feb 5, 2025
1c5bcbc
Add authentication with apollo context
gael-pri Feb 6, 2025
b680e50
Get last dev
gael-pri Feb 6, 2025
31a0644
Add Correction PR
blackstars64 Feb 5, 2025
965207b
[feat] add new trad, fix docker file for translation and change vers…
blackstars64 Feb 5, 2025
0a02ee6
add TU
blackstars64 Feb 5, 2025
f43d236
[fix] moving components
blackstars64 Feb 6, 2025
0fdf7f3
Get last dev
gael-pri Feb 6, 2025
94352df
Fix biome
gael-pri Feb 6, 2025
19fae6f
Merge pull request #34 from WildCodeSchool/feat-3329-backend_authenti…
gael-pri Feb 6, 2025
e83bc90
Merge pull request #31 from WildCodeSchool/feat-5410-sign_up_step
blackstars64 Feb 6, 2025
b7edae4
Feat 5410 create login page (#22)
Cyrildab Feb 6, 2025
54fb705
[fix] update entities
blackstars64 Feb 7, 2025
0f77491
[fix] update inputs
blackstars64 Feb 7, 2025
9f151bb
[fix] update resolvers
blackstars64 Feb 7, 2025
ce3024f
[feat] add seed.sh
blackstars64 Feb 7, 2025
fffc9eb
Merge pull request #35 from WildCodeSchool/feat-add_seed
blackstars64 Feb 7, 2025
cb752be
[fix] add RUN rm -rf node_modules package-lock.json
blackstars64 Feb 7, 2025
4e1e6b9
Merge pull request #36 from WildCodeSchool/fix-dockerfile_translation…
blackstars64 Feb 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .github/workflows/back_unit_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: back_unit_tests

on:
pull_request:
branches: [ main, dev ]
push:
branches: [ main, dev ]

jobs:
back_unit_tests:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./backend # plus besoin de remettre le chemin cd backend à chaque step

steps:
- name: Checkout PulseForm code
uses: actions/checkout@v4

- name: npm install dependencies
run: npm i

- name: Typescript transpile
run: npx tsc

- name: Run back unit tests
run: npm test

105 changes: 105 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
name: deploy

on:
pull_request:
branches: [ main ]
push:
branches: [ main ]

jobs:
deploy:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Set up SSH
run: |
mkdir -p ~/.ssh
echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
chmod 600 ~/.ssh/id_rsa
eval "$(ssh-agent -s)"
ssh-add ~/.ssh/id_rsa



- name: Get current date and set app name
run: |
echo "date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
echo "myapp=pulseform" >> $GITHUB_ENV
echo "environnement=main" >> $GITHUB_ENV

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Login to Docker Hub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Build and push Backend Docker image
uses: docker/build-push-action@v4
with:
push: true
context: ./backend
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.myapp }}-backend:${{ env.environnement }}
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.myapp }}-backend:${{ github.sha }}
labels: |
maintainer=${{ secrets.DOCKERHUB_USERNAME }}
version=${{ github.sha }}
build-date=${{ env.date }}
cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/${{ env.myapp }}-backend:cache
cache-to: type=inline

- name: Build and push Frontend Docker image
uses: docker/build-push-action@v4
with:
push: true
context: ./frontend
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.myapp }}-frontend:${{ env.environnement }}
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.myapp }}-frontend:${{ github.sha }}
labels: |
maintainer=${{ secrets.DOCKERHUB_USERNAME }}
version=${{ github.sha }}
build-date=${{ env.date }}
cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/${{ env.myapp }}-frontend:cache
cache-to: type=inline

- name: Build and push Translation Docker image
uses: docker/build-push-action@v4
with:
push: true
context: ./translation-server
tags: |
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.myapp }}-translation:${{ env.environnement }}
${{ secrets.DOCKERHUB_USERNAME }}/${{ env.myapp }}-translation:${{ github.sha }}
labels: |
maintainer=${{ secrets.DOCKERHUB_USERNAME }}
version=${{ github.sha }}
build-date=${{ env.date }}
cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/${{ env.myapp }}-translation:cache
cache-to: type=inline

- name: Login to Docker Hub on main Server
run: |
ssh -v -o StrictHostKeyChecking=no -T -p 2269 wns_student@${{ secrets.SERVER_IP }} "
echo $DOCKERHUB_TOKEN | docker login -u $DOCKERHUB_USERNAME --password-stdin
"
env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Deploy to main
run: |
ssh -o StrictHostKeyChecking=no -T -p 2269 wns_student@${{ secrets.SERVER_IP }} "
cd pulseform &&
docker compose -f docker-compose.yml pull &&
docker compose -f docker-compose.yml up -d
"
45 changes: 45 additions & 0 deletions .github/workflows/e2e_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: e2e_test

on:
push:
branches: [ main, dev ]

jobs:
e2e_test:
runs-on: ubuntu-latest

steps:
- name: Checkout the code
uses: actions/checkout@v4

# Print the current directory
- name: Debugs logs
run: pwd

# List curent directory
- name: Debugs logs 2
run: ls -l

- name: install playwright
run: npm init playwright@latest

- name: Run interface test
run: docker compose -f docker-compose.e2e.yml up --build --exit-code-from e2e

# If test fails, check the screenshot folder
- name: Debugs logs 3
if: failure()
run: ls -l ./e2e/screenshots

# Upload screenshot in case of failure
- name: Upload screenshot
if: failure()
uses: actions/upload-artifact@v4
with:
name: e2e-snapshots
path: ./e2e/screenshots

- name: Stop and remove Docker containers (cleanup)
if: always()
run: docker compose -f docker-compose.e2e.yml down

29 changes: 29 additions & 0 deletions .github/workflows/front_unit_tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: front_unit_tests

on:
pull_request:
branches: [ main, dev ]
push:
branches: [ main, dev ]


jobs:
front_unit_tests:
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./frontend # plus besoin de remettre le chemin cd frontend à chaque step

steps:
- name: Checkout PulseForm code
uses: actions/checkout@v4

- name: npm install dependencies
run: npm i

- name: Typescript transpile
run: npx tsc

- name: Run front unit tests
run: npm test

6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
init-db.sh
start.sh
start.sh
.env
node_modules/
logBack.sh
logFront.sh
1 change: 1 addition & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
npx lint-staged
12 changes: 6 additions & 6 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"editor.codeActionsOnSave": {
"quickfix.biome": "explicit",
"source.organizeImports.biome": "explicit"
},
"editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true
"editor.codeActionsOnSave": {
"quickfix.biome": "explicit",
"source.organizeImports.biome": "explicit"
},
"editor.defaultFormatter": "biomejs.biome",
"editor.formatOnSave": true
}
9 changes: 7 additions & 2 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
FROM node:18-bookworm


WORKDIR /app

CMD npm i && npm run start
COPY package*.json ./

RUN npm install

COPY . .

CMD npm run start
59 changes: 31 additions & 28 deletions backend/biome.json
Original file line number Diff line number Diff line change
@@ -1,30 +1,33 @@
{
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
"vcs": {
"enabled": false,
"clientKind": "git",
"useIgnoreFile": false
},
"files": {
"ignoreUnknown": false,
"ignore": ["node_modules", "data-pulseform"]
},
"formatter": {
"enabled": true,
"indentStyle": "space"
},
"organizeImports": {
"enabled": true
},
"linter": {
"enabled": true,
"rules": {
"recommended": true
}
},
"javascript": {
"formatter": {
"quoteStyle": "double"
}
}
"$schema": "https://biomejs.dev/schemas/1.9.4/schema.json",
"vcs": {
"enabled": false,
"clientKind": "git",
"useIgnoreFile": false
},
"files": {
"ignoreUnknown": false,
"ignore": ["node_modules", "data-pulseform"]
},
"formatter": {
"enabled": true,
"indentStyle": "space"
},
"organizeImports": {
"enabled": true
},
"linter": {
"enabled": true,
"rules": {
"recommended": true
}
},
"javascript": {
"formatter": {
"quoteStyle": "double"
},
"parser": {
"unsafeParameterDecoratorsEnabled": true
}
}
}
Loading
Loading