Skip to content

Commit

Permalink
updated prettier config
Browse files Browse the repository at this point in the history
  • Loading branch information
@breeku
breeku committed May 15, 2020
1 parent 19f54aa commit 15b9deb
Show file tree
Hide file tree
Showing 44 changed files with 914 additions and 916 deletions.
5 changes: 3 additions & 2 deletions .prettierrc
View file
@@ -1,4 +1,5 @@
{
"tabWidth": 4,
"useTabs": false
"tabWidth": 4,
"useTabs": false,
"semi": false
}
72 changes: 36 additions & 36 deletions client/src/App.jsx
View file
@@ -1,25 +1,25 @@
import React, { useEffect } from "react";
import React, { useEffect } from "react"
import {
BrowserRouter as Router,
Route,
Redirect,
Switch,
} from "react-router-dom";
import { connect } from "react-redux";
} from "react-router-dom"
import { connect } from "react-redux"

import Main from "./components/Home/Home";
import Callback from "./components/Callback";
import Login from "./components/Login";
import PlaylistorAlbum from "./components/Playlist&Album/PlaylistorAlbum";
import Appbar from "./components/Appbar/Appbar";
import About from "./components/About/About";
import Search from "./components/Search/Search";
import Notifier from "./components/Notifier/Notifier";
import Main from "./components/Home/Home"
import Callback from "./components/Callback"
import Login from "./components/Login"
import PlaylistorAlbum from "./components/Playlist&Album/PlaylistorAlbum"
import Appbar from "./components/Appbar/Appbar"
import About from "./components/About/About"
import Search from "./components/Search/Search"
import Notifier from "./components/Notifier/Notifier"

import { getRecentAlbums } from "./reducers/albumReducer";
import { setToken } from "./reducers/authReducer";
import { initializePlaylists } from "./reducers/playlistReducer";
import { getUser } from "./reducers/userReducer";
import { getRecentAlbums } from "./reducers/albumReducer"
import { setToken } from "./reducers/authReducer"
import { initializePlaylists } from "./reducers/playlistReducer"
import { getUser } from "./reducers/userReducer"

const routes = [
{
Expand Down Expand Up @@ -54,7 +54,7 @@ const routes = [
exact: true,
main: () => <Search />,
},
];
]

const App = (props) => {
const {
Expand All @@ -66,42 +66,42 @@ const App = (props) => {
playlists,
user,
getUser,
} = props;
} = props

useEffect(() => {
if (!tokens) {
setToken();
setToken()
}
}, [setToken, tokens]);
}, [setToken, tokens])

useEffect(() => {
if (tokens && tokens.accessToken && !albums) {
getRecentAlbums({ accessToken: tokens.accessToken });
getRecentAlbums({ accessToken: tokens.accessToken })
}
}, [albums, getRecentAlbums, tokens]);
}, [albums, getRecentAlbums, tokens])

useEffect(() => {
if (tokens && tokens.accessToken && !playlists) {
initializePlaylists(tokens);
initializePlaylists(tokens)
}
}, [initializePlaylists, playlists, tokens]);
}, [initializePlaylists, playlists, tokens])

useEffect(() => {
if (tokens && tokens.accessToken && !user) {
getUser({ accessToken: tokens.accessToken });
getUser({ accessToken: tokens.accessToken })
}
}, [getUser, user, tokens]);
}, [getUser, user, tokens])

const TokenRouting = () => {
if (tokens) {
if (tokens.accessToken) {
return null;
return null
} else if (tokens.accessToken === null) {
return <Redirect to="/login" />;
return <Redirect to="/login" />
}
}
return null;
};
return null
}

return (
<React.Fragment>
Expand All @@ -121,8 +121,8 @@ const App = (props) => {
</Switch>
</Router>
</React.Fragment>
);
};
)
}

const mapStateToProps = (state) => {
return {
Expand All @@ -131,16 +131,16 @@ const mapStateToProps = (state) => {
recent: state.recent,
albums: state.albums,
user: state.user,
};
};
}
}

const mapDispatchToProps = {
setToken,
getRecentAlbums,
initializePlaylists,
getUser,
};
}

const ConnectedApp = connect(mapStateToProps, mapDispatchToProps)(App);
const ConnectedApp = connect(mapStateToProps, mapDispatchToProps)(App)

export default ConnectedApp;
export default ConnectedApp
14 changes: 7 additions & 7 deletions client/src/components/About/About.jsx
View file
@@ -1,6 +1,6 @@
import React from "react";
import React from "react"

import { makeStyles } from "@material-ui/core/styles";
import { makeStyles } from "@material-ui/core/styles"

const useStyles = makeStyles((theme) => ({
root: theme.root,
Expand All @@ -12,10 +12,10 @@ const useStyles = makeStyles((theme) => ({
a: {
color: "whitesmoke",
},
}));
}))

const About = () => {
const classes = useStyles();
const classes = useStyles()

return (
<div className={classes.root}>
Expand Down Expand Up @@ -63,7 +63,7 @@ const About = () => {
</div>
</main>
</div>
);
};
)
}

export default About;
export default About
88 changes: 44 additions & 44 deletions client/src/components/Appbar/Appbar.jsx
View file
@@ -1,34 +1,34 @@
import React, { useState } from "react";
import React, { useState } from "react"

import PlaylistList from "./PlaylistList";
import PlaylistList from "./PlaylistList"

import { Link } from "react-router-dom";
import { Link } from "react-router-dom"

import { connect } from "react-redux";
import { connect } from "react-redux"

import { withStyles } from "@material-ui/core/styles";
import Drawer from "@material-ui/core/Drawer";
import AppBar from "@material-ui/core/AppBar";
import Toolbar from "@material-ui/core/Toolbar";
import Typography from "@material-ui/core/Typography";
import Divider from "@material-ui/core/Divider";
import ListItem from "@material-ui/core/ListItem";
import ListItemIcon from "@material-ui/core/ListItemIcon";
import ListItemText from "@material-ui/core/ListItemText";
import List from "@material-ui/core/List";
import CssBaseline from "@material-ui/core/CssBaseline";
import Button from "@material-ui/core/Button";
import IconButton from "@material-ui/core/IconButton";
import Hidden from "@material-ui/core/Hidden";
import { withStyles } from "@material-ui/core/styles"
import Drawer from "@material-ui/core/Drawer"
import AppBar from "@material-ui/core/AppBar"
import Toolbar from "@material-ui/core/Toolbar"
import Typography from "@material-ui/core/Typography"
import Divider from "@material-ui/core/Divider"
import ListItem from "@material-ui/core/ListItem"
import ListItemIcon from "@material-ui/core/ListItemIcon"
import ListItemText from "@material-ui/core/ListItemText"
import List from "@material-ui/core/List"
import CssBaseline from "@material-ui/core/CssBaseline"
import Button from "@material-ui/core/Button"
import IconButton from "@material-ui/core/IconButton"
import Hidden from "@material-ui/core/Hidden"

import HomeIcon from "@material-ui/icons/Home";
import SearchIcon from "@material-ui/icons/Search";
import HelpOutlineIcon from "@material-ui/icons/HelpOutline";
import MenuIcon from "@material-ui/icons/Menu";
import HomeIcon from "@material-ui/icons/Home"
import SearchIcon from "@material-ui/icons/Search"
import HelpOutlineIcon from "@material-ui/icons/HelpOutline"
import MenuIcon from "@material-ui/icons/Menu"

import Cookies from "js-cookie";
import Cookies from "js-cookie"

const drawerWidth = 300;
const drawerWidth = 300
const styles = (theme) => ({
root: {
flexGrow: 1,
Expand Down Expand Up @@ -60,29 +60,29 @@ const styles = (theme) => ({
title: {
flexGrow: 1,
},
});
})

const Appbar = (props) => {
const { classes, tokens } = props;
const [mobileOpen, setMobileOpen] = useState(false);
const { classes, tokens } = props
const [mobileOpen, setMobileOpen] = useState(false)

const currentUrl = window.location.origin;
const redirectUrl = currentUrl + "/callback/";
const scopes = "&scope=user-read-recently-played%20user-top-read";
const currentUrl = window.location.origin
const redirectUrl = currentUrl + "/callback/"
const scopes = "&scope=user-read-recently-played%20user-top-read"
const authUrl =
"https://accounts.spotify.com/authorize?client_id=aef42b48cc74441299b7b1ac9b42a779&response_type=code&redirect_uri=" +
redirectUrl +
scopes;
scopes

const handleDrawerToggle = () => {
setMobileOpen(!mobileOpen);
};
setMobileOpen(!mobileOpen)
}

const handleLogout = () => {
Cookies.remove("accessToken");
Cookies.remove("refreshToken");
window.location.href = "/";
};
Cookies.remove("accessToken")
Cookies.remove("refreshToken")
window.location.href = "/"
}

const drawer = (
<React.Fragment>
Expand Down Expand Up @@ -125,7 +125,7 @@ const Appbar = (props) => {
<Divider />
<PlaylistList />
</React.Fragment>
);
)

return (
<React.Fragment>
Expand Down Expand Up @@ -192,15 +192,15 @@ const Appbar = (props) => {
</Hidden>
</nav>
</React.Fragment>
);
};
)
}

const mapStateToProps = (state) => {
return {
tokens: state.tokens,
};
};
}
}

const ConnectedAppbar = connect(mapStateToProps, null)(Appbar);
const ConnectedAppbar = connect(mapStateToProps, null)(Appbar)

export default withStyles(styles)(ConnectedAppbar);
export default withStyles(styles)(ConnectedAppbar)
34 changes: 17 additions & 17 deletions client/src/components/Appbar/PlaylistList.jsx
View file
@@ -1,23 +1,23 @@
import React from "react";
import React from "react"

import { connect } from "react-redux";
import { Link } from "react-router-dom";
import { connect } from "react-redux"
import { Link } from "react-router-dom"

import ListItem from "@material-ui/core/ListItem";
import ListItemText from "@material-ui/core/ListItemText";
import { withStyles } from "@material-ui/core/styles";
import ListItem from "@material-ui/core/ListItem"
import ListItemText from "@material-ui/core/ListItemText"
import { withStyles } from "@material-ui/core/styles"

import SkeletonPlaylists from "../Skeletons/SkeletonPlaylists";
import SkeletonPlaylists from "../Skeletons/SkeletonPlaylists"

import PerfectScrollbar from "react-perfect-scrollbar";
import "react-perfect-scrollbar/dist/css/styles.css";
import PerfectScrollbar from "react-perfect-scrollbar"
import "react-perfect-scrollbar/dist/css/styles.css"

const styles = (theme) => ({
a: theme.aNoDecoration,
});
})

const PlaylistList = (props) => {
const { classes, playlists, tokens } = props;
const { classes, playlists, tokens } = props

return (
<PerfectScrollbar>
Expand Down Expand Up @@ -47,16 +47,16 @@ const PlaylistList = (props) => {
</React.Fragment>
)}
</PerfectScrollbar>
);
};
)
}

const mapStateToProps = (state) => {
return {
tokens: state.tokens,
playlists: state.playlists,
};
};
}
}

const ConnectedPlaylists = connect(mapStateToProps, null)(PlaylistList);
const ConnectedPlaylists = connect(mapStateToProps, null)(PlaylistList)

export default withStyles(styles)(ConnectedPlaylists);
export default withStyles(styles)(ConnectedPlaylists)

0 comments on commit 15b9deb

Please sign in to comment.