From ab93adc650576d62eee2227a87e2b2f10e940c9c Mon Sep 17 00:00:00 2001 From: OldHawk Date: Fri, 9 Jun 2017 16:08:04 +0800 Subject: [PATCH] feat(users): add user score menu item --- modules/core/client/app/trans-string-en.js | 1 + modules/core/client/app/trans-string-zh.js | 1 + .../client/controllers/header.client.controller.js | 1 + modules/core/client/views/header.client.view.html | 3 +++ .../messages/client/config/messages.client.menus.js | 12 ++++++++++++ modules/users/client/config/users.client.routes.js | 9 +++++++++ .../users/client/views/score/detail.client.view.html | 5 +++++ .../users/client/views/score/score.client.view.html | 3 +++ .../client/views/status/status.client.view.html | 11 ----------- 9 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 modules/users/client/views/score/detail.client.view.html create mode 100644 modules/users/client/views/score/score.client.view.html diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index ecbcb2b2..1d95f4f1 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -40,6 +40,7 @@ SIGNIN: 'Sign In', SIGNUP: 'Sign Up', MENU_MESSAGE_INBOX: 'Message Inbox', + MENU_SCORE_LEVEL: 'Score Level', MENU_ACCOUNT_STATUS: 'Account Status', EDIT_PROFILE: 'Edit Profile', EDIT_PROFILE_PIC: 'Edit Profile Picture', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index d177602a..103170f2 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -40,6 +40,7 @@ SIGNIN: '登录', SIGNUP: '注册', MENU_MESSAGE_INBOX: '消息收件箱', + MENU_SCORE_LEVEL: '积分等级', MENU_ACCOUNT_STATUS: '帐户状态', EDIT_PROFILE: '修改个人信息', EDIT_PROFILE_PIC: '修改个人头像', diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js index 4c808cae..8b825937 100644 --- a/modules/core/client/controllers/header.client.controller.js +++ b/modules/core/client/controllers/header.client.controller.js @@ -15,6 +15,7 @@ vm.accountMenu = menuService.getMenu('account').items[0]; vm.messagesMenu = menuService.getMenu('mt').items[0]; vm.statusMenu = menuService.getMenu('mt').items[1]; + vm.scoreMenu = menuService.getMenu('mt').items[2]; vm.authentication = Authentication; vm.isCollapsed = false; vm.menu = menuService.getMenu('topbar'); diff --git a/modules/core/client/views/header.client.view.html b/modules/core/client/views/header.client.view.html index e80a9d1e..fd6114ba 100644 --- a/modules/core/client/views/header.client.view.html +++ b/modules/core/client/views/header.client.view.html @@ -48,6 +48,9 @@
  • +
  • + +
  • diff --git a/modules/messages/client/config/messages.client.menus.js b/modules/messages/client/config/messages.client.menus.js index 4ee1dcc0..942fcc71 100644 --- a/modules/messages/client/config/messages.client.menus.js +++ b/modules/messages/client/config/messages.client.menus.js @@ -26,6 +26,13 @@ roles: ['user'] }); + menuService.addMenuItem('mt', { + title: '', + state: 'score', + type: 'dropdown', + roles: ['user'] + }); + menuService.addSubMenuItem('mt', 'messages', { title: 'MENU_MESSAGE_INBOX', state: 'messages.inbox' @@ -35,5 +42,10 @@ title: 'MENU_ACCOUNT_STATUS', state: 'status.account' }); + + menuService.addSubMenuItem('mt', 'score', { + title: 'MENU_SCORE_LEVEL', + state: 'score.detail' + }); } }()); diff --git a/modules/users/client/config/users.client.routes.js b/modules/users/client/config/users.client.routes.js index e132c83d..0e5a62f7 100644 --- a/modules/users/client/config/users.client.routes.js +++ b/modules/users/client/config/users.client.routes.js @@ -87,6 +87,15 @@ url: '/downloading', templateUrl: '/modules/users/client/views/status/downloading.client.view.html' }) + .state('score', { + abstract: true, + url: '/score', + templateUrl: '/modules/users/client/views/score/score.client.view.html' + }) + .state('score.detail', { + url: '/detail', + templateUrl: '/modules/users/client/views/score/detail.client.view.html' + }) .state('authentication', { abstract: true, url: '/authentication', diff --git a/modules/users/client/views/score/detail.client.view.html b/modules/users/client/views/score/detail.client.view.html new file mode 100644 index 00000000..7aa4d4f2 --- /dev/null +++ b/modules/users/client/views/score/detail.client.view.html @@ -0,0 +1,5 @@ +
    +
    +

    Score Detail

    +
    +
    diff --git a/modules/users/client/views/score/score.client.view.html b/modules/users/client/views/score/score.client.view.html new file mode 100644 index 00000000..7c52ee82 --- /dev/null +++ b/modules/users/client/views/score/score.client.view.html @@ -0,0 +1,3 @@ +
    +
    +
    diff --git a/modules/users/client/views/status/status.client.view.html b/modules/users/client/views/status/status.client.view.html index 0f5955bd..60f7e308 100644 --- a/modules/users/client/views/status/status.client.view.html +++ b/modules/users/client/views/status/status.client.view.html @@ -1,16 +1,5 @@