Skip to content

Commit be4b22d

Browse files
adithyaakrishnaadithyaakrishna
committed
chore: fix conflicts
1 parent d9b5c1b commit be4b22d

File tree

209 files changed

+1086
-1153
lines changed

Some content is hidden

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

209 files changed

+1086
-1153
lines changed

‎apps/sim/app/(auth)/oauth/consent/page.tsx‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ export default function OAuthConsentPage() {
189189
Authorize Application
190190
</h1>
191191
<p className='font-[430] font-season text-[var(--text-primary)]/60 text-lg leading-[125%] tracking-[0.02em]'>
192-
<span className='font-medium text-[var(--landing-text)]'>{clientName}</span> is requesting access to
193-
your account
192+
<span className='font-medium text-[var(--landing-text)]'>{clientName}</span> is requesting
193+
access to your account
194194
</p>
195195
</div>
196196

@@ -232,7 +232,10 @@ export default function OAuthConsentPage() {
232232
<p className='mb-3 font-medium text-sm'>This will allow the application to:</p>
233233
<ul className='space-y-2'>
234234
{scopes.map((s) => (
235-
<li key={s} className='flex items-start gap-2 font-normal text-[var(--text-subtle)] text-small'>
235+
<li
236+
key={s}
237+
className='flex items-start gap-2 font-normal text-[var(--text-subtle)] text-small'
238+
>
236239
<span className='mt-0.5 text-green-500'>&#10003;</span>
237240
<span>{SCOPE_DESCRIPTIONS[s] ?? s}</span>
238241
</li>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ export function RequestResetForm({
5454
{/* Status message display */}
5555
{statusType && statusMessage && (
5656
<div
57-
className={cn('text-xs', statusType === 'success' ? 'text-[var(--success)]' : 'text-red-400')}
57+
className={cn(
58+
'text-xs',
59+
statusType === 'success' ? 'text-[var(--success)]' : 'text-red-400'
60+
)}
5861
>
5962
<p>{statusMessage}</p>
6063
</div>

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,9 @@ function SignupFormContent({
554554
<div className='w-full border-[var(--surface-4)] border-t' />
555555
</div>
556556
<div className='relative flex justify-center text-sm'>
557-
<span className='bg-[var(--landing-bg)] px-4 font-[340] text-[var(--text-subtle)]'>Or continue with</span>
557+
<span className='bg-[var(--landing-bg)] px-4 font-[340] text-[var(--text-subtle)]'>
558+
Or continue with
559+
</span>
558560
</div>
559561
</div>
560562
)}
@@ -643,4 +645,4 @@ export default function SignupPage({
643645
/>
644646
</Suspense>
645647
)
646-
}
648+
}

‎apps/sim/app/(auth)/verify/verify-content.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ function VerificationForm({
126126
Didn't receive a code?{' '}
127127
{countdown > 0 ? (
128128
<span>
129-
Resend in <span className='font-medium text-[var(--landing-text)]'>{countdown}s</span>
129+
Resend in{' '}
130+
<span className='font-medium text-[var(--landing-text)]'>{countdown}s</span>
130131
</span>
131132
) : (
132133
<button

‎apps/sim/app/(home)/components/collaboration/collaboration.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ export default function Collaboration() {
256256

257257
<Link
258258
href='/signup'
259-
className='group/cta mt-3 inline-flex h-[32px] cursor-none items-center gap-1.5 rounded-[5px] border border-[var(--white)] bg-[var(--white)] px-2.5 font-[430] font-season text-sm text-black transition-colors hover:border-[var(--border-1)] hover:bg-[var(--border-1)]'
259+
className='group/cta mt-3 inline-flex h-[32px] cursor-none items-center gap-1.5 rounded-[5px] border border-[var(--white)] bg-[var(--white)] px-2.5 font-[430] font-season text-black text-sm transition-colors hover:border-[var(--border-1)] hover:bg-[var(--border-1)]'
260260
>
261261
Build together
262262
<span className='relative h-[10px] w-[10px] shrink-0'>

‎apps/sim/app/(home)/components/features/components/features-preview.tsx‎

Lines changed: 42 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -460,9 +460,18 @@ function TableCardBody() {
460460
key={i}
461461
className='flex items-center gap-1 border-[var(--surface-4)] border-b px-1.5 py-[3.5px]'
462462
>
463-
<div className='h-[1.5px] rounded-full bg-[var(--divider)]' style={{ width: `${row[0]}%` }} />
464-
<div className='h-[1.5px] rounded-full bg-[var(--divider)]' style={{ width: `${row[1]}%` }} />
465-
<div className='h-[1.5px] rounded-full bg-[var(--divider)]' style={{ width: `${row[2]}%` }} />
463+
<div
464+
className='h-[1.5px] rounded-full bg-[var(--divider)]'
465+
style={{ width: `${row[0]}%` }}
466+
/>
467+
<div
468+
className='h-[1.5px] rounded-full bg-[var(--divider)]'
469+
style={{ width: `${row[1]}%` }}
470+
/>
471+
<div
472+
className='h-[1.5px] rounded-full bg-[var(--divider)]'
473+
style={{ width: `${row[2]}%` }}
474+
/>
466475
</div>
467476
))}
468477
</div>
@@ -506,7 +515,10 @@ function KnowledgeCardBody() {
506515
{KB_WIDTHS.map((w, i) => (
507516
<div key={i} className='flex items-center gap-1'>
508517
<div className='h-[3px] w-[3px] flex-shrink-0 rounded-full bg-[var(--surface-7)]' />
509-
<div className='h-[1.5px] rounded-full bg-[var(--surface-6)]' style={{ width: `${w}%` }} />
518+
<div
519+
className='h-[1.5px] rounded-full bg-[var(--surface-6)]'
520+
style={{ width: `${w}%` }}
521+
/>
510522
</div>
511523
))}
512524
</div>
@@ -608,7 +620,7 @@ const MOCK_KB_DATA = [
608620

609621
const MD_COMPONENTS: Components = {
610622
h1: ({ children }) => (
611-
<h1 className='mb-4 border-[var(--surface-6)] border-b pb-2 font-semibold text-[var(--text-primary)] text-[20px]'>
623+
<h1 className='mb-4 border-[var(--surface-6)] border-b pb-2 font-semibold text-[20px] text-[var(--text-primary)]'>
612624
{children}
613625
</h1>
614626
),
@@ -622,7 +634,9 @@ const MD_COMPONENTS: Components = {
622634
li: ({ children }) => (
623635
<li className='mb-1 text-[var(--text-primary)] text-sm leading-[1.6]'>{children}</li>
624636
),
625-
p: ({ children }) => <p className='mb-3 text-[var(--text-primary)] text-sm leading-[1.6]'>{children}</p>,
637+
p: ({ children }) => (
638+
<p className='mb-3 text-[var(--text-primary)] text-sm leading-[1.6]'>{children}</p>
639+
),
626640
}
627641

628642
function MockFullFiles() {
@@ -635,7 +649,9 @@ function MockFullFiles() {
635649
<File className='h-[14px] w-[14px] text-[var(--text-subtle)]' />
636650
<span className='text-[var(--text-subtle)] text-small'>Files</span>
637651
<span className='text-[var(--surface-7)] text-small'>/</span>
638-
<span className='font-medium text-[var(--text-primary)] text-small'>meeting-notes.md</span>
652+
<span className='font-medium text-[var(--text-primary)] text-small'>
653+
meeting-notes.md
654+
</span>
639655
</div>
640656
</div>
641657

@@ -935,7 +951,9 @@ function MockFullLogs({ revealedRows }: { revealedRows: number }) {
935951
</span>
936952
</td>
937953
<td className='px-6 py-2.5 align-middle'>
938-
<span className='font-medium text-[var(--text-subtle)] text-sm'>{row[1]}</span>
954+
<span className='font-medium text-[var(--text-subtle)] text-sm'>
955+
{row[1]}
956+
</span>
939957
</td>
940958
<td className='px-6 py-2.5 align-middle'>
941959
<span
@@ -946,15 +964,19 @@ function MockFullLogs({ revealedRows }: { revealedRows: number }) {
946964
</span>
947965
</td>
948966
<td className='px-6 py-2.5 align-middle'>
949-
<span className='font-medium text-[var(--text-subtle)] text-sm'>{row[3]}</span>
967+
<span className='font-medium text-[var(--text-subtle)] text-sm'>
968+
{row[3]}
969+
</span>
950970
</td>
951971
<td className='px-6 py-2.5 align-middle'>
952972
<span className='rounded-sm bg-[var(--surface-4)] px-1.5 py-0.5 text-[var(--text-secondary)] text-xs'>
953973
{row[4]}
954974
</span>
955975
</td>
956976
<td className='px-6 py-2.5 align-middle'>
957-
<span className='font-medium text-[var(--text-subtle)] text-sm'>{row[5]}</span>
977+
<span className='font-medium text-[var(--text-subtle)] text-sm'>
978+
{row[5]}
979+
</span>
958980
</td>
959981
</motion.tr>
960982
)
@@ -1047,7 +1069,9 @@ function MockLogDetailsSidebar({ selectedRow, onPrev, onNext }: MockLogDetailsSi
10471069
backgroundClip: 'padding-box',
10481070
}}
10491071
/>
1050-
<span className='truncate font-medium text-[var(--text-secondary)] text-small'>{row[0]}</span>
1072+
<span className='truncate font-medium text-[var(--text-secondary)] text-small'>
1073+
{row[0]}
1074+
</span>
10511075
</div>
10521076
</div>
10531077
</div>
@@ -1075,7 +1099,9 @@ function MockLogDetailsSidebar({ selectedRow, onPrev, onNext }: MockLogDetailsSi
10751099
</div>
10761100

10771101
<div className='flex flex-col gap-1.5 rounded-md border border-[var(--surface-6)] bg-[var(--surface-1)] px-2.5 py-2'>
1078-
<span className='font-medium text-[var(--text-subtle)] text-caption'>Workflow Output</span>
1102+
<span className='font-medium text-[var(--text-subtle)] text-caption'>
1103+
Workflow Output
1104+
</span>
10791105
<div className='rounded-md bg-[var(--surface-4)] p-2.5 font-mono text-[#555] text-xs leading-[1.5]'>
10801106
{detail.output}
10811107
</div>
@@ -1085,10 +1111,7 @@ function MockLogDetailsSidebar({ selectedRow, onPrev, onNext }: MockLogDetailsSi
10851111
<span className='font-medium text-[var(--text-subtle)] text-caption'>Trace Spans</span>
10861112
<div className='flex flex-col gap-1.5'>
10871113
{detail.spans.map((span, i) => (
1088-
<div
1089-
key={i}
1090-
className={cn('flex flex-col gap-[3px]', span.depth === 1 && 'ml-3')}
1091-
>
1114+
<div key={i} className={cn('flex flex-col gap-[3px]', span.depth === 1 && 'ml-3')}>
10921115
<div className='flex items-center justify-between'>
10931116
<span className='font-mono text-[#555] text-xs'>{span.name}</span>
10941117
<span className='font-medium text-[var(--text-subtle)] text-xs'>{span.ms}ms</span>
@@ -1199,7 +1222,9 @@ function MockFullTable({ revealedRows }: { revealedRows: number }) {
11991222
)}
12001223
/>
12011224
)}
1202-
<span className='block truncate text-[var(--text-primary)] text-small'>{cell}</span>
1225+
<span className='block truncate text-[var(--text-primary)] text-small'>
1226+
{cell}
1227+
</span>
12031228
</td>
12041229
))}
12051230
</motion.tr>

‎apps/sim/app/(home)/components/features/features.tsx‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,7 @@ export default function Features() {
195195
</div>
196196

197197
<div className='relative z-10 pt-[60px] lg:pt-[100px]'>
198-
<div
199-
ref={sectionRef}
200-
className='flex flex-col items-start gap-5 px-6 lg:px-[80px]'
201-
>
198+
<div ref={sectionRef} className='flex flex-col items-start gap-5 px-6 lg:px-[80px]'>
202199
<Badge
203200
variant='blue'
204201
size='md'
@@ -216,7 +213,7 @@ export default function Features() {
216213
</Badge>
217214
<h2
218215
id='features-heading'
219-
className='max-w-[900px] font-[430] font-season text-[var(--text-primary)] text-[28px] leading-[110%] tracking-[-0.02em] md:text-[40px]'
216+
className='max-w-[900px] font-[430] font-season text-[28px] text-[var(--text-primary)] leading-[110%] tracking-[-0.02em] md:text-[40px]'
220217
>
221218
{HEADING_LETTERS.map((char, i) => (
222219
<ScrollLetter key={i} scrollYProgress={scrollYProgress} charIndex={i}>
@@ -301,7 +298,7 @@ export default function Features() {
301298
<div className='mt-8 flex flex-col gap-6 px-6 lg:mt-[60px] lg:grid lg:grid-cols-[1fr_2.8fr] lg:gap-[60px] lg:px-[120px]'>
302299
<div className='flex flex-col items-start justify-between gap-6 pt-5 lg:h-[560px] lg:gap-0'>
303300
<div className='flex flex-col items-start gap-4'>
304-
<h3 className='font-[430] font-season text-[var(--text-primary)] text-[24px] leading-[120%] tracking-[-0.02em] lg:text-[28px]'>
301+
<h3 className='font-[430] font-season text-[24px] text-[var(--text-primary)] leading-[120%] tracking-[-0.02em] lg:text-[28px]'>
305302
{FEATURE_TABS[activeTab].title}
306303
</h3>
307304
<p className='font-[430] font-season text-[var(--landing-text-subtle)]/50 text-md leading-[150%] tracking-[0.02em] lg:text-lg'>

‎apps/sim/app/(home)/components/footer/footer-cta.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export function FooterCTA() {
4242

4343
return (
4444
<div className='flex flex-col items-center px-4 pt-[120px] pb-[100px] sm:px-8 md:px-[80px]'>
45-
<h2 className='text-center font-[430] font-season text-[var(--text-primary)] text-[28px] leading-[100%] tracking-[-0.02em] sm:text-[32px] md:text-[36px]'>
45+
<h2 className='text-center font-[430] font-season text-[28px] text-[var(--text-primary)] leading-[100%] tracking-[-0.02em] sm:text-[32px] md:text-[36px]'>
4646
What should we get done?
4747
</h2>
4848

‎apps/sim/app/(home)/components/footer/footer.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import Image from 'next/image'
22
import Link from 'next/link'
33
import { FooterCTA } from '@/app/(home)/components/footer/footer-cta'
44

5-
const LINK_CLASS = 'text-sm text-[var(--text-subtle)] transition-colors hover:text-[var(--landing-text)]'
5+
const LINK_CLASS =
6+
'text-sm text-[var(--text-subtle)] transition-colors hover:text-[var(--landing-text)]'
67

78
interface FooterItem {
89
label: string

‎apps/sim/app/(home)/components/landing-preview/components/landing-preview-panel/landing-preview-panel.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ export const LandingPreviewPanel = memo(function LandingPreviewPanel() {
114114
<div className='flex flex-shrink-0 items-center px-2 pt-3.5'>
115115
<div className='pointer-events-none flex gap-1'>
116116
<div className='flex h-[28px] items-center rounded-md border border-[var(--border-1)] bg-[var(--surface-5)] px-2 py-[5px]'>
117-
<span className='font-medium text-[var(--text-primary)] text-[12.5px]'>Copilot</span>
117+
<span className='font-medium text-[12.5px] text-[var(--text-primary)]'>Copilot</span>
118118
</div>
119119
<div className='flex h-[28px] items-center rounded-md border border-transparent px-2 py-[5px]'>
120-
<span className='font-medium text-[var(--text-muted)] text-[12.5px]'>Toolbar</span>
120+
<span className='font-medium text-[12.5px] text-[var(--text-muted)]'>Toolbar</span>
121121
</div>
122122
<div className='flex h-[28px] items-center rounded-md border border-transparent px-2 py-[5px]'>
123-
<span className='font-medium text-[var(--text-muted)] text-[12.5px]'>Editor</span>
123+
<span className='font-medium text-[12.5px] text-[var(--text-muted)]'>Editor</span>
124124
</div>
125125
</div>
126126
</div>
@@ -130,7 +130,9 @@ export const LandingPreviewPanel = memo(function LandingPreviewPanel() {
130130
<div className='flex h-full flex-col'>
131131
{/* Copilot header bar — matches mx-[-1px] in real copilot */}
132132
<div className='pointer-events-none mx-[-1px] flex flex-shrink-0 items-center rounded-sm border border-[var(--surface-active)] bg-[#292929] px-3 py-1.5'>
133-
<span className='truncate font-medium text-[var(--text-primary)] text-sm'>New Chat</span>
133+
<span className='truncate font-medium text-[var(--text-primary)] text-sm'>
134+
New Chat
135+
</span>
134136
</div>
135137

136138
{/* User input — matches real UserInput at p-2 inside copilot welcome state */}

0 commit comments

Comments
 (0)