Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Responsive Tiles #533 #608

Open
wants to merge 3 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,4 @@ const mapDispatchToProps = dispatch => ({
),
});

export default connect(
mapStateToProps,
mapDispatchToProps,
)(App);
export default connect(mapStateToProps, mapDispatchToProps)(App);
7 changes: 1 addition & 6 deletions src/components/Appshell/Appshell.js
Original file line number Diff line number Diff line change
Expand Up @@ -506,11 +506,6 @@ const mapDispatchToProps = dispatch => ({

export default withRouter(
withTheme()(
withStyles(styles)(
connect(
mapStateToProps,
mapDispatchToProps,
)(Appshell),
),
withStyles(styles)(connect(mapStateToProps, mapDispatchToProps)(Appshell)),
),
);
5 changes: 1 addition & 4 deletions src/components/CustomCircularInput/CustomCircularInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,5 @@ const mapDispatchToProps = dispatch => ({
});

export default withTheme(
connect(
null,
mapDispatchToProps,
)(CustomCircularInput),
connect(null, mapDispatchToProps)(CustomCircularInput),
);
5 changes: 1 addition & 4 deletions src/components/CustomSliderInput/CustomSliderInput.js
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,5 @@ const mapDispatchToProps = dispatch => ({
});

export default withStyles(styles)(
connect(
null,
mapDispatchToProps,
)(CustomSliderInput),
connect(null, mapDispatchToProps)(CustomSliderInput),
);
2 changes: 1 addition & 1 deletion src/components/GraphPanelLayout/GraphPanelLayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
SettingsContainer,
SettingsWrapper,
GraphContainer,
InformationContainer
InformationContainer,
} from './GraphPanelLayout.styles';

const GraphPanelLayout = ({ actionButtons, settings, graph, information }) => {
Expand Down
5 changes: 1 addition & 4 deletions src/components/SimplePanelLayout/SimplePanelLayout.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
import React from 'react';
import {
LayoutWrapper,
LayoutContainer,
} from './SimplePanelLayout.styles';
import { LayoutWrapper, LayoutContainer } from './SimplePanelLayout.styles';

const SimplePanelLayout = props => {
const { panel } = props;
Expand Down
14 changes: 7 additions & 7 deletions src/screen/AboutUs/AboutUs.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,10 @@ const AboutUs = () => {
}}
>
<ListItemIcon>
<img
<img
src={FacebookIcon}
style={{ height: '3em', width: '3em' }}
alt=""
style={{ height: '3em', width: '3em' }}
alt=""
/>
</ListItemIcon>
<ListItemText primary="Like us on Facebook" />
Expand All @@ -156,10 +156,10 @@ const AboutUs = () => {
}}
>
<ListItemIcon>
<img
<img
src={TwitterIcon}
style={{ height: '3em', width: '3em' }}
alt=""
style={{ height: '3em', width: '3em' }}
alt=""
/>
</ListItemIcon>
<ListItemText primary="Follow us on Twitter" />
Expand All @@ -183,7 +183,7 @@ const AboutUs = () => {
<img
src={YoutubeIcon}
style={{ height: '3em', width: '3em' }}
alt=""
alt=""
/>
</ListItemIcon>
<ListItemText primary="Watch us on Youtube" />
Expand Down
5 changes: 1 addition & 4 deletions src/screen/DeviceScreen/DeviceScreen.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,4 @@ const mapStateToProps = state => ({
deviceInformation: state.app.device.deviceInformation,
});

export default connect(
mapStateToProps,
null,
)(DeviceScreen);
export default connect(mapStateToProps, null)(DeviceScreen);
2 changes: 1 addition & 1 deletion src/screen/DeviceScreen/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import DeviceScreen from './DeviceScreen';

export default DeviceScreen;
export default DeviceScreen;
5 changes: 4 additions & 1 deletion src/screen/FAQ/FAQ.js
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,10 @@ const FAQ = () => {
collected. Future versions of the device will come with a SD card
to store the data locally as well. At the moment there are still
limits to using this feature, but we are continuously working on
it <span role="img" aria-label="smiley">🙂</span>
it{' '}
<span role="img" aria-label="smiley">
🙂
</span>
</Typography>
</ExpansionPanelDetails>
</ExpansionPanel>
Expand Down
6 changes: 5 additions & 1 deletion src/screen/Home/components/InstrumentCard.styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const CustomCard = styled.div`
display: flex;
width: 48em;
height: 26em;
margin-right:1em;
margin-right: 1em;
transition-timing-function: ease-in-out;
transition-duration: 200ms;
border-radius: 8px;
Expand All @@ -18,6 +18,10 @@ export const CustomCard = styled.div`
box-shadow: 0px 3px 5px -1px rgba(0, 0, 0, 0.2),
0px 6px 10px 0px rgba(0, 0, 0, 0.14), 0px 1px 18px 0px rgba(0, 0, 0, 0.12);
}

@media only screen and (max-width: 1800px) {
margin-top: 10px;
}
`;

export const ImageWrapper = styled.div`
Expand Down
26 changes: 19 additions & 7 deletions src/screen/Home/components/Tabs.styles.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,34 @@
import styled from 'styled-components';

export const TabsContainer = styled.div`
height: calc(100% - 16px);
width: 100%;
display: flex;
flex-direction: column;
margin: 0px 0px 16px 0px;
margin: 0;
`;

export const TabsWrapper = styled.div`
margin: 16px 16px 0px 0px;
width: 98em;
export const TabsRow = styled.div`
display: flex;
justify-content: flex-start;
flex-wrap: wrap;
justify-content: center;
align-items: center;
`;
export const TabsRow = styled.div`

export const TabsWrapper = styled.div`
display: flex;
flex-wrap: wrap;
justify-content: center;
`;

export const InstrumentCard = styled.div`
display: flex;
flex-wrap: wrap;
justify-content: center;
align-items: center;
@media only screen and (max-width: 1800px) {
display: flex;
flex-direction: wrap;
justify-content: center;
align-items: center;
}
`;
7 changes: 1 addition & 6 deletions src/screen/LoggedData/LoggedData.js
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,4 @@ const mapDispatchToProps = dispatch => ({
),
});

export default withRouter(
connect(
null,
mapDispatchToProps,
)(LoggedData),
);
export default withRouter(connect(null, mapDispatchToProps)(LoggedData));
5 changes: 1 addition & 4 deletions src/screen/LogicAnalyzer/LogicAnalyzer.js
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,4 @@ const mapStateToProps = state => ({
isConnected: state.app.device.isConnected,
});

export default connect(
mapStateToProps,
null,
)(LogicAnalyzer);
export default connect(mapStateToProps, null)(LogicAnalyzer);
5 changes: 1 addition & 4 deletions src/screen/Multimeter/Multimeter.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,4 @@ const mapStateToProps = state => ({
isConnected: state.app.device.isConnected,
});

export default connect(
mapStateToProps,
null,
)(Multimeter);
export default connect(mapStateToProps, null)(Multimeter);
5 changes: 1 addition & 4 deletions src/screen/Oscilloscope/Oscilloscope.js
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,4 @@ const mapStateToProps = state => ({
isConnected: state.app.device.isConnected,
});

export default connect(
mapStateToProps,
null,
)(Oscilloscope);
export default connect(mapStateToProps, null)(Oscilloscope);
7 changes: 1 addition & 6 deletions src/screen/PowerSource/PowerSource.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,4 @@ const mapStateToProps = state => ({
isConnected: state.app.device.isConnected,
});

export default withRouter(
connect(
mapStateToProps,
null,
)(PowerSouce),
);
export default withRouter(connect(mapStateToProps, null)(PowerSouce));
7 changes: 1 addition & 6 deletions src/screen/PowerSource/components/InstrumentCluster.js
Original file line number Diff line number Diff line change
Expand Up @@ -319,9 +319,4 @@ const mapDispatchToProps = dispatch => ({
),
});

export default withStyles(styles)(
connect(
null,
mapDispatchToProps,
)(Settings),
);
export default withStyles(styles)(connect(null, mapDispatchToProps)(Settings));
11 changes: 2 additions & 9 deletions src/screen/RobotArm/RobotArm.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import React, { Component } from 'react';
import { connect } from 'react-redux';
import {
Container,
KnobWrapper,
PaintWrapper
} from './RobotArm.styles';
import { Container, KnobWrapper, PaintWrapper } from './RobotArm.styles';
import PaintArea from './Components/PaintArea';
import KnobControl from './Components/KnobControl';
import range from 'lodash/range';
Expand Down Expand Up @@ -181,7 +177,4 @@ const mapStateToProps = state => ({
isConnected: state.app.device.isConnected,
});

export default connect(
mapStateToProps,
null,
)(RobotArm);
export default connect(mapStateToProps, null)(RobotArm);
7 changes: 1 addition & 6 deletions src/screen/WaveGenerator/WaveGenerator.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,9 +200,4 @@ const mapStateToProps = state => ({
isConnected: state.app.device.isConnected,
});

export default withRouter(
connect(
mapStateToProps,
null,
)(WaveGenerator),
);
export default withRouter(connect(mapStateToProps, null)(WaveGenerator));