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

Also show confetti on the new FinishDialog component #21002

Merged
merged 1 commit into from Mar 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/src/StudioApp.js
Expand Up @@ -1454,6 +1454,7 @@ StudioApp.prototype.displayFeedback = function (options) {
code: generatedCodeProperties.code,
};
store.dispatch(setFeedbackData({
isChallenge: this.config.isChallengeLevel,
isPerfect: feedbackType >= TestResults.MINIMUM_OPTIMAL_RESULT,
blocksUsed: this.feedback_.getNumCountableBlocks(),
displayFunometer: response && response.puzzle_ratings_enabled,
Expand Down
4 changes: 3 additions & 1 deletion apps/src/redux/feedback.js
Expand Up @@ -11,7 +11,7 @@ const initialState = {
displayingCode: false,
displayingShareControls: false,


isChallenge: false,
isPerfect: true,
blocksUsed: 0,
blockLimit: undefined,
Expand Down Expand Up @@ -48,6 +48,7 @@ export default function reducer(state = initialState, action) {
}
if (action.type === SET_FEEDBACK_DATA) {
const {
isChallenge,
isPerfect,
blocksUsed,
displayFunometer,
Expand All @@ -56,6 +57,7 @@ export default function reducer(state = initialState, action) {
} = action;
return {
...state,
isChallenge,
isPerfect,
blocksUsed,
displayFunometer,
Expand Down
13 changes: 13 additions & 0 deletions apps/src/templates/FinishDialog.jsx
Expand Up @@ -6,6 +6,7 @@ import BaseDialog from './BaseDialog';
import GeneratedCode from './feedback/GeneratedCode';
import Odometer from './Odometer';
import PuzzleRatingButtons from './PuzzleRatingButtons';
import Confetti from 'react-dom-confetti';
import React, { Component, PropTypes } from 'react';
import color from '../util/color';
import msg from '@cdo/locale';
Expand Down Expand Up @@ -37,6 +38,11 @@ const styles = {
content: {
padding: '42px 56px 5px',
},
confetti: {
position: 'relative',
left: '50%',
top: 150,
},
bubbleContainer: {
width: 74,
height: 74,
Expand Down Expand Up @@ -167,6 +173,7 @@ export class UnconnectedFinishDialog extends Component {
onContinue: PropTypes.func,
onReplay: PropTypes.func,

isChallenge: PropTypes.bool,
isPerfect: PropTypes.bool,
blocksUsed: PropTypes.number,
blockLimit: PropTypes.number,
Expand Down Expand Up @@ -409,6 +416,8 @@ export class UnconnectedFinishDialog extends Component {
return null;
}

const confetti = this.props.isChallenge && this.props.isPerfect && this.state.blocksCounted;

return (
<BaseDialog
isOpen={this.props.isOpen}
Expand All @@ -422,6 +431,9 @@ export class UnconnectedFinishDialog extends Component {
<div
style={styles.modal}
>
<div style={styles.confetti}>
<Confetti active={confetti} />
</div>
<div style={styles.header}>
{this.getBubble()}
</div>
Expand Down Expand Up @@ -451,6 +463,7 @@ export class UnconnectedFinishDialog extends Component {

export default connect(state => ({
isOpen: state.feedback.displayingFeedback,
isChallenge: state.feedback.isChallenge,
isPerfect: state.feedback.isPerfect,
blocksUsed: state.feedback.blocksUsed,
blockLimit: state.feedback.blockLimit,
Expand Down
20 changes: 20 additions & 0 deletions apps/src/templates/FinishDialog.story.jsx
Expand Up @@ -162,4 +162,24 @@ export default storybook =>
</div>
),
},
{
name: 'Perfect Finish of challenge level',
description: 'Perfectly finished a challenge level',
story: () => (
<div style={dialogWrapper}>
<FinishDialog
hideBackdrop

isChallenge
isPerfect
blockLimit={98}
blocksUsed={98}
achievements={achievements}
studentCode={studentCode}
showFunometer
canShare
/>
</div>
),
},
]);
4 changes: 3 additions & 1 deletion apps/test/unit/redux/feedbackTest.js
Expand Up @@ -8,7 +8,7 @@ describe('feedback redux module', () => {
displayingCode: false,
displayingShareControls: false,


isChallenge: false,
isPerfect: true,
blocksUsed: 0,
blockLimit: undefined,
Expand Down Expand Up @@ -77,13 +77,15 @@ describe('feedback redux module', () => {
it('sets all the properties', () => {
const state = {};
const newState = reducer(state, feedback.setFeedbackData({
isChallenge: true,
isPerfect: true,
blocksUsed: 19,
displayFunometer: false,
studentCode: 'console.log("hello world!");',
canShare: true,
}));
expect(newState).to.deep.equal({
isChallenge: true,
isPerfect: true,
blocksUsed: 19,
displayFunometer: false,
Expand Down