Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
aquinojardim committed Aug 30, 2020
1 parent e45b1ac commit cf05529
Show file tree
Hide file tree
Showing 34 changed files with 926 additions and 771 deletions.
16 changes: 16 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
module.exports = {
env: {
browser: true,
es2020: true,
},
extends: ["eslint:recommended", "plugin:react/recommended"],
parserOptions: {
ecmaFeatures: {
jsx: true,
},
ecmaVersion: 12,
sourceType: "module",
},
plugins: ["react"],
rules: {},
};
6 changes: 6 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Ignore artifacts:
build
coverage

# Ignore all HTML files:
*.html
1 change: 1 addition & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{}
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
# smarthome

Application for home automation that turns lights on and off and controls temperature
9 changes: 4 additions & 5 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
module.exports = {
presets: [
[
'@babel/preset-env',
"@babel/preset-env",
{
targets: {
node: 'current',
node: "current",
},
},
],
'@babel/preset-react',
"@babel/preset-react",
],

};
};
3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@
"concurrently": "^5.2.0",
"cross-env": "^7.0.2",
"css-loader": "^3.5.3",
"eslint": "^7.7.0",
"eslint-plugin-react": "^7.20.6",
"html-webpack-plugin": "^4.3.0",
"jest": "^26.4.0",
"nodemon": "^2.0.4",
"prettier": "2.1.1",
"style-loader": "^1.2.1",
"webpack": "^4.43.0",
"webpack-cli": "^3.3.11",
Expand Down
16 changes: 8 additions & 8 deletions src/__tests__/index.test.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from '../client/App';
import store from '../client/store';
import React from "react";
import ReactDOM from "react-dom";
import App from "../client/App";
import store from "../client/store";

it('renders without crashing', () => {
const div = document.createElement('div');
ReactDOM.render(<App store={store}/>, div);
});
it("renders without crashing", () => {
const div = document.createElement("div");
ReactDOM.render(<App store={store} />, div);
});
40 changes: 19 additions & 21 deletions src/client/App.jsx
Original file line number Diff line number Diff line change
@@ -1,41 +1,39 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Provider } from 'react-redux';
import store from './reducer/store';
import {BrowserRouter as Router, Route, Switch} from 'react-router-dom';
import { createMuiTheme, ThemeProvider } from '@material-ui/core';
import teal from '@material-ui/core/colors/teal';
import { CssBaseline } from '@material-ui/core';
import Home from './layouts/Home';
import React from "react";
import PropTypes from "prop-types";
import { Provider } from "react-redux";
import { BrowserRouter as Router, Route, Switch } from "react-router-dom";
import { createMuiTheme, ThemeProvider } from "@material-ui/core";
import teal from "@material-ui/core/colors/teal";
import { CssBaseline } from "@material-ui/core";
import Home from "./layouts/Home";

const myColor = teal;
const myColor = teal;

const theme = createMuiTheme({
palette: {
primary: myColor,
secondary: myColor,
type: 'dark',
}
})
type: "dark",
},
});

// Return the App, rendering the MainContainer within it
const App = ({store}) => {

return(
const App = ({ store }) => {
return (
<Provider store={store}>
<ThemeProvider theme={theme}>
{/* works the same as a CSS-reset */}
{/* works the same as a CSS-reset */}
<CssBaseline />
{/* could be made into a component and stored on routes folder */}
<Router>
<Switch>
<Route exact path="/" component={Home}/>
<Route exact path="/" component={Home} />
</Switch>
</Router>
</ThemeProvider>
</Provider>
)
);
};
App.propTypes = {store: PropTypes.object.isRequired};
App.propTypes = { store: PropTypes.object.isRequired };

export default App;
export default App;
41 changes: 22 additions & 19 deletions src/client/components/BottomBar.jsx
Original file line number Diff line number Diff line change
@@ -1,41 +1,44 @@
import React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import BottomNavigation from '@material-ui/core/BottomNavigation';
import BottomNavigationAction from '@material-ui/core/BottomNavigationAction';
import SpeedIcon from '@material-ui/icons/Speed';
import EmojiObjectsIcon from '@material-ui/icons/EmojiObjects';
import Button from '@material-ui/core/Button';
/* eslint-disable react/prop-types */
import React from "react";
import { makeStyles } from "@material-ui/core/styles";
import { BottomNavigation, BottomNavigationAction } from "@material-ui/core";
import SpeedIcon from "@material-ui/icons/Speed";
import EmojiObjectsIcon from "@material-ui/icons/EmojiObjects";

const useStyles = makeStyles({
root: {
width: '100%',
position: 'fixed',
width: "100%",
position: "fixed",
bottom: 0,
background: 'black'
background: "black",
},
button: {
width: '100%',
width: "100%",
},
});

export default function BottomBar({view, setView}) {
export default function BottomBar({ view, setView }) {
const classes = useStyles();

return (
<BottomNavigation
value={view}
onChange={(event, newValue) => {
setView(newValue);

}}
showLabels
className={classes.root}
>
<BottomNavigationAction
className={classes.button} label="Temperature Panel" icon={<SpeedIcon />} />
<BottomNavigationAction
className={classes.button}
label="Light Panel" icon={<EmojiObjectsIcon />} />
<BottomNavigationAction
className={classes.button}
label="Temperature Panel"
icon={<SpeedIcon />}
/>
<BottomNavigationAction
className={classes.button}
label="Light Panel"
icon={<EmojiObjectsIcon />}
/>
</BottomNavigation>
);
}
}
86 changes: 44 additions & 42 deletions src/client/components/TopBar.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
import React from 'react';
import { makeStyles } from '@material-ui/core/styles';
import Toolbar from '@material-ui/core/Toolbar';
import Typography from '@material-ui/core/Typography';
import IconButton from '@material-ui/core/IconButton';
import MenuIcon from '@material-ui/icons/Menu';
import AccountCircle from '@material-ui/icons/AccountCircle';
import MenuItem from '@material-ui/core/MenuItem';
import Menu from '@material-ui/core/Menu';
import React from "react";
import { makeStyles } from "@material-ui/core/styles";
import { Toolbar, Typography, IconButton, MenuItem, Menu } from "@material-ui/core";
import MenuIcon from "@material-ui/icons/Menu";
import AccountCircle from "@material-ui/icons/AccountCircle";

const useStyles = makeStyles((theme) => ({
root: {
Expand All @@ -24,57 +20,63 @@ export default function TopBar() {
const classes = useStyles();
const [anchorEl, setAnchorEl] = React.useState(null);
const open = Boolean(anchorEl);
const today = new Date().toDateString()
const today = new Date().toDateString();

const handleMenu = (event) => {
setAnchorEl(event.currentTarget);
};

const handleClose = () => {
// eslint-disable-next-line no-unused-vars
const handleClose = (event) => {
setAnchorEl(null);
};

return (
<div className={classes.root}>
<div>
<Toolbar>
<IconButton edge="start" className={classes.menuButton} color="inherit" aria-label="menu">
<IconButton
edge="start"
className={classes.menuButton}
color="inherit"
aria-label="menu"
>
<MenuIcon />
</IconButton>
<Typography variant="h6" className={classes.title}>
{today}
</Typography>
<div>
<IconButton
aria-label="account of current user"
aria-controls="menu-appbar"
aria-haspopup="true"
onClick={handleMenu}
color="inherit"
>
<AccountCircle />
</IconButton>
<Menu
id="menu-appbar"
anchorEl={anchorEl}
anchorOrigin={{
vertical: 'top',
horizontal: 'right',
}}
keepMounted
transformOrigin={{
vertical: 'top',
horizontal: 'right',
}}
open={open}
onClose={handleClose}
>
<MenuItem onClick={handleClose}>Login</MenuItem>
<MenuItem onClick={handleClose}>Sign up </MenuItem>
</Menu>
</div>
<div>
<IconButton
aria-label="account of current user"
aria-controls="menu-appbar"
aria-haspopup="true"
onClick={handleMenu}
color="inherit"
>
<AccountCircle />
</IconButton>
<Menu
id="menu-appbar"
anchorEl={anchorEl}
anchorOrigin={{
vertical: "top",
horizontal: "right",
}}
keepMounted
transformOrigin={{
vertical: "top",
horizontal: "right",
}}
open={open}
onClose={handleClose}
>
<MenuItem onClick={handleClose}>Login</MenuItem>
<MenuItem onClick={handleClose}>Sign up </MenuItem>
</Menu>
</div>
</Toolbar>
</div>
</div>
);
}
}
Loading

0 comments on commit cf05529

Please sign in to comment.