Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added assets/.gitkeep
Empty file.
Binary file added assets/01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/05.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/06.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/07.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/08.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/09.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/headshot-male.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file added assets/index.js
Empty file.
2 changes: 1 addition & 1 deletion src/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $fd-fonts-path: '../node_modules/fiori-fundamentals/dist/fonts/';
}

.fd-popover {
margin-right: 60px;
// margin-right: 60px;
}

.fd-button--grouped {
Expand Down
2 changes: 1 addition & 1 deletion src/Button/Button.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const Button = props => {
};

Button.propTypes = {
option: PropTypes.oneOf(['', 'emphasized' , 'light']),
option: PropTypes.oneOf(['', 'emphasized' , 'light', 'shell']),
type: PropTypes.oneOf(['', 'standard' , 'positive', 'negative', 'medium']),
compact: PropTypes.bool,
glyph: PropTypes.string,
Expand Down
98 changes: 44 additions & 54 deletions src/Menu/Menu.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,79 +4,69 @@ import { Link } from 'react-router-dom';

// ------------------------------------------- Menu ------------------------------------------
export const Menu = props => {
const { id, addonBefore, children } = props;
return (
<nav
className={`fd-menu${addonBefore ? ' fd-menu--addon-before' : ''}`}
id={id}
>
{children}
</nav>
);
const { id, addonBefore, children } = props;
return (
<nav className={`fd-menu${addonBefore ? ' fd-menu--addon-before' : ''}`} id={id}>
{children}
</nav>
);
};

Menu.propTypes = {
id: PropTypes.string,
addonBefore: PropTypes.bool
id: PropTypes.string,
addonBefore: PropTypes.bool
};

// ---------------------------------------- Menu List ----------------------------------------
export const MenuList = props => {
const { children } = props;
return <ul className="fd-menu__list">{children}</ul>;
const { children } = props;
return <ul className="fd-menu__list">{children}</ul>;
};

// ---------------------------------------- Menu Item ----------------------------------------
export const MenuItem = props => {
const { url, link, isLink, separator, addon, children } = props;
return (
<React.Fragment>
<li>
{addon ? (
<div className="fd-menu__addon-before">
{<span className={'sap-icon--' + addon} />}
</div>
) : null}
{link ? (
<Link
to={link}
className={`fd-menu__item${isLink ? ' fd-menu__link' : ''}`}
>
{children}
</Link>
) : null}
{url ? (
<a
href={url}
className={`fd-menu__item${isLink ? ' fd-menu__link' : ''}`}
>
{children}
</a>
) : null}
</li>
{separator ? <hr /> : null}
</React.Fragment>
);
const { url, link, isLink, separator, addon, children, onclick } = props;
return (
<React.Fragment>
<li>
{addon ? (
<div className="fd-menu__addon-before">{<span className={'sap-icon--' + addon} />}</div>
) : null}
{link ? (
<Link to={link} className={`fd-menu__item${isLink ? ' fd-menu__link' : ''}`}>
{children}
</Link>
) : null}
{url ? (
<a href={url} className={`fd-menu__item${isLink ? ' fd-menu__link' : ''}`}>
{children}
</a>
) : null}
{!url && !link ? <a className="fd-menu__item" onClick={onclick}>{children}</a> : null}
</li>
{separator ? <hr /> : null}
</React.Fragment>
);
};

MenuItem.propTypes = {
url: PropTypes.string,
separator: PropTypes.bool,
addon: PropTypes.string,
isLink: PropTypes.bool
url: PropTypes.string,
separator: PropTypes.bool,
addon: PropTypes.string,
isLink: PropTypes.bool
};

// ---------------------------------------- Menu Group ----------------------------------------
export const MenuGroup = props => {
const { title, children } = props;
return (
<div className="fd-menu__group">
<h1 className="fd-menu__title">{title}</h1>
{children}
</div>
);
const { title, children } = props;
return (
<div className="fd-menu__group">
<h1 className="fd-menu__title">{title}</h1>
{children}
</div>
);
};

MenuGroup.propTypes = {
title: PropTypes.string
title: PropTypes.string
};
6 changes: 6 additions & 0 deletions src/Routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ import { ToggleComponent } from './Toggle/Toggle.Component';
import { TreeComponent } from './Tree/Tree.Component';
import { TimeComponent } from './Time/Time.Component';
import { TimePickerComponent } from './TimePicker/TimePicker.Component';
import { ShellbarComponent } from './Shellbar/Shellbar.Component';

export default class Routes extends Component {
constructor(props) {
Expand Down Expand Up @@ -131,6 +132,11 @@ export default class Routes extends Component {
name: 'Search Input',
component: SearchInputComponent
},
{
url: '/shellbar',
name: 'Shellbar',
component: ShellbarComponent
},
{
url: '/sideNavigation',
name: 'Side Navigation',
Expand Down
Loading