account setting front script

2026-01-12 22:27:09 +08:00 · 2014-09-21 03:31:17 +08:00
parent 6cc65f1b27
commit 11e4732dfc
9 changed files with 90 additions and 90 deletions
--- a/bin/rp-migration.coffee
+++ b/bin/rp-migration.coffee
@@ -6,31 +6,33 @@ async = require 'async'

 config = require '../config'
 {user, password, host, name} = config.mongodb
+mongodb_uri = "mongodb://#{user}:#{password}@#{host}/#{name}"

 version = _.last process.argv

 migration_action =
  '0.7.1': (callback) ->
-    console.log "
-npm install coffee-script -g
+    ###
+      npm install coffee-script -g

-vi /etc/rc.local
+      vi /etc/rc.local

-    iptables-restore < /etc/iptables.rules
+          iptables-restore < /etc/iptables.rules

-vi /etc/supervisor/conf.d/rpadmin.conf
+      vi /etc/supervisor/conf.d/rpadmin.conf

-    [program:RootPanel]
-    command=node /home/rpadmin/RootPanel/start.js
-    autorestart=true
-    user=rpadmin
+          [program:RootPanel]
+          command=node /home/rpadmin/RootPanel/start.js
+          autorestart=true
+          user=rpadmin
+
+      service supervisor restart
+    ###

-service supervisor restart
-"
    crypto = require 'crypto'
    bitcoin = require '../core/bitcoin'

-    MongoClient.connect "mongodb://#{user}:#{password}@#{host}/#{name}", (err, db) ->
+    MongoClient.connect mongodb_uri, (err, db) ->
      mAccount = db.collection 'accounts'

      mAccount.find().toArray (err, accounts) ->
@@ -51,7 +53,7 @@ service supervisor restart
          callback()

  '0.6.0': (callback) ->
-    MongoClient.connect "mongodb://#{user}:#{password}@#{host}/#{name}", (err, db) ->
+    MongoClient.connect mongodb_uri, (err, db) ->
      mAccount = db.collection 'accounts'

      async.parallel [
--- a/core/locale/zh_CN.json
+++ b/core/locale/zh_CN.json
@@ -14,7 +14,8 @@
        }
    },
    "common": {
-        "error": "错误"
+        "error": "错误",
+        "success": "成功"
    },
    "error_code": {
        "username_exist": "用户名已存在"
@@ -75,7 +76,7 @@
            "password2": "重复",
            "already_register": "已有帐号？",
            "no_account": "还没有账户？",
-            "password_Inconsistent": "两次输入的密码不一致"
+            "password_inconsistent": "两次输入的密码不一致"
        }
    },
    "plugins": {}
--- a/core/router/account.coffee
+++ b/core/router/account.coffee
@@ -172,7 +172,10 @@ exports.post '/use_coupon', requireAuthenticate, (req, res) ->
    unless coupon_code.available_times > 0
      return res.error 'code_not_available'

-    if _.find coupon_code.apply_log, (i) -> i.account_id.toString() == req.account._id.toString()
+    apply_log = _.find coupon_code.apply_log, (i) ->
+      return i.account_id.toString() == req.account._id.toString()
+
+    if apply_log
      return res.error 'already_used'

    mCouponCode.applyCode req.account, coupon_code, ->
--- a/core/static/script/account/login.coffee
+++ b/core/static/script/account/login.coffee
@@ -1,14 +1,9 @@
 $ ->
  $('.action-login').click ->
-    $.post '/account/login/', JSON.stringify
-      username : $('#username').val()
-      password : $('#password').val()
-    .fail (jqXHR) ->
-      if jqXHR.responseJSON?.error
-        alert jqXHR.responseJSON.error
-      else
-        alert jqXHR.statusText
-    .success ->
+    request '/account/login/',
+      username: $('.input-username').val()
+      password: $('.input-password').val()
+    , ->
      location.href = '/panel/'

  $('#password').keypress (e) ->
--- a/core/static/script/account/register.coffee
+++ b/core/static/script/account/register.coffee
@@ -1,11 +1,16 @@
 $ ->
  $('.action-register').click ->
-    unless $('#password').val() == $('#password2').val()
-      return alert t 'view.account.password_Inconsistent'
+    username = $('.input-username').val()
+    password = $('.input-password').val()
+    password2 = $('.input-password2').val()
+    email = $('.input-email').val()
+
+    unless password == password2
+      return alert t 'view.account.password_inconsistent'

    request '/account/register/',
-      username: $('#username').val()
-      password: $('#password').val()
-      email: $('#email').val()
+      username: username
+      password: password
+      email: email
    , ->
      location.href = '/panel/'
--- a/core/static/script/account/setting.coffee
+++ b/core/static/script/account/setting.coffee
@@ -1,44 +1,38 @@
 $ ->
-  $('.action-update-password').click ->
-    if $('.form-password :input[name=password]').val() != $('.form-password :input[name=password2]').val()
-      return alert 'Two password is not equal'
-
-    $.post '/account/update_password/', JSON.stringify
-      old_password : $('.form-password :input[name=old_password]').val()
-      password: $('.form-password :input[name=password]').val()
-    .fail (jqXHR) ->
-      alert jqXHR.responseJSON?.error ? jqXHR.statusText
-    .success ->
-      alert 'Success!'
-
  $('.action-save').click ->
-    $.post '/account/update_setting/', JSON.stringify
-      name: 'qq'
-      value: $(':input[name=qq]').val()
-    .fail (jqXHR) ->
-      alert jqXHR.responseJSON?.error ? jqXHR.statusText
-    .success ->
-      alert 'Success!'
-
-  $('.action-update-email').click ->
-    $.post '/account/update_email/', JSON.stringify
-      password: $('.form-email :input[name=password]').val()
-      email: $(':input[name=email]').val()
-    .fail (jqXHR) ->
-      alert jqXHR.responseJSON?.error ? jqXHR.statusText
-    .success ->
-      alert 'Success!'
+    request '/account/update_setting/',
+      qq: $('.form-setting .input-qq').val()
+    , ->
+      alert t 'common.success'

  $('.action-use').click ->
-    $.post '/account/coupon_info/', JSON.stringify
-      code: $(':input[name=coupon_code]').val()
-    .fail (jqXHR) ->
-      alert jqXHR.responseJSON?.error ? jqXHR.statusText
-    .success (data) ->
+    code = $('.form-coupon .input-coupon_code').val()
+
+    request '/account/coupon_info/',
+      code: code
+    , ->
      if window.confirm data.message
-        $.post '/account/use_coupon/', JSON.stringify
-          code: $(':input[name=coupon_code]').val()
-        .fail (jqXHR) ->
-          alert jqXHR.responseJSON?.error ? jqXHR.statusText
-        .success ->
-          alert 'Success!'
+        request '/account/use_coupon/',
+          code: code
+        , ->
+          alert t 'common.success'
+
+  $('.action-update-password').click ->
+    password = $('.form-password .input-password').val()
+    password2 = $('.form-password .input-password2').val()
+
+    if password != password2
+      return alert t 'view.account.password_inconsistent'
+
+    request '/account/update_password/',
+      old_password: $('.form-password .input-old_password').val()
+      password: password
+    , ->
+      alert t 'common.success'
+
+  $('.action-update-email').click ->
+    request '/account/update_email/',
+      password: $('.form-email .input-password').val()
+      email: $('.form-email .input-email').val()
+    , ->
+      alert t 'common.success'
--- a/core/view/account/login.jade
+++ b/core/view/account/login.jade
@@ -5,15 +5,15 @@ prepend header

 block main
  header= t('account.login')
-  form.form-horizontal(method='post', role='form')
+  form.form-horizontal
    .form-group
-      label.col-sm-2.col-md-offset-1.control-label(for='username')= t('account.username')
+      label.col-sm-2.col-md-offset-1.control-label= t('account.username')
      .col-sm-5
-        input#username.form-control(type='text', name='username', required)
+        input.input-username.form-control(type='text', required)
    .form-group
-      label.col-sm-2.col-md-offset-1.control-label(for='password')= t('account.password')
+      label.col-sm-2.col-md-offset-1.control-label= t('account.password')
      .col-sm-5
-        input#password.form-control(type='password', name='password')
+        input.input-password.form-control(type='password')
    .form-group
      .col-sm-offset-3
        button.action-login.btn.btn-lg.btn-primary(type='button')= t('account.login')
--- a/core/view/account/register.jade
+++ b/core/view/account/register.jade
@@ -5,23 +5,23 @@ prepend header

 block main
  header= t('account.register')
-  form.form-horizontal.signup-form(method='post', role='form')
+  form.form-horizontal.signup-form
    .form-group
-      label.col-sm-2.col-md-offset-1.control-label(for='username')= t('account.username')
+      label.col-sm-2.col-md-offset-1.control-label= t('account.username')
      .col-sm-5
-        input#username.form-control(type='text', name='username', required)
+        input.input-username.form-control(type='text')
    .form-group
-      label.col-sm-2.col-md-offset-1.control-label(for='email')= t('account.email')
+      label.col-sm-2.col-md-offset-1.control-label= t('account.email')
      .col-sm-5
-        input#email.form-control(type='email', name='email', required)
+        input.input-email.form-control(type='email')
    .form-group
-      label.col-sm-2.col-md-offset-1.control-label(for='password')= t('account.password')
+      label.col-sm-2.col-md-offset-1.control-label= t('account.password')
      .col-sm-5
-        input#password.form-control(type='password', name='password')
+        input.input-password.form-control(type='password')
    .form-group
-      label.col-sm-2.col-md-offset-1.control-label(for='password2')= t('view.account.password2')
+      label.col-sm-2.col-md-offset-1.control-label= t('view.account.password2')
      .col-sm-5
-        input#password2.form-control(type='password', name='password2')
+        input.input-password2.form-control(type='password')
    .form-group
      .col-sm-offset-3
        button.action-register.btn.btn-lg.btn-primary(type='button')= t('account.register')
--- a/core/view/account/setting.jade
+++ b/core/view/account/setting.jade
@@ -10,7 +10,7 @@ block main
      .form-group
        label.col-sm-2.col-md-offset-1.control-label QQ
        .col-sm-5
-          input.form-control(type='text', name='qq', value=account.settings.qq)
+          input.input-qq.form-control(type='text', value=account.settings.qq)
      .form-group
        .col-sm-offset-3
          button.action-save.btn.btn-lg.btn-success(type='button') 保存
@@ -21,7 +21,7 @@ block main
      .form-group
        label.col-sm-2.col-md-offset-1.control-label 代码
        .col-sm-5
-          input.form-control(type='text', name='coupon_code', required)
+          input.input-coupon_code.form-control(type='text')
      .form-group
        .col-sm-offset-3
          button.action-use.btn.btn-lg.btn-success(type='button') 使用
@@ -32,15 +32,15 @@ block main
      .form-group
        label.col-sm-2.col-md-offset-1.control-label 原密码
        .col-sm-5
-          input.form-control(type='password', name='old_password')
+          input.input-old_password.form-control(type='password')
      .form-group
        label.col-sm-2.col-md-offset-1.control-label 新密码
        .col-sm-5
-          input.form-control(type='password', name='password')
+          input.input-password.form-control(type='password')
      .form-group
        label.col-sm-2.col-md-offset-1.control-label 重复密码
        .col-sm-5
-          input.form-control(type='password', name='password2')
+          input.input-password2.form-control(type='password')
      .form-group
        .col-sm-offset-3
          button.action-update-password.btn.btn-lg.btn-info(type='button') 修改
@@ -55,11 +55,11 @@ block main
      .form-group
        label.col-sm-2.col-md-offset-1.control-label 密码
        .col-sm-5
-          input.form-control(type='password', name='password')
+          input.input-password.form-control(type='password')
      .form-group
        label.col-sm-2.col-md-offset-1.control-label 新邮箱
        .col-sm-5
-          input.form-control(type='text', name='email')
+          input.input-email.form-control(type='text')
      .form-group
        .col-sm-offset-3
          button.action-update-email.btn.btn-lg.btn-info(type='button') 修改