QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-18 05:40: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

22
client/src/components/Dashboard/DashboardActionsBar.js
View File

@@ -1,18 +1,16 @@
import React from 'react';
import classnames from 'classnames';
import { Navbar } from "@blueprintjs/core";
import { Navbar } from '@blueprintjs/core';
export default function DashboardActionsBar({
children, name
}) {
export default function DashboardActionsBar({ children, name }) {
return (
<div className={classnames({
'dashboard__actions-bar': true,
[`dashboard__actions-bar--${name}`]: !!name,
})}>
<Navbar className="navbar--dashboard-actions-bar">
{ children }
</Navbar>
<div
className={classnames({
'dashboard__actions-bar': true,
[`dashboard__actions-bar--${name}`]: !!name
})}
>
<Navbar className='navbar--dashboard-actions-bar'>{children}</Navbar>
</div>
);
}
}

31
client/src/components/Dashboard/DashboardBreadcrumbs.js
View File

@@ -3,17 +3,22 @@ import {
CollapsibleList,
MenuItem,
Classes,
Boundary,
} from "@blueprintjs/core";
import classNames from "classnames";
Boundary
} from '@blueprintjs/core';
import classNames from 'classnames';
export default function DashboardBreadcrumbs() {
function renderBreadcrumb(props) {
if (props.href != null) {
return <a className={Classes.BREADCRUMB}>{props.text}</a>;
} else {
return <span className={classNames(Classes.BREADCRUMB, Classes.BREADCRUMB_CURRENT)}>{props.text}</span>;
return (
<span
className={classNames(Classes.BREADCRUMB, Classes.BREADCRUMB_CURRENT)}
>
{props.text}
</span>
);
}
}
return (
@@ -24,12 +29,12 @@ export default function DashboardBreadcrumbs() {
collapseFrom={Boundary.START}
visibleItemCount={0}
>
<MenuItem icon="folder-close" text="All files" href="#" />
<MenuItem icon="folder-close" text="Users" href="#" />
<MenuItem icon="folder-close" text="Jane Person" href="#" />
<MenuItem icon="folder-close" text="My documents" href="#" />
<MenuItem icon="folder-close" text="Classy dayjob" href="#" />
<MenuItem icon="document" text="How to crush it" />
</CollapsibleList>
<MenuItem icon='folder-close' text='All files' href='#' />
<MenuItem icon='folder-close' text='Users' href='#' />
<MenuItem icon='folder-close' text='Jane Person' href='#' />
<MenuItem icon='folder-close' text='My documents' href='#' />
<MenuItem icon='folder-close' text='Classy dayjob' href='#' />
<MenuItem icon='document' text='How to crush it' />
</CollapsibleList>
);
}
}