diff --git a/space/components/accounts/auth-forms/password.tsx b/space/components/accounts/auth-forms/password.tsx index a9aeec30f..9ec087e4e 100644 --- a/space/components/accounts/auth-forms/password.tsx +++ b/space/components/accounts/auth-forms/password.tsx @@ -180,7 +180,7 @@ export const PasswordForm: React.FC = (props) => { )} {!!passwordFormData.confirm_password && passwordFormData.password !== passwordFormData.confirm_password && ( - Password doesn{"'"}t match + Passwords don{"'"}t match )} )} diff --git a/space/components/accounts/onboarding-form.tsx b/space/components/accounts/onboarding-form.tsx index 618e838c9..b43af9ffe 100644 --- a/space/components/accounts/onboarding-form.tsx +++ b/space/components/accounts/onboarding-form.tsx @@ -210,7 +210,7 @@ export const OnBoardingForm: React.FC = observer((props) => { disabled={isButtonDisabled} loading={isSubmitting} > - {isSubmitting ? "Updating..." : "Continue"} + Continue ); diff --git a/space/pages/accounts/reset-password.tsx b/space/pages/accounts/reset-password.tsx index fe2d42340..be7b28dbc 100644 --- a/space/pages/accounts/reset-password.tsx +++ b/space/pages/accounts/reset-password.tsx @@ -181,7 +181,7 @@ const ResetPasswordPage: NextPage = () => { )} {!!resetFormData.confirm_password && resetFormData.password !== resetFormData.confirm_password && ( - Password doesn{"'"}t match + Passwords don{"'"}t match )} )} diff --git a/web/components/account/auth-forms/password.tsx b/web/components/account/auth-forms/password.tsx index 4264b318e..903eb5e4c 100644 --- a/web/components/account/auth-forms/password.tsx +++ b/web/components/account/auth-forms/password.tsx @@ -181,7 +181,7 @@ export const AuthPasswordForm: React.FC = observer((props: Props) => { )} {!!passwordFormData.confirm_password && passwordFormData.password !== passwordFormData.confirm_password && ( - Password doesn{"'"}t match + Passwords don{"'"}t match )} )} diff --git a/web/components/onboarding/create-or-join-workspaces.tsx b/web/components/onboarding/create-or-join-workspaces.tsx index b8b8257b0..ae8fcc450 100644 --- a/web/components/onboarding/create-or-join-workspaces.tsx +++ b/web/components/onboarding/create-or-join-workspaces.tsx @@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react"; import { observer } from "mobx-react"; import Image from "next/image"; // icons -import { Sparkles } from "lucide-react"; +import { useTheme } from "next-themes"; // types import { IWorkspaceMemberInvitation, TOnboardingSteps } from "@plane/types"; // ui @@ -12,7 +12,8 @@ import { Invitations, OnboardingHeader, SwitchOrDeleteAccountDropdown, CreateWor // hooks import { useUser } from "@/hooks/store"; // assets -import createJoinWorkspace from "public/onboarding/create-join-workspace.png"; +import CreateJoinWorkspaceDark from "public/onboarding/create-join-workspace-dark.svg"; +import CreateJoinWorkspace from "public/onboarding/create-join-workspace.svg"; export enum ECreateOrJoinWorkspaceViews { WORKSPACE_CREATE = "WORKSPACE_CREATE", @@ -31,6 +32,8 @@ export const CreateOrJoinWorkspaces: React.FC = observer((props) => { const [currentView, setCurrentView] = useState(null); // store hooks const { data: user } = useUser(); + // hooks + const { resolvedTheme } = useTheme(); useEffect(() => { if (invitations.length > 0) { @@ -47,7 +50,7 @@ export const CreateOrJoinWorkspaces: React.FC = observer((props) => { return (
-
+
@@ -74,14 +77,14 @@ export const CreateOrJoinWorkspaces: React.FC = observer((props) => { )}
-
+
-
-
- - Workspace is the hub for all work happening in your company. -
- create-join-workspace +
+ Profile setup
diff --git a/web/components/onboarding/create-workspace.tsx b/web/components/onboarding/create-workspace.tsx index 3f8d92d89..c31d56013 100644 --- a/web/components/onboarding/create-workspace.tsx +++ b/web/components/onboarding/create-workspace.tsx @@ -141,7 +141,7 @@ export const CreateWorkspace: React.FC = (props) => {

Create a workspace

- To start using plane, you need to create or join a workspace + To start using Plane, you need to create or join a workspace.

@@ -162,7 +162,7 @@ export const CreateWorkspace: React.FC = (props) => { }, }} render={({ field: { value, ref, onChange } }) => ( -
+
= (props) => { placeholder="Enter workspace name..." ref={ref} hasError={Boolean(errors.name)} - className="w-full border-onboarding-border-100 text-base placeholder:text-base placeholder:text-custom-text-400/50" + className="w-full border-onboarding-border-100 placeholder:text-custom-text-400" />
)} @@ -185,16 +185,16 @@ export const CreateWorkspace: React.FC = (props) => {
(
{window && window.location.host}/ = (props) => {
)} /> -

You can only edit the slug of the url

+

You can only edit the slug of the URL

{slugError && Workspace URL is already taken!} {invalidSlug && ( {`URL can only contain ( - ), ( _ ) & alphanumeric characters.`} @@ -238,7 +238,7 @@ export const CreateWorkspace: React.FC = (props) => { Select organization size ) } - buttonClassName="!border-[0.5px] !border-custom-border-200 !shadow-none" + buttonClassName="!border-[0.5px] !border-onboarding-border-100 !shadow-none !rounded-md" input optionsClassName="w-full" > diff --git a/web/components/onboarding/index.ts b/web/components/onboarding/index.ts index db79162be..8b94c8094 100644 --- a/web/components/onboarding/index.ts +++ b/web/components/onboarding/index.ts @@ -4,7 +4,6 @@ export * from "./create-or-join-workspaces"; export * from "./profile-setup"; export * from "./create-workspace"; export * from "./invitations"; -export * from "./onboarding-sidebar"; export * from "./step-indicator"; export * from "./switch-or-delete-account-dropdown"; export * from "./switch-delete-account-modal"; diff --git a/web/components/onboarding/invite-members.tsx b/web/components/onboarding/invite-members.tsx index 212b162f2..44d43443f 100644 --- a/web/components/onboarding/invite-members.tsx +++ b/web/components/onboarding/invite-members.tsx @@ -30,10 +30,8 @@ import useDynamicDropdownPosition from "@/hooks/use-dynamic-dropdown"; // services import { WorkspaceService } from "@/services/workspace.service"; // assets -import userDark from "public/onboarding/user-dark.svg"; -import userLight from "public/onboarding/user-light.svg"; -import user1 from "public/users/user-1.png"; -import user2 from "public/users/user-2.png"; +import InviteMembersDark from "public/onboarding/invite-members-dark.svg"; +import InviteMembersLight from "public/onboarding/invite-members-light.svg"; // components import { OnboardingHeader } from "./header"; import { SwitchOrDeleteAccountDropdown } from "./switch-or-delete-account-dropdown"; @@ -136,7 +134,7 @@ const InviteMemberInput: React.FC = (props) => { return (
-
+
= (props) => { )} />
-
+
= (props) => { type="button" ref={buttonRef} onClick={() => setIsDropdownOpen((prev) => !prev)} - className="flex w-full items-center justify-between gap-1 rounded-md px-2.5 py-2 text-xs duration-300" + className="flex w-full items-center justify-between gap-1 rounded-md px-2.5 py-2 text-sm border-[0.5px] border-onboarding-border-100" > = (props) => { = (props) => { return (
-
+
{/* Since this will always be the last step */} @@ -437,46 +435,14 @@ export const InviteMembers: React.FC = (props) => {
-
+
-