Skip to content

Commit

Permalink
Merge pull request #3 from oskar-binary/fix_travis_errors
Browse files Browse the repository at this point in the history
fix linter errors
  • Loading branch information
klyanyi committed Aug 30, 2019
2 parents a5392f5 + 3cae4b8 commit 4aa4634
Show file tree
Hide file tree
Showing 10 changed files with 48 additions and 42 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
class MenuAccordionHeaders extends React.PureComponent {
state = {
is_active_tab_open: true,
selected_tab : this.props.items[0].label
selected_tab : this.props.items[0].label,
}

handleAccordion = (selected) => {
Expand Down Expand Up @@ -37,9 +37,12 @@ class MenuAccordionHeaders extends React.PureComponent {
<div key={idx}>
<div>
<VerticalTabHeader item={item} onChange={this.handleAccordion} >
<Icon icon='IconChevronRight' className={classNames('dt_accordion-chevron', {
'dt_accordion-chevron--show': show_sub_tab_list, // this.state.is_active_tab_open,
})} />
<Icon
icon='IconChevronRight'
className={classNames('dt_accordion-chevron', {
'dt_accordion-chevron--show': show_sub_tab_list,
})}
/>
</VerticalTabHeader>
</div>
{show_sub_tab_list && (
Expand All @@ -50,7 +53,8 @@ class MenuAccordionHeaders extends React.PureComponent {
/>
)}
</div>
)}
);
}
)}
</VerticalTabWrapper>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class MenuAccordion extends React.PureComponent {

return (
<VerticalTabLayout is_full_width={is_full_width}>
<MenuAccordionHeaders
<MenuAccordionHeaders
items={list}
onChange={this.changeSelectedContent}
selected={selected_content}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const HeaderIcon = ({ icon, is_active }) => (
'vertical-tab__header__icon--active': is_active,
})}
/>
)
);

const Header = ({ text }) => <div className='vertical-tab__header__link'>{text}</div>;

Expand All @@ -35,7 +35,7 @@ const VerticalTabHeader = ({ children, is_routed, item, onChange, selected }) =>
>
<HeaderIcon icon={item.icon} is_active={is_active} />
<Header text={label} />
{children}
{children}
</NavLink>
:
<div
Expand All @@ -49,9 +49,9 @@ const VerticalTabHeader = ({ children, is_routed, item, onChange, selected }) =>
>
<HeaderIcon icon={item.icon} is_active={is_active} />
<Header text={label} />
{children}
{children}
</div>
);
}
};

export { VerticalTabHeader }
export { VerticalTabHeader };
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { VerticalTabWrapper } from './vertical-tab-wrapper';
import { VerticalTabHeader } from './vertical-tab-header';
import React from 'react';
import { VerticalTabWrapper } from './vertical-tab-wrapper.jsx';
import { VerticalTabHeader } from './vertical-tab-header.jsx';

class VerticalTabHeaders extends React.PureComponent {
render() {
Expand All @@ -13,14 +13,14 @@ class VerticalTabHeaders extends React.PureComponent {
}

{this.props.items.map(item => (
<VerticalTabHeader
item={item}
onChange={this.props.onChange}
is_routed={this.props.is_routed}
selected={this.props.selected}
key={item.label}
/>
)
<VerticalTabHeader
item={item}
onChange={this.props.onChange}
is_routed={this.props.is_routed}
selected={this.props.selected}
key={item.label}
/>
)
)}
</VerticalTabWrapper>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@ import React from 'react';
import classNames from 'classnames';

const VerticalTabLayout = ({ children, is_full_width }) => (
<div className={classNames('vertical-tab', {
'vertical-tab--full-screen': is_full_width,
})}>
<div
className={classNames('vertical-tab', {
'vertical-tab--full-screen': is_full_width,
})}
>
{children}
</div>
);

export { VerticalTabLayout }
export { VerticalTabLayout };
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ const VerticalTabWrapper = ({ children }) => (
</div>
);

export { VerticalTabWrapper }
export { VerticalTabWrapper };
10 changes: 5 additions & 5 deletions packages/trader/src/Assets/AccountManagement/icon-security.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ import React from 'react';

const IconSecurity = ({ className }) => (
<svg className={classNames('inline-icon', className)} width='16' height='16' viewBox='0 0 16 16'>
<g fill="#333" fillRule="evenodd">
<path d="M7 6V5a1 1 0 1 1 2 0v1a.5.5 0 1 0 1 0V5a2 2 0 1 0-4 0v1a.5.5 0 1 0 1 0zM10 8v3H6V8h4zm0-1H6a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h4a1 1 0 0 0 1-1V8a1 1 0 0 0-1-1z"/>
<circle cx="8" cy="9.001" r="1"/>
<rect width="1" height="1.08" x="7.75" y="9.181" rx=".25"/>
<path d="M8 0v1a7.79 7.79 0 0 0 5.23 2.16.71.71 0 0 1 .69.68v.51a16.19 16.19 0 0 1-.66 6A7.08 7.08 0 0 1 11.58 13a9.36 9.36 0 0 1-3.48 2h-.17a9.53 9.53 0 0 1-3.52-2 7 7 0 0 1-1.73-2.64A16.08 16.08 0 0 1 2 4.38v-.53a.71.71 0 0 1 .69-.68A7.79 7.79 0 0 0 8 1V0zm0 0a1.05 1.05 0 0 0-.71.27 6.79 6.79 0 0 1-4.61 1.9A1.71 1.71 0 0 0 1 3.83v.5a16.9 16.9 0 0 0 .72 6.33 8.1 8.1 0 0 0 2 3 10.51 10.51 0 0 0 3.89 2.24h.16L8 16h.38a10.61 10.61 0 0 0 3.88-2.24 8 8 0 0 0 2-3A16.93 16.93 0 0 0 15 4.34v-.5a1.71 1.71 0 0 0-1.64-1.66A6.79 6.79 0 0 1 8.73.28 1 1 0 0 0 8 0z"/>
<g fill='#333' fillRule='evenodd'>
<path d='M7 6V5a1 1 0 1 1 2 0v1a.5.5 0 1 0 1 0V5a2 2 0 1 0-4 0v1a.5.5 0 1 0 1 0zM10 8v3H6V8h4zm0-1H6a1 1 0 0 0-1 1v3a1 1 0 0 0 1 1h4a1 1 0 0 0 1-1V8a1 1 0 0 0-1-1z' />
<circle cx='8' cy='9.001' r='1' />
<rect width='1' height='1.08' x='7.75' y='9.181' rx='.25' />
<path d='M8 0v1a7.79 7.79 0 0 0 5.23 2.16.71.71 0 0 1 .69.68v.51a16.19 16.19 0 0 1-.66 6A7.08 7.08 0 0 1 11.58 13a9.36 9.36 0 0 1-3.48 2h-.17a9.53 9.53 0 0 1-3.52-2 7 7 0 0 1-1.73-2.64A16.08 16.08 0 0 1 2 4.38v-.53a.71.71 0 0 1 .69-.68A7.79 7.79 0 0 0 8 1V0zm0 0a1.05 1.05 0 0 0-.71.27 6.79 6.79 0 0 1-4.61 1.9A1.71 1.71 0 0 0 1 3.83v.5a16.9 16.9 0 0 0 .72 6.33 8.1 8.1 0 0 0 2 3 10.51 10.51 0 0 0 3.89 2.24h.16L8 16h.38a10.61 10.61 0 0 0 3.88-2.24 8 8 0 0 0 2-3A16.93 16.93 0 0 0 15 4.34v-.5a1.71 1.71 0 0 0-1.64-1.66A6.79 6.79 0 0 1 8.73.28 1 1 0 0 0 8 0z' />
</g>
</svg>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import React from 'react';

const IconVerification = ({ className }) => (
<svg className={classNames('inline-icon', className)} width='16' height='16' viewBox='0 0 16 16'>
<g fill="none" fillRule="evenodd">
<path d="M0 .001h16v16H0z"/>
<path fill="#333" d="M8 0v1a7.79 7.79 0 0 0 5.23 2.16.71.71 0 0 1 .69.68v.51a16.19 16.19 0 0 1-.66 6A7.08 7.08 0 0 1 11.58 13a9.36 9.36 0 0 1-3.48 2h-.17a9.53 9.53 0 0 1-3.52-2 7 7 0 0 1-1.73-2.64A16.08 16.08 0 0 1 2 4.38v-.53a.71.71 0 0 1 .69-.68A7.79 7.79 0 0 0 8 1V0zm0 0a1.05 1.05 0 0 0-.71.27 6.79 6.79 0 0 1-4.61 1.9A1.71 1.71 0 0 0 1 3.83v.5a16.9 16.9 0 0 0 .72 6.33 8.1 8.1 0 0 0 2 3 10.51 10.51 0 0 0 3.89 2.24h.16L8 16h.38a10.61 10.61 0 0 0 3.88-2.24 8 8 0 0 0 2-3A16.93 16.93 0 0 0 15 4.34v-.5a1.71 1.71 0 0 0-1.64-1.66A6.79 6.79 0 0 1 8.73.28 1 1 0 0 0 8 0z"/>
<path fill="#333" d="M5.854 7.857a.5.5 0 0 0-.708.707l2 2a.5.5 0 0 0 .754-.053l3-4a.5.5 0 0 0-.8-.6L7.446 9.449 5.854 7.857z"/>
<g fill='none' fillRule='evenodd'>
<path d='M0 .001h16v16H0z' />
<path fill='#333' d='M8 0v1a7.79 7.79 0 0 0 5.23 2.16.71.71 0 0 1 .69.68v.51a16.19 16.19 0 0 1-.66 6A7.08 7.08 0 0 1 11.58 13a9.36 9.36 0 0 1-3.48 2h-.17a9.53 9.53 0 0 1-3.52-2 7 7 0 0 1-1.73-2.64A16.08 16.08 0 0 1 2 4.38v-.53a.71.71 0 0 1 .69-.68A7.79 7.79 0 0 0 8 1V0zm0 0a1.05 1.05 0 0 0-.71.27 6.79 6.79 0 0 1-4.61 1.9A1.71 1.71 0 0 0 1 3.83v.5a16.9 16.9 0 0 0 .72 6.33 8.1 8.1 0 0 0 2 3 10.51 10.51 0 0 0 3.89 2.24h.16L8 16h.38a10.61 10.61 0 0 0 3.88-2.24 8 8 0 0 0 2-3A16.93 16.93 0 0 0 15 4.34v-.5a1.71 1.71 0 0 0-1.64-1.66A6.79 6.79 0 0 1 8.73.28 1 1 0 0 0 8 0z' />
<path fill='#333' d='M5.854 7.857a.5.5 0 0 0-.708.707l2 2a.5.5 0 0 0 .754-.053l3-4a.5.5 0 0 0-.8-.6L7.446 9.449 5.854 7.857z' />
</g>
</svg>
);
Expand Down
8 changes: 4 additions & 4 deletions packages/trader/src/Assets/Header/NavBar/icon-user.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import React from 'react';

const IconUser = ({ className }) => (
<svg className={classNames('inline-icon', className)} width='16' height='16' viewBox='0 0 16 16'>
<g fill="none" fillRule="evenodd">
<path d="M0 0h16v16H0z"/>
<path fill="#333" d="M8 1a7 7 0 1 1 0 14A7 7 0 0 1 8 1zm0-1a8 8 0 1 0 0 16A8 8 0 0 0 8 0z"/>
<path fill="#333" d="M8 3a2 2 0 1 1 0 4 2 2 0 0 1 0-4zm0-1a3 3 0 1 0 0 6 3 3 0 0 0 0-6zM5 12.82v-1.64A1.69 1.69 0 0 1 6.682 9.5H9.32A1.69 1.69 0 0 1 11 11.182v1.638a.5.5 0 1 0 1 0v-1.64A2.69 2.69 0 0 0 9.322 8.5H6.68A2.69 2.69 0 0 0 4 11.178v1.642a.5.5 0 1 0 1 0z"/>
<g fill='none' fillRule='evenodd'>
<path d='M0 0h16v16H0z' />
<path fill='#333' d='M8 1a7 7 0 1 1 0 14A7 7 0 0 1 8 1zm0-1a8 8 0 1 0 0 16A8 8 0 0 0 8 0z' />
<path fill='#333' d='M8 3a2 2 0 1 1 0 4 2 2 0 0 1 0-4zm0-1a3 3 0 1 0 0 6 3 3 0 0 0 0-6zM5 12.82v-1.64A1.69 1.69 0 0 1 6.682 9.5H9.32A1.69 1.69 0 0 1 11 11.182v1.638a.5.5 0 1 0 1 0v-1.64A2.69 2.69 0 0 0 9.322 8.5H6.68A2.69 2.69 0 0 0 4 11.178v1.642a.5.5 0 1 0 1 0z' />
</g>
</svg>
);
Expand Down
4 changes: 2 additions & 2 deletions packages/trader/src/Assets/icon.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ class Icon extends React.PureComponent {
/* When adding a new icon, arrange it by following the ascending file system arrangement */
this.icons = {
// AccountManagement
IconVerification : React.lazy(() => import('./AccountManagement/icon-verification')),
IconSecurity : React.lazy(() => import('./AccountManagement/icon-security')),
IconVerification: React.lazy(() => import('./AccountManagement/icon-verification')),
IconSecurity : React.lazy(() => import('./AccountManagement/icon-security')),

// Common
IconArrowBold : React.lazy(() => import('./Common/icon-arrow-bold.jsx')),
Expand Down

0 comments on commit 4aa4634

Please sign in to comment.