diff --git a/README.md b/README.md index 4338d172ce..0464d2f942 100644 --- a/README.md +++ b/README.md @@ -158,7 +158,7 @@ yarn dx npx prisma studio ``` 8. Click on the `User` model to add a new user record. -9. Fill out the fields `email`, `username`, and `password` (remembering to encrypt your password with [BCrypt](https://bcrypt-generator.com/)) and click `Save 1 Record` to create your first user. +9. Fill out the fields `email`, `username`, `password`, and set `metadata` to empty `{}` (remembering to encrypt your password with [BCrypt](https://bcrypt-generator.com/)) and click `Save 1 Record` to create your first user. 10. Open a browser to [http://localhost:3000](http://localhost:3000) and login with your just created, first user. 11. Set a 32 character random string in your .env file for the CALENDSO_ENCRYPTION_KEY. diff --git a/components/booking/pages/AvailabilityPage.tsx b/components/booking/pages/AvailabilityPage.tsx index 21041c2292..b8718ef56c 100644 --- a/components/booking/pages/AvailabilityPage.tsx +++ b/components/booking/pages/AvailabilityPage.tsx @@ -61,7 +61,6 @@ const AvailabilityPage = ({ profile, eventType, workingHours }: Props) => { }, [telemetry]); const changeDate = (newDate: Dayjs) => { - telemetry.withJitsu((jitsu) => jitsu.track(telemetryEventTypes.dateSelected, collectPageParameters())); router.replace( { query: { diff --git a/components/booking/pages/BookingPage.tsx b/components/booking/pages/BookingPage.tsx index d63c3a5fdf..0ff3478606 100644 --- a/components/booking/pages/BookingPage.tsx +++ b/components/booking/pages/BookingPage.tsx @@ -112,9 +112,6 @@ const BookingPage = (props: BookingPageProps) => { }, [router.query.guest]); const telemetry = useTelemetry(); - useEffect(() => { - telemetry.withJitsu((jitsu) => jitsu.track(telemetryEventTypes.timeSelected, collectPageParameters())); - }, [telemetry]); const locationInfo = (type: LocationType) => locations.find((location) => location.type === type); diff --git a/lib/telemetry.ts b/lib/telemetry.ts index fe8ac8caad..6b945b07b5 100644 --- a/lib/telemetry.ts +++ b/lib/telemetry.ts @@ -7,8 +7,6 @@ import React, { useContext } from "react"; */ export const telemetryEventTypes = { pageView: "page_view", - dateSelected: "date_selected", - timeSelected: "time_selected", bookingConfirmed: "booking_confirmed", bookingCancelled: "booking_cancelled", }; diff --git a/pages/settings/profile.tsx b/pages/settings/profile.tsx index 54e0f3c4f7..cf0cb8f717 100644 --- a/pages/settings/profile.tsx +++ b/pages/settings/profile.tsx @@ -128,6 +128,7 @@ function SettingsView(props: ComponentProps & { localeProp: str ]; const usernameRef = useRef(null!); const nameRef = useRef(null!); + const emailRef = useRef(null!); const descriptionRef = useRef(null!); const avatarRef = useRef(null!); const brandColorRef = useRef(null!); @@ -160,6 +161,7 @@ function SettingsView(props: ComponentProps & { localeProp: str const enteredUsername = usernameRef.current.value.toLowerCase(); const enteredName = nameRef.current.value; + const enteredEmail = emailRef.current.value; const enteredDescription = descriptionRef.current.value; const enteredAvatar = avatarRef.current.value; const enteredBrandColor = brandColorRef.current.value; @@ -173,6 +175,7 @@ function SettingsView(props: ComponentProps & { localeProp: str mutation.mutate({ username: enteredUsername, name: enteredName, + email: enteredEmail, bio: enteredDescription, avatar: enteredAvatar, timeZone: enteredTimeZone, @@ -226,19 +229,16 @@ function SettingsView(props: ComponentProps & { localeProp: str {t("email")}

- {t("change_email_contact")}{" "} - - help@cal.com - + {t("change_email_tip")}

diff --git a/public/static/locales/de/common.json b/public/static/locales/de/common.json index 8fd58eface..dcaa978ebd 100644 --- a/public/static/locales/de/common.json +++ b/public/static/locales/de/common.json @@ -486,7 +486,6 @@ "remove_cal_branding_description": "Um die Cal Werbung von Ihren Buchungsseiten zu entfernen, müssen Sie auf ein Pro-Konto upgraden.", "to_upgrade_go_to": "Zum Upgrade gehen Sie zu", "edit_profile_info_description": "Bearbeiten Sie Ihre Profilinformationen, welche bei Ihrem Cal-Link angezeigt werden.", - "change_email_contact": "Um Ihre E-Mail zu ändern, kontaktieren Sie bitte", "little_something_about": "Ein wenig über sich selbst.", "profile_updated_successfully": "Profil erfolgreich aktualisiert", "your_user_profile_updated_successfully": "Ihr Benutzerprofil wurde erfolgreich aktualisiert.", diff --git a/public/static/locales/en/common.json b/public/static/locales/en/common.json index 702f174e2f..d31767923d 100644 --- a/public/static/locales/en/common.json +++ b/public/static/locales/en/common.json @@ -486,7 +486,7 @@ "remove_cal_branding_description": "In order to remove the Cal branding from your booking pages, you need to upgrade to a Pro account.", "to_upgrade_go_to": "To upgrade go to", "edit_profile_info_description": "Edit your profile information, which shows on your scheduling link.", - "change_email_contact": "To change your email, please contact", + "change_email_tip": "You may need to log out and back in to see the change take effect.", "little_something_about": "A little something about yourself.", "profile_updated_successfully": "Profile updated successfully", "your_user_profile_updated_successfully": "Your user profile has been updated successfully.", diff --git a/public/static/locales/es/common.json b/public/static/locales/es/common.json index 2e4022de4a..4829f2d64f 100644 --- a/public/static/locales/es/common.json +++ b/public/static/locales/es/common.json @@ -482,7 +482,6 @@ "remove_cal_branding_description": "Para eliminar la marca Cal de sus páginas de reserva, debe actualizar a una cuenta Pro.", "to_upgrade_go_to": "Para actualizar vaya a", "edit_profile_info_description": "Edite la información de su perfil, que se muestra en su enlace de programación.", - "change_email_contact": "Para cambiar su email, pongase en contacto con", "little_something_about": "Algo sobre ti.", "profile_updated_successfully": "Perfil Actualizado con Éxito", "your_user_profile_updated_successfully": "Su perfil de usuario se ha actualizado correctamente.", diff --git a/public/static/locales/fr/common.json b/public/static/locales/fr/common.json index cea67eae62..4e4eaf0130 100644 --- a/public/static/locales/fr/common.json +++ b/public/static/locales/fr/common.json @@ -450,7 +450,6 @@ "remove_cal_branding_description": "Pour retirer l'image de marque de Cal de vos pages de réservation, vous devez passer à un compte Pro.", "to_upgrade_go_to": "Pour mettre à niveau, allez à", "edit_profile_info_description": "Modifiez les informations de votre profil, qui apparaissent sur votre lien de réservation.", - "change_email_contact": "Pour changer votre adresse e-mail, veuillez contacter", "little_something_about": "Quelque chose à propos de vous.", "profile_updated_successfully": "Profil mis à jour avec succès", "your_user_profile_updated_successfully": "Votre profil d'utilisateur a été mis à jour avec succès.", diff --git a/public/static/locales/it/common.json b/public/static/locales/it/common.json index 3aba5967c9..946296f1f2 100644 --- a/public/static/locales/it/common.json +++ b/public/static/locales/it/common.json @@ -476,7 +476,6 @@ "remove_cal_branding_description": "Al fine di rimuovere il marchio Cal dalle pagine di prenotazione, è necessario acquistare un account Pro.", "to_upgrade_go_to": "Per aggiornare vai a", "edit_profile_info_description": "Modifica le informazioni del tuo profilo, che verranno visualizzate sul tuo link di pianificazione.", - "change_email_contact": "Per modificare la tua email, contatta", "little_something_about": "Qualcosa su di te.", "profile_updated_successfully": "Profilo aggiornato con successo", "your_user_profile_updated_successfully": "Il tuo profilo utente è stato aggiornato con successo.", diff --git a/public/static/locales/ja/common.json b/public/static/locales/ja/common.json index 336bd6fdf6..7c03788bee 100644 --- a/public/static/locales/ja/common.json +++ b/public/static/locales/ja/common.json @@ -448,7 +448,6 @@ "remove_cal_branding_description": "予約ページからカルブランディングを削除するには、Proアカウントにアップグレードする必要があります。", "to_upgrade_go_to": "アップグレードするには", "edit_profile_info_description": "スケジューリングリンクに表示されるプロフィール情報を編集します。", - "change_email_contact": "メールアドレスを変更するには、お問い合わせください", "little_something_about": "あなた自身につい何か少し。", "profile_updated_successfully": "プロフィールが正常に更新されました", "your_user_profile_updated_successfully": "ユーザープロフィールの更新が完了しました。", diff --git a/public/static/locales/ko/common.json b/public/static/locales/ko/common.json index b0963a1a32..c66128ebe6 100644 --- a/public/static/locales/ko/common.json +++ b/public/static/locales/ko/common.json @@ -471,7 +471,6 @@ "remove_cal_branding_description": "예약 페이지에서 Cal 브랜드를 제거하려면 Pro 계정으로 업그레이드해야 합니다.", "to_upgrade_go_to": "업그레이드하려면 다음으로 이동하십시오.", "edit_profile_info_description": "일정 링크에 표시되는 프로필 정보를 수정합니다.", - "change_email_contact": "이메일을 변경하려면 다음으로 연락하십시오.", "little_something_about": "자신에 대해 조금 알려주세요.", "profile_updated_successfully": "프로필이 업데이트되었습니다.", "your_user_profile_updated_successfully": "사용자 프로필이 성공적으로 업데이트되었습니다.", diff --git a/public/static/locales/nl/common.json b/public/static/locales/nl/common.json index fca5337bcd..207f8718f9 100644 --- a/public/static/locales/nl/common.json +++ b/public/static/locales/nl/common.json @@ -441,7 +441,6 @@ "remove_cal_branding_description": "Om de Cal branding van uw boekpagina's te verwijderen, moet u upgraden naar een Pro-account.", "to_upgrade_go_to": "Ga voor upgraden naar", "edit_profile_info_description": "Bewerk profielgegevens die worden weergegeven op uw boekpagina.", - "change_email_contact": "Om uw e-mailadres te wijzigen, neem contact op met", "little_something_about": "Een introductie over uzelf.", "profile_updated_successfully": "Profiel bijgewerkt", "your_user_profile_updated_successfully": "Uw profiel is is met succes bijgewerkt.", diff --git a/public/static/locales/pt-BR/common.json b/public/static/locales/pt-BR/common.json index f8f67e0b5d..6b82d32986 100644 --- a/public/static/locales/pt-BR/common.json +++ b/public/static/locales/pt-BR/common.json @@ -486,7 +486,6 @@ "remove_cal_branding_description": "Para remover a marca Cal das suas páginas de reservas, você precisar fazer o upgrade para uma conta Pro.", "to_upgrade_go_to": "Para fazer upgrade, vá para", "edit_profile_info_description": "Edite as informações do seu perfil, que aparecem na sua página de reservas.", - "change_email_contact": "Para alterar o seu email, por favor entre em contato com", "little_something_about": "Fale um pouco mais sobre você.", "profile_updated_successfully": "Perfil atualizado com sucesso", "your_user_profile_updated_successfully": "O seu perfil foi atualizado com sucesso.", diff --git a/public/static/locales/pt/common.json b/public/static/locales/pt/common.json index 0596484ca9..0cecf6ea15 100644 --- a/public/static/locales/pt/common.json +++ b/public/static/locales/pt/common.json @@ -486,7 +486,6 @@ "remove_cal_branding_description": "Para remover a marca Cal das suas páginas de reservas, tem de atualizar para uma conta Pro.", "to_upgrade_go_to": "Para atualizar, aceda a", "edit_profile_info_description": "Edite as informações do seu perfil, que mostram a sua ligação de agendamento.", - "change_email_contact": "Para alterar o seu email, por favor contacte", "little_something_about": "Um pouco sobre si.", "profile_updated_successfully": "Perfil atualizado com sucesso", "your_user_profile_updated_successfully": "O seu perfil de utilizador foi atualizado com sucesso.", diff --git a/public/static/locales/ro/common.json b/public/static/locales/ro/common.json index d634eb37c8..a3de319bee 100644 --- a/public/static/locales/ro/common.json +++ b/public/static/locales/ro/common.json @@ -448,7 +448,6 @@ "remove_cal_branding_description": "Pentru a elimina branding Cal din paginile dvs. de rezervare, trebuie să faceți upgrade la un cont Pro.", "to_upgrade_go_to": "Pentru a face upgrade mergi la", "edit_profile_info_description": "Editați informațiile de profil, care sunt afișate pe link-ul dvs. de programare.", - "change_email_contact": "Pentru a vă schimba adresa de e-mail, vă rugăm să contactați", "little_something_about": "Un pic despre tine.", "profile_updated_successfully": "Profil actualizat cu succes", "your_user_profile_updated_successfully": "Profilul dvs. de utilizator a fost actualizat cu succes.", diff --git a/public/static/locales/ru/common.json b/public/static/locales/ru/common.json index 5ea42411aa..794533d93f 100644 --- a/public/static/locales/ru/common.json +++ b/public/static/locales/ru/common.json @@ -482,7 +482,6 @@ "remove_cal_branding_description": "Чтобы удалить брендинг Cal со страниц бронирования, необходимо перейти на Pro аккаунт.", "to_upgrade_go_to": "Для обновления перейдите на", "edit_profile_info_description": "Отредактируйте информацию своего профиля, она будет отображаться на вашей публичной странице.", - "change_email_contact": "Чтобы изменить адрес электронной почты, пожалуйста, свяжитесь с", "little_something_about": "Немного о вас.", "profile_updated_successfully": "Профиль успешно обновлен", "your_user_profile_updated_successfully": "Ваш профиль пользователя успешно обновлен.", diff --git a/server/routers/viewer.tsx b/server/routers/viewer.tsx index 7226bbdbeb..c6a1fcc9a6 100644 --- a/server/routers/viewer.tsx +++ b/server/routers/viewer.tsx @@ -542,6 +542,7 @@ const loggedInViewerRouter = createProtectedRouter() input: z.object({ username: z.string().optional(), name: z.string().optional(), + email: z.string().optional(), bio: z.string().optional(), avatar: z.string().optional(), timeZone: z.string().optional(),