Skip to content

Commit

Permalink
#88 trying the link and the title
Browse files Browse the repository at this point in the history
  • Loading branch information
HennecartLisa committed Aug 27, 2018
1 parent 6230e29 commit c107707
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 20 deletions.
16 changes: 1 addition & 15 deletions src/components/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,6 @@ export default class Header extends Component {
</p>
</div>;

typeOfBuildingFilter =
<Row>
<Input name='group1' type='checkbox' value='restaurant' label='Restaurant'/>
<Input name='group1' type='checkbox' value='bar' label='Cafe'/>
<Input name='group1' type='checkbox' value='shop' label='Winkelen'/>
<Input name='group1' type='checkbox' value='school' label='School'/>
<Input name='group1' type='checkbox' value='hospital' label='Ziekenhuis'/>
</Row>;

facilitiesFilter =
<Row>
<Input name='group2' type='checkbox' value='red' label='Lift'/>
<Input name='group2' type='checkbox' value='yellow' label='Ringleiding'/>
</Row>;

/**
* This array determines which filters are rendered, and consists of the name (shown in the header) and the component which is shown in the modal
*
Expand Down Expand Up @@ -137,6 +122,7 @@ export default class Header extends Component {
<p>
vul alstublieft de breedte van uw rolstoel in.</p><p> We toon enkel bereikbare locaties voor jou op de kaart.</p>
</Modal>

<Col s={1} className="right">
<a href="https://github.com/oSoc18/OASIS" target="_blank">
<img alt="github icon" title="github" className="social__media__icon"
Expand Down
3 changes: 1 addition & 2 deletions src/components/Sidebar.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import SearchResult from "./SidebarSearchResult.jsx";
import {Card, Col, Pagination} from "react-materialize";
import {Card, Col, Pagination, Preloader} from "react-materialize";
import BuildingDetail from './SidebarBuildingDetail.jsx';
import {inject, observer} from 'mobx-react';

Expand Down Expand Up @@ -44,7 +44,6 @@ export default class Sidebar extends React.Component {
? this.BuildingStore.getFilteredBuildings.length + " resultaten "
: "Resultaat voor '" + this.BuildingStore.getSearchKey + "' (" + this.renderLists().length + ")";
return (

<Col l={4} m={6} s={12} className="no-padding">
<div className="sidebar__list">
{this.show()}
Expand Down
12 changes: 10 additions & 2 deletions src/components/SidebarBuildingDetail.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,22 @@ export default class SidebarBuildingDetail extends Component {
}
}

titleBuild = () => {
if (this.Building.title.includes("&#39;t")) {
return "Sporthall";
} else {
return this.Building.title;
}
}

render() {
return (
<Row>
<Col>
<h2>{this.Building.title}</h2>
<h2>{this.titleBuild()}</h2>
</Col>
<Col s={12}>
<p>{this.Building.description}</p>
<a href={this.Building.description}>link to the page</a>
</Col>
<Col s={12}>
{this.showAccessibilityInformation()}
Expand Down
2 changes: 1 addition & 1 deletion src/components/SidebarSearchResult.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default class SidebarSearchResult extends React.Component {


<Col m={9} s={12}>
<span className="sidebar__searchresult__description"><p>{this.Building.description}</p></span>
<span className="sidebar__searchresult__description"><a hred={this.Building.description}>link to the page</a></span>
</Col>
<img className="col m3 s12 sidebar__searchresult__thumbnail" src={this.Building.src}/>
<Col m={9} s={12}>
Expand Down

0 comments on commit c107707

Please sign in to comment.