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

chore: merge develop branch #74

Merged
merged 34 commits into from
Mar 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
08b15af
fix: prevent image load jank
cdtinney Mar 6, 2019
8b0bc18
fix: allow progressive image to load placeholders
cdtinney Mar 6, 2019
2101e87
tests: add parentheses to func unit test describe blocks
cdtinney Mar 6, 2019
bc9018d
docs: delete unused readme
cdtinney Mar 6, 2019
a9fb0b9
refactor: rename action for clarity
cdtinney Mar 6, 2019
a8cc026
refactor: rename actions using fetch for consistency
cdtinney Mar 6, 2019
a6b2d1d
refactor: move action types under obj
cdtinney Mar 7, 2019
4247744
cleanup
cdtinney Mar 7, 2019
4b5bcc0
add assets to repo
cdtinney Mar 8, 2019
f0b5c0e
shuffle related albums before displaying
cdtinney Mar 8, 2019
ec2ac0f
fix: store user auth errors as strings
cdtinney Mar 11, 2019
2cc8516
fix: linting errors
cdtinney Mar 11, 2019
b27702b
refactor: use masonry
cdtinney Mar 8, 2019
aea440d
improve song card animations
cdtinney Mar 8, 2019
324089d
refactor: map album artists by ID
cdtinney Mar 8, 2019
a66fcc9
refactor: add window props to state
cdtinney Mar 11, 2019
fa043a2
ci: use fixed Node version due to bug
cdtinney Mar 11, 2019
cdfcde0
fix: linting errors
cdtinney Mar 11, 2019
fba4604
tests: add missing test
cdtinney Mar 11, 2019
991abb3
refactor: nest browser resolution in state
cdtinney Mar 12, 2019
d922f73
refactor: use selectors to memoize num albums to display
cdtinney Mar 12, 2019
674b2fc
tests: skip failing test
cdtinney Mar 12, 2019
c9c0af4
refactor: store album ID ordering in state
cdtinney Mar 12, 2019
9d45679
tests: fix tests
cdtinney Mar 12, 2019
66861f5
tests: fix tests
cdtinney Mar 12, 2019
46413f9
shuffle displayed albums
cdtinney Mar 12, 2019
c38a262
fix: remove duplicate albums shared by artists
cdtinney Mar 12, 2019
5c72376
tests: fix broken tests
cdtinney Mar 12, 2019
5571a9d
improve jank when loading album images
cdtinney Mar 12, 2019
2bfbb2a
animate color overlay
cdtinney Mar 12, 2019
009c8aa
refactor: remove useless component
cdtinney Mar 12, 2019
2dc08f2
debug: add tool for logging unnecessary renders
cdtinney Mar 12, 2019
c7a934c
fix: no longer update state if song hasnt changed
cdtinney Mar 12, 2019
7e4d0b0
fix: broken tests
cdtinney Mar 12, 2019
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
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: node_js
node_js:
- "node"
# Latest has a bug: https://github.com/facebook/create-react-app/issues/6591
- "11.10.1"

# Caches node_modules for 3 minutes
cache: npm
Expand Down
Binary file added assets/spune_favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/spune_favicon.psd
Binary file not shown.
Binary file added assets/spune_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/spune_logo.psd
Binary file not shown.
2,444 changes: 0 additions & 2,444 deletions packages/client/README-cra.md

This file was deleted.

115 changes: 114 additions & 1 deletion packages/client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,24 @@
"@material-ui/core": "^3.9.2",
"axios": "^0.18.0",
"connected-react-router": "6.0.0",
"debounce": "^1.2.0",
"http-proxy-middleware": "^0.19.1",
"immutability-helper": "^3.0.0",
"prop-types": "^15.7.2",
"react": "^16.8.1",
"react-dom": "^16.8.1",
"react-full-screen": "^0.2.3",
"react-progressive-image": "0.6.0",
"react-masonry-component": "^6.2.1",
"react-progressive-image": "^0.6.0",
"react-redux": "^6.0.0",
"react-router": "4.3.1",
"react-scripts": "^2.1.5",
"react-window-size": "^1.2.2",
"redux": "^4.0.1",
"redux-responsive": "^4.3.8",
"redux-thunk": "2.3.0",
"reselect": "^4.0.0"
"reselect": "^4.0.0",
"why-did-you-update": "^1.0.6"
},
"devDependencies": {
"axios-mock-adapter": "^1.16.0",
Expand Down
19 changes: 12 additions & 7 deletions packages/client/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,19 @@ import Routes from './routes';
import * as userActions from './actions/user';
import './App.css';

/**
* Root application component.
*
* When it's first mounted, it attempts to authorize the user.
*/
export class App extends Component {
static propTypes = {
userAuthenticated: PropTypes.bool.isRequired,
fetchAuthUser: PropTypes.func.isRequired,
fetchUserAuth: PropTypes.func.isRequired,
};

componentDidMount() {
this.props.fetchAuthUser();
this.props.fetchUserAuth();
}

render() {
Expand All @@ -49,8 +54,8 @@ function mapStateToProps(state) {

function mapDispatchToProps(dispatch) {
return {
fetchAuthUser() {
dispatch(userActions.fetchAuthUser());
fetchUserAuth() {
dispatch(userActions.fetchUserAuth());
},
};
}
Expand All @@ -59,14 +64,14 @@ function ConnectedApp(props) {
const {
history,
userAuthenticated,
fetchAuthUser,
fetchUserAuth,
} = props;

return (
<ConnectedRouter history={history}>
<App
userAuthenticated={userAuthenticated}
fetchAuthUser={fetchAuthUser}
fetchUserAuth={fetchUserAuth}
/>
</ConnectedRouter>
);
Expand All @@ -76,7 +81,7 @@ function ConnectedApp(props) {
ConnectedApp.propTypes = {
history: PropTypes.object.isRequired,
userAuthenticated: PropTypes.bool.isRequired,
fetchAuthUser: PropTypes.func.isRequired,
fetchUserAuth: PropTypes.func.isRequired,
};

export default connect(
Expand Down
2 changes: 1 addition & 1 deletion packages/client/src/__tests__/App.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe('App', () => {
shallow(
<App
userAuthenticated={false}
fetchAuthUser={() => {}}
fetchUserAuth={() => {}}
/>, {
context,
},
Expand Down
Loading