Beautiful Open-Source Form Builder
Migrating amplitude and crisp plugin/composable
Julien Nahum12778fad340d
diff --git a/client/app.vue b/client/app.vueindex 440928796..a8b8c3ac3 100644--- a/client/app.vue+++ b/client/app.vue@@ -1,6 +1,5 @@<template><div id="app" class="bg-white dark:bg-notion-dark">- <ServiceCrisp/><transition enter-active-class="linear duration-200 overflow-hidden"enter-from-class="max-h-0"enter-to-class="max-h-screen"@@ -45,12 +44,17 @@ export default {setup() {const appStore = useAppStore()+return {layout: computed(() => appStore.layout),isIframe: useIsIframe()}},+ mounted() {+ useCrisp().showChat()+ },+data: () => ({metaTitle: 'OpnForm',metaDescription: 'Create beautiful forms for free. Unlimited fields, unlimited submissions. It\'s free and it takes less than 1 minute to create your first form.',diff --git a/client/components/global/NotionPage.vue b/client/components/global/NotionPage.vueindex d595dd9e7..e88eb5ab2 100644--- a/client/components/global/NotionPage.vue+++ b/client/components/global/NotionPage.vue@@ -28,7 +28,7 @@ export default {</script><style lang="scss">-@import "styles.css";+@import "vue-notion/src/styles.css";.notion-blue {@apply text-nt-blue;diff --git a/client/components/service/Crisp.vue b/client/components/service/Crisp.vuedeleted file mode 100644index b6d22078f..000000000--- a/client/components/service/Crisp.vue+++ /dev/null@@ -1,32 +0,0 @@-<template />--<script>-export default {- name: 'Crisp',-- setup () {- return {- isIframe: useIsIframe()- }- },-- mounted () {- this.loadCrisp()- },-- methods: {- loadCrisp () {- if (process.server) return- if (this.isIframe || !this.$config.crisp_website_id) return-- window.CRISP_WEBSITE_ID = this.$config.crisp_website_id-- const script = document.createElement('script')- script.setAttribute('src', 'https://client.crisp.chat/l.js')- script.setAttribute('id', 'crisp-widget')- script.setAttribute('async', 1)- document.head.appendChild(script)- }- }-}-</script>diff --git a/client/composables/useCrisp.js b/client/composables/useCrisp.jsindex fdb9059b5..5f37093eb 100644--- a/client/composables/useCrisp.js+++ b/client/composables/useCrisp.js@@ -1,46 +1,72 @@export const useCrisp = () => {- function push(args) {- if (process.client) {- window.$crisp.push(args)- }- }+ let crisp = process.client ? window.Crisp : nullfunction openChat() {- push(['do', 'chat:open'])+ if (!crisp) return+ crisp.chat.open()}function showChat() {- push(['do', 'chat:show'])+ if (!crisp) return+ crisp.chat.show()}function hideChat() {- push(['do', 'chat:hide'])+ if (!crisp) return+ crisp.chat.hide()}function closeChat() {- push(['do', 'chat:close'])+ if (!crisp) return+ crisp.chat.close()}function openAndShowChat(message = null) {+ if (!crisp) returnshowChat()openChat()if (message) sendTextMessage(message)}function openHelpdesk(){- push(['do', 'helpdesk:search'])+ if (!crisp) return+ openChat()+ crisp.chat.setHelpdeskView()}- function openHelpdeskArticle(articleSlug, lang = 'en') {- push(['do', 'helpdesk:article:open', [lang, articleSlug]])+ function openHelpdeskArticle(articleSlug, locale = 'en') {+ if (!crisp) return+ crisp.chat.openHelpdeskArticle(locale, articleSlug);}function sendTextMessage(message) {- push(['do', 'message:send', ['text',message]])+ if (!crisp) return+ crisp.message.send('text', message)+ }++ function setUser (user) {+ if (!crisp) return+ crisp.user.setEmail(user.email);+ crisp.user.setNickname(user.name);+ crisp.session.setData({+ user_id : user.id,+ 'pro-subscription' : user?.is_subscribed ?? false,+ 'stripe-id' : user?.stripe_id ?? '',+ 'subscription' : user?.has_enterprise_subscription ? 'enterprise' : 'pro'+ });++ if (user?.is_subscribed ?? false) {+ setSegments([['subscribed', user?.has_enterprise_subscription ? 'enterprise' : 'pro']])+ }+ }++ function setSegments(segments, overwrite = false) {+ if (!crisp) return+ crisp.session.setSegments(segments, overwrite)}return {- push,+ crisp,openChat,showChat,hideChat,@@ -48,6 +74,7 @@ export const useCrisp = () => {openAndShowChat,openHelpdesk,openHelpdeskArticle,- sendTextMessage+ sendTextMessage,+ setUser}}diff --git a/client/plugins/crisp.client.js b/client/plugins/crisp.client.jsnew file mode 100644index 000000000..7038d4513--- /dev/null+++ b/client/plugins/crisp.client.js@@ -0,0 +1,10 @@+import {Crisp} from "crisp-sdk-web"+import config from "~/opnform.config.js";++export default defineNuxtPlugin(nuxtApp => {+ const isIframe = useIsIframe()+ if (config.crisp_website_id && !isIframe) {+ Crisp.configure(config.crisp_website_id)+ window.Crisp = Crisp+ }+});diff --git a/client/stores/auth.js b/client/stores/auth.jsindex 0326e1051..0045f4df3 100644--- a/client/stores/auth.js+++ b/client/stores/auth.js@@ -38,6 +38,7 @@ export const useAuthStore = defineStore('auth', {try {const { data } = await axios.get('/api/user')this.user = data+ this.initServiceClients()return data} catch (e) {@@ -50,7 +51,11 @@ export const useAuthStore = defineStore('auth', {this.user = payload},- load+ initServiceClients() {+ if (!this.user) return+ useAmplitude().setUser(this.user)+ useCrisp().setUser(this.user)+ },async logout () {try {diff --git a/package-lock.json b/package-lock.jsonindex 9bc2c5814..85eea006b 100644--- a/package-lock.json+++ b/package-lock.json@@ -16,6 +16,7 @@"axios": "^0.21.1","chart.js": "^4.4.0","clone-deep": "^4.0.1",+ "crisp-sdk-web": "^1.0.21","date-fns": "^2.28.0","debounce": "^1.2.1","fuse.js": "^6.4.6",@@ -5139,6 +5140,11 @@"integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==","dev": true},+ "node_modules/crisp-sdk-web": {+ "version": "1.0.21",+ "resolved": "https://registry.npmjs.org/crisp-sdk-web/-/crisp-sdk-web-1.0.21.tgz",+ "integrity": "sha512-jNF/zSSA0lsAWT3q4JLG6YxtMRvgai++PwesxEL2Zm6utZaN+AoWPAH01QTfjJC/c++nFT7YM56ucdi+Y5yP4A=="+ },"node_modules/cross-env": {"version": "7.0.3","resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz",diff --git a/package.json b/package.jsonindex 92b0e8038..29ed9d60c 100644--- a/package.json+++ b/package.json@@ -17,6 +17,7 @@"axios": "^0.21.1","chart.js": "^4.4.0","clone-deep": "^4.0.1",+ "crisp-sdk-web": "^1.0.21","date-fns": "^2.28.0","debounce": "^1.2.1","fuse.js": "^6.4.6",@@ -36,8 +37,8 @@"vue-country-flag-next": "^2.3.2","vue-i18n": "^8.25.0","vue-meta": "^3.0.0-alpha.2",- "vue-router": "^4.2.5","vue-notion": "^3.0.0-beta.1",+ "vue-router": "^4.2.5","vue-signature-pad": "^3.0.2","vue3-editor": "^0.1.1","vue3-vt-notifications": "^1.0.0",