From d6c4fd19b6b204dd1d1b1b5f682d29d1c7c7704d Mon Sep 17 00:00:00 2001 From: Greg Herbowicz Date: Fri, 2 Feb 2018 11:49:18 +0100 Subject: [PATCH 1/8] Update zadanie01.js --- app/zadanie01.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/zadanie01.js b/app/zadanie01.js index 8c20173..4bc7edd 100644 --- a/app/zadanie01.js +++ b/app/zadanie01.js @@ -1 +1,15 @@ -//Twój kod \ No newline at end of file +const express = require('express'); +const app = express(); + +app.get('/', (req, res) => { + res.send('Podaj 2 liczby w URL'); +}); + +app.get('/:first/:second', (req, res) => { + const sum = parseInt(req.params.first) + parseInt(req.params.second); + res.send('Suma ' + req.params.first + ' i ' + req.params.second + ' to: ' + sum); +}); + +app.listen(3000, () => { + console.log('Serwer uruchomiony na porcie 3000'); +}); From f33c9e5848cd8dedb71355e1fb98db4a4da05d94 Mon Sep 17 00:00:00 2001 From: Greg Herbowicz Date: Fri, 2 Feb 2018 12:13:16 +0100 Subject: [PATCH 2/8] Update zadanie02.js --- app/zadanie02.js | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/app/zadanie02.js b/app/zadanie02.js index 8c20173..71bbaf3 100644 --- a/app/zadanie02.js +++ b/app/zadanie02.js @@ -1 +1,27 @@ -//Twój kod \ No newline at end of file +const express = require('express'); +const app = express(); + +app.get('/', (req, res) => { + res.send(''); +}); + +let names = []; + +app.get('/name/set/:imie', (req, res) => { + names.push(req.params.imie); + res.send(`Imię ${req.params.imie} dodane.`); +}); + +app.get('/name/show', (req, res) => { + res.send('Aktualne imię to: ' + names[names.length-1]); +}); + +app.get('/name/check/:imie', (req, res) => { //poprawiona ścieżka + names.indexOf(req.params.imie) < 0 ? + res.send(`Imię ${req.params.imie} nie zostało jeszcze zapisane.`) : + res.send(`Imię ${req.params.imie} zostało już zapisane.`); +}); + +app.listen(3000, () => { + console.log('Serwer uruchomiony na porcie 3000'); +}); From 288eb392d15e98ce40db55d70ca99ab2959845c6 Mon Sep 17 00:00:00 2001 From: Greg Herbowicz Date: Fri, 2 Feb 2018 12:26:14 +0100 Subject: [PATCH 3/8] Update zadanieDnia1.js --- app/zadanieDnia1.js | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/app/zadanieDnia1.js b/app/zadanieDnia1.js index 8c20173..cc6f8bf 100644 --- a/app/zadanieDnia1.js +++ b/app/zadanieDnia1.js @@ -1 +1,26 @@ -//Twój kod \ No newline at end of file +const express = require('express'); +const app = express(); + +let yes = 0, + no = 0; + +app.use(express.static('./public/zadanieDnia/')); + +app.get('/vote/yes', (req, res) => { + yes++; + res.send('Dziękujemy za głos!'); +}); + +app.get('/vote/no', (req, res) => { + no++; + res.send('Dziękujemy za głos!'); +}); + +app.get('/votes/check', (req, res) => { + res.send(`Za: ${yes}
+ Przeciw: ${no}`); +}); + +app.listen(3000, () => { + console.log('Serwer uruchomiony na porcie 3000'); +}); From 9af26d9af709d9196239c1a1771baf794ec18e72 Mon Sep 17 00:00:00 2001 From: Greg Herbowicz Date: Fri, 2 Feb 2018 14:44:10 +0100 Subject: [PATCH 4/8] =?UTF-8?q?z=20gwiazdk=C4=85=20*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/zadanieDnia1.js | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/app/zadanieDnia1.js b/app/zadanieDnia1.js index cc6f8bf..76cfcc4 100644 --- a/app/zadanieDnia1.js +++ b/app/zadanieDnia1.js @@ -1,24 +1,21 @@ const express = require('express'); const app = express(); -let yes = 0, - no = 0; +let answer = {}; app.use(express.static('./public/zadanieDnia/')); -app.get('/vote/yes', (req, res) => { - yes++; - res.send('Dziękujemy za głos!'); -}); - -app.get('/vote/no', (req, res) => { - no++; +app.get('/vote/:vote', (req, res) => { + answer[req.params.vote] === undefined ? answer[req.params.vote] = 1 : answer[req.params.vote]++; res.send('Dziękujemy za głos!'); }); app.get('/votes/check', (req, res) => { - res.send(`Za: ${yes}
- Przeciw: ${no}`); + let results = ""; + for (var vote in answer) { + results += `${vote} : ${answer[vote]}
`; + } + res.send(results); }); app.listen(3000, () => { From ba9c506bd31e7ce7c9c2442da1ce473a9161c8ce Mon Sep 17 00:00:00 2001 From: Greg Herbowicz Date: Fri, 2 Feb 2018 14:46:52 +0100 Subject: [PATCH 5/8] es6 --- app/zadanieDnia1.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/zadanieDnia1.js b/app/zadanieDnia1.js index 76cfcc4..ea08f06 100644 --- a/app/zadanieDnia1.js +++ b/app/zadanieDnia1.js @@ -12,7 +12,7 @@ app.get('/vote/:vote', (req, res) => { app.get('/votes/check', (req, res) => { let results = ""; - for (var vote in answer) { + for (let vote in answer) { results += `${vote} : ${answer[vote]}
`; } res.send(results); From a43371b2a7c5d7db39f7739978cb4b3bcaaf16ce Mon Sep 17 00:00:00 2001 From: Greg Herbowicz Date: Fri, 2 Feb 2018 14:51:23 +0100 Subject: [PATCH 6/8] destr. --- app/zadanieDnia1.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/zadanieDnia1.js b/app/zadanieDnia1.js index ea08f06..99d4d68 100644 --- a/app/zadanieDnia1.js +++ b/app/zadanieDnia1.js @@ -6,12 +6,13 @@ let answer = {}; app.use(express.static('./public/zadanieDnia/')); app.get('/vote/:vote', (req, res) => { - answer[req.params.vote] === undefined ? answer[req.params.vote] = 1 : answer[req.params.vote]++; + let {vote} = req.params; + answer[vote] === undefined ? answer[vote] = 1 : answer[vote]++; res.send('Dziękujemy za głos!'); }); app.get('/votes/check', (req, res) => { - let results = ""; + let results = ''; for (let vote in answer) { results += `${vote} : ${answer[vote]}
`; } From a4b7c6b2bd012318463aa339e44c1e5722416e03 Mon Sep 17 00:00:00 2001 From: Greg Herbowicz Date: Fri, 2 Feb 2018 15:09:44 +0100 Subject: [PATCH 7/8] name variables --- app/zadanieDnia1.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/zadanieDnia1.js b/app/zadanieDnia1.js index 99d4d68..7d5c95a 100644 --- a/app/zadanieDnia1.js +++ b/app/zadanieDnia1.js @@ -1,20 +1,20 @@ const express = require('express'); const app = express(); -let answer = {}; +let votes = {}; app.use(express.static('./public/zadanieDnia/')); -app.get('/vote/:vote', (req, res) => { - let {vote} = req.params; - answer[vote] === undefined ? answer[vote] = 1 : answer[vote]++; +app.get('/vote/:option', (req, res) => { + let {option} = req.params; + votes[option] === undefined ? votes[option] = 1 : votes[option]++; res.send('Dziękujemy za głos!'); }); app.get('/votes/check', (req, res) => { - let results = ''; - for (let vote in answer) { - results += `${vote} : ${answer[vote]}
`; + let results = ""; + for (let option in votes) { + results += `${option} : ${votes[option]}
`; } res.send(results); }); From 5daead38b6f43f3991c34e1f1b937029758ee9d0 Mon Sep 17 00:00:00 2001 From: Greg Herbowicz Date: Fri, 2 Feb 2018 20:39:27 +0100 Subject: [PATCH 8/8] =?UTF-8?q?kr=C3=B3cej?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/zadanieDnia1.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/zadanieDnia1.js b/app/zadanieDnia1.js index 7d5c95a..6c10a08 100644 --- a/app/zadanieDnia1.js +++ b/app/zadanieDnia1.js @@ -7,7 +7,7 @@ app.use(express.static('./public/zadanieDnia/')); app.get('/vote/:option', (req, res) => { let {option} = req.params; - votes[option] === undefined ? votes[option] = 1 : votes[option]++; + votes[option] = votes[option] + 1 || 1; res.send('Dziękujemy za głos!'); });