diff --git a/.gitignore b/.gitignore index 62b4db31..b489fb87 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -#.env \ No newline at end of file +#.env +backend/node_modules/ \ No newline at end of file diff --git a/backend/bon_courage.js b/backend/bon_courage.js deleted file mode 100644 index e69de29b..00000000 diff --git a/backend/package-lock.json b/backend/package-lock.json index 53ec8114..0c703230 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -19,12 +19,12 @@ "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" }, "body-parser": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", - "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "version": "1.20.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", + "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", "requires": { "bytes": "3.1.2", - "content-type": "~1.0.4", + "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", @@ -32,7 +32,7 @@ "iconv-lite": "0.4.24", "on-finished": "2.4.1", "qs": "6.11.0", - "raw-body": "2.5.1", + "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" } @@ -148,6 +148,38 @@ "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" + }, + "dependencies": { + "body-parser": { + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", + "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "requires": { + "bytes": "3.1.2", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.11.0", + "raw-body": "2.5.1", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + } + }, + "raw-body": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "requires": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + } } }, "finalhandler": { @@ -321,9 +353,9 @@ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "raw-body": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", - "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", + "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "requires": { "bytes": "3.1.2", "http-errors": "2.0.0", diff --git a/backend/package.json b/backend/package.json index dd412dc3..269fb1ea 100644 --- a/backend/package.json +++ b/backend/package.json @@ -8,6 +8,7 @@ "start": "node server.js" }, "dependencies": { + "body-parser": "^1.20.2", "express": "^4.18.2" }, "devDependencies": {}, diff --git a/backend/server.js b/backend/server.js index 14d42625..df4bcac0 100644 --- a/backend/server.js +++ b/backend/server.js @@ -1,46 +1,22 @@ -// const http = require('https'); -// const host = 'localhost'; -// const port = 443; - - -// // const server = http.createServer((req, res) => { -// // res.end('Voilà la réponse du serveur !'); -// // }); - -// const requestListener = function (req, res) { -// res.writeHead(200); -// res.end("My first server!"); -// }; - -// const server = http.createServer(requestListener); -// server.listen(port, host, () => { -// console.log(`Server is running on http://${host}:${port}`); -// }); - -// 'use strict'; - -// const express = require('express'); -// const app = express(); -// app.get('/', (req, res) => { -// res.send('Hello World!') -// }) -// app.listen(5000, () => console.log('Server is up and running')); - -// const express = require('express') -// const app = express() -// const port = 5000 -// const name = process.env.name || "World" - -// app.get('/', (req, res) => { -// res.send(`Hello ${name} !`) -// }) -// app.listen(port, () => { -// console.log(`Server Started on Port ${port}`) -// }) - const express = require('express'); +const bodyParser = require('body-parser'); const app = express(); -app.get('/', (req, res) => { - res.sendfile('/var/www/html') +// app.use(express.json()); + +app.use(bodyParser.urlencoded({ extended: false })); +app.use(bodyParser.json()); + +app.get('/api/test', (req, res) => { + res.send('Hello World!') }) + +app.post('/api/login', (req, res) => { + + // const formData = req.body; + // console.log(formData); + console.log('get request'); + console.log(req.body); + res.status(201).json(req.body); + }); + app.listen(5000, () => console.log('Server is up and running')); \ No newline at end of file diff --git a/conf/nginx.conf b/conf/nginx.conf index f9c1211b..9ffb3086 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,23 +10,28 @@ # } server { - listen 443 ssl; - listen 80 ssl; # listen 443 ssl; - #listen 80; + # listen 80 ssl; + # listen 443 ssl; + listen 80; # server_name homemadePong.42.fr; - ssl_protocols TLSv1.3; - ssl_certificate /etc/ssl/certs/nginx-selfsigned.crt; - ssl_certificate_key /etc/ssl/private/nginx-selfsigned.key; + # ssl_protocols TLSv1.3; + # ssl_certificate /etc/ssl/certs/nginx-selfsigned.crt; + # ssl_certificate_key /etc/ssl/private/nginx-selfsigned.key; # root /var/www/html; # index index.html; # autoindex on; - location / { + root /var/www/html; + index index.html; + } + + + location /api/login { proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -34,6 +39,8 @@ server { proxy_pass http://backend:5000; } + + #proxy_pass http://localhost:5000 } diff --git a/docker-compose.yml b/docker-compose.yml index 297292f3..667b201f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,8 @@ services: ports: - 80:80 # - 443:443 - + volumes: + - ./frontend:/var/www/html restart: unless-stopped networks: - pongNetwork diff --git a/dockerfiles/Dockerfile.backEnd b/dockerfiles/Dockerfile.backEnd index 4b211627..c92b9e98 100644 --- a/dockerfiles/Dockerfile.backEnd +++ b/dockerfiles/Dockerfile.backEnd @@ -6,7 +6,7 @@ # By: apommier +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/03/19 09:28:33 by apommier #+# #+# # -# Updated: 2023/03/20 21:24:40 by apommier ### ########.fr # +# Updated: 2023/03/22 12:14:35 by apommier ### ########.fr # # # # **************************************************************************** # @@ -27,7 +27,8 @@ FROM node:latest WORKDIR /usr/src/app COPY /backend/package*.json ./ RUN npm install +#npm install body-parser COPY /backend/ . EXPOSE 5000 -CMD ["npm", "start"] -# CMD ["node", "server.js"] +# CMD ["npm", "start"] +CMD ["node", "server.js"] diff --git a/dockerfiles/Dockerfile.nginx b/dockerfiles/Dockerfile.nginx index 52244f2f..fae9d2a9 100644 --- a/dockerfiles/Dockerfile.nginx +++ b/dockerfiles/Dockerfile.nginx @@ -6,17 +6,17 @@ # By: apommier +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2023/03/19 09:28:32 by apommier #+# #+# # -# Updated: 2023/03/20 19:48:53 by apommier ### ########.fr # +# Updated: 2023/03/21 11:08:16 by apommier ### ########.fr # # # # **************************************************************************** # FROM nginx:latest -RUN apt update -y -RUN apt-get install -y openssl +# RUN apt update -y +# RUN apt-get install -y openssl -RUN mkdir -p /etc/ssl/private -RUN mkdir -p /etc/ssl/certs -RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/nginx-selfsigned.key -out /etc/ssl/certs/nginx-selfsigned.crt -subj "/C=FR/ST=17/L=StJeanDeLiversay/O=42/CN=apommier" +# RUN mkdir -p /etc/ssl/private +# RUN mkdir -p /etc/ssl/certs +# RUN openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/ssl/private/nginx-selfsigned.key -out /etc/ssl/certs/nginx-selfsigned.crt -subj "/C=FR/ST=17/L=StJeanDeLiversay/O=42/CN=apommier" COPY conf/nginx.conf /etc/nginx/conf.d/default.conf \ No newline at end of file diff --git a/frontend/css/header.css b/frontend/css/header.css index be9f3275..53ed7c54 100644 --- a/frontend/css/header.css +++ b/frontend/css/header.css @@ -42,6 +42,11 @@ footer { margin:auto; } +.submit{ + height: 5vh; + border-radius: 100vh; +} + .submit:hover { background-color: blueviolet; } diff --git a/frontend/index.html b/frontend/index.html index 9dbda605..2b834928 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -4,6 +4,7 @@ BEST PONG EVER +
@@ -21,14 +22,24 @@