Skip to content
This repository has been archived by the owner on Mar 20, 2019. It is now read-only.

React-Feature-Toggles #106

Merged
merged 15 commits into from
Jun 21, 2018
148 changes: 102 additions & 46 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,15 @@
]
},
"dependencies": {
"@paralleldrive/react-feature-toggles": "2.0.0-beta2",
"@poetapp/frost-client": "0.1.4",
"classnames": "2.2.5",
"formdata-polyfill": "3.0.10",
"isomorphic-fetch": "2.2.1",
"moment": "2.22.1",
"prop-types": "15.6.1",
"react": "15.6.2",
"react-dom": "15.6.2",
"react": "16.4.1",
"react-dom": "16.4.1",
"react-progress-bar-plus": "1.3.1",
"react-redux": "5.0.6",
"react-router": "3.2.0",
Expand Down Expand Up @@ -98,7 +99,7 @@
"@types/isomorphic-fetch": "0.0.34",
"@types/node-sass": "3.10.32",
"@types/prop-types": "15.5.2",
"@types/react": "0.14.57",
"@types/react": "16.3.17",
"@types/react-dom": "0.14.23",
"@types/react-hot-loader": "3.0.5",
"@types/react-redux": "4.4.47",
Expand Down Expand Up @@ -136,7 +137,7 @@
"node-sass": "4.9.0",
"postcss-loader": "1.3.3",
"prettier": "1.12.1",
"react-hot-loader": "1.3.1",
"react-hot-loader": "3.1.3",
"riteway": "2.0.4",
"sass-loader": "4.1.1",
"sinon": "6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import './Root.scss'
import './styles/reset.scss'

interface RootLayoutProps {
readonly children?: JSX.Element
readonly children?: React.ReactNode
}

export const Layout = (props: RootLayoutProps): JSX.Element => <div className="root-layout">{props.children}</div>
2 changes: 1 addition & 1 deletion src/components/atoms/Hash/Hash.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ storiesOf('Components/Text', module).addWithJSX(
### Usage
~~~js
<Hash
readonly children?: JSX.Element
readonly children?: string
readonly textClickable?: boolean
readonly className?: string
/>
Expand Down
5 changes: 3 additions & 2 deletions src/components/atoms/Hash/Hash.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import * as React from 'react'

import { CopyableText } from 'components/atoms/CopyableText/CopyableText'
import { ClassNameProps } from 'interfaces/Props'
import * as React from 'react'

import './Hash.scss'

interface HashProps extends ClassNameProps {
readonly children?: JSX.Element
readonly children?: string
readonly textClickable?: boolean
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/atoms/HeaderTitle/HeaderTitle.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ storiesOf('Components/Layout', module).addWithJSX(
### Usage
~~~js
<HeaderTitle
readonly children?: JSX.Element
readonly children?: string
readonly className?: string
/>
~~~`)(() => <HeaderTitle children={text('children', 'test')} className={text('className', '')} />)
Expand Down
5 changes: 3 additions & 2 deletions src/components/atoms/HeaderTitle/HeaderTitle.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import * as React from 'react'

import * as classNames from 'classnames'
import { ClassNameProps } from 'interfaces/Props'
import * as React from 'react'
import './HeaderTitle.scss'

interface HeaderTitleProps extends ClassNameProps {
readonly children?: JSX.Element
readonly children?: string
}

export const HeaderTitle = (props: HeaderTitleProps) => (
Expand Down
2 changes: 1 addition & 1 deletion src/components/atoms/LoadingPage/LoadingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import './LoadingPage.scss'
interface LoadingPageProps extends ClassNameProps {
readonly loading?: boolean
readonly percentage?: number
readonly children?: JSX.Element
readonly children?: React.ReactNode
}

export const LoadingPage = (props: LoadingPageProps) => (
Expand Down
Loading