Skip to content

Commit

Permalink
Merge pull request #18 from ingresse/feature/icn-coupon
Browse files Browse the repository at this point in the history
Add: New Icons
  • Loading branch information
udimberto authored Apr 23, 2020
2 parents e034598 + 1bb0cea commit 17cddce
Show file tree
Hide file tree
Showing 42 changed files with 2,201 additions and 2,051 deletions.
23 changes: 15 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Re-export the Aphrodite tools through your React application folder structure.
```js
export {
colors,
} from 'aphrodite-react';
} from '@ingresse/aphrodite';
```

`src/components/index.js`:
Expand All @@ -26,7 +26,7 @@ export {
Button,
Container,
Segment,
} from 'aphrodite-react';
} from '@ingresse/aphrodite';
```

`src/App.jsx`:
Expand All @@ -37,6 +37,7 @@ import React from 'react';
/* Your Project Components */
import {
Button,
Container,
Segment,
} from './components';

Expand All @@ -46,12 +47,18 @@ function App() {
}

return (
<Segment
textAlign="center">
<Button onClick={handleClick}>
Aphrodite Button
</Button>
</Segment>
<Container>
<Segment
as="section"
textAlign="center"
background="helper">
<Button
color="bamboo"
onClick={handleClick}>
Aphrodite Button
</Button>
</Segment>
</Container>
);
}

Expand Down
3,887 changes: 1,952 additions & 1,935 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ingresse/aphrodite",
"version": "2.0.0",
"version": "2.0.2",
"private": false,
"license": "MIT",
"description": "React UI library from ingresse.com",
Expand Down Expand Up @@ -71,9 +71,10 @@
],
"authors": [
"Ingresse",
"Udimberto Silvestre Junior",
"Ana Paula de Oliveira",
"Maicon Silva"
"Ana Flávia Rodrigues",
"Maicon Silva",
"Udimberto Silvestre Junior"
],
"bugs": {
"url": "https://github.com/ingresse/aphrodite-react/issues"
Expand Down
2 changes: 1 addition & 1 deletion src/components/ActionBar/ActionBar.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { ActionBar, Button, Container, Segment } from '../';
### Toggle visibility of action elements

```jsx
import { ActionBar, Button } from 'aphrodite-react';
import { ActionBar, Button } from '@ingresse/aphrodite';

<ActionBar
visible={true}
Expand Down
2 changes: 1 addition & 1 deletion src/components/Badge/Badge.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
### Badge styled with Aphrodite definitions.

```jsx
import { Badge } from 'aphrodite-react';
import { Badge } from '@ingresse/aphrodite';

<Badge>
Hello, you
Expand Down
2 changes: 1 addition & 1 deletion src/components/Button/Button.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { Button, Container, Segment, Row, Col } from '../';
### Button styled with Aphrodite definitions.

```jsx
import { Button } from 'aphrodite-react';
import { Button } from '@ingresse/aphrodite';

<Button>Hello, you</Button>
```
Expand Down
2 changes: 1 addition & 1 deletion src/components/Card/Card.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
### Used as base on `Collapsible` component.

```jsx
import { Card } from 'aphrodite-react';
import { Card } from '@ingresse/aphrodite';

...

Expand Down
2 changes: 1 addition & 1 deletion src/components/Clipboard/Clipboard.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {


```jsx
import { Clipboard } from 'aphrodite-react';
import { Clipboard } from '@ingresse/aphrodite';

...

Expand Down
2 changes: 1 addition & 1 deletion src/components/Collapsible/Collapsible.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
### An alternative to accordion.

```jsx
import { Collapsible, Segment } from 'aphrodite-react';
import { Collapsible, Segment } from '@ingresse/aphrodite';
...
<Collapsible header="Hi">
<Segment padding="5px 10px">
Expand Down
2 changes: 1 addition & 1 deletion src/components/Countdown/Countdown.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { colors } from '../../utils';
### Regressive seconds visual timer

```jsx
import { Countdown } from 'aphrodite-react';
import { Countdown } from '@ingresse/aphrodite';

...

Expand Down
2 changes: 1 addition & 1 deletion src/components/Dialog/Dialog.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import {
### Dialog boxes tell users about a task and can contain critical information, require decisions, or involve multiple tasks.

```jsx
import { Dialog } from 'aphrodite-react';
import { Dialog } from '@ingresse/aphrodite';

...

Expand Down
8 changes: 5 additions & 3 deletions src/components/Dropdown/Dropdown.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@ import {
### A white block, rounded, with simple shadow effect, downing from some other component.

```jsx
import { Dropdown } from 'aphrodite-react';
import { Dropdown } from '@ingresse/aphrodite';

...

<Dropdown>
Hello
<Dropdown
center
toggle="Dropdown toggle">
Dropdown content
</Dropdown>
```

Expand Down
8 changes: 4 additions & 4 deletions src/components/ExpansionPanel/ExpansionPanel.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ menu : › Components
route: /components/expansion-panel
---

import { useState } from 'react';
import { useState, Fragment } from 'react';
import { Playground, Props } from 'docz';
import {
ExpansionPanel,
Expand All @@ -24,7 +24,7 @@ import { colors } from '../../utils';

<Playground>
{() => {
// import { ExpansionPanel } from 'aphrodite-react';
// import { ExpansionPanel } from '@ingresse/aphrodite';

return (
<ExpansionPanel
Expand Down Expand Up @@ -118,7 +118,7 @@ import { colors } from '../../utils';
}

return (
<>
<Fragment>
<Row horizontal="center">
<Col sm={4}>
<Button
Expand Down Expand Up @@ -147,7 +147,7 @@ import { colors } from '../../utils';

)}
</Row>
</>
</Fragment>
);
}}
</Playground>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Flex/Flex.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {

<Playground style={{ margin: '-20px', padding: '0 !important' }}>
{() => {
// import { Flex } from 'aphrodite-react';
// import { Flex } from '@ingresse/aphrodite';

const wrapperStyles = {
width : '100%',
Expand Down
6 changes: 3 additions & 3 deletions src/components/Form/InputMask/InputMask.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ menu : › Components
route: /components/form/input-mask
---

import { useState } from 'react';
import { useState, Fragment } from 'react';
import { Playground, Props } from 'docz';
import {
InputMask,
Expand Down Expand Up @@ -39,7 +39,7 @@ import {
}

return (
<>
<Fragment>
<Row>
<Col xs={12} sm={6}>
<Segment padding="10px 0">
Expand All @@ -63,7 +63,7 @@ import {
</Segment>
</Col>
</Row>
</>
</Fragment>
);
}}
</Playground>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Form/Select/Select.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ const Select = memo(forwardRef((props, ref) => {
<Icon
size={30}
slug="arrow-down"
color={props.disabled ? 'disabled' : 'base'}
color={props.disabled ? 'helper' : 'base'}
/>
</AphFormControlButtonStyled>
<AphFormControlErrorMsgStyled
Expand Down
16 changes: 16 additions & 0 deletions src/components/Form/Select/Select.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,22 @@ import {
</Playground>


## Disabled

<Playground>
<Container xs>
<Segment padding="10px 0">
<Select disabled label="Disabled example">
<option value=""></option>
<option value="ingresse">Ingresse</option>
<option value="aphrodite">Aphrodite</option>
<option value="react">React</option>
</Select>
</Segment>
</Container>
</Playground>


## Delayed

<Playground>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Grid/grid.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { GRID, RADIUS } from '../../constants';
### Align the components with Aphrodite standards

```jsx
import { Container, Row, Col } from 'aphrodite-react';
import { Container, Row, Col } from '@ingresse/aphrodite';
...
<Container>
<Row>
Expand Down
15 changes: 8 additions & 7 deletions src/components/HoverActions/HoverActions.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,28 @@ menu : › Components
route: /components/hover-actions
---

import { Fragment } from 'react';
import { Playground, Props } from 'docz';
import { HoverActions, HoverActionsItem, Img, Container } from '../';

# HoverActions
### On some content hovered, display another content over the original.

```jsx
import { HoverActions, HoverActionsItem } from 'aphrodite-react';
import { HoverActions, HoverActionsItem } from '@ingresse/aphrodite';

...

<HoverActions
actions={(
<>
<Fragment>
<HoverActionsItem>
Useless
</HoverActionsItem>
<HoverActionsItem>
Useless
</HoverActionsItem>
</>
</Fragment>
)}>
My Hoverable Element expecting some surprising actions
</HoverActions>
Expand All @@ -37,14 +38,14 @@ import { HoverActions, HoverActionsItem } from 'aphrodite-react';
<Container styles={{ padding: '20px', textAlign: 'center' }}>
<HoverActions
actions={(
<>
<Fragment>
<HoverActionsItem color="ocean">
A button for some action
</HoverActionsItem>
<HoverActionsItem>
Another button
</HoverActionsItem>
</>
</Fragment>
)}>
My Hoverable Element expecting some surprising actions
</HoverActions>
Expand All @@ -59,7 +60,7 @@ import { HoverActions, HoverActionsItem } from 'aphrodite-react';
<Container styles={{ padding: '20px', textAlign: 'center' }}>
<HoverActions
actions={(
<>
<Fragment>
<HoverActionsItem
as="a"
target="_blank"
Expand All @@ -68,7 +69,7 @@ import { HoverActions, HoverActionsItem } from 'aphrodite-react';
styles={{ padding: '6px 5px 4px' }}>
Open image in a new tab
</HoverActionsItem>
</>
</Fragment>
)}>
<Img
circle
Expand Down
Loading

0 comments on commit 17cddce

Please sign in to comment.