Add reset progress option to user settings by dhcodes · Pull Request #10824 · freeCodeCamp/freeCodeCamp

dhcodes · 2016-09-20T17:49:14Z

Pre-Submission Checklist

Your pull request targets the staging branch of FreeCodeCamp.
Branch starts with either fix/, feature/, or translate/ (e.g. fix/signin-issue)
You have only one commit (if not, squash them into one commit).
All new and existing tests pass the command npm run test-challenges. Use git commit --amend to amend any fixes.

Type of Change

Small bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds new functionality)
Breaking change (fix or feature that would change existing functionality)
Add new translation (feature adding new translations)

Checklist:

Tested changes locally.
Closes currently open issue (replace XXXX with an issue no): Closes Add "Reset all my progress" button to settings #10806

Description

Made a new jade page for progress reset, updated settings to add new button to reset progress, wrote functions to reset necessary attributes for user and update progressTimestamp to when the progress is reset. I tested this locally by making a new user, checking the mongo record, completing a few challenges, resetting the progress, and then confirming that the reset record matched the original new record.

dhcodes · 2016-09-20T18:12:15Z

Will update this based on the Travis build fail

Update: hooray, Travis and I are friends again.

camperbot · 2016-09-20T18:17:44Z

@dhcodes updated the pull request.

camperbot · 2016-09-20T18:23:23Z

@dhcodes updated the pull request.

camperbot · 2016-09-20T19:36:52Z

@dhcodes updated the pull request.

camperbot · 2016-09-20T19:43:14Z

@dhcodes updated the pull request.

dhcodes · 2016-09-20T20:29:50Z

As an aside, I'm not sure this removed the code stored in the editor from challenges I'd completed with my test user. Is #10200 implemented on staging?

Bouncey

I will pull down today and test locally

server/boot/user.js

+        longestStreak: 0,
+        currentChallengeId: '',
+        isBackEndCert: false,
+        isFullStackCert: false,


server/views/account/reset-progress.jade

+                    p This will really delete all of your progress and brownie points.
+                    p We won't be able to recover any of it for you later, even if you change your mind.
+                .modal-footer
+                    a.btn.btn-success.btn-block(href='/about', data-dismiss='modal', aria-hidden='true')


server/views/account/reset-progress.jade

+        .modal-dialog
+            .modal-content
+                .modal-header
+                    a.close(href='/about', data-dismiss='modal', aria-hidden='true') ×


server/boot/user.js

+    postResetProgress
+  );
+  api.get(
+    '/account',


server/boot/user.js

+        longestStreak: 0,
+        currentChallengeId: '',
+        isBackEndCert: false,
+        isFullStackCert: false,


dhcodes · 2016-09-25T19:04:53Z

I've updated this but can't get the changes to update on the PR. I think I'll have to make a new branch and try again :(

camperbot · 2016-09-26T15:56:28Z

@dhcodes updated the pull request.

dhcodes · 2016-09-26T16:16:52Z

@Bouncey @BerkeleyTrue I updated based on your feedback and re-tested locally. Should be better now.

BerkeleyTrue · 2016-09-26T16:29:37Z

LGTM. Can someone test

dhcodes · 2016-10-11T13:31:32Z

I think this should be good to go.

ghost · 2016-10-15T13:15:41Z

Cannot QA. /settings automatically redirects to /map. Not sure of the cause, but I don't believe it's an issue with this PR.

cc/ @FreeCodeCamp/issue-moderators

ivantedja · 2016-10-15T13:22:20Z

@atjonathan the redirection probably related with #10879

ghost · 2016-10-15T13:50:42Z

@Bouncey, please rebase this off staging. The /settings route works on the staging branch 🎉

dhcodes · 2016-10-15T14:03:08Z

@atjonathan you should be able to get to the settings by clicking your avatar from the map page. Or something. Just keep clicking your avatar and it should get you there eventually. There's an open issue about the map redirect

ghost · 2016-10-15T14:17:34Z

@dhcodes, couldn't get that to work on this PR. Works fine on staging.

ivantedja · 2016-10-15T14:53:41Z

@atjonathan I don't see any different behaviour between this PR and staging

from /map
click avatar and it will go to settings

I did reinstall everything though (node_modules, bower_components, drop database and recreate it)

ghost · 2016-10-15T15:01:27Z

@ivantedja, can't get that to work on this PR branch. I will try again

server/views/account/reset-progress.jade

+extends ../layout
+block content
+    include ../partials/flyer
+    #modal-dialog.modal.animated.wobble


server/views/account/reset-progress.jade

+                    p This will really delete all of your progress and brownie points.
+                    p We won't be able to recover any of it for you later, even if you change your mind.
+                .modal-footer
+                    a.btn.btn-success.btn-block(href='/settings', data-dismiss='modal', aria-hidden='true')


server/views/account/reset-progress.jade

+    include ../partials/flyer
+    #modal-dialog.modal.animated.wobble
+        .modal-dialog
+            .modal-content


ghost · 2016-10-19T19:33:51Z

@ivantedja, as I mentioned earlier, the problem was this PR had an earlier version of staging. The PR will take a snapshot of what staging has after making a branch out of it.

dhcodes · 2016-10-19T20:51:00Z

@atjonathan I replicated the actions and modal of the delete account route so while I'm not opposed to making the changes, we should probably make them to both routes.

Bouncey · 2016-10-26T07:28:39Z

I'm all for removing the animations, they are so '2015'

I will pull this down again today to test

dhcodes · 2016-10-26T14:33:34Z

Should we open a new issue to make the UI changes since they are unrelated to the functionality of this PR? Assuming it tests okay for @Bouncey

raisedadead · 2016-10-26T14:56:08Z

@dhcodes yes that sounds right, please open a new request for the UI changes.
We can push this if it's good.

Opening a new issue instead.

ghost

LGTM 👍

Everything acts as it's supposed to, I will open a PR with the styling/animation changes soon.
Thanks @dhcodes ❤️ 💪

dhcodes force-pushed the feature/add-progress-reset-option-in-settings branch 2 times, most recently from 6525422 to afb985b Compare September 20, 2016 18:23

dhcodes force-pushed the feature/add-progress-reset-option-in-settings branch from afb985b to 7d1a19a Compare September 20, 2016 19:36

dhcodes force-pushed the feature/add-progress-reset-option-in-settings branch from 7d1a19a to d799f31 Compare September 20, 2016 19:43

Bouncey reviewed Sep 24, 2016

View reviewed changes

BerkeleyTrue reviewed Sep 24, 2016

View reviewed changes

server/boot/user.js Outdated

postResetProgress

);

api.get(

'/account',

This comment was marked as off-topic.

Sign in to view

server/boot/user.js

longestStreak: 0,

currentChallengeId: '',

isBackEndCert: false,

isFullStackCert: false,

This comment was marked as off-topic.

Sign in to view

Add reset progress option to user settings

e543693

dhcodes force-pushed the feature/add-progress-reset-option-in-settings branch from d799f31 to e543693 Compare September 26, 2016 15:56

thanhjack9x approved these changes Oct 7, 2016

View reviewed changes

BerkeleyTrue added the status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. label Oct 7, 2016

ghost previously requested changes Oct 19, 2016

View reviewed changes

ghost added status: blocked In a transient & temporary hold. and removed status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. labels Oct 19, 2016

raisedadead added status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. and removed status: blocked In a transient & temporary hold. labels Oct 26, 2016

ghost mentioned this pull request Oct 26, 2016

Update UX on reset progress and delete account buttons #11382

Closed

ghost approved these changes Oct 26, 2016

View reviewed changes

ghost merged commit 3878998 into freeCodeCamp:staging Oct 26, 2016

ghost removed the status: waiting review To be applied to PR's that are ready for QA, especially when additional review is pending. label Oct 26, 2016

systimotic mentioned this pull request Oct 28, 2016

'Update your settings' redirects to /map #10879

Closed

This pull request was closed.

Uh oh!

Conversation

dhcodes commented Sep 20, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-Submission Checklist

Type of Change

Checklist:

Description

Uh oh!

dhcodes commented Sep 20, 2016 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

camperbot commented Sep 20, 2016

Uh oh!

camperbot commented Sep 20, 2016

Uh oh!

camperbot commented Sep 20, 2016

Uh oh!

camperbot commented Sep 20, 2016

Uh oh!

dhcodes commented Sep 20, 2016

Uh oh!

Bouncey left a comment

Choose a reason for hiding this comment

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

dhcodes commented Sep 25, 2016

Uh oh!

camperbot commented Sep 26, 2016

Uh oh!

dhcodes commented Sep 26, 2016

Uh oh!

BerkeleyTrue commented Sep 26, 2016

Uh oh!

dhcodes commented Oct 11, 2016

Uh oh!

ghost commented Oct 15, 2016 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ivantedja commented Oct 15, 2016

Uh oh!

ghost commented Oct 15, 2016

Uh oh!

dhcodes commented Oct 15, 2016

Uh oh!

ghost commented Oct 15, 2016

Uh oh!

ivantedja commented Oct 15, 2016

Uh oh!

ghost commented Oct 15, 2016

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

This comment was marked as off-topic.

Uh oh!

dhcodes commented Sep 20, 2016 •

edited

Loading

dhcodes commented Sep 20, 2016 •

edited

Loading

ghost commented Oct 15, 2016 •

edited by ghost

Loading

ghost left a comment •

edited by ghost

Loading