Skip to content

Commit 1ca48b7

Browse files
adithyaakrishnaadithyaakrishna
committed
chore: fix conflicts
1 parent 1eda525 commit 1ca48b7

File tree

110 files changed

+491
-369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+491
-369
lines changed

‎apps/sim/app/(auth)/login/login-form.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,4 +616,4 @@ export default function LoginPage({
616616
</Modal>
617617
</>
618618
)
619-
}
619+
}

‎apps/sim/app/(auth)/signup/signup-form.tsx‎

Lines changed: 113 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -375,105 +375,139 @@ function SignupFormContent({
375375

376376
{/* Email/Password Form - show unless explicitly disabled */}
377377
{!isFalsy(getEnv('NEXT_PUBLIC_EMAIL_PASSWORD_SIGNUP_ENABLED')) && (
378-
<form onSubmit={onSubmit} className='mt-8 space-y-8'>
378+
<form onSubmit={onSubmit} className='mt-8 space-y-10'>
379379
<div className='space-y-6'>
380380
<div className='space-y-2'>
381381
<div className='flex items-center justify-between'>
382382
<Label htmlFor='name'>Full name</Label>
383383
</div>
384-
<Input
385-
id='name'
386-
name='name'
387-
placeholder='Enter your name'
388-
type='text'
389-
autoCapitalize='words'
390-
autoComplete='name'
391-
title='Name can only contain letters, spaces, hyphens, and apostrophes'
392-
value={name}
393-
onChange={handleNameChange}
394-
className={cn(
395-
showNameValidationError &&
396-
nameErrors.length > 0 &&
397-
'border-red-500 focus:border-red-500'
398-
)}
399-
/>
400-
{showNameValidationError && nameErrors.length > 0 && (
401-
<div className='mt-1 space-y-1 text-red-400 text-xs'>
402-
{nameErrors.map((error, index) => (
403-
<p key={index}>{error}</p>
404-
))}
384+
<div className='relative'>
385+
<Input
386+
id='name'
387+
name='name'
388+
placeholder='Enter your name'
389+
type='text'
390+
autoCapitalize='words'
391+
autoComplete='name'
392+
title='Name can only contain letters, spaces, hyphens, and apostrophes'
393+
value={name}
394+
onChange={handleNameChange}
395+
className={cn(
396+
showNameValidationError &&
397+
nameErrors.length > 0 &&
398+
'border-red-500 focus:border-red-500'
399+
)}
400+
/>
401+
<div
402+
className={cn(
403+
'absolute right-0 left-0 z-10 grid transition-[grid-template-rows] duration-200 ease-out',
404+
showNameValidationError && nameErrors.length > 0
405+
? 'grid-rows-[1fr]'
406+
: 'grid-rows-[0fr]'
407+
)}
408+
aria-live='polite'
409+
>
410+
<div className='overflow-hidden'>
411+
<div className='mt-1 space-y-1 text-red-400 text-xs'>
412+
{nameErrors.map((error, index) => (
413+
<p key={index}>{error}</p>
414+
))}
415+
</div>
416+
</div>
405417
</div>
406-
)}
407-
</div>
408-
<div className='space-y-2'>
409-
<div className='flex items-center justify-between'>
410-
<Label htmlFor='email'>Email</Label>
411418
</div>
412-
<Input
413-
id='email'
414-
name='email'
415-
placeholder='Enter your email'
416-
autoCapitalize='none'
417-
autoComplete='email'
418-
autoCorrect='off'
419-
value={email}
420-
onChange={handleEmailChange}
421-
className={cn(
422-
(emailError || (showEmailValidationError && emailErrors.length > 0)) &&
423-
'border-red-500 focus:border-red-500'
424-
)}
425-
/>
426-
{showEmailValidationError && emailErrors.length > 0 && (
427-
<div className='mt-1 space-y-1 text-red-400 text-xs'>
428-
{emailErrors.map((error, index) => (
429-
<p key={index}>{error}</p>
430-
))}
431-
</div>
432-
)}
433-
{emailError && !showEmailValidationError && (
434-
<div className='mt-1 text-red-400 text-xs'>
435-
<p>{emailError}</p>
436-
</div>
437-
)}
438419
</div>
439420
<div className='space-y-2'>
440421
<div className='flex items-center justify-between'>
441-
<Label htmlFor='password'>Password</Label>
422+
<Label htmlFor='email'>Email</Label>
442423
</div>
443424
<div className='relative'>
444425
<Input
445-
id='password'
446-
name='password'
447-
type={showPassword ? 'text' : 'password'}
426+
id='email'
427+
name='email'
428+
placeholder='Enter your email'
448429
autoCapitalize='none'
449-
autoComplete='new-password'
450-
placeholder='Enter your password'
430+
autoComplete='email'
451431
autoCorrect='off'
452-
value={password}
453-
onChange={handlePasswordChange}
432+
value={email}
433+
onChange={handleEmailChange}
454434
className={cn(
455-
'pr-10',
456-
showValidationError &&
457-
passwordErrors.length > 0 &&
435+
(emailError || (showEmailValidationError && emailErrors.length > 0)) &&
458436
'border-red-500 focus:border-red-500'
459437
)}
460438
/>
461-
<button
462-
type='button'
463-
onClick={() => setShowPassword(!showPassword)}
464-
className='-translate-y-1/2 absolute top-1/2 right-3 text-[#999] transition hover:text-[#ECECEC]'
465-
aria-label={showPassword ? 'Hide password' : 'Show password'}
439+
<div
440+
className={cn(
441+
'absolute right-0 left-0 z-10 grid transition-[grid-template-rows] duration-200 ease-out',
442+
(showEmailValidationError && emailErrors.length > 0) ||
443+
(emailError && !showEmailValidationError)
444+
? 'grid-rows-[1fr]'
445+
: 'grid-rows-[0fr]'
446+
)}
447+
aria-live='polite'
466448
>
467-
{showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
468-
</button>
449+
<div className='overflow-hidden'>
450+
<div className='mt-1 space-y-1 text-red-400 text-xs'>
451+
{showEmailValidationError && emailErrors.length > 0 ? (
452+
emailErrors.map((error, index) => <p key={index}>{error}</p>)
453+
) : emailError && !showEmailValidationError ? (
454+
<p>{emailError}</p>
455+
) : null}
456+
</div>
457+
</div>
458+
</div>
469459
</div>
470-
{showValidationError && passwordErrors.length > 0 && (
471-
<div className='mt-1 space-y-1 text-red-400 text-xs'>
472-
{passwordErrors.map((error, index) => (
473-
<p key={index}>{error}</p>
474-
))}
460+
</div>
461+
<div className='space-y-2'>
462+
<div className='flex items-center justify-between'>
463+
<Label htmlFor='password'>Password</Label>
464+
</div>
465+
<div className='relative'>
466+
<div className='relative'>
467+
<Input
468+
id='password'
469+
name='password'
470+
type={showPassword ? 'text' : 'password'}
471+
autoCapitalize='none'
472+
autoComplete='new-password'
473+
placeholder='Enter your password'
474+
autoCorrect='off'
475+
value={password}
476+
onChange={handlePasswordChange}
477+
className={cn(
478+
'pr-10',
479+
showValidationError &&
480+
passwordErrors.length > 0 &&
481+
'border-red-500 focus:border-red-500'
482+
)}
483+
/>
484+
<button
485+
type='button'
486+
onClick={() => setShowPassword(!showPassword)}
487+
className='-translate-y-1/2 absolute top-1/2 right-3 text-[#999] transition hover:text-[#ECECEC]'
488+
aria-label={showPassword ? 'Hide password' : 'Show password'}
489+
>
490+
{showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
491+
</button>
492+
</div>
493+
<div
494+
className={cn(
495+
'absolute right-0 left-0 z-10 grid transition-[grid-template-rows] duration-200 ease-out',
496+
showValidationError && passwordErrors.length > 0
497+
? 'grid-rows-[1fr]'
498+
: 'grid-rows-[0fr]'
499+
)}
500+
aria-live='polite'
501+
>
502+
<div className='overflow-hidden'>
503+
<div className='mt-1 space-y-1 text-red-400 text-xs'>
504+
{passwordErrors.map((error, index) => (
505+
<p key={index}>{error}</p>
506+
))}
507+
</div>
508+
</div>
475509
</div>
476-
)}
510+
</div>
477511
</div>
478512
</div>
479513

@@ -498,6 +532,7 @@ function SignupFormContent({
498532
disabled={isLoading}
499533
loading={isLoading}
500534
loadingText='Creating account'
535+
className='!mt-6'
501536
>
502537
Create account
503538
</BrandedButton>
@@ -608,4 +643,4 @@ export default function SignupPage({
608643
/>
609644
</Suspense>
610645
)
611-
}
646+
}

‎apps/sim/app/chat/components/auth/password/password-auth.tsx‎

Lines changed: 45 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -103,47 +103,59 @@ export default function PasswordAuth({ identifier, onAuthSuccess }: PasswordAuth
103103
}}
104104
className='mt-8 w-full max-w-[410px] space-y-6'
105105
>
106-
<div className='space-y-2'>
106+
<div className='space-y-6'>
107107
<div className='flex items-center justify-between'>
108108
<Label htmlFor='password'>Password</Label>
109109
</div>
110110
<div className='relative'>
111-
<Input
112-
id='password'
113-
name='password'
114-
required
115-
type={showPassword ? 'text' : 'password'}
116-
autoCapitalize='none'
117-
autoComplete='new-password'
118-
autoCorrect='off'
119-
placeholder='Enter password'
120-
value={password}
121-
onChange={handlePasswordChange}
122-
onKeyDown={handleKeyDown}
111+
<div className='relative'>
112+
<Input
113+
id='password'
114+
name='password'
115+
required
116+
type={showPassword ? 'text' : 'password'}
117+
autoCapitalize='none'
118+
autoComplete='new-password'
119+
autoCorrect='off'
120+
placeholder='Enter password'
121+
value={password}
122+
onChange={handlePasswordChange}
123+
onKeyDown={handleKeyDown}
124+
className={cn(
125+
'pr-10',
126+
showValidationError &&
127+
passwordErrors.length > 0 &&
128+
'border-red-500 focus:border-red-500'
129+
)}
130+
autoFocus
131+
/>
132+
<button
133+
type='button'
134+
onClick={() => setShowPassword(!showPassword)}
135+
className='-translate-y-1/2 absolute top-1/2 right-3 text-[#999] hover:text-[#ECECEC]'
136+
aria-label={showPassword ? 'Hide password' : 'Show password'}
137+
>
138+
{showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
139+
</button>
140+
</div>
141+
<div
123142
className={cn(
124-
'pr-10',
125-
showValidationError &&
126-
passwordErrors.length > 0 &&
127-
'border-red-500 focus:border-red-500'
143+
'absolute right-0 left-0 z-10 grid transition-[grid-template-rows] duration-200 ease-out',
144+
showValidationError && passwordErrors.length > 0
145+
? 'grid-rows-[1fr]'
146+
: 'grid-rows-[0fr]'
128147
)}
129-
autoFocus
130-
/>
131-
<button
132-
type='button'
133-
onClick={() => setShowPassword(!showPassword)}
134-
className='-translate-y-1/2 absolute top-1/2 right-3 text-[#999] hover:text-[#ECECEC]'
135-
aria-label={showPassword ? 'Hide password' : 'Show password'}
148+
aria-live='polite'
136149
>
137-
{showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
138-
</button>
139-
</div>
140-
{showValidationError && passwordErrors.length > 0 && (
141-
<div className='mt-1 space-y-1 text-red-400 text-xs'>
142-
{passwordErrors.map((error, index) => (
143-
<p key={index}>{error}</p>
144-
))}
150+
<div className='overflow-hidden'>
151+
<div className='mt-1 space-y-1 text-red-400 text-xs'>
152+
{passwordErrors.map((error, index) => (
153+
<p key={index}>{error}</p>
154+
))}
155+
</div>
156+
</div>
145157
</div>
146-
)}
158+
</div>
147159
</div>
148160

149161
<BrandedButton

‎apps/sim/app/not-found.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export default async function NotFound() {
1717
<div className='relative z-30 flex flex-1 items-center justify-center px-4 pb-24'>
1818
<div className='flex flex-col items-center gap-[12px]'>
1919
<h1 className='font-[430] font-season text-[40px] text-white leading-[110%] tracking-[-0.02em]'>
20-
Page Not Found
20+
Page not found
2121
</h1>
2222
<p className='font-[430] font-season text-[#F6F6F6]/60 text-[18px] leading-[125%] tracking-[0.02em]'>
2323
The page you&apos;re looking for doesn&apos;t exist or has been moved.

‎apps/sim/app/workspace/[workspaceId]/components/message-actions/message-actions.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export function MessageActions({ content, requestId }: MessageActionsProps) {
4949
<button
5050
type='button'
5151
aria-label='More options'
52-
className='flex h-5 w-5 items-center justify-center rounded-sm text-[var(--text-icon)] opacity-0 transition-colors transition-opacity hover:bg-[var(--surface-3)] hover:text-[var(--text-primary)] focus-visible:opacity-100 focus-visible:outline-none group-hover/msg:opacity-100 data-[state=open]:opacity-100'
52+
className='flex h-5 w-5 items-center justify-center rounded-sm text-[var(--text-icon)] opacity-0 transition-colors transition-opacity hover-hover:bg-[var(--surface-3)] hover-hover:text-[var(--text-primary)] focus-visible:opacity-100 focus-visible:outline-none group-hover/msg:opacity-100 data-[state=open]:opacity-100'
5353
onClick={(event) => event.stopPropagation()}
5454
>
5555
<Ellipsis className='h-3 w-3' strokeWidth={2} />

‎apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-options-bar/resource-options-bar.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ export const ResourceOptionsBar = memo(function ResourceOptionsBar({
118118
{search.tags?.length || search.value ? (
119119
<button
120120
type='button'
121-
className='mr-[2px] flex h-[14px] w-[14px] shrink-0 items-center justify-center text-[var(--text-subtle)] transition-colors hover:text-[var(--text-secondary)]'
121+
className='mr-[2px] flex h-[14px] w-[14px] shrink-0 items-center justify-center text-[var(--text-subtle)] transition-colors hover-hover:text-[var(--text-secondary)]'
122122
onClick={search.onClearAll}
123123
>
124124
<span className='text-[12px]'>✕</span>

‎apps/sim/app/workspace/[workspaceId]/components/resource/resource.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ export const ResourceTable = memo(function ResourceTable({
282282
<th key={col.id} className='h-10 px-[16px] py-[6px] text-left align-middle'>
283283
<Button
284284
variant='subtle'
285-
className='px-[8px] py-[4px] font-base text-[var(--text-muted)] hover:text-[var(--text-muted)]'
285+
className='px-[8px] py-[4px] font-base text-[var(--text-muted)] hover-hover:text-[var(--text-muted)]'
286286
onClick={() =>
287287
handleSort(
288288
col.id,
@@ -314,7 +314,7 @@ export const ResourceTable = memo(function ResourceTable({
314314
data-resource-row
315315
data-row-id={row.id}
316316
className={cn(
317-
'transition-colors hover:bg-[var(--surface-3)]',
317+
'transition-colors hover-hover:bg-[var(--surface-3)]',
318318
onRowClick && 'cursor-pointer',
319319
(selectedRowId === row.id || isSelected) && 'bg-[var(--surface-3)]'
320320
)}
@@ -356,7 +356,7 @@ export const ResourceTable = memo(function ResourceTable({
356356
'transition-colors',
357357
create.disabled
358358
? 'cursor-not-allowed'
359-
: 'cursor-pointer hover:bg-[var(--surface-3)]'
359+
: 'cursor-pointer hover-hover:bg-[var(--surface-3)]'
360360
)}
361361
onClick={create.disabled ? undefined : create.onClick}
362362
>
@@ -428,7 +428,7 @@ function Pagination({
428428
type='button'
429429
onClick={() => onPageChange(page)}
430430
className={cn(
431-
'font-medium text-sm transition-colors hover:text-[var(--text-body)]',
431+
'font-medium text-sm transition-colors hover-hover:text-[var(--text-body)]',
432432
page === currentPage ? 'text-[var(--text-body)]' : 'text-[var(--text-secondary)]'
433433
)}
434434
>

0 commit comments

Comments
 (0)