Browse Source

Fixed issues with input types, forgot password page and settings page.

KrisVos130 7 years ago
parent
commit
63410be8cf

+ 2 - 2
frontend/app/js/views/Auth/CustomInput.jsx

@@ -52,7 +52,7 @@ const dictionary = {
 		errors: {
 			length: "Code must be 8 characters long.",
 			format: "Invalid code format.",
-		}
+		},
 	},
 };
 
@@ -105,7 +105,7 @@ export default class CustomInput extends Component {
 		super(props);
 
 		this.state = {
-			inputText: dictionary[props.type].inputText,
+			inputType: dictionary[props.type].inputType,
 			value: "",
 			original: "",
 			errors: [],

+ 2 - 0
frontend/app/js/views/Auth/ForgotPassword.jsx

@@ -27,6 +27,8 @@ export default class Settings extends Component {
 	constructor(props) {
 		super(props);
 
+		CustomInput.initialize(this);
+
 		this.state = {
 			step: 1,
 			resetCode: "",

+ 11 - 4
frontend/app/js/views/Auth/Settings.jsx

@@ -199,12 +199,19 @@ export default class Settings extends Component {
 		const unlinkPassword = (<button key="unlinkPassword" onClick={ this.unlinkPassword }>
 			Remove logging in with password
 		</button>);
-		if (this.state.passwordLinked) return [newPassword, changePasswordButton];
+
+		const toReturn = [];
+		if (this.state.passwordLinked) {
+			toReturn.push(newPassword);
+			toReturn.push(changePasswordButton);
+		}
 		if (this.state.passwordLinked && this.state.gitHubLinked) {
-			return [unlinkGitHub, unlinkPassword];
+			toReturn.push(unlinkGitHub);
+			toReturn.push(unlinkPassword);
 		} else if (!this.state.passwordLinked) {
-			return linkPassword;
-		} return linkGitHub;
+			toReturn.push(linkPassword);
+		} else toReturn.push(linkGitHub);
+		return toReturn;
 	};
 
 	render() {