Skip to content

Commit

Permalink
chore: change calendso strings to cal.com (#707)
Browse files Browse the repository at this point in the history
* chore: change calendso strings to cal.com

* rebase LICENSE

* rebase LICENSE

* strings that were missed

Co-authored-by: Bailey Pumfleet <[email protected]>
  • Loading branch information
conrmahr and baileypumfleet authored Sep 21, 2021
1 parent 75d6e17 commit 96fd7ec
Show file tree
Hide file tree
Showing 21 changed files with 72 additions and 79 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
<https://www.gnu.org/licenses/>.
<https://www.gnu.org/licenses/>.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

<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>
<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>

### Built With

Expand Down Expand Up @@ -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://<user>:<pass>@<db-host>:<db-port>` with it.
7. In `Settings`, copy your URI to your Cal.com .env file and replace the `postgresql://<user>:<pass>@<db-host>:<db-port>` 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)

Expand Down Expand Up @@ -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 `<CALENDSO URL>/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 `<Cal.com URL>/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.

Expand All @@ -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 `<CALENDSO URL>/api/integrations/office365calendar/callback` replacing CALENDSO URL with the URI at which your application runs.
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.
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

Expand All @@ -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 `<CALENDSO URL>/api/integrations/zoomvideo/callback` replacing CALENDSO URL with the URI at which your application runs.
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.
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".
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ee/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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.
10 changes: 4 additions & 6 deletions lib/emails/EventAttendeeMail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ export default class EventAttendeeMail extends EventMail {
</tr>
<tr>
<td>When</td>
<td>${this.getInviteeStart().format("dddd, LL")}<br>${this.getInviteeStart().format("h:mma")} (${
this.calEvent.attendees[0].timeZone
<td>${this.getInviteeStart().format("dddd, LL")}<br>${this.getInviteeStart().format("h:mma")} (${this.calEvent.attendees[0].timeZone
})</td>
</tr>
<tr>
Expand Down Expand Up @@ -92,7 +91,7 @@ export default class EventAttendeeMail extends EventMail {
`
</div>
<div style="text-align: center; margin-top: 20px; color: #ccc; font-size: 12px;">
<img style="opacity: 0.25; width: 120px;" src="https://app.cal.com/cal-logo-word.svg" alt="Calendso Logo"></div>
<img style="opacity: 0.25; width: 120px;" src="https://app.cal.com/cal-logo-word.svg" alt="Cal.com Logo"></div>
</body>
`
);
Expand Down Expand Up @@ -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(),
};
Expand Down
15 changes: 6 additions & 9 deletions lib/emails/EventOrganizerMail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,8 @@ export default class EventOrganizerMail extends EventMail {
}

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

protected getImage(): string {
Expand Down Expand Up @@ -108,14 +107,12 @@ export default class EventOrganizerMail extends EventMail {
</tr>
<tr>
<td>When</td>
<td>${this.getOrganizerStart().format("dddd, LL")}<br>${this.getOrganizerStart().format("h:mma")} (${
this.calEvent.organizer.timeZone
<td>${this.getOrganizerStart().format("dddd, LL")}<br>${this.getOrganizerStart().format("h:mma")} (${this.calEvent.organizer.timeZone
})</td>
</tr>
<tr>
<td>Who</td>
<td>${this.calEvent.attendees[0].name}<br /><small><a href="mailto:${
this.calEvent.attendees[0].email
<td>${this.calEvent.attendees[0].name}<br /><small><a href="mailto:${this.calEvent.attendees[0].email
}">${this.calEvent.attendees[0].email}</a></small></td>
</tr>
<tr>
Expand All @@ -137,7 +134,7 @@ export default class EventOrganizerMail extends EventMail {
`
</div>
<div style="text-align: center; margin-top: 20px; color: #ccc; font-size: 12px;">
<img style="opacity: 0.25; width: 120px;" src="https://app.cal.com/cal-logo-word.svg" alt="Calendso Logo"></div>
<img style="opacity: 0.25; width: 120px;" src="https://app.cal.com/cal-logo-word.svg" alt="Cal.com Logo"></div>
</body>
`
);
Expand Down Expand Up @@ -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(),
Expand Down
2 changes: 1 addition & 1 deletion lib/emails/EventOrganizerRescheduledMail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 3 additions & 4 deletions lib/emails/EventRejectionMail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export default class EventRejectionMail extends EventMail {
`
</div>
<div style="text-align: center; margin-top: 20px; color: #ccc; font-size: 12px;">
<img style="opacity: 0.25; width: 120px;" src="https://app.cal.com/cal-logo-word.svg" alt="Calendso Logo"></div>
<img style="opacity: 0.25; width: 120px;" src="https://app.cal.com/cal-logo-word.svg" alt="Cal.com Logo"></div>
</body>
`
);
Expand All @@ -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(),
};
Expand Down
6 changes: 3 additions & 3 deletions lib/emails/invitation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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") +
Expand Down Expand Up @@ -53,7 +53,7 @@ const html = (invitation: any) => {
Hi,<br />
<br />` +
(invitation.from ? invitation.from + " invited you" : "You have been invited") +
` to join the team "${invitation.teamName}" in Calendso.<br />
` to join the team "${invitation.teamName}" in Cal.com.<br />
<br />
<table border="0" cellpadding="0" cellspacing="0" role="presentation" style="border-collapse:separate;line-height:100%;">
<tr>
Expand All @@ -71,7 +71,7 @@ const html = (invitation: any) => {
</td>
</tr>
</table><br />
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.
</td>
</tr>
</table>
Expand Down
2 changes: 1 addition & 1 deletion lib/emails/sendMail.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const sendEmail = ({ to, subject, text, html = null }): Promise<string | SentMes

nodemailer.createTransport(transport).sendMail(
{
from: `Calendso ${from}`,
from: `Cal.com ${from}`,
to,
subject,
text,
Expand Down
4 changes: 2 additions & 2 deletions lib/forgot-password/messaging/forgot-password.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import buildMessageTemplate from "../../emails/buildMessageTemplate";

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

export const forgotPasswordMessageTemplate = `Hey there,
Expand All @@ -9,7 +9,7 @@ Use the link below to reset your password.
p.s. It expires in 6 hours.
- Calendso`;
- Cal.com`;

export const buildForgotPasswordMessage = (vars) => {
return buildMessageTemplate({
Expand Down
2 changes: 1 addition & 1 deletion pages/api/auth/[...nextauth].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default NextAuth({
},
providers: [
Providers.Credentials({
name: "Calendso",
name: "Cal.com",
credentials: {
email: { label: "Email Address", type: "email", placeholder: "[email protected]" },
password: { label: "Password", type: "password", placeholder: "Your super secure password" },
Expand Down
2 changes: 1 addition & 1 deletion pages/auth/login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export default function Login({ csrfToken }) {
<div className="min-h-screen bg-neutral-50 flex flex-col justify-center py-12 sm:px-6 lg:px-8">
<HeadSeo title="Login" description="Login" />
<div className="sm:mx-auto sm:w-full sm:max-w-md">
<img className="h-6 mx-auto" src="/calendso-logo-white-word.svg" alt="Calendso Logo" />
<img className="h-6 mx-auto" src="/calendso-logo-white-word.svg" alt="Cal.com Logo" />
<h2 className="mt-6 text-center text-3xl font-bold text-neutral-900">Sign in to your account</h2>
</div>

Expand Down
4 changes: 2 additions & 2 deletions pages/auth/signup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -116,7 +116,7 @@ export default function Signup(props) {
/>
<a
onClick={() =>
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
Expand Down
26 changes: 13 additions & 13 deletions pages/event-types/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ const EventTypesPage = (props: PageProps) => {
return (
<div>
<Head>
<title>Event Types | Calendso</title>
<title>Event Types | Cal.com</title>
<link rel="icon" href="/favicon.ico" />
</Head>
<Shell
Expand Down Expand Up @@ -342,11 +342,11 @@ const CreateNewEventDialog = ({ profiles, canAddEvents }: { profiles: Profile[];
data-testid="new-event-type"
{...(canAddEvents
? {
href: modalOpen.hrefOn,
}
href: modalOpen.hrefOn,
}
: {
disabled: true,
})}
disabled: true,
})}
StartIcon={PlusIcon}>
New event type
</Button>
Expand All @@ -372,8 +372,8 @@ const CreateNewEventDialog = ({ profiles, canAddEvents }: { profiles: Profile[];
eventPage: profile.slug,
...(profile.teamId
? {
teamId: profile.teamId,
}
teamId: profile.teamId,
}
: {}),
},
})
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion pages/getting-started.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@ export default function Onboarding(props: OnboardingProps) {
return (
<div className="bg-black min-h-screen">
<Head>
<title>Calendso - Getting Started</title>
<title>Cal.com - Getting Started</title>
<link rel="icon" href="/favicon.ico" />
</Head>

Expand Down
2 changes: 1 addition & 1 deletion pages/integrations/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ export default function Home({ integrations }: Props) {
title="Connect to Apple Server"
subtitle={
<p>
Generate an app specific password to use with Calendso at{" "}
Generate an app specific password to use with Cal.com at{" "}
<a
className="text-indigo-400"
href="https://appleid.apple.com/account/manage"
Expand Down
4 changes: 2 additions & 2 deletions pages/settings/embed.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function Embed(props) {
<div className="py-6 lg:pb-8 lg:col-span-9">
<div className="mb-6">
<h2 className="text-lg leading-6 font-medium text-gray-900">iframe Embed</h2>
<p className="mt-1 text-sm text-gray-500">The easiest way to embed Calendso on your website.</p>
<p className="mt-1 text-sm text-gray-500">The easiest way to embed Cal.com on your website.</p>
</div>
<div className="grid grid-cols-2 space-x-4">
<div>
Expand Down Expand Up @@ -64,7 +64,7 @@ export default function Embed(props) {
</div>
</div>
<div className="my-6">
<h2 className="text-lg leading-6 font-medium text-gray-900">Calendso API</h2>
<h2 className="text-lg leading-6 font-medium text-gray-900">Cal.com API</h2>
<p className="mt-1 text-sm text-gray-500">
Leverage our API for full control and customizability.
</p>
Expand Down
Loading

0 comments on commit 96fd7ec

Please sign in to comment.