Skip to content
This repository was archived by the owner on Mar 1, 2024. It is now read-only.

Commit 98df96c

Browse files
Greg-HamelGreg-Hamel
committed
Merge remote-tracking branch 'upstream/master' into tooltip
2 parents e7e9f3a + 2317e32 commit 98df96c

33 files changed

+1926
-913
lines changed

‎.releaserc‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,20 @@
1+
<a name="1.5.1"></a>
12

3+
## [1.5.1](https://github.com/tabler/tabler-react/compare/v1.5.0...v1.5.1) (2018-05-25)
4+
5+
### Bug Fixes
6+
7+
* **semantic-release:** fix config ([5ba703d](https://github.com/tabler/tabler-react/commit/5ba703d))
8+
9+
<a name="1.5.0"></a>
10+
11+
# [1.5.0](https://github.com/tabler/tabler-react/compare/v1.4.0...v1.5.0) (2018-05-25)
12+
13+
### Bug Fixes
14+
15+
* **tabler css:** copy tabler css before build and start ([2062c71](https://github.com/tabler/tabler-react/commit/2062c71))
16+
17+
### Features
18+
19+
* **Form:** Add form and input event props ([c109724](https://github.com/tabler/tabler-react/commit/c109724))
20+
* **FormInput:** Add error prop ([2d98e75](https://github.com/tabler/tabler-react/commit/2d98e75))

‎README.md‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
# Tabler React
22

3-
[![Greenkeeper badge](https://badges.greenkeeper.io/tabler/tabler-react.svg)](https://greenkeeper.io/)
4-
53
> React implementation of the [Tabler Dashboard UI Kit](https://github.com/tabler/tabler)
64
7-
[![NPM](https://img.shields.io/npm/v/tabler-react.svg)](https://www.npmjs.com/package/tabler-react) ![Type definitions](https://img.shields.io/badge/type%20definitions-flow-green.svg)
5+
[![NPM](https://img.shields.io/npm/v/tabler-react.svg)](https://www.npmjs.com/package/tabler-react) ![Type definitions](https://img.shields.io/badge/type%20definitions-flow-green.svg) [![Greenkeeper badge](https://badges.greenkeeper.io/tabler/tabler-react.svg)](https://greenkeeper.io/) [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
86

97
**[Demo](https://tabler.github.io/tabler-react/)** | **[Documentation](https://tabler.github.io/tabler-react/documentation/)** | **[Issues](https://github.com/tabler/tabler-react/issues)** | **[Slack](https://tabler-ui.slack.com/messages/CA55LDVHU/)**.
108

11-
> Please note: we're working fast towards [version 1.0](https://github.com/tabler/tabler-react/milestone/1) and until then all releases should be considered unstable and potentially breaking
12-
139
## Install
1410

15-
Make sure you have [Node.js](https://nodejs.org/) 8+ and [npm](https://npmjs.com/) installed.
11+
Make sure you have [Node.js](https://nodejs.org/) 8+ and [yarn](https://yarnpkg.com) installed.
1612

17-
`npm install --save tabler-react` or `yarn add tabler-react`
13+
`yarn add tabler-react`
1814

1915
## Example
2016

@@ -55,8 +51,8 @@ The package is made up of 2 main folders:
5551
To setup and run a local copy:
5652

5753
1. Clone this repo with `git clone https://github.com/tabler/tabler-react`
58-
2. Run `yarn` or `npm install` in the root folder
59-
3. Run `yarn` or `npm install` in the example folder
54+
2. Run `yarn install` in the root folder
55+
3. Run `yarn install` in the example folder
6056
4. In seperate terminal windows, run `yarn start` in the root and example folders.
6157

6258
You should now be up and running with live browser reloading of the example website while you work on Tabler React components in the /src folder.

‎commitlint.config.js‎

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,28 @@
1-
module.exports = { extends: ["@commitlint/config-conventional"] };
1+
module.exports = {
2+
rules: {
3+
"body-leading-blank": [1, "always"],
4+
"footer-leading-blank": [1, "always"],
5+
"header-max-length": [2, "always", 72],
6+
"subject-empty": [2, "never"],
7+
"subject-full-stop": [2, "never", "."],
8+
"type-case": [2, "always", "lower-case"],
9+
"type-empty": [2, "never"],
10+
"type-enum": [
11+
2,
12+
"always",
13+
[
14+
"build",
15+
"chore",
16+
"ci",
17+
"docs",
18+
"feat",
19+
"fix",
20+
"perf",
21+
"refactor",
22+
"revert",
23+
"style",
24+
"test",
25+
],
26+
],
27+
},
28+
};

‎docs/Introduction.md‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
> Please note: we're working fast towards [version 1.0](https://github.com/tabler/tabler-react/milestone/1) and until then all releases should be considered unstable and potentially breaking
2-
31
**[Demo](https://tabler.github.io/tabler-react/)** | **[Issues](https://github.com/tabler/tabler-react/issues)** | **[Slack](https://tabler-ui.slack.com/messages/CA55LDVHU/)**.
42

53
## Install
64

7-
Make sure you have [Node.js](https://nodejs.org/) 8+ and [npm](https://npmjs.com/) installed.
5+
Make sure you have [Node.js](https://nodejs.org/) 8+ and [yarn](https://yarnpkg.com) installed.
86

9-
`npm install --save tabler-react` or `yarn add tabler-react`
7+
`yarn add tabler-react`
108

119
## Basic Usage Example
1210

‎example/public/documentation/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>Tabler React Style Guide</title></head><body><div id="rsg-root"></div><script src="build/bundle.54462f7a.js"></script></body></html>
1+
<!DOCTYPE html><html><head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta http-equiv="X-UA-Compatible" content="ie=edge"><title>Tabler React Style Guide</title></head><body><div id="rsg-root"></div><script src="build/bundle.51f40b52.js"></script></body></html>

‎example/src/SiteWrapper.react.js‎

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import * as React from "react";
44
import { NavLink } from "react-router-dom";
55

6-
import { Site, Nav, Button } from "tabler-react";
6+
import { Site, Nav, Grid, List, Button } from "tabler-react";
77

88
type Props = {|
99
+children: React.Node,
@@ -158,6 +158,60 @@ class SiteWrapper extends React.Component<Props, void> {
158158
accountDropdown: accountDropdownProps,
159159
}}
160160
navProps={{ itemsObjects: navBarItems }}
161+
footerProps={{
162+
links: [
163+
<a>First Link</a>,
164+
<a>Second Link</a>,
165+
<a>Third Link</a>,
166+
<a>Fourth Link</a>,
167+
<a>Five Link</a>,
168+
<a>Sixth Link</a>,
169+
<a>Seventh Link</a>,
170+
<a>Eigth Link</a>,
171+
],
172+
note:
173+
"Premium and Open Source dashboard template with responsive and high quality UI. For Free!",
174+
copyright: (
175+
<React.Fragment>
176+
Copyright © 2018
177+
<a href="."> Tabler-react</a>. Theme by
178+
<a
179+
href="https://codecalm.net"
180+
target="_blank"
181+
rel="noopener noreferrer"
182+
>
183+
{" "}
184+
codecalm.net
185+
</a>{" "}
186+
All rights reserved.
187+
</React.Fragment>
188+
),
189+
nav: (
190+
<React.Fragment>
191+
<Grid.Col auto={true}>
192+
<List className="list-inline list-inline-dots mb-0">
193+
<List.Item className="list-inline-item">
194+
<a href="./docs/index.html">Documentation</a>
195+
</List.Item>
196+
<List.Item className="list-inline-item">
197+
<a href="./faq.html">FAQ</a>
198+
</List.Item>
199+
</List>
200+
</Grid.Col>
201+
<Grid.Col auto={true}>
202+
<Button
203+
href="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/tabler/tabler-react"
204+
size="sm"
205+
outline
206+
color="primary"
207+
RootComponent="a"
208+
>
209+
Source code
210+
</Button>
211+
</Grid.Col>
212+
</React.Fragment>
213+
),
214+
}}
161215
>
162216
{this.props.children}
163217
</Site.Wrapper>

‎example/src/pages/400.react.js‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@
22

33
import * as React from "react";
44

5-
import { DefaultErrorPage } from "tabler-react";
5+
import { Error400Page } from "tabler-react";
66

77
type Props = {||};
88

99
function Error400(props: Props): React.Node {
10-
return (
11-
<DefaultErrorPage
12-
title="400"
13-
subtitle="Oops... You just found an error page..."
14-
details="We are sorry but your request contains bad syntax and cannot be fulfilled..."
15-
/>
16-
);
10+
return <Error400Page />;
1711
}
1812

1913
export default Error400;

‎example/src/pages/401.react.js‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@
22

33
import * as React from "react";
44

5-
import { DefaultErrorPage } from "tabler-react";
5+
import { Error401Page } from "tabler-react";
66

77
type Props = {||};
88

99
function Error401(props: Props): React.Node {
10-
return (
11-
<DefaultErrorPage
12-
title="401"
13-
subtitle="Oops... You just found an error page..."
14-
details="We are sorry but you are not authorized to access this page..."
15-
/>
16-
);
10+
return <Error401Page />;
1711
}
1812

1913
export default Error401;

‎example/src/pages/403.react.js‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@
22

33
import * as React from "react";
44

5-
import { DefaultErrorPage } from "tabler-react";
5+
import { Error403Page } from "tabler-react";
66

77
type Props = {||};
88

99
function Error403(props: Props): React.Node {
10-
return (
11-
<DefaultErrorPage
12-
title="403"
13-
subtitle="Oops... You just found an error page..."
14-
details="We are sorry but you do not have permission to access this page..."
15-
/>
16-
);
10+
return <Error403Page />;
1711
}
1812

1913
export default Error403;

0 commit comments

Comments
 (0)