Skip to content
Open
Show file tree
Hide file tree
Changes from all 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
8 changes: 4 additions & 4 deletions web/src/auth/PrivateRoute.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import { Redirect, Route } from 'react-router-dom';

export const PrivateRoute = ({ component: Component, ...rest }) => {
// Add your own authentication on the below line.
const isLoggedIn =
localStorage.getItem('uuid') !== null
? true
: false;
const isLoggedIn = true;
// localStorage.getItem('uuid') !== null
// ? true
// : false;

return (
(
Expand Down
8 changes: 4 additions & 4 deletions web/src/components/LineChart.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ const data = {
pointRadius: 0,
fill: false,
borderWidth: 4,
data: [100, 50, 0, 67, 12, 89, 65, 0, 100]
data: [20, 25, 23, 30, 40, 65, 45, 17, 24]
},
{
borderColor: 'violet',
hoverBorderColor: 'white',
pointRadius: 0,
fill: false,
borderWidth: 4,
data: [30, 96, 87, 12, 50, 90, 50, 0, 100]
data: [60, 55, 87, 74, 87, 42, 52, 42, 45]
}
]
};
Expand All @@ -28,8 +28,8 @@ export default class LineChart extends Component {
render() {
return (
<div>
<header id="graph-title">SOME DAY: SOME FACTOR</header>
<header id="line-graph-score">92%</header>
<header id="graph-title">FRIDAY: LIGHT QUALITY</header>
<header id="line-graph-score">22%</header>
<div id="line-graph-container">
<Line
data={data}
Expand Down
28 changes: 14 additions & 14 deletions web/src/pages/Factors.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,31 @@ class FactorGrid extends React.Component {
render() {
return (
<div id="factor-grid" className="ui grid">
<div className="four wide column">
<FactorStatus
score="63"
factor="Air quality"
colour_class="yellow-factor"
/>
</div>
<div className="four wide column">
<FactorStatus
score="30"
factor="Temperature"
score="22"
factor="Light quality"
colour_class="red-factor"
/>
</div>
<div className="four wide column">
<FactorStatus
score="75"
factor="Factor 2"
colour_class="green-factor"
/>
</div>
<div className="four wide column">
<FactorStatus
score="75"
factor="Factor 3"
score="53"
factor="Noise quality"
colour_class="yellow-factor"
/>
</div>
<div className="four wide column">
<FactorStatus
score="75"
factor="Factor 4"
score="82"
factor="Temperature"
colour_class="green-factor"
/>
</div>
Expand All @@ -50,7 +50,7 @@ export default class Factors extends React.Component {
</button>
</Link>
<div id="content-container">
<header id="graph-title">SOME DAY</header>
<header id="graph-title">FRIDAY</header>
<FactorGrid />
</div>
</div>
Expand Down
8 changes: 3 additions & 5 deletions web/src/pages/Feedback.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,9 @@ export default class Feedback extends React.Component {
<div id="sensor-feedback">
<header>What can you do?</header>
<ul>
<li>this</li>
<li>this</li>
<li>this</li>
<li>this</li>
<li>this</li>
<li>Try installing blackout blinds</li>
<li>Change bulbs to have warmer light</li>
<li>Turn off screens and appliances</li>
</ul>
</div>
</div>
Expand Down