- { this.renderSEOTags() }
-
+ {this.renderSEOTags()}
+
- Login
+
+ Login
+
- » Forgot Password
+
+ {" "}
+ » Forgot Password
+
{this.renderError()}
@@ -207,4 +235,4 @@ export default class ResetPassword extends SearchComponent {
);
}
-}
\ No newline at end of file
+}
diff --git a/src/containers/Sidebar.js b/src/containers/Sidebar.js
index 8a61b081..7b7231de 100644
--- a/src/containers/Sidebar.js
+++ b/src/containers/Sidebar.js
@@ -9,7 +9,7 @@ import { Tabs, Tab, OverlayTrigger, Popover } from "react-bootstrap";
import config from "../config";
import { LinkContainer } from "react-router-bootstrap";
import Skeleton, { SkeletonTheme } from "react-loading-skeleton";
-import { API } from "aws-amplify";
+import { API } from "../libs/utils";
import * as Styles from "./Styles";
import "./Sidebar.css";
diff --git a/src/containers/Signup.js b/src/containers/Signup.js
index 11f03531..edd671be 100644
--- a/src/containers/Signup.js
+++ b/src/containers/Signup.js
@@ -1,9 +1,16 @@
import React from "react";
-import { Alert, FormGroup, FormControl, FormLabel, FormText } from "react-bootstrap";
+import {
+ Alert,
+ FormGroup,
+ FormControl,
+ FormLabel,
+ FormText,
+} from "react-bootstrap";
import { Helmet } from "react-helmet";
-import { Auth, API } from "aws-amplify";
-import LoaderButton from "../components/LoaderButton";
+import { confirmSignUp, resendSignUpCode } from "aws-amplify/auth";
import { LinkContainer } from "react-router-bootstrap";
+import { API } from "../libs/utils";
+import LoaderButton from "../components/LoaderButton";
import SearchComponent from "../components/SearchComponent";
import "./Signup.css";
@@ -26,70 +33,77 @@ export default class Signup extends SearchComponent {
errorMessage: "",
signedUp: false,
verified: false,
- codeResent: false
+ codeResent: false,
};
}
validateForm() {
- if(this.state.signedUp) {
+ if (this.state.signedUp) {
return this.state.code.length > 0;
} else {
- return this.state.name.length > 0 && this.state.username.length > 0 && this.state.email.length > 0 && this.state.password.length > 0 && this.validatePassword() && this.validateUserName();
+ return (
+ this.state.name.length > 0 &&
+ this.state.username.length > 0 &&
+ this.state.email.length > 0 &&
+ this.state.password.length > 0 &&
+ this.validatePassword() &&
+ this.validateUserName()
+ );
}
}
validateUserName = () => {
- let {username} = this.state;
+ let { username } = this.state;
const regExp = /^[a-zA-Z0-9]+$/;
return username ? username.match(regExp) !== null : true;
- }
+ };
validatePassword = () => {
- let {password} = this.state;
+ let { password } = this.state;
return password ? password.length > 7 : true;
- }
+ };
- handleChange = event => {
+ handleChange = (event) => {
this.setState({
[event.target.id]: event.target.value,
isValidUsername: true,
emailExists: false,
- isErrorState: false
+ isErrorState: false,
});
- }
+ };
componentDidMount() {
window.scrollTo(0, 0);
- if(this.props.isVerify) {
- if(typeof Storage !== "undefined") {
+ if (this.props.isVerify) {
+ if (typeof Storage !== "undefined") {
let username = localStorage.getItem("username");
- if(username) {
+ if (username) {
this.setState({
- username
+ username,
});
} else {
this.setState({
- getUsername: true
+ getUsername: true,
});
}
}
this.setState({
- signedUp: true
+ signedUp: true,
});
}
}
autoRedirect() {
let timer = setInterval(() => {
- let {timeRemaining} = this.state;
- if(timeRemaining === 1) {
+ let { timeRemaining } = this.state;
+ if (timeRemaining === 1) {
clearInterval(timer);
this.props.history.push("/login");
} else {
this.setState({
- timeRemaining: timeRemaining - 1
+ timeRemaining: timeRemaining - 1,
});
}
}, 1000);
@@ -99,28 +113,31 @@ export default class Signup extends SearchComponent {
this.setState({ isLoading: true });
try {
- await Auth.confirmSignUp(username, code);
+ await confirmSignUp({
+ username,
+ confirmationCode: code,
+ });
this.autoRedirect();
this.setState({
isLoading: false,
- verified: true
+ verified: true,
});
- } catch(e) {
+ } catch (e) {
this.setState({
isLoading: false,
isErrorState: true,
- errorMessage: e.message
+ errorMessage: e.message,
});
}
}
- handleSubmit = async event => {
+ handleSubmit = async (event) => {
event.preventDefault();
-
+
this.setState({ isLoading: true });
try {
- if(this.state.signedUp) {
+ if (this.state.signedUp) {
this.confirmUser(this.state.username, this.state.code);
} else {
try {
@@ -129,61 +146,62 @@ export default class Signup extends SearchComponent {
username: this.state.username,
password: this.state.password,
email: this.state.email,
- name: this.state.name
- }
+ name: this.state.name,
+ },
});
window.scrollTo(0, 0);
this.setState({
isLoading: false,
- signedUp: true
+ signedUp: true,
});
- if(typeof Storage !== "undefined") {
+ if (typeof Storage !== "undefined") {
localStorage.setItem("username", this.state.username);
}
this.props.history.push("/signup/verify");
- } catch(e) {
+ } catch (e) {
this.setState({
isLoading: false,
isErrorState: true,
- isValidUsername: e.response?.data?.code !== "UsernameExistsException",
+ isValidUsername:
+ e.response?.data?.code !== "UsernameExistsException",
emailExists: e.response?.data?.code === "EmailExistsException",
- errorMessage: e.response?.data?.message || e.message
+ errorMessage: e.response?.data?.message || e.message,
});
}
}
- } catch(e) {
+ } catch (e) {
this.setState({
isLoading: false,
isErrorState: true,
- errorMessage: e.message
+ errorMessage: e.message,
});
}
- }
+ };
resendAuthCode = (e) => {
e.preventDefault();
- Auth.resendSignUp(this.state.username).then(() => {
- this.setState({
- codeResent: true
- });
- }).catch(e => {
- this.setState({
- isErrorState: true,
- errorMessage: e.message
+ resendSignUpCode({
+ username: this.state.username,
+ })
+ .then(() => {
+ this.setState({
+ codeResent: true,
+ });
+ })
+ .catch((e) => {
+ this.setState({
+ isErrorState: true,
+ errorMessage: e.message,
+ });
});
- });
- }
+ };
renderError = () => {
- if(this.state.isErrorState) {
- return(
-
- {this.state.errorMessage}
-
- );
+ if (this.state.isErrorState) {
+ return
{this.state.errorMessage};
}
- }
+ };
renderSEOTags() {
return (
@@ -198,10 +216,10 @@ export default class Signup extends SearchComponent {
}
renderVerificationForm() {
- if(this.state.signedUp) {
- return(
+ if (this.state.signedUp) {
+ return (