Merge branch 'development' into bugfix/emoji-picker-in-editor

ecency · Feb 14, 2024 · 9d14e0d · 9d14e0d
2 parents 393faad + 321ce2d
commit 9d14e0d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 26 deletions.
diff --git a/src/common/components/follow-controls/index.tsx b/src/common/components/follow-controls/index.tsx
@@ -140,14 +140,19 @@ export default class FollowControls extends BaseComponent<Props, State> {
     const muteMsg = _t("follow-controls.mute");
     const unMuteMsg = _t("follow-controls.unMute");
 
-    const btnFollow = LoginRequired({
-      ...this.props,
-      children: (
-        <Button style={{ marginRight: "5px" }} disabled={inProgress} onClick={this.follow}>
-          {followMsg}
-        </Button>
-      )
-    });
+    const btnFollow =
+      this.props.activeUser?.username !== this.props.targetUsername ? (
+        LoginRequired({
+          ...this.props,
+          children: (
+            <Button style={{ marginRight: "5px" }} disabled={inProgress} onClick={this.follow}>
+              {followMsg}
+            </Button>
+          )
+        })
+      ) : (
+        <></>
+      );
 
     const btnUnfollow = LoginRequired({
       ...this.props,

diff --git a/src/common/pages/sign-up.scss b/src/common/pages/sign-up.scss
@@ -98,6 +98,13 @@
         }
       }
 
+      .bottom-description,
+      .form-faq {
+        opacity: 0.7;
+        text-align: center;
+        margin-bottom: 10px;
+      }
+
       .form-done {
         margin: 20px auto;
         text-align: center;
@@ -134,14 +141,6 @@
         form {
           margin-bottom: 30px;
         }
-
-        .form-do-login,
-        .form-bottom-description,
-        .form-faq {
-          opacity: 0.7;
-          text-align: center;
-          margin-bottom: 10px;
-        }
       }
     }
   }

diff --git a/src/common/pages/sign-up.tsx b/src/common/pages/sign-up.tsx
@@ -176,6 +176,7 @@ export const SignUp = (props: PageProps) => {
       } else {
         setDone(true);
         setLsReferral(undefined);
+        setStage(Stage.FORM);
       }
     } catch (e) {
       if (axios.isAxiosError(e) && e.response?.data?.message) {
@@ -226,7 +227,7 @@ export const SignUp = (props: PageProps) => {
             <img src={signupSvg} alt="Signup" />
           </div>
           <div className="the-form">
-            {!done && stage === Stage.FORM ? (
+            {stage === Stage.FORM ? (
               <>
                 <div className="form-title">{_t("sign-up.header")}</div>
                 <div className="form-sub-title">{_t("sign-up.description")}</div>
@@ -238,6 +239,15 @@ export const SignUp = (props: PageProps) => {
                 <div className="flex items-center justify-center form-image">
                   <img src={signupSvg} alt="Signup" />
                 </div>
+
+                <div className="bottom-description text-center">
+                  {_t("sign-up.bottom-description")}
+                </div>
+
+                <Tsx k="sign-up.learn-more">
+                  <div className="form-faq" />
+                </Tsx>
+
                 {done ? (
                   <div className="form-done">
                     <div className="done-icon">{checkSvg}</div>
@@ -255,14 +265,8 @@ export const SignUp = (props: PageProps) => {
             )}
             {!done && stage === Stage.FORM ? (
               <div className="form-content">
-                <div className="form-bottom-description text-center">
-                  {_t("sign-up.bottom-description")}
-                </div>
-                <Tsx k="sign-up.learn-more">
-                  <div className="form-faq" />
-                </Tsx>
-
                 <Form
+                  className="form-content"
                   ref={form}
                   onSubmit={async (e: React.FormEvent) => {
                     e.preventDefault();
@@ -383,7 +387,11 @@ export const SignUp = (props: PageProps) => {
                     <div>{_t("sign-up.free-account-desc")}</div>
                   </div>
                   <div className="bg-gray-100 dark:bg-gray-800 border-t border-[--border-color] py-2 px-3">
-                    <Button className="w-full" onClick={regularRegister}>
+                    <Button
+                      className="w-full"
+                      onClick={regularRegister}
+                      icon={inProgress && <Spinner className="w-3.5 h-3.5" />}
+                    >
                       {_t("sign-up.register-free")}
                     </Button>
                   </div>

diff --git a/src/style/_bootstrap_vars.scss b/src/style/_bootstrap_vars.scss
@@ -24,4 +24,4 @@ $list-group-action-active-bg-d: $gray-200;
 $border-color-d: $gray-300;
 
 // App variables
-$box-shadow-alt: 0 .1rem 1rem rgba($black, .10);
+$box-shadow-alt: 0 .1rem 1rem rgba($black, .10);