diff --git a/config/env/torrents.js b/config/env/torrents.js index 5bee5554..4260d9e5 100644 --- a/config/env/torrents.js +++ b/config/env/torrents.js @@ -19,7 +19,7 @@ module.exports = { allow_social_sign: true }, invite: { - open_invite: true, + open_invite: false, score_exchange: 10000, expires: 60 * 60 * 1000 * 24 }, diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index c55e9aef..4d79a767 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -441,12 +441,19 @@ //invitation INVITATION: { MY_INVITATION: 'My invitations', - INVITE_NOTE: 'Please attention to the expiration time of the time limit invitation.', + USED_INVITATION: 'Used invitations', + INVITE_NOTE: 'Please attention to the expiration time of the time limit invitation is {{hours}} hours.', + SIGN_NOTE: 'Please attention to the expiration time of sign in with the invitation is {{hours}} hours.', TITLE_CREATEDAT: 'CreatedAt', TITLE_EXPIRESAT: 'ExpiresAt', + TITLE_INVITEDAT: 'InvitedAt', + TITLE_SIGNINAT: 'SigninAt', TITLE_OPERATION: 'Operation', TITLE_TOKEN: 'Token', - TITLE_SEND: 'Send an invitation' + TITLE_SEND: 'Send an invitation', + TITLE_STATUS: 'Status', + TITLE_STATUS_REGED: 'Signed', + TITLE_STATUS_UNREGED: 'Unsigned' }, GET_INVITATIONS_ERROR: 'Get invitations failed', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 497d1fb4..ee55c38a 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -441,12 +441,19 @@ //invitation INVITATION: { MY_INVITATION: '我的邀请', - INVITE_NOTE: '请注意限时邀请的过期时间.', + USED_INVITATION: '已发送的邀请', + INVITE_NOTE: '请注意限时邀请的过期时间为 {{hours}} 小时.', + SIGN_NOTE: '请注意邀请注册的有效期为 {{hours}} 小时.', TITLE_CREATEDAT: '创建时间', TITLE_EXPIRESAT: '过期时间', + TITLE_INVITEDAT: '发邀时间', + TITLE_SIGNINAT: '注册时间', TITLE_OPERATION: '操作', TITLE_TOKEN: '哈希码', - TITLE_SEND: '发送邀请' + TITLE_SEND: '发送邀请', + TITLE_STATUS: '状态', + TITLE_STATUS_REGED: '已注册', + TITLE_STATUS_UNREGED: '未注册' }, GET_INVITATIONS_ERROR: '获取邀请列表失败', diff --git a/modules/core/client/less/mt.less b/modules/core/client/less/mt.less index cb6dacd7..a57aa29e 100644 --- a/modules/core/client/less/mt.less +++ b/modules/core/client/less/mt.less @@ -948,6 +948,10 @@ body { margin-bottom: 2px; } +.mt-title { + font-size: 18px; +} + .left-icon { color: lighten(@mt-base-color, 40%); line-height: 1.4; diff --git a/modules/invitations/client/controllers/invitations.client.controller.js b/modules/invitations/client/controllers/invitations.client.controller.js index ce5d113a..1c43fef7 100644 --- a/modules/invitations/client/controllers/invitations.client.controller.js +++ b/modules/invitations/client/controllers/invitations.client.controller.js @@ -26,6 +26,7 @@ */ vm.getMyInvitations = function () { InvitationsService.get({}, function (items) { + console.log(items); vm.my_invitations = items.my_invitations; vm.used_invitations = items.used_invitations; }, function (res) { diff --git a/modules/invitations/client/views/detail.client.view.html b/modules/invitations/client/views/detail.client.view.html index 37e92c33..25edaad0 100644 --- a/modules/invitations/client/views/detail.client.view.html +++ b/modules/invitations/client/views/detail.client.view.html @@ -3,7 +3,7 @@
@@ -11,12 +11,14 @@
- -
{{ 'INVITATION.MY_INVITATION' | translate }} ({{vm.my_invitations.length}}) +
+ {{ 'INVITATION.MY_INVITATION' | translate }} ({{vm.my_invitations.length}})
-

{{ 'NOTE_TIP' | translate }} {{ 'INVITATION.INVITE_NOTE' | translate }}

+

{{ 'NOTE_TIP' | translate }} + +

@@ -46,5 +48,46 @@
+ +
+
+
+
+ {{ 'INVITATION.USED_INVITATION' | translate }} ({{vm.used_invitations.length}}) +
+
+

{{ 'NOTE_TIP' | translate }} + +

+
+ +
+ + + + + + + + + + + + + + + + + + + +
#{{'INVITATION.TITLE_TOKEN' | translate}}{{'INVITATION.TITLE_INVITEDAT' | translate}}{{'INVITATION.TITLE_SIGNINAT' | translate}}{{'INVITATION.TITLE_STATUS' | translate}}
{{$index+1}}{{r.token}}{{r.invitedat | date:'yyyy-MM-dd HH:mm:ss'}}{{r.registeredat | date:'yyyy-MM-dd HH:mm:ss'}} + {{ r.status == 2 ? ('INVITATION.TITLE_STATUS_REGED' | translate) : ('INVITATION.TITLE_STATUS_UNREGED' | translate) }} +
+
+
+
+
diff --git a/modules/invitations/server/controllers/invitations.server.controller.js b/modules/invitations/server/controllers/invitations.server.controller.js index 6ef3090f..b64489c6 100644 --- a/modules/invitations/server/controllers/invitations.server.controller.js +++ b/modules/invitations/server/controllers/invitations.server.controller.js @@ -71,12 +71,10 @@ exports.list = function (req, res) { var findUsedInvitations = function (callback) { Invitation.find({ - where: { user: req.user._id, - status: 2 - } + status: {$gt: 0} }) - .sort('registeredat') + .sort('invitedat') .populate('user') .exec(function (err, invitations) { if (err) { diff --git a/modules/invitations/server/models/invitation.server.model.js b/modules/invitations/server/models/invitation.server.model.js index b55c6fd2..12a7fcda 100644 --- a/modules/invitations/server/models/invitation.server.model.js +++ b/modules/invitations/server/models/invitation.server.model.js @@ -38,6 +38,9 @@ var InvitationSchema = new Schema({ expiresat: { type: Date }, + invitedat: { + type: Date + }, registeredat: { type: Date },