From 6af3b0ffc6576222af2978771747b0c9715f70b1 Mon Sep 17 00:00:00 2001 From: Baris Usakli Date: Thu, 25 Jul 2013 12:30:59 -0400 Subject: [PATCH] account settings --- public/src/forum/accountsettings.js | 6 ++++++ public/templates/account.tpl | 5 +++-- public/templates/accountedit.tpl | 5 +++-- public/templates/accountsettings.tpl | 32 ++++++++++++++++++++++++++++ public/templates/config.json | 1 + public/templates/followers.tpl | 5 +++-- public/templates/following.tpl | 5 +++-- src/routes/user.js | 14 ++++++++++++ 8 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 public/src/forum/accountsettings.js create mode 100644 public/templates/accountsettings.tpl diff --git a/public/src/forum/accountsettings.js b/public/src/forum/accountsettings.js new file mode 100644 index 0000000000..3c6e0c26cf --- /dev/null +++ b/public/src/forum/accountsettings.js @@ -0,0 +1,6 @@ + + + +$(document).ready(function() { + +}); \ No newline at end of file diff --git a/public/templates/account.tpl b/public/templates/account.tpl index 79a94cae4d..31b440b9d3 100644 --- a/public/templates/account.tpl +++ b/public/templates/account.tpl @@ -8,8 +8,9 @@ {username}
- followers - following + settings + followers + following edit
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl index 2b0c7bbc11..48df1a19bd 100644 --- a/public/templates/accountedit.tpl +++ b/public/templates/accountedit.tpl @@ -66,8 +66,9 @@ edit
- followers - following + settings + followers + following edit
diff --git a/public/templates/accountsettings.tpl b/public/templates/accountsettings.tpl new file mode 100644 index 0000000000..58ab413a9a --- /dev/null +++ b/public/templates/accountsettings.tpl @@ -0,0 +1,32 @@ + +
+ + + +
+
+

privacy

+ +
+ +
+ span10 +
+ +
+
+ + \ No newline at end of file diff --git a/public/templates/config.json b/public/templates/config.json index 2aa8f4c9a9..5f00752c23 100644 --- a/public/templates/config.json +++ b/public/templates/config.json @@ -23,6 +23,7 @@ "users[^]*edit": "accountedit", "users[^]*following": "following", "users[^]*followers": "followers", + "users[^]*settings": "accountsettings", "users/[^]*": "account", "recent": "recent", diff --git a/public/templates/followers.tpl b/public/templates/followers.tpl index 3e38ca006c..6c5e2c8677 100644 --- a/public/templates/followers.tpl +++ b/public/templates/followers.tpl @@ -7,8 +7,9 @@ followers
- followers - following + settings + followers + following edit
diff --git a/public/templates/following.tpl b/public/templates/following.tpl index b14bf94904..affacf970c 100644 --- a/public/templates/following.tpl +++ b/public/templates/following.tpl @@ -9,8 +9,9 @@ following
- followers - following + settings + followers + following edit
diff --git a/src/routes/user.js b/src/routes/user.js index 710fe5b409..d96e089da4 100644 --- a/src/routes/user.js +++ b/src/routes/user.js @@ -76,6 +76,20 @@ var user = require('./../user.js'), }); }); + app.get('/users/:userslug/settings', function(req, res) { + + if(!req.user) + return res.redirect('/403'); + + user.getUserField(req.user.uid, 'userslug', function(userslug) { + if(req.params.userslug && userslug === req.params.userslug) { + res.send(app.build_header(res) + app.create_route('users/'+req.params.userslug+'/settings','accountsettings') + templates['footer']); + } else { + return res.redirect('/404'); + } + }); + }); + app.post('/users/uploadpicture', function(req, res) { if(!req.user) return res.redirect('/403');