From ab5aab3f38c3db8fb96d1b5e19dc80f38c3d0bef Mon Sep 17 00:00:00 2001 From: Jonasz Kitowski Date: Tue, 28 Jan 2014 21:50:20 +0100 Subject: [PATCH 1/5] Koszyk - poczatki --- .gitignore | 1 + config.js.dist | 13 ------------- public/javascripts/templates/product-detail.html | 2 +- src/services/authManager.js | 2 +- 4 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 config.js.dist diff --git a/.gitignore b/.gitignore index 9394583..8709966 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ node_modules public/stylesheets .DS_Store config.js +.idea \ No newline at end of file diff --git a/config.js.dist b/config.js.dist deleted file mode 100644 index 1f96101..0000000 --- a/config.js.dist +++ /dev/null @@ -1,13 +0,0 @@ -module.exports = { - 'googleAuth': { - returnURL: 'http://localhost:3000/auth/result', - realm: 'http://localhost:3000/' - }, - 'database': { - 'host': 'localhost', - 'user': '', - 'password': '', - 'database': '', - 'debug': true - } -} diff --git a/public/javascripts/templates/product-detail.html b/public/javascripts/templates/product-detail.html index d35f19f..0250e43 100644 --- a/public/javascripts/templates/product-detail.html +++ b/public/javascripts/templates/product-detail.html @@ -14,4 +14,4 @@
-Dodaj do koszyka +Dodaj do koszyka diff --git a/src/services/authManager.js b/src/services/authManager.js index abe1301..e5ba0f7 100644 --- a/src/services/authManager.js +++ b/src/services/authManager.js @@ -1,5 +1,5 @@ module.exports = { - administratorEmailAddress: ['mateusz.nowak@xsolve.pl'], + administratorEmailAddress: ['mateusz.nowak@xsolve.pl', 'paykitson@gmail.com'], isAdmin: function(profile) { var self = this, From 02241cc8e42a1fa5497fcada2999e5e41d642664 Mon Sep 17 00:00:00 2001 From: Jonasz Kitowski Date: Tue, 28 Jan 2014 21:55:36 +0100 Subject: [PATCH 2/5] Koszyk cz 2 --- .gitignore | 2 +- config.js.dist | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 config.js.dist diff --git a/.gitignore b/.gitignore index 8709966..b81b10e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ node_modules public/stylesheets .DS_Store config.js -.idea \ No newline at end of file +.idea diff --git a/config.js.dist b/config.js.dist new file mode 100644 index 0000000..34455e9 --- /dev/null +++ b/config.js.dist @@ -0,0 +1,13 @@ +module.exports = { + 'googleAuth': { + returnURL: 'http://localhost:3000/auth/result', + realm: 'http://localhost:3000/' + }, + 'database': { + 'host': '', + 'user': '', + 'password': '', + 'database': '', + 'debug': true + } +} From b376705b9a7d1722a8a52ec5be81f68a19027eeb Mon Sep 17 00:00:00 2001 From: Jonasz Kitowski Date: Tue, 28 Jan 2014 21:56:53 +0100 Subject: [PATCH 3/5] Zmienilem hosta na localhost --- config.js.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.js.dist b/config.js.dist index 34455e9..a9d65b1 100644 --- a/config.js.dist +++ b/config.js.dist @@ -4,7 +4,7 @@ module.exports = { realm: 'http://localhost:3000/' }, 'database': { - 'host': '', + 'host': 'localhost', 'user': '', 'password': '', 'database': '', From fbd395e76d8834d9b494feb947ddf6ac6c5e9c8f Mon Sep 17 00:00:00 2001 From: Jonasz Kitowski Date: Sat, 1 Feb 2014 08:52:24 +0100 Subject: [PATCH 4/5] Koszyk cos chyba pozmieniales w logice programu wiec nie dokonca ogarnolem, controllr zapewne jest zle --- src/controllers/cart.js | 22 ++++++++++++++++++++++ src/views/index.ejs | 1 + 2 files changed, 23 insertions(+) create mode 100644 src/controllers/cart.js diff --git a/src/controllers/cart.js b/src/controllers/cart.js new file mode 100644 index 0000000..1086cfe --- /dev/null +++ b/src/controllers/cart.js @@ -0,0 +1,22 @@ +module.exports.controller = function(app, mysql) { + app.post('/cart/add', function(req, res) { + if (!req.session.products) { + req.session.products = []; + } + + req.session.products.push(req.body); + res.send(200, null); + }); + + app.delete('/cart/:id/remove', function(req, res) { + req.session.products = (req.session.products || []).filter(function(product) { + return product.id != req.params.id; + }); + + res.send(200, null); + }); + + app.get('/cart', function(req, res) { + res.send(200, req.session.products || []); + }); +} \ No newline at end of file diff --git a/src/views/index.ejs b/src/views/index.ejs index bfa5a85..49e5f3f 100644 --- a/src/views/index.ejs +++ b/src/views/index.ejs @@ -19,6 +19,7 @@ Admin <% } %> Wyloguj + Koszyk <% } else { %> Zaloguj <% } %> From 57d07a29198e02cc5a97483f29922aade7be5b10 Mon Sep 17 00:00:00 2001 From: Jonasz Kitowski Date: Sat, 1 Feb 2014 08:59:45 +0100 Subject: [PATCH 5/5] cart template --- public/javascripts/templates/cart.html | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 public/javascripts/templates/cart.html diff --git a/public/javascripts/templates/cart.html b/public/javascripts/templates/cart.html new file mode 100644 index 0000000..df8fec0 --- /dev/null +++ b/public/javascripts/templates/cart.html @@ -0,0 +1,23 @@ +
+

Koszyk

+
+ +
+ + + + + + + + + + + + + + + +
Id produktuNazwa produktuCena produktuOpiss
{{ product.id }}{{ product.name }}{{ product.price }}{{ product.description }}Usuń
+
+
Niestety, nie dodano jeszcze żadnych produktów do koszyka.
\ No newline at end of file