From 96fd7ecf41dc171734088e4263caa403ec72c96e Mon Sep 17 00:00:00 2001 From: Conor Meagher Date: Tue, 21 Sep 2021 04:59:34 -0500 Subject: [PATCH] chore: change calendso strings to cal.com (#707) * chore: change calendso strings to cal.com * rebase LICENSE * rebase LICENSE * strings that were missed Co-authored-by: Bailey Pumfleet --- LICENSE | 2 +- README.md | 10 ++--- docker-compose.yml | 2 +- ee/LICENSE | 2 +- lib/emails/EventAttendeeMail.ts | 10 ++--- lib/emails/EventOrganizerMail.ts | 15 +++----- lib/emails/EventOrganizerRescheduledMail.ts | 2 +- lib/emails/EventRejectionMail.ts | 7 ++-- lib/emails/invitation.ts | 6 +-- lib/emails/sendMail.ts | 2 +- .../messaging/forgot-password.ts | 4 +- pages/api/auth/[...nextauth].tsx | 2 +- pages/auth/login.tsx | 2 +- pages/auth/signup.tsx | 4 +- pages/event-types/index.tsx | 26 ++++++------- pages/getting-started.tsx | 2 +- pages/integrations/index.tsx | 2 +- pages/settings/embed.tsx | 4 +- pages/settings/profile.tsx | 4 +- pages/success.tsx | 37 +++++++++---------- public/site.webmanifest | 6 +-- 21 files changed, 72 insertions(+), 79 deletions(-) diff --git a/LICENSE b/LICENSE index 35ea814629..da549a7e32 100644 --- a/LICENSE +++ b/LICENSE @@ -666,4 +666,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -. +. \ No newline at end of file diff --git a/README.md b/README.md index 136dd36c8d..0e7b8e5ea8 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ That's where Cal.com comes in. Self-hosted or hosted by us. White-label by desig #### Support us on [Product Hunt](https://www.producthunt.com/posts/calendso?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-calendso) -Calendso - The open source Calendly alternative | Product Hunt Calendso - The open source Calendly alternative | Product Hunt Cal.com - The open source Calendly alternative | Product Hunt +Cal.com - The open source Calendly alternative | Product Hunt Cal.com - The open source Calendly alternative | Product Hunt Cal.com - The open source Calendly alternative | Product Hunt ### Built With @@ -134,7 +134,7 @@ yarn dx 6. Once you completed the above steps, click on your newly created `Heroku Postgres` and go to its `Settings`. ![image](https://user-images.githubusercontent.com/16905768/115323367-e92ea980-a17f-11eb-9ff4-dec95f2ec349.png) - 7. In `Settings`, copy your URI to your Calendso .env file and replace the `postgresql://:@:` with it. + 7. In `Settings`, copy your URI to your Cal.com .env file and replace the `postgresql://:@:` with it. ![image](https://user-images.githubusercontent.com/16905768/115323556-4591c900-a180-11eb-9808-2f55d2aa3995.png) ![image](https://user-images.githubusercontent.com/16905768/115323697-7a9e1b80-a180-11eb-9f08-a742b1037f90.png) @@ -244,7 +244,7 @@ Contributions are what make the open source community such an amazing place to b 6. In the third page (Test Users), add the Google account(s) you'll using. Make sure the details are correct on the last page of the wizard and your consent screen will be configured. 7. Now select [Credentials](https://console.cloud.google.com/apis/credentials) from the side pane and then select Create Credentials. Select the OAuth Client ID option. 8. Select Web Application as the Application Type. -9. Under Authorized redirect URI's, select Add URI and then add the URI `/api/integrations/googlecalendar/callback` replacing CALENDSO URL with the URI at which your application runs. +9. Under Authorized redirect URI's, select Add URI and then add the URI `/api/integrations/googlecalendar/callback` replacing Cal.com URL with the URI at which your application runs. 10. The key will be created and you will be redirected back to the Credentials page. Select the newly generated client ID under OAuth 2.0 Client IDs. 11. Select Download JSON. Copy the contents of this file and paste the entire JSON string in the .env file as the value for GOOGLE_API_CREDENTIALS key. @@ -253,7 +253,7 @@ Contributions are what make the open source community such an amazing place to b 1. Open [Azure App Registration](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/RegisteredApps) and select New registration 2. Name your application 3. Set **Who can use this application or access this API?** to **Accounts in any organizational directory (Any Azure AD directory - Multitenant)** -4. Set the **Web** redirect URI to `/api/integrations/office365calendar/callback` replacing CALENDSO URL with the URI at which your application runs. +4. Set the **Web** redirect URI to `/api/integrations/office365calendar/callback` replacing Cal.com URL with the URI at which your application runs. 5. Use **Application (client) ID** as the **MS_GRAPH_CLIENT_ID** attribute value in .env 6. Click **Certificates & secrets** create a new client secret and use the value as the **MS_GRAPH_CLIENT_SECRET** attriubte @@ -267,7 +267,7 @@ Contributions are what make the open source community such an amazing place to b 6. De-select the option to publish the app on the Zoom App Marketplace. 7. Click "Create". 8. Now copy the Client ID and Client Secret to your .env file into the `ZOOM_CLIENT_ID` and `ZOOM_CLIENT_SECRET` fields. -9. Set the Redirect URL for OAuth `/api/integrations/zoomvideo/callback` replacing CALENDSO URL with the URI at which your application runs. +9. Set the Redirect URL for OAuth `/api/integrations/zoomvideo/callback` replacing Cal.com URL with the URI at which your application runs. 10. Also add the redirect URL given above as a whitelist URL and enable "Subdomain check". Make sure, it says "saved" below the form. 11. You don't need to provide basic information about your app. Instead click at "Scopes" and then at "+ Add Scopes". On the left, click the category "Meeting" and check the scope `meeting:write`. 12. Click "Done". diff --git a/docker-compose.yml b/docker-compose.yml index ec8a69d553..55d88a66c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -# this file is a helper to run calendso locally +# this file is a helper to run Cal.com locally # starts a postgres instance on port 5450 to use as a local db version: "3.6" services: diff --git a/ee/LICENSE b/ee/LICENSE index 96f08e110b..f63f1ebe4f 100644 --- a/ee/LICENSE +++ b/ee/LICENSE @@ -39,4 +39,4 @@ SOFTWARE. For all third party components incorporated into the Cal.com Software, those components are licensed under the original license provided by the owner of the -applicable component. +applicable component. \ No newline at end of file diff --git a/lib/emails/EventAttendeeMail.ts b/lib/emails/EventAttendeeMail.ts index 972bbf39f9..b03070f322 100644 --- a/lib/emails/EventAttendeeMail.ts +++ b/lib/emails/EventAttendeeMail.ts @@ -59,8 +59,7 @@ export default class EventAttendeeMail extends EventMail { When - ${this.getInviteeStart().format("dddd, LL")}
${this.getInviteeStart().format("h:mma")} (${ - this.calEvent.attendees[0].timeZone + ${this.getInviteeStart().format("dddd, LL")}
${this.getInviteeStart().format("h:mma")} (${this.calEvent.attendees[0].timeZone }) @@ -92,7 +91,7 @@ export default class EventAttendeeMail extends EventMail { `
- Calendso Logo
+ Cal.com Logo ` ); @@ -142,9 +141,8 @@ export default class EventAttendeeMail extends EventMail { to: `${this.calEvent.attendees[0].name} <${this.calEvent.attendees[0].email}>`, from: `${this.calEvent.organizer.name} <${this.getMailerOptions().from}>`, replyTo: this.calEvent.organizer.email, - subject: `Confirmed: ${this.calEvent.type} with ${ - this.calEvent.team?.name || this.calEvent.organizer.name - } on ${this.getInviteeStart().format("LT dddd, LL")}`, + subject: `Confirmed: ${this.calEvent.type} with ${this.calEvent.team?.name || this.calEvent.organizer.name + } on ${this.getInviteeStart().format("LT dddd, LL")}`, html: this.getHtmlRepresentation(), text: this.getPlainTextRepresentation(), }; diff --git a/lib/emails/EventOrganizerMail.ts b/lib/emails/EventOrganizerMail.ts index 9f48ee3f2e..2a11434816 100644 --- a/lib/emails/EventOrganizerMail.ts +++ b/lib/emails/EventOrganizerMail.ts @@ -51,9 +51,8 @@ export default class EventOrganizerMail extends EventMail { } protected getAdditionalFooter(): string { - return `

Need to make a change? Manage my bookings

`; + return `

Need to make a change? Manage my bookings

`; } protected getImage(): string { @@ -108,14 +107,12 @@ export default class EventOrganizerMail extends EventMail { When - ${this.getOrganizerStart().format("dddd, LL")}
${this.getOrganizerStart().format("h:mma")} (${ - this.calEvent.organizer.timeZone + ${this.getOrganizerStart().format("dddd, LL")}
${this.getOrganizerStart().format("h:mma")} (${this.calEvent.organizer.timeZone }) Who - ${this.calEvent.attendees[0].name}
${this.calEvent.attendees[0].email} @@ -137,7 +134,7 @@ export default class EventOrganizerMail extends EventMail { `
- Calendso Logo
+ Cal.com Logo ` ); @@ -193,7 +190,7 @@ export default class EventOrganizerMail extends EventMail { filename: "event.ics", content: this.getiCalEventAsString(), }, - from: `Calendso <${this.getMailerOptions().from}>`, + from: `Cal.com <${this.getMailerOptions().from}>`, to: toAddresses.join(","), subject: this.getSubject(), html: this.getHtmlRepresentation(), diff --git a/lib/emails/EventOrganizerRescheduledMail.ts b/lib/emails/EventOrganizerRescheduledMail.ts index af9cc864de..a21754bcd6 100644 --- a/lib/emails/EventOrganizerRescheduledMail.ts +++ b/lib/emails/EventOrganizerRescheduledMail.ts @@ -55,7 +55,7 @@ export default class EventOrganizerRescheduledMail extends EventOrganizerMail { filename: "event.ics", content: this.getiCalEventAsString(), }, - from: `Calendso <${this.getMailerOptions().from}>`, + from: `Cal.com <${this.getMailerOptions().from}>`, to: this.calEvent.organizer.email, subject: `Rescheduled event: ${this.calEvent.attendees[0].name} - ${organizerStart.format( "LT dddd, LL" diff --git a/lib/emails/EventRejectionMail.ts b/lib/emails/EventRejectionMail.ts index a6d1c66ad1..17007b6e71 100644 --- a/lib/emails/EventRejectionMail.ts +++ b/lib/emails/EventRejectionMail.ts @@ -52,7 +52,7 @@ export default class EventRejectionMail extends EventMail { `
- Calendso Logo
+ Cal.com Logo ` ); @@ -68,9 +68,8 @@ export default class EventRejectionMail extends EventMail { to: `${this.calEvent.attendees[0].name} <${this.calEvent.attendees[0].email}>`, from: `${this.calEvent.organizer.name} <${this.getMailerOptions().from}>`, replyTo: this.calEvent.organizer.email, - subject: `Rejected: ${this.calEvent.type} with ${ - this.calEvent.organizer.name - } on ${this.getInviteeStart().format("dddd, LL")}`, + subject: `Rejected: ${this.calEvent.type} with ${this.calEvent.organizer.name + } on ${this.getInviteeStart().format("dddd, LL")}`, html: this.getHtmlRepresentation(), text: this.getPlainTextRepresentation(), }; diff --git a/lib/emails/invitation.ts b/lib/emails/invitation.ts index ee4668657e..e4df1b4139 100644 --- a/lib/emails/invitation.ts +++ b/lib/emails/invitation.ts @@ -17,7 +17,7 @@ const sendEmail = (invitation: any, { provider }) => nodemailer.createTransport(transport).sendMail( { - from: `Calendso <${from}>`, + from: `Cal.com <${from}>`, to: invitation.toEmail, subject: (invitation.from ? invitation.from + " invited you" : "You have been invited") + @@ -53,7 +53,7 @@ const html = (invitation: any) => { Hi,

` + (invitation.from ? invitation.from + " invited you" : "You have been invited") + - ` to join the team "${invitation.teamName}" in Calendso.
+ ` to join the team "${invitation.teamName}" in Cal.com.

@@ -71,7 +71,7 @@ const html = (invitation: any) => {

- If you prefer not to use "${invitation.toEmail}" as your Calendso email or already have a Calendso account, please request another invitation to that email. + If you prefer not to use "${invitation.toEmail}" as your Cal.com email or already have a Cal.com account, please request another invitation to that email. diff --git a/lib/emails/sendMail.ts b/lib/emails/sendMail.ts index 917a7308e7..e904f64df2 100644 --- a/lib/emails/sendMail.ts +++ b/lib/emails/sendMail.ts @@ -11,7 +11,7 @@ const sendEmail = ({ to, subject, text, html = null }): Promise { return buildMessageTemplate({ diff --git a/pages/api/auth/[...nextauth].tsx b/pages/api/auth/[...nextauth].tsx index 140dafa78d..df9c164ff3 100644 --- a/pages/api/auth/[...nextauth].tsx +++ b/pages/api/auth/[...nextauth].tsx @@ -16,7 +16,7 @@ export default NextAuth({ }, providers: [ Providers.Credentials({ - name: "Calendso", + name: "Cal.com", credentials: { email: { label: "Email Address", type: "email", placeholder: "john.doe@example.com" }, password: { label: "Password", type: "password", placeholder: "Your super secure password" }, diff --git a/pages/auth/login.tsx b/pages/auth/login.tsx index cc63b19a40..d4308b707b 100644 --- a/pages/auth/login.tsx +++ b/pages/auth/login.tsx @@ -69,7 +69,7 @@ export default function Login({ csrfToken }) {
- Calendso Logo + Cal.com Logo

Sign in to your account

diff --git a/pages/auth/signup.tsx b/pages/auth/signup.tsx index d7cbc943a0..a641389025 100644 --- a/pages/auth/signup.tsx +++ b/pages/auth/signup.tsx @@ -41,7 +41,7 @@ export default function Signup(props) { method: "POST", }) .then(handleErrors) - .then(() => signIn("Calendso", { callbackUrl: (router.query.callbackUrl || "") as string })) + .then(() => signIn("Cal.com", { callbackUrl: (router.query.callbackUrl || "") as string })) .catch((err) => { setHasErrors(true); setErrorMessage(err.message); @@ -116,7 +116,7 @@ export default function Signup(props) { /> - signIn("Calendso", { callbackUrl: (router.query.callbackUrl || "") as string }) + signIn("Cal.com", { callbackUrl: (router.query.callbackUrl || "") as string }) } className="w-5/12 inline-flex justify-center text-sm text-gray-500 font-medium border px-4 py-2 rounded btn cursor-pointer"> Login instead diff --git a/pages/event-types/index.tsx b/pages/event-types/index.tsx index b6d0f19518..ae4225fec8 100644 --- a/pages/event-types/index.tsx +++ b/pages/event-types/index.tsx @@ -263,7 +263,7 @@ const EventTypesPage = (props: PageProps) => { return (
- Event Types | Calendso + Event Types | Cal.com New event type @@ -372,8 +372,8 @@ const CreateNewEventDialog = ({ profiles, canAddEvents }: { profiles: Profile[]; eventPage: profile.slug, ...(profile.teamId ? { - teamId: profile.teamId, - } + teamId: profile.teamId, + } : {}), }, }) @@ -681,13 +681,13 @@ export async function getServerSideProps(context) { eventTypes: user.eventTypes.concat(typesRaw).map((type, index) => user.plan === "FREE" && index > 0 ? { - ...type, - $disabled: true, - } + ...type, + $disabled: true, + } : { - ...type, - $disabled: false, - } + ...type, + $disabled: false, + } ), metadata: { membershipCount: 1, diff --git a/pages/getting-started.tsx b/pages/getting-started.tsx index d29a8b056d..8bd48801ea 100644 --- a/pages/getting-started.tsx +++ b/pages/getting-started.tsx @@ -528,7 +528,7 @@ export default function Onboarding(props: OnboardingProps) { return (
- Calendso - Getting Started + Cal.com - Getting Started diff --git a/pages/integrations/index.tsx b/pages/integrations/index.tsx index 68d83b12c3..a5ad51172a 100644 --- a/pages/integrations/index.tsx +++ b/pages/integrations/index.tsx @@ -323,7 +323,7 @@ export default function Home({ integrations }: Props) { title="Connect to Apple Server" subtitle={

- Generate an app specific password to use with Calendso at{" "} + Generate an app specific password to use with Cal.com at{" "}

@@ -64,7 +64,7 @@ export default function Embed(props) {
-

Calendso API

+

Cal.com API

Leverage our API for full control and customizability.

diff --git a/pages/settings/profile.tsx b/pages/settings/profile.tsx index 5fbff0e258..1f5e28835b 100644 --- a/pages/settings/profile.tsx +++ b/pages/settings/profile.tsx @@ -309,10 +309,10 @@ export default function Settings(props: Props) {
-

Hide all Calendso branding from your public pages.

+

Hide all Cal.com branding from your public pages.

diff --git a/pages/success.tsx b/pages/success.tsx index f80d4748ee..cd3c2c2267 100644 --- a/pages/success.tsx +++ b/pages/success.tsx @@ -135,10 +135,9 @@ export default function Success(props: inferSSRProps) `https://calendar.google.com/calendar/r/eventedit?dates=${date .utc() .format("YYYYMMDDTHHmmss[Z]")}/${date - .add(props.eventType.length, "minute") - .utc() - .format("YYYYMMDDTHHmmss[Z]")}&text=${eventName}&details=${ - props.eventType.description + .add(props.eventType.length, "minute") + .utc() + .format("YYYYMMDDTHHmmss[Z]")}&text=${eventName}&details=${props.eventType.description }` + (location ? "&location=" + encodeURIComponent(location) : "") }> @@ -156,13 +155,13 @@ export default function Success(props: inferSSRProps) href={ encodeURI( "https://outlook.live.com/calendar/0/deeplink/compose?body=" + - props.eventType.description + - "&enddt=" + - date.add(props.eventType.length, "minute").utc().format() + - "&path=%2Fcalendar%2Faction%2Fcompose&rru=addevent&startdt=" + - date.utc().format() + - "&subject=" + - eventName + props.eventType.description + + "&enddt=" + + date.add(props.eventType.length, "minute").utc().format() + + "&path=%2Fcalendar%2Faction%2Fcompose&rru=addevent&startdt=" + + date.utc().format() + + "&subject=" + + eventName ) + (location ? "&location=" + location : "") }> ) href={ encodeURI( "https://outlook.office.com/calendar/0/deeplink/compose?body=" + - props.eventType.description + - "&enddt=" + - date.add(props.eventType.length, "minute").utc().format() + - "&path=%2Fcalendar%2Faction%2Fcompose&rru=addevent&startdt=" + - date.utc().format() + - "&subject=" + - eventName + props.eventType.description + + "&enddt=" + + date.add(props.eventType.length, "minute").utc().format() + + "&path=%2Fcalendar%2Faction%2Fcompose&rru=addevent&startdt=" + + date.utc().format() + + "&subject=" + + eventName ) + (location ? "&location=" + location : "") }> ) )} {!props.hideBranding && ( )}
diff --git a/public/site.webmanifest b/public/site.webmanifest index 11e9eb0e66..15a8e42abb 100644 --- a/public/site.webmanifest +++ b/public/site.webmanifest @@ -1,6 +1,6 @@ { - "name": "Calendso", - "short_name": "Calendso", + "name": "Cal.com", + "short_name": "Cal.com", "icons": [ { "src": "/android-chrome-192x192.png", @@ -16,4 +16,4 @@ "theme_color": "#ffffff", "background_color": "#ffffff", "display": "standalone" -} +} \ No newline at end of file