Skip to content

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.

Login redesign (#1222)

Oleg Isonen0c9e96d2e3f4
diff --git a/apps/builder/app/auth/brand-button.tsx b/apps/builder/app/auth/brand-button.tsx
new file mode 100644
index 0000000000..1088724b68
--- /dev/null
+++ b/apps/builder/app/auth/brand-button.tsx
@@ -0,0 +1,54 @@
+import { css, textVariants, theme } from "@webstudio-is/design-system";
+import type { ComponentProps } from "react";
+
+const buttonStyle = css({
+ all: "unset",
+ boxSizing: "border-box",
+ minWidth: 0,
+ display: "inline-flex",
+ alignItems: "center",
+ justifyContent: "center",
+ gap: theme.spacing[5],
+ height: theme.spacing[15],
+ px: theme.spacing[9],
+ borderRadius: 12,
+ border: "2px solid transparent",
+ whiteSpace: "nowrap",
+ backgroundImage: `
+ linear-gradient(${theme.colors.backgroundPanel}, ${theme.colors.backgroundPanel}),
+ ${theme.colors.brandBorderFullGradient}
+ `,
+ backgroundOrigin: "border-box",
+ backgroundClip: "padding-box, border-box",
+ color: theme.colors.foregroundMain,
+ boxShadow: theme.shadows.brandElevationSmall,
+ ...textVariants.brandButtonRegular,
+ "&:hover": {
+ boxShadow: theme.shadows.brandElevationBig,
+ },
+ "&:focus-visible": {
+ outline: `2px solid ${theme.colors.borderFocus}`,
+ outlineOffset: 1,
+ },
+ "&:disabled": {
+ boxShadow: "none",
+ color: theme.colors.foregroundDisabled,
+ borderColor: theme.colors.borderMain,
+ "& svg": {
+ opacity: "0.5",
+ },
+ },
+});
+
+type BrandButtonProps = ComponentProps<"button"> & {
+ icon: JSX.Element;
+};
+
+export const BrandButton = ({ icon, children, ...props }: BrandButtonProps) => {
+ return (
+ <button {...props} type="submit" className={buttonStyle()}>
+ {icon}
+ {children}
+ </button>
+ );
+};
diff --git a/apps/builder/app/auth/login-button.tsx b/apps/builder/app/auth/login-button.tsx
index 793183f064..d501141d73 100644
--- a/apps/builder/app/auth/login-button.tsx
+++ b/apps/builder/app/auth/login-button.tsx
@@ -1,39 +1,30 @@
import type * as React from "react";
-import { Button, Flex, Tooltip } from "@webstudio-is/design-system";
+import { Tooltip } from "@webstudio-is/design-system";
import env from "~/shared/env";
-import { theme } from "@webstudio-is/design-system";
+import { BrandButton } from "./brand-button";
const isPreviewEnvironment = env.DEPLOYMENT_ENVIRONMENT === "preview";
export const LoginButton = ({
children,
- isDevLogin = false,
- disabled,
+ isSecretLogin = false,
+ disabled = false,
icon,
...props
}: {
children: React.ReactChild;
- isDevLogin?: boolean;
+ isSecretLogin?: boolean;
onClick?: () => void;
- disabled: boolean;
+ disabled?: boolean;
icon: JSX.Element;
}) => {
const isSocialLoginInPreviewEnvironment =
- isPreviewEnvironment && isDevLogin === false;
+ isPreviewEnvironment && isSecretLogin === false;
const button = (
- <Button
- {...props}
- type="submit"
- disabled={disabled}
- color="neutral"
- css={{ width: "100%" }}
- >
- <Flex gap="2" align="center">
- <Flex css={{ size: theme.spacing[10] }}>{icon}</Flex>
- {children}
- </Flex>
- </Button>
+ <BrandButton {...props} type="submit" disabled={disabled} icon={icon}>
+ {children}
+ </BrandButton>
);
if (isSocialLoginInPreviewEnvironment) {
diff --git a/apps/builder/app/auth/login.css b/apps/builder/app/auth/login.css
deleted file mode 100644
index 778f302cf4..0000000000
--- a/apps/builder/app/auth/login.css
+++ /dev/null
@@ -1,6 +0,0 @@
-body {
- margin: 0;
- overflow: hidden;
- font-family: var(--fonts-sans);
- font-size: var(--fontSizes-1);
-}
diff --git a/apps/builder/app/auth/login.stories.tsx b/apps/builder/app/auth/login.stories.tsx
new file mode 100644
index 0000000000..83d14c6037
--- /dev/null
+++ b/apps/builder/app/auth/login.stories.tsx
@@ -0,0 +1,23 @@
+import type { ComponentStory } from "@storybook/react";
+import { createBrowserRouter, RouterProvider } from "react-router-dom";
+import { Login } from "./login";
+
+export default {
+ component: Login,
+};
+
+const createRouter = (element: JSX.Element) =>
+ createBrowserRouter([
+ {
+ path: "*",
+ element,
+ loader: () => null,
+ },
+ ]);
+
+export const Basic: ComponentStory<typeof Login> = () => {
+ const router = createRouter(
+ <Login isGoogleEnabled={false} isSecretLoginEnabled />
+ );
+ return <RouterProvider router={router} />;
+};
diff --git a/apps/builder/app/auth/login.tsx b/apps/builder/app/auth/login.tsx
index 3b0c48c71b..9160582839 100644
--- a/apps/builder/app/auth/login.tsx
+++ b/apps/builder/app/auth/login.tsx
@@ -1,107 +1,126 @@
-import type { LinksFunction, MetaFunction } from "@remix-run/node";
-import { Form, useLoaderData } from "@remix-run/react";
-import { useState } from "react";
import {
+ AccessibleIcon,
+ Box,
+ css,
Flex,
- Button,
- DeprecatedText2,
- TextField,
+ globalCss,
+ Text,
+ theme,
} from "@webstudio-is/design-system";
+import { GithubIcon, GoogleIcon, WebstudioIcon } from "@webstudio-is/icons";
// eslint-disable-next-line import/no-internal-modules
import interFont from "@fontsource/inter/variable.css";
-import { GithubIcon, CommitIcon, GoogleIcon } from "@webstudio-is/icons";
+// eslint-disable-next-line import/no-internal-modules
+import manropeVariableFont from "@fontsource/manrope/variable.css";
import { LoginButton } from "./login-button";
-import loginStyles from "./login.css";
+import { Form } from "@remix-run/react";
import { authPath } from "~/shared/router-utils";
-import { theme } from "@webstudio-is/design-system";
+import { SecretLogin } from "./secret-login";
-export const links: LinksFunction = () => {
- return [
- {
- rel: "stylesheet",
- href: interFont,
- },
- {
- rel: "stylesheet",
- href: loginStyles,
- },
- ];
-};
+export const links = () => [
+ { rel: "stylesheet", href: interFont },
+ { rel: "stylesheet", href: manropeVariableFont },
+];
-export const meta: MetaFunction = () => {
- return { title: "Webstudio Login" };
-};
+const globalStyles = globalCss({
+ body: {
+ margin: 0,
+ background: theme.colors.backgroundPanel,
+ },
+});
+
+const layoutStyle = css({
+ display: "flex",
+ height: "100vh",
+ flexDirection: "column",
+ "@tablet": {
+ flexDirection: "row",
+ },
+});
-export const Login = ({ errorMessage }: { errorMessage: string }) => {
- const [isDevLoginOpen, openDevLogin] = useState(false);
- const data = useLoaderData();
+const sidebarStyle = css({
+ flexBasis: "35%",
+ "@tablet": {
+ background: `
+ radial-gradient(65.88% 47.48% at 50% 50%, #FFFFFF 0%, rgba(255, 255, 255, 0) 100%),
+ linear-gradient(0deg, rgba(255, 255, 255, 0) 49.46%, rgba(255, 255, 255, 0.33) 100%),
+ linear-gradient(180deg, rgba(255, 174, 60, 0) 0%, rgba(230, 60, 254, 0.33) 100%),
+ radial-gradient(211.58% 161.63% at 3.13% 100%, rgba(255, 174, 60, 0.3) 0%, rgba(227, 53, 255, 0) 100%),
+ radial-gradient(107.1% 32.15% at 92.96% 5.04%, rgba(53, 255, 182, 0.2) 0%, rgba(74, 78, 250, 0.2) 100%), #EBFFFC;
+ `,
+ },
+});
+type LoginProps = {
+ errorMessage?: string;
+ isGithubEnabled?: boolean;
+ isGoogleEnabled?: boolean;
+ isSecretLoginEnabled?: boolean;
+};
+
+export const Login = ({
+ errorMessage,
+ isGithubEnabled,
+ isGoogleEnabled,
+ isSecretLoginEnabled,
+}: LoginProps) => {
+ globalStyles();
return (
- <Flex
- css={{ height: "100vh" }}
- direction="column"
- align="center"
- justify="center"
- >
- <Flex direction="column" align="center" gap="3">
+ <Box className={layoutStyle()}>
+ <Flex
+ align="center"
+ justify="center"
+ as="aside"
+ className={sidebarStyle()}
+ >
+ <a href="https://webstudio.is" aria-label="Go to webstudio.is">
+ <AccessibleIcon label="Logo">
+ <WebstudioIcon width="112" height="84" />
+ </AccessibleIcon>
+ </a>
+ </Flex>
+ <Flex
+ align="center"
+ direction="column"
+ grow
+ as="main"
+ gap={6}
+ css={{
+ "@tablet": {
+ justifyContent: "center",
+ },
+ }}
+ >
+ <Text variant="brandMediumTitle" color="main" as="h1">
+ Sign in
+ </Text>
<Flex direction="column" gap="4">
- {errorMessage.length ? (
- <DeprecatedText2 align="center" color="error">
- {errorMessage}
- </DeprecatedText2>
- ) : null}
- <Flex gap="2" direction="column">
- <Form action={authPath({ provider: "github" })} method="post">
+ <Flex gap="3" direction="column">
+ <Form action={authPath({ provider: "google" })} method="post">
<LoginButton
- disabled={data.isGithubEnabled === false}
- icon={<GithubIcon />}
+ disabled={isGoogleEnabled === false}
+ icon={<GoogleIcon size={22} />}
>
- Login with GitHub
+ Sign in with Google
</LoginButton>
</Form>
- <Form action={authPath({ provider: "google" })} method="post">
+ <Form action={authPath({ provider: "github" })} method="post">
<LoginButton
- disabled={data.isGoogleEnabled === false}
- icon={<GoogleIcon />}
+ disabled={isGithubEnabled === false}
+ icon={<GithubIcon size={22} />}
>
- Login with Google
+ Sign in with GitHub
</LoginButton>
</Form>
- {data.isDevLogin &&
- (isDevLoginOpen ? (
- <Flex
- as="form"
- action={authPath({ provider: "dev" })}
- method="post"
- css={{
- flexDirection: "row",
- gap: theme.spacing[5],
- }}
- >
- <TextField
- name="secret"
- type="text"
- minLength={2}
- required
- autoFocus
- placeholder="Auth secret"
- css={{ flexGrow: 1 }}
- />
- <Button>Login</Button>
- </Flex>
- ) : (
- <LoginButton
- disabled={data.isDevLogin === false}
- isDevLogin
- onClick={() => openDevLogin(true)}
- icon={<CommitIcon />}
- >
- Dev Login
- </LoginButton>
- ))}
+ {isSecretLoginEnabled && <SecretLogin />}
</Flex>
+ {errorMessage ? (
+ <Text align="center" color="destructive">
+ {errorMessage}
+ </Text>
+ ) : null}
</Flex>
</Flex>
- </Flex>
+ </Box>
);
};
diff --git a/apps/builder/app/auth/secret-login.tsx b/apps/builder/app/auth/secret-login.tsx
new file mode 100644
index 0000000000..d19931f5da
--- /dev/null
+++ b/apps/builder/app/auth/secret-login.tsx
@@ -0,0 +1,44 @@
+import { Button, Flex, TextField, theme } from "@webstudio-is/design-system";
+import { CommitIcon } from "@webstudio-is/icons";
+import { useState } from "react";
+import { authPath } from "~/shared/router-utils";
+import { LoginButton } from "./login-button";
+
+export const SecretLogin = () => {
+ const [isSecretLoginOpen, setIsSecretLoginOpen] = useState(false);
+ if (isSecretLoginOpen) {
+ return (
+ <Flex
+ as="form"
+ action={authPath({ provider: "dev" })}
+ method="post"
+ css={{
+ width: "fit-content",
+ flexDirection: "row",
+ gap: theme.spacing[5],
+ }}
+ >
+ <TextField
+ name="secret"
+ type="text"
+ minLength={2}
+ required
+ autoFocus
+ placeholder="Auth secret"
+ css={{ flexGrow: 1 }}
+ />
+ <Button>Login</Button>
+ </Flex>
+ );
+ }
+
+ return (
+ <LoginButton
+ isSecretLogin
+ onClick={() => setIsSecretLoginOpen(true)}
+ icon={<CommitIcon size={22} />}
+ >
+ Login with Secret
+ </LoginButton>
+ );
+};
diff --git a/apps/builder/app/routes/login/index.tsx b/apps/builder/app/routes/login/index.tsx
index 93451c8a29..a109debe67 100644
--- a/apps/builder/app/routes/login/index.tsx
+++ b/apps/builder/app/routes/login/index.tsx
@@ -1,12 +1,17 @@
-import { type LoaderArgs, redirect, json } from "@remix-run/node";
-
+import {
+ type LoaderArgs,
+ redirect,
+ json,
+ TypedResponse,
+} from "@remix-run/node";
import { findAuthenticatedUser } from "~/services/auth.server";
import env from "~/env/env.server";
-
import { Login, links } from "~/auth";
import { useLoginErrorMessage } from "~/shared/session";
import { dashboardPath } from "~/shared/router-utils";
import { returnToCookie } from "~/services/cookie.server";
+import { useLoaderData } from "@remix-run/react";
+import type { ComponentProps } from "react";
export { links };
@@ -16,7 +21,9 @@ const comparePathnames = (pathnameOrUrlA: string, pathnameOrUrlB: string) => {
return aPathname === bPathname;
};
-export const loader = async ({ request }: LoaderArgs) => {
+export const loader = async ({
+ request,
+}: LoaderArgs): Promise<TypedResponse<ComponentProps<typeof Login>>> => {
const user = await findAuthenticatedUser(request);
const url = new URL(request.url);
@@ -28,7 +35,7 @@ export const loader = async ({ request }: LoaderArgs) => {
}
if (user) {
- return redirect(returnTo);
+ throw redirect(returnTo);
}
const headers = new Headers();
@@ -36,8 +43,7 @@ export const loader = async ({ request }: LoaderArgs) => {
return json(
{
- isDevLogin: env.DEV_LOGIN === "true",
- env,
+ isSecretLoginEnabled: env.DEV_LOGIN === "true",
isGithubEnabled: Boolean(env.GH_CLIENT_ID && env.GH_CLIENT_SECRET),
isGoogleEnabled: Boolean(
env.GOOGLE_CLIENT_ID && env.GOOGLE_CLIENT_SECRET
@@ -49,7 +55,8 @@ export const loader = async ({ request }: LoaderArgs) => {
const LoginRoute = () => {
const errorMessage = useLoginErrorMessage();
- return <Login errorMessage={errorMessage} />;
+ const data = useLoaderData<typeof loader>();
+ return <Login {...data} errorMessage={errorMessage} />;
};
export default LoginRoute;
diff --git a/apps/builder/app/services/auth.server.ts b/apps/builder/app/services/auth.server.ts
index a53dc17d9b..21198c1a6e 100644
--- a/apps/builder/app/services/auth.server.ts
+++ b/apps/builder/app/services/auth.server.ts
@@ -88,7 +88,7 @@ if (env.DEV_LOGIN === "true") {
}
}
- throw new Error("The dev login code is incorrect");
+ throw new Error("Secret is incorrect");
}),
"dev"
);
diff --git a/packages/icons/icons/commit.svg b/packages/icons/icons/commit.svg
new file mode 100644
index 0000000000..5e42d891c0
--- /dev/null
+++ b/packages/icons/icons/commit.svg
@@ -0,0 +1,4 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" clip-rule="evenodd" d="M11 7.75C9.2051 7.75 7.75002 9.20507 7.75002 11C7.75002 12.7949 9.2051 14.25 11 14.25C12.7949 14.25 14.25 12.7949 14.25 11C14.25 9.20507 12.7949 7.75 11 7.75ZM6.3089 10.25C6.66849 7.98301 8.63187 6.25 11 6.25C13.3682 6.25 15.3316 7.98301 15.6911 10.25H20.15C20.5642 10.25 20.9 10.5858 20.9 11C20.9 11.4142 20.5642 11.75 20.15 11.75H15.6911C15.3316 14.017 13.3682 15.75 11 15.75C8.63187 15.75 6.66849 14.017 6.3089 11.75H1.84998C1.43576 11.75 1.09998 11.4142 1.09998 11C1.09998 10.5858 1.43576 10.25 1.84998 10.25H6.3089Z" fill="black"/>
+</svg>
+
\ No newline at end of file
diff --git a/packages/icons/icons/github.svg b/packages/icons/icons/github.svg
new file mode 100644
index 0000000000..b16f56a1e8
--- /dev/null
+++ b/packages/icons/icons/github.svg
@@ -0,0 +1,4 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <path fill-rule="evenodd" clip-rule="evenodd" d="M11 1C5.475 1 1 5.475 1 11C1 15.425 3.8625 19.1625 7.8375 20.4875C8.3375 20.575 8.525 20.275 8.525 20.0125C8.525 19.775 8.5125 18.9875 8.5125 18.15C6 18.6125 5.35 17.5375 5.15 16.975C5.0375 16.6875 4.55 15.8 4.125 15.5625C3.775 15.375 3.275 14.9125 4.1125 14.9C4.9 14.8875 5.4625 15.625 5.65 15.925C6.55 17.4375 7.9875 17.0125 8.5625 16.75C8.65 16.1 8.9125 15.6625 9.2 15.4125C6.975 15.1625 4.65 14.3 4.65 10.475C4.65 9.3875 5.0375 8.4875 5.675 7.7875C5.575 7.5375 5.225 6.5125 5.775 5.1375C5.775 5.1375 6.6125 4.875 8.525 6.1625C9.325 5.9375 10.175 5.825 11.025 5.825C11.875 5.825 12.725 5.9375 13.525 6.1625C15.4375 4.8625 16.275 5.1375 16.275 5.1375C16.825 6.5125 16.475 7.5375 16.375 7.7875C17.0125 8.4875 17.4 9.375 17.4 10.475C17.4 14.3125 15.0625 15.1625 12.8375 15.4125C13.2 15.725 13.5125 16.325 13.5125 17.2625C13.5125 18.6 13.5 19.675 13.5 20.0125C13.5 20.275 13.6875 20.5875 14.1875 20.4875C16.1727 19.8173 17.8977 18.5415 19.1198 16.8395C20.3419 15.1376 20.9995 13.0953 21 11C21 5.475 16.525 1 11 1Z" fill="#11181C"/>
+</svg>
+
\ No newline at end of file
diff --git a/packages/icons/icons/google.svg b/packages/icons/icons/google.svg
new file mode 100644
index 0000000000..dc1a48a5fd
--- /dev/null
+++ b/packages/icons/icons/google.svg
@@ -0,0 +1,7 @@
+<svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <path d="M11 9.18195V13.0547H16.3818C16.1455 14.3001 15.4363 15.3547 14.3727 16.0638L17.6181 18.582C19.509 16.8366 20.5999 14.2729 20.5999 11.2275C20.5999 10.5184 20.5363 9.83654 20.4181 9.18205L11 9.18195Z" fill="#4285F4"/>
+ <path d="M5.39555 12.9035L4.66358 13.4638L2.07263 15.4819C3.71808 18.7455 7.09056 21.0001 10.9996 21.0001C13.6996 21.0001 15.9632 20.1092 17.6177 18.582L14.3723 16.0638C13.4814 16.6638 12.345 17.0274 10.9996 17.0274C8.39963 17.0274 6.19061 15.2729 5.39964 12.9092L5.39555 12.9035Z" fill="#34A853"/>
+ <path d="M2.07265 6.51837C1.39087 7.86377 1 9.38197 1 11.0001C1 12.6183 1.39087 14.1365 2.07265 15.4819C2.07265 15.4909 5.39998 12.9001 5.39998 12.9001C5.19998 12.3001 5.08177 11.6637 5.08177 11C5.08177 10.3363 5.19998 9.69998 5.39998 9.09998L2.07265 6.51837Z" fill="#FBBC05"/>
+ <path d="M10.9998 4.98182C12.4726 4.98182 13.7816 5.49089 14.8271 6.47272L17.6907 3.60912C15.9543 1.99097 13.6999 1 10.9998 1C7.09076 1 3.71808 3.24545 2.07263 6.51819L5.39986 9.10001C6.19072 6.73635 8.39984 4.98182 10.9998 4.98182Z" fill="#EA4335"/>
+</svg>
+
\ No newline at end of file
diff --git a/packages/icons/src/__generated__/commit.tsx b/packages/icons/src/__generated__/commit.tsx
new file mode 100644
index 0000000000..86bdd8ae42
--- /dev/null
+++ b/packages/icons/src/__generated__/commit.tsx
@@ -0,0 +1,15 @@
+// Generated from icons/commit.svg
+
+import { forwardRef } from "react";
+import type { IconProps } from "../types";
+
+// prettier-ignore
+export const CommitIcon = forwardRef<SVGSVGElement, IconProps>(
+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {
+ return (
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path fill="#000" fillRule="evenodd" d="M11 7.75a3.25 3.25 0 1 0 0 6.5 3.25 3.25 0 0 0 0-6.5Zm-4.691 2.5a4.751 4.751 0 0 1 9.382 0h4.459a.75.75 0 0 1 0 1.5h-4.459a4.751 4.751 0 0 1-9.382 0H1.85a.75.75 0 0 1 0-1.5h4.459Z" clipRule="evenodd" /></svg>
+ );
+ }
+);
+
+CommitIcon.displayName = "CommitIcon";
diff --git a/packages/icons/src/__generated__/github.tsx b/packages/icons/src/__generated__/github.tsx
new file mode 100644
index 0000000000..4f82cfd650
--- /dev/null
+++ b/packages/icons/src/__generated__/github.tsx
@@ -0,0 +1,15 @@
+// Generated from icons/github.svg
+
+import { forwardRef } from "react";
+import type { IconProps } from "../types";
+
+// prettier-ignore
+export const GithubIcon = forwardRef<SVGSVGElement, IconProps>(
+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {
+ return (
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path fill="#11181C" fillRule="evenodd" d="M11 1C5.475 1 1 5.475 1 11a9.994 9.994 0 0 0 6.838 9.488c.5.087.687-.213.687-.476 0-.237-.013-1.024-.013-1.862-2.512.463-3.162-.612-3.362-1.175-.113-.288-.6-1.175-1.025-1.413-.35-.187-.85-.65-.013-.662.788-.013 1.35.725 1.538 1.025.9 1.512 2.337 1.087 2.912.825.088-.65.35-1.088.638-1.338-2.225-.25-4.55-1.112-4.55-4.937 0-1.088.387-1.987 1.025-2.688-.1-.25-.45-1.274.1-2.65 0 0 .837-.262 2.75 1.026a9.28 9.28 0 0 1 2.5-.338c.85 0 1.7.112 2.5.337 1.912-1.3 2.75-1.024 2.75-1.024.55 1.375.2 2.4.1 2.65.637.7 1.025 1.587 1.025 2.687 0 3.838-2.337 4.688-4.562 4.938.362.312.675.912.675 1.85 0 1.337-.013 2.412-.013 2.75 0 .262.188.574.688.474A10.016 10.016 0 0 0 21 11c0-5.525-4.475-10-10-10Z" clipRule="evenodd" /></svg>
+ );
+ }
+);
+
+GithubIcon.displayName = "GithubIcon";
diff --git a/packages/icons/src/__generated__/google.tsx b/packages/icons/src/__generated__/google.tsx
new file mode 100644
index 0000000000..e7611846f3
--- /dev/null
+++ b/packages/icons/src/__generated__/google.tsx
@@ -0,0 +1,15 @@
+// Generated from icons/google.svg
+
+import { forwardRef } from "react";
+import type { IconProps } from "../types";
+
+// prettier-ignore
+export const GoogleIcon = forwardRef<SVGSVGElement, IconProps>(
+ ({ color = "currentColor", size = 16, ...props }, forwardedRef) => {
+ return (
+ <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22" width={size} height={size} fill={color} {...props} ref={forwardedRef}><path fill="#4285F4" d="M11 9.182v3.873h5.382a4.611 4.611 0 0 1-2.01 3.009l3.246 2.518c1.891-1.745 2.982-4.31 2.982-7.355 0-.709-.064-1.39-.182-2.045H11Z" /><path fill="#34A853" d="m5.396 12.903-.732.56-2.591 2.019C3.718 18.746 7.09 21 11 21c2.7 0 4.963-.89 6.618-2.418l-3.246-2.518c-.89.6-2.027.963-3.372.963-2.6 0-4.81-1.754-5.6-4.118l-.004-.006Z" /><path fill="#FBBC05" d="M2.073 6.518A9.877 9.877 0 0 0 1 11c0 1.618.39 3.136 1.073 4.482C2.073 15.49 5.4 12.9 5.4 12.9c-.2-.6-.318-1.236-.318-1.9 0-.664.118-1.3.318-1.9L2.073 6.518Z" /><path fill="#EA4335" d="M11 4.982c1.473 0 2.782.509 3.827 1.49l2.864-2.863C15.954 1.991 13.7 1 11 1 7.09 1 3.718 3.245 2.073 6.518L5.4 9.1c.79-2.364 3-4.118 5.6-4.118Z" /></svg>
+ );
+ }
+);
+
+GoogleIcon.displayName = "GoogleIcon";
diff --git a/packages/icons/src/__generated__/index.ts b/packages/icons/src/__generated__/index.ts
index d6471b9920..1f9e914654 100644
--- a/packages/icons/src/__generated__/index.ts
+++ b/packages/icons/src/__generated__/index.ts
@@ -14,11 +14,14 @@ export * from "./chevron-filled-left";
export * from "./chevron-filled-right";
export * from "./chevron-filled-up";
export * from "./code";
+export * from "./commit";
export * from "./dash";
export * from "./dot";
export * from "./drag-handle";
export * from "./eyecon-closed";
export * from "./eyecon-open";
+export * from "./github";
+export * from "./google";
export * from "./hamburger-menu";
export * from "./info";
export * from "./linked";
diff --git a/packages/icons/src/github.tsx b/packages/icons/src/github.tsx
deleted file mode 100644
index 7a266899d5..0000000000
--- a/packages/icons/src/github.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import * as React from "react";
-import type { IconProps } from "./types";
-
-export const GithubIcon = React.forwardRef<SVGSVGElement, IconProps>(
- ({ color = "currentColor", ...props }, forwardedRef) => {
- return (
- <svg
- role="img"
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- {...props}
- ref={forwardedRef}
- >
- <title>GitHub</title>
- <path
- d="M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12"
- fill={color}
- />
- </svg>
- );
- }
-);
-
-GithubIcon.displayName = "GithubIcon";
diff --git a/packages/icons/src/google.tsx b/packages/icons/src/google.tsx
deleted file mode 100644
index 4ffc2cd885..0000000000
--- a/packages/icons/src/google.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import * as React from "react";
-import type { IconProps } from "./types";
-
-export const GoogleIcon = React.forwardRef<SVGSVGElement, IconProps>(
- ({ color = "currentColor", ...props }, forwardedRef) => {
- return (
- <svg
- role="img"
- viewBox="0 0 24 24"
- xmlns="http://www.w3.org/2000/svg"
- {...props}
- ref={forwardedRef}
- >
- <title>Google</title>
- <path
- d="M12.48 10.92v3.28h7.84c-.24 1.84-.853 3.187-1.787 4.133-1.147 1.147-2.933 2.4-6.053 2.4-4.827 0-8.6-3.893-8.6-8.72s3.773-8.72 8.6-8.72c2.6 0 4.507 1.027 5.907 2.347l2.307-2.307C18.747 1.44 16.133 0 12.48 0 5.867 0 .307 5.387.307 12s5.56 12 12.173 12c3.573 0 6.267-1.173 8.373-3.36 2.16-2.16 2.84-5.213 2.84-7.667 0-.76-.053-1.467-.173-2.053H12.48z"
- fill={color}
- />
- </svg>
- );
- }
-);
-
-GoogleIcon.displayName = "GoogleIcon";
diff --git a/packages/icons/src/index.ts b/packages/icons/src/index.ts
index 9e1a67b062..fb68661db5 100644
--- a/packages/icons/src/index.ts
+++ b/packages/icons/src/index.ts
@@ -5,8 +5,6 @@ export * from "./brush";
export * from "./form";
export * from "./undo";
export * from "./redo";
-export * from "./google";
-export * from "./github";
export * from "./devices";
export * from "./body";
export * from "./types";
diff --git a/packages/icons/src/legacy.ts b/packages/icons/src/legacy.ts
index a9ad529e2c..e346e18bd8 100644
--- a/packages/icons/src/legacy.ts
+++ b/packages/icons/src/legacy.ts
@@ -13,7 +13,6 @@ export {
DotFilledIcon,
TriangleRightIcon,
TriangleDownIcon,
- CommitIcon,
InputIcon,
ButtonIcon,
HeadingIcon,