diff --git a/.env.example b/.env.example index ed0977341b..1c1126b585 100644 --- a/.env.example +++ b/.env.example @@ -8,7 +8,7 @@ BASE_URL='http://localhost:3000' # Required for Vercel hosting - set NEXTAUTH_URL to equal your BASE_URL # NEXTAUTH_URL='http://localhost:3000' -# Remove this var if you don't want Calendso to collect anonymous usage +# Remove this var if you don't want Cal to collect anonymous usage NEXT_PUBLIC_TELEMETRY_KEY=js.2pvs2bbpqq1zxna97wcml.oi2jzirnbj1ev4tc57c5r # Used for the Office 365 / Outlook.com Calendar integration @@ -21,11 +21,11 @@ ZOOM_CLIENT_SECRET= # E-mail settings -# Calendso uses nodemailer (@see https://nodemailer.com/about/) to provide email sending. As such we are trying to +# Cal uses nodemailer (@see https://nodemailer.com/about/) to provide email sending. As such we are trying to # 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 7222ca9187..136dd36c8d 100644 --- a/README.md +++ b/README.md @@ -1,49 +1,57 @@

- Logo + Logo + -

Calendso

+

Cal.com (formerly Calendso)

The open-source Calendly alternative.
- Learn more » + Learn more »

Slack · - Website + Website · Issues

- Join Calendso Slack + Join Cal.com Slack Product Hunt Github Stars Hacker News License Commits-per-month - Pricing + Pricing

## About The Project -calendso-screenshot +booking-screen -Let's face it: Calendly and other scheduling tools are awesome. It made our lives massively easier. We're using it for business meetings, seminars, yoga classes and even calls with our families. However, most tools are very limited in terms of control and customisations. That's where Calendso comes in. Self-hosted or hosted by us. White-label by design. API-driven and ready to be deployed on your own domain. Full control of your events and data. Calendso is to Calendly what GitLab is to GitHub. +# Scheduling infrastructure for absolutely everyone. + +The open source Calendly alternative. You are in charge +of your own data, workflow and appearance. + +Calendly and other scheduling tools are awesome. It made our lives massively easier. We're using it for business meetings, seminars, yoga classes and even calls with our families. However, most tools are very limited in terms of control and customisations. + +That's where Cal.com comes in. Self-hosted or hosted by us. White-label by design. API-driven and ready to be deployed on your own domain. Full control of your events and data. ### Product of the Month: April #### 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 Calendso - The open source Calendly alternative | Product Hunt +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 ### Built With @@ -54,9 +62,9 @@ Let's face it: Calendly and other scheduling tools are awesome. It made our live ## Stay Up-to-Date -Calendso is currently in alpha. Watch **releases** of this repository to be notified for future updates: +Cal officially launched as v.1.0 on 15th of September, however a lot of new features are coming. Watch **releases** of this repository to be notified for future updates: -![calendso-star-github](https://user-images.githubusercontent.com/8019099/116010176-5d9c9900-a615-11eb-92d0-aa0e892f7056.gif) +![cal-star-github](https://user-images.githubusercontent.com/8019099/116010176-5d9c9900-a615-11eb-92d0-aa0e892f7056.gif) @@ -66,7 +74,7 @@ To get a local copy up and running, please follow these simple steps. ### Prerequisites -Here is what you need to be able to run Calendso. +Here is what you need to be able to run Cal. - Node.js - PostgreSQL @@ -81,12 +89,11 @@ You will also need Google API credentials. You can get this from the [Google API > - **Requires Docker to be installed** > - Will start a local Postgres instance with a few test users - the credentials will be logged in the console - ```bash git clone git@github.com:calendso/calendso.git cd calendso yarn -yarn dx +yarn dx ``` #### Manual @@ -113,7 +120,7 @@ yarn dx 1. Create a free account with [Heroku](https://www.heroku.com/). 2. Create a new app. - Google Chrome — CleanShotX | 2021-04-20 at 02 01 56 + Create an App 3. In your new app, go to `Overview` and next to `Installed add-ons`, click `Configure Add-ons`. We need this to set up our database. ![image](https://user-images.githubusercontent.com/16905768/115323232-a53ba480-a17f-11eb-98db-58e2f8c52426.png) @@ -122,7 +129,7 @@ yarn dx ![image](https://user-images.githubusercontent.com/16905768/115323126-5beb5500-a17f-11eb-8030-7380310807a9.png) 5. Once the pop-up appears, click `Submit Order Form` - plan name should be `Hobby Dev - Free`. - Google Chrome — CleanShotX | 2021-04-20 at 02 04 29 + Submit Order Form 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) @@ -198,7 +205,7 @@ yarn dx ### Docker -The Docker configuration for Calendso is an effort powered by people within the community. Calendso does not provide official support for Docker, but we will accept fixes and documentation. Use at your own risk. +The Docker configuration for Cal is an effort powered by people within the community. Cal.com, Inc. does not provide official support for Docker, but we will accept fixes and documentation. Use at your own risk. The Docker configuration can be found [in our docker repository](https://github.com/calendso/docker). @@ -206,7 +213,7 @@ The Docker configuration can be found [in our docker repository](https://github. [![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/new/template?template=https%3A%2F%2Fgithub.com%2Fcalendso%2Fcalendso&plugins=postgresql&envs=GOOGLE_API_CREDENTIALS%2CBASE_URL%2CNEXTAUTH_URL%2CPORT&BASE_URLDefault=http%3A%2F%2Flocalhost%3A3000&NEXTAUTH_URLDefault=http%3A%2F%2Flocalhost%3A3000&PORTDefault=3000) -You can deploy Calendso on [Railway](https://railway.app/) using the button above. The team at Railway also have a [detailed blog post](https://blog.railway.app/p/calendso) on deploying Calendso on their platform. +You can deploy Cal on [Railway](https://railway.app/) using the button above. The team at Railway also have a [detailed blog post](https://blog.railway.app/p/calendso) on deploying Cal on their platform. @@ -264,7 +271,7 @@ Contributions are what make the open source community such an amazing place to b 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". -13. You're good to go. Now you can easily add your Zoom integration in the Calendso settings. +13. You're good to go. Now you can easily add your Zoom integration in the Cal.com settings. @@ -276,14 +283,12 @@ Distributed under the MIT License. See `LICENSE` for more information. ## Acknowledgements -Special thanks to these amazing projects which help power Calendso: +Special thanks to these amazing projects which help power Cal.com: -[](https://vercel.com/?utm_source=calend-so&utm_campaign=oss) +[](https://vercel.com/?utm_source=calend-so&utm_campaign=oss) - [Vercel](https://vercel.com/?utm_source=calend-so&utm_campaign=oss) - [Next.js](https://nextjs.org/) - [Day.js](https://day.js.org/) - [Tailwind CSS](https://tailwindcss.com/) - [Prisma](https://prisma.io/) - -[product-screenshot]: https://i.imgur.com/4yvFj2E.png 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/ImageUploader.tsx b/components/ImageUploader.tsx index 43a2188e0d..b76bdc6eee 100644 --- a/components/ImageUploader.tsx +++ b/components/ImageUploader.tsx @@ -1,5 +1,5 @@ import Cropper from "react-easy-crop"; -import { useState, useCallback, useRef } from "react"; +import { useCallback, useRef, useState } from "react"; import Slider from "./Slider"; export default function ImageUploader({ target, id, buttonMsg, handleAvatarChange, imageRef }) { diff --git a/components/Logo.tsx b/components/Logo.tsx index 23c26a10e4..2d99aa2eaa 100644 --- a/components/Logo.tsx +++ b/components/Logo.tsx @@ -4,8 +4,8 @@ export default function Logo({ small }: { small?: boolean }) { Calendso 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 }) => ( { // TODO: Move to translations const locationLabels = { - [LocationType.InPerson]: "In-person meeting", + [LocationType.InPerson]: "Link or In-person meeting", [LocationType.Phone]: "Phone call", [LocationType.GoogleMeet]: "Google Meet", [LocationType.Zoom]: "Zoom Video", @@ -148,7 +148,7 @@ const BookingPage = (props: any): JSX.Element => { {rescheduleUid ? "Reschedule" : "Confirm"} your {props.eventType.title} with {props.profile.name}{" "} - | Calendso + | Cal.com diff --git a/components/seo/head-seo.tsx b/components/seo/head-seo.tsx index 5155e70426..11445061bd 100644 --- a/components/seo/head-seo.tsx +++ b/components/seo/head-seo.tsx @@ -68,7 +68,7 @@ const buildSeoMeta = (pageProps: { const constructImage = (name: string, avatar: string, description: string): string => { 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) ); }; @@ -87,7 +87,7 @@ export const HeadSeo: React.FC = (props) => nextSeoProps = {}, } = props; - const pageTitle = title + " | Calendso"; + const pageTitle = title + " | Cal.com"; let seoObject = buildSeoMeta({ title: pageTitle, image, description, canonical, siteName }); if (name && avatar) { diff --git a/components/team/EditTeam.tsx b/components/team/EditTeam.tsx index cb3ffa0e5f..549dafa268 100644 --- a/components/team/EditTeam.tsx +++ b/components/team/EditTeam.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState, useRef } from "react"; +import React, { useEffect, useRef, useState } from "react"; import { ArrowLeftIcon, PlusIcon, TrashIcon } from "@heroicons/react/outline"; import ErrorAlert from "@components/ui/alerts/Error"; import { UsernameInput } from "@components/ui/UsernameInput"; @@ -242,9 +242,9 @@ export default function EditTeam(props: { team: Team | undefined | null; onClose
-

Hide all Calendso branding from your public pages.

+

Hide all Cal.com branding from your public pages.

diff --git a/components/team/TeamListItem.tsx b/components/team/TeamListItem.tsx index 10e1001009..052b82e111 100644 --- a/components/team/TeamListItem.tsx +++ b/components/team/TeamListItem.tsx @@ -1,9 +1,9 @@ import { - TrashIcon, DotsHorizontalIcon, + ExternalLinkIcon, LinkIcon, PencilAltIcon, - ExternalLinkIcon, + TrashIcon, } from "@heroicons/react/outline"; import Dropdown, { DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "../ui/Dropdown"; import { useState } from "react"; diff --git a/components/ui/Alert.tsx b/components/ui/Alert.tsx index a22ce26cf4..08deee22ff 100644 --- a/components/ui/Alert.tsx +++ b/components/ui/Alert.tsx @@ -1,4 +1,4 @@ -import { XCircleIcon, InformationCircleIcon, CheckCircleIcon } from "@heroicons/react/solid"; +import { CheckCircleIcon, InformationCircleIcon, XCircleIcon } from "@heroicons/react/solid"; import classNames from "classnames"; import { ReactNode } from "react"; diff --git a/components/ui/Dropdown.tsx b/components/ui/Dropdown.tsx index 2987ecc4e9..7f5dc8f0f8 100644 --- a/components/ui/Dropdown.tsx +++ b/components/ui/Dropdown.tsx @@ -29,7 +29,6 @@ export const DropdownMenuContent = forwardRef {children} - ); } diff --git a/components/ui/PoweredByCalendso.tsx b/components/ui/PoweredByCalendso.tsx index 1e0ce6ab23..dd75088b69 100644 --- a/components/ui/PoweredByCalendso.tsx +++ b/components/ui/PoweredByCalendso.tsx @@ -2,20 +2,20 @@ import Link from "next/link"; const PoweredByCalendso = () => (
- + powered by{" "} Calendso Logo Calendso Logo diff --git a/components/ui/Schedule/Schedule.tsx b/components/ui/Schedule/Schedule.tsx index 20e29eaa25..c70a50041e 100644 --- a/components/ui/Schedule/Schedule.tsx +++ b/components/ui/Schedule/Schedule.tsx @@ -3,6 +3,7 @@ import Text from "@components/ui/Text"; import { PlusIcon, TrashIcon } from "@heroicons/react/outline"; import dayjs, { Dayjs } from "dayjs"; import classnames from "classnames"; + export const SCHEDULE_FORM_ID = "SCHEDULE_FORM_ID"; export const toCalendsoAvailabilityFormat = (schedule: Schedule) => { return schedule; diff --git a/cypress/integration/booking-pages.spec.ts b/cypress/integration/booking-pages.spec.ts index 74657ef5fb..00437e4af2 100644 --- a/cypress/integration/booking-pages.spec.ts +++ b/cypress/integration/booking-pages.spec.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ describe("booking pages", () => { describe("free user", () => { - it("only one visibile event", () => { + it("only one visible event", () => { cy.visit("/free"); cy.get("[data-testid=event-types]").children().should("have.length", 1); cy.get('[href="/free/30min"]').should("exist"); @@ -18,7 +18,7 @@ describe("booking pages", () => { }); }); - it("/free/60min is not bookable", () => { + it.skip("/free/60min is not bookable", () => { cy.request({ method: "GET", url: "/free/60min", @@ -28,7 +28,7 @@ describe("booking pages", () => { }); }); }); - it("pro user's page has at least 2 visibile events", () => { + it("pro user's page has at least 2 visible events", () => { cy.visit("/pro"); cy.get("[data-testid=event-types]").children().should("have.length.at.least", 2); }); @@ -49,7 +49,7 @@ describe("booking pages", () => { }); }); - it("/free-first-hidden/60min is not bookable", () => { + it.skip("/free-first-hidden/60min is not bookable", () => { cy.request({ method: "GET", url: "/free-first-hidden/60min", diff --git a/ee/LICENSE b/ee/LICENSE index 41f8e610d1..f42d6e99d6 100644 --- a/ee/LICENSE +++ b/ee/LICENSE @@ -6,7 +6,7 @@ With regard to the Calendso Software: This software and associated documentation files (the "Software") may only be used in production, if you (and any entity that you represent) have agreed to, and are in compliance with, the Calendso Subscription Terms available -at https://calendso.com/terms (the “EE Terms”), or other agreements governing +at https://cal.com/terms (the “EE Terms”), or other agreements governing the use of the Software, as mutually agreed by you and Meet Technologies, Inc ("Calendso"), and otherwise have a valid Calendso Enterprise Edition subscription ("EE Subscription") for the correct number of hosts as defined in the EE Terms ("Hosts"). Subject to the foregoing sentence, diff --git a/ee/README.md b/ee/README.md index 2bea6507fe..fbd36f4c8c 100644 --- a/ee/README.md +++ b/ee/README.md @@ -1,15 +1,16 @@ -
- - Logo -
- Website +
+ + Logo + + + Get Started with Enterprise
# 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/calendarClient.ts b/lib/calendarClient.ts index 2564f843b0..14827b7089 100644 --- a/lib/calendarClient.ts +++ b/lib/calendarClient.ts @@ -5,12 +5,12 @@ import { Credential } from "@prisma/client"; import CalEventParser from "./CalEventParser"; import { EventResult } from "@lib/events/EventManager"; import logger from "@lib/logger"; - -const log = logger.getChildLogger({ prefix: ["[lib] calendarClient"] }); import { CalDavCalendar } from "./integrations/CalDav/CalDavCalendarAdapter"; import { AppleCalendar } from "./integrations/Apple/AppleCalendarAdapter"; import { VideoCallData } from "@lib/videoClient"; +const log = logger.getChildLogger({ prefix: ["[lib] calendarClient"] }); + // eslint-disable-next-line @typescript-eslint/no-var-requires const { google } = require("googleapis"); @@ -215,7 +215,9 @@ const MicrosoftOffice365Calendar = (credential): CalendarApiAdapter => { return { getAvailability: (dateFrom, dateTo, selectedCalendars) => { - const filter = "?startdatetime=" + dateFrom + "&enddatetime=" + dateTo; + const filter = `?startdatetime=${encodeURIComponent(dateFrom)}&enddatetime=${encodeURIComponent( + dateTo + )}`; return auth .getToken() .then((accessToken) => { diff --git a/lib/config/next-seo.config.ts b/lib/config/next-seo.config.ts index 669c0af454..b87f6bc430 100644 --- a/lib/config/next-seo.config.ts +++ b/lib/config/next-seo.config.ts @@ -15,7 +15,7 @@ export const seoConfig: { defaultNextSeo: DefaultSeoProps; } = { headSeo: { - siteName: "Calendso", + siteName: "Cal.com", }, defaultNextSeo: { twitter: { 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/lib/integrations/CalDav/CalDavCalendarAdapter.ts b/lib/integrations/CalDav/CalDavCalendarAdapter.ts index 0c83a74bfe..201e2b6fa1 100644 --- a/lib/integrations/CalDav/CalDavCalendarAdapter.ts +++ b/lib/integrations/CalDav/CalDavCalendarAdapter.ts @@ -1,23 +1,23 @@ -import { IntegrationCalendar, CalendarApiAdapter, CalendarEvent } from "../../calendarClient"; +import { CalendarApiAdapter, CalendarEvent, IntegrationCalendar } from "../../calendarClient"; import { symmetricDecrypt } from "@lib/crypto"; import { createAccount, - fetchCalendars, - fetchCalendarObjects, - getBasicAuthHeaders, createCalendarObject, - updateCalendarObject, deleteCalendarObject, + fetchCalendarObjects, + fetchCalendars, + getBasicAuthHeaders, + updateCalendarObject, } from "tsdav"; import { Credential } from "@prisma/client"; import ICAL from "ical.js"; -import { createEvent, DurationObject, Attendee, Person } from "ics"; +import { Attendee, createEvent, DurationObject, Person } from "ics"; import dayjs from "dayjs"; import { v4 as uuidv4 } from "uuid"; import { stripHtml } from "../../emails/helpers"; import logger from "@lib/logger"; -const log = logger.getChildLogger({ prefix: ["[[lib] caldav"] }); +const log = logger.getChildLogger({ prefix: ["[lib] caldav"] }); type EventBusyDate = Record<"start" | "end", Date>; @@ -111,7 +111,7 @@ export class CalDavCalendar implements CalendarApiAdapter { id: uid, }; } catch (reason) { - console.error(reason); + log.error(reason); throw reason; } } @@ -161,7 +161,7 @@ export class CalDavCalendar implements CalendarApiAdapter { }) ); } catch (reason) { - console.error(reason); + log.error(reason); throw reason; } } @@ -193,7 +193,7 @@ export class CalDavCalendar implements CalendarApiAdapter { }) ); } catch (reason) { - console.error(reason); + log.error(reason); throw reason; } } @@ -260,7 +260,7 @@ export class CalDavCalendar implements CalendarApiAdapter { integration: this.integrationName, })); } catch (reason) { - console.error(reason); + log.error(reason); throw reason; } } @@ -281,58 +281,59 @@ export class CalDavCalendar implements CalendarApiAdapter { headers: this.headers, }); - const events = - objects && - objects?.length > 0 && - objects - .map((object) => { - if (object?.data) { - const jcalData = ICAL.parse(object.data); - const vcalendar = new ICAL.Component(jcalData); - const vevent = vcalendar.getFirstSubcomponent("vevent"); - const event = new ICAL.Event(vevent); + if (!objects || objects?.length === 0) { + return []; + } - const calendarTimezone = vcalendar.getFirstSubcomponent("vtimezone") - ? vcalendar.getFirstSubcomponent("vtimezone").getFirstPropertyValue("tzid") - : ""; + const events = objects + .map((object) => { + if (object?.data) { + const jcalData = ICAL.parse(object.data); + const vcalendar = new ICAL.Component(jcalData); + const vevent = vcalendar.getFirstSubcomponent("vevent"); + const event = new ICAL.Event(vevent); - const startDate = calendarTimezone - ? dayjs(event.startDate).tz(calendarTimezone) - : new Date(event.startDate.toUnixTime() * 1000); - const endDate = calendarTimezone - ? dayjs(event.endDate).tz(calendarTimezone) - : new Date(event.endDate.toUnixTime() * 1000); + const calendarTimezone = vcalendar.getFirstSubcomponent("vtimezone") + ? vcalendar.getFirstSubcomponent("vtimezone").getFirstPropertyValue("tzid") + : ""; - return { - uid: event.uid, - etag: object.etag, - url: object.url, - summary: event.summary, - description: event.description, - location: event.location, - sequence: event.sequence, - startDate, - endDate, - duration: { - weeks: event.duration.weeks, - days: event.duration.days, - hours: event.duration.hours, - minutes: event.duration.minutes, - seconds: event.duration.seconds, - isNegative: event.duration.isNegative, - }, - organizer: event.organizer, - attendees: event.attendees.map((a) => a.getValues()), - recurrenceId: event.recurrenceId, - timezone: calendarTimezone, - }; - } - }) - .filter((e) => e != null); + const startDate = calendarTimezone + ? dayjs(event.startDate).tz(calendarTimezone) + : new Date(event.startDate.toUnixTime() * 1000); + const endDate = calendarTimezone + ? dayjs(event.endDate).tz(calendarTimezone) + : new Date(event.endDate.toUnixTime() * 1000); + + return { + uid: event.uid, + etag: object.etag, + url: object.url, + summary: event.summary, + description: event.description, + location: event.location, + sequence: event.sequence, + startDate, + endDate, + duration: { + weeks: event.duration.weeks, + days: event.duration.days, + hours: event.duration.hours, + minutes: event.duration.minutes, + seconds: event.duration.seconds, + isNegative: event.duration.isNegative, + }, + organizer: event.organizer, + attendees: event.attendees.map((a) => a.getValues()), + recurrenceId: event.recurrenceId, + timezone: calendarTimezone, + }; + } + }) + .filter((e) => e != null); return events; } catch (reason) { - console.error(reason); + log.error(reason); throw reason; } } diff --git a/lib/slugify.ts b/lib/slugify.ts index a0a530ef6c..c6fba1f4f0 100644 --- a/lib/slugify.ts +++ b/lib/slugify.ts @@ -1,5 +1,5 @@ export const slugify = (str: string) => { - return str.replace(/\s+/g, "-").toLowerCase(); + return str.replace(/[^a-zA-Z0-9-]/g, "-").toLowerCase(); }; export default slugify; diff --git a/package.json b/package.json index 2406db19d4..204ddb307a 100644 --- a/package.json +++ b/package.json @@ -63,7 +63,7 @@ "react-select": "^4.3.1", "react-timezone-select": "^1.0.7", "short-uuid": "^4.2.0", - "tsdav": "^1.0.6", + "tsdav": "1.0.6", "tslog": "^3.2.1", "uuid": "^8.3.2" }, diff --git a/pages/404.tsx b/pages/404.tsx index a2f79a0cc1..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", }, ]; @@ -54,9 +54,9 @@ export default function Custom404() { Check for spelling mistakes or go back to the previous page. ) : ( - - The username calendso.com{username} is still - available. Register now. + + The username cal.com{username} is still available.{" "} + Register now. )} @@ -65,9 +65,7 @@ export default function Custom404() { {!isEventType404 && (