Minor verbiage changes; Push to staging for early QA

pull/441/head
Rick Carlino 2017-08-31 16:21:01 -05:00
parent aa04300a4a
commit 87955b809e
4 changed files with 7 additions and 8 deletions

View File

@ -139,7 +139,7 @@ describe Api::UsersController do
.to include(Users::ResendVerification::ALREADY_VERIFIED) .to include(Users::ResendVerification::ALREADY_VERIFIED)
end end
it 'refuses to send token to a user if they are already verified' do it 're-sends verification email' do
unverified = User.create!(email: Faker::Internet.email, unverified = User.create!(email: Faker::Internet.email,
password: "password123", password: "password123",
password_confirmation: "password123") password_confirmation: "password123")

View File

@ -106,7 +106,7 @@ export class API {
get devicePath() { return `${this.baseUrl}/api/device/`; } get devicePath() { return `${this.baseUrl}/api/device/`; }
/** /api/users/ */ /** /api/users/ */
get usersPath() { return `${this.baseUrl}/api/users/`; } get usersPath() { return `${this.baseUrl}/api/users/`; }
/** /api/users/resend_verification?id=EMAIL */ /** /api/users/resend_verification */
get userResendConfirmationPath() { get userResendConfirmationPath() {
return this.usersPath + "/resend_verification"; return this.usersPath + "/resend_verification";
} }

View File

@ -114,9 +114,8 @@ export class FrontPage extends React.Component<{}, Partial<FrontPageState>> {
this.setState({ showServerOpts: !this.state.showServerOpts }); this.setState({ showServerOpts: !this.state.showServerOpts });
} }
toggleForgotPassword = () => { toggleForgotPassword = () => this.setState({ activePanel: "forgotPassword" });
this.setState({ activePanel: "forgotPassword" });
}
submitForgotPassword = (e: React.FormEvent<HTMLFormElement>) => { submitForgotPassword = (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault(); e.preventDefault();

View File

@ -11,7 +11,7 @@ export interface FrontPageState {
forgotPasswordEmail?: string; forgotPasswordEmail?: string;
agreeToTerms: boolean; agreeToTerms: boolean;
activePanel: activePanel:
| "login" /** Render default login panel */ | "resendVerificationEmail" /** Render the "resend verification" panel. */
| "forgotPassword" /** Render forgotten password pane */ | "login" /** Render default login panel */
| "resendVerificationEmail" /** Render the "resend verification" panel. */; | "forgotPassword" /** Render forgotten password pane */;
} }