mirror of
https://github.com/naturalcrit/homebrewery.git
synced 2026-01-14 21:32:41 +00:00
make more concise
This commit is contained in:
@@ -7,67 +7,36 @@ import Dialog from '../../../components/dialog.jsx';
|
|||||||
|
|
||||||
const DISMISS_BUTTON = <i className='fas fa-times dismiss' />;
|
const DISMISS_BUTTON = <i className='fas fa-times dismiss' />;
|
||||||
|
|
||||||
const ErrorBar = ( props ) => {
|
const ErrorBar = (props) => {
|
||||||
let hasOpenError = false;
|
let hasOpenError = false, hasCloseError = false, hasMatchError = false;
|
||||||
let hasCloseError = false;
|
|
||||||
let hasMatchError = false;
|
|
||||||
|
|
||||||
const renderErrors = () => {
|
const renderErrors = () => (
|
||||||
hasOpenError = false;
|
<ul>
|
||||||
hasCloseError = false;
|
{_.map(props.errors, (err, idx) => {
|
||||||
hasMatchError = false;
|
if (err.id === 'OPEN') hasOpenError = true;
|
||||||
|
if (err.id === 'CLOSE') hasCloseError = true;
|
||||||
|
if (err.id === 'MISMATCH') hasMatchError = true;
|
||||||
|
return (
|
||||||
|
<li key={idx}>
|
||||||
|
Line {err.line} : {err.text}, '{err.type}' tag
|
||||||
|
</li>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</ul>
|
||||||
|
);
|
||||||
|
|
||||||
const errors = _.map(props.errors, (err, idx) => {
|
const renderProtip = () => (
|
||||||
if (err.id === 'OPEN') hasOpenError = true;
|
<div className="protips">
|
||||||
if (err.id === 'CLOSE') hasCloseError = true;
|
<h4>Protips!</h4>
|
||||||
if (err.id === 'MISMATCH') hasMatchError = true;
|
{hasOpenError && <div>Unmatched opening tag. Close your tags, like this {'</div>'}. Match types!</div>}
|
||||||
|
{hasCloseError && <div>Unmatched closing tag. Either remove it or check where it was opened.</div>}
|
||||||
return (
|
{hasMatchError && <div>Type mismatch. Closed a tag with a different type.</div>}
|
||||||
<li key={idx}>
|
</div>
|
||||||
Line {err.line} : {err.text}, '{err.type}' tag
|
);
|
||||||
</li>
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
return <ul>{errors}</ul>;
|
|
||||||
};
|
|
||||||
|
|
||||||
const renderProtip = () => {
|
|
||||||
const msg = [];
|
|
||||||
if (hasOpenError) {
|
|
||||||
msg.push(
|
|
||||||
<div key="openError">
|
|
||||||
An unmatched opening tag means there's an opened tag that isn't closed. You need to close your tags, like this {'</div>'}. Make sure to match types!
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hasCloseError) {
|
|
||||||
msg.push(
|
|
||||||
<div key="closeError">
|
|
||||||
An unmatched closing tag means you closed a tag without opening it. Either remove it, or check to where you think you opened it.
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hasMatchError) {
|
|
||||||
msg.push(
|
|
||||||
<div key="matchError">
|
|
||||||
A type mismatch means you closed a tag, but the last open tag was a different type.
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="protips">
|
|
||||||
<h4>Protips!</h4>
|
|
||||||
{msg}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
if (!props.errors.length) return null;
|
if (!props.errors.length) return null;
|
||||||
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dialog className="errorBar" closeText={DISMISS_BUTTON} >
|
<Dialog className="errorBar" closeText={DISMISS_BUTTON} >
|
||||||
<div className="content">
|
<div className="content">
|
||||||
|
|||||||
Reference in New Issue
Block a user