Skip to content

Commit

Permalink
pretty
Browse files Browse the repository at this point in the history
  • Loading branch information
dwilt committed Feb 17, 2018
1 parent 74b0734 commit 51fe6cd
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 35 deletions.
38 changes: 18 additions & 20 deletions src/components/Quiz/Quiz.component.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
import React, { PureComponent } from "react";

import isEmptyObject from 'is-empty-object';
import isEmptyObject from "is-empty-object";

import {
QuizQuestion,
} from 'components';
import { QuizQuestion } from "components";

import PropTypes from 'prop-types';
import PropTypes from "prop-types";

import "./Quiz.css";

export default class Quiz extends PureComponent {
static propTypes = {
questions: PropTypes.object,
};
static propTypes = {
questions: PropTypes.object,
};

render() {
const { questions } = this.props;
render() {
const { questions } = this.props;

return questions && !isEmptyObject(questions) ? (
<div className={`Quiz`}>
{Object.values(questions).map((question) => (
<div key={question.id}>
<QuizQuestion {...question} />
</div>
))}
</div>
) : null;
}
return questions && !isEmptyObject(questions) ? (
<div className={`Quiz`}>
{Object.values(questions).map((question) => (
<div key={question.id}>
<QuizQuestion {...question} />
</div>
))}
</div>
) : null;
}
}
22 changes: 9 additions & 13 deletions src/components/Quiz/Quiz.container.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
import { connect } from 'react-redux'
import { connect } from "react-redux";

import { compose } from 'redux'
import { compose } from "redux";

import { firestoreConnect } from 'react-redux-firebase'
import { firestoreConnect } from "react-redux-firebase";

import Quiz from './Quiz.component';
import Quiz from "./Quiz.component";

export default compose(
firestoreConnect([
`questions`,
]),
connect(
(state) => ({
questions: state.firestore.data.questions
})
)
)(Quiz)
firestoreConnect([`questions`]),
connect((state) => ({
questions: state.firestore.data.questions,
}))
)(Quiz);
8 changes: 6 additions & 2 deletions src/store/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { reduxFirestore, firestoreReducer } from "redux-firestore";

import firebase from "firebase";

import 'firebase/firestore';
import "firebase/firestore";

// react-redux-firebase config
const rrfConfig = {
Expand Down Expand Up @@ -34,4 +34,8 @@ const rootReducer = combineReducers({
firestore: firestoreReducer, // <- needed if using firestore
});

export default createStoreWithFirebase(rootReducer, {}, window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__());
export default createStoreWithFirebase(
rootReducer,
{},
window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__()
);

0 comments on commit 51fe6cd

Please sign in to comment.