Skip to content

Commit ff3e089

Browse files
author
Theodore Li
committed
Merge branch 'staging' into fix/enforce-duplicate-name
2 parents e3ab7d2 + 8d84c30 commit ff3e089

File tree

53 files changed

+1360
-1024
lines changed

Some content is hidden

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

53 files changed

+1360
-1024
lines changed

apps/docs/components/icons.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4140,7 +4140,7 @@ export function IncidentioIcon(props: SVGProps<SVGSVGElement>) {
41404140

41414141
export function InfisicalIcon(props: SVGProps<SVGSVGElement>) {
41424142
return (
4143-
<svg {...props} viewBox='0 0 273 182' xmlns='http://www.w3.org/2000/svg'>
4143+
<svg {...props} viewBox='20 25 233 132' xmlns='http://www.w3.org/2000/svg'>
41444144
<path
41454145
d='m191.6 39.4c-20.3 0-37.15 13.21-52.9 30.61-12.99-16.4-29.8-30.61-51.06-30.61-27.74 0-50.44 23.86-50.44 51.33 0 26.68 21.43 51.8 48.98 51.8 20.55 0 37.07-13.86 51.32-31.81 12.69 16.97 29.1 31.41 53.2 31.41 27.13 0 49.85-22.96 49.85-51.4 0-27.12-20.44-51.33-48.95-51.33zm-104.3 77.94c-14.56 0-25.51-12.84-25.51-26.07 0-13.7 10.95-28.29 25.51-28.29 14.93 0 25.71 11.6 37.6 27.34-11.31 15.21-22.23 27.02-37.6 27.02zm104.4 0.25c-15 0-25.28-11.13-37.97-27.37 12.69-16.4 22.01-27.24 37.59-27.24 14.97 0 24.79 13.25 24.79 27.26 0 13-10.17 27.35-24.41 27.35z'
41464146
fill='currentColor'
@@ -4253,7 +4253,7 @@ export function ZoomIcon(props: SVGProps<SVGSVGElement>) {
42534253
fill='currentColor'
42544254
width='800px'
42554255
height='800px'
4256-
viewBox='0 0 32 32'
4256+
viewBox='-1 9.5 34 13'
42574257
version='1.1'
42584258
xmlns='http://www.w3.org/2000/svg'
42594259
>

apps/docs/content/docs/en/tools/microsoft_ad.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Manage users and groups in Azure AD (Microsoft Entra ID)
55

66
import { BlockInfoCard } from "@/components/ui/block-info-card"
77

8-
<BlockInfoCard
8+
<BlockInfoCard
99
type="microsoft_ad"
1010
color="#0078D4"
1111
/>

apps/docs/content/docs/en/tools/okta.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Manage users and groups in Okta
55

66
import { BlockInfoCard } from "@/components/ui/block-info-card"
77

8-
<BlockInfoCard
8+
<BlockInfoCard
99
type="okta"
1010
color="#191919"
1111
/>
@@ -29,6 +29,7 @@ In Sim, the Okta integration enables your agents to automate identity management
2929
If you encounter issues with the Okta integration, contact us at [help@sim.ai](mailto:help@sim.ai)
3030
{/* MANUAL-CONTENT-END */}
3131

32+
3233
## Usage Instructions
3334

3435
Integrate Okta identity management into your workflow. List, create, update, activate, suspend, and delete users. Reset passwords. Manage groups and group membership.

apps/sim/app/(home)/components/enterprise/enterprise.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,9 @@ export default function Enterprise() {
612612
Ready for growth?
613613
</p>
614614
<Link
615-
href='/contact'
615+
href='https://form.typeform.com/to/jqCO12pF'
616+
target='_blank'
617+
rel='noopener noreferrer'
616618
className='group/cta inline-flex h-[32px] items-center gap-[6px] rounded-[5px] border border-white bg-white px-[10px] font-[430] font-season text-[14px] text-black transition-colors hover:border-[#E0E0E0] hover:bg-[#E0E0E0]'
617619
>
618620
Book a demo

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const PRODUCT_LINKS: FooterItem[] = [
2323

2424
const RESOURCES_LINKS: FooterItem[] = [
2525
{ label: 'Blog', href: '/blog' },
26-
{ label: 'Templates', href: '/templates' },
26+
// { label: 'Templates', href: '/templates' },
2727
{ label: 'Docs', href: 'https://docs.sim.ai', external: true },
2828
{ label: 'Careers', href: 'https://jobs.ashbyhq.com/sim', external: true },
2929
{ label: 'Changelog', href: '/changelog' },

apps/sim/app/(home)/components/pricing/pricing.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ const PRICING_TIERS: PricingTier[] = [
7878
'SSO & SCIM · SOC2 & HIPAA',
7979
'Self hosting · Dedicated support',
8080
],
81-
cta: { label: 'Book a demo', href: '/contact' },
81+
cta: { label: 'Book a demo', href: 'https://form.typeform.com/to/jqCO12pF' },
8282
},
8383
]
8484

@@ -125,12 +125,14 @@ function PricingCard({ tier }: PricingCardProps) {
125125
</p>
126126
<div className='mt-4'>
127127
{isEnterprise ? (
128-
<Link
128+
<a
129129
href={tier.cta.href}
130+
target='_blank'
131+
rel='noopener noreferrer'
130132
className='flex h-[32px] w-full items-center justify-center rounded-[5px] border border-[#E5E5E5] px-[10px] font-[430] font-season text-[#1C1C1C] text-[14px] transition-colors hover:bg-[#F0F0F0]'
131133
>
132134
{tier.cta.label}
133-
</Link>
135+
</a>
134136
) : isPro ? (
135137
<Link
136138
href={tier.cta.href}

apps/sim/app/(home)/landing.tsx

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { getAllPostMeta } from '@/lib/blog/registry'
1+
import { getNavBlogPosts } from '@/lib/blog/registry'
22
import { martianMono } from '@/app/_styles/fonts/martian-mono/martian-mono'
33
import { season } from '@/app/_styles/fonts/season/season'
44
import {
@@ -33,12 +33,7 @@ import {
3333
* enterprise (Enterprise) -> pricing (Pricing) -> testimonials (Testimonials).
3434
*/
3535
export default async function Landing() {
36-
const allPosts = await getAllPostMeta()
37-
const featuredPost = allPosts.find((p) => p.featured) ?? allPosts[0]
38-
const recentPosts = allPosts.filter((p) => p !== featuredPost).slice(0, 4)
39-
const blogPosts = [featuredPost, ...recentPosts]
40-
.filter(Boolean)
41-
.map((p) => ({ slug: p.slug, title: p.title, ogImage: p.ogImage }))
36+
const blogPosts = await getNavBlogPosts()
4237

4338
return (
4439
<div className={`${season.variable} ${martianMono.variable} min-h-screen bg-[#1C1C1C]`}>

apps/sim/app/(landing)/blog/layout.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import { getNavBlogPosts } from '@/lib/blog/registry'
12
import Footer from '@/app/(home)/components/footer/footer'
23
import Navbar from '@/app/(home)/components/navbar/navbar'
34

4-
export default function StudioLayout({ children }: { children: React.ReactNode }) {
5+
export default async function StudioLayout({ children }: { children: React.ReactNode }) {
6+
const blogPosts = await getNavBlogPosts()
57
const orgJsonLd = {
68
'@context': 'https://schema.org',
79
'@type': 'Organization',
@@ -34,7 +36,7 @@ export default function StudioLayout({ children }: { children: React.ReactNode }
3436
dangerouslySetInnerHTML={{ __html: JSON.stringify(websiteJsonLd) }}
3537
/>
3638
<header>
37-
<Navbar />
39+
<Navbar blogPosts={blogPosts} />
3840
</header>
3941
<main className='relative flex-1'>{children}</main>
4042
<Footer />
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
'use client'
2+
3+
import { useEffect } from 'react'
4+
5+
interface ExternalRedirectProps {
6+
url: string
7+
}
8+
9+
/** Redirects to an external URL when it is configured via an environment variable. */
10+
export default function ExternalRedirect({ url }: ExternalRedirectProps) {
11+
useEffect(() => {
12+
if (url?.startsWith('http')) {
13+
window.location.href = url
14+
}
15+
}, [url])
16+
17+
return null
18+
}

apps/sim/app/(landing)/components/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import Background from '@/app/(landing)/components/background/background'
2+
import ExternalRedirect from '@/app/(landing)/components/external-redirect'
23
import Footer from '@/app/(landing)/components/footer/footer'
34
import Hero from '@/app/(landing)/components/hero/hero'
45
import Integrations from '@/app/(landing)/components/integrations/integrations'
@@ -20,4 +21,5 @@ export {
2021
Footer,
2122
StructuredData,
2223
LegalLayout,
24+
ExternalRedirect,
2325
}

0 commit comments

Comments
 (0)