Skip to content

Commit

Permalink
refactor: ♻️ Remove any trace of Cypress
Browse files Browse the repository at this point in the history
  • Loading branch information
baptisteArno committed Feb 24, 2022
1 parent 7e7596d commit 658202e
Show file tree
Hide file tree
Showing 11 changed files with 126 additions and 614 deletions.
2 changes: 1 addition & 1 deletion apps/builder/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports = {
version: 'detect', // Tells eslint-plugin-react to automatically detect the version of React to use
},
},
plugins: ['prettier', 'react', 'cypress', '@typescript-eslint'],
plugins: ['prettier', 'react', '@typescript-eslint'],
rules: {
'react/no-unescaped-entities': [0],
'prettier/prettier': 'error',
Expand Down
91 changes: 91 additions & 0 deletions apps/builder/assets/emails/typebot2-free-user-anouncement.mjml
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
<mjml>
<mj-head>
<mj-attributes>
<mj-all font-family="Helvetica Neue, Helvetica, Helvetica, Arial, sans-serif" font-size="16px" padding="0" line-height="23px"></mj-all>
<mj-section background-color="#ffffff" padding-bottom="20px"></mj-section>
<mj-text padding="10px 40px"></mj-text>
</mj-attributes>
<mj-style inline="inline">
.footer-link {
color: #A0AEC0
}
</mj-style>
</mj-head>
<mj-body background-color="#ffffff">
<mj-wrapper border="1px solid #E2E8F0">
<mj-section padding-bottom="0px">
<mj-column width="100%">
<mj-image src="https://typebot.s3.eu-west-3.amazonaws.com/assets/typebot2-banner.png" alt="header image" padding="0px"></mj-image>
</mj-column>
</mj-section>
<mj-section padding-top="20px">
<mj-column>
<mj-text>Hey 👋</mj-text>
<mj-text>I’m super excited to announce that Typebot 2.0 is finally available after 3 months of deep work. </mj-text>
<mj-text>It comes with a brand new building experience and it has been implemented from the ground up with “Freedom” in mind, allowing you to create truly customized conversational applications.</mj-text>
</mj-column>
</mj-section>
<mj-section>
<mj-column>
<mj-image src="https://typebot.s3.eu-west-3.amazonaws.com/assets/newsletter-builder.gif"></mj-image>
</mj-column>
</mj-section>
<mj-section>
<mj-column>
<mj-text>Typebot 2.0 also comes with new advanced features, including:</mj-text>
<mj-text>- Data fetching from a Google Sheet</mj-text>
<mj-text>- Custom emails</mj-text>
<mj-text>- Custom CSS</mj-text>
</mj-column>
</mj-section>
<mj-section>
<mj-column>
<mj-text>Typebot still allows you to create unique conversational experiences for your user. This leads to:</mj-text>
<mj-text>😍 An increase in customer satisfaction and retention.</mj-text>
<mj-text>🚀 A 3x conversion increase on average on your lead qualification forms.</mj-text>
<mj-text font-weight="bold">And it still comes with a generous unlimited free plan 💙</mj-text>
</mj-column>
</mj-section>
<mj-section>
<mj-column>
<mj-button background-color="#0042da" color="white" href="https://app.typebot.io/register" font-weight="500" border-radius="5px">Try it out</mj-button>
</mj-column>
</mj-section>
<mj-section padding-top="20px">
<mj-column>
<mj-text>I’m inviting you to join our Facebook community where you’ll get updates on the product.</mj-text>
<mj-text>It’s also a place where we share our metrics and forms templates 💪</mj-text>
</mj-column>
</mj-section>
<mj-section>
<mj-column>
<mj-button background-color="#ffffff" color="#0042da" border="1px solid #0042da" href="https://app.typebot.io/register" font-weight="500" border-radius="5px">Join the community</mj-button>
</mj-column>
</mj-section>
<mj-section padding-top="20px">
<mj-column>
<mj-text>If you have any question, just hit "reply"! I'm super approachable 😁. Look, here is a selfie 👇</mj-text>
</mj-column>
</mj-section>
<mj-section>
<mj-column>
<mj-image src="https://typebot.s3.eu-west-3.amazonaws.com/assets/selfie-newsletter.jpeg" width="300px" border-radius="5px"></mj-image>
</mj-column>
</mj-section>
<mj-section padding-top="20px">
<mj-column>
<mj-text padding-bottom="0px">Baptiste,</mj-text>
<mj-text padding-top="0px">Founder of Typebot.</mj-text>
</mj-column>
</mj-section>
<mj-section>
<mj-column>
<mj-text font-size="13px" text-decoration="underline">
<a class="footer-link" href="%unsubscribe_url%" color="#fffff">Unsubscribe from all future emails</a>
</mj-text>
</mj-column>
</mj-section>
</mj-wrapper>

</mj-body>
</mjml>
3 changes: 0 additions & 3 deletions apps/builder/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
},
"devDependencies": {
"@playwright/test": "^1.19.0",
"@testing-library/cypress": "^8.0.2",
"@types/google-spreadsheet": "^3.1.5",
"@types/micro-cors": "^0.1.2",
"@types/node": "^17.0.17",
Expand All @@ -95,13 +94,11 @@
"@types/qs": "^6.9.7",
"@types/react": "^17.0.39",
"@types/react-table": "^7.7.9",
"@types/testing-library__cypress": "^5.0.9",
"@typescript-eslint/eslint-plugin": "^5.11.0",
"dotenv": "^16.0.0",
"eslint": "<8.0.0",
"eslint-config-next": "12.0.10",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-prettier": "^4.0.0",
"firebase-admin": "^10.0.2",
"next-transpile-modules": "^9.0.0",
Expand Down
1 change: 1 addition & 0 deletions apps/builder/pages/api/integrations/email/test-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
})
res.status(200).send({ message: 'Email sent!', info })
} catch (err) {
console.log(err)
res.status(500).send(err)
}
}
Expand Down
3 changes: 2 additions & 1 deletion apps/builder/services/api/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ export const getAuthenticatedUser = async (
req: NextApiRequest
): Promise<User | undefined> => {
const session = await getSession({ req })
return session?.user as User | undefined
if (session?.user && !('id' in session.user)) return
return session?.user as User
}
2 changes: 1 addition & 1 deletion apps/viewer/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports = {
version: 'detect', // Tells eslint-plugin-react to automatically detect the version of React to use
},
},
plugins: ['prettier', 'react', 'cypress', '@typescript-eslint'],
plugins: ['prettier', 'react', '@typescript-eslint'],
rules: {
'react/no-unescaped-entities': [0],
'prettier/prettier': 'error',
Expand Down
1 change: 0 additions & 1 deletion apps/viewer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
"eslint": "<8.0.0",
"eslint-config-next": "12.0.10",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-prettier": "^4.0.0",
"next-transpile-modules": "^9.0.0",
"prettier": "^2.5.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/viewer/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
"pages/404.js",
"pages/_error.js"
],
"exclude": ["node_modules", "cypress"]
"exclude": ["node_modules"]
}
2 changes: 1 addition & 1 deletion packages/bot-engine/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module.exports = {
version: 'detect', // Tells eslint-plugin-react to automatically detect the version of React to use
},
},
plugins: ['prettier', 'react', 'cypress', '@typescript-eslint'],
plugins: ['prettier', 'react', '@typescript-eslint'],
ignorePatterns: 'dist',
rules: {
'react/no-unescaped-entities': [0],
Expand Down
1 change: 0 additions & 1 deletion packages/bot-engine/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
"eslint": "<8.0.0",
"eslint-config-next": "12.0.10",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-cypress": "^2.12.1",
"eslint-plugin-prettier": "^4.0.0"
},
"peerDependencies": {
Expand Down
Loading

1 comment on commit 658202e

@vercel
Copy link

@vercel vercel bot commented on 658202e Feb 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.