Fix some React errors and warnings
This commit is contained in:
parent
fc29d7d327
commit
b8322417a0
@ -6,7 +6,7 @@ class Header extends Component {
|
|||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<header>
|
<header>
|
||||||
<button id="navBtn"><img src={navIcon} /></button>
|
<button id="navBtn"><img src={navIcon} alt="" /></button>
|
||||||
<h1 id="pageTitle">{this.props.title}</h1>
|
<h1 id="pageTitle">{this.props.title}</h1>
|
||||||
</header>
|
</header>
|
||||||
);
|
);
|
||||||
|
@ -6,13 +6,13 @@ class MenuButton extends Component {
|
|||||||
return (
|
return (
|
||||||
<button>
|
<button>
|
||||||
<span>{this.props.label}</span>
|
<span>{this.props.label}</span>
|
||||||
<img src={this.props.icon}/>
|
<img src={this.props.icon} alt="" />
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
return (
|
return (
|
||||||
<button>
|
<button>
|
||||||
<img src={this.props.icon}/>
|
<img src={this.props.icon} alt="" />
|
||||||
<span>{this.props.label}</span>
|
<span>{this.props.label}</span>
|
||||||
</button>
|
</button>
|
||||||
);
|
);
|
||||||
|
@ -8,28 +8,26 @@ import warningIcon from '../img/warning.svg';
|
|||||||
class TrafficEntry extends Component {
|
class TrafficEntry extends Component {
|
||||||
render() {
|
render() {
|
||||||
let trafficInfo = this.props.departure.info;
|
let trafficInfo = this.props.departure.info;
|
||||||
let lineInterference = trafficInfo != "" && trafficInfo != null;
|
let lineInterference = trafficInfo !== "" && trafficInfo !== null;
|
||||||
let infoElem = <></>;
|
|
||||||
|
|
||||||
if (trafficInfo != "" && trafficInfo != null)
|
|
||||||
infoElem = <p>{trafficInfo} <u>Visa mer</u></p>
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div class="trafficEntry">
|
<div className="trafficEntry">
|
||||||
<div>
|
<div>
|
||||||
<div class="timeColumn">
|
<div className="timeColumn">
|
||||||
<span>{this.props.departure.time}</span>
|
<span>{this.props.departure.time}</span>
|
||||||
{lineInterference &&
|
{lineInterference &&
|
||||||
<img src={warningIcon}></img>
|
<img src={warningIcon} alt=""></img>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
<div class="lineColumn">
|
<div className="lineColumn">
|
||||||
<div>
|
<div>
|
||||||
<span class="lineName">{this.props.departure.lineName}</span>
|
<span className="lineName">{this.props.departure.lineName}</span>
|
||||||
<img src={busIcon}></img>
|
<img src={busIcon} alt=""></img>
|
||||||
<span class="destination">{this.props.departure.destination}</span>
|
<span className="destination">{this.props.departure.destination}</span>
|
||||||
</div>
|
</div>
|
||||||
{infoElem}
|
{lineInterference &&
|
||||||
|
<p>{trafficInfo} <u>Visa mer</u></p>
|
||||||
|
}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -8,18 +8,20 @@ class TrafficList extends Component {
|
|||||||
render() {
|
render() {
|
||||||
let entries = [];
|
let entries = [];
|
||||||
|
|
||||||
|
let i = 0; // React requires elems in array to have associated unique key
|
||||||
|
|
||||||
this.props.departures.forEach(departure => {
|
this.props.departures.forEach(departure => {
|
||||||
entries.push(
|
entries.push(
|
||||||
<TrafficEntry departure={departure} />
|
<TrafficEntry key={i++} departure={departure} />
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Add separator between every element
|
// Add separator between every element
|
||||||
const intersperse = (arr, sep) => arr.reduce((a,v)=>[...a,v,sep],[]).slice(0,-1);
|
const intersperse = (arr, sep) => arr.reduce((a,v)=>[...a,v,sep],[]).slice(0,-1);
|
||||||
entries = intersperse(entries, (<hr />));
|
entries = intersperse(entries, (<hr key={i++} />));
|
||||||
|
|
||||||
// Add separator after the last element
|
// Add separator after the last element
|
||||||
entries.push(<hr />);
|
entries.push(<hr key={i++} />);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div id="trafficList">
|
<div id="trafficList">
|
||||||
|
@ -7,7 +7,7 @@ class TripSelector extends Component {
|
|||||||
<label>Från:</label>
|
<label>Från:</label>
|
||||||
<input type="text" placeholder="Hållplats/Adress/Plats" />
|
<input type="text" placeholder="Hållplats/Adress/Plats" />
|
||||||
<hr/>
|
<hr/>
|
||||||
<label for="lname">Till:</label>
|
<label>Till:</label>
|
||||||
<input type="text" placeholder="Hållplats/Adress/Plats" />
|
<input type="text" placeholder="Hållplats/Adress/Plats" />
|
||||||
</form>
|
</form>
|
||||||
);
|
);
|
||||||
|
Loading…
Reference in New Issue
Block a user