- /admin/panel/users/view-user
+
+
+ {(this.state.invalid) ? this.renderInvalid() : this.renderUserInfo()}
);
}
+
+ renderInvalid() {
+ return (
+
+ {i18n('INVALID_USER')}
+
+ );
+ }
+
+ renderUserInfo() {
+ return (
+
+
+
+ {i18n('NAME')}
+
+ {this.state.name}
+
+
+
+ {i18n('EMAIL')}
+
+ {this.state.email}
+
+
+
+
+
+
+
+
+
+ );
+ }
+
+ getTicketListProps() {
+ return {
+ type: 'secondary',
+ tickets: this.state.tickets,
+ loading: this.state.loading,
+ departments: this.props.departments,
+ ticketPath: '/admin/panel/tickets/view-ticket/'
+ };
+ }
+
+ onUserRetrieved(result) {
+ this.setState({
+ name: result.data.name,
+ email: result.data.email,
+ tickets: result.data.tickets,
+ loading: false
+ });
+ }
+
+ onDeleteClick() {
+ AreYouSure.openModal(i18n('DELETE_USER_DESCRIPTION'), this.deleteUser.bind(this))
+ }
+
+ deleteUser() {
+ API.call({
+ path: '/user/delete',
+ data: {
+ userId: this.props.params.userId
+ }
+ }).then(() => {
+ browserHistory.push('/admin/panel/user/list-users');
+ });
+ }
}
-export default AdminPanelViewUser;
\ No newline at end of file
+export default connect((store) => {
+ return {
+ departments: store.session.userDepartments
+ };
+})(AdminPanelViewUser);
diff --git a/client/src/app/admin/panel/users/admin-panel-view-user.scss b/client/src/app/admin/panel/users/admin-panel-view-user.scss
new file mode 100644
index 00000000..730301fe
--- /dev/null
+++ b/client/src/app/admin/panel/users/admin-panel-view-user.scss
@@ -0,0 +1,40 @@
+@import '../../../../scss/vars';
+
+.admin-panel-view-user {
+
+ &__info {
+ text-align: left;
+
+ &-item {
+ display: inline-block;
+ margin-right: 20px;
+ width: 200px;
+ }
+
+ &-box {
+ background-color: $grey;
+ color: $primary-black;
+ font-size: $font-size--sm;
+ padding: 5px 15px;
+ text-align: center;
+ }
+ }
+
+ &__delete-button {
+ margin-top: 20px;
+ }
+
+ &__separator {
+ background-color: $grey;
+ display: block;
+ margin: 30px 0;
+ height: 1px;
+ width: 100%;
+ }
+
+ &__tickets-title {
+ font-size: $font-size--md;
+ margin-bottom: 20px;
+ text-align: left;
+ }
+}
\ No newline at end of file
diff --git a/client/src/core-components/button.js b/client/src/core-components/button.js
index 3b2d52c6..2932b38c 100644
--- a/client/src/core-components/button.js
+++ b/client/src/core-components/button.js
@@ -41,7 +41,7 @@ class Button extends React.Component {
static defaultProps = {
type: 'primary',
- size: 'medium'
+ size: 'large'
};
render() {
diff --git a/client/src/core-components/button.scss b/client/src/core-components/button.scss
index 33f1cb7b..2c133d1d 100644
--- a/client/src/core-components/button.scss
+++ b/client/src/core-components/button.scss
@@ -59,11 +59,14 @@
}
&_medium {
- width: 239px;
+ width: auto;
+ padding: 5px 15px;
+ height: 35px;
+ text-transform: none;
}
&_large {
- //width: 239px;
+ width: 239px;
}
&_auto {
diff --git a/client/src/data/fixtures/user-fixtures.js b/client/src/data/fixtures/user-fixtures.js
index dde8365e..5c3ce6e7 100644
--- a/client/src/data/fixtures/user-fixtures.js
+++ b/client/src/data/fixtures/user-fixtures.js
@@ -1,3 +1,5 @@
+import _ from 'lodash';
+
module.exports = [
{
path: '/user/login',
@@ -124,6 +126,147 @@ module.exports = [
};
}
},
+ {
+ path: '/user/delete',
+ time: 1000,
+ response: function () {
+ return {
+ status: 'success',
+ data: {}
+ };
+ }
+ },
+ {
+ path: '/user/get-user',
+ time: 100,
+ response: function () {
+ return {
+ status: 'success',
+ data: {
+ name: 'Kurt Gödel',
+ email: 'kurt@currycurrylady.hs',
+ tickets: _.times(13).map(() => {
+ return {
+ ticketNumber: '118551',
+ title: 'Lorem ipsum door',
+ content: 'I had a problem with the installation of the php server',
+ department: {
+ id: 1,
+ name: 'Sales Support'
+ },
+ date: '20150409',
+ file: 'http://www.opensupports.com/some_file.zip',
+ language: 'en',
+ unread: false,
+ closed: false,
+ priority: 'low',
+ author: {
+ name: 'Haskell Curry',
+ email: 'haskell@lambda.com'
+ },
+ owner: {
+ name: 'Steve Jobs'
+ },
+ events: [
+ {
+ type: 'ASSIGN',
+ date: '20150409',
+ author: {
+ name: 'Emilia Clarke',
+ email: 'jobs@steve.com',
+ profilePic: 'http://www.opensupports.com/profilepic.jpg',
+ staff: true
+ }
+ },
+ {
+ type: 'COMMENT',
+ date: '20150409',
+ content: 'Do you have apache installed? It generally happens if you dont have apache.',
+ author: {
+ name: 'Emilia Clarke',
+ email: 'jobs@steve.com',
+ profilePic: 'http://www.opensupports.com/profilepic.jpg',
+ staff: true
+ }
+ },
+ {
+ type: 'UN_ASSIGN',
+ date: '20150410',
+ author: {
+ name: 'Emilia Clarke',
+ email: 'jobs@steve.com',
+ profilePic: 'http://www.opensupports.com/profilepic.jpg',
+ staff: true
+ }
+ },
+ {
+ type: 'DEPARTMENT_CHANGED',
+ date: '20150411',
+ content: 'System support',
+ author: {
+ name: 'Emilia Clarke',
+ email: 'jobs@steve.com',
+ profilePic: 'http://www.opensupports.com/profilepic.jpg',
+ staff: true
+ }
+ },
+ {
+ type: 'COMMENT',
+ date: '20150412',
+ content: 'I have already installed apache, but the problem persists',
+ author: {
+ name: 'Haskell Curry',
+ steve: 'haskell@lambda.com',
+ staff: false
+ }
+ },
+ {
+ type: 'PRIORITY_CHANGED',
+ date: '20150413',
+ content: 'MEDIUM',
+ author: {
+ name: 'Emilia Clarke',
+ email: 'jobs@steve.com',
+ profilePic: 'http://www.opensupports.com/profilepic.jpg',
+ staff: true
+ }
+ },
+ {
+ type: 'COMMENT',
+ date: '20150511',
+ content: 'Thanks!, I soved it by myself',
+ author: {
+ name: 'Haskell Curry',
+ steve: 'haskell@lambda.com',
+ staff: false
+ }
+ },
+ {
+ type: 'CLOSE',
+ date: '20150513',
+ author: {
+ name: 'Emilia Clarke',
+ email: 'jobs@steve.com',
+ profilePic: 'http://www.opensupports.com/profilepic.jpg',
+ staff: true
+ }
+ },
+ {
+ type: 'RE_OPEN',
+ date: '20151018',
+ author: {
+ name: 'Haskell Curry',
+ email: 'haskell@lambda.com',
+ staff: false
+ }
+ }
+ ]
+ };
+ })
+ }
+ }
+ }
+ },
{
path: '/user/get-users',
time: 100,
diff --git a/client/src/data/languages/en.js b/client/src/data/languages/en.js
index 82f4e0a4..29175429 100644
--- a/client/src/data/languages/en.js
+++ b/client/src/data/languages/en.js
@@ -59,6 +59,7 @@ export default {
'SAVE': 'Save',
'DISCARD_CHANGES': 'Discard changes',
'DELETE': 'Delete',
+ 'DELETE_AND_BAN': 'Delete and ban',
'LANGUAGE': 'Language',
'OWNER': 'Owner',
'OWNED': 'Owned',
@@ -78,7 +79,8 @@ export default {
'NAME': 'Name',
'SIGNUP_DATE': 'Sign up date',
'SEARCH_USERS': 'Search users...',
-
+ 'USER_VIEW_TITLE': 'User #{userId}',
+
//VIEW DESCRIPTIONS
'CREATE_TICKET_DESCRIPTION': 'This is a form for creating tickets. Fill the form and send us your issues/doubts/suggestions. Our support system will answer it as soon as possible.',
'TICKET_LIST_DESCRIPTION': 'Here you can find a list of all tickets you have sent to our support team.',
@@ -92,6 +94,8 @@ export default {
'ALL_TICKETS_DESCRIPTION': 'Here you can view the tickets of the departments you are assigned.',
'TICKET_VIEW_DESCRIPTION': 'This ticket has been sent by a customer. Here you can respond or assign the ticket',
'LIST_USERS_DESCRIPTION': 'This is the list of users that are registered in this platform. You can search for someone in particular, delete it or ban it.',
+ 'USER_VIEW_DESCRIPTION': 'Here you can find all the information about an user and all the tickets sent by the user. You can also delete or ban it.',
+ 'DELETE_USER_DESCRIPTION': 'The user will not be able to log in aging and all its tickets will be erased. Also, the email can not be used any more.',
//ERRORS
'EMAIL_OR_PASSWORD': 'Email or password invalid',
@@ -106,6 +110,7 @@ export default {
'INVALID_RECOVER': 'Invalid recover data',
'TICKET_SENT_ERROR': 'An error occurred while trying to create the ticket.',
'NO_PERMISSION': 'You\'ve no permission to access to this page.',
+ 'INVALID_USER': 'User id is invalid',
//MESSAGES
'SIGNUP_SUCCESS': 'You have registered successfully in our support system.',