QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-19 22:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix Merge conflict.

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-03-26 14:02:52 +02:00
parent ae29d20cc9
commit 6fd1afaba7
25 changed files with 923 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
client/src/components/Accounts/AccountsViewsTabs.js
View File

@@ -1,6 +1,6 @@
import React from 'react';
import {useHistory} from 'react-router';
import {connect} from 'react-redux';
import { useHistory } from 'react-router';
import { connect } from 'react-redux';
import {
Alignment,
Navbar,
@@ -8,11 +8,11 @@ import {
Tabs,
Tab,
Button
} from "@blueprintjs/core";
import {useParams} from 'react-router-dom';
} from '@blueprintjs/core';
import { useParams } from 'react-router-dom';
import Icon from 'components/Icon';
import {Link} from 'react-router-dom';
import {compose} from 'utils';
import { Link } from 'react-router-dom';
import { compose } from 'utils';
import AccountsConnect from 'connectors/Accounts.connector';
function AccountsViewsTabs({ views }) {
@@ -22,33 +22,34 @@ function AccountsViewsTabs({ views }) {
const handleClickNewView = () => {
history.push('/dashboard/custom_views/accounts/new');
};
const tabs = views.map((view) => {
const tabs = views.map(view => {
const baseUrl = '/dashboard/accounts';
const link = (<Link to={`${baseUrl}/${view.id}/custom_view`}>{ view.name }</Link>);
return (<Tab id={`custom_view_${view.id}`} title={link} />);
const link = (
<Link to={`${baseUrl}/${view.id}/custom_view`}>{view.name}</Link>
);
return <Tab id={`custom_view_${view.id}`} title={link} />;
});
return (
<Navbar className="navbar--dashboard-views">
<NavbarGroup
align={Alignment.LEFT}>
<Navbar className='navbar--dashboard-views'>
<NavbarGroup align={Alignment.LEFT}>
<Tabs
id="navbar"
id='navbar'
large={true}
selectedTabId={`custom_view_${customViewId}`}
className="tabs--dashboard-views">
<Tab
id="all"
title={<Link to={`/dashboard/accounts`}>All</Link>} />
className='tabs--dashboard-views'
>
<Tab id='all' title={<Link to={`/dashboard/accounts`}>All</Link>} />
{ tabs }
{tabs}
<Button
className="button--new-view"
icon={<Icon icon="plus" />}
onClick={handleClickNewView} />
className='button--new-view'
icon={<Icon icon='plus' />}
onClick={handleClickNewView}
/>
</Tabs>
</NavbarGroup>
</Navbar>
);
}
export default compose(AccountsConnect)(AccountsViewsTabs);
export default compose(AccountsConnect)(AccountsViewsTabs);