♻️ Remove references to old s3 URLs

baptisteArno · Dec 6, 2023 · c2fc2df · c2fc2df · vercel · Dec 6, 2023
1 parent 61f7f67
commit c2fc2df
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 1,031 deletions.
diff --git a/apps/builder/public/bots/onboarding-dark.json b/apps/builder/public/bots/onboarding-dark.json
diff --git a/apps/builder/public/bots/onboarding.json b/apps/builder/public/bots/onboarding.json
diff --git a/apps/builder/public/images/actionRequiredBanner.png b/apps/builder/public/images/actionRequiredBanner.png
diff --git a/apps/builder/public/images/backgrounds/brightRain.jpeg b/apps/builder/public/images/backgrounds/brightRain.jpeg
diff --git a/apps/builder/public/images/backgrounds/rayOfLights.jpeg b/apps/builder/public/images/backgrounds/rayOfLights.jpeg
diff --git a/apps/builder/public/images/invitationBanner.png b/apps/builder/public/images/invitationBanner.png
diff --git a/apps/builder/public/images/og.png b/apps/builder/public/images/og.png
diff --git a/apps/builder/public/images/yourBotIsFlyingBanner.png b/apps/builder/public/images/yourBotIsFlyingBanner.png
diff --git a/apps/builder/public/images/yourMagicLinkBanner.png b/apps/builder/public/images/yourMagicLinkBanner.png
diff --git a/apps/builder/src/components/Seo.tsx b/apps/builder/src/components/Seo.tsx
@@ -1,9 +1,18 @@
+import { env } from '@typebot.io/env'
 import Head from 'next/head'
 
+const getOrigin = () => {
+  if (typeof window !== 'undefined') {
+    return window.location.origin
+  }
+
+  return env.NEXTAUTH_URL
+}
+
 export const Seo = ({
   title,
   description = 'Create and publish conversational forms that collect 4 times more answers and feel native to your product',
-  imagePreviewUrl = 'https://app.typebot.io/site-preview.png',
+  imagePreviewUrl = `${getOrigin()}/images/og.png`,
 }: {
   title: string
   description?: string

diff --git a/apps/builder/src/features/theme/galleryTemplates.ts b/apps/builder/src/features/theme/galleryTemplates.ts
@@ -1,6 +1,15 @@
+import { env } from '@typebot.io/env'
 import { ThemeTemplate } from '@typebot.io/schemas'
 import { BackgroundType } from '@typebot.io/schemas/features/typebot/theme/constants'
 
+const getOrigin = () => {
+  if (typeof window !== 'undefined') {
+    return window.location.origin
+  }
+
+  return env.NEXTAUTH_URL
+}
+
 export const galleryTemplates: Pick<ThemeTemplate, 'id' | 'name' | 'theme'>[] =
   [
     {
@@ -111,8 +120,7 @@ export const galleryTemplates: Pick<ThemeTemplate, 'id' | 'name' | 'theme'>[] =
           font: 'Montserrat',
           background: {
             type: BackgroundType.IMAGE,
-            content:
-              'https://s3.fr-par.scw.cloud/typebot/public/typebots/hlmywyje0sbz1lfogu86pyks/blocks/ssmyt084oosa17cggqd8kfg9',
+            content: getOrigin() + '/images/backgrounds/brightRain.jpeg',
           },
         },
       },
@@ -136,8 +144,7 @@ export const galleryTemplates: Pick<ThemeTemplate, 'id' | 'name' | 'theme'>[] =
           font: 'Raleway',
           background: {
             type: BackgroundType.IMAGE,
-            content:
-              'https://s3.fr-par.scw.cloud/typebot/public/typebots/hlmywyje0sbz1lfogu86pyks/blocks/uc2dyf63eeogaivqzm4z2hdb',
+            content: getOrigin() + '/images/backgrounds/rayOfLights.jpeg',
           },
         },
       },

diff --git a/packages/emails/src/emails/AlmostReachedChatsLimitEmail.tsx b/packages/emails/src/emails/AlmostReachedChatsLimitEmail.tsx
@@ -5,6 +5,7 @@ import { Head, HeroImage, Text } from '../components'
 import { parseNumberWithCommas } from '@typebot.io/lib'
 import { SendMailOptions } from 'nodemailer'
 import { sendEmail } from '../sendEmail'
+import { env } from '@typebot.io/env'
 
 type AlmostReachedChatsLimitEmailProps = {
   workspaceName: string
@@ -33,7 +34,9 @@ export const AlmostReachedChatsLimitEmail = ({
       <MjmlBody width={600}>
         <MjmlSection padding="0">
           <MjmlColumn>
-            <HeroImage src="https://typebot.s3.fr-par.scw.cloud/public/assets/yourBotIsFlyingEmailBanner.png" />
+            <HeroImage
+              src={`${env.NEXTAUTH_URL}/images/yourBotIsFlyingBanner.png`}
+            />
           </MjmlColumn>
         </MjmlSection>
         <MjmlSection padding="0 24px" cssClass="smooth">

diff --git a/packages/emails/src/emails/GuestInvitationEmail.tsx b/packages/emails/src/emails/GuestInvitationEmail.tsx
@@ -10,6 +10,7 @@ import { render } from '@faire/mjml-react/utils/render'
 import { HeroImage, Text, Button, Head } from '../components'
 import { SendMailOptions } from 'nodemailer'
 import { sendEmail } from '../sendEmail'
+import { env } from '@typebot.io/env'
 
 type GuestInvitationEmailProps = {
   workspaceName: string
@@ -31,7 +32,7 @@ export const GuestInvitationEmail = ({
     <MjmlBody width={600}>
       <MjmlSection padding="0">
         <MjmlColumn>
-          <HeroImage src="https://typebot.s3.eu-west-3.amazonaws.com/assets/invitation-banner.png" />
+          <HeroImage src={`${env.NEXTAUTH_URL}/images/invitationBanner.png`} />
         </MjmlColumn>
       </MjmlSection>
       <MjmlSection padding="0 24px" cssClass="smooth">

diff --git a/packages/emails/src/emails/MagicLinkEmail.tsx b/packages/emails/src/emails/MagicLinkEmail.tsx
@@ -10,6 +10,7 @@ import { render } from '@faire/mjml-react/utils/render'
 import { HeroImage, Text, Button, Head } from '../components'
 import { SendMailOptions } from 'nodemailer'
 import { sendEmail } from '../sendEmail'
+import { env } from '@typebot.io/env'
 
 type Props = {
   url: string
@@ -21,7 +22,9 @@ export const MagicLinkEmail = ({ url }: Props) => (
     <MjmlBody width={600}>
       <MjmlSection padding="0">
         <MjmlColumn>
-          <HeroImage src="https://s3.fr-par.scw.cloud/typebot/public/typebots/rxp84mn10va5iqek63enrg99/blocks/yfazs53p6coxe4u3tbbvkl0m" />
+          <HeroImage
+            src={`${env.NEXTAUTH_URL}/images/yourMagicLinkBanner.png`}
+          />
         </MjmlColumn>
       </MjmlSection>
       <MjmlSection padding="0 24px" cssClass="smooth">

diff --git a/packages/emails/src/emails/ReachedChatsLimitEmail.tsx b/packages/emails/src/emails/ReachedChatsLimitEmail.tsx
@@ -11,6 +11,7 @@ import { Button, Head, HeroImage, Text } from '../components'
 import { parseNumberWithCommas } from '@typebot.io/lib'
 import { SendMailOptions } from 'nodemailer'
 import { sendEmail } from '../sendEmail'
+import { env } from '@typebot.io/env'
 
 type ReachedChatsLimitEmailProps = {
   chatsLimit: number
@@ -29,7 +30,9 @@ export const ReachedChatsLimitEmail = ({
       <MjmlBody width={600}>
         <MjmlSection padding="0">
           <MjmlColumn>
-            <HeroImage src="https://typebot.s3.fr-par.scw.cloud/public/assets/actionRequiredEmailBanner.png" />
+            <HeroImage
+              src={`${env.NEXTAUTH_URL}/images/actionRequiredBanner.png`}
+            />
           </MjmlColumn>
         </MjmlSection>
         <MjmlSection padding="0 24px" cssClass="smooth">

diff --git a/packages/emails/src/emails/WorkspaceMemberInvitationEmail.tsx b/packages/emails/src/emails/WorkspaceMemberInvitationEmail.tsx
@@ -10,6 +10,7 @@ import { render } from '@faire/mjml-react/utils/render'
 import { HeroImage, Text, Button, Head } from '../components'
 import { SendMailOptions } from 'nodemailer'
 import { sendEmail } from '../sendEmail'
+import { env } from '@typebot.io/env'
 
 type WorkspaceMemberInvitationProps = {
   workspaceName: string
@@ -29,7 +30,7 @@ export const WorkspaceMemberInvitation = ({
     <MjmlBody width={600}>
       <MjmlSection padding="0">
         <MjmlColumn>
-          <HeroImage src="https://typebot.s3.eu-west-3.amazonaws.com/assets/invitation-banner.png" />
+          <HeroImage src={`${env.NEXTAUTH_URL}/images/invitationBanner.png`} />
         </MjmlColumn>
       </MjmlSection>
       <MjmlSection padding="0 24px" cssClass="smooth">