Skip to content

Commit

Permalink
prettify for settings change
Browse files Browse the repository at this point in the history
  • Loading branch information
jacobdcastro committed Nov 13, 2019
1 parent 7c6a8f1 commit 8b7daff
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 30 deletions.
30 changes: 15 additions & 15 deletions client/src/components/lobby/PlayerSubmitScore.js
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import React, { useState, Fragment } from "react";
import PropTypes from "prop-types";
import { connect } from "react-redux";
import { submitPlayerScore } from "../../redux/actions/game";
import ScoreForm from "./ScoreForm";
import React, { useState, Fragment } from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { submitPlayerScore } from '../../redux/actions/game';
import ScoreForm from './ScoreForm';
import {
DialogContent,
DialogTitle,
DialogActions,
Button
} from "@material-ui/core";
Button,
} from '@material-ui/core';

// TODO fix broken player submit form

const PlayerSubmitScore = ({
roundData,
playerId,
gameId,
submitPlayerScore
submitPlayerScore,
}) => {
const [roundScore, setRoundScore] = useState(0);
const { roundNumber } = roundData;
Expand All @@ -41,11 +41,11 @@ const PlayerSubmitScore = ({

<DialogActions>
<Button
variant="contained"
size="large"
color="primary"
className="submitScoreBtn"
type="submit"
variant='contained'
size='large'
color='primary'
className='submitScoreBtn'
type='submit'
onClick={e => handleSubmit(e)}
>
Submit Score
Expand All @@ -59,12 +59,12 @@ PlayerSubmitScore.propTypes = {
roundData: PropTypes.object,
playerId: PropTypes.string,
gameId: PropTypes.string.isRequired,
submitPlayerScore: PropTypes.func.isRequired
submitPlayerScore: PropTypes.func.isRequired,
};

const mapStateToProps = state => ({
playerId: state.player._id,
gameId: state.game._id
gameId: state.game._id,
});

export default connect(mapStateToProps, { submitPlayerScore })(
Expand Down
27 changes: 12 additions & 15 deletions client/src/components/lobby/gamemaster/GMSubmitScores.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
import React, { useState, Fragment } from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import { submitPlayerScore } from '../../../redux/actions/game';
import ScoreForm from '../ScoreForm';
import React, { useState, Fragment } from "react";
import { connect } from "react-redux";
import PropTypes from "prop-types";
import { submitPlayerScore } from "../../../redux/actions/game";
import ScoreForm from "../ScoreForm";
import {
DialogContent,
DialogTitle,
DialogActions,
Button,
} from '@material-ui/core';
Button
} from "@material-ui/core";

const GMSubmitScores = ({
index,
setIndex,
playerBeingScored,
submitPlayerScore,
playersToScoreLength,
playersToScoreLength
}) => {
const [roundScore, setRoundScore] = useState(0);
const playerId = playerBeingScored._id;

// object is added to/manipulated in submitScore()'s
let actionData = {
gameId: localStorage.gameId,
gameId: localStorage.gameId
};

const handleScoreSubmit = () => {
Expand All @@ -38,7 +38,7 @@ const GMSubmitScores = ({
<Fragment>
<DialogTitle>
{playerBeingScored.isGamemaster
? 'Enter your score'
? "Enter your score"
: `Enter score for ${playerBeingScored.name}`}
</DialogTitle>
<DialogContent>
Expand All @@ -63,10 +63,7 @@ GMSubmitScores.propTypes = {
index: PropTypes.number.isRequired,
setIndex: PropTypes.func.isRequired,
playerBeingScored: PropTypes.object.isRequired,
submitPlayerScore: PropTypes.func.isRequired,
submitPlayerScore: PropTypes.func.isRequired
};

export default connect(
null,
{ submitPlayerScore }
)(GMSubmitScores);
export default connect(null, { submitPlayerScore })(GMSubmitScores);

0 comments on commit 8b7daff

Please sign in to comment.