Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: onboarding ui fix #1225

Merged
merged 1 commit into from
Jun 6, 2023
Merged

fix: onboarding ui fix #1225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions apps/app/components/onboarding/user-details.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ export const UserDetails: React.FC<Props> = ({ user, setStep, setUserRole }) =>
</div>

<div className="flex flex-col justify-between gap-4 px-7 py-3.5 sm:flex-row">
<div className="flex flex-col items-start justify-center gap-2.5 w-full sm:w-1/2">
<span>First name</span>
<div className="flex flex-col items-start justify-center gap-1 w-full sm:w-1/2">
<span className="mb-1.5">First name</span>
<Input
name="first_name"
autoComplete="off"
Expand All @@ -88,8 +88,8 @@ export const UserDetails: React.FC<Props> = ({ user, setStep, setUserRole }) =>
error={errors.first_name}
/>
</div>
<div className="flex flex-col items-start justify-center gap-2.5 w-full sm:w-1/2">
<span>Last name</span>
<div className="flex flex-col items-start justify-center gap-1 w-full sm:w-1/2">
<span className="mb-1.5">Last name</span>
<Input
name="last_name"
autoComplete="off"
Expand Down Expand Up @@ -128,6 +128,7 @@ export const UserDetails: React.FC<Props> = ({ user, setStep, setUserRole }) =>
</CustomSelect>
)}
/>
{errors.role && <span className="text-sm text-red-500">{errors.role.message}</span>}
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions apps/app/components/onboarding/workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export const Workspace: React.FC<Props> = ({ setStep, setWorkspace, user }) => {
<div className="grid w-full place-items-center">
<Tab.Group
as="div"
className="flex h-[417px] w-full max-w-xl flex-col justify-between rounded-[10px] bg-brand-base shadow-md"
className="flex h-[442px] w-full max-w-xl flex-col justify-between rounded-[10px] bg-brand-base shadow-md"
defaultIndex={currentTabValue(currentTab)}
onChange={(i) => {
switch (i) {
Expand Down Expand Up @@ -132,7 +132,7 @@ export const Workspace: React.FC<Props> = ({ setStep, setWorkspace, user }) => {
<Tab.Panels as="div" className="h-full">
<Tab.Panel className="h-full">
<div className="flex h-full w-full flex-col">
<div className="h-[255px] overflow-y-auto px-7">
<div className="h-[280px] overflow-y-auto px-7">
{invitations && invitations.length > 0 ? (
invitations.map((invitation) => (
<div key={invitation.id}>
Expand Down
16 changes: 8 additions & 8 deletions apps/app/components/workspace/create-workspace-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ export const CreateWorkspaceForm: React.FC<Props> = ({

return (
<form className="flex h-full w-full flex-col" onSubmit={handleSubmit(handleCreateWorkspace)}>
<div className="divide-y h-[255px]">
<div className="flex flex-col justify-between gap-3.5 px-7 pb-3.5">
<div className="flex flex-col items-start justify-center gap-2.5">
<span className="text-sm">Workspace name</span>
<div className="divide-y h-[280px]">
<div className="flex flex-col justify-between gap-3 px-7 pb-3.5">
<div className="flex flex-col items-start justify-center gap-1">
<span className="mb-1.5 text-sm">Workspace name</span>
<Input
name="name"
register={register}
Expand All @@ -125,8 +125,8 @@ export const CreateWorkspaceForm: React.FC<Props> = ({
error={errors.name}
/>
</div>
<div className="flex flex-col items-start justify-center gap-2.5">
<span className="text-sm">Workspace URL</span>
<div className="flex flex-col items-start justify-center gap-1">
<span className="mb-1.5 text-sm">Workspace URL</span>
<div className="flex w-full items-center rounded-md border border-brand-base px-3">
<span className="whitespace-nowrap text-sm text-brand-secondary">
{typeof window !== "undefined" && window.location.origin}/
Expand Down Expand Up @@ -156,8 +156,8 @@ export const CreateWorkspaceForm: React.FC<Props> = ({
</div>
</div>

<div className="flex flex-col items-start justify-center gap-2.5 border-t border-brand-base px-7 pt-3.5 ">
<span className="text-sm">How large is your company?</span>
<div className="flex flex-col items-start justify-center gap-1 border-t border-brand-base px-7 pt-3.5 ">
<span className="mb-1.5 text-sm">How large is your company?</span>
<div className="w-full">
<Controller
name="company_size"
Expand Down