From 043439abcfac4667b8c47ea2872e9c30a9ab5c18 Mon Sep 17 00:00:00 2001 From: metoro Date: Mon, 30 Sep 2013 00:14:47 -0700 Subject: Add phone too --- routes/users.coffee | 1 + 1 file changed, 1 insertion(+) (limited to 'routes') diff --git a/routes/users.coffee b/routes/users.coffee index 631ea2be..21485f75 100644 --- a/routes/users.coffee +++ b/routes/users.coffee @@ -47,6 +47,7 @@ module.exports = (sessions) -> lastname: req.body.lastname, company: req.body.company, email: req.body.email, + phone: req.body.phone, companytype: req.body.companytype, address1: req.body.address1, address2: req.body.address2, -- cgit v1.2.3 From 2cb11063b53431fd6a3669911380a534e724e4af Mon Sep 17 00:00:00 2001 From: metoro Date: Wed, 2 Oct 2013 16:27:34 -0700 Subject: Add website field --- routes/users.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'routes') diff --git a/routes/users.coffee b/routes/users.coffee index 21485f75..e01ef414 100644 --- a/routes/users.coffee +++ b/routes/users.coffee @@ -54,7 +54,8 @@ module.exports = (sessions) -> city: req.body.city, postcode: req.body.postcode, state: req.body.state, - country: req.body.country + country: req.body.country, + web: req.body.web } , -> -- cgit v1.2.3 From cc5da1593b2d5b50175ed1fa049c4afa1b0429ed Mon Sep 17 00:00:00 2001 From: metoro Date: Wed, 2 Oct 2013 16:37:49 -0700 Subject: Added website --- routes/users.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'routes') diff --git a/routes/users.coffee b/routes/users.coffee index e01ef414..5b08778a 100644 --- a/routes/users.coffee +++ b/routes/users.coffee @@ -59,8 +59,8 @@ module.exports = (sessions) -> } , -> - req.headers['referer'] = "/#{req.body.username}/edit" - sessions.create(req, res) + req.headers['referer'] = "/#{req.body.username}/edit" + sessions.create(req, res) ) ) ) -- cgit v1.2.3 From 72c30a6d61d129434c83a517e9129bd25029aa3e Mon Sep 17 00:00:00 2001 From: metoro Date: Wed, 2 Oct 2013 16:52:55 -0700 Subject: Fix tabs issue with coffeescript... :-o --- routes/users.coffee | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'routes') diff --git a/routes/users.coffee b/routes/users.coffee index 5b08778a..4f54a946 100644 --- a/routes/users.coffee +++ b/routes/users.coffee @@ -3,7 +3,7 @@ bcrypt = require('bcrypt') module.exports = (sessions) -> exists: (req, res) -> - + db.hgetall("user:"+req.params.user, (err, obj) -> if obj? then res.write('true') else res.write('false') res.end() @@ -39,7 +39,7 @@ module.exports = (sessions) -> db.sadd("users",userkey) db.hmset( userkey, - { + { username: req.body.username, password: hash, email: req.body.email, @@ -56,11 +56,10 @@ module.exports = (sessions) -> state: req.body.state, country: req.body.country, web: req.body.web - } - , + }, -> - req.headers['referer'] = "/#{req.body.username}/edit" - sessions.create(req, res) + req.headers['referer'] = "/#{req.body.username}/edit" + sessions.create(req, res) ) ) ) @@ -74,7 +73,7 @@ module.exports = (sessions) -> update: (req, res) -> return unless req.params.user is req.user.username or - req.user.username is 'admin' + req.user.username is 'admin' db.hmset("user:"+req.params.user, req.body, -> - res.redirect("/#{req.params.user}") + res.redirect("/#{req.params.user}") ) -- cgit v1.2.3 From 9ce3e483151f4a4856ee17286bfd6729a4399577 Mon Sep 17 00:00:00 2001 From: metoro Date: Wed, 2 Oct 2013 17:17:18 -0700 Subject: Fix more coffee strangeness --- routes/users.coffee | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) (limited to 'routes') diff --git a/routes/users.coffee b/routes/users.coffee index 4f54a946..2397c4a8 100644 --- a/routes/users.coffee +++ b/routes/users.coffee @@ -36,31 +36,12 @@ module.exports = (sessions) -> res.redirect(req.body.username) else bcrypt.hash(req.body.password, 12, (err, hash) -> - db.sadd("users",userkey) - db.hmset( - userkey, - { - username: req.body.username, - password: hash, - email: req.body.email, - firstname: req.body.firstname, - lastname: req.body.lastname, - company: req.body.company, - email: req.body.email, - phone: req.body.phone, - companytype: req.body.companytype, - address1: req.body.address1, - address2: req.body.address2, - city: req.body.city, - postcode: req.body.postcode, - state: req.body.state, - country: req.body.country, - web: req.body.web - }, - -> - req.headers['referer'] = "/#{req.body.username}/edit" - sessions.create(req, res) - ) + db.sadd("users",userkey) + formfields = {username: req.body.username,password: hash,email: req.body.email,firstname: req.body.firstname,lastname: req.body.lastname,company: req.body.company,email: req.body.email,phone: req.body.phone,companytype: req.body.companytype,address1: req.body.address1,address2: req.body.address2,city: req.body.city,postcode: req.body.postcode,state: req.body.state,country: req.body.country,web: req.body.web} + db.hmset(userkey,formfields, -> + req.headers['referer'] = "/#{req.body.username}/edit" + sessions.create(req, res) + ) ) ) -- cgit v1.2.3 From 676a9c336a8cda838d7350134d2781c176731e6a Mon Sep 17 00:00:00 2001 From: metoro Date: Thu, 3 Oct 2013 13:55:52 -0700 Subject: Draw merchant types from DB --- routes/users.coffee | 16 +- views/users/new.html | 600 ++++++++++++++++++++++++++------------------------- 2 files changed, 317 insertions(+), 299 deletions(-) (limited to 'routes') diff --git a/routes/users.coffee b/routes/users.coffee index 2397c4a8..380379e3 100644 --- a/routes/users.coffee +++ b/routes/users.coffee @@ -24,11 +24,19 @@ module.exports = (sessions) -> ) new: (req, res) -> - res.render('users/new', - js: (-> global.js), - css: (-> global.css), + db.smembers('mts', (err, keys) -> + mts = [] + for mt in keys + db.hgetall(mt, (err, it) -> + mts.push(it) + if keys.length==mts.length + res.render('users/new', + js: (-> global.js), + css: (-> global.css), + mtypes: mts + ) + ) ) - create: (req, res) -> userkey = "user:"+req.body.username db.hgetall(userkey, (err, obj) -> diff --git a/views/users/new.html b/views/users/new.html index 3adfe651..f0d87f67 100644 --- a/views/users/new.html +++ b/views/users/new.html @@ -11,303 +11,313 @@
-

Register

+
+

Register

+
+ +
+ + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- + + + + + + + + + + + + + + + + + +
+
+
+
- + \ No newline at end of file -- cgit v1.2.3