From cf7f5ae53cf55c862c6f44c23c9b6ff942fac61e Mon Sep 17 00:00:00 2001 From: Alex van Andel Date: Wed, 15 Sep 2021 21:35:55 +0100 Subject: [PATCH] Replace all instances of calendso.com with cal.com and add a new logo for Cal.com emails (#662) --- .env.example | 2 +- .github/ISSUE_TEMPLATE/questions.md | 2 +- README.md | 2 +- calendso.yaml | 8 ++++---- components/DonateBanner.tsx | 4 ++-- components/Shell.tsx | 4 ++-- components/seo/head-seo.tsx | 2 +- components/ui/PoweredByCalendso.tsx | 2 +- ee/LICENSE | 2 +- ee/README.md | 8 ++++---- lib/emails/EventAttendeeMail.ts | 2 +- lib/emails/EventOrganizerMail.ts | 2 +- lib/emails/EventRejectionMail.ts | 2 +- pages/404.tsx | 8 ++++---- pages/integrations/index.tsx | 2 +- pages/settings/embed.tsx | 2 +- pages/settings/profile.tsx | 4 ++-- public/cal-logo-word.svg | 9 +++++++++ 18 files changed, 38 insertions(+), 29 deletions(-) create mode 100644 public/cal-logo-word.svg diff --git a/.env.example b/.env.example index 15b02c6846..1c1126b585 100644 --- a/.env.example +++ b/.env.example @@ -25,7 +25,7 @@ ZOOM_CLIENT_SECRET= # allow access to the nodemailer transports from the .env file. E-mail templates are accessible within lib/emails/ # Configures the global From: header whilst sending emails. -EMAIL_FROM='notifications@yourselfhostedcalendso.com' +EMAIL_FROM='notifications@yourselfhostedcal.com' # Configure SMTP settings (@see https://nodemailer.com/smtp/). # Note: The below configuration for Office 365 has been verified to work. diff --git a/.github/ISSUE_TEMPLATE/questions.md b/.github/ISSUE_TEMPLATE/questions.md index 4097ff010f..475796de30 100644 --- a/.github/ISSUE_TEMPLATE/questions.md +++ b/.github/ISSUE_TEMPLATE/questions.md @@ -7,7 +7,7 @@ assignees: '' --- -Please do not use GitHub for asking questions, as this unnecessarily pollutes it. Instead, if you have a general question about Calendso or about Calendso's features we encourage you to post on our Slack workspace instead: [Calendso's Slack](https://calendso.com/slack). The maintainers and other community members can provide help and answer your questions there. +Please do not use GitHub for asking questions, as this unnecessarily pollutes it. Instead, if you have a general question about Calendso or about Calendso's features we encourage you to post on our Slack workspace instead: [Calendso's Slack](https://cal.com/slack). The maintainers and other community members can provide help and answer your questions there. If you've discovered a bug or would like to propose a change/new feature please use one of the other issue templates. diff --git a/README.md b/README.md index b4d6789103..136dd36c8d 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@

- Join Cal.com Slack + Join Cal.com Slack Product Hunt Github Stars Hacker News diff --git a/calendso.yaml b/calendso.yaml index 030ce2d26a..aec371c9aa 100644 --- a/calendso.yaml +++ b/calendso.yaml @@ -4,12 +4,12 @@ info: description: The open source Calendly alternative. contact: name: Support - email: support@calendso.com + email: support@cal.com license: name: MIT License url: 'https://opensource.org/licenses/MIT' version: 1.0.0 - termsOfService: 'https://calendso.com/terms' + termsOfService: 'https://cal.com/terms' server: url: 'http://localhost:{port}' description: Local Development Server @@ -205,7 +205,7 @@ paths: integration: google_calendar name: Birthdays - selected: true - externalId: bailey@calendso.com + externalId: bailey@cal.com integration: google_calendar name: Calendso primary: true @@ -1009,7 +1009,7 @@ paths: required: true description: The team which you wish to list members of servers: - - url: 'https://app.calendso.com' + - url: 'https://app.cal.com' description: Production components: securitySchemes: {} diff --git a/components/DonateBanner.tsx b/components/DonateBanner.tsx index 41675d9a39..90db7cca12 100644 --- a/components/DonateBanner.tsx +++ b/components/DonateBanner.tsx @@ -1,6 +1,6 @@ import { GiftIcon } from "@heroicons/react/outline"; export default function DonateBanner() { - if (location.hostname.endsWith(".calendso.com")) { + if (location.hostname.endsWith(".cal.com")) { return null; } @@ -27,7 +27,7 @@ export default function DonateBanner() { Donate diff --git a/components/Shell.tsx b/components/Shell.tsx index a8eb7219c0..c154c19f11 100644 --- a/components/Shell.tsx +++ b/components/Shell.tsx @@ -276,7 +276,7 @@ function UserDropdown({ small, bottom }: { small?: boolean; bottom?: boolean }) {({ active }) => ( {({ active }) => ( { return ( encodeURIComponent("Meet **" + name + "**
" + description).replace(/'/g, "%27") + - ".png?md=1&images=https%3A%2F%2Fcalendso.com%2Fcalendso-logo-white.svg&images=" + + ".png?md=1&images=https%3A%2F%2Fcal.com%2Fcalendso-logo-white.svg&images=" + encodeURIComponent(avatar) ); }; diff --git a/components/ui/PoweredByCalendso.tsx b/components/ui/PoweredByCalendso.tsx index fdaf98ceab..dd75088b69 100644 --- a/components/ui/PoweredByCalendso.tsx +++ b/components/ui/PoweredByCalendso.tsx @@ -2,7 +2,7 @@ import Link from "next/link"; const PoweredByCalendso = () => (

- + powered by{" "}
- Logo + Logo
- Website + Website
# Enterprise Edition Welcome to the Enterprise Edition ("/ee") of Calendso.com. -The [/ee](https://github.com/calendso/calendso/tree/main/ee) subfolder is the place for all the **Pro** features from our [hosted](https://calendso.com/pricing) plan and [enterprise-grade](https://calendso.com/enterprise) features such as SSO, SAML, ADFS, OIDC, SCIM, SIEM, HRIS and much more. +The [/ee](https://github.com/calendso/calendso/tree/main/ee) subfolder is the place for all the **Pro** features from our [hosted](https://cal.com/pricing) plan and [enterprise-grade](https://cal.com/enterprise) features such as SSO, SAML, ADFS, OIDC, SCIM, SIEM, HRIS and much more. -> _❗ WARNING: This repository is copyrighted (unlike our [main repo](https://github.com/calendso/calendso)). You are not allowed to use this code to host your own version of app.calendso.com without obtaining a proper [license](https://calendso.com/enterprise) first❗_ +> _❗ WARNING: This repository is copyrighted (unlike our [main repo](https://github.com/calendso/calendso)). You are not allowed to use this code to host your own version of app.cal.com without obtaining a proper [license](https://cal.com/enterprise) first❗_ diff --git a/lib/emails/EventAttendeeMail.ts b/lib/emails/EventAttendeeMail.ts index cf9ea78f14..972bbf39f9 100644 --- a/lib/emails/EventAttendeeMail.ts +++ b/lib/emails/EventAttendeeMail.ts @@ -92,7 +92,7 @@ export default class EventAttendeeMail extends EventMail { `
- Calendso Logo
+ Calendso Logo ` ); diff --git a/lib/emails/EventOrganizerMail.ts b/lib/emails/EventOrganizerMail.ts index 7c5a95994c..9f48ee3f2e 100644 --- a/lib/emails/EventOrganizerMail.ts +++ b/lib/emails/EventOrganizerMail.ts @@ -137,7 +137,7 @@ export default class EventOrganizerMail extends EventMail { `
- Calendso Logo
+ Calendso Logo ` ); diff --git a/lib/emails/EventRejectionMail.ts b/lib/emails/EventRejectionMail.ts index f52c7eb6bb..a6d1c66ad1 100644 --- a/lib/emails/EventRejectionMail.ts +++ b/lib/emails/EventRejectionMail.ts @@ -52,7 +52,7 @@ export default class EventRejectionMail extends EventMail { `
- Calendso Logo
+ Calendso Logo ` ); diff --git a/pages/404.tsx b/pages/404.tsx index 630d2e0c2a..855959c7cd 100644 --- a/pages/404.tsx +++ b/pages/404.tsx @@ -10,19 +10,19 @@ const links = [ title: "Documentation", description: "Learn how to integrate our tools with your app", icon: DocumentTextIcon, - href: "https://docs.calendso.com", + href: "https://docs.cal.com", }, { title: "API Reference", description: "A complete API reference for our libraries", icon: CodeIcon, - href: "https://api.docs.calendso.com", + href: "https://api.docs.cal.com", }, { title: "Blog", description: "Read our latest news and articles", icon: BookOpenIcon, - href: "https://calendso.com/blog", + href: "https://cal.com/blog", }, ]; @@ -117,7 +117,7 @@ export default function Custom404() { ))}
  • - +
    diff --git a/pages/integrations/index.tsx b/pages/integrations/index.tsx index 250ab4f197..3d77b7e196 100644 --- a/pages/integrations/index.tsx +++ b/pages/integrations/index.tsx @@ -462,7 +462,7 @@ export default function Home({ integrations }: Props) {

    If you want to add your own App here, get in touch with us.

    - + Contact us
    diff --git a/pages/settings/embed.tsx b/pages/settings/embed.tsx index 4187fa3055..5f4fa989ac 100644 --- a/pages/settings/embed.tsx +++ b/pages/settings/embed.tsx @@ -69,7 +69,7 @@ export default function Embed(props) { Leverage our API for full control and customizability.

    - + Browse our API documentation diff --git a/pages/settings/profile.tsx b/pages/settings/profile.tsx index 3960ee506a..a303454df8 100644 --- a/pages/settings/profile.tsx +++ b/pages/settings/profile.tsx @@ -65,8 +65,8 @@ function HideBrandingInput(props: {

    {" "} To upgrade go to{" "} - - calendso.com/upgrade + + cal.com/upgrade .

    diff --git a/public/cal-logo-word.svg b/public/cal-logo-word.svg new file mode 100644 index 0000000000..bccfe813ef --- /dev/null +++ b/public/cal-logo-word.svg @@ -0,0 +1,9 @@ + + + + + + + + +