Skip to content

MERGE: "dev" into "main" #2

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.

Sign up for GitHub

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

Merged
ItsKarmaOff merged 3 commits into from
Jul 4, 2025
Merged

MERGE: "dev" into "main" #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5e9a2a
FEAT: add deploy script for GitHub Pages in package.json
ItsKarmaOff Jul 4, 2025
1c6f64f
FIX: correct link for Olivier POUECH in contributors list
ItsKarmaOff Jul 4, 2025
cf806b3
MERGE: "website" into "dev"
ItsKarmaOff Jul 4, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,5 +217,5 @@ For this project, we were a group of **6 people**. Here are the people in the gr
- [Gianni TUERO](https://github.com/xJundo)
- [Lou PELLEGRINO](https://github.com/DimitriLaPoudre)
- [Nicolas TORO](https://github.com/toro-nicolas)
- [Olivier POUECH](hhttps://github.com/Livoooo)
- [Olivier POUECH](https://github.com/Livoooo)
- [Raphael LAUNAY](https://github.com/frenchkiwi)
3 changes: 2 additions & 1 deletion website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"predeploy": "npm run build"
"predeploy": "npm run build",
"deploy": "gh-pages -d build -r https://github.com/ItsKarmaOff/Zappy.git"
},
"eslintConfig": {
"extends": [
Expand Down
Loading