Compare commits

..

No commits in common. "master" and "v2.3" have entirely different histories.
master ... v2.3

34 changed files with 5752 additions and 22490 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.github/backup

View File

@ -1,9 +1,5 @@
<h1 align="center"><a href="https://function.divlo.fr/">FunctionProject</a></h1> <h1 align="center"><a href="https://function.divlo.fr/">FunctionProject</a></h1>
<p align="center">
<strong>⚠️ Le projet n'est plus maintenu.</strong>
</p>
<p align="center"> <p align="center">
<strong>Apprenez la programmation grâce à l'apprentissage par projet alias fonction.</strong> <strong>Apprenez la programmation grâce à l'apprentissage par projet alias fonction.</strong>
</p> </p>
@ -42,11 +38,11 @@ Si vous voulez **contribuer**, avant toute chose écrivez une **"[issue](https:/
Si vous voulez avoir les données des catégories et des fonctions, vous pouvez d'abord lancer l'API pour que Sequelize crée les tables SQl et ensuite exécuter le fichier SQL [backup.sql](./.github/backup.sql). Si vous voulez avoir les données des catégories et des fonctions, vous pouvez d'abord lancer l'API pour que Sequelize crée les tables SQl et ensuite exécuter le fichier SQL [backup.sql](./.github/backup.sql).
### Prérequis ### Prérequis :
- [Node.js](https://nodejs.org/) >= 14 - [Node.js](https://nodejs.org/) >= 14
- [npm](https://www.npmjs.com/) >= 7 - [npm](https://www.npmjs.com/) >= 6
- [MySQL](https://www.mysql.com/) >= 8 - [MySQL](https://www.mysql.com/) >= 8.0
### Commandes (à suivre dans l'ordre) ### Commandes (à suivre dans l'ordre)
@ -102,6 +98,8 @@ npm run dev # API lancé sur http://localhost:8080
Enjoy! 😃 Enjoy! 😃
[![JavaScript Style Guide](https://cdn.rawgit.com/standard/standard/master/badge.svg)](https://github.com/standard/standard)
## 📄 License ## 📄 License
[MIT](./LICENSE) [MIT](./LICENSE)

2
api/.gitignore vendored
View File

@ -22,7 +22,7 @@
# misc # misc
.DS_Store .DS_Store
/temp /temp
/assets/images/users /assets/images/
npm-debug.log* npm-debug.log*
yarn-debug.log* yarn-debug.log*

View File

@ -1,4 +1,4 @@
FROM node:14.16.1 FROM node:14.15.3-alpine3.12
WORKDIR /app WORKDIR /app

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

6519
api/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -13,7 +13,8 @@
"scripts": { "scripts": {
"start": "node app.js", "start": "node app.js",
"dev": "nodemon app.js", "dev": "nodemon app.js",
"lint": "standard | snazzy" "lint": "standard | snazzy",
"format": "standard --fix | snazzy"
}, },
"dependencies": { "dependencies": {
"axios": "^0.21.1", "axios": "^0.21.1",
@ -21,25 +22,25 @@
"cors": "^2.8.5", "cors": "^2.8.5",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"express": "^4.17.1", "express": "^4.17.1",
"express-fileupload": "^1.2.1", "express-fileupload": "^1.2.0",
"express-http-to-https": "^1.1.4", "express-http-to-https": "^1.1.4",
"express-rate-limit": "^5.2.6", "express-rate-limit": "^5.2.3",
"express-validator": "^6.10.0", "express-validator": "^6.9.0",
"helmet": "^4.4.1", "helmet": "^4.3.1",
"jsdom": "^16.5.3", "jsdom": "^16.4.0",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
"moment": "^2.29.1", "moment": "^2.29.1",
"morgan": "^1.10.0", "morgan": "^1.10.0",
"ms": "^2.1.3", "ms": "^2.1.3",
"mysql2": "^2.2.5", "mysql2": "^2.2.5",
"nodemailer": "^6.5.0", "nodemailer": "^6.4.17",
"sequelize": "^6.6.2", "sequelize": "^6.3.5",
"smart-request-balancer": "^2.1.1", "smart-request-balancer": "^2.1.1",
"uuid": "^8.3.2", "uuid": "^8.3.2",
"validator": "^13.5.2" "validator": "^13.5.2"
}, },
"devDependencies": { "devDependencies": {
"nodemon": "^2.0.7", "nodemon": "^2.0.6",
"snazzy": "^9.0.0", "snazzy": "^9.0.0",
"standard": "^16.0.3" "standard": "^16.0.3"
} }

View File

@ -40,7 +40,7 @@ services:
container_name: 'functionproject-website' container_name: 'functionproject-website'
functionproject-phpmyadmin: functionproject-phpmyadmin:
image: 'phpmyadmin/phpmyadmin:5.1.0' image: 'phpmyadmin/phpmyadmin:5.0.2'
environment: environment:
PMA_HOST: 'functionproject-database' PMA_HOST: 'functionproject-database'
PMA_USER: 'root' PMA_USER: 'root'
@ -52,7 +52,7 @@ services:
container_name: 'functionproject-phpmyadmin' container_name: 'functionproject-phpmyadmin'
functionproject-database: functionproject-database:
image: 'mysql:8.0.23' image: 'mysql:8.0.22'
command: '--default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci' command: '--default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci'
environment: environment:
MYSQL_ROOT_PASSWORD: 'password' MYSQL_ROOT_PASSWORD: 'password'

View File

@ -1,4 +1,4 @@
FROM node:14.16.1 FROM node:14.15.3-alpine3.12
WORKDIR /app WORKDIR /app

File diff suppressed because it is too large Load Diff

View File

@ -13,19 +13,20 @@
"scripts": { "scripts": {
"start": "node app.js", "start": "node app.js",
"dev": "nodemon app.js", "dev": "nodemon app.js",
"lint": "standard | snazzy" "lint": "standard | snazzy",
"format": "standard --fix | snazzy"
}, },
"dependencies": { "dependencies": {
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"ejs": "^3.1.6", "ejs": "^3.1.5",
"express": "^4.17.1", "express": "^4.17.1",
"express-http-to-https": "^1.1.4", "express-http-to-https": "^1.1.4",
"helmet": "^4.4.1", "helmet": "^4.3.1",
"morgan": "^1.10.0", "morgan": "^1.10.0",
"mysql": "^2.18.1" "mysql": "^2.18.1"
}, },
"devDependencies": { "devDependencies": {
"nodemon": "^2.0.7", "nodemon": "^2.0.6",
"snazzy": "^9.0.0", "snazzy": "^9.0.0",
"standard": "^16.0.3" "standard": "^16.0.3"
} }

View File

@ -1,4 +1,4 @@
FROM node:14.16.1 FROM node:14.15.3-alpine3.12
WORKDIR /app WORKDIR /app

16498
website/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -18,30 +18,31 @@
"start": "next start", "start": "next start",
"build": "next build", "build": "next build",
"export": "next export", "export": "next export",
"lint": "standard | snazzy" "lint": "standard | snazzy",
"format": "standard --fix | snazzy"
}, },
"dependencies": { "dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.35", "@fortawesome/fontawesome-svg-core": "^1.2.32",
"@fortawesome/free-brands-svg-icons": "^5.15.3", "@fortawesome/free-brands-svg-icons": "^5.15.1",
"@fortawesome/free-regular-svg-icons": "^5.15.3", "@fortawesome/free-regular-svg-icons": "^5.15.1",
"@fortawesome/free-solid-svg-icons": "^5.15.3", "@fortawesome/free-solid-svg-icons": "^5.15.1",
"@fortawesome/react-fontawesome": "^0.1.14", "@fortawesome/react-fontawesome": "^0.1.14",
"axios": "^0.21.1", "axios": "^0.21.1",
"date-and-time": "^1.0.0", "date-and-time": "^0.14.2",
"date-fns": "^2.21.1", "date-fns": "^2.16.1",
"express": "^4.17.1", "express": "^4.17.1",
"express-http-to-https": "^1.1.4", "express-http-to-https": "^1.1.4",
"html-react-parser": "^1.2.5", "html-react-parser": "^1.1.1",
"next": "^10.1.3", "next": "^10.0.4",
"next-fonts": "^1.5.1", "next-fonts": "^1.5.1",
"next-pwa": "^5.2.9", "next-pwa": "^5.0.1",
"notyf": "^3.9.0", "notyf": "^3.9.0",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"react": "16.13.1", "react": "17.0.1",
"react-codepen-embed": "^1.0.2", "react-codepen-embed": "^1.0.2",
"react-color": "^2.19.3", "react-color": "^2.19.3",
"react-datepicker": "^3.3.0", "react-datepicker": "^3.3.0",
"react-dom": "16.13.1", "react-dom": "17.0.1",
"react-markdown": "^5.0.3", "react-markdown": "^5.0.3",
"react-swipeable-views": "^0.13.9", "react-swipeable-views": "^0.13.9",
"react-swipeable-views-utils": "^0.13.9", "react-swipeable-views-utils": "^0.13.9",