Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refactor authentication components for improved UI consistency

Bill Yanga928bc3ba86e
diff --git a/client/Dockerfile b/client/Dockerfile
index 057f844fa..5d6194459 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -28,12 +28,10 @@ ENV NEXT_TELEMETRY_DISABLED=1
ARG NEXT_PUBLIC_BACKEND_URL
ARG NEXT_PUBLIC_DISABLE_SIGNUP
ARG NEXT_PUBLIC_CLOUD
-ARG NEXT_PUBLIC_MAPBOX_TOKEN
ARG NEXT_PUBLIC_TURNSTILE_SITE_KEY
ENV NEXT_PUBLIC_BACKEND_URL=${NEXT_PUBLIC_BACKEND_URL}
ENV NEXT_PUBLIC_DISABLE_SIGNUP=${NEXT_PUBLIC_DISABLE_SIGNUP}
ENV NEXT_PUBLIC_CLOUD=${NEXT_PUBLIC_CLOUD}
-ENV NEXT_PUBLIC_MAPBOX_TOKEN=${NEXT_PUBLIC_MAPBOX_TOKEN}
ENV NEXT_PUBLIC_TURNSTILE_SITE_KEY=${NEXT_PUBLIC_TURNSTILE_SITE_KEY}
WORKDIR /app/client
diff --git a/client/src/app/invitation/components/login.tsx b/client/src/app/invitation/components/login.tsx
index 2f08c153b..1d54df721 100644
--- a/client/src/app/invitation/components/login.tsx
+++ b/client/src/app/invitation/components/login.tsx
@@ -51,6 +51,7 @@ export function Login({ inviterEmail, organization }: LoginProps) {
return (
<form onSubmit={handleLogin}>
<div className="flex flex-col gap-4">
+ <SocialButtons onError={setError} />
<AuthInput
id="email"
label="Email"
@@ -60,7 +61,6 @@ export function Login({ inviterEmail, organization }: LoginProps) {
value={email}
onChange={e => setEmail(e.target.value)}
/>
-
<AuthInput
id="password"
label="Password"
@@ -70,13 +70,9 @@ export function Login({ inviterEmail, organization }: LoginProps) {
value={password}
onChange={e => setPassword(e.target.value)}
/>
-
<AuthButton isLoading={isLoading} loadingText="Logging in...">
Login to Accept Invitation
</AuthButton>
-
- <SocialButtons onError={setError} />
-
<AuthError error={error} />
</div>
</form>
diff --git a/client/src/app/invitation/components/signup.tsx b/client/src/app/invitation/components/signup.tsx
index c5eb4b0b9..0c89af395 100644
--- a/client/src/app/invitation/components/signup.tsx
+++ b/client/src/app/invitation/components/signup.tsx
@@ -71,6 +71,16 @@ export function Signup({ inviterEmail, organization }: SignupProps) {
return (
<form onSubmit={handleSignup}>
<div className="flex flex-col gap-4">
+ <AuthButton
+ isLoading={isLoading}
+ loadingText="Creating account..."
+ disabled={IS_CLOUD ? !turnstileToken || isLoading : isLoading}
+ >
+ Sign Up to Accept Invitation
+ </AuthButton>
+
+ <SocialButtons onError={setError} />
+
<AuthInput
id="email"
label="Email"
@@ -100,16 +110,6 @@ export function Signup({ inviterEmail, organization }: SignupProps) {
/>
)}
- <AuthButton
- isLoading={isLoading}
- loadingText="Creating account..."
- disabled={IS_CLOUD ? !turnstileToken || isLoading : isLoading}
- >
- Sign Up to Accept Invitation
- </AuthButton>
-
- <SocialButtons onError={setError} />
-
<AuthError error={error} />
</div>
</form>
diff --git a/client/src/app/login/page.tsx b/client/src/app/login/page.tsx
index d25b3d8ee..72f323f93 100644
--- a/client/src/app/login/page.tsx
+++ b/client/src/app/login/page.tsx
@@ -81,19 +81,10 @@ export default function Page() {
<RybbitTextLogo />
</a>
</div>
-
<div className="flex-1 flex flex-col justify-center w-full max-w-[550px] mx-auto">
<h1 className="text-lg text-neutral-600 dark:text-neutral-300 mb-6">Welcome back</h1>
-
<div className="flex flex-col gap-4">
- <SocialButtons onError={setError} showDivider={false} />
-
- <div className="relative flex items-center text-xs uppercase">
- <div className="flex-1 border-t border-neutral-200 dark:border-neutral-800" />
- <span className="px-3 text-muted-foreground">Or continue with email</span>
- <div className="flex-1 border-t border-neutral-200 dark:border-neutral-800" />
- </div>
-
+ <SocialButtons onError={setError} />
<form onSubmit={handleSubmit}>
<div className="flex flex-col gap-4">
<AuthInput
diff --git a/client/src/app/signup/page.tsx b/client/src/app/signup/page.tsx
index baa4e4323..5de013682 100644
--- a/client/src/app/signup/page.tsx
+++ b/client/src/app/signup/page.tsx
@@ -195,18 +195,7 @@ export default function SignupPage() {
<motion.div initial="hidden" animate="visible" variants={contentVariants}>
<h2 className="text-2xl font-semibold mb-4">Signup</h2>
<div className="space-y-4">
- {IS_CLOUD && (
- <SocialButtons onError={setError} callbackURL="/signup?step=2" mode="signup" showDivider={false} />
- )}
-
- {IS_CLOUD && (
- <div className="relative flex items-center text-xs uppercase">
- <div className="flex-1 border-t border-neutral-200 dark:border-neutral-800" />
- <span className="px-3 text-muted-foreground">Or continue with email</span>
- <div className="flex-1 border-t border-neutral-200 dark:border-neutral-800" />
- </div>
- )}
-
+ <SocialButtons onError={setError} callbackURL="/signup?step=2" mode="signup" />
<AuthInput
id="email"
label="Email"
@@ -216,7 +205,6 @@ export default function SignupPage() {
value={email}
onChange={e => setEmail(e.target.value)}
/>
-
<AuthInput
id="password"
label="Password"
@@ -226,7 +214,6 @@ export default function SignupPage() {
value={password}
onChange={e => setPassword(e.target.value)}
/>
-
{IS_CLOUD && (
<Turnstile
onSuccess={token => setTurnstileToken(token)}
@@ -235,7 +222,6 @@ export default function SignupPage() {
className="flex justify-center"
/>
)}
-
<AuthButton
isLoading={isLoading}
loadingText="Creating account..."
@@ -247,7 +233,6 @@ export default function SignupPage() {
Continue
<ArrowRight className="ml-2 h-4 w-4" />
</AuthButton>
-
<div className="text-center text-sm">
Already have an account?{" "}
<Link
diff --git a/client/src/components/auth/SocialButtons.tsx b/client/src/components/auth/SocialButtons.tsx
index ce903a493..e7732c73c 100644
--- a/client/src/components/auth/SocialButtons.tsx
+++ b/client/src/components/auth/SocialButtons.tsx
@@ -1,7 +1,7 @@
"use client";
import { Button } from "@/components/ui/button";
-import { SiGoogle, SiGithub } from "@icons-pack/react-simple-icons";
+import { SiGithub } from "@icons-pack/react-simple-icons";
import { authClient } from "@/lib/auth";
import { IS_CLOUD } from "@/lib/const";
import Image from "next/image";
@@ -11,18 +11,9 @@ interface SocialButtonsProps {
callbackURL?: string;
mode?: "signin" | "signup";
className?: string;
- showDivider?: boolean;
- dividerText?: string;
}
-export function SocialButtons({
- onError,
- callbackURL,
- mode = "signin",
- className = "",
- showDivider = true,
- dividerText = "Or continue with",
-}: SocialButtonsProps) {
+export function SocialButtons({ onError, callbackURL, mode = "signin", className = "" }: SocialButtonsProps) {
if (!IS_CLOUD) return null;
const handleSocialAuth = async (provider: "google" | "github" | "twitter") => {
@@ -40,12 +31,6 @@ export function SocialButtons({
return (
<>
- {showDivider && (
- <div className="relative flex justify-center text-xs uppercase">
- <span className="text-muted-foreground">{dividerText}</span>
- </div>
- )}
-
<div className={`flex flex-col gap-2 ${className}`}>
<Button type="button" onClick={() => handleSocialAuth("google")} className="h-11">
<Image src="/crawlers/Google.svg" alt="Google" width={16} height={16} />
@@ -56,6 +41,11 @@ export function SocialButtons({
Continue with GitHub
</Button>
</div>
+ <div className="relative flex items-center text-xs uppercase">
+ <div className="flex-1 border-t border-neutral-200 dark:border-neutral-800" />
+ <span className="px-3 text-muted-foreground">Or continue with email</span>
+ <div className="flex-1 border-t border-neutral-200 dark:border-neutral-800" />
+ </div>
</>
);
}