From 2615ff0440ef2909646463f78018632b9b8dbf28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anna=20G=C3=B3rzanowska?= Date: Thu, 15 Feb 2018 15:23:08 +0100 Subject: [PATCH 1/7] express installed --- .gitignore | 3 +++ package.json | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 .gitignore create mode 100644 package.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..de88951 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.idea +*.*~ +node_modules diff --git a/package.json b/package.json new file mode 100644 index 0000000..b4292aa --- /dev/null +++ b/package.json @@ -0,0 +1,22 @@ +{ + "name": "challenge", + "version": "1.0.0", + "description": "\"Logo\"", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/angorzan/Node.js_challenge_dzien_5.git" + }, + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/angorzan/Node.js_challenge_dzien_5/issues" + }, + "homepage": "https://github.com/angorzan/Node.js_challenge_dzien_5#readme", + "dependencies": { + "express": "^4.16.2" + } +} From 3e9bcff2f8726f3b298e38fc3a672422be9d817b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anna=20G=C3=B3rzanowska?= Date: Thu, 15 Feb 2018 15:36:31 +0100 Subject: [PATCH 2/7] test done --- app/test.js | 10 ++++++++++ app/zadanie01.js | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 app/test.js diff --git a/app/test.js b/app/test.js new file mode 100644 index 0000000..1415549 --- /dev/null +++ b/app/test.js @@ -0,0 +1,10 @@ +const express = require('express'); +const app = express(); + +app.get('/', (req, res) => { + res.send('Hello, World!'); +}); + +app.listen(3000, () => { + console.log('Serwer uruchomiony na porcie 3000'); +}); \ No newline at end of file diff --git a/app/zadanie01.js b/app/zadanie01.js index 8c20173..e69de29 100644 --- a/app/zadanie01.js +++ b/app/zadanie01.js @@ -1 +0,0 @@ -//Twój kod \ No newline at end of file From a1792c781ca9051323372220ad83e9c7522b0293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anna=20G=C3=B3rzanowska?= Date: Thu, 15 Feb 2018 16:10:16 +0100 Subject: [PATCH 3/7] Ex. 01 done --- app/test2.js | 8 ++++++++ app/zadanie01.js | 13 +++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 app/test2.js diff --git a/app/test2.js b/app/test2.js new file mode 100644 index 0000000..e974e57 --- /dev/null +++ b/app/test2.js @@ -0,0 +1,8 @@ +const express = require('express'); +const app = express(); + +app.use(express.static('./public/przykladStatyczne/')); + +app.listen(3000, () => { + console.log('Serwer uruchomiony na porcie 3000'); +}); \ No newline at end of file diff --git a/app/zadanie01.js b/app/zadanie01.js index e69de29..0220ec7 100644 --- a/app/zadanie01.js +++ b/app/zadanie01.js @@ -0,0 +1,13 @@ +const express = require('express'); +const app = express(); + +app.get('/:num1/:num2', (req, res) => { + const num1 = req.params.num1; + const num2 = req.params.num2; + let sum = parseInt(num1) + parseInt(num2); + res.send('Suma liczb to ' + sum); +}); + +app.listen(3000, () => { + console.log('Serwer uruchomiony na porcie 3000'); +}); \ No newline at end of file From 92ce3a933a569c6c77e4c8da0cb263254a2de9b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anna=20G=C3=B3rzanowska?= Date: Sun, 18 Feb 2018 10:58:10 +0100 Subject: [PATCH 4/7] Ex. 02 done --- app/zadanie02.js | 21 ++++++++++++++++++++- app/zadanieDnia1.js | 1 - 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/zadanie02.js b/app/zadanie02.js index 8c20173..3675875 100644 --- a/app/zadanie02.js +++ b/app/zadanie02.js @@ -1 +1,20 @@ -//Twój kod \ No newline at end of file +const express = require('express'); +const app = express(); +let userName = ''; + +app.get('/name/set/:imie', (req, res) => { + userName = req.params.imie; +res.send('Twoje imię to ' + userName); +}); + +app.get('/name/show', (req, res) => { + res.send('Zapamiętałem Twoje imię: ' + userName); +}); + +app.get('/name/check', (req, res) => { + (userName !=='')? (res.send('Zapamiętałem Twoje imię: ' + userName)) : (res.send('Nie znam Twojego imienia :(')); +}); + +app.listen(3000, () => { + console.log('Serwer uruchomiony na porcie 3000'); +}); \ No newline at end of file diff --git a/app/zadanieDnia1.js b/app/zadanieDnia1.js index 8c20173..e69de29 100644 --- a/app/zadanieDnia1.js +++ b/app/zadanieDnia1.js @@ -1 +0,0 @@ -//Twój kod \ No newline at end of file From 3d31dba27325865eb4b213a34c0966a6e4ef1cb1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anna=20G=C3=B3rzanowska?= Date: Fri, 2 Mar 2018 11:37:32 +0100 Subject: [PATCH 5/7] Challenge done --- app/public/zadanieDnia/css/style.css | 4 ++++ app/public/zadanieDnia/index.html | 1 + app/zadanieDnia1.js | 30 ++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/app/public/zadanieDnia/css/style.css b/app/public/zadanieDnia/css/style.css index b0708de..fac86a8 100644 --- a/app/public/zadanieDnia/css/style.css +++ b/app/public/zadanieDnia/css/style.css @@ -11,4 +11,8 @@ .vote.no { background : red; +} + +.vote.maybe { + background: hotpink; } \ No newline at end of file diff --git a/app/public/zadanieDnia/index.html b/app/public/zadanieDnia/index.html index bfc2842..5172239 100644 --- a/app/public/zadanieDnia/index.html +++ b/app/public/zadanieDnia/index.html @@ -12,6 +12,7 @@

Zagłosuj: czy Node.js jest fajny?

Tak! Nie :( + To się okaże
Sprawdź wyniki głosowania diff --git a/app/zadanieDnia1.js b/app/zadanieDnia1.js index e69de29..fbc28f9 100644 --- a/app/zadanieDnia1.js +++ b/app/zadanieDnia1.js @@ -0,0 +1,30 @@ +const express = require('express'); +const app = express(); +let yesCounter = 0; +let noCounter = 0; +let maybeCounter = 0; +app.use(express.static('./public/zadanieDnia/')); +let pollCounter = ()=> { + app.get('/vote/yes', (req, res) => { + yesCounter++; + res.send('Dziękujemy za głos!'); + }); + app.get('/vote/no', (req, res) => { + noCounter++; + res.send('Dziękujemy za głos!'); + }); + app.get('/vote/maybe', (req, res) => { + maybeCounter++; + res.send('Dziękujemy za głos!'); + }); + + app.get('/votes/check', (req, res) => { + res.send(`'Tak': ${yesCounter} 'Nie': ${noCounter} 'To się okaże': ${maybeCounter}`); + }); +}; +pollCounter(); + + +app.listen(3000, () => { + console.log('Serwer uruchomiony na porcie 3000'); +}); \ No newline at end of file From 830db084d6308f0b5636c7dd2c1f08baa1248642 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anna=20G=C3=B3rzanowska?= Date: Wed, 7 Mar 2018 09:39:38 +0100 Subject: [PATCH 6/7] the solution with variables --- app/zadanieDnia1.js | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/app/zadanieDnia1.js b/app/zadanieDnia1.js index fbc28f9..205cb08 100644 --- a/app/zadanieDnia1.js +++ b/app/zadanieDnia1.js @@ -5,26 +5,36 @@ let noCounter = 0; let maybeCounter = 0; app.use(express.static('./public/zadanieDnia/')); let pollCounter = ()=> { - app.get('/vote/yes', (req, res) => { - yesCounter++; + // app.get('/vote/yes', (req, res) => { + // // yesCounter++; + // res.send('Dziękujemy za głos!'); + // }); + // app.get('/vote/no', (req, res) => { + // // noCounter++; + // res.send('Dziękujemy za głos!'); + // }); + // app.get('/vote/maybe', (req, res) => { + // // maybeCounter++; + // res.send('Dziękujemy za głos!'); + // }); + app.get('/vote/:votetype', (req, res) => { + let votetype = req.params.votetype; + if (votetype === 'yes') { + yesCounter++; + } + else if (votetype === 'no'){ + noCounter++; + } + else { + maybeCounter++; + } res.send('Dziękujemy za głos!'); }); - app.get('/vote/no', (req, res) => { - noCounter++; - res.send('Dziękujemy za głos!'); - }); - app.get('/vote/maybe', (req, res) => { - maybeCounter++; - res.send('Dziękujemy za głos!'); - }); - app.get('/votes/check', (req, res) => { res.send(`'Tak': ${yesCounter} 'Nie': ${noCounter} 'To się okaże': ${maybeCounter}`); }); }; pollCounter(); - - app.listen(3000, () => { console.log('Serwer uruchomiony na porcie 3000'); }); \ No newline at end of file From cc1532a5a561e22a409f348b9aa84f9d338dff5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anna=20G=C3=B3rzanowska?= Date: Wed, 7 Mar 2018 09:44:31 +0100 Subject: [PATCH 7/7] the solution with variables and ES6 --- app/zadanieDnia1.js | 38 +++++++++----------------------------- 1 file changed, 9 insertions(+), 29 deletions(-) diff --git a/app/zadanieDnia1.js b/app/zadanieDnia1.js index 205cb08..e971a16 100644 --- a/app/zadanieDnia1.js +++ b/app/zadanieDnia1.js @@ -5,35 +5,15 @@ let noCounter = 0; let maybeCounter = 0; app.use(express.static('./public/zadanieDnia/')); let pollCounter = ()=> { - // app.get('/vote/yes', (req, res) => { - // // yesCounter++; - // res.send('Dziękujemy za głos!'); - // }); - // app.get('/vote/no', (req, res) => { - // // noCounter++; - // res.send('Dziękujemy za głos!'); - // }); - // app.get('/vote/maybe', (req, res) => { - // // maybeCounter++; - // res.send('Dziękujemy za głos!'); - // }); - app.get('/vote/:votetype', (req, res) => { - let votetype = req.params.votetype; - if (votetype === 'yes') { - yesCounter++; - } - else if (votetype === 'no'){ - noCounter++; - } - else { - maybeCounter++; - } - res.send('Dziękujemy za głos!'); - }); - app.get('/votes/check', (req, res) => { - res.send(`'Tak': ${yesCounter} 'Nie': ${noCounter} 'To się okaże': ${maybeCounter}`); - }); -}; + app.get('/vote/:votetype', (req, res) => { + let votetype = req.params.votetype; + (votetype === 'yes') ? yesCounter++ : (votetype === 'no')? noCounter++ : maybeCounter++; + res.send('Dziękujemy za głos!'); + }); + app.get('/votes/check', (req, res) => { + res.send(`'Tak': ${yesCounter} 'Nie': ${noCounter} 'To się okaże': ${maybeCounter}`); + }); + }; pollCounter(); app.listen(3000, () => { console.log('Serwer uruchomiony na porcie 3000');