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

- Re-shape dashboard icons in 16 and 24 grid.

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-06-01 18:22:29 +02:00
parent 2a466ce2da
commit b0d53e4fad
25 changed files with 311 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
client/src/components/Sidebar/SidebarMenu.js
View File

@@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import {Menu, MenuDivider} from "@blueprintjs/core"; import { Menu, MenuDivider } from '@blueprintjs/core';
import {useHistory, useLocation} from 'react-router-dom'; import { useHistory, useLocation } from 'react-router-dom';
import sidebarMenuList from 'config/sidebarMenu'; import sidebarMenuList from 'config/sidebarMenu';
import Icon from 'components/Icon'; import Icon from 'components/Icon';
import MenuItem from 'components/MenuItem'; import MenuItem from 'components/MenuItem';
@@ -12,38 +12,45 @@ export default function SidebarMenu() {
const menuItemsMapper = (list) => { const menuItemsMapper = (list) => {
return list.map((item, index) => { return list.map((item, index) => {
const children = Array.isArray(item.children) ? menuItemsMapper(item.children) : null; const children = Array.isArray(item.children)
const isActive = (item.href && item.href === location.pathname) || ? menuItemsMapper(item.children)
(item.children && item.children.some((c) => c.href === location.pathname)); : null;
const isActive =
(item.href && item.href === location.pathname) ||
(item.children &&
item.children.some((c) => c.href === location.pathname));
const handleItemClick = () => { const handleItemClick = () => {
if (item.href) { history.push(item.href); } if (item.href) {
history.push(item.href);
}
}; };
return ( return item.spacer ? (
(item.divider) ? <div class="bp3-menu-spacer"></div>
<MenuDivider ) : item.divider ? (
key={index} <MenuDivider key={index} title={item.title} />
title={item.title} /> : ) : (
<MenuItem <MenuItem
key={index} key={index}
active={isActive} active={isActive}
icon={<Icon icon={item.icon} iconSize={item.iconSize} />} icon={<Icon icon={item.icon} iconSize={item.iconSize} />}
text={item.text} text={item.text}
label={item.label} label={item.label}
disabled={item.disabled} disabled={item.disabled}
children={children} children={children}
dropdownType={item.dropdownType || 'collapse'} dropdownType={item.dropdownType || 'collapse'}
caretIconSize={15} caretIconSize={15}
onClick={handleItemClick} onClick={handleItemClick}
callapseActive={!!isActive} callapseActive={!!isActive}
itemClassName={classNames({ itemClassName={classNames({
'is-active': isActive, 'is-active': isActive,
'has-icon': !children && item.icon, 'has-icon': !children && item.icon,
})} /> })}
/>
); );
}); });
}; };
const items = menuItemsMapper(sidebarMenuList); const items = menuItemsMapper(sidebarMenuList);
return (<Menu className="sidebar-menu">{items}</Menu>); return <Menu className="sidebar-menu">{items}</Menu>;
}; }

2
client/src/config/sidebarMenu.js
View File

@@ -35,7 +35,7 @@ export default [
], ],
}, },
{ {
divider: true, spacer: true,
}, },
{ {
icon: 'balance-scale', icon: 'balance-scale',

10
client/src/containers/Accounting/ManualJournalActionsBar.js
View File

@@ -85,7 +85,7 @@ function ManualJournalActionsBar({
> >
<Button <Button
className={classNames(Classes.MINIMAL, 'button--table-views')} className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon='table' />} icon={<Icon icon='table-16' iconSize={16} />}
text={<T id={'table_views'}/>} text={<T id={'table_views'}/>}
rightIcon={'caret-down'} rightIcon={'caret-down'}
/> />
@@ -107,14 +107,14 @@ function ManualJournalActionsBar({
<Button <Button
className={classNames(Classes.MINIMAL, 'button--filter')} className={classNames(Classes.MINIMAL, 'button--filter')}
text='Filter' text='Filter'
icon={<Icon icon='filter' />} icon={<Icon icon='filter-16' iconSize={16} />}
/> />
</Popover> </Popover>
<If condition={hasSelectedRows}> <If condition={hasSelectedRows}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='trash' iconSize={15} />} icon={<Icon icon='trash-16' iconSize={16} />}
text={<T id={'delete'}/>} text={<T id={'delete'}/>}
intent={Intent.DANGER} intent={Intent.DANGER}
onClick={handleBulkDelete} onClick={handleBulkDelete}
@@ -123,12 +123,12 @@ function ManualJournalActionsBar({
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='file-import' />} icon={<Icon icon='file-import-16' iconSize={16} />}
text={<T id={'import'}/>} text={<T id={'import'}/>}
/> />
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='file-export' />} icon={<Icon icon='file-export-16' iconSize={16} />}
text={<T id={'export'}/>} text={<T id={'export'}/>}
/> />
</NavbarGroup> </NavbarGroup>

2
client/src/containers/Accounting/ManualJournalsDataTable.js
View File

@@ -228,7 +228,7 @@ function ManualJournalsDataTable({
content={actionMenuList(cell.row.original)} content={actionMenuList(cell.row.original)}
position={Position.RIGHT_BOTTOM} position={Position.RIGHT_BOTTOM}
> >
<Button icon={<Icon icon="ellipsis-h" />} /> <Button icon={<Icon icon='more-h-16' iconSize={16} />} />
</Popover> </Popover>
), ),
className: 'actions', className: 'actions',

24
client/src/containers/Accounts/AccountsActionsBar.js
View File

@@ -102,7 +102,7 @@ onBulkInactive && onBulkInactive(selectedRows.map(r=>r.id))
> >
<Button <Button
className={classNames(Classes.MINIMAL, 'button--table-views')} className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon='table' />} icon={<Icon icon='table-16' iconSize={16} />}
text={<T id={'table_views'}/>} text={<T id={'table_views'}/>}
rightIcon={'caret-down'} rightIcon={'caret-down'}
/> />
@@ -125,26 +125,25 @@ onBulkInactive && onBulkInactive(selectedRows.map(r=>r.id))
<Button <Button
className={classNames(Classes.MINIMAL, 'button--filter')} className={classNames(Classes.MINIMAL, 'button--filter')}
text={filterCount <= 0 ? <T id={'filter'}/> : `${filterCount} filters applied`} text={filterCount <= 0 ? <T id={'filter'}/> : `${filterCount} filters applied`}
icon={ <Icon icon="filter" /> }/> icon={ <Icon icon="filter-16" iconSize={16} /> }/>
</Popover> </Popover>
<If condition={hasSelectedRows}> <If condition={hasSelectedRows}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='multi-select' iconSize={15} />} icon={<Icon icon='play-16' iconSize={16} />}
text={<T id={'activate'}/>} text={<T id={'activate'}/>}
onClick={handelBulkActivate} onClick={handelBulkActivate}
/> />
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='archive' iconSize={15} />} icon={<Icon icon='pause-16' iconSize={16} />}
text={<T id={'inactivate'}/>} text={<T id={'inactivate'}/>}
onClick={handelBulkInactive} onClick={handelBulkInactive}
/> />
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='trash' iconSize={15} />} icon={<Icon icon='trash-16' iconSize={16} />}
text={<T id={'delete'}/>} text={<T id={'delete'}/>}
intent={Intent.DANGER} intent={Intent.DANGER}
onClick={handleBulkDelete} onClick={handleBulkDelete}
@@ -153,14 +152,19 @@ onBulkInactive && onBulkInactive(selectedRows.map(r=>r.id))
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='file-import' />} icon={<Icon icon='print-16' iconSize={16} />}
text={<T id={'import'}/>} text={<T id={'print'}/>}
/> />
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='file-export' />} icon={<Icon icon='file-export-16' iconSize={16} />}
text={<T id={'export'}/>} text={<T id={'export'}/>}
/> />
<Button
className={Classes.MINIMAL}
icon={<Icon icon='file-import-16' iconSize={16} />}
text={<T id={'import'}/>}
/>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

2
client/src/containers/Accounts/AccountsDataTable.js
View File

@@ -160,7 +160,7 @@ function AccountsDataTable({
<Popover <Popover
content={actionMenuList(cell.row.original)} content={actionMenuList(cell.row.original)}
position={Position.RIGHT_TOP}> position={Position.RIGHT_TOP}>
<Button icon={<Icon icon='ellipsis-h' />} /> <Button icon={<Icon icon='more-h-16' iconSize={16} />} />
</Popover> </Popover>
), ),
className: 'actions', className: 'actions',

33
client/src/containers/ExchangeRates/ExchangeRateActionsBar.js
View File

@@ -1,6 +1,7 @@
import React, { useCallback, useState, useMemo } from 'react'; import React, { useCallback, useState, useMemo } from 'react';
import { import {
NavbarGroup, NavbarGroup,
NavbarDivider,
Button, Button,
Classes, Classes,
Intent, Intent,
@@ -19,8 +20,7 @@ import FilterDropdown from 'components/FilterDropdown';
import withResourceDetail from 'containers/Resources/withResourceDetails'; import withResourceDetail from 'containers/Resources/withResourceDetails';
import { compose } from 'utils'; import { compose } from 'utils';
import { FormattedMessage as T ,useIntl } from 'react-intl'; import { FormattedMessage as T, useIntl } from 'react-intl';
function ExchangeRateActionsBar({ function ExchangeRateActionsBar({
// #withDialog. // #withDialog.
@@ -28,15 +28,15 @@ function ExchangeRateActionsBar({
// #withResourceDetail // #withResourceDetail
resourceFields, resourceFields,
// #ownProps // #ownProps
selectedRows = [], selectedRows = [],
onDeleteExchangeRate, onDeleteExchangeRate,
onFilterChanged, onFilterChanged,
onBulkDelete onBulkDelete,
}) { }) {
const [filterCount, setFilterCount] = useState(0); const [filterCount, setFilterCount] = useState(0);
const {formatMessage} =useIntl() const { formatMessage } = useIntl();
const onClickNewExchangeRate = () => { const onClickNewExchangeRate = () => {
openDialog('exchangeRate-form', {}); openDialog('exchangeRate-form', {});
@@ -62,19 +62,21 @@ const {formatMessage} =useIntl()
selectedRows, selectedRows,
]); ]);
const handelBulkDelete =useCallback(()=>{ const handelBulkDelete = useCallback(() => {
onBulkDelete && onBulkDelete(selectedRows.map(r=>r.id)); onBulkDelete && onBulkDelete(selectedRows.map((r) => r.id));
},[onBulkDelete,selectedRows]) }, [onBulkDelete, selectedRows]);
return ( return (
<DashboardActionsBar> <DashboardActionsBar>
<NavbarGroup> <NavbarGroup>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='plus' />} icon={<Icon icon="plus" />}
text={<T id={'new_exchange_rate'} />} text={<T id={'new_exchange_rate'} />}
onClick={onClickNewExchangeRate} onClick={onClickNewExchangeRate}
/> />
<NavbarDivider />
<Popover <Popover
minimal={true} minimal={true}
content={filterDropdown} content={filterDropdown}
@@ -87,16 +89,17 @@ const {formatMessage} =useIntl()
filterCount <= 0 ? ( filterCount <= 0 ? (
<T id={'filter'} /> <T id={'filter'} />
) : ( ) : (
`${filterCount} ${formatMessage({id:'filters_applied'})}` `${filterCount} ${formatMessage({ id: 'filters_applied' })}`
) )
} }
icon={<Icon icon='filter' />} icon={<Icon icon="filter-16" iconSize={16} />}
/> />
</Popover> </Popover>
{hasSelectedRows && ( {hasSelectedRows && (
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='trash' iconSize={15} />} icon={<Icon icon="trash-16" iconSize={16} />}
text={<T id={'delete'} />} text={<T id={'delete'} />}
intent={Intent.DANGER} intent={Intent.DANGER}
onClick={handelBulkDelete} onClick={handelBulkDelete}
@@ -104,12 +107,12 @@ const {formatMessage} =useIntl()
)} )}
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='file-import' />} icon={<Icon icon="file-import-16" iconSize={16} />}
text={<T id={'import'} />} text={<T id={'import'} />}
/> />
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='file-export' />} icon={<Icon icon="file-export-16" iconSize={16} />}
text={<T id={'export'} />} text={<T id={'export'} />}
/> />
</NavbarGroup> </NavbarGroup>
@@ -128,5 +131,5 @@ export default compose(
withDialog, withDialog,
withResourceDetail(({ resourceFields }) => ({ withResourceDetail(({ resourceFields }) => ({
resourceFields, resourceFields,
})) })),
)(ExchangeRateActionsBar); )(ExchangeRateActionsBar);

2
client/src/containers/ExchangeRates/ExchangeRateTable.js
View File

@@ -83,7 +83,7 @@ function ExchangeRateTable({
content={actionMenuList(cell.row.original)} content={actionMenuList(cell.row.original)}
position={Position.RIGHT_BOTTOM} position={Position.RIGHT_BOTTOM}
> >
<Button icon={<Icon icon='ellipsis-h' />} /> <Button icon={<Icon icon='more-h-16' iconSize={16} />} />
</Popover> </Popover>
), ),
className: 'actions', className: 'actions',

9
client/src/containers/FinancialStatements/BalanceSheet/BalanceSheetActionsBar.js
View File

@@ -39,7 +39,7 @@ function BalanceSheetActionsBar({
<NavbarGroup> <NavbarGroup>
<Button <Button
className={classNames(Classes.MINIMAL, 'button--table-views')} className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon="cog" />} icon={<Icon icon="cog-16" iconSize={16} />}
text={<T id={'customize_report'} />} text={<T id={'customize_report'} />}
/> />
<NavbarDivider /> <NavbarDivider />
@@ -61,7 +61,6 @@ function BalanceSheetActionsBar({
icon={<Icon icon="arrow-to-bottom" />} icon={<Icon icon="arrow-to-bottom" />}
/> />
</If> </If>
<NavbarDivider /> <NavbarDivider />
<Popover <Popover
@@ -72,18 +71,18 @@ function BalanceSheetActionsBar({
<Button <Button
className={classNames(Classes.MINIMAL, 'button--filter')} className={classNames(Classes.MINIMAL, 'button--filter')}
text={<T id={'filter'} />} text={<T id={'filter'} />}
icon={<Icon icon="filter" />} icon={<Icon icon="filter-16" iconSize={16} />}
/> />
</Popover> </Popover>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="file-export" />} icon={<Icon icon='print-16' iconSize={16} />}
text={<T id={'print'} />} text={<T id={'print'} />}
/> />
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="file-export" />} icon={<Icon icon="file-export-16" iconSize={16} />}
text={<T id={'export'} />} text={<T id={'export'} />}
/> />
</NavbarGroup> </NavbarGroup>

6
client/src/containers/FinancialStatements/FinancialStatementDateRange.js
View File

@@ -71,7 +71,6 @@ export default function FinancialStatementDateRange({
<FormGroup <FormGroup
label={intl.formatMessage({'id': 'from_date'})} label={intl.formatMessage({'id': 'from_date'})}
labelInfo={infoIcon} labelInfo={infoIcon}
minimal={true}
fill={true} fill={true}
intent={formik.errors.from_date && Intent.DANGER}> intent={formik.errors.from_date && Intent.DANGER}>
@@ -80,6 +79,7 @@ export default function FinancialStatementDateRange({
value={formik.values.from_date} value={formik.values.from_date}
onChange={handleDateChange('from_date')} onChange={handleDateChange('from_date')}
popoverProps={{ position: Position.BOTTOM }} popoverProps={{ position: Position.BOTTOM }}
minimal={true}
fill={true} /> fill={true} />
</FormGroup> </FormGroup>
</Col> </Col>
@@ -87,8 +87,7 @@ export default function FinancialStatementDateRange({
<Col sm={3}> <Col sm={3}>
<FormGroup <FormGroup
label={intl.formatMessage({'id': 'to_date'})} label={intl.formatMessage({'id': 'to_date'})}
labelInfo={infoIcon} labelInfo={infoIcon}
minimal={true}
fill={true} fill={true}
intent={formik.errors.to_date && Intent.DANGER}> intent={formik.errors.to_date && Intent.DANGER}>
@@ -98,6 +97,7 @@ export default function FinancialStatementDateRange({
onChange={handleDateChange('to_date')} onChange={handleDateChange('to_date')}
popoverProps={{ position: Position.BOTTOM }} popoverProps={{ position: Position.BOTTOM }}
fill={true} fill={true}
minimal={true}
intent={formik.errors.to_date && Intent.DANGER} /> intent={formik.errors.to_date && Intent.DANGER} />
</FormGroup> </FormGroup>
</Col> </Col>

9
client/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerActionsBar.js
View File

@@ -46,7 +46,7 @@ function GeneralLedgerActionsBar({
<NavbarGroup> <NavbarGroup>
<Button <Button
className={classNames(Classes.MINIMAL, 'button--table-views')} className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon='cog' />} icon={<Icon icon='cog-16' iconSize={16} />}
text={<T id={'customize_report'}/>} text={<T id={'customize_report'}/>}
/> />
@@ -69,7 +69,6 @@ function GeneralLedgerActionsBar({
onClick={handleFilterClick} onClick={handleFilterClick}
/> />
</If> </If>
<NavbarDivider /> <NavbarDivider />
<Popover <Popover
@@ -80,17 +79,17 @@ function GeneralLedgerActionsBar({
<Button <Button
className={classNames(Classes.MINIMAL, 'button--filter')} className={classNames(Classes.MINIMAL, 'button--filter')}
text={<T id={'filter'}/>} text={<T id={'filter'}/>}
icon={ <Icon icon="filter" /> } /> icon={<Icon icon="filter-16" iconSize={16} /> } />
</Popover> </Popover>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='file-export' />} icon={<Icon icon='print-16' iconSize={16} />}
text={<T id={'print'}/>} text={<T id={'print'}/>}
/> />
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='file-export' />} icon={<Icon icon='file-export-16' iconSize={16} />}
text={<T id={'export'}/>} text={<T id={'export'}/>}
/> />
</NavbarGroup> </NavbarGroup>

8
client/src/containers/FinancialStatements/Journal/JournalActionsBar.js
View File

@@ -42,7 +42,7 @@ function JournalActionsBar({
<NavbarGroup> <NavbarGroup>
<Button <Button
className={classNames(Classes.MINIMAL, 'button--table-views')} className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon="cog" />} icon={<Icon icon="cog-16" iconSize={16} />}
text={<T id={'customize_report'} />} text={<T id={'customize_report'} />}
/> />
<NavbarDivider /> <NavbarDivider />
@@ -74,18 +74,18 @@ function JournalActionsBar({
<Button <Button
className={classNames(Classes.MINIMAL, 'button--filter')} className={classNames(Classes.MINIMAL, 'button--filter')}
text={<T id={'filter'} />} text={<T id={'filter'} />}
icon={<Icon icon="filter" />} icon={<Icon icon="filter-16" iconSize={16} />}
/> />
</Popover> </Popover>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="file-export" />} icon={<Icon icon='print-16' iconSize={16} />}
text={<T id={'print'} />} text={<T id={'print'} />}
/> />
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="file-export" />} icon={<Icon icon="file-export-16" iconSize={16} />}
text={<T id={'export'} />} text={<T id={'export'} />}
/> />
</NavbarGroup> </NavbarGroup>

6
client/src/containers/FinancialStatements/ProfitLossSheet/ProfitLossActionsBar.js
View File

@@ -29,7 +29,7 @@ function ProfitLossActionsBar({
<NavbarGroup> <NavbarGroup>
<Button <Button
className={classNames(Classes.MINIMAL, 'button--table-views')} className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon="cog" />} icon={<Icon icon="cog-16" iconSize={16} />}
text={<T id={'customize_report'} />} text={<T id={'customize_report'} />}
/> />
<NavbarDivider /> <NavbarDivider />
@@ -56,12 +56,12 @@ function ProfitLossActionsBar({
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="file-export" />} icon={<Icon icon='print-16' iconSize={16} />}
text={<T id={'print'} />} text={<T id={'print'} />}
/> />
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="file-export" />} icon={<Icon icon="file-export-16" iconSize={16} />}
text={<T id={'export'} />} text={<T id={'export'} />}
/> />
</NavbarGroup> </NavbarGroup>

6
client/src/containers/FinancialStatements/TrialBalanceSheet/TrialBalanceActionsBar.js
View File

@@ -31,7 +31,7 @@ function TrialBalanceActionsBar({
<NavbarGroup> <NavbarGroup>
<Button <Button
className={classNames(Classes.MINIMAL, 'button--table-views')} className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon="cog" />} icon={<Icon icon="cog-16" iconSize={16} />}
text={<T id={'customize_report'} />} text={<T id={'customize_report'} />}
/> />
<NavbarDivider /> <NavbarDivider />
@@ -58,12 +58,12 @@ function TrialBalanceActionsBar({
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="file-export" />} icon={<Icon icon='print-16' iconSize={16} />}
text={<T id={'print'} />} text={<T id={'print'} />}
/> />
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="file-export" />} icon={<Icon icon="file-export-16" iconSize={16} />}
text={<T id={'export'} />} text={<T id={'export'} />}
/> />
</NavbarGroup> </NavbarGroup>

44
client/src/containers/Items/ItemCategoriesList.js
View File

@@ -1,4 +1,4 @@
import React, { useEffect, useState, useCallback,useMemo } from 'react'; import React, { useEffect, useState, useCallback, useMemo } from 'react';
import { useParams } from 'react-router-dom'; import { useParams } from 'react-router-dom';
import { useQuery } from 'react-query'; import { useQuery } from 'react-query';
import { Alert, Intent } from '@blueprintjs/core'; import { Alert, Intent } from '@blueprintjs/core';
@@ -14,7 +14,7 @@ import ItemCategoriesDataTable from 'containers/Items/ItemCategoriesTable';
import ItemsCategoryActionsBar from 'containers/Items/ItemsCategoryActionsBar'; import ItemsCategoryActionsBar from 'containers/Items/ItemsCategoryActionsBar';
import withDialog from 'connectors/Dialog.connector'; import withDialog from 'connectors/Dialog.connector';
import withDashboardActions from 'containers/Dashboard/withDashboard'; import withDashboardActions from 'containers/Dashboard/withDashboardActions';
import withItemCategoriesActions from 'containers/Items/withItemCategoriesActions'; import withItemCategoriesActions from 'containers/Items/withItemCategoriesActions';
import { compose } from 'utils'; import { compose } from 'utils';
@@ -45,11 +45,11 @@ const ItemCategoryList = ({
id id
? changePageTitle(formatMessage({ id: 'edit_category_details' })) ? changePageTitle(formatMessage({ id: 'edit_category_details' }))
: changePageTitle(formatMessage({ id: 'category_list' })); : changePageTitle(formatMessage({ id: 'category_list' }));
}, [id,changePageTitle,formatMessage]); }, [id, changePageTitle, formatMessage]);
const fetchCategories = useQuery( const fetchCategories = useQuery(
['items-categories-table', filter], ['items-categories-table', filter],
(key, query) => requestFetchItemCategories(query) (key, query) => requestFetchItemCategories(query),
); );
const handleFilterChanged = useCallback(() => {}, []); const handleFilterChanged = useCallback(() => {}, []);
@@ -59,7 +59,7 @@ const ItemCategoryList = ({
(itemCategories) => { (itemCategories) => {
setSelectedRows(itemCategories); setSelectedRows(itemCategories);
}, },
[setSelectedRows] [setSelectedRows],
); );
// Handle fetch data of accounts datatable. // Handle fetch data of accounts datatable.
@@ -107,7 +107,7 @@ const ItemCategoryList = ({
(itemsCategoriesIds) => { (itemsCategoriesIds) => {
setBulkDelete(itemsCategoriesIds); setBulkDelete(itemsCategoriesIds);
}, },
[setBulkDelete] [setBulkDelete],
); );
// handle confirm itemCategories bulk delete. // handle confirm itemCategories bulk delete.
@@ -125,22 +125,20 @@ const ItemCategoryList = ({
.catch((errors) => { .catch((errors) => {
setBulkDelete(false); setBulkDelete(false);
}); });
}, [requestDeleteBulkItemCategories, bulkDelete,formatMessage]); }, [requestDeleteBulkItemCategories, bulkDelete, formatMessage]);
//Handel cancel itemCategories bulk delete. //Handel cancel itemCategories bulk delete.
const handleCancelBulkDelete =useCallback(()=>{ const handleCancelBulkDelete = useCallback(() => {
setBulkDelete(false) setBulkDelete(false);
},[]) }, []);
// Calculates the data table selected rows count.
const selectedRowsCount = useMemo(() => Object.values(selectedRows).length, [selectedRows]);
// Calculates the data table selected rows count.
const selectedRowsCount = useMemo(() => Object.values(selectedRows).length, [
selectedRows,
]);
return ( return (
<DashboardInsider name={'item-category-list'}> <DashboardInsider name={'item-category-list'}>
<ItemsCategoryActionsBar <ItemsCategoryActionsBar
selectedRows={selectedRows} selectedRows={selectedRows}
onFilterChanged={handleFilterChanged} onFilterChanged={handleFilterChanged}
@@ -153,13 +151,12 @@ const ItemCategoryList = ({
onSelectedRowsChange={handleSelectedRowsChange} onSelectedRowsChange={handleSelectedRowsChange}
onDeleteCategory={handleDeleteCategory} onDeleteCategory={handleDeleteCategory}
loading={tableLoading} loading={tableLoading}
/> />
<Alert <Alert
cancelButtonText={<T id={'cancel'} />} cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'delete'} />} confirmButtonText={<T id={'delete'} />}
icon='trash' icon="trash"
intent={Intent.DANGER} intent={Intent.DANGER}
isOpen={deleteCategory} isOpen={deleteCategory}
onCancel={handleCancelItemDelete} onCancel={handleCancelItemDelete}
@@ -174,8 +171,10 @@ const ItemCategoryList = ({
<Alert <Alert
cancelButtonText={<T id={'cancel'} />} cancelButtonText={<T id={'cancel'} />}
confirmButtonText={`${formatMessage({id:'delete'})} (${selectedRowsCount})`} confirmButtonText={`${formatMessage({
icon='trash' id: 'delete',
})} (${selectedRowsCount})`}
icon="trash"
intent={Intent.DANGER} intent={Intent.DANGER}
isOpen={bulkDelete} isOpen={bulkDelete}
onCancel={handleCancelBulkDelete} onCancel={handleCancelBulkDelete}
@@ -183,11 +182,12 @@ const ItemCategoryList = ({
> >
<p> <p>
<FormattedHTMLMessage <FormattedHTMLMessage
id={'once_delete_these_item_categories_you_will_not_able_restore_them'} id={
'once_delete_these_item_categories_you_will_not_able_restore_them'
}
/> />
</p> </p>
</Alert> </Alert>
</DashboardInsider> </DashboardInsider>
); );
}; };

164
client/src/containers/Items/ItemCategoriesTable.js
View File

@@ -1,11 +1,5 @@
import React, { useCallback, useMemo } from 'react'; import React, { useCallback, useMemo } from 'react';
import { import { Button, Popover, Menu, MenuItem, Position } from '@blueprintjs/core';
Button,
Popover,
Menu,
MenuItem,
Position,
} from '@blueprintjs/core';
import { FormattedMessage as T, useIntl } from 'react-intl'; import { FormattedMessage as T, useIntl } from 'react-intl';
import Icon from 'components/Icon'; import Icon from 'components/Icon';
@@ -15,7 +9,6 @@ import DataTable from 'components/DataTable';
import withItemCategories from './withItemCategories'; import withItemCategories from './withItemCategories';
const ItemsCategoryList = ({ const ItemsCategoryList = ({
// #withItemCategories // #withItemCategories
categoriesList, categoriesList,
@@ -26,78 +19,103 @@ const ItemsCategoryList = ({
onEditCategory, onEditCategory,
onSelectedRowsChange, onSelectedRowsChange,
}) => { }) => {
const {formatMessage} = useIntl(); const { formatMessage } = useIntl();
const handelEditCategory=useCallback((category)=>{onEditCategory(category);},[onEditCategory]) const handelEditCategory = useCallback(
const handleDeleteCategory =useCallback((category)=>{onDeleteCategory(category);},[onDeleteCategory]) (category) => {
const actionMenuList = useCallback((category) => ( onEditCategory(category);
<Menu>
<MenuItem
text={<T id={'edit_category'} />}
onClick={() => handelEditCategory(category)} />
<MenuItem
text={<T id={'delete_category'}/>}
onClick={() => handleDeleteCategory(category)}
/>
</Menu>
), [handelEditCategory,handleDeleteCategory]);
const columns = useMemo(() => [
{
id: 'name',
Header: formatMessage({ id:'category_name' }),
accessor: 'name',
width: 150,
}, },
{ [onEditCategory],
id: 'description', );
Header: formatMessage({ id:'description' }), const handleDeleteCategory = useCallback(
accessor: 'description', (category) => {
className: 'description', onDeleteCategory(category);
width: 150,
}, },
{ [onDeleteCategory],
id: 'count', );
Header: formatMessage({ id:'count' }), const actionMenuList = useCallback(
accessor: (r) => r.count || '', (category) => (
className: 'count', <Menu>
width: 50, <MenuItem
text={<T id={'edit_category'} />}
onClick={() => handelEditCategory(category)}
/>
<MenuItem
text={<T id={'delete_category'} />}
onClick={() => handleDeleteCategory(category)}
/>
</Menu>
),
[handelEditCategory, handleDeleteCategory],
);
const columns = useMemo(
() => [
{
id: 'name',
Header: formatMessage({ id: 'category_name' }),
accessor: 'name',
width: 150,
},
{
id: 'description',
Header: formatMessage({ id: 'description' }),
accessor: 'description',
className: 'description',
width: 150,
},
{
id: 'count',
Header: formatMessage({ id: 'count' }),
accessor: (r) => r.count || '',
className: 'count',
width: 50,
},
{
id: 'actions',
Header: '',
Cell: ({ cell }) => (
<Popover
content={actionMenuList(cell.row.original)}
position={Position.RIGHT_BOTTOM}
>
<Button icon={<Icon icon="more-h-16" iconSize={16} />} />
</Popover>
),
className: 'actions',
width: 50,
disableResizing: false,
},
],
[actionMenuList, formatMessage],
);
const handelFetchData = useCallback(
(...params) => {
onFetchData && onFetchData(...params);
}, },
{ [onFetchData],
id: 'actions', );
Header: '',
Cell: ({ cell }) => ( const handleSelectedRowsChange = useCallback(
<Popover (selectedRows) => {
content={actionMenuList(cell.row.original)} onSelectedRowsChange &&
position={Position.RIGHT_BOTTOM} onSelectedRowsChange(selectedRows.map((s) => s.original));
>
<Button icon={<Icon icon='ellipsis-h' />} />
</Popover>
),
className: 'actions',
width: 50,
disableResizing: false
}, },
], [actionMenuList,formatMessage]); [onSelectedRowsChange],
);
const handelFetchData = useCallback((...params) => {
onFetchData && onFetchData(...params);
}, [onFetchData]);
const handleSelectedRowsChange = useCallback((selectedRows) => {
onSelectedRowsChange && onSelectedRowsChange(selectedRows.map(s => s.original));
}, [onSelectedRowsChange]);
const selectionColumn = useMemo(() => ({
minWidth: 42,
width: 42,
maxWidth: 42,
}), []);
const selectionColumn = useMemo(
() => ({
minWidth: 42,
width: 42,
maxWidth: 42,
}),
[],
);
return ( return (
<LoadingIndicator mount={false} > <LoadingIndicator mount={false}>
<DataTable <DataTable
noInitialFetch={true} noInitialFetch={true}
columns={columns} columns={columns}
@@ -108,7 +126,7 @@ const ItemsCategoryList = ({
expandable={true} expandable={true}
onSelectedRowsChange={handleSelectedRowsChange} onSelectedRowsChange={handleSelectedRowsChange}
treeGraph={true} treeGraph={true}
spinnerProps={{size:30}} spinnerProps={{ size: 30 }}
/> />
</LoadingIndicator> </LoadingIndicator>
); );

46
client/src/containers/Items/ItemsActionsBar.js
View File

@@ -44,7 +44,6 @@ const ItemsActionsBar = ({
<MenuItem href={`${path}/${view.id}/custom_view`} text={view.name} /> <MenuItem href={`${path}/${view.id}/custom_view`} text={view.name} />
)); ));
const onClickNewItem = useCallback(() => { const onClickNewItem = useCallback(() => {
history.push('/items/new'); history.push('/items/new');
}, [history]); }, [history]);
@@ -61,14 +60,13 @@ const ItemsActionsBar = ({
}, },
}); });
const onClickNewCategory = useCallback(() => { // const onClickNewCategory = useCallback(() => {
openDialog('item-form', {}); // openDialog('item-form', {});
}, [openDialog]); // }, [openDialog]);
const handleBulkDelete = useCallback(() => {
onBulkDelete && onBulkDelete(selectedRows.map(r => r.id));
}, [onBulkDelete, selectedRows]);
const handleBulkDelete = useCallback(() => {
onBulkDelete && onBulkDelete(selectedRows.map((r) => r.id));
}, [onBulkDelete, selectedRows]);
return ( return (
<DashboardActionsBar> <DashboardActionsBar>
@@ -81,7 +79,7 @@ const ItemsActionsBar = ({
> >
<Button <Button
className={classNames(Classes.MINIMAL, 'button--table-views')} className={classNames(Classes.MINIMAL, 'button--table-views')}
icon={<Icon icon='table' />} icon={<Icon icon="table-16" iconSize={16} />}
text={<T id={'table_views'} />} text={<T id={'table_views'} />}
rightIcon={'caret-down'} rightIcon={'caret-down'}
/> />
@@ -91,17 +89,11 @@ const ItemsActionsBar = ({
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='plus' />} icon={<Icon icon="plus" />}
text={<T id={'new_item'} />} text={<T id={'new_item'} />}
onClick={onClickNewItem} onClick={onClickNewItem}
/> />
<NavbarDivider />
<Button
className={Classes.MINIMAL}
icon={<Icon icon='plus' />}
text={<T id={'new_category'} />}
onClick={onClickNewCategory}
/>
<Popover <Popover
content={filterDropdown} content={filterDropdown}
@@ -111,21 +103,19 @@ const ItemsActionsBar = ({
<Button <Button
className={classNames(Classes.MINIMAL, 'button--filter')} className={classNames(Classes.MINIMAL, 'button--filter')}
text={ text={
filterCount <= 0 ? ( filterCount <= 0 ?
<T id={'filter'} /> (<T id={'filter'} />) :
) : ( (`${filterCount} ${formatMessage({ id: 'filters_applied' })}`)
`${filterCount} ${formatMessage({ id: 'filters_applied' })}`
)
} }
icon={<Icon icon='filter' />} icon={<Icon icon="filter-16" iconSize={16} />}
/> />
</Popover> </Popover>
<If condition={hasSelectedRows}> <If condition={hasSelectedRows}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='trash' iconSize={15} />} icon={<Icon icon="trash-16" iconSize={16} />}
text={<T id={'delete'}/>} text={<T id={'delete'} />}
intent={Intent.DANGER} intent={Intent.DANGER}
onClick={handleBulkDelete} onClick={handleBulkDelete}
/> />
@@ -133,12 +123,12 @@ const ItemsActionsBar = ({
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='file-import' />} icon={<Icon icon="file-import-16" iconSize={16} />}
text={<T id={'import'} />} text={<T id={'import'} />}
/> />
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon='file-export' />} icon={<Icon icon="file-export-16" iconSize={16} />}
text={<T id={'export'} />} text={<T id={'export'} />}
/> />
</NavbarGroup> </NavbarGroup>
@@ -153,5 +143,5 @@ export default compose(
})), })),
withResourceDetail(({ resourceFields }) => ({ withResourceDetail(({ resourceFields }) => ({
resourceFields, resourceFields,
})) })),
)(ItemsActionsBar); )(ItemsActionsBar);

2
client/src/containers/Items/ItemsCategoryActionsBar.js
View File

@@ -79,7 +79,7 @@ const ItemsCategoryActionsBar = ({
<Button <Button
className={classNames(Classes.MINIMAL, 'button--filter')} className={classNames(Classes.MINIMAL, 'button--filter')}
text={ filterCount <= 0 ? <T id={'filter'}/> : `${filterCount} filters applied`} text={ filterCount <= 0 ? <T id={'filter'}/> : `${filterCount} filters applied`}
icon={<Icon icon='filter' />} icon={<Icon icon='filter-18' iconSize={18} />}
/> />
</Popover> </Popover>

6
client/src/containers/Items/ItemsDataTable.js
View File

@@ -29,9 +29,7 @@ const ItemsDataTable = ({
onFetchData, onFetchData,
onSelectedRowsChange, onSelectedRowsChange,
}) => { }) => {
const { formatMessage } = useIntl();
const {formatMessage} = useIntl();
const [initialMount, setInitialMount] = useState(false); const [initialMount, setInitialMount] = useState(false);
useEffect(() => { useEffect(() => {
@@ -106,7 +104,7 @@ const ItemsDataTable = ({
<Popover <Popover
content={actionMenuList(cell.row.original)} content={actionMenuList(cell.row.original)}
position={Position.RIGHT_BOTTOM}> position={Position.RIGHT_BOTTOM}>
<Button icon={<Icon icon="ellipsis-h" />} /> <Button icon={<Icon icon='more-h-16' iconSize={16} />} />
</Popover> </Popover>
), ),
className: 'actions', className: 'actions',

85
client/src/static/json/icons.js
View File

@@ -35,24 +35,6 @@ export default {
], ],
viewBox: '0 0 384 512', viewBox: '0 0 384 512',
}, },
'file-import': {
path: [
'M497.83 97.98L413.94 14.1c-9-9-21.2-14.1-33.89-14.1H175.99C149.5.1 128 21.6 128 48.09v215.98H12c-6.63 0-12 5.37-12 12v24c0 6.63 5.37 12 12 12h276v48.88c0 10.71 12.97 16.05 20.52 8.45l71.77-72.31c4.95-4.99 4.95-13.04 0-18.03l-71.77-72.31c-7.55-7.6-20.52-2.26-20.52 8.45v48.88H175.99V48.09h159.97v103.98c0 13.3 10.7 23.99 24 23.99H464v287.95H175.99V360.07H128v103.94c0 26.49 21.5 47.99 47.99 47.99h287.94c26.5 0 48.07-21.5 48.07-47.99V131.97c0-12.69-5.17-24.99-14.17-33.99zm-113.88 30.09V51.99l76.09 76.08h-76.09z',
],
viewBox: '0 0 512 512',
},
'file-export': {
path: [
'M572.29 279.06l-71.77-72.31c-7.55-7.6-20.52-2.26-20.52 8.45v48.88h-96v-132.1c0-12.7-5.17-25-14.17-33.99L285.94 14.1c-9-9-21.2-14.1-33.89-14.1H47.99C21.5.1 0 21.6 0 48.09v415.92C0 490.5 21.5 512 47.99 512h287.94c26.5 0 48.07-21.5 48.07-47.99V360.07h-48v103.94H47.99V48.09h159.97v103.98c0 13.3 10.7 23.99 24 23.99H336v88.01H172c-6.63 0-12 5.37-12 12v24c0 6.63 5.37 12 12 12h308v48.88c0 10.71 12.97 16.05 20.52 8.45l71.77-72.31c4.95-4.99 4.95-13.04 0-18.03zM255.95 128.07V51.99l76.09 76.08h-76.09z',
],
viewBox: '0 0 576 512',
},
table: {
path: [
'M464 32H48C21.49 32 0 53.49 0 80v352c0 26.51 21.49 48 48 48h416c26.51 0 48-21.49 48-48V80c0-26.51-21.49-48-48-48zM232 432H54a6 6 0 0 1-6-6V296h184v136zm0-184H48V112h184v136zm226 184H280V296h184v130a6 6 0 0 1-6 6zm6-184H280V112h184v136z',
],
viewBox: '0 0 512 512',
},
'arrow-up': { 'arrow-up': {
path: [ path: [
'M6.101 261.899L25.9 281.698c4.686 4.686 12.284 4.686 16.971 0L198 126.568V468c0 6.627 5.373 12 12 12h28c6.627 0 12-5.373 12-12V126.568l155.13 155.13c4.686 4.686 12.284 4.686 16.971 0l19.799-19.799c4.686-4.686 4.686-12.284 0-16.971L232.485 35.515c-4.686-4.686-12.284-4.686-16.971 0L6.101 244.929c-4.687 4.686-4.687 12.284 0 16.97z', 'M6.101 261.899L25.9 281.698c4.686 4.686 12.284 4.686 16.971 0L198 126.568V468c0 6.627 5.373 12 12 12h28c6.627 0 12-5.373 12-12V126.568l155.13 155.13c4.686 4.686 12.284 4.686 16.971 0l19.799-19.799c4.686-4.686 4.686-12.284 0-16.971L232.485 35.515c-4.686-4.686-12.284-4.686-16.971 0L6.101 244.929c-4.687 4.686-4.687 12.284 0 16.97z',
@@ -95,18 +77,14 @@ export default {
], ],
viewBox: '0 0 320 512', viewBox: '0 0 320 512',
}, },
filter: {
path: [
'M91,32.1H8c-2.5,0-4.6-2.1-4.6-4.6s2.1-4.6,4.6-4.6H91c2.5,0,4.6,2.1,4.6,4.6S93.5,32.1,91,32.1z M21.9,45.9 h55.3c2.5,0,4.6,2.1,4.6,4.6c0,2.5-2.1,4.6-4.6,4.6H21.9c-2.5,0-4.6-2.1-4.6-4.6C17.2,48,19.3,45.9,21.9,45.9z M35.7,68.9h27.6 c2.5,0,4.6,2.1,4.6,4.6s-2.1,4.6-4.6,4.6H35.7c-2.5,0-4.6-2.1-4.6-4.6S33.1,68.9,35.7,68.9z',
],
viewBox: '0 0 91 91',
},
receipt: { receipt: {
path: [ path: [
'M344 288H104c-4.4 0-8 3.6-8 8v32c0 4.4 3.6 8 8 8h240c4.4 0 8-3.6 8-8v-32c0-4.4-3.6-8-8-8zM400.8 5.7L357.3 37 318.7 9.2c-16.8-12.1-39.2-12.1-56.1 0L224 37 185.4 9.2a47.888 47.888 0 0 0-56.1 0L90.7 37 47.2 5.7C27.4-8.5 0 5.6 0 29.9v452.3c0 23.8 27.1 38.6 47.2 24.2L90.7 475l38.6 27.8c16.8 12.1 39.2 12.1 56.1 0L224 475l38.6 27.8c16.8 12.1 39.3 12.1 56.1 0l38.6-27.8 43.5 31.3c19.8 14.2 47.2.1 47.2-24.1V29.9C448 6 420.9-8.7 400.8 5.7zm-.8 440.8l-42.7-30.7-66.7 48-66.7-48-66.7 48-66.7-48L48 446.5v-381l42.7 30.7 66.7-48 66.7 48 66.7-48 66.7 48L400 65.5v381zM344 176H104c-4.4 0-8 3.6-8 8v32c0 4.4 3.6 8 8 8h240c4.4 0 8-3.6 8-8v-32c0-4.4-3.6-8-8-8zz', 'M344 288H104c-4.4 0-8 3.6-8 8v32c0 4.4 3.6 8 8 8h240c4.4 0 8-3.6 8-8v-32c0-4.4-3.6-8-8-8zM400.8 5.7L357.3 37 318.7 9.2c-16.8-12.1-39.2-12.1-56.1 0L224 37 185.4 9.2a47.888 47.888 0 0 0-56.1 0L90.7 37 47.2 5.7C27.4-8.5 0 5.6 0 29.9v452.3c0 23.8 27.1 38.6 47.2 24.2L90.7 475l38.6 27.8c16.8 12.1 39.2 12.1 56.1 0L224 475l38.6 27.8c16.8 12.1 39.3 12.1 56.1 0l38.6-27.8 43.5 31.3c19.8 14.2 47.2.1 47.2-24.1V29.9C448 6 420.9-8.7 400.8 5.7zm-.8 440.8l-42.7-30.7-66.7 48-66.7-48-66.7 48-66.7-48L48 446.5v-381l42.7 30.7 66.7-48 66.7 48 66.7-48 66.7 48L400 65.5v381zM344 176H104c-4.4 0-8 3.6-8 8v32c0 4.4 3.6 8 8 8h240c4.4 0 8-3.6 8-8v-32c0-4.4-3.6-8-8-8zz',
], ],
viewBox: '0 0 448 512', viewBox: '0 0 448 512',
}, },
trash: { trash: {
path: [ path: [
'M432 80h-82.4l-34-56.7A48 48 0 0 0 274.4 0H173.6a48 48 0 0 0-41.2 23.3L98.4 80H16A16 16 0 0 0 0 96v16a16 16 0 0 0 16 16h16l21.2 339a48 48 0 0 0 47.9 45h245.8a48 48 0 0 0 47.9-45L416 128h16a16 16 0 0 0 16-16V96a16 16 0 0 0-16-16zM173.6 48h100.8l19.2 32H154.4zm173.3 416H101.11l-21-336h287.8z', 'M432 80h-82.4l-34-56.7A48 48 0 0 0 274.4 0H173.6a48 48 0 0 0-41.2 23.3L98.4 80H16A16 16 0 0 0 0 96v16a16 16 0 0 0 16 16h16l21.2 339a48 48 0 0 0 47.9 45h245.8a48 48 0 0 0 47.9-45L416 128h16a16 16 0 0 0 16-16V96a16 16 0 0 0-16-16zM173.6 48h100.8l19.2 32H154.4zm173.3 416H101.11l-21-336h287.8z',
@@ -143,11 +121,11 @@ export default {
], ],
viewBox: '0 0 512 512', viewBox: '0 0 512 512',
}, },
cog: { 'cog-16': {
path: [ path: [
'M452.515 237l31.843-18.382c9.426-5.441 13.996-16.542 11.177-27.054-11.404-42.531-33.842-80.547-64.058-110.797-7.68-7.688-19.575-9.246-28.985-3.811l-31.785 18.358a196.276 196.276 0 0 0-32.899-19.02V39.541a24.016 24.016 0 0 0-17.842-23.206c-41.761-11.107-86.117-11.121-127.93-.001-10.519 2.798-17.844 12.321-17.844 23.206v36.753a196.276 196.276 0 0 0-32.899 19.02l-31.785-18.358c-9.41-5.435-21.305-3.877-28.985 3.811-30.216 30.25-52.654 68.265-64.058 110.797-2.819 10.512 1.751 21.613 11.177 27.054L59.485 237a197.715 197.715 0 0 0 0 37.999l-31.843 18.382c-9.426 5.441-13.996 16.542-11.177 27.054 11.404 42.531 33.842 80.547 64.058 110.797 7.68 7.688 19.575 9.246 28.985 3.811l31.785-18.358a196.202 196.202 0 0 0 32.899 19.019v36.753a24.016 24.016 0 0 0 17.842 23.206c41.761 11.107 86.117 11.122 127.93.001 10.519-2.798 17.844-12.321 17.844-23.206v-36.753a196.34 196.34 0 0 0 32.899-19.019l31.785 18.358c9.41 5.435 21.305 3.877 28.985-3.811 30.216-30.25 52.654-68.266 64.058-110.797 2.819-10.512-1.751-21.613-11.177-27.054L452.515 275c1.22-12.65 1.22-25.35 0-38zm-52.679 63.019l43.819 25.289a200.138 200.138 0 0 1-33.849 58.528l-43.829-25.309c-31.984 27.397-36.659 30.077-76.168 44.029v50.599a200.917 200.917 0 0 1-67.618 0v-50.599c-39.504-13.95-44.196-16.642-76.168-44.029l-43.829 25.309a200.15 200.15 0 0 1-33.849-58.528l43.819-25.289c-7.63-41.299-7.634-46.719 0-88.038l-43.819-25.289c7.85-21.229 19.31-41.049 33.849-58.529l43.829 25.309c31.984-27.397 36.66-30.078 76.168-44.029V58.845a200.917 200.917 0 0 1 67.618 0v50.599c39.504 13.95 44.196 16.642 76.168 44.029l43.829-25.309a200.143 200.143 0 0 1 33.849 58.529l-43.819 25.289c7.631 41.3 7.634 46.718 0 88.037zM256 160c-52.935 0-96 43.065-96 96s43.065 96 96 96 96-43.065 96-96-43.065-96-96-96zm0 144c-26.468 0-48-21.532-48-48 0-26.467 21.532-48 48-48s48 21.533 48 48c0 26.468-21.532 48-48 48', 'M15.19,6.39h-1.85c-0.11-0.37-0.27-0.71-0.45-1.04l1.36-1.36c0.31-0.31,0.31-0.82,0-1.13l-1.13-1.13c-0.31-0.31-0.82-0.31-1.13,0l-1.36,1.36C10.3,2.92,9.96,2.76,9.59,2.65V0.79c0-0.44-0.36-0.8-0.8-0.8h-1.6c-0.44,0-0.8,0.36-0.8,0.8v1.86c-0.39,0.12-0.75,0.28-1.1,0.47l-1.3-1.3c-0.3-0.3-0.79-0.3-1.09,0L1.82,2.91c-0.3,0.3-0.3,0.79,0,1.09l1.3,1.3C2.92,5.64,2.76,6,2.64,6.39H0.79c-0.44,0-0.8,0.36-0.8,0.8v1.6c0,0.44,0.36,0.8,0.8,0.8h1.85c0.11,0.37,0.27,0.71,0.45,1.04l-1.36,1.36c-0.31,0.31-0.31,0.82,0,1.13l1.13,1.13c0.31,0.31,0.82,0.31,1.13,0l1.36-1.36c0.33,0.18,0.67,0.33,1.04,0.44v1.86c0,0.44,0.36,0.8,0.8,0.8h1.6c0.44,0,0.8-0.36,0.8-0.8v-1.86c0.39-0.12,0.75-0.28,1.1-0.47l1.3,1.3c0.3,0.3,0.79,0.3,1.09,0l1.09-1.09c0.3-0.3,0.3-0.79,0-1.09l-1.3-1.3c0.19-0.35,0.36-0.71,0.48-1.1h1.85c0.44,0,0.8-0.36,0.8-0.8v-1.6C15.99,6.75,15.63,6.39,15.19,6.39z M7.99,10.99c-1.66,0-3-1.34-3-3s1.34-3,3-3s3,1.34,3,3S9.65,10.99,7.99,10.99z',
], ],
viewBox: '0 0 512 512', viewBox: '0 0 16 16',
}, },
'times-circle': { 'times-circle': {
path: [ path: [
@@ -209,4 +187,57 @@ export default {
], ],
viewBox: '0 0 384 512', viewBox: '0 0 384 512',
}, },
// 16
'file-import-16': {
path: [
'M6,10.41l-3.29,3.3A1.0041,1.0041,0,0,1,1,13a.9655.9655,0,0,1,.3-.71L4.59,9H3A1,1,0,0,1,3,7H7A1.0029,1.0029,0,0,1,8,8v4a1,1,0,0,1-2,0ZM9.8818,0,5.9947-.0147A2.9947,2.9947,0,0,0,3,2.98V4.9929H5V1.9975H9V5.99h4V14H5.0183L4.011,15.0072l-.1248.1249a2.955,2.955,0,0,0,2.1085.8825h6.0106A2.9946,2.9946,0,0,0,15,13.02V5.1182L12.4409,2.5591Z',
],
viewBox: '0 0 16 16',
},
'file-export-16': {
path: [
'M3,9.5852l3.29-3.294A1.0045,1.0045,0,0,1,8,7a.9627.9627,0,0,1-.3.7087l-3.29,3.284H6A.9982.9982,0,1,1,6,12.989H2a1.002,1.002,0,0,1-1-.9982V7.9981a1,1,0,0,1,2,0ZM9.8818.0146,5.9947,0A2.992,2.992,0,0,0,3,2.9892V4.9984H5v-2.99H9V5.9937h4V13.989H5.0183L4.011,14.9944l-.1248.1246A2.9574,2.9574,0,0,0,5.9947,16h6.0106A2.992,2.992,0,0,0,15,13.0108V5.1234L12.4409,2.569Z',
],
viewBox: '0 0 16 16',
},
'trash-16': {
path: [
'M2.9,14.2149A1.7915,1.7915,0,0,0,4.6,16h6.8a1.7915,1.7915,0,0,0,1.7-1.7851V4H2.9Z',
'M14,1.0645H11L10.1,0H5.9L5,1.0645H2V3H14Z',
],
viewBox: '0 0 16 16',
},
'pause-16': {
path: ['M3,13H6V3H3ZM10,3V13h3V3Z'],
viewBox: '0 0 16 16',
},
'filter-16': {
path: ['M6,13h4V11H6ZM0,3V5H16V3ZM3,9H13V7H3Z'],
viewBox: '0 0 16 16',
},
'print-16': {
path: [
'M16,5.12v6H13v4H3v-4H0v-6Zm-4-4H4v3h8Zm-1,8H5v4h6Zm2.54-3a.7109.7109,0,1,0,.021-.0546c-.0207.0108-.0411.0224-.061.0346',
],
viewBox: '0 0 16 16',
},
'play-16': {
path: [
'M12,8c0-0.35-0.19-0.64-0.46-0.82l0.01-0.02l-6-4L5.54,3.18C5.39,3.08,5.21,3,5,3C4.45,3,4,3.45,4,4v8c0,0.55,0.45,1,1,1c0.21,0,0.39-0.08,0.54-0.18l0.01,0.02l6-4l-0.01-0.02C11.81,8.64,12,8.35,12,8z',
],
viewBox: '0 0 16 16',
},
'more-h-16': {
path: [
'M2.5,6A1.5,1.5,0,1,0,4,7.5,1.5044,1.5044,0,0,0,2.5,6Zm11,0A1.5,1.5,0,1,0,15,7.5,1.5044,1.5044,0,0,0,13.5,6ZM8,6A1.5,1.5,0,1,0,9.5,7.5,1.5044,1.5044,0,0,0,8,6Z',
],
viewBox: '0 0 16 16',
},
'table-16': {
path: [
'M0 1.994C0 .893.895 0 1.994 0h12.012C15.107 0 16 .895 16 1.994v12.012A1.995 1.995 0 0 1 14.006 16H1.994A1.995 1.995 0 0 1 0 14.006V1.994zM2 7v1.002C2 8.557 2.452 9 3.01 9h1.98A.999.999 0 0 0 6 8.001V6.999C6 6.443 5.548 6 4.99 6H3.01A.999.999 0 0 0 2 6.999zm5 0v1.002C7 8.557 7.449 9 8.003 9h4.994A.994.994 0 0 0 14 8.001V6.999A.998.998 0 0 0 12.997 6H8.003A.994.994 0 0 0 7 6.999zM2 3c0 .556.452 1 1.01 1h1.98a1 1 0 1 0 0-2H3.01A1 1 0 0 0 2 3zm5 0c0 .556.449 1 1.003 1h4.994A.994.994 0 0 0 14 3c0-.556-.449-1-1.003-1H8.003A.994.994 0 0 0 7 3zm-5 8.999v1.002c0 .556.452.999 1.01.999h1.98A.999.999 0 0 0 6 13.001v-1.002C6 11.443 5.548 11 4.99 11H3.01a.999.999 0 0 0-1.01.999zm5 0v1.002c0 .556.449.999 1.003.999h4.994A.994.994 0 0 0 14 13.001v-1.002A.998.998 0 0 0 12.997 11H8.003A.994.994 0 0 0 7 11.999z',
],
viewBox: '0 0 16 16',
},
}; };

4
client/src/style/components/data-table.scss
View File

@@ -134,6 +134,10 @@
&:focus{ &:focus{
background-color: #CFDCEE; background-color: #CFDCEE;
} }
.bp3-icon-more-h-16{
margin-top: 2px;
}
} }
.tr.no-results{ .tr.no-results{
.td{ .td{

2
client/src/style/pages/accounts-chart.scss
View File

@@ -23,7 +23,7 @@
} }
} }
.code{ .code{
color: #666; color: #333;
} }
.normal{ .normal{
.bp3-popover-wrapper{ .bp3-popover-wrapper{

4
client/src/style/pages/dashboard.scss
View File

@@ -104,6 +104,8 @@
.#{$ns}-navbar{ .#{$ns}-navbar{
box-shadow: none; box-shadow: none;
padding-left: 12px;
padding-right: 12px;
&, &,
&-group{ &-group{
@@ -163,7 +165,7 @@
h1{ h1{
font-size: 26px; font-size: 26px;
font-weight: 200; font-weight: 300;
color: #4d4c4c; color: #4d4c4c;
margin: 0; margin: 0;
} }

4
client/src/style/pages/financial-statements.scss
View File

@@ -62,9 +62,9 @@
&__title{ &__title{
margin: 0; margin: 0;
font-weight: 200; font-weight: 300;
font-size: 22px; font-size: 22px;
color: #222; color: #333;
text-align: center; text-align: center;
} }
&__sheet-type{ &__sheet-type{

16
client/src/style/views/Sidebar.scss
View File

@@ -1,8 +1,7 @@
$sidebar-background: #01194e; $sidebar-background: #01194e;
$sidebar-text-color: #fff; $sidebar-text-color: #fff;
$sidebar-width: 220px; $sidebar-width: 220px;
$sidebar-menu-item-color: #b8c0d5; $sidebar-menu-item-color: #cbd1dd;
$sidebar-popover-submenu-bg: rgb(1, 20, 62); $sidebar-popover-submenu-bg: rgb(1, 20, 62);
.sidebar { .sidebar {
@@ -41,7 +40,7 @@ $sidebar-popover-submenu-bg: rgb(1, 20, 62);
margin-top: 4px; margin-top: 4px;
svg{ svg{
opacity: 0.4; opacity: 0.45;
} }
} }
} }
@@ -67,7 +66,7 @@ $sidebar-popover-submenu-bg: rgb(1, 20, 62);
&:hover, &:hover,
&.bp3-active { &.bp3-active {
background: #012470; background: #012470;
color: #c1c9dd; color: $sidebar-menu-item-color;
} }
&:focus, &:focus,
&:active { &:active {
@@ -76,7 +75,7 @@ $sidebar-popover-submenu-bg: rgb(1, 20, 62);
> .#{$ns}-icon { > .#{$ns}-icon {
color: #767b9b; color: #767b9b;
margin-right: 14px; margin-right: 16px;
margin-top: 0; margin-top: 0;
} }
> .#{$ns}-icon-caret-right { > .#{$ns}-icon-caret-right {
@@ -120,10 +119,15 @@ $sidebar-popover-submenu-bg: rgb(1, 20, 62);
color: $sidebar-menu-item-color; color: $sidebar-menu-item-color;
} }
.#{$ns}-menu-divider { .#{$ns}-menu-divider {
border-top-color: #1d366a; border-top-color: #152a55;
color: #6b708c; color: #6b708c;
margin: 4px 0; margin: 4px 0;
} }
.#{$ns}-menu-spacer{
margin: 4px 0;
height: 1px;
}
} }
&--mini-sidebar{ &--mini-sidebar{