login --> sign in

ResearchHub · Jul 22, 2020 · d69f14e · d69f14e
1 parent cb09e9d
commit d69f14e
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 21 deletions.
diff --git a/components/DiscussionPostMetadata.js b/components/DiscussionPostMetadata.js
@@ -68,10 +68,7 @@ const DiscussionPostMetadata = (props) => {
   const promptFlagConfirmation = () => {
     if (!isLoggedIn) {
       dispatch(
-        ModalActions.openLoginModal(
-          true,
-          "Please login with Google to continue."
-        )
+        ModalActions.openLoginModal(true, "Please sign in Google to continue.")
       );
     } else {
       return alert.show({

diff --git a/components/GoogleLoginButton.js b/components/GoogleLoginButton.js
@@ -105,7 +105,7 @@ const GoogleLoginButton = (props) => {
                 rippleClass={props.rippleClass}
                 customLabelStyle={props.customLabelStyle}
                 customIconStyle={[styles.iconStyle, props.iconStyle]}
-                label={customLabel ? customLabel : "Login with Google"}
+                label={customLabel ? customLabel : "Sign In with Google"}
               />
             </div>
           );

diff --git a/components/Hubs/LiveFeedNotification.js b/components/Hubs/LiveFeedNotification.js
@@ -569,7 +569,7 @@ class LiveFeedNotification extends React.Component {
     let isLoggedIn = auth.isLoggedIn;
 
     if (!isLoggedIn) {
-      openLoginModal(true, "Please login with Google to continue.");
+      openLoginModal(true, "Please Sign in with Google to continue.");
     } else {
       return alert.show({
         text: `Are you sure you want to ${

diff --git a/components/Navbar.js b/components/Navbar.js
@@ -308,7 +308,7 @@ const Navbar = (props) => {
           styles={[styles.loginMobile]}
           iconStyle={styles.googleIcon}
           rippleClass={styles.rippleClass}
-          customLabel="Login"
+          customLabel="Sign In"
           customLabelStyle={[styles.googleLabelMobile]}
           isLoggedIn
         />

diff --git a/components/OrcidConnectButton.js b/components/OrcidConnectButton.js
@@ -74,7 +74,7 @@ const OrcidConnectButton = (props) => {
           icon={"/static/icons/orcid.png"}
           customLabelStyle={customLabelStyle}
           customIconStyle={[styles.iconStyle, iconStyle]}
-          label={customLabel ? customLabel : "Login with ORCID"}
+          label={customLabel ? customLabel : "Sign in ORCID"}
         />
       )}
     />

diff --git a/components/OrcidLoginButton.js b/components/OrcidLoginButton.js
@@ -55,7 +55,7 @@ const OrcidLoginButton = (props) => {
           icon={"/static/icons/orcid.png"}
           customLabelStyle={customLabelStyle}
           customIconStyle={[styles.iconStyle, iconStyle]}
-          label={customLabel ? customLabel : "Login with ORCID"}
+          label={customLabel ? customLabel : "Sign in ORCID"}
         />
       )}
     />

diff --git a/components/ResearchHubBanner.js b/components/ResearchHubBanner.js
@@ -110,7 +110,7 @@ class ResearchHubBanner extends React.Component {
                 styles={styles.googleLoginButton}
                 googleLogin={this.props.googleLogin}
                 getUser={this.props.getUser}
-                customLabel={"Sign up with Google"}
+                customLabel={"Sign in with Google"}
               />
             )}
           </span>

diff --git a/components/TextEditor/index.js b/components/TextEditor/index.js
@@ -76,7 +76,7 @@ const TextEditor = (props) => {
   async function submit(content, plain_text, callback) {
     let success = false;
     if (!isLoggedIn) {
-      openLoginModal(true, "Please login with Google to continue.");
+      openLoginModal(true, "Please Sign in with Google to continue.");
     } else {
       if (isQuillEmpty(content)) {
         props.setMessage("Content cannot be empty.");

diff --git a/components/modal/LoginModal.js b/components/modal/LoginModal.js
@@ -49,7 +49,7 @@ class LoginModal extends React.Component {
     });
 
     if (this.props.auth.loginFailed) {
-      this.props.setMessage("Login failed");
+      this.props.setMessage("Sign in failed");
       this.props.showMessage({ show: true, error: true });
     }
   };
@@ -60,11 +60,11 @@ class LoginModal extends React.Component {
       <BaseModal
         isOpen={modals.openLoginModal}
         closeModal={this.closeModal}
-        title={"Login to your account"}
+        title={"Sign in to your account"}
         subtitle={
           modals.loginModal.flavorText
             ? modals.loginModal.flavorText
-            : "Login with your Google account"
+            : "Sign in with your Google account"
         }
         backgroundImage={true}
       >
@@ -82,7 +82,7 @@ class LoginModal extends React.Component {
                 customButtonStyle={styles.button}
                 icon={"/static/icons/google.png"}
                 customIconStyle={styles.iconStyle}
-                label={"Login with Google"}
+                label={"Sign in with Google"}
               />
             )}
           />

diff --git a/components/modal/SignUpModal.js b/components/modal/SignUpModal.js
@@ -71,7 +71,7 @@ const SignUpModal = (props) => {
         </div>
 
         <div className={css(styles.googleButton)}>
-          <GoogleLoginButton customLabel={"Sign up with Google"} />
+          <GoogleLoginButton customLabel={"Sign in with Google"} />
         </div>
         {renderDivider()}
         <div className={css(styles.loginContainer)}>

diff --git a/components/modal/SignUpOverlay.js b/components/modal/SignUpOverlay.js
@@ -81,15 +81,15 @@ class SignUpOverlay extends React.Component {
                 </div>
                 <div className={css(styles.googleButton)}>
                   <GoogleLoginButton
-                    customLabel={"Sign up with Google"}
+                    customLabel={"Sign in with Google"}
                     loginCallback={this.closeBanner}
                   />
                 </div>
                 {this.renderDivider()}
                 <div className={css(styles.loginContainer)}>
                   {"Already a member? "}
                   <GoogleLoginButton
-                    customLabel={"Login"}
+                    customLabel={"Sign in"}
                     hideButton={true}
                     loginCallback={this.closeBanner}
                   />

diff --git a/pages/about/index.js b/pages/about/index.js
@@ -539,8 +539,8 @@ class Index extends React.Component {
                 trigger="- How can I help?"
               >
                 <p className={css(styles.subtext, styles.wideText)}>
-                  {`The easiest way to help the community grow is to sign up and start contributing content.\n\n`}
-                  <b>1. Sign up</b>
+                  {`The easiest way to help the community grow is to sign in and start contributing content.\n\n`}
+                  <b>1. Sign in</b>
                   {"\n"}Create your account in just a few clicks, using Google
                   Sign In.{"\n\n"}
                   <b>2. Upload a paper</b>

diff --git a/pages/orcid/index.js b/pages/orcid/index.js
@@ -100,7 +100,7 @@ class OrcidLoginPage extends React.Component {
               <React.Fragment>
                 <h1 className={css(styles.header)}>We're almost done!</h1>
                 <p className={css(styles.description)}>
-                  Confirm your email address to complete login with Orcid.
+                  Confirm your email address to complete Sign in with Orcid.
                 </p>
               </React.Fragment>
             </div>