Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions apps/docs/components/ui/block-types.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { cn } from '@/lib/utils'
import {
AgentIcon,
ApiIcon,
Expand All @@ -7,7 +6,8 @@ import {
ConditionalIcon,
ConnectIcon,
ResponseIcon,
} from '../icons'
} from '@/components/icons'
import { cn } from '@/lib/utils'

// Custom Feature component specifically for BlockTypes to handle the 6-item layout
const BlockFeature = ({
Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/(auth)/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import Image from 'next/image'
import Link from 'next/link'
import { GridPattern } from '../(landing)/components/grid-pattern'
import { GridPattern } from '@/app/(landing)/components/grid-pattern'

export default function AuthLayout({ children }: { children: React.ReactNode }) {
return (
Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/(auth)/login/login-form.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
import { useRouter, useSearchParams } from 'next/navigation'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { client } from '@/lib/auth-client'
import LoginPage from './login-form'
import LoginPage from '@/app/(auth)/login/login-form'

vi.mock('next/navigation', () => ({
useRouter: vi.fn(),
Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/(auth)/login/login-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
import { Input } from '@/components/ui/input'
import { Label } from '@/components/ui/label'
import { client } from '@/lib/auth-client'
import { createLogger } from '@/lib/logs/console-logger'
import { createLogger } from '@/lib/logs/console/logger'
import { cn } from '@/lib/utils'
import { SocialLoginButtons } from '@/app/(auth)/components/social-login-buttons'

Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/(auth)/login/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getOAuthProviderStatus } from '../components/oauth-provider-checker'
import LoginForm from './login-form'
import { getOAuthProviderStatus } from '@/app/(auth)/components/oauth-provider-checker'
import LoginForm from '@/app/(auth)/login/login-form'

// Force dynamic rendering to avoid prerender errors with search params
export const dynamic = 'force-dynamic'
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/(auth)/reset-password/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import {
CardHeader,
CardTitle,
} from '@/components/ui/card'
import { createLogger } from '@/lib/logs/console-logger'
import { SetNewPasswordForm } from './reset-password-form'
import { createLogger } from '@/lib/logs/console/logger'
import { SetNewPasswordForm } from '@/app/(auth)/reset-password/reset-password-form'

const logger = createLogger('ResetPasswordPage')

Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/(auth)/signup/page.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { env, isTruthy } from '@/lib/env'
import { getOAuthProviderStatus } from '../components/oauth-provider-checker'
import SignupForm from './signup-form'
import { getOAuthProviderStatus } from '@/app/(auth)/components/oauth-provider-checker'
import SignupForm from '@/app/(auth)/signup/signup-form'

// Force dynamic rendering to avoid prerender errors with search params
export const dynamic = 'force-dynamic'
Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/(auth)/signup/signup-form.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
import { useRouter, useSearchParams } from 'next/navigation'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { client } from '@/lib/auth-client'
import SignupPage from './signup-form'
import SignupPage from '@/app/(auth)/signup/signup-form'

vi.mock('next/navigation', () => ({
useRouter: vi.fn(),
Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/(auth)/verify/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { env } from '@/lib/env'
import { isProd } from '@/lib/environment'
import { getBaseUrl } from '@/lib/urls/utils'
import { VerifyContent } from './verify-content'
import { VerifyContent } from '@/app/(auth)/verify/verify-content'

// Force dynamic rendering to avoid prerender errors with search params
export const dynamic = 'force-dynamic'
Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/(auth)/verify/use-verification.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useEffect, useState } from 'react'
import { useRouter, useSearchParams } from 'next/navigation'
import { client } from '@/lib/auth-client'
import { env, isTruthy } from '@/lib/env'
import { createLogger } from '@/lib/logs/console-logger'
import { createLogger } from '@/lib/logs/console/logger'

const logger = createLogger('useVerification')

Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/(auth)/verify/verify-content.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Suspense, useEffect, useState } from 'react'
import { Button } from '@/components/ui/button'
import { InputOTP, InputOTPGroup, InputOTPSlot } from '@/components/ui/input-otp'
import { cn } from '@/lib/utils'
import { useVerification } from './use-verification'
import { useVerification } from '@/app/(auth)/verify/use-verification'

interface VerifyContentProps {
hasResendKey: boolean
Expand Down
6 changes: 3 additions & 3 deletions apps/sim/app/(landing)/components/hero-workflow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import ReactFlow, {
} from 'reactflow'
import 'reactflow/dist/style.css'

import { HeroBlock } from './hero-block'
import { HeroEdge } from './hero-edge'
import { useWindowSize } from './use-window-size'
import { HeroBlock } from '@/app/(landing)/components/hero-block'
import { HeroEdge } from '@/app/(landing)/components/hero-edge'
import { useWindowSize } from '@/app/(landing)/components/use-window-size'

const nodeTypes: NodeTypes = { heroBlock: HeroBlock }
const edgeTypes: EdgeTypes = { heroEdge: HeroEdge }
Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/(landing)/components/nav-client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
SheetTitle,
SheetTrigger,
} from '@/components/ui/sheet'
import { usePrefetchOnHover } from '../utils/prefetch'
import { usePrefetchOnHover } from '@/app/(landing)/utils/prefetch'

// --- Framer Motion Variants ---
const desktopNavContainerVariants = {
Expand Down
6 changes: 3 additions & 3 deletions apps/sim/app/(landing)/components/nav-wrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import { useEffect, useState } from 'react'
import { AnimatePresence, motion } from 'framer-motion'
import { usePathname } from 'next/navigation'
import { getFormattedGitHubStars } from '../actions/github'
import GitHubStarsClient from './github-stars-client'
import NavClient from './nav-client'
import { getFormattedGitHubStars } from '@/app/(landing)/actions/github'
import GitHubStarsClient from '@/app/(landing)/components/github-stars-client'
import NavClient from '@/app/(landing)/components/nav-client'

interface NavWrapperProps {
onOpenTypeformLink: () => void
Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/(landing)/components/sections/blogs.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use client'

import { motion } from 'framer-motion'
import { BlogCard } from '../blog-card'
import { BlogCard } from '@/app/(landing)/components/blog-card'

function Blogs() {
return (
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/(landing)/components/sections/features.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import 'reactflow/dist/style.css'

import { AgentIcon, ConnectIcon, StartIcon } from '@/components/icons'
import { cn } from '@/lib/utils'
import { DotPattern } from '../dot-pattern'
import { HeroBlock } from '../hero-block'
import { DotPattern } from '@/app/(landing)/components/dot-pattern'
import { HeroBlock } from '@/app/(landing)/components/hero-block'

// --- Types ---
type Feature = {
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/(landing)/components/sections/footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import { useRouter } from 'next/navigation'
import { DiscordIcon, GithubIcon, xIcon as XIcon } from '@/components/icons'
import { Button } from '@/components/ui/button'
import { useSession } from '@/lib/auth-client'
import { usePrefetchOnHover } from '../../utils/prefetch'
import useIsMobile from '../hooks/use-is-mobile'
import useIsMobile from '@/app/(landing)/components/hooks/use-is-mobile'
import { usePrefetchOnHover } from '@/app/(landing)/utils/prefetch'

function Footer() {
const router = useRouter()
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/(landing)/components/sections/hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { Command, CornerDownLeft } from 'lucide-react'
import { useRouter } from 'next/navigation'
import { Button } from '@/components/ui/button'
import { useSession } from '@/lib/auth-client'
import { GridPattern } from '../grid-pattern'
import HeroWorkflowProvider from '../hero-workflow'
import { GridPattern } from '@/app/(landing)/components/grid-pattern'
import HeroWorkflowProvider from '@/app/(landing)/components/hero-workflow'

function Hero() {
const router = useRouter()
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/(landing)/components/sections/integrations.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import { motion } from 'framer-motion'
import { GitBranch, RefreshCcw } from 'lucide-react'
import ReactFlow, { ConnectionLineType, Position, ReactFlowProvider } from 'reactflow'
import { DotPattern } from '@/app/(landing)/components/dot-pattern'
import { HeroBlock } from '@/app/(landing)/components/hero-block'
import { OrbitingCircles } from '@/app/(landing)/components/magicui/orbiting-circles'
import { DotPattern } from '../dot-pattern'
import { HeroBlock } from '../hero-block'

function Integrations() {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use client'

import { motion } from 'framer-motion'
import useIsMobile from '@/app/(landing)/components/hooks/use-is-mobile'
import { Marquee } from '@/app/(landing)/components/magicui/marquee'
import useIsMobile from '../hooks/use-is-mobile'

const X_TESTIMONIALS = [
{
Expand Down
8 changes: 4 additions & 4 deletions apps/sim/app/(landing)/contributors/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import {
import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar'
import { Button } from '@/components/ui/button'
import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs'
import { GridPattern } from '../components/grid-pattern'
import NavWrapper from '../components/nav-wrapper'
import Footer from '../components/sections/footer'
import { getCachedContributorsData, prefetchContributorsData } from '../utils/prefetch'
import { GridPattern } from '@/app/(landing)/components/grid-pattern'
import NavWrapper from '@/app/(landing)/components/nav-wrapper'
import Footer from '@/app/(landing)/components/sections/footer'
import { getCachedContributorsData, prefetchContributorsData } from '@/app/(landing)/utils/prefetch'

interface Contributor {
login: string
Expand Down
10 changes: 5 additions & 5 deletions apps/sim/app/(landing)/landing.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
'use client'

import NavWrapper from './components/nav-wrapper'
import Footer from './components/sections/footer'
import Hero from './components/sections/hero'
import Integrations from './components/sections/integrations'
import Testimonials from './components/sections/testimonials'
import NavWrapper from '@/app/(landing)/components/nav-wrapper'
import Footer from '@/app/(landing)/components/sections/footer'
import Hero from '@/app/(landing)/components/sections/hero'
import Integrations from '@/app/(landing)/components/sections/integrations'
import Testimonials from '@/app/(landing)/components/sections/testimonials'

export default function Landing() {
const handleOpenTypeformLink = () => {
Expand Down
6 changes: 3 additions & 3 deletions apps/sim/app/(landing)/privacy/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use client'

import Link from 'next/link'
import { GridPattern } from '../components/grid-pattern'
import NavWrapper from '../components/nav-wrapper'
import Footer from '../components/sections/footer'
import { GridPattern } from '@/app/(landing)/components/grid-pattern'
import NavWrapper from '@/app/(landing)/components/nav-wrapper'
import Footer from '@/app/(landing)/components/sections/footer'

export default function PrivacyPolicy() {
const handleOpenTypeformLink = () => {
Expand Down
6 changes: 3 additions & 3 deletions apps/sim/app/(landing)/terms/page.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
'use client'

import Link from 'next/link'
import { GridPattern } from '../components/grid-pattern'
import NavWrapper from '../components/nav-wrapper'
import Footer from '../components/sections/footer'
import { GridPattern } from '@/app/(landing)/components/grid-pattern'
import NavWrapper from '@/app/(landing)/components/nav-wrapper'
import Footer from '@/app/(landing)/components/sections/footer'

export default function TermsOfService() {
const handleOpenTypeformLink = () => {
Expand Down
4 changes: 2 additions & 2 deletions apps/sim/app/(landing)/utils/prefetch.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Utility for prefetching and caching contributors page data
import { getCommitsData, getContributors, getRepositoryStats } from '../actions/github'
import { generateActivityData, generateCommitTimelineData } from './github'
import { getCommitsData, getContributors, getRepositoryStats } from '@/app/(landing)/actions/github'
import { generateActivityData, generateCommitTimelineData } from '@/app/(landing)/utils/github'

interface Contributor {
login: string
Expand Down
6 changes: 3 additions & 3 deletions apps/sim/app/api/__test-utils__/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ export function mockExecutionDependencies() {
}
})

vi.mock('@/lib/logs/trace-spans', () => ({
vi.mock('@/lib/logs/execution/trace-spans/trace-spans', () => ({
buildTraceSpans: vi.fn().mockReturnValue({
traceSpans: [],
totalDuration: 100,
Expand Down Expand Up @@ -375,7 +375,7 @@ export function mockWorkflowAccessValidation(shouldSucceed = true) {

export async function getMockedDependencies() {
const utilsModule = await import('@/lib/utils')
const traceSpansModule = await import('@/lib/logs/trace-spans')
const traceSpansModule = await import('@/lib/logs/execution/trace-spans/trace-spans')
const workflowUtilsModule = await import('@/lib/workflows/utils')
const executorModule = await import('@/executor')
const serializerModule = await import('@/serializer')
Expand Down Expand Up @@ -655,7 +655,7 @@ export function mockKnowledgeSchemas() {
* Mock console logger
*/
export function mockConsoleLogger() {
vi.doMock('@/lib/logs/console-logger', () => ({
vi.doMock('@/lib/logs/console/logger', () => ({
createLogger: vi.fn().mockReturnValue(mockLogger),
}))
}
Expand Down
16 changes: 8 additions & 8 deletions apps/sim/app/api/auth/forget-password/route.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe('Forget Password API Route', () => {
redirectTo: 'https://example.com/reset',
})

const { POST } = await import('./route')
const { POST } = await import('@/app/api/auth/forget-password/route')

const response = await POST(req)
const data = await response.json()
Expand Down Expand Up @@ -56,7 +56,7 @@ describe('Forget Password API Route', () => {
email: 'test@example.com',
})

const { POST } = await import('./route')
const { POST } = await import('@/app/api/auth/forget-password/route')

const response = await POST(req)
const data = await response.json()
Expand All @@ -79,7 +79,7 @@ describe('Forget Password API Route', () => {

const req = createMockRequest('POST', {})

const { POST } = await import('./route')
const { POST } = await import('@/app/api/auth/forget-password/route')

const response = await POST(req)
const data = await response.json()
Expand All @@ -98,7 +98,7 @@ describe('Forget Password API Route', () => {
email: '',
})

const { POST } = await import('./route')
const { POST } = await import('@/app/api/auth/forget-password/route')

const response = await POST(req)
const data = await response.json()
Expand Down Expand Up @@ -126,15 +126,15 @@ describe('Forget Password API Route', () => {
email: 'nonexistent@example.com',
})

const { POST } = await import('./route')
const { POST } = await import('@/app/api/auth/forget-password/route')

const response = await POST(req)
const data = await response.json()

expect(response.status).toBe(500)
expect(data.message).toBe(errorMessage)

const logger = await import('@/lib/logs/console-logger')
const logger = await import('@/lib/logs/console/logger')
const mockLogger = logger.createLogger('ForgetPasswordTest')
expect(mockLogger.error).toHaveBeenCalledWith('Error requesting password reset:', {
error: expect.any(Error),
Expand All @@ -156,15 +156,15 @@ describe('Forget Password API Route', () => {
email: 'test@example.com',
})

const { POST } = await import('./route')
const { POST } = await import('@/app/api/auth/forget-password/route')

const response = await POST(req)
const data = await response.json()

expect(response.status).toBe(500)
expect(data.message).toBe('Failed to send password reset email. Please try again later.')

const logger = await import('@/lib/logs/console-logger')
const logger = await import('@/lib/logs/console/logger')
const mockLogger = logger.createLogger('ForgetPasswordTest')
expect(mockLogger.error).toHaveBeenCalled()
})
Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/api/auth/forget-password/route.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type NextRequest, NextResponse } from 'next/server'
import { auth } from '@/lib/auth'
import { createLogger } from '@/lib/logs/console-logger'
import { createLogger } from '@/lib/logs/console/logger'

export const dynamic = 'force-dynamic'

Expand Down
Loading