From 9edc8a787ddb552afd24ef00c3c3b7eeb0945ab9 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sun, 27 Oct 2013 22:11:49 -0700 Subject: Move seed data into install script --- app.coffee | 15 -- install.coffee | 28 +++ package.json | 1 + redis.coffee | 5 +- routes/users.coffee | 22 +- views/users/new.html | 606 +++++++++++++++++++++++++-------------------------- 6 files changed, 351 insertions(+), 326 deletions(-) create mode 100644 install.coffee diff --git a/app.coffee b/app.coffee index a505a4e7..50a25e0b 100644 --- a/app.coffee +++ b/app.coffee @@ -62,18 +62,3 @@ app.use((err, req, res, next) -> ) app.listen(3000) - -# Setup DB -db = require("redis").createClient() -db.sismember("mts","mt:rest", (err,res) -> - if !res - db.hmset("mt:rest",{code: "rest", label: "Restaurant/Bar"}, -> - db.sadd("mts","mt:rest") - ) - db.hmset("mt:coff",{code: "rest", label: "Coffee Shop"}, -> - db.sadd("mts","mt:coff") - ) - console.log("Added merchant types.") -) - - diff --git a/install.coffee b/install.coffee new file mode 100644 index 00000000..a47ac12a --- /dev/null +++ b/install.coffee @@ -0,0 +1,28 @@ +db = require("./redis") +bcrypt = require('bcrypt') + +db.get("user:admin", (err, res) -> + if !res + bcrypt.hash('admin', 12, (err, hash) -> + db.sadd("users","user:admin") + db.hmset("user:admin", + username: 'admin' + password: hash, + , -> + console.log("Created admin user with password 'admin'") + ) + ) +) + +db.sismember("mts","mt:rest", (err,res) -> + if !res + db.hmset("mt:rest",{code: "rest", label: "Restaurant/Bar"}, -> + db.sadd("mts","mt:rest") + ) + db.hmset("mt:coff",{code: "rest", label: "Coffee Shop"}, -> + db.sadd("mts","mt:coff") + ) + console.log("Added merchant types") +) + +process.exit() diff --git a/package.json b/package.json index 5b8abc75..c6f57762 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "version": "0.0.1", "private": true, "scripts": { + "prepublish": "coffee install.coffee", "start": "coffee app.coffee" }, "dependencies": { diff --git a/redis.coffee b/redis.coffee index 9388a3c4..8c7a5600 100644 --- a/redis.coffee +++ b/redis.coffee @@ -1,4 +1,5 @@ -module.exports = -> +settings = port: 6379 host: '127.0.0.1' - require('redis').createClient(port, host) + +module.exports = require('redis').createClient(settings.port, settings.ost) diff --git a/routes/users.coffee b/routes/users.coffee index 6d0d9fe7..718a649a 100644 --- a/routes/users.coffee +++ b/routes/users.coffee @@ -45,8 +45,24 @@ module.exports = (sessions) -> else bcrypt.hash(req.body.password, 12, (err, hash) -> 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, -> + 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) ) @@ -64,5 +80,5 @@ module.exports = (sessions) -> return unless req.params.user is req.user.username or req.user.username is 'admin' db.hmset("user:"+req.params.user, req.body, -> - res.redirect("/#{req.params.user}") + res.redirect("/#{req.params.user}") ) diff --git a/views/users/new.html b/views/users/new.html index 7211c31a..a2c249c7 100644 --- a/views/users/new.html +++ b/views/users/new.html @@ -11,314 +11,308 @@
-
-

Register

-
- -
- - - - - - - - - - - - - - - - - - -
-
- - - - - - - - - - - +

Register

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