Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
refactor: simplify login buttons (#3105)
Bogdan Chadkin156ddf2dc43f
diff --git a/apps/builder/app/auth/login-button.tsx b/apps/builder/app/auth/login-button.tsxdeleted file mode 100644index d501141d73..0000000000--- a/apps/builder/app/auth/login-button.tsx+++ /dev/null@@ -1,43 +0,0 @@-import type * as React from "react";-import { Tooltip } from "@webstudio-is/design-system";-import env from "~/shared/env";-import { BrandButton } from "./brand-button";--const isPreviewEnvironment = env.DEPLOYMENT_ENVIRONMENT === "preview";--export const LoginButton = ({- children,- isSecretLogin = false,- disabled = false,- icon,- ...props-}: {- children: React.ReactChild;- isSecretLogin?: boolean;- onClick?: () => void;- disabled?: boolean;- icon: JSX.Element;-}) => {- const isSocialLoginInPreviewEnvironment =- isPreviewEnvironment && isSecretLogin === false;-- const button = (- <BrandButton {...props} type="submit" disabled={disabled} icon={icon}>- {children}- </BrandButton>- );-- if (isSocialLoginInPreviewEnvironment) {- const content = disabled- ? "Social login does not work in preview deployments"- : "This login is not configured";-- return (- <Tooltip content={content} delayDuration={0}>- {button}- </Tooltip>- );- }-- return button;-};diff --git a/apps/builder/app/auth/login.tsx b/apps/builder/app/auth/login.tsxindex 834ff153dd..9fa183bc69 100644--- a/apps/builder/app/auth/login.tsx+++ b/apps/builder/app/auth/login.tsx@@ -9,7 +9,7 @@ import {theme,} from "@webstudio-is/design-system";import { GithubIcon, GoogleIcon, WebstudioIcon } from "@webstudio-is/icons";-import { LoginButton } from "./login-button";+import { BrandButton } from "./brand-button";import { Form } from "@remix-run/react";import { authPath } from "~/shared/router-utils";import { SecretLogin } from "./secret-login";@@ -90,20 +90,20 @@ export const Login = ({<TooltipProvider><Flex gap="3" direction="column"><Form action={authPath({ provider: "google" })} method="post">- <LoginButton+ <BrandButtondisabled={isGoogleEnabled === false}icon={<GoogleIcon size={22} />}>Sign in with Google- </LoginButton>+ </BrandButton></Form><Form action={authPath({ provider: "github" })} method="post">- <LoginButton+ <BrandButtondisabled={isGithubEnabled === false}icon={<GithubIcon size={22} />}>Sign in with GitHub- </LoginButton>+ </BrandButton></Form>{isSecretLoginEnabled && <SecretLogin />}</Flex>diff --git a/apps/builder/app/auth/secret-login.tsx b/apps/builder/app/auth/secret-login.tsxindex 98bbec96f8..b0694d2885 100644--- a/apps/builder/app/auth/secret-login.tsx+++ b/apps/builder/app/auth/secret-login.tsx@@ -7,7 +7,7 @@ import {import { CommitIcon } from "@webstudio-is/icons";import { useState } from "react";import { authPath } from "~/shared/router-utils";-import { LoginButton } from "./login-button";+import { BrandButton } from "./brand-button";export const SecretLogin = () => {const [isSecretLoginOpen, setIsSecretLoginOpen] = useState(false);@@ -38,12 +38,11 @@ export const SecretLogin = () => {}return (- <LoginButton- isSecretLogin+ <BrandButtononClick={() => setIsSecretLoginOpen(true)}icon={<CommitIcon size={22} />}>Login with Secret- </LoginButton>+ </BrandButton>);};diff --git a/apps/builder/app/env/env.public.server.ts b/apps/builder/app/env/env.public.server.tsindex 26d75e9a84..381ae93f21 100644--- a/apps/builder/app/env/env.public.server.ts+++ b/apps/builder/app/env/env.public.server.ts@@ -8,7 +8,6 @@ import serverEnv from "./env.server";* Never use a private key here, because it will become public.**/const env = {- DEPLOYMENT_ENVIRONMENT: serverEnv.DEPLOYMENT_ENVIRONMENT,FEATURES: process.env.FEATURES,BUILDER_HOST: process.env.BUILDER_HOST,PUBLISHER_HOST: process.env.PUBLISHER_HOST || null,