github.com
/
verdaccio
mirror of https://github.com/verdaccio/verdaccio.git
1
0
Fork 0
Code Releases Wiki Activity

Merge branch 'master' into refactor-config

This commit is contained in:
Juan Picado @jotadeveloper 2018-07-12 08:50:07 +02:00 committed by GitHub
parent 50f3634bab 452cdce00f
commit 9ef13fb6b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/webui/src/components/Header/index.js
View File

@ -2,6 +2,7 @@ import React from 'react';
import {Form, Button, Dialog, Input, Alert} from 'element-react';
import isString from 'lodash/isString';
import isNumber from 'lodash/isNumber';
import capitalize from 'lodash/capitalize';
import {Link} from 'react-router-dom';
import API from '../../../utils/api';
@ -134,9 +135,10 @@ export default class Header extends React.Component {
renderUserActionButton() {
if (!this.isTokenExpire) { // TODO: Check jwt token expire
const username = capitalize(storage.getItem('username'));
return (
<div className="user-logged">
<span className="user-logged-greetings" style={ {marginRight: '10px'} }>Hi, {storage.getItem('username')}</span>
<span className="user-logged-greetings" style={{marginRight: '10px'}}>Hi, {username}</span>
<Button className={`${classes.headerButton} header-button-logout`} type="danger" onClick={this.handleLogout}>Logout</Button>
</div>
);

2
test/e2e/e2e.spec.js
View File

@ -97,7 +97,7 @@ describe('/ (Verdaccio Page)', () => {
// check whether user is logged
const greetings = await page.evaluate(() => document.querySelector('.user-logged-greetings').textContent);
const buttonLogout = await page.$('.header-button-logout');
expect(greetings).toMatch('Hi, test');
expect(greetings).toMatch('Hi, Test');
expect(buttonLogout).toBeDefined();
});