Skip to content

Commit 96fd7ec

Browse files
conrmahrpumfleet
conrmahr
and
pumfleet
authored
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 <pumfleet@hey.com>
1 parent 75d6e17 commit 96fd7ec

21 files changed

+72
-79
lines changed

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -666,4 +666,4 @@ specific requirements.
666666
You should also get your employer (if you work as a programmer) or school,
667667
if any, to sign a "copyright disclaimer" for the program, if necessary.
668668
For more information on this, and how to apply and follow the GNU AGPL, see
669-
<https://www.gnu.org/licenses/>.
669+
<https://www.gnu.org/licenses/>.

‎README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ That's where Cal.com comes in. Self-hosted or hosted by us. White-label by desig
5151

5252
#### Support us on [Product Hunt](https://www.producthunt.com/posts/calendso?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-calendso)
5353

54-
<a href="https://www.producthunt.com/posts/calendso?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-calendso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=291910&theme=light&period=monthly" alt="Calendso - The open source Calendly alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a> <a href="https://www.producthunt.com/posts/calendso?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-calendso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=291910&theme=light" alt="Calendso - The open source Calendly alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a> <a href="https://www.producthunt.com/stories/how-this-open-source-calendly-alternative-rocketed-to-product-of-the-day" target="_blank"><img src="https://cal.com/maker-grant.svg" alt="Cal.com - The open source Calendly alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
54+
<a href="https://www.producthunt.com/posts/calendso?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-calendso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/top-post-badge.svg?post_id=291910&theme=light&period=monthly" alt="Cal.com - The open source Calendly alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a> <a href="https://www.producthunt.com/posts/calendso?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-calendso" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=291910&theme=light" alt="Cal.com - The open source Calendly alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a> <a href="https://www.producthunt.com/stories/how-this-open-source-calendly-alternative-rocketed-to-product-of-the-day" target="_blank"><img src="https://cal.com/maker-grant.svg" alt="Cal.com - The open source Calendly alternative | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
5555

5656
### Built With
5757

@@ -134,7 +134,7 @@ yarn dx
134134
6. Once you completed the above steps, click on your newly created `Heroku Postgres` and go to its `Settings`.
135135
![image](https://user-images.githubusercontent.com/16905768/115323367-e92ea980-a17f-11eb-9ff4-dec95f2ec349.png)
136136

137-
7. In `Settings`, copy your URI to your Calendso .env file and replace the `postgresql://<user>:<pass>@<db-host>:<db-port>` with it.
137+
7. In `Settings`, copy your URI to your Cal.com .env file and replace the `postgresql://<user>:<pass>@<db-host>:<db-port>` with it.
138138
![image](https://user-images.githubusercontent.com/16905768/115323556-4591c900-a180-11eb-9808-2f55d2aa3995.png)
139139
![image](https://user-images.githubusercontent.com/16905768/115323697-7a9e1b80-a180-11eb-9f08-a742b1037f90.png)
140140

@@ -244,7 +244,7 @@ Contributions are what make the open source community such an amazing place to b
244244
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.
245245
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.
246246
8. Select Web Application as the Application Type.
247-
9. Under Authorized redirect URI's, select Add URI and then add the URI `<CALENDSO URL>/api/integrations/googlecalendar/callback` replacing CALENDSO URL with the URI at which your application runs.
247+
9. Under Authorized redirect URI's, select Add URI and then add the URI `<Cal.com URL>/api/integrations/googlecalendar/callback` replacing Cal.com URL with the URI at which your application runs.
248248
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.
249249
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.
250250

@@ -253,7 +253,7 @@ Contributions are what make the open source community such an amazing place to b
253253
1. Open [Azure App Registration](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/RegisteredApps) and select New registration
254254
2. Name your application
255255
3. Set **Who can use this application or access this API?** to **Accounts in any organizational directory (Any Azure AD directory - Multitenant)**
256-
4. Set the **Web** redirect URI to `<CALENDSO URL>/api/integrations/office365calendar/callback` replacing CALENDSO URL with the URI at which your application runs.
256+
4. Set the **Web** redirect URI to `<Cal.com URL>/api/integrations/office365calendar/callback` replacing Cal.com URL with the URI at which your application runs.
257257
5. Use **Application (client) ID** as the **MS_GRAPH_CLIENT_ID** attribute value in .env
258258
6. Click **Certificates & secrets** create a new client secret and use the value as the **MS_GRAPH_CLIENT_SECRET** attriubte
259259

@@ -267,7 +267,7 @@ Contributions are what make the open source community such an amazing place to b
267267
6. De-select the option to publish the app on the Zoom App Marketplace.
268268
7. Click "Create".
269269
8. Now copy the Client ID and Client Secret to your .env file into the `ZOOM_CLIENT_ID` and `ZOOM_CLIENT_SECRET` fields.
270-
9. Set the Redirect URL for OAuth `<CALENDSO URL>/api/integrations/zoomvideo/callback` replacing CALENDSO URL with the URI at which your application runs.
270+
9. Set the Redirect URL for OAuth `<Cal.com URL>/api/integrations/zoomvideo/callback` replacing Cal.com URL with the URI at which your application runs.
271271
10. Also add the redirect URL given above as a whitelist URL and enable "Subdomain check". Make sure, it says "saved" below the form.
272272
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`.
273273
12. Click "Done".

‎docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# this file is a helper to run calendso locally
1+
# this file is a helper to run Cal.com locally
22
# starts a postgres instance on port 5450 to use as a local db
33
version: "3.6"
44
services:

‎ee/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ SOFTWARE.
3939

4040
For all third party components incorporated into the Cal.com Software, those
4141
components are licensed under the original license provided by the owner of the
42-
applicable component.
42+
applicable component.

‎lib/emails/EventAttendeeMail.ts

+4-6
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ export default class EventAttendeeMail extends EventMail {
5959
</tr>
6060
<tr>
6161
<td>When</td>
62-
<td>${this.getInviteeStart().format("dddd, LL")}<br>${this.getInviteeStart().format("h:mma")} (${
63-
this.calEvent.attendees[0].timeZone
62+
<td>${this.getInviteeStart().format("dddd, LL")}<br>${this.getInviteeStart().format("h:mma")} (${this.calEvent.attendees[0].timeZone
6463
})</td>
6564
</tr>
6665
<tr>
@@ -92,7 +91,7 @@ export default class EventAttendeeMail extends EventMail {
9291
`
9392
</div>
9493
<div style="text-align: center; margin-top: 20px; color: #ccc; font-size: 12px;">
95-
<img style="opacity: 0.25; width: 120px;" src="https://app.cal.com/cal-logo-word.svg" alt="Calendso Logo"></div>
94+
<img style="opacity: 0.25; width: 120px;" src="https://app.cal.com/cal-logo-word.svg" alt="Cal.com Logo"></div>
9695
</body>
9796
`
9897
);
@@ -142,9 +141,8 @@ export default class EventAttendeeMail extends EventMail {
142141
to: `${this.calEvent.attendees[0].name} <${this.calEvent.attendees[0].email}>`,
143142
from: `${this.calEvent.organizer.name} <${this.getMailerOptions().from}>`,
144143
replyTo: this.calEvent.organizer.email,
145-
subject: `Confirmed: ${this.calEvent.type} with ${
146-
this.calEvent.team?.name || this.calEvent.organizer.name
147-
} on ${this.getInviteeStart().format("LT dddd, LL")}`,
144+
subject: `Confirmed: ${this.calEvent.type} with ${this.calEvent.team?.name || this.calEvent.organizer.name
145+
} on ${this.getInviteeStart().format("LT dddd, LL")}`,
148146
html: this.getHtmlRepresentation(),
149147
text: this.getPlainTextRepresentation(),
150148
};

‎lib/emails/EventOrganizerMail.ts

+6-9
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,8 @@ export default class EventOrganizerMail extends EventMail {
5151
}
5252

5353
protected getAdditionalFooter(): string {
54-
return `<p style="color: #4b5563; margin-top: 20px;">Need to make a change? <a href=${
55-
process.env.BASE_URL + "/bookings"
56-
} style="color: #161e2e;">Manage my bookings</a></p>`;
54+
return `<p style="color: #4b5563; margin-top: 20px;">Need to make a change? <a href=${process.env.BASE_URL + "/bookings"
55+
} style="color: #161e2e;">Manage my bookings</a></p>`;
5756
}
5857

5958
protected getImage(): string {
@@ -108,14 +107,12 @@ export default class EventOrganizerMail extends EventMail {
108107
</tr>
109108
<tr>
110109
<td>When</td>
111-
<td>${this.getOrganizerStart().format("dddd, LL")}<br>${this.getOrganizerStart().format("h:mma")} (${
112-
this.calEvent.organizer.timeZone
110+
<td>${this.getOrganizerStart().format("dddd, LL")}<br>${this.getOrganizerStart().format("h:mma")} (${this.calEvent.organizer.timeZone
113111
})</td>
114112
</tr>
115113
<tr>
116114
<td>Who</td>
117-
<td>${this.calEvent.attendees[0].name}<br /><small><a href="mailto:${
118-
this.calEvent.attendees[0].email
115+
<td>${this.calEvent.attendees[0].name}<br /><small><a href="mailto:${this.calEvent.attendees[0].email
119116
}">${this.calEvent.attendees[0].email}</a></small></td>
120117
</tr>
121118
<tr>
@@ -137,7 +134,7 @@ export default class EventOrganizerMail extends EventMail {
137134
`
138135
</div>
139136
<div style="text-align: center; margin-top: 20px; color: #ccc; font-size: 12px;">
140-
<img style="opacity: 0.25; width: 120px;" src="https://app.cal.com/cal-logo-word.svg" alt="Calendso Logo"></div>
137+
<img style="opacity: 0.25; width: 120px;" src="https://app.cal.com/cal-logo-word.svg" alt="Cal.com Logo"></div>
141138
</body>
142139
`
143140
);
@@ -193,7 +190,7 @@ export default class EventOrganizerMail extends EventMail {
193190
filename: "event.ics",
194191
content: this.getiCalEventAsString(),
195192
},
196-
from: `Calendso <${this.getMailerOptions().from}>`,
193+
from: `Cal.com <${this.getMailerOptions().from}>`,
197194
to: toAddresses.join(","),
198195
subject: this.getSubject(),
199196
html: this.getHtmlRepresentation(),

‎lib/emails/EventOrganizerRescheduledMail.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export default class EventOrganizerRescheduledMail extends EventOrganizerMail {
5555
filename: "event.ics",
5656
content: this.getiCalEventAsString(),
5757
},
58-
from: `Calendso <${this.getMailerOptions().from}>`,
58+
from: `Cal.com <${this.getMailerOptions().from}>`,
5959
to: this.calEvent.organizer.email,
6060
subject: `Rescheduled event: ${this.calEvent.attendees[0].name} - ${organizerStart.format(
6161
"LT dddd, LL"

‎lib/emails/EventRejectionMail.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export default class EventRejectionMail extends EventMail {
5252
`
5353
</div>
5454
<div style="text-align: center; margin-top: 20px; color: #ccc; font-size: 12px;">
55-
<img style="opacity: 0.25; width: 120px;" src="https://app.cal.com/cal-logo-word.svg" alt="Calendso Logo"></div>
55+
<img style="opacity: 0.25; width: 120px;" src="https://app.cal.com/cal-logo-word.svg" alt="Cal.com Logo"></div>
5656
</body>
5757
`
5858
);
@@ -68,9 +68,8 @@ export default class EventRejectionMail extends EventMail {
6868
to: `${this.calEvent.attendees[0].name} <${this.calEvent.attendees[0].email}>`,
6969
from: `${this.calEvent.organizer.name} <${this.getMailerOptions().from}>`,
7070
replyTo: this.calEvent.organizer.email,
71-
subject: `Rejected: ${this.calEvent.type} with ${
72-
this.calEvent.organizer.name
73-
} on ${this.getInviteeStart().format("dddd, LL")}`,
71+
subject: `Rejected: ${this.calEvent.type} with ${this.calEvent.organizer.name
72+
} on ${this.getInviteeStart().format("dddd, LL")}`,
7473
html: this.getHtmlRepresentation(),
7574
text: this.getPlainTextRepresentation(),
7675
};

‎lib/emails/invitation.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const sendEmail = (invitation: any, { provider }) =>
1717

1818
nodemailer.createTransport(transport).sendMail(
1919
{
20-
from: `Calendso <${from}>`,
20+
from: `Cal.com <${from}>`,
2121
to: invitation.toEmail,
2222
subject:
2323
(invitation.from ? invitation.from + " invited you" : "You have been invited") +
@@ -53,7 +53,7 @@ const html = (invitation: any) => {
5353
Hi,<br />
5454
<br />` +
5555
(invitation.from ? invitation.from + " invited you" : "You have been invited") +
56-
` to join the team "${invitation.teamName}" in Calendso.<br />
56+
` to join the team "${invitation.teamName}" in Cal.com.<br />
5757
<br />
5858
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
5959
<tr>
@@ -71,7 +71,7 @@ const html = (invitation: any) => {
7171
</td>
7272
</tr>
7373
</table><br />
74-
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.
74+
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.
7575
</td>
7676
</tr>
7777
</table>

‎lib/emails/sendMail.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const sendEmail = ({ to, subject, text, html = null }): Promise<string | SentMes
1111

1212
nodemailer.createTransport(transport).sendMail(
1313
{
14-
from: `Calendso ${from}`,
14+
from: `Cal.com ${from}`,
1515
to,
1616
subject,
1717
text,

‎lib/forgot-password/messaging/forgot-password.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import buildMessageTemplate from "../../emails/buildMessageTemplate";
22

3-
export const forgotPasswordSubjectTemplate = "Forgot your password? - Calendso";
3+
export const forgotPasswordSubjectTemplate = "Forgot your password? - Cal.com";
44

55
export const forgotPasswordMessageTemplate = `Hey there,
66
@@ -9,7 +9,7 @@ Use the link below to reset your password.
99
1010
p.s. It expires in 6 hours.
1111
12-
- Calendso`;
12+
- Cal.com`;
1313

1414
export const buildForgotPasswordMessage = (vars) => {
1515
return buildMessageTemplate({

‎pages/api/auth/[...nextauth].tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default NextAuth({
1616
},
1717
providers: [
1818
Providers.Credentials({
19-
name: "Calendso",
19+
name: "Cal.com",
2020
credentials: {
2121
email: { label: "Email Address", type: "email", placeholder: "john.doe@example.com" },
2222
password: { label: "Password", type: "password", placeholder: "Your super secure password" },

‎pages/auth/login.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export default function Login({ csrfToken }) {
6969
<div className="min-h-screen bg-neutral-50 flex flex-col justify-center py-12 sm:px-6 lg:px-8">
7070
<HeadSeo title="Login" description="Login" />
7171
<div className="sm:mx-auto sm:w-full sm:max-w-md">
72-
<img className="h-6 mx-auto" src="/calendso-logo-white-word.svg" alt="Calendso Logo" />
72+
<img className="h-6 mx-auto" src="/calendso-logo-white-word.svg" alt="Cal.com Logo" />
7373
<h2 className="mt-6 text-center text-3xl font-bold text-neutral-900">Sign in to your account</h2>
7474
</div>
7575

‎pages/auth/signup.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export default function Signup(props) {
4141
method: "POST",
4242
})
4343
.then(handleErrors)
44-
.then(() => signIn("Calendso", { callbackUrl: (router.query.callbackUrl || "") as string }))
44+
.then(() => signIn("Cal.com", { callbackUrl: (router.query.callbackUrl || "") as string }))
4545
.catch((err) => {
4646
setHasErrors(true);
4747
setErrorMessage(err.message);
@@ -116,7 +116,7 @@ export default function Signup(props) {
116116
/>
117117
<a
118118
onClick={() =>
119-
signIn("Calendso", { callbackUrl: (router.query.callbackUrl || "") as string })
119+
signIn("Cal.com", { callbackUrl: (router.query.callbackUrl || "") as string })
120120
}
121121
className="w-5/12 inline-flex justify-center text-sm text-gray-500 font-medium border px-4 py-2 rounded btn cursor-pointer">
122122
Login instead

‎pages/event-types/index.tsx

+13-13
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ const EventTypesPage = (props: PageProps) => {
263263
return (
264264
<div>
265265
<Head>
266-
<title>Event Types | Calendso</title>
266+
<title>Event Types | Cal.com</title>
267267
<link rel="icon" href="/favicon.ico" />
268268
</Head>
269269
<Shell
@@ -342,11 +342,11 @@ const CreateNewEventDialog = ({ profiles, canAddEvents }: { profiles: Profile[];
342342
data-testid="new-event-type"
343343
{...(canAddEvents
344344
? {
345-
href: modalOpen.hrefOn,
346-
}
345+
href: modalOpen.hrefOn,
346+
}
347347
: {
348-
disabled: true,
349-
})}
348+
disabled: true,
349+
})}
350350
StartIcon={PlusIcon}>
351351
New event type
352352
</Button>
@@ -372,8 +372,8 @@ const CreateNewEventDialog = ({ profiles, canAddEvents }: { profiles: Profile[];
372372
eventPage: profile.slug,
373373
...(profile.teamId
374374
? {
375-
teamId: profile.teamId,
376-
}
375+
teamId: profile.teamId,
376+
}
377377
: {}),
378378
},
379379
})
@@ -681,13 +681,13 @@ export async function getServerSideProps(context) {
681681
eventTypes: user.eventTypes.concat(typesRaw).map((type, index) =>
682682
user.plan === "FREE" && index > 0
683683
? {
684-
...type,
685-
$disabled: true,
686-
}
684+
...type,
685+
$disabled: true,
686+
}
687687
: {
688-
...type,
689-
$disabled: false,
690-
}
688+
...type,
689+
$disabled: false,
690+
}
691691
),
692692
metadata: {
693693
membershipCount: 1,

‎pages/getting-started.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ export default function Onboarding(props: OnboardingProps) {
528528
return (
529529
<div className="bg-black min-h-screen">
530530
<Head>
531-
<title>Calendso - Getting Started</title>
531+
<title>Cal.com - Getting Started</title>
532532
<link rel="icon" href="/favicon.ico" />
533533
</Head>
534534

‎pages/integrations/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ export default function Home({ integrations }: Props) {
323323
title="Connect to Apple Server"
324324
subtitle={
325325
<p>
326-
Generate an app specific password to use with Calendso at{" "}
326+
Generate an app specific password to use with Cal.com at{" "}
327327
<a
328328
className="text-indigo-400"
329329
href="https://appleid.apple.com/account/manage"

‎pages/settings/embed.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export default function Embed(props) {
1919
<div className="py-6 lg:pb-8 lg:col-span-9">
2020
<div className="mb-6">
2121
<h2 className="text-lg leading-6 font-medium text-gray-900">iframe Embed</h2>
22-
<p className="mt-1 text-sm text-gray-500">The easiest way to embed Calendso on your website.</p>
22+
<p className="mt-1 text-sm text-gray-500">The easiest way to embed Cal.com on your website.</p>
2323
</div>
2424
<div className="grid grid-cols-2 space-x-4">
2525
<div>
@@ -64,7 +64,7 @@ export default function Embed(props) {
6464
</div>
6565
</div>
6666
<div className="my-6">
67-
<h2 className="text-lg leading-6 font-medium text-gray-900">Calendso API</h2>
67+
<h2 className="text-lg leading-6 font-medium text-gray-900">Cal.com API</h2>
6868
<p className="mt-1 text-sm text-gray-500">
6969
Leverage our API for full control and customizability.
7070
</p>

0 commit comments

Comments
 (0)