-
Notifications
You must be signed in to change notification settings - Fork 19
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
Smart waiver #247
Smart waiver #247
Conversation
FYI, better to rebase on top of your develop branch rather than merging. That way the commit history doesn't get cluttered with merge commits from feature branches. This is something that can easily lead to regressions. |
This is a bit of a hack. I'm fine with this fix for now because you need to get something that works for build week. But we should track this issue so we can implement a proper fix in the future. |
public/cheating.html
Outdated
<!-- This file lives in public/cheating.html --> | ||
<div class="dialog"> | ||
<h1>You tried to do something suspicious</h1> | ||
<p>Please go back and try again, this time without trying to cheat the system...we'll be keeping an eye on you!</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change the error message to indicate why the user is seeing this page (skipping the waiver video). And the cute error message isn't really necessary, its better for users to use something clear and straightforward.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will do
I like the merge commits, but seems like we rebase in this repo, so I will also rebase in the future |
This may be hacky and should probably be made configurable, but almost anything on the client side can be manipulated, so this was the quickest, most sane way of doing things. Will keep issue #249 open for future consideration. |
@pkoenig10 when pulling in updates from another branch, I understand the rebase and merge idea. When merging pull requests, is there a tradition of rebasing and merging in this repository? |
If not, I prefer to make a merge commit so we can see that the code came from a different feature branch, but if there is a tradition, I wouldn't want to change it. |
public/cheating.html
Outdated
<h1>You tried to do something suspicious</h1> | ||
<p>Please go back and try again, this time without trying to cheat the system...we'll be keeping an eye on you!</p> | ||
<h1>You tried to do skip the saftey videos</h1> | ||
<p>Please watch the entire saftey video before completing the waiver!</p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"Safety" is misspelled on both lines.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm getting sloppy...Fixing this now.
Prevent users from cheating or skipping the safety video