Skip to content

Commit

Permalink
Merge 25634b4 into 00d5fd7
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffredodd authored Jan 16, 2019
2 parents 00d5fd7 + 25634b4 commit e2dc113
Show file tree
Hide file tree
Showing 55 changed files with 185 additions and 312 deletions.
2 changes: 1 addition & 1 deletion config/paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ module.exports = {
appBuild: resolveApp('build'),
appPublic: resolveApp('public'),
appHtml: resolveApp('public/index.html'),
appIndexJs: resolveModule(resolveApp, 'src/index'),
appIndexJs: resolveModule(resolveApp, 'src/_playground/index'),
appPackageJson: resolveApp('package.json'),
appSrc: resolveApp('src'),
appTsConfig: resolveApp('tsconfig.json'),
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"build-js": "node scripts/build.js",
"build:lint:fix": "eslint --fix 'src/**' --ext .js,.jsx --env browser,node",
"build:lint": "eslint 'src/**' --ext .js,.jsx --env browser,node",
"build": "rm -rf dist && NODE_ENV=production babel src --out-dir dist --copy-files --ignore __tests__,spec.js,test.js,__snapshots__,Component.js",
"build": "rm -rf dist && NODE_ENV=production babel src --out-dir dist --ignore \"src/**/*.spec.js\",\"src/**/*.test.js\",\"src/**/*.Component.js\",\"src/_playground/*\"",
"deploy": "gh-pages -d build",
"lint:fix": "npm run build:lint:fix",
"lint:pre-commit": "printf \"running pre-commit lint...\" && npm run lint && printf \"done!\n\"",
Expand Down
2 changes: 1 addition & 1 deletion src/ActionBar/ActionBar.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { ActionBar, ActionBarBack, ActionBarHeader, ActionBarActions, Button, Popover, Menu, MenuList, MenuItem } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';

export const ActionBarComponent = () => {
const actionBarBackBtnCode = `<ActionBar>
Expand Down
2 changes: 1 addition & 1 deletion src/Alert/Alert.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Alert, Icon } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../_playground';

export const AlertComponent = () => {
const defaultAlertCode = '<Alert dismissable link="#" linkText="link">Default alert with a </Alert>';
Expand Down
2 changes: 1 addition & 1 deletion src/Badge/Badge.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Badge, Label, Status, Counter, Button } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../_playground';

export const BadgeComponent = () => {
const defaultBadgeCode = `<Badge>Default</Badge>
Expand Down
2 changes: 1 addition & 1 deletion src/Breadcrumb/Breadcrumb.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Breadcrumb, BreadcrumbItem } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import } from '../_playground';

export const BreadcrumbComponent = () => {
const breadcrumbHrefCode = `<Breadcrumb>
Expand Down
2 changes: 1 addition & 1 deletion src/Button/Button.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Button, ButtonGroup } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../_playground';

export const ButtonComponent = () => {
const buttonOptionsCode = `<Button option="emphasized" onClick={() => clickBtnHandler('Emphasized')}>
Expand Down
2 changes: 1 addition & 1 deletion src/Calendar/Calendar.Component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import {Calendar} from '../';

export const CalendarComponent = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/ComboboxInput/ComboboxInput.Component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Import, Properties } from '../_playground';
import { Menu, MenuItem, MenuList, ComboboxInput } from '../';

export const ComboboxInputComponent = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/ContextualMenu/ContextualMenu.Component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Description } from '../';
import { DocsTile, DocsText, Separator, Header, Description } from '../_playground';
import { Popover, Button, Menu, MenuList, MenuItem } from '../';

export const ContextualMenuComponent = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/DatePicker/DatePicker.Component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { DatePicker } from '../';

export const DatePickerComponent = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/Dropdown/Dropdown.Component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { Dropdown, Popover, Button, Menu, MenuList, MenuItem } from '../';

export const DropdownComponent = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/Forms/Forms.Component.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
FormFieldset,
FormLegend
} from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';

export const FormsComponent = () => {
const inputsCode = `<FormSet>
Expand Down
2 changes: 1 addition & 1 deletion src/Icon/Icon.Component.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
Import,
Properties,
Playground
} from '../';
} from '../_playground';

export const IconComponent = () => {
const iconsCode = `<Icon glyph="cart" size="s" />
Expand Down
2 changes: 1 addition & 1 deletion src/Identifier/Identifier.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Identifier } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../_playground';


export const IdentifierComponent = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/Image/Image.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Image } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../_playground';

export const ImageComponent = () => {
const sizesImageCode = `<Image size="s" photo="https://placeimg.com/400/400/nature"></Image>
Expand Down
2 changes: 1 addition & 1 deletion src/InlineHelp/InlineHelp.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { InlineHelp } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';


export const InlineHelpComponent = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/InputGroup/InputGroup.Component.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
Import,
Properties,
Playground
} from '../';
} from '../_playground';
import { FormItem, FormLabel, FormGroup, InputGroup, Button } from '../';

export const InputGroupComponent = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/ListGroup/ListGroup.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Button, ListGroup, ListGroupItem, ListGroupItemActions, ListGroupItemCheckbox } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Playground } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Playground } from '../_playground';

export const ListGroupComponent = () => {
const simpleListCode = `<ListGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/LocalizationEditor/LocalizationEditor.Component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Import, Properties } from '../_playground';
import { LocalizationEditor } from '../';

export const LocalizationEditorComponent = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/MegaMenu/MegaMenu.Component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { MegaMenu, MegaMenuList, MegaMenuGroup } from '../';

export const MegaMenuComponent = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/Menu/Menu.Component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { Menu, MenuList, MenuItem, MenuGroup } from '../';

export const MenuComponent = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/Modal/Modal.Component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { Modal, Button } from '../';

export class ModalComponent extends Component {
Expand Down
10 changes: 1 addition & 9 deletions src/MultiInput/MultiInput.Component.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
import React, { Component } from 'react';
import {
DocsTile,
DocsText,
Separator,
Header,
Description,
Import,
Properties
} from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { MultiInput } from '../';

export class MultiInputComponent extends Component {
Expand Down
12 changes: 2 additions & 10 deletions src/Pagination/Pagination.Component.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
import React from 'react';
import {
DocsTile,
DocsText,
Separator,
Header,
Description,
Import,
Properties,
Pagination
} from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { Pagination } from '../';

export const PaginationComponent = () => {
const handleClick = event => {
Expand Down
2 changes: 1 addition & 1 deletion src/Panel/Panel.Component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import {
Panel,
PanelGrid,
Expand Down
2 changes: 1 addition & 1 deletion src/Popover/Popover.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Popover, Image, Identifier, Icon, Menu, MenuList, MenuItem } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';

export const PopoverComponent = () => {
const popoverCode = `<Popover
Expand Down
2 changes: 1 addition & 1 deletion src/SearchInput/SearchInput.Component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { SearchInput } from './SearchInput';

export class SearchInputComponent extends Component {
Expand Down
3 changes: 2 additions & 1 deletion src/Shellbar/Shellbar.Component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { Component } from 'react';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Menu, MenuList, MenuItem } from '..';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { Menu, MenuList, MenuItem } from '../';
import { Shellbar } from '..';
var images = require.context('../../assets', true);

Expand Down
2 changes: 1 addition & 1 deletion src/SideNavigation/SideNavigation.Component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { SideNav, SideNavList, SideNavGroup } from '../';

export const SideNavigationComponent = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/Table/Table.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Image, Popover, Button, Menu, MenuList, MenuItem, Table } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';

export const TableComponent = () => {
const simpleTableCode = `<Table
Expand Down
2 changes: 1 addition & 1 deletion src/Tabs/Tabs.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Tabs, TabComponent } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../_playground';

export const TabsComponent = () => {
const tabscomponentCode = `
Expand Down
2 changes: 1 addition & 1 deletion src/Tile/Tile.Component.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
MenuList,
MenuItem
} from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties, Playground } from '../_playground';

export const TileComponent = () => {
const simpleTileCode = `<Tile>
Expand Down
2 changes: 1 addition & 1 deletion src/Time/Time.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Time } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';

export const TimeComponent = () => {
const defaultTimeCode = '<Time />';
Expand Down
2 changes: 1 addition & 1 deletion src/TimePicker/TimePicker.Component.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
Header,
Description,
Properties
} from '../';
} from '../_playground';

export const TimePickerComponent = () => {
const defaultTimeCode = '<TimePicker />';
Expand Down
2 changes: 1 addition & 1 deletion src/Toggle/Toggle.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Toggle } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';

export const ToggleComponent = () => {
const toggleCode = `<Toggle size="xs" id="Yj07w604">
Expand Down
2 changes: 1 addition & 1 deletion src/Token/Token.Component.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Token } from './Token';
import { DocsTile, DocsText, Separator, Header, Description, Import } from '..';
import { DocsTile, DocsText, Separator, Header, Description, Import } from '../_playground';

export const TokenComponent = () => {
const tokenCode = `<Token>Bibendum</Token>
Expand Down
2 changes: 1 addition & 1 deletion src/Tree/Tree.Component.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../';
import { DocsTile, DocsText, Separator, Header, Description, Import, Properties } from '../_playground';
import { Tree} from '../';

export const TreeComponent = () => {
Expand Down
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions src/App.scss → src/_playground/App.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$fd-icons-path: '../node_modules/fiori-fundamentals/scss/icons/';
$fd-fonts-path: '../node_modules/fiori-fundamentals/dist/fonts/';
@import '../node_modules/fiori-fundamentals/scss/all.scss';
$fd-icons-path: '../../node_modules/fiori-fundamentals/scss/icons/';
$fd-fonts-path: '../../node_modules/fiori-fundamentals/dist/fonts/';
@import '../../node_modules/fiori-fundamentals/scss/all.scss';

.App {
background-color: white;
Expand Down
Loading

0 comments on commit e2dc113

Please sign in to comment.