Updating client dependencies. Switching to yarn. (#6433)
* Updating client dependancies. Switching to using yarn. * Updating React * Moving pure components to using function syntax (performance gains with newer react version) * Updating client dependancies. * Ignore .yarninstall * Enabling pre-lockfile because it's the entire point of using yarn. * Removing old webpack config * Moving to new prop-types * Fixing ESLint Errors * Updating jest snapshots. * Cleaning up package.json
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
63e599c43b
Коммит
2bbedd9def
@@ -1,40 +1,40 @@
|
||||
import PropTypes from 'prop-types';
|
||||
|
||||
// Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
|
||||
// See License.txt for license information.
|
||||
|
||||
import React from 'react';
|
||||
import {FormattedMessage} from 'react-intl';
|
||||
|
||||
export default class Banner extends React.Component {
|
||||
render() {
|
||||
let title = (
|
||||
<FormattedMessage
|
||||
id='admin.banner.heading'
|
||||
defaultMessage='Note:'
|
||||
/>
|
||||
);
|
||||
export default function Banner(props) {
|
||||
let title = (
|
||||
<FormattedMessage
|
||||
id='admin.banner.heading'
|
||||
defaultMessage='Note:'
|
||||
/>
|
||||
);
|
||||
|
||||
if (this.props.title) {
|
||||
title = this.props.title;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className='banner'>
|
||||
<div className='banner__content'>
|
||||
<h4 className='banner__heading'>
|
||||
{title}
|
||||
</h4>
|
||||
<p>
|
||||
{this.props.description}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
if (props.title) {
|
||||
title = props.title;
|
||||
}
|
||||
|
||||
return (
|
||||
<div className='banner'>
|
||||
<div className='banner__content'>
|
||||
<h4 className='banner__heading'>
|
||||
{title}
|
||||
</h4>
|
||||
<p>
|
||||
{props.description}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Banner.defaultProps = {
|
||||
};
|
||||
Banner.propTypes = {
|
||||
title: React.PropTypes.node,
|
||||
description: React.PropTypes.node.isRequired
|
||||
title: PropTypes.node,
|
||||
description: PropTypes.node.isRequired
|
||||
};
|
||||
|
||||
Ссылка в новой задаче
Block a user