Merge branch 'fil-small-fixes-02' into 'dev'

added: icons for curtains and thermostat, all links in the footer now work,...

See merge request sa4-2020/the-sanmarinoes/frontend!134
This commit is contained in:
Andrea Brites Marto 2020-05-07 13:22:22 +02:00
commit 26d1f22c04
5 changed files with 16 additions and 8 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -165,8 +165,12 @@ class NewDevice extends Component {
render() { render() {
const deviceOptions = [ const deviceOptions = [
//stuff //stuff
{ key: "thermostat", text: "Thermostat", value: "thermostat", image: {} }, { key: "thermostat", text: "Thermostat", value: "thermostat",
{ key: "curtains", text: "Curtain", value: "curtains", image: {} }, image: {avatar: true, src: "/img/thermostat-icon.png"}
},
{ key: "curtains", text: "Curtain", value: "curtains",
image: {avatar: true, src: "/img/curtains-icon.png"}
},
//stuff ends //stuff ends
{ {
key: "light", key: "light",

View File

@ -70,12 +70,16 @@ class Videocam extends Component {
/> />
</Grid.Column> </Grid.Column>
</Grid.Row> </Grid.Row>
</Grid> <Grid.Row textAlign="center">
<Grid.Column>
<Checkbox <Checkbox
checked={this.props.stateOrDevice.on} checked={this.props.stateOrDevice.on}
toggle toggle
onChange={(e, val) => this.setOnOff(val.checked)} onChange={(e, val) => this.setOnOff(val.checked)}
/> />
</Grid.Column>
</Grid.Row>
</Grid>
</div> </div>
); );

View File

@ -247,7 +247,7 @@ const Home = () => (
</a> </a>
</List.Item> </List.Item>
<List.Item> <List.Item>
<a href="https://theshell.ch" target="blank"> <a href="https://www.theshell.ch" target="blank">
The Shell The Shell
</a> </a>
</List.Item> </List.Item>