v1.8.4

* fix: remove duplicate button in textusernamefield

* feat: adds username if not present in getting-started first onboarding step

* fix: credentials

* fix: typo

* fix: user type

* fix: type errors

* Validates successRedirectUrl earlier with zod

* Removes deprecated api endpoint

* Reduces the data needed for the frontend on onboarding

Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Omar López <zomars@me.com>

.env.appStore.example

@@ -21,7 +21,8 @@ DAILY_SCALE_PLAN=''
 #   - GOOGLE CALENDAR/MEET/LOGIN
 # Needed to enable Google Calendar integration and Login with Google
 # @see https://github.com/calendso/calendso#obtaining-the-google-api-credentials
-GOOGLE_API_CREDENTIALS='{}'
+GOOGLE_API_CREDENTIALS=
+
 # To enable Login with Google you need to:
 # 1. Set `GOOGLE_API_CREDENTIALS` above
 # 2. Set `GOOGLE_LOGIN_ENABLED` to `true`

.env.example

@@ -77,16 +77,29 @@ NEXT_PUBLIC_HELPSCOUT_KEY=
 # Inbox to send user feedback
 SEND_FEEDBACK_EMAIL=
 
+# Sengrid
+# Used for email reminders in workflows
+SENDGRID_API_KEY=
+SENDGRID_EMAIL=
+
+# Twilio
+# Used to send SMS reminders in workflows
+TWILIO_SID=
+TWILIO_TOKEN=
+TWILIO_MESSAGING_SID=
+
 # This is used so we can bypass emails in auth flows for E2E testing
 # Set it to "1" if you need to run E2E tests locally
 NEXT_PUBLIC_IS_E2E=
 
 # Used for internal billing system
-NEXT_PUBLIC_STRIPE_PRO_PLAN_PRODUCT=
 NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE=
 NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE=
 NEXT_PUBLIC_STRIPE_FREE_PLAN_PRICE=
 STRIPE_WEBHOOK_SECRET=
+STRIPE_PRO_PLAN_PRODUCT_ID=
+STRIPE_PREMIUM_PLAN_PRODUCT_ID=
+STRIPE_FREE_PLAN_PRODUCT_ID=
 
 # Use for internal Public API Keys and optional
 API_KEY_PREFIX=cal_
@@ -114,3 +127,6 @@ EMAIL_SERVER_PASSWORD='<office365_password>'
 ## @see https://support.google.com/accounts/answer/185833
 # EMAIL_SERVER_PASSWORD='<gmail_app_password>'
 # **********************************************************************************************************
+
+# Set the following value to true if you wish to enable Team Impersonation
+NEXT_PUBLIC_TEAM_IMPERSONATION=false

.github/labeler.yml

@@ -0,0 +1,5 @@
+"♻️ autoupdate":
+  - apps/web/public/static/locales/**/*.json
+
+automerge:
+  - apps/web/public/static/locales/**/*.json

.github/workflows/add-to-project.yml

@@ -0,0 +1,22 @@
+name: Add bugs to Bug Hunting
+
+on:
+  issues:
+    types:
+      - opened
+      - labeled
+  pull_request:
+    types:
+      - opened
+      - labeled
+
+jobs:
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@v0.1.0
+        with:
+          project-url: https://github.com/orgs/calcom/projects/1
+          github-token: ${{ secrets.GH_ACCESS_TOKEN }}
+          labeled: 🐛 bug, 🎨 needs design, 🙋🏻‍♂️help wanted, 🚨 urgent

.github/workflows/check-if-ui-has-changed.yml

@@ -0,0 +1,36 @@
+# .github/workflows/chromatic.yml
+
+# Workflow name
+name: 'Chromatic'
+
+# Event for the workflow
+on:
+  pull_request_target: # So we can test on forks
+    branches:
+      - main
+    paths:
+      - apps/storybook/**
+      - packages/ui/**
+  workflow_dispatch:
+
+# List of jobs
+jobs:
+  chromatic-deployment:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }} # So we can test on forks
+          fetch-depth: 0
+      - name: Install dependencies
+        run: yarn
+        # 👇 Adds Chromatic as a step in the workflow
+      - name: Publish to Chromatic
+        uses: chromaui/action@v1
+        # Options required to the GitHub Chromatic Action
+        with:
+          # 👇 Chromatic projectToken, refer to the manage page to obtain it.
+          projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
+          workingDir: "apps/storybook"
+          buildScriptName: "build"

.github/workflows/check-types.yml

@@ -3,15 +3,11 @@ on:
   pull_request_target:
     branches:
       - main
+    paths:
+      - "**.tsx?"
 jobs:
-  types:
-    name: Check types
-    strategy:
-      matrix:
-        node: ["16.x"]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
-
+  check-types:
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -19,10 +15,10 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 2
 
-      - name: Use Node ${{ matrix.node }}
+      - name: Use Node 16.x
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node }}
+          node-version: 16.x
           cache: "yarn"
       - run: yarn --frozen-lockfile
       - run: yarn type-check

.github/workflows/cron-bookingReminder.yml

@@ -7,7 +7,7 @@ on:
     # Runs “At minute 0, 15, 30, and 45.” (see https://crontab.guru)
     - cron: "0,15,30,45 * * * *"
 jobs:
-  cron:
+  cron-bookingReminder:
     env:
       APP_URL: ${{ secrets.APP_URL }}
       CRON_API_KEY: ${{ secrets.CRON_API_KEY }}

.github/workflows/cron-downgradeUsers.yml

@@ -7,7 +7,7 @@ on:
     # Runs “At minute 0, 15, 30, and 45.” (see https://crontab.guru)
     - cron: "0,15,30,45 * * * *"
 jobs:
-  cron:
+  cron-downgradeUsers:
     env:
       APP_URL: ${{ secrets.APP_URL }}
       CRON_API_KEY: ${{ secrets.CRON_API_KEY }}

.github/workflows/cron-scheduleEmailReminders.yml

@@ -0,0 +1,23 @@
+name: Cron - scheduleEmailReminders
+
+on:
+  # "Scheduled workflows run on the latest commit on the default or base branch."
+  # — https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#schedule
+  schedule:
+    # Runs “At minute 0, 15, 30, and 45.” (see https://crontab.guru)
+    - cron: "0,15,30,45 * * * *"
+jobs:
+  cron-scheduleEmailReminders:
+    env:
+      APP_URL: ${{ secrets.APP_URL }}
+      CRON_API_KEY: ${{ secrets.CRON_API_KEY }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: cURL request
+        if: ${{ env.APP_URL && env.CRON_API_KEY }}
+        run: |
+          curl ${{ secrets.APP_URL }}/api/cron/workflows/scheduleEmailReminders \
+            -X POST \
+            -H 'content-type: application/json' \
+            -H 'authorization: ${{ secrets.CRON_API_KEY }}' \
+            --fail

.github/workflows/cron-scheduleSMSReminders.yml

@@ -0,0 +1,23 @@
+name: Cron - scheduleSMSReminders
+
+on:
+  # "Scheduled workflows run on the latest commit on the default or base branch."
+  # — https://docs.github.com/en/actions/learn-github-actions/events-that-trigger-workflows#schedule
+  schedule:
+    # Runs “At minute 0, 15, 30, and 45.” (see https://crontab.guru)
+    - cron: "0,15,30,45 * * * *"
+jobs:
+  cron-scheduleSMSReminders:
+    env:
+      APP_URL: ${{ secrets.APP_URL }}
+      CRON_API_KEY: ${{ secrets.CRON_API_KEY }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: cURL request
+        if: ${{ env.APP_URL && env.CRON_API_KEY }}
+        run: |
+          curl ${{ secrets.APP_URL }}/api/cron/workflows/scheduleSMSReminders \
+            -X POST \
+            -H 'content-type: application/json' \
+            -H 'authorization: ${{ secrets.CRON_API_KEY }}' \
+            --fail

.github/workflows/db-staging-snapshot.yml

@@ -0,0 +1,18 @@
+name: Staging DB Snapshot
+on:
+  schedule:
+    - cron: "0 4 * * 1-5" # At 04:00 on every day-of-week from Monday through Friday.
+  workflow_dispatch:
+jobs:
+  db-staging-snapshot:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Snaplet CLI
+        run: curl -sL https://app.snaplet.dev/get-cli/ | bash
+      - name: Restore Snapshot
+        run: snaplet snapshot restore -y
+        env:
+          SNAPLET_DATABASE_URL: ${{ secrets.SNAPLET_DATA_TARGET_DB_URL }}
+          SNAPLET_ACCESS_TOKEN: ${{ secrets.SNAPLET_ACCESS_TOKEN }}
+          SNAPLET_DATABASE_ID: ${{ secrets.SNAPLET_DATABASE_ID }}

.github/workflows/e2e-app-store.yml

@@ -0,0 +1,99 @@
+name: E2E App-Store Apps
+on:
+  push:
+    branches: [ feature/event-routing ]
+  pull_request_target: # So we can test on forks
+    branches:
+      - main
+    paths-ignore:
+      - apps/api/**
+      - apps/console/**
+      - apps/docs/**
+      - apps/swagger/**
+      - apps/website/**
+      - apps/web/public/**
+jobs:
+  test:
+    timeout-minutes: 20
+    name: E2E App-Store Apps
+    strategy:
+      matrix:
+        node: ["16.x"]
+        os: [ubuntu-latest]
+    runs-on: ${{ matrix.os }}
+
+    env:
+      DATABASE_URL: postgresql://postgres:@localhost:5432/calendso
+      NEXT_PUBLIC_WEBAPP_URL: http://localhost:3000
+      NEXT_PUBLIC_WEBSITE_URL: http://localhost:3000
+      NEXTAUTH_SECRET: secret
+      GOOGLE_API_CREDENTIALS: ${{ secrets.CI_GOOGLE_API_CREDENTIALS }}
+      GOOGLE_LOGIN_ENABLED: true
+      # CRON_API_KEY: xxx
+      CALENDSO_ENCRYPTION_KEY: ${{ secrets.CI_CALENDSO_ENCRYPTION_KEY }}
+      NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${{ secrets.CI_NEXT_PUBLIC_STRIPE_PUBLIC_KEY }}
+      STRIPE_PRIVATE_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
+      STRIPE_CLIENT_ID: ${{ secrets.CI_STRIPE_CLIENT_ID }}
+      STRIPE_WEBHOOK_SECRET: ${{ secrets.CI_STRIPE_WEBHOOK_SECRET }}
+      PAYMENT_FEE_PERCENTAGE: 0.005
+      PAYMENT_FEE_FIXED: 10
+      SAML_DATABASE_URL: postgresql://postgres:@localhost:5432/calendso
+      SAML_ADMINS: pro@example.com
+      NEXTAUTH_URL: http://localhost:3000/api/auth
+      NEXT_PUBLIC_IS_E2E: 1
+      # EMAIL_FROM: e2e@cal.com
+      # EMAIL_SERVER_HOST: ${{ secrets.CI_EMAIL_SERVER_HOST }}
+      # EMAIL_SERVER_PORT: ${{ secrets.CI_EMAIL_SERVER_PORT }}
+      # EMAIL_SERVER_USER: ${{ secrets.CI_EMAIL_SERVER_USER }}
+      # EMAIL_SERVER_PASSWORD: ${{ secrets.CI_EMAIL_SERVER_PASSWORD }}
+      # MS_GRAPH_CLIENT_ID: xxx
+      # MS_GRAPH_CLIENT_SECRET: xxx
+      # ZOOM_CLIENT_ID: xxx
+      # ZOOM_CLIENT_SECRET: xxx
+      TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
+      TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
+    services:
+      postgres:
+        image: postgres:12.1
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_DB: calendso
+        ports:
+          - 5432:5432
+
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.sha }} # So we can test on forks
+          fetch-depth: 2
+      - run: echo 'NODE_OPTIONS="--max_old_space_size=4096"' >> $GITHUB_ENV
+      - name: Use Node ${{ matrix.node }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node }}
+          cache: "yarn"
+
+      - name: Cache playwright binaries
+        uses: actions/cache@v2
+        id: playwright-cache
+        with:
+          path: |
+            ~/Library/Caches/ms-playwright
+            ~/.cache/ms-playwright
+            ${{ github.workspace }}/node_modules/playwright
+          key: cache-playwright-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: cache-playwright-
+      - run: yarn --frozen-lockfile
+      - name: Install playwright deps
+        # if: steps.playwright-cache.outputs.cache-hit != 'true'
+        run: yarn playwright install --with-deps
+      - name: Run Tests
+        run: yarn app-e2e-quick
+
+      - name: Upload Test Results
+        if: ${{ always() }}
+        uses: actions/upload-artifact@v2
+        with:
+          name: test-results-core
+          path: packages/app-store/**/playwright/results

.github/workflows/e2e-embed.yml

@@ -1,27 +1,16 @@
-name: E2E tests Embed
+name: E2E Embed tests and booking flow(for non-embed as well)
 on:
   pull_request_target: # So we can test on forks
     branches:
       - main
     # Embed e2e - tests verify booking flow which is applicable to non-embed case also. So, don't ignore apps/web changes.
-    paths-ignore:
-      - apps/api/**
-      - apps/console/**
-      - apps/docs/**
-      - apps/swagger/**
-      - apps/website/**
-      - apps/web/public/**
-      - tests/**
-      - playwright/**
+    paths:
+      - apps/web/**
+      - packages/embeds/**
 jobs:
-  test:
+  e2e-embed:
     timeout-minutes: 20
-    name: Embed and booking flow(for non-embed as well)
-    strategy:
-      matrix:
-        node: ["16.x"]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     env:
       DATABASE_URL: postgresql://postgres:@localhost:5432/calendso
@@ -33,6 +22,9 @@ jobs:
       # CRON_API_KEY: xxx
       CALENDSO_ENCRYPTION_KEY: ${{ secrets.CI_CALENDSO_ENCRYPTION_KEY }}
       NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${{ secrets.CI_NEXT_PUBLIC_STRIPE_PUBLIC_KEY }}
+      NEXT_PUBLIC_STRIPE_FREE_PLAN_PRICE: ${{ secrets.CI_NEXT_PUBLIC_STRIPE_FREE_PLAN_PRICE }}
+      NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE: ${{ secrets.CI_NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE }}
+      NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE: ${{ secrets.CI_NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE }}
       STRIPE_PRIVATE_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
       STRIPE_CLIENT_ID: ${{ secrets.CI_STRIPE_CLIENT_ID }}
       STRIPE_WEBHOOK_SECRET: ${{ secrets.CI_STRIPE_WEBHOOK_SECRET }}
@@ -69,10 +61,10 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }} # So we can test on forks
           fetch-depth: 2
       - run: echo 'NODE_OPTIONS="--max_old_space_size=4096"' >> $GITHUB_ENV
-      - name: Use Node ${{ matrix.node }}
+      - name: Use Node 16.x
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node }}
+          node-version: 16.x
           cache: "yarn"
 
       - name: Cache playwright binaries

.github/workflows/e2e.yml

@@ -3,17 +3,13 @@ on:
   pull_request_target: # So we can test on forks
     branches:
       - main
-    paths-ignore:
-      - apps/web/public/static/locales/**
+    paths:
+      - apps/web/**
+      - packages/**
 jobs:
-  test:
+  e2e:
     timeout-minutes: 20
-    name: Testing ${{ matrix.node }} and ${{ matrix.os }}
-    strategy:
-      matrix:
-        node: ["16.x"]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     env:
       DATABASE_URL: postgresql://postgres:@localhost:5432/calendso
@@ -25,9 +21,15 @@ jobs:
       # CRON_API_KEY: xxx
       CALENDSO_ENCRYPTION_KEY: ${{ secrets.CI_CALENDSO_ENCRYPTION_KEY }}
       NEXT_PUBLIC_STRIPE_PUBLIC_KEY: ${{ secrets.CI_NEXT_PUBLIC_STRIPE_PUBLIC_KEY }}
+      NEXT_PUBLIC_STRIPE_FREE_PLAN_PRICE: ${{ secrets.CI_NEXT_PUBLIC_STRIPE_FREE_PLAN_PRICE }}
+      NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE: ${{ secrets.CI_NEXT_PUBLIC_STRIPE_PRO_PLAN_PRICE }}
+      NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE: ${{ secrets.CI_NEXT_PUBLIC_STRIPE_PREMIUM_PLAN_PRICE }}
       STRIPE_PRIVATE_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
       STRIPE_CLIENT_ID: ${{ secrets.CI_STRIPE_CLIENT_ID }}
       STRIPE_WEBHOOK_SECRET: ${{ secrets.CI_STRIPE_WEBHOOK_SECRET }}
+      STRIPE_PRO_PLAN_PRODUCT_ID: ${{ secrets.CI_STRIPE_PRO_PLAN_PRODUCT_ID }}
+      STRIPE_PREMIUM_PLAN_PRODUCT_ID: ${{ secrets.CI_STRIPE_PREMIUM_PLAN_PRODUCT_ID }}
+      STRIPE_FREE_PLAN_PRODUCT_ID: ${{ secrets.CI_STRIPE_FREE_PLAN_PRODUCT_ID }}
       PAYMENT_FEE_PERCENTAGE: 0.005
       PAYMENT_FEE_FIXED: 10
       SAML_DATABASE_URL: postgresql://postgres:@localhost:5432/calendso
@@ -61,10 +63,10 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }} # So we can test on forks
           fetch-depth: 2
       - run: echo 'NODE_OPTIONS="--max_old_space_size=4096"' >> $GITHUB_ENV
-      - name: Use Node ${{ matrix.node }}
+      - name: Use Node 16.x
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node }}
+          node-version: 16.x
           cache: "yarn"
 
       - name: Cache playwright binaries

.github/workflows/labeler.yml

@@ -0,0 +1,17 @@
+name: "Pull Request Labeler"
+on:
+  - pull_request_target
+
+jobs:
+  labeler:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/labeler@v4
+        # Checking the actor will prevent your Action run failing on non-Dependabot
+        # PRs but also ensures that it only does work for Dependabot PRs.
+        if: ${{ github.actor == 'github-actions[bot]' }}
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/lint.yml

@@ -3,13 +3,12 @@ on:
   pull_request_target:
     branches:
       - main
+    paths:
+      - "**.tsx?"
+      - "**.jsx?"
 jobs:
   lint:
-    strategy:
-      matrix:
-        node: ["16.x"]
-        os: [ubuntu-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repo
@@ -18,10 +17,10 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 2
 
-      - name: Use Node ${{ matrix.node }}
+      - name: Use Node 16.x
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node }}
+          node-version: 16.x
           cache: "yarn"
 
       - name: Install deps
@@ -36,10 +35,11 @@ jobs:
         run: jq -s '[.[]]|flatten' lint-results/*.json &> lint-results/eslint_report.json
 
       - name: Annotate Code Linting Results
-        uses: ataylorme/eslint-annotate-action@1.2.0
+        uses: ataylorme/eslint-annotate-action@v2
         with:
-          repo-token: "${{ secrets.GITHUB_TOKEN }}"
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
           report-json: "lint-results/eslint_report.json"
+          only-pr-files: false
 
       - name: Upload ESLint report
         if: ${{ always() }}

.github/workflows/required-checks.yml

@@ -0,0 +1,36 @@
+name: "Meta Workflow: Require Conditional Status Checks"
+on:
+  pull_request:
+    branches:
+      - main
+jobs:
+  required-checks:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Ensure All Conditional Checks Have Passed
+        uses: blend/require-conditional-status-checks@2022.02.04
+        with:
+          timeout: 15m
+          github-token: ${{ github.token }}
+          interval: 20s
+          # Question marks aren't working
+          # @see https://github.com/blend/require-conditional-status-checks/pull/11
+          checks-yaml: |
+            - job: lint
+              paths:
+                - /**/*.jsx
+                - /**/*.js
+                - /**/*.tsx
+                - /**/*.ts
+            - job: check-types
+              paths:
+                - /**/*.tsx
+                - /**/*.ts
+            - job: e2e
+              paths:
+                - /apps/web/**
+                - /packages/**
+            - job: e2e-embed
+              paths:
+                - /apps/web/**
+                - /packages/embeds/**

.github/workflows/submodule-sync.yml

@@ -3,7 +3,6 @@ on:
   schedule:
     - cron: "15 */4 * * *"
   workflow_dispatch: ~
-
 jobs:
   submodule-sync:
     name: Submodule update
@@ -11,11 +10,11 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v2
-      - name: run action
-        uses: releasehub-com/github-action-create-pr-parent-submodule@v1
         with:
-          github_token: ${{ secrets.GH_ACCESS_TOKEN }}
-          parent_repository: "calcom/cal.com"
-          checkout_branch: "main"
-          pr_against_branch: "main"
-          owner: "calcom"
+          submodules: recursive
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+      - name: Commit
+        run: |
+          git config user.email "actions@github.com"
+          git config user.name "github-actions"
+          git commit -am "Auto updated submodule references" && git push || echo "No changes to commit"

.gitignore

@@ -73,6 +73,9 @@ dist
 # Linting
 lint-results
 
+#Storybook
+apps/storybook/build-storybook.log
+
 # Snaplet
 .snaplet/snapshots
 .snaplet/structure.d.ts

.kodiak.toml

@@ -4,5 +4,4 @@ version = 1
 autoupdate_label = "♻️ autoupdate"
 
 [approve]
-auto_approve_usernames = ["dependabot"]
-
+auto_approve_usernames = ["dependabot", "github-actions"]

.snaplet/transform.ts

@@ -1,7 +1,7 @@
 // This transform config was generated by Snaplet.
 // Snaplet found fields that may contain personally identifiable information (PII)
 // and used that to populate this file.
-import { copycat } from "@snaplet/copycat";
+import { copycat as c } from "@snaplet/copycat";
 
 import type { Transform } from "./structure";
 
@@ -11,13 +11,13 @@ function hasStringProp<T extends string>(x: unknown, key: T): x is { [key in T]:
 
 function replaceKeyIfExists<T extends string>(x: object, key: T) {
   if (hasStringProp(x, key)) {
-    return { ...x, [key]: copycat.uuid(x[key]) };
+    return { ...x, [key]: c.uuid(x[key]) };
   }
   return x;
 }
 
 function generateSlug(x: string) {
-  return copycat.words(x, { max: 3 }).split(" ").join("-");
+  return c.words(x, { max: 3 }).split(" ").join("-");
 }
 
 function replaceSensitiveKeys(record: object) {
@@ -39,57 +39,57 @@ function replaceSensitiveKeys(record: object) {
   };
 }
 
+const generateUsername = (x: string) => `${c.firstName(x)}-${c.lastName(x)}${c.int(x, { min: 2, max: 99 })}`;
+
 const config: Transform = () => ({
   public: {
-    _user_eventtype: ({ row }) => ({
-      A: copycat.int(row.A),
-      B: copycat.int(row.B),
-    }),
     ApiKey: ({ row }) => ({
-      note: copycat.sentence(row.note),
+      hashedKey: c.uuid(row.hashedKey),
     }),
     App: ({ row }) => ({
       keys: replaceSensitiveKeys(row.keys),
     }),
     Attendee: ({ row }) => ({
-      email: copycat.email(row.email),
-      name: copycat.fullName(row.name),
-      timeZone: copycat.timezone(row.timeZone),
-    }),
-    Availability: ({ row }) => ({
-      // date: copycat.fullName(row.date),
+      email: c.email(row.email),
+      name: c.fullName(row.name),
+      timeZone: c.timezone(row.timeZone),
     }),
     Credential: ({ row }) => ({
-      key: typeof row.key === "string" ? copycat.uuid(row.key) : replaceSensitiveKeys(row.key),
+      key: typeof row.key === "string" ? c.uuid(row.key) : replaceSensitiveKeys(row.key),
     }),
     EventType: ({ row }) => ({
       slug: generateSlug(row.slug),
-      timeZone: copycat.timezone(row.timeZone),
-    }),
-    Feedback: ({ row }) => ({
-      // date: copycat.dateString(row.date),
+      timeZone: c.timezone(row.timeZone),
+      eventName: c.words(row.eventName, { max: 3 }),
     }),
     ResetPasswordRequest: ({ row }) => ({
-      email: copycat.email(row.email),
+      email: c.email(row.email),
     }),
     Schedule: ({ row }) => ({
-      timeZone: copycat.timezone(row.timeZone),
+      timeZone: c.timezone(row.timeZone),
     }),
     Team: ({ row }) => ({
-      bio: copycat.sentence(row.bio),
-      name: copycat.words(row.name, { max: 2 }),
+      bio: c.sentence(row.bio),
+      name: c.words(row.name, { max: 2 }),
       slug: generateSlug(row.slug),
     }),
-    users: ({ row }) => ({
-      bio: copycat.sentence(row.bio),
-      email: copycat.email(row.email),
-      name: copycat.fullName(row.name),
-      password: copycat.password(row.password),
-      timeZone: copycat.timezone(row.timeZone),
-      username: generateSlug(row.username),
-    }),
+    users: ({ row }) =>
+      row.role !== "ADMIN"
+        ? {
+            bio: c.sentence(row.bio),
+            email: c.email(row.email),
+            name: c.fullName(row.name),
+            password: c.password(row.password),
+            timeZone: c.timezone(row.timeZone),
+            username: generateUsername(row.username),
+          }
+        : row,
     VerificationToken: ({ row }) => ({
-      token: copycat.uuid(row.token),
+      token: c.uuid(row.token),
+    }),
+    Account: ({ row }) => ({
+      access_token: c.uuid(row.access_token),
+      refresh_token: c.uuid(row.refresh_token),
     }),
   },
 });

.vscode/tasks.json

@@ -22,10 +22,6 @@
       "group": {
         "kind": "build",
         "isDefault": true
-      },
-      // Try start the task on folder open
-      "runOptions": {
-        "runOn": "folderOpen"
       }
     },
     {

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contributing to Cal.com
 
-Contributions are what make the open source community such an amazing place to be learn, inspire, and create. Any contributions you make are **greatly appreciated**.
+Contributions are what make the open source community such an amazing place to learn, inspire, and create. Any contributions you make are **greatly appreciated**.
 
 - Before jumping into a PR be sure to search [existing PRs](https://github.com/calcom/cal.com/pulls) or [issues](https://github.com/calcom/cal.com/issues) for an open or closed item that relates to your submission.
 

README.md

@@ -26,6 +26,7 @@
 <p align="center">
    <a href="https://cal.com/slack"><img src="https://img.shields.io/badge/Slack-calendso.slack.com-%234A154B" alt="Join Cal.com Slack"></a>
    <a href="https://www.producthunt.com/posts/calendso"><img src="https://img.shields.io/badge/Product%20Hunt-%231%20Product%20of%20the%20Month-%23DA552E" alt="Product Hunt"></a>
+   <a href="https://status.cal.com"><img src="https://betteruptime.com/status-badges/v1/monitor/a9kf.svg" alt="Uptime"></a>
    <a href="https://github.com/calcom/cal.com/stargazers"><img src="https://img.shields.io/github/stars/calcom/cal.com" alt="Github Stars"></a>
    <a href="https://news.ycombinator.com/item?id=26817795"><img src="https://img.shields.io/badge/Hacker%20News-311-%23FF6600" alt="Hacker News"></a>
    <a href="https://github.com/calcom/cal.com/blob/main/LICENSE"><img src="https://img.shields.io/badge/license-AGPLv3-purple" alt="License"></a>
@@ -36,6 +37,8 @@
    <a href="https://hub.docker.com/r/calendso/calendso"><img src="https://img.shields.io/docker/pulls/calendso/calendso"></a>
    <a href="https://twitter.com/calcom"><img src="https://img.shields.io/twitter/follow/calcom?style=flat"></a>
    <a href="https://twitch.tv/calcomtv"><img src="https://img.shields.io/twitch/status/calcomtv?style=flat"></a>
+   <a href="https://github.com/orgs/calcom/projects/1/views/25"><img src="https://img.shields.io/badge/Help%20Wanted-Contribute-blue"></a>
+   <a href="https://cal.com/figma"><img src="https://img.shields.io/badge/Figma-Design%20System-blueviolet"></a>
    <a href="https://calendso.slack.com/archives/C02BY67GMMW"><img src="https://img.shields.io/badge/translations-contribute-brightgreen" /></a>
    <a href="https://www.contributor-covenant.org/version/1/4/code-of-conduct/ "><img src="https://img.shields.io/badge/Contributor%20Covenant-1.4-purple" /></a>
 </p>
@@ -44,7 +47,7 @@
 
 ## About The Project
 
-<img width="100%" alt="booking-screen" src="https://user-images.githubusercontent.com/8019099/134363898-4b29e18f-3e61-42b7-95bc-10891056249d.gif">
+<img width="100%" alt="booking-screen" src="https://user-images.githubusercontent.com/8019099/176390354-f1bc7069-0341-437a-9bb8-eb41092b4016.gif">
 
 # Scheduling infrastructure for absolutely everyone
 
@@ -84,7 +87,7 @@ To get a local copy up and running, please follow these simple steps.
 
 Here is what you need to be able to run Cal.
 
-- Node.js (Version: >=14.x <17)
+- Node.js (Version: >=15.x <17)
 - PostgreSQL
 - Yarn _(recommended)_
 
@@ -94,7 +97,7 @@ Here is what you need to be able to run Cal.
 
 ### Setup
 
-1. Clone the repo into a public GitHub repository (to comply with AGPLv3. To clone in a private repository, [acquire a commercial license](https://cal.com/sales))
+1. Clone the repo into a public GitHub repository (or fork https://github.com/calcom/cal.com/fork). If you plan to distribute the code, keep the source code public to comply with [AGPLv3](https://github.com/calcom/cal.com/blob/main/LICENSE). To clone in a private repository, [acquire a commercial license](https://cal.com/sales))
 
    ```sh
    git clone https://github.com/calcom/cal.com.git
@@ -167,7 +170,7 @@ echo 'NEXT_PUBLIC_DEBUG=1' >> .env
    </details>
 
 1. Set a 32 character random string in your .env file for the `CALENDSO_ENCRYPTION_KEY` (You can use a command like `openssl rand -base64 24` to generate one).
-1. Set up the database using the Prisma schema (found in `apps/web/prisma/schema.prisma`)
+1. Set up the database using the Prisma schema (found in `packages/prisma/schema.prisma`)
 
    ```sh
    yarn workspace @calcom/prisma db-deploy
@@ -189,7 +192,7 @@ echo 'NEXT_PUBLIC_DEBUG=1' >> .env
 
 1. Click on the `User` model to add a new user record.
 1. Fill out the fields `email`, `username`, `password`, and set `metadata` to empty `{}` (remembering to encrypt your password with [BCrypt](https://bcrypt-generator.com/)) and click `Save 1 Record` to create your first user.
-   > New users are set on a `TRIAL` plan by default. You might want to adjust this behavior to your needs in the `apps/web/prisma/schema.prisma` file.
+   > New users are set on a `TRIAL` plan by default. You might want to adjust this behavior to your needs in the `packages/prisma/schema.prisma` file.
 1. Open a browser to [http://localhost:3000](http://localhost:3000) and login with your just created, first user.
 
 ### E2E-Testing
@@ -278,11 +281,19 @@ The Docker configuration can be found [in our docker repository](https://github.
 
 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.
 
+### Vercel
+
+Currently Vercel Pro Plan is required to be able to Deploy this application with Vercel, due to limitations on the number of serverless functions on the free plan.
+
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fcalcom%2Fcal.com&env=DATABASE_URL,NEXT_PUBLIC_WEBAPP_URL,NEXTAUTH_URL,NEXTAUTH_SECRET,CRON_API_KEY,CALENDSO_ENCRYPTION_KEY,NEXT_PUBLIC_LICENSE_CONSENT&envDescription=See%20all%20available%20env%20vars&envLink=https%3A%2F%2Fgithub.com%2Fcalcom%2Fcal.com%2Fblob%2Fmain%2F.env.example&project-name=cal&repo-name=cal.com&build-command=cd%20../..%20%26%26%20yarn%20build&root-directory=apps%2Fweb%2F)
+
 <!-- ROADMAP -->
 
 ## Roadmap
 
-See the [roadmap project](https://github.com/orgs/calcom/projects/1) for a list of proposed features (and known issues). You can change the view to see planned tagged releases.
+<a href="https://cal.com/roadmap"><img src="https://user-images.githubusercontent.com/8019099/176388295-25081ca4-207e-4468-8079-37b195fa8e59.png" alt="Cal.com Roadmap" /></a>
+
+See the [roadmap project](https://cal.com/roadmap) for a list of proposed features (and known issues). You can change the view to see planned tagged releases.
 
 <!-- CONTRIBUTING -->
 
@@ -292,7 +303,7 @@ Please see our [contributing guide](/CONTRIBUTING.md).
 
 ### Good First Issues
 
-We have a list of [good first issues](https://github.com/calcom/cal.com/labels/✅%20good%20first%20issue) that contain bugs which have a relatively limited scope. This is a great place to get started, gain experience, and get familiar with our contribution process.
+We have a list of [help wanted](https://github.com/orgs/calcom/projects/1/views/25) that contain small features and bugs which have a relatively limited scope. This is a great place to get started, gain experience, and get familiar with our contribution process.
 
 ## Integrations
 
@@ -418,6 +429,31 @@ Next make sure you have your app running `yarn dx`. Then in the slack chat type
 1. Select all events for the webhook you interested, e.g. `sleep_created`
 1. Copy the webhook secret (`sec...`) to `VITAL_WEBHOOK_SECRET` in the .env.appStore file.
 
+## Workflows
+
+### Setting up SendGrid for Email reminders
+
+1. Create a SendGrid account (https://signup.sendgrid.com/)
+2. Go to Settings -> API keys and create an API key
+3. Copy API key to your .env file into the SENDGRID_API_KEY field
+4. Go to Settings -> Sender Authentication and verify a single sender
+5. Copy the verified E-Mail to your .env file into the SENDGRID_EMAIL field
+
+### Setting up Twilio for SMS reminders
+
+1. Create a Twilio account (https://www.twilio.com/try-twilio)
+2. Click ‘Get a Twilio phone number’
+3. Copy Account SID to your .env file into the TWILIO_SID field
+4. Copy Auth Token to your .env file into the TWILIO_TOKEN field
+5. Create a messaging service (Develop -> Messaging -> Services)
+6. Choose any name for the messaging service
+7. Click 'Add Senders'
+8. Choose phone number as sender type
+9. Add the listed phone number
+10. Leave all other fields as they are
+11. Complete setup and click ‘View my new Messaging Service’
+12. Copy Messaging Service SID to your .env file into the TWILIO_MESSAGING_SID field
+
 <!-- LICENSE -->
 
 ## License

SECURITY.md

@@ -0,0 +1,39 @@
+# Security
+
+Contact: security@cal.com
+
+Based on [https://supabase.com/.well-known/security.txt](https://supabase.com/.well-known/security.txt)
+
+At Cal.com, we consider the security of our systems a top priority. But no matter how much effort we put into system security, there can still be vulnerabilities present.
+
+If you discover a vulnerability, we would like to know about it so we can take steps to address it as quickly as possible. We would like to ask you to help us better protect our clients and our systems.
+
+## Out of scope vulnerabilities:
+
+- Clickjacking on pages with no sensitive actions.
+- Unauthenticated/logout/login CSRF.
+- Attacks requiring MITM or physical access to a user's device.
+- Any activity that could lead to the disruption of our service (DoS).
+- Content spoofing and text injection issues without showing an attack vector/without being able to modify HTML/CSS.
+- Email spoofing
+- Missing DNSSEC, CAA, CSP headers
+- Lack of Secure or HTTP only flag on non-sensitive cookies
+- Deadlinks
+
+## Please do the following:
+
+- E-mail your findings to [security@cal.com](mailto:security@cal.com).
+- Do not run automated scanners on our infrastructure or dashboard. If you wish to do this, contact us and we will set up a sandbox for you.
+- Do not take advantage of the vulnerability or problem you have discovered, for example by downloading more data than necessary to demonstrate the vulnerability or deleting or modifying other people's data,
+- Do not reveal the problem to others until it has been resolved,
+- Do not use attacks on physical security, social engineering, distributed denial of service, spam or applications of third parties,
+- Do provide sufficient information to reproduce the problem, so we will be able to resolve it as quickly as possible. Usually, the IP address or the URL of the affected system and a description of the vulnerability will be sufficient, but complex vulnerabilities may require further explanation.
+
+## What we promise:
+
+- We will respond to your report within 3 business days with our evaluation of the report and an expected resolution date,
+- If you have followed the instructions above, we will not take any legal action against you in regard to the report,
+- We will handle your report with strict confidentiality, and not pass on your personal details to third parties without your permission,
+- We will keep you informed of the progress towards resolving the problem,
+- In the public information concerning the problem reported, we will give your name as the discoverer of the problem (unless you desire otherwise), and
+- We strive to resolve all problems as quickly as possible, and we would like to play an active role in the ultimate publication on the problem after it is resolved.

apps/docs/package.json

@@ -4,19 +4,20 @@
   "description": "",
   "main": "index.js",
   "scripts": {
+    "build": "next build",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
     "dev": "PORT=4000 next",
     "lint": "next lint",
-    "type-check": "tsc --pretty --noEmit",
+    "lint:fix": "eslint . --ext .ts,.js,.tsx,.jsx --fix",
     "lint:report": "eslint . --format json --output-file ../../lint-results/docs.json",
     "start": "PORT=4000 next start",
-    "build": "next build"
+    "type-check": "tsc --pretty --noEmit"
   },
   "author": "Cal.com, Inc.",
   "license": "MIT",
   "dependencies": {
     "iframe-resizer-react": "^1.1.0",
-    "next": "^12.1.6",
+    "next": "^12.2.0",
     "nextra": "^1.1.0",
     "nextra-theme-docs": "^1.2.2",
     "react": "^18.1.0",

apps/docs/pages/developer/code-styling.mdx

@@ -10,10 +10,10 @@ We use a number of style guides written by other amazing companies, simply becau
 We don't expect you to study every single rule of each style guide, but these are great reference points as to how your code should be styled. We may reject a pull request if your code style significantly differs from these style guides however.
 
 ## ESLint & Prettier
-Calendso uses the ESLint and Prettier formatting tools, and the repository comes with defined rules for each tool. We recommend setting up both tools and using these to help automatically style your code to our guidelines.
+Cal.com uses the ESLint and Prettier formatting tools, and the repository comes with defined rules for each tool. We recommend setting up both tools and using these to help automatically style your code to our guidelines.
 
 ## JavaScript/TypeScript
-We use the [Airbnb JavaScript Style Guide](https://github.com/airbnb/javascript) for all JavaScript and Typescript code.
+We use the [Airbnb JavaScript Style Guide](https://github.com/airbnb/javascript) for all JavaScript and TypeScript code.
 
 ## HTML & CSS
 We use the [Google HTML/CSS Style Guide](https://google.github.io/styleguide/htmlcssguide.html) for any HTML and CSS markup. However, exceptions to the HTML guide apply where JSX differentiates from standard HTML.

apps/docs/pages/integrations/google.mdx

@@ -25,7 +25,7 @@ To remove a product from your account that isn't listed in your Google Account,
 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 two URIs `<CALENDSO URL>/api/integrations/googlecalendar/callback` and `<CALENDSO URL>/api/auth/callback/google` replacing CALENDSO 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.
 

apps/docs/pages/self-hosting/vercel.mdx

@@ -18,7 +18,7 @@ You need a PostgresDB database hosted somewhere. [Heroku](https://www.heroku.com
    git clone https://github.com/<your-fork>/cal.com.git
    ```
 
-2. Copy the `.env.example` file in `apps/web`, rename it to `.env` and fill it with your settings ([See manual setup](https://github.com/calcom/cal.com#manual) and [Obtaining the Google API Credentials](https://github.com/calcom/cal.com#obtaining-the-google-api-credentials))
+2. Copy the `.env.example` file in `apps/web`, rename it to `.env` and fill it with your settings ([See manual setup](https://github.com/calcom/cal.com#manual-setup) and [Obtaining the Google API Credentials](https://github.com/calcom/cal.com#obtaining-the-google-api-credentials))
 
 3. Install packages with `yarn`
 

apps/docs/theme.config.js

@@ -1,3 +1,5 @@
+import { SEO_IMG_DEFAULT, DOCS_URL } from "@calcom/lib/constants";
+
 const themeConfig = {
   github: "https://github.com/calcom/cal.com",
   docsRepositoryBase: "https://github.com/calcom/cal.com/blob/main/apps/docs/pages",
@@ -18,11 +20,11 @@ const themeConfig = {
         content="Explore advice and explanations for all of our features, and discover new tips and tricks to get the most out of your subscription."
       />
       <meta name="twitter:card" content="summary_large_image" />
-      <meta name="twitter:image" content="https://cal.com/og-image.png" />
+      <meta name="twitter:image" content={SEO_IMG_DEFAULT} />
       <meta name="twitter:site:domain" content="docs.cal.com" />
-      <meta name="twitter:url" content="https://docs.cal.com" />
+      <meta name="twitter:url" content={DOCS_URL} />
       <meta name="og:title" content="Cal.com Documentation" />
-      <meta name="og:image" content="https://cal.com/og-image.png" />
+      <meta name="og:image" content={SEO_IMG_DEFAULT} />
       <meta name="apple-mobile-web-app-title" content="Cal.com Docs" />
 
       <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />

apps/storybook/.gitignore

@@ -0,0 +1,37 @@
+# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
+
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# next.js
+/.next/
+/out/
+
+# production
+/build
+
+# misc
+.DS_Store
+*.pem
+
+# debug
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+.pnpm-debug.log*
+
+# local env files
+.env*.local
+
+# vercel
+.vercel
+
+# typescript
+*.tsbuildinfo
+
+storybook-static/

apps/storybook/.storybook/main.js

@@ -0,0 +1,57 @@
+const path = require("path");
+
+module.exports = {
+  stories: ["../stories/**/*.stories.mdx", "../stories/**/*.stories.@(js|jsx|ts|tsx)"],
+  addons: [
+    "@storybook/addon-links",
+    "@storybook/addon-essentials",
+    "@storybook/addon-interactions",
+    "storybook-addon-designs",
+    "@storybook/addon-a11y",
+    "storybook-addon-next",
+  ],
+  framework: "@storybook/react",
+  core: {
+    builder: "webpack5",
+  },
+  webpackFinal: async (config) => {
+    /**
+     * Fixes font import with /
+     * @see https://github.com/storybookjs/storybook/issues/12844#issuecomment-867544160
+     */
+    config.resolve.roots = [path.resolve(__dirname, "../public"), "node_modules"];
+
+    /**
+     * Why webpack5... Just why?
+     * @type {{console: boolean, process: boolean, timers: boolean, os: boolean, querystring: boolean, sys: boolean, fs: boolean, url: boolean, crypto: boolean, path: boolean, zlib: boolean, punycode: boolean, util: boolean, stream: boolean, assert: boolean, string_decoder: boolean, domain: boolean, vm: boolean, tty: boolean, http: boolean, buffer: boolean, constants: boolean, https: boolean, events: boolean}}
+     */
+    config.resolve.fallback = {
+      fs: false,
+      assert: false,
+      buffer: false,
+      console: false,
+      constants: false,
+      crypto: false,
+      domain: false,
+      events: false,
+      http: false,
+      https: false,
+      os: false,
+      path: false,
+      punycode: false,
+      process: false,
+      querystring: false,
+      stream: false,
+      string_decoder: false,
+      sys: false,
+      timers: false,
+      tty: false,
+      url: false,
+      util: false,
+      vm: false,
+      zlib: false,
+    };
+
+    return config;
+  },
+};

apps/storybook/.storybook/preview-head.html

@@ -0,0 +1,8 @@
+<script>
+  window.isEmbed = ()=> {
+    return location.search.includes("embed=")
+  }
+</script>
+<style>
+  @import url('https://fonts.googleapis.com/css2?family=Inter:wght@500&display=swap');
+</style>

apps/storybook/.storybook/preview.js

@@ -0,0 +1,24 @@
+import { RouterContext } from "next/dist/shared/lib/router-context";
+import * as NextImage from "next/image";
+
+import "../styles/globals.css";
+
+const OriginalNextImage = NextImage.default;
+
+Object.defineProperty(NextImage, "default", {
+  configurable: true,
+  value: (props) => <OriginalNextImage {...props} unoptimized />,
+});
+
+export const parameters = {
+  actions: { argTypesRegex: "^on[A-Z].*" },
+  controls: {
+    matchers: {
+      color: /(background|color)$/i,
+      date: /Date$/,
+    },
+  },
+  nextRouter: {
+    Provider: RouterContext.Provider,
+  },
+};

apps/storybook/README.md

@@ -0,0 +1,21 @@
+# Storybook & UI
+
+Storybook is home to all of our commonly used components. We use this app to visually show all components that we have within the project + automatic type documentation generated for each component.
+
+All changes to storybook/ui must require a visual/code review.
+
+- Visual reviews happen on a tool called [Chormatic](http://chromatic.com/) and these reviews will happen by our product team.
+
+- Code reviews happen as normal on any changes to storybook/ui designs
+
+## Deployment
+
+To deploy this project run
+
+```bash
+  cd apps/storybook
+```
+
+```bash
+  yarn dev
+```

apps/storybook/next-env.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="next" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/basic-features/typescript for more information.

apps/storybook/next.config.js

@@ -0,0 +1,7 @@
+const withTM = require("next-transpile-modules")(["@calcom/dayjs", "@calcom/ui"]);
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  reactStrictMode: true,
+};
+
+module.exports = withTM(nextConfig);

apps/storybook/package.json

@@ -0,0 +1,63 @@
+{
+  "name": "@calcom/storybook",
+  "version": "0.1.0",
+  "private": true,
+  "scripts": {
+    "dev:next": "next dev",
+    "build:next": "next build",
+    "start": "next start",
+    "lint": "next lint",
+    "lint:report": "eslint . --format json --output-file ../../lint-results/storybook.json",
+    "dev": "start-storybook -p 6006",
+    "build": "build-storybook",
+    "chromatic": "npx chromatic --project-token=56fadc9ab496"
+  },
+  "dependencies": {
+    "@calcom/dayjs": "*",
+    "@calcom/ui": "*",
+    "@radix-ui/react-avatar": "^0.1.4",
+    "@radix-ui/react-collapsible": "^0.1.0",
+    "@radix-ui/react-dialog": "^0.1.0",
+    "@radix-ui/react-dropdown-menu": "^0.1.1",
+    "@radix-ui/react-id": "^0.1.0",
+    "@radix-ui/react-radio-group": "^0.1.1",
+    "@radix-ui/react-slider": "^0.1.1",
+    "@radix-ui/react-switch": "^0.1.1",
+    "@radix-ui/react-tooltip": "^0.1.0",
+    "next": "^12.2.0",
+    "next-transpile-modules": "^9.0.0",
+    "react": "18.1.0",
+    "react-dom": "18.1.0",
+    "react-feather": "^2.0.9",
+    "react-hot-toast": "^2.2.0"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.18.6",
+    "@calcom/config": "*",
+    "@storybook/addon-a11y": "^6.5.9",
+    "@storybook/addon-actions": "^6.5.9",
+    "@storybook/addon-essentials": "^6.5.9",
+    "@storybook/addon-interactions": "^6.5.9",
+    "@storybook/addon-links": "^6.5.9",
+    "@storybook/addon-postcss": "^2.0.0",
+    "@storybook/builder-webpack5": "^6.5.9",
+    "@storybook/manager-webpack5": "^6.5.9",
+    "@storybook/react": "^6.5.9",
+    "@types/node": "16.9.1",
+    "@types/react": "18.0.9",
+    "@types/react-dom": "18.0.4",
+    "autoprefixer": "^10.4.7",
+    "babel-loader": "^8.2.5",
+    "chromatic": "^6.6.4",
+    "eslint": "^8.15.0",
+    "postcss": "^8.4.13",
+    "postcss-loader": "^7.0.0",
+    "storybook-addon-designs": "^6.3.1",
+    "storybook-addon-next": "^1.6.7",
+    "tailwindcss": "^3.1.3",
+    "tsconfig-paths-webpack-plugin": "^3.5.2",
+    "typescript": "^4.6.4"
+  },
+  "readme": "ERROR: No README data found!",
+  "_id": "@calcom/storybook@0.1.0"
+}

apps/storybook/pages/_app.tsx

@@ -0,0 +1,9 @@
+import type { AppProps } from "next/app";
+
+import "../styles/globals.css";
+
+function MyApp({ Component, pageProps }: AppProps) {
+  return <Component {...pageProps} />;
+}
+
+export default MyApp;

apps/storybook/pages/index.tsx

@@ -0,0 +1,63 @@
+import type { NextPage } from "next";
+import Head from "next/head";
+import Image from "next/image";
+
+const Home: NextPage = () => {
+  return (
+    <div className={styles.container}>
+      <Head>
+        <title>Create Next App</title>
+        <meta name="description" content="Generated by create next app" />
+        <link rel="icon" href="/favicon.ico" />
+      </Head>
+
+      <main className={styles.main}>
+        <h1 className={styles.title}>
+          Welcome to <a href="https://nextjs.org">Next.js!</a>
+        </h1>
+
+        <p className={styles.description}>
+          Get started by editing <code className={styles.code}>pages/index.tsx</code>
+        </p>
+
+        <div className={styles.grid}>
+          <a href="https://nextjs.org/docs" className={styles.card}>
+            <h2>Documentation &rarr;</h2>
+            <p>Find in-depth information about Next.js features and API.</p>
+          </a>
+
+          <a href="https://nextjs.org/learn" className={styles.card}>
+            <h2>Learn &rarr;</h2>
+            <p>Learn about Next.js in an interactive course with quizzes!</p>
+          </a>
+
+          <a href="https://github.com/vercel/next.js/tree/canary/examples" className={styles.card}>
+            <h2>Examples &rarr;</h2>
+            <p>Discover and deploy boilerplate example Next.js projects.</p>
+          </a>
+
+          <a
+            href="https://vercel.com/new?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app"
+            className={styles.card}>
+            <h2>Deploy &rarr;</h2>
+            <p>Instantly deploy your Next.js site to a public URL with Vercel.</p>
+          </a>
+        </div>
+      </main>
+
+      <footer className={styles.footer}>
+        <a
+          href="https://vercel.com?utm_source=create-next-app&utm_medium=default-template&utm_campaign=create-next-app"
+          target="_blank"
+          rel="noopener noreferrer">
+          Powered by{" "}
+          <span className={styles.logo}>
+            <Image src="/vercel.svg" alt="Vercel Logo" width={72} height={16} />
+          </span>
+        </a>
+      </footer>
+    </div>
+  );
+};
+
+export default Home;

apps/storybook/postcss.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+};

apps/storybook/public/vercel.svg

@@ -0,0 +1,4 @@
+<svg width="283" height="64" viewBox="0 0 283 64" fill="none" 
+    xmlns="http://www.w3.org/2000/svg">
+    <path d="M141.04 16c-11.04 0-19 7.2-19 18s8.96 18 20 18c6.67 0 12.55-2.64 16.19-7.09l-7.65-4.42c-2.02 2.21-5.09 3.5-8.54 3.5-4.79 0-8.86-2.5-10.37-6.5h28.02c.22-1.12.35-2.28.35-3.5 0-10.79-7.96-17.99-19-17.99zm-9.46 14.5c1.25-3.99 4.67-6.5 9.45-6.5 4.79 0 8.21 2.51 9.45 6.5h-18.9zM248.72 16c-11.04 0-19 7.2-19 18s8.96 18 20 18c6.67 0 12.55-2.64 16.19-7.09l-7.65-4.42c-2.02 2.21-5.09 3.5-8.54 3.5-4.79 0-8.86-2.5-10.37-6.5h28.02c.22-1.12.35-2.28.35-3.5 0-10.79-7.96-17.99-19-17.99zm-9.45 14.5c1.25-3.99 4.67-6.5 9.45-6.5 4.79 0 8.21 2.51 9.45 6.5h-18.9zM200.24 34c0 6 3.92 10 10 10 4.12 0 7.21-1.87 8.8-4.92l7.68 4.43c-3.18 5.3-9.14 8.49-16.48 8.49-11.05 0-19-7.2-19-18s7.96-18 19-18c7.34 0 13.29 3.19 16.48 8.49l-7.68 4.43c-1.59-3.05-4.68-4.92-8.8-4.92-6.07 0-10 4-10 10zm82.48-29v46h-9V5h9zM36.95 0L73.9 64H0L36.95 0zm92.38 5l-27.71 48L73.91 5H84.3l17.32 30 17.32-30h10.39zm58.91 12v9.69c-1-.29-2.06-.49-3.2-.49-5.81 0-10 4-10 10V51h-9V17h9v9.2c0-5.08 5.91-9.2 13.2-9.2z" fill="#000"/>
+</svg>

apps/storybook/stories/Avatar.stories.tsx

@@ -0,0 +1,26 @@
+import { ComponentMeta } from "@storybook/react";
+
+import Avatar from "@calcom/ui/v2/Avatar";
+
+export default {
+  title: "Avatar",
+  component: Avatar,
+} as ComponentMeta<typeof Avatar>;
+
+export const Default = () => {
+  return (
+    <>
+      <Avatar size="sm" alt="Avatar Story" gravatarFallbackMd5="Ui@CAL.com" />
+      <Avatar size="lg" alt="Avatar Story" gravatarFallbackMd5="Ui@CAL.com" />
+    </>
+  );
+};
+
+export const Accepted = () => {
+  return (
+    <>
+      <Avatar size="sm" alt="Avatar Story" gravatarFallbackMd5="Ui@CAL.com" accepted />
+      <Avatar size="lg" alt="Avatar Story" gravatarFallbackMd5="Ui@CAL.com" accepted />
+    </>
+  );
+};

apps/storybook/stories/AvatarGroup.stories.tsx

@@ -0,0 +1,60 @@
+import { ComponentMeta } from "@storybook/react";
+
+import Avatar from "@calcom/ui/v2/Avatar";
+import AvatarGroup from "@calcom/ui/v2/AvatarGroup";
+
+export default {
+  title: "Avatar/Group",
+  component: AvatarGroup,
+} as ComponentMeta<typeof AvatarGroup>;
+
+const IMAGES = [
+  {
+    image: "https://cal.com/stakeholder/peer.jpg",
+    alt: "Peer",
+    title: "Peer Richelsen",
+  },
+  {
+    image: "https://cal.com/stakeholder/bailey.jpg",
+    alt: "Bailey",
+    title: "Bailey Pumfleet",
+  },
+  {
+    image: "https://cal.com/stakeholder/alex-van-andel.jpg",
+    alt: "Alex",
+    title: "Alex Van Andel",
+  },
+  {
+    image: "https://cal.com/stakeholder/ciaran.jpg",
+    alt: "Ciarán",
+    title: "Ciarán Hanrahan",
+  },
+  {
+    image: "https://cal.com/stakeholder/peer.jpg",
+    alt: "Peer",
+    title: "Peer Richelsen",
+  },
+  {
+    image: "https://cal.com/stakeholder/bailey.jpg",
+    alt: "Bailey",
+    title: "Bailey Pumfleet",
+  },
+  {
+    image: "https://cal.com/stakeholder/alex-van-andel.jpg",
+    alt: "Alex",
+    title: "Alex Van Andel",
+  },
+  {
+    image: "https://cal.com/stakeholder/ciaran.jpg",
+    alt: "Ciarán",
+    title: "Ciarán Hanrahan",
+  },
+];
+
+export const Default = () => {
+  return (
+    <>
+      <AvatarGroup size="lg" items={IMAGES} />
+    </>
+  );
+};

apps/storybook/stories/Badge.stories.tsx

@@ -0,0 +1,58 @@
+import { ComponentMeta } from "@storybook/react";
+import { Bell } from "react-feather";
+
+import { Badge } from "@calcom/ui/v2";
+
+export default {
+  title: "Badge",
+  component: Badge,
+} as ComponentMeta<typeof Badge>;
+
+export const All = () => (
+  <div className="">
+    <h1>Default</h1>
+    <div className="mb-4 flex space-x-2">
+      <Badge variant="gray">Badge</Badge>
+      <Badge variant="red">Badge</Badge>
+      <Badge variant="green">Badge</Badge>
+      <Badge variant="orange">Badge</Badge>
+      <Badge variant="blue">Badge</Badge>
+    </div>
+    <h1>Icons</h1>
+    <div className="mb-4 flex space-x-2">
+      <Badge variant="gray" StartIcon={Bell}>
+        Badge
+      </Badge>
+      <Badge variant="red" StartIcon={Bell}>
+        Badge
+      </Badge>
+      <Badge variant="green" StartIcon={Bell}>
+        Badge
+      </Badge>
+      <Badge variant="orange" StartIcon={Bell}>
+        Badge
+      </Badge>
+      <Badge variant="blue" StartIcon={Bell}>
+        Badge
+      </Badge>
+    </div>
+    <h1>Large</h1>
+    <div className="flex space-x-2">
+      <Badge variant="gray" size="lg">
+        Badge
+      </Badge>
+      <Badge variant="red" size="lg">
+        Badge
+      </Badge>
+      <Badge variant="green" size="lg">
+        Badge
+      </Badge>
+      <Badge variant="orange" size="lg">
+        Badge
+      </Badge>
+      <Badge variant="blue" size="lg">
+        Badge
+      </Badge>
+    </div>
+  </div>
+);

apps/storybook/stories/Banner.stories.tsx

@@ -0,0 +1,46 @@
+import { ComponentStory, ComponentMeta } from "@storybook/react";
+import { Info } from "react-feather";
+
+import { Banner } from "@calcom/ui/v2";
+
+export default {
+  title: "Banner",
+  component: Banner,
+} as ComponentMeta<typeof Banner>;
+
+export const Default = () => {
+  return (
+    <Banner
+      variant="neutral"
+      title="Summarise what happened"
+      description="Describe what can be done about it here."
+      Icon={Info}
+      onDismiss={() => console.log("dismissed")}
+    />
+  );
+};
+
+export const Warning = () => {
+  return (
+    <Banner
+      variant="warning"
+      title="Summarise what happened"
+      description="Describe what can be done about it here."
+      Icon={Info}
+      onDismiss={() => console.log("dismissed")}
+    />
+  );
+};
+
+export const Error = () => {
+  return (
+    <Banner
+      variant="error"
+      title="Summarise what happened"
+      description="Describe what can be done about it here."
+      errorMessage="Event creation failed"
+      Icon={Info}
+      onDismiss={() => console.log("dismissed")}
+    />
+  );
+};

apps/storybook/stories/Breadcrumb.stories.tsx

@@ -0,0 +1,22 @@
+import { ComponentMeta } from "@storybook/react";
+
+import { Breadcrumb, BreadcrumbItem } from "@calcom/ui/v2";
+
+export default {
+  title: "Breadcrumbs",
+  component: Breadcrumb,
+} as ComponentMeta<typeof Breadcrumb>;
+
+export const Default = () => (
+  <Breadcrumb>
+    <BreadcrumbItem href="/">Home</BreadcrumbItem>
+    <BreadcrumbItem href="/">Test</BreadcrumbItem>
+  </Breadcrumb>
+);
+
+Default.parameters = {
+  nextRouter: {
+    path: "/test",
+    asPath: "/test",
+  },
+};

apps/storybook/stories/Button.stories.tsx

@@ -0,0 +1,95 @@
+import { ComponentMeta, ComponentStory } from "@storybook/react";
+import { Trash2 } from "react-feather";
+
+import { Button as ButtonComponent } from "@calcom/ui/v2";
+
+export default {
+  title: "Button",
+  component: ButtonComponent,
+  argTypes: {
+    color: {
+      options: ["primary", "secondary", "minimal", "destructive"],
+      control: { type: "select" },
+    },
+    disabled: {
+      options: [true, false],
+      control: { type: "boolean" },
+    },
+    loading: {
+      options: [true, false],
+      control: { type: "boolean" },
+    },
+    size: {
+      options: ["base", "lg", "icon"],
+      control: { type: "radio" },
+    },
+  },
+} as ComponentMeta<typeof ButtonComponent>;
+
+const Template: ComponentStory<typeof ButtonComponent> = (args) => <ButtonComponent {...args} />;
+
+export const All = () => (
+  <div>
+    <h1>Primary</h1>
+    <div className="flex space-x-2">
+      <ButtonComponent aria-label="Button Text">Button Text</ButtonComponent>
+      <ButtonComponent disabled aria-label="Button Text">
+        Button Text
+      </ButtonComponent>
+    </div>
+    <h1>Secondary</h1>
+    <div className="flex space-x-2">
+      <ButtonComponent color="secondary" aria-label="Button Text">
+        Button Text
+      </ButtonComponent>
+      <ButtonComponent disabled color="secondary" aria-label="Button Text">
+        Button Text
+      </ButtonComponent>
+      <ButtonComponent size="icon" color="secondary" StartIcon={Trash2} aria-label="Button Text" />
+    </div>
+    <h1>Minimal</h1>
+    <div className="flex">
+      <ButtonComponent color="minimal" aria-label="Button Text">
+        Button Text
+      </ButtonComponent>
+      <ButtonComponent disabled color="minimal" aria-label="Button Text">
+        Button Text
+      </ButtonComponent>
+      <ButtonComponent size="icon" color="minimal" StartIcon={Trash2} aria-label="Button Text" />
+    </div>
+    <h1>Destructive</h1>
+    <ButtonComponent size="icon" color="destructive" StartIcon={Trash2} aria-label="Button Text" />
+    <h1>Tooltip</h1>
+    <ButtonComponent
+      tooltip="Deletes EventTypes"
+      size="icon"
+      color="destructive"
+      StartIcon={Trash2}
+      aria-label="Button Text"
+    />
+  </div>
+);
+
+export const Button = Template.bind({});
+Button.args = {
+  color: "primary",
+  children: "Button Text",
+};
+
+export const Disabled = Template.bind({});
+Disabled.args = {
+  ...Button.args,
+  disabled: true,
+};
+
+export const Loading = Template.bind({});
+Loading.args = {
+  ...Button.args,
+  loading: true,
+};
+export const Icon = Template.bind({});
+Icon.args = {
+  color: "secondary",
+  StartIcon: Trash2,
+  size: "icon",
+};

apps/storybook/stories/ButtonGroup.stories.tsx

@@ -0,0 +1,31 @@
+import { ComponentMeta } from "@storybook/react";
+import { ArrowLeft, ArrowRight, Clipboard, Navigation2, Trash2 } from "react-feather";
+
+import { Button, ButtonGroup } from "@calcom/ui/v2";
+
+export default {
+  title: "Button Group",
+  component: ButtonGroup,
+} as ComponentMeta<typeof ButtonGroup>;
+
+export const Default = () => (
+  <ButtonGroup>
+    <Button StartIcon={Trash2} size="icon" color="secondary" />
+    <Button StartIcon={Navigation2} size="icon" color="secondary" />
+    <Button StartIcon={Clipboard} size="icon" color="secondary" />
+  </ButtonGroup>
+);
+
+export const Combined = () => (
+  <div className="flex flex-col space-y-2">
+    <ButtonGroup combined>
+      <Button StartIcon={Trash2} size="icon" color="secondary" combined />
+      <Button StartIcon={Navigation2} size="icon" color="secondary" combined />
+      <Button StartIcon={Clipboard} size="icon" color="secondary" combined />
+    </ButtonGroup>
+    <ButtonGroup combined>
+      <Button StartIcon={ArrowLeft} size="icon" color="secondary" combined />
+      <Button StartIcon={ArrowRight} size="icon" color="secondary" combined />
+    </ButtonGroup>
+  </div>
+);

apps/storybook/stories/Cards.stories.tsx

@@ -0,0 +1,53 @@
+import { ComponentMeta } from "@storybook/react";
+
+import { BaseCardProps, Card } from "@calcom/ui/v2/Card";
+
+export default {
+  title: "Cards",
+  component: Card,
+} as ComponentMeta<typeof Card>;
+
+const profileProps: BaseCardProps[] = [
+  {
+    variant: "ProfileCard",
+    title: "Alex Fisher",
+    image:
+      "https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80",
+    description: "Co-founder at Attio. Book a meeting to discuss enterprise deals.",
+  },
+  {
+    variant: "ProfileCard",
+    title: "Julian Wan",
+    image:
+      "https://images.unsplash.com/photo-1570295999919-56ceb5ecca61?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1760&q=80",
+    description: "Co-founder at Attio. Book a meeting to discuss enterprise deals.",
+  },
+];
+
+export const Profile = () => {
+  return (
+    <div className="flex w-full space-x-2 bg-gray-200 p-4">
+      <Card {...profileProps[0]} />
+      <Card {...profileProps[1]} />
+    </div>
+  );
+};
+
+const appStoreProps: BaseCardProps = {
+  variant: "AppStore",
+  title: "Giphy",
+  image: "https://app.cal.com/api/app-store/giphy/icon.svg",
+  description: "Add GIFs to spice up your booking confirmations.",
+  actionButton: {
+    href: "#",
+    child: "View Details",
+  },
+};
+
+export const AppStore = () => {
+  return (
+    <div className="w-full bg-gray-200 p-4">
+      <Card {...appStoreProps} />
+    </div>
+  );
+};

apps/storybook/stories/Checkbox.stories.tsx

@@ -0,0 +1,31 @@
+import { ComponentMeta } from "@storybook/react";
+
+import { Checkbox } from "@calcom/ui/v2";
+
+export default {
+  title: "Checkbox",
+  component: Checkbox,
+} as ComponentMeta<typeof Checkbox>;
+
+export const All = () => (
+  <div className="flex flex-col space-y-2">
+    <Checkbox label="Default" description="Toggle on and off something" />
+    <Checkbox label="Error" description="Toggle on and off something" error />
+    <Checkbox label="Disabled" description="Toggle on and off something" disabled />
+    <Checkbox label="Disabled Checked" description="Toggle on and off something" checked disabled />
+    <hr />
+    <Checkbox description="Default" descriptionAsLabel />
+    <Checkbox description="Error" descriptionAsLabel error />
+    <Checkbox description="Disabled" descriptionAsLabel disabled />
+    <Checkbox description="Disabled" descriptionAsLabel disabled checked />
+  </div>
+);
+
+export const CheckboxField = () => <Checkbox description="Default" descriptionAsLabel />;
+export const CheckboxError = () => <Checkbox description="Error" descriptionAsLabel />;
+export const CheckboxDisabled = () => (
+  <>
+    <Checkbox description="Disabled" descriptionAsLabel disabled />
+    <Checkbox description="Disabled" descriptionAsLabel disabled checked />
+  </>
+);

apps/storybook/stories/Colors.stories.tsx

@@ -0,0 +1,208 @@
+import { useState } from "react";
+
+import ColorPicker from "@calcom/ui/v2/colorpicker";
+
+// eslint-disable-next-line import/no-anonymous-default-export
+export default {
+  title: "Colors",
+  component: ColorPicker,
+};
+const COLORS = {
+  brand: {
+    50: "#f3f3f4",
+    100: "#e7e8e9",
+    200: "#c4c5c9",
+    300: "#a0a3a9",
+    400: "#585d68",
+    500: "#111827", // Brand color
+    600: "#0f1623",
+    700: "#0d121d",
+    800: "#0a0e17",
+    900: "#080c13",
+  },
+  gray: {
+    50: "#F8F8F8",
+    100: "#F5F5F5",
+    200: "#E1E1E1",
+    300: "#CFCFCF",
+    400: "#ACACAC",
+    500: "#888888",
+    600: "#494949",
+    700: "#3E3E3E",
+    800: "#313131",
+    900: "#292929",
+  },
+  neutral: {
+    50: "#F8F8F8",
+    100: "#F5F5F5",
+    200: "#E1E1E1",
+    300: "#CFCFCF",
+    400: "#ACACAC",
+    500: "#888888",
+    600: "#494949",
+    700: "#3E3E3E",
+    800: "#313131",
+    900: "#292929",
+  },
+  primary: {
+    50: "#F4F4F4",
+    100: "#E8E8E8",
+    200: "#C6C6C6",
+    300: "#A3A3A3",
+    400: "#5F5F5F",
+    500: "#1A1A1A",
+    600: "#171717",
+    700: "#141414",
+    800: "#101010",
+    900: "#0D0D0D",
+  },
+  secondary: {
+    50: "#F5F8F7",
+    100: "#EBF0F0",
+    200: "#CDDAD9",
+    300: "#AEC4C2",
+    400: "#729894",
+    500: "#356C66",
+    600: "#30615C",
+    700: "#28514D",
+    800: "#20413D",
+    900: "#223B41",
+  },
+  red: {
+    50: "#FEF2F2",
+    100: "#FEE2E2",
+    200: "#FECACA",
+    300: "#FCA5A5",
+    400: "#F87171",
+    500: "#EF4444",
+    600: "#DC2626",
+    700: "#B91C1C",
+    800: "#991B1B",
+    900: "#7F1D1D",
+  },
+  orange: {
+    50: "#FFF7ED",
+    100: "#FFEDD5",
+    200: "#FED7AA",
+    300: "#FDBA74",
+    400: "#FB923C",
+    500: "#F97316",
+    600: "#EA580C",
+    700: "#C2410C",
+    800: "#9A3412",
+    900: "#7C2D12",
+  },
+  green: {
+    50: "#ECFDF5",
+    100: "#D1FAE5",
+    200: "#A7F3D0",
+    300: "#6EE7B7",
+    400: "#34D399",
+    500: "#10B981",
+    600: "#059669",
+    700: "#047857",
+    800: "#065F46",
+    900: "#064E3B",
+  },
+};
+export const All = () => {
+  return (
+    <div className="w-full">
+      <div>
+        {Object.keys(COLORS.brand).map((color) => (
+          <div className="flex flex-row space-x-2" key={COLORS.brand[color]}>
+            <div className="w-full">Brand</div>
+            <div className="w-full">{color}</div>
+            <div className="w-full">{COLORS.brand[color]}</div>
+            <div
+              style={{
+                backgroundColor: COLORS.brand[color],
+                width: "100%",
+                height: "32px",
+              }}
+            />
+          </div>
+        ))}
+        <hr />
+        {Object.keys(COLORS.gray).map((color) => (
+          <div className="flex flex-row space-x-2" key={COLORS.gray[color]}>
+            <div className="w-full">gray</div>
+            <div className="w-full">{color}</div>
+            <div className="w-full">{COLORS.gray[color]}</div>
+            <div
+              style={{
+                backgroundColor: COLORS.gray[color],
+                width: "100%",
+                height: "32px",
+              }}
+            />
+          </div>
+        ))}
+        <hr />
+        {Object.keys(COLORS.secondary).map((color) => (
+          <div className="flex flex-row space-x-2" key={COLORS.secondary[color]}>
+            <div className="w-full">secondary</div>
+            <div className="w-full">{color}</div>
+            <div className="w-full">{COLORS.secondary[color]}</div>
+            <div
+              style={{
+                backgroundColor: COLORS.secondary[color],
+                width: "100%",
+                height: "32px",
+              }}
+            />
+          </div>
+        ))}
+        <hr />
+        {Object.keys(COLORS.red).map((color) => (
+          <div className="flex flex-row space-x-2" key={COLORS.red[color]}>
+            <div className="w-full">red</div>
+            <div className="w-full">{color}</div>
+            <div className="w-full">{COLORS.red[color]}</div>
+            <div
+              style={{
+                backgroundColor: COLORS.red[color],
+                width: "100%",
+                height: "32px",
+              }}
+            />
+          </div>
+        ))}
+        <hr />
+        {Object.keys(COLORS.orange).map((color) => (
+          <div className="flex flex-row space-x-2" key={COLORS.orange[color]}>
+            <div className="w-full">orange</div>
+            <div className="w-full">{color}</div>
+            <div className="w-full">{COLORS.orange[color]}</div>
+            <div
+              style={{
+                backgroundColor: COLORS.orange[color],
+                width: "100%",
+                height: "32px",
+              }}
+            />
+          </div>
+        ))}
+        <hr />
+        {Object.keys(COLORS.green).map((color) => (
+          <div className="flex flex-row space-x-2" key={COLORS.green[color]}>
+            <div className="w-full">green</div>
+            <div className="w-full">{color}</div>
+            <div className="w-full">{COLORS.green[color]}</div>
+            <div
+              style={{
+                backgroundColor: COLORS.green[color],
+                width: "100%",
+                height: "32px",
+              }}
+            />
+          </div>
+        ))}
+      </div>
+    </div>
+  );
+};
+export const ColorPickerComponent = () => {
+  const [color, setColor] = useState("3B82F6");
+  return <ColorPicker defaultValue={color} onChange={(val) => setColor(val)} />;
+};

apps/storybook/stories/DatePicker.stories.tsx

@@ -0,0 +1,17 @@
+import { useState } from "react";
+
+import DatePicker from "@calcom/ui/v2/booker/DatePicker";
+
+export default {
+  title: "Datepicker",
+  component: DatePicker,
+};
+
+export const Default = () => {
+  const [selected, setSelected] = useState<Date | undefined>(undefined);
+  return (
+    <div style={{ width: "455px" }}>
+      <DatePicker selected={selected} onChange={setSelected} locale="en" />
+    </div>
+  );
+};

apps/storybook/stories/EmptyScreen.stories.tsx

@@ -0,0 +1,26 @@
+import { ComponentMeta } from "@storybook/react";
+import { Bell } from "react-feather";
+
+import { EmptyScreen as EmptyScreenPattern } from "@calcom/ui/v2";
+
+export default {
+  title: "pattern/Empty Screen",
+  component: EmptyScreenPattern,
+  decorators: [
+    (Story) => (
+      <div className="flex items-center justify-center">
+        <Story />
+      </div>
+    ),
+  ],
+} as ComponentMeta<typeof EmptyScreenPattern>;
+
+export const EmptyScreenS = () => (
+  <EmptyScreenPattern
+    Icon={Bell}
+    headline="Empty State Header"
+    description="Ullamco dolor nulla sint nulla occaecat aliquip id elit fugiat et excepteur magna. Nisi tempor anim do tempor irure fugiat ad occaecat. Mollit ea eiusmod pariatur sunt deserunt eu eiusmod. Sit reprehenderit cupidatat consequat commodo in aliqua ea et. Et quis sit enim proident dolor mollit consectetur tempor dolore reprehenderit consequat adipisicing reprehenderit officia. Sint eu sunt fugiat laborum Lorem irure aute nulla et. Do non in enim ipsum ea."
+    buttonText="Veniam ut ipsum"
+    buttonOnClick={() => console.log("Button Clicked")}
+  />
+);

apps/storybook/stories/FormStep.stories.tsx

@@ -0,0 +1,27 @@
+import { ComponentMeta } from "@storybook/react";
+import { useState } from "react";
+
+import { FormStep } from "@calcom/ui/v2";
+
+export default {
+  title: "Form Step",
+  component: FormStep,
+} as ComponentMeta<typeof FormStep>;
+
+export const Default = () => {
+  const STEPS = 4;
+  const [currentStep, setCurrentStep] = useState(1);
+  return (
+    <div className="flex flex-col items-center justify-center space-y-14 p-20">
+      <div className="w-1/2">
+        <FormStep steps={STEPS} currentStep={currentStep} />
+        <div className="flex space-x-2 pt-4">
+          <button onClick={() => currentStep - 1 > 0 && setCurrentStep((old) => old - 1)}>Previous</button>
+          <button onClick={() => currentStep + 1 < STEPS + 1 && setCurrentStep((old) => old + 1)}>
+            Next
+          </button>
+        </div>
+      </div>
+    </div>
+  );
+};

apps/storybook/stories/HorizontalTab.stories.tsx

@@ -0,0 +1,30 @@
+// Disabling until we figure out what is happening with the RouterMock.
+import { ComponentMeta } from "@storybook/react";
+
+import { HorizontalTabs } from "@calcom/ui/v2/navigation/tabs";
+import { HorizontalTabItemProps } from "@calcom/ui/v2/navigation/tabs/HorizontalTabItem";
+
+export default {
+  title: "Horizontal Tabs",
+  component: HorizontalTabs,
+} as ComponentMeta<typeof HorizontalTabs>;
+
+const HorizontalTabsPropsDefault: HorizontalTabItemProps[] = [
+  {
+    name: "Tab One",
+    href: "/tab-one",
+  },
+];
+
+export const Default = () => (
+  <div className="w-full p-4" style={{ backgroundColor: "#F9FAFB" }}>
+    <HorizontalTabs tabs={HorizontalTabsPropsDefault} />
+  </div>
+);
+
+Default.parameters = {
+  nextRouter: {
+    path: "/[page]",
+    asPath: "/profile",
+  },
+};

apps/storybook/stories/Input.stories.tsx

@@ -0,0 +1,68 @@
+import { ComponentMeta, ComponentStory } from "@storybook/react";
+import { Copy } from "react-feather";
+
+import DatePicker from "@calcom/ui/v2/form/DatePicker";
+import { TextAreaField, TextField } from "@calcom/ui/v2/form/fields";
+
+export default {
+  title: "Inputs",
+  component: TextField,
+  argTypes: {
+    disabled: {
+      options: [false, true],
+    },
+  },
+} as ComponentMeta<typeof TextField>;
+
+const TextInputTemplate: ComponentStory<typeof TextField> = (args) => <TextField {...args} />;
+// name="demo" label="Demo Label" hint="Hint text"
+export const TextInput = TextInputTemplate.bind({});
+TextInput.args = {
+  name: "demo",
+  label: "Demo Label",
+  hint: "Hint Text",
+  disabled: false,
+};
+
+export const TextInputPrefix = TextInputTemplate.bind({});
+TextInputPrefix.args = {
+  name: "demo",
+  label: "Demo Label",
+  hint: "Hint Text",
+  addOnLeading: "https://",
+  disabled: false,
+};
+
+export const TextInputSuffix = TextInputTemplate.bind({});
+TextInputSuffix.args = {
+  name: "demo",
+  label: "Demo Label",
+  hint: "Hint Text",
+  addOnSuffix: "Minutes",
+  disabled: false,
+};
+
+export const TextInputPrefixIcon = TextInputTemplate.bind({});
+TextInputPrefixIcon.args = {
+  name: "demo",
+  label: "Demo Label",
+  hint: "Hint Text",
+  addOnFilled: false,
+  addOnSuffix: <Copy />,
+  disabled: false,
+};
+export const TextInputSuffixIcon = TextInputTemplate.bind({});
+TextInputSuffixIcon.args = {
+  name: "demo",
+  label: "Demo Label",
+  hint: "Hint Text",
+  addOnFilled: false,
+  addOnLeading: <Copy />,
+  disabled: false,
+};
+
+export const TextAreaInput: ComponentStory<typeof TextAreaField> = () => (
+  <TextAreaField name="Text-area-input" label="Text Area" />
+);
+
+export const DatePickerInput: ComponentStory<typeof DatePicker> = () => <DatePicker date={new Date()} />;

apps/storybook/stories/Modal.stories.tsx

@@ -0,0 +1,52 @@
+import { useState } from "react";
+import { Info } from "react-feather";
+
+import { Button } from "@calcom/ui/v2";
+import { Dialog, DialogContent, DialogTrigger } from "@calcom/ui/v2/Dialog";
+import { TextField } from "@calcom/ui/v2/form/fields";
+
+export default {
+  title: "pattern/Modal",
+  component: Dialog,
+};
+
+export const Creation = () => {
+  const [open, setOpen] = useState(false);
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger asChild>
+        <Button onClick={() => setOpen(true)}>Open Modal</Button>
+      </DialogTrigger>
+      <DialogContent
+        title="Header"
+        description="Optional Description"
+        type="creation"
+        actionText="Create"
+        actionOnClick={() => setOpen(false)}>
+        <TextField name="Label" />
+        <TextField name="Label" />
+        <TextField name="Label" />
+        <TextField name="Label" />
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+export const Confirmation = () => {
+  const [open, setOpen] = useState(false);
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger asChild>
+        <Button>Open Modal</Button>
+      </DialogTrigger>
+      <DialogContent
+        title="Header"
+        description="Optional Description"
+        type="confirmation"
+        actionText="Confirm"
+        Icon={Info}
+        actionOnClick={() => setOpen(false)}
+      />
+    </Dialog>
+  );
+};

apps/storybook/stories/Notifcations.stories.tsx

@@ -0,0 +1,25 @@
+import { ComponentMeta } from "@storybook/react";
+import { Toaster } from "react-hot-toast";
+
+import { Button } from "@calcom/ui/v2";
+import showToast from "@calcom/ui/v2/notfications";
+
+export default {
+  title: "Notifcations-Toasts",
+  decorators: [
+    (Story) => (
+      <>
+        <Story />
+        <Toaster />
+      </>
+    ),
+  ],
+} as ComponentMeta<typeof All>; // We have to fake this type as the story for this component isn't really a component.
+
+export const All = () => (
+  <div className="flex space-x-2">
+    <Button onClick={() => showToast("This is a Neutral toast", "warning")}>Neutral</Button>
+    <Button onClick={() => showToast("This is a Success toast", "success")}>Success</Button>
+    <Button onClick={() => showToast("This is a Error toast", "error")}>Error</Button>
+  </div>
+);

apps/storybook/stories/PageHeader.stories.tsx

@@ -0,0 +1,52 @@
+import { ComponentMeta } from "@storybook/react";
+import { Search } from "react-feather";
+
+import { Button, PageHeader } from "@calcom/ui/v2";
+import { TextField } from "@calcom/ui/v2/form";
+
+export default {
+  title: "pattern/Page Header",
+  component: PageHeader,
+  decorators: [
+    (Story) => (
+      <div className="">
+        <Story />
+      </div>
+    ),
+  ],
+} as ComponentMeta<typeof PageHeader>;
+
+export const Default = () => (
+  <PageHeader title="Title" description="Some description about the header above" />
+);
+
+export const ButtonRight = () => (
+  <PageHeader
+    title="Title"
+    description="Some description about the header above"
+    rightAlignedComponent={<Button>Button Text</Button>}
+  />
+);
+export const ComingSoon = () => (
+  <PageHeader
+    title="Title"
+    description="Some description about the header above"
+    badgeText="Coming Soon"
+    badgeVariant="gray"
+  />
+);
+export const SearchInstalledApps = () => (
+  <PageHeader
+    title="Search booking"
+    description="See upcoming and past events booking through your event type link"
+    rightAlignedComponent={
+      <TextField
+        containerClassName="h-9 max-h-9"
+        addOnLeading={<Search />}
+        name="search"
+        labelSrOnly
+        placeholder="WIP"
+      />
+    }
+  />
+);

apps/storybook/stories/Radio.stories.tsx

@@ -0,0 +1,19 @@
+import * as Radio from "@calcom/ui/v2/form/radio-area/Radio";
+import { RadioField } from "@calcom/ui/v2/form/radio-area/Radio";
+
+export default {
+  title: "Radio",
+  component: RadioField,
+};
+
+export const RadioGroupDemo = () => {
+  return (
+    <form>
+      <Radio.Group aria-label="View density" defaultValue="default">
+        <RadioField label="Default" id="r1" value="1" />
+        <RadioField label="Next" id="r2" value="2" />
+        <RadioField label="Disabled" id="r3" disabled value="1" />
+      </Radio.Group>
+    </form>
+  );
+};

apps/storybook/stories/Select.stories.tsx

@@ -0,0 +1,10 @@
+import { ComponentMeta } from "@storybook/react";
+
+import { Select } from "@calcom/ui/v2";
+
+export default {
+  title: "Form/Select",
+  component: Select,
+} as ComponentMeta<typeof Select>;
+
+export const Single = () => <Select items={[{ value: "Test Test" }]} />;

apps/storybook/stories/Switch.stories.tsx

@@ -0,0 +1,15 @@
+import { ComponentMeta } from "@storybook/react";
+
+import { Switch } from "@calcom/ui/v2";
+
+export default {
+  title: "Switch",
+  component: Switch,
+} as ComponentMeta<typeof Switch>;
+
+export const All = () => (
+  <div className="flex flex-col space-y-2">
+    <p>Checked works in app but storybook doesnt like it</p>
+    <Switch label="Default" />
+  </div>
+);

apps/storybook/stories/TabItem.stories.tsx

@@ -0,0 +1,67 @@
+// Disabling until we figure out what is happening with the RouterMock.
+import { ComponentMeta } from "@storybook/react";
+import { Link } from "react-feather";
+
+import { VerticalTabItem } from "@calcom/ui/v2";
+
+export default {
+  title: "VerticalTabItem",
+  component: VerticalTabItem,
+} as ComponentMeta<typeof VerticalTabItem>;
+
+const TabItemProps = {
+  name: "Event Setup",
+  icon: Link,
+  href: "/settings/event",
+  info: "60 mins, Zoom",
+};
+
+// export const Default = () => (
+//   <div className="h-20 w-full bg-gray-100 p-4">
+//     <VerticalTabItem {...TabItemProps}></VerticalTabItem>
+//   </div>
+// );
+// export const Active = () => (
+//   <div className="h-20 w-full bg-gray-100 p-4">
+//     <VerticalTabItem {...TabItemProps}></VerticalTabItem>
+//   </div>
+// );
+
+// Mocking next router to show active state
+// Active.parameters = {
+//   nextRouter: {
+//     path: "/settings/[tab]",
+//     asPath: "/settings/event",
+//   },
+// };
+
+// export const Disabled = () => (
+//   <div className="h-20 w-full bg-gray-100 p-4">
+//     <VerticalTabItem {...TabItemProps} disabled></VerticalTabItem>
+//   </div>
+// );
+
+// export const NoIconNoInfo = () => (
+//   <div className="h-20 w-full bg-gray-100 p-4">
+//     <VerticalTabItem name="Event Setup" href="/settings/event"></VerticalTabItem>
+//   </div>
+// );
+
+// export const IconNoInfo = () => (
+//   <div className="h-20 w-full bg-gray-100 p-4">
+//     <VerticalTabItem name="Event Setup" href="/settings/event" icon={Link}></VerticalTabItem>
+//   </div>
+// );
+
+// export const IconNoInfoActive = () => (
+//   <div className="h-20 w-full bg-gray-100 p-4">
+//     <VerticalTabItem name="Event Setup" href="/settings/events" icon={Link}></VerticalTabItem>
+//   </div>
+// );
+
+// IconNoInfoActive.paramaters = {
+//   nextRouter: {
+//     path: "/settings/[tab]",
+//     asPath: "/settings/events",
+//   },
+// };

apps/storybook/stories/VerticalTab.stories.tsx

@@ -0,0 +1,85 @@
+// Disabling until we figure out what is happening with the RouterMock.
+import { ComponentMeta } from "@storybook/react";
+import { Calendar, Clock, Grid, Link, RefreshCw, User, Users } from "react-feather";
+
+import { VerticalTabs } from "@calcom/ui/v2/navigation/tabs";
+
+export default {
+  title: "Vertical Tabs",
+  component: VerticalTabs,
+} as ComponentMeta<typeof VerticalTabs>;
+
+const VerticalTabsPropsDefault = [
+  {
+    name: "Security",
+    icon: Link,
+    href: "/security",
+  },
+  {
+    name: "Profile",
+    icon: User,
+    href: "/profile",
+  },
+  {
+    name: "Calendar Sync",
+    icon: RefreshCw,
+    href: "/cal-sync",
+  },
+  {
+    name: "Teams",
+    icon: Users,
+    href: "/Teams",
+  },
+];
+
+export const Default = () => (
+  <div className="w-full p-4" style={{ backgroundColor: "#F9FAFB" }}>
+    <VerticalTabs tabs={VerticalTabsPropsDefault} />
+  </div>
+);
+
+Default.parameters = {
+  nextRouter: {
+    path: "/[page]",
+    asPath: "/profile",
+  },
+};
+
+const VerticalTabsPropsInfo = [
+  {
+    name: "Event Setup",
+    icon: Link,
+    href: "/events",
+    info: "60 Mins, Zoom",
+  },
+  {
+    name: "Availability",
+    icon: Calendar,
+    href: "/availability",
+    info: "Working Hours",
+  },
+  {
+    name: "Limits",
+    icon: Clock,
+    href: "/limits",
+    info: "Buffers, Limits & more...",
+  },
+  {
+    name: "Apps",
+    icon: Grid,
+    href: "/apps",
+    info: "3 apps - 0 active",
+  },
+];
+
+export const Info = () => (
+  <div className="w-full p-4" style={{ backgroundColor: "#F9FAFB" }}>
+    <VerticalTabs tabs={VerticalTabsPropsInfo} />
+  </div>
+);
+Info.parameters = {
+  nextRouter: {
+    path: "/[page]",
+    asPath: "/events",
+  },
+};

apps/storybook/styles/globals.css

@@ -0,0 +1,13 @@
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
+
+:root {
+  --brand-color: #292929;
+  --brand-text-color: #ffffff;
+  --brand-color-dark-mode: #fafafa;
+  --brand-text-color-dark-mode: #292929;
+  font-family: 'Inter', sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}

apps/storybook/tailwind.config.js

@@ -0,0 +1,167 @@
+module.exports = {
+  content: ["../../packages/ui/**/*.{js,ts,jsx,tsx}", "./stories/**/*.{js,ts,tsx,jsx}"],
+  darkMode: "class",
+  theme: {
+    fontFamily: {
+      cal: ["Cal Sans", "sans-serif"],
+      mono: ["Roboto Mono", "monospace"],
+    },
+    extend: {
+      colors: {
+        /* your primary brand color */
+        brandcontrast: "var(--brand-text-color)",
+        darkmodebrand: "var(--brand-color-dark-mode)",
+        darkmodebrandcontrast: "var(--brand-text-color-dark-mode)",
+        bookinglightest: "var(--booking-lightest-color)",
+        bookinglighter: "var(--booking-lighter-color)",
+        bookinglight: "var(--booking-light-color)",
+        bookingmedian: "var(--booking-median-color)",
+        bookingdark: "var(--booking-dark-color)",
+        bookingdarker: "var(--booking-darker-color)",
+        bookinghighlight: "var(--booking-highlight-color)",
+        black: "#111111",
+        brand: {
+          // Figure out a way to automate this for self hosted users
+          // Goto https://javisperez.github.io/tailwindcolorshades to generate your brand color
+          50: "#d1d5db",
+          100: "#9ca3af",
+          200: "#6b7280",
+          300: "#4b5563",
+          400: "#374151",
+          500: "#111827", // Brand color
+          600: "#0f1623",
+          700: "#0d121d",
+          800: "#0a0e17",
+          900: "#080c13",
+          DEFAULT: "#111827",
+        },
+        gray: {
+          50: "#F9FAFB",
+          100: "#F3F4F6",
+          200: "#E5E7EB",
+          300: "#D1D5DB",
+          400: "#9CA3AF",
+          500: "#6B7280",
+          600: "#4B5563",
+          700: "#374151",
+          800: "#1F2937",
+          900: "#111827",
+        },
+        neutral: {
+          50: "#F8F8F8",
+          100: "#F5F5F5",
+          200: "#E1E1E1",
+          300: "#CFCFCF",
+          400: "#ACACAC",
+          500: "#888888",
+          600: "#494949",
+          700: "#3E3E3E",
+          800: "#313131",
+          900: "#292929",
+        },
+        primary: {
+          50: "#F4F4F4",
+          100: "#E8E8E8",
+          200: "#C6C6C6",
+          300: "#A3A3A3",
+          400: "#5F5F5F",
+          500: "#1A1A1A",
+          600: "#171717",
+          700: "#141414",
+          800: "#101010",
+          900: "#0D0D0D",
+        },
+        secondary: {
+          50: "#F5F8F7",
+          100: "#EBF0F0",
+          200: "#CDDAD9",
+          300: "#AEC4C2",
+          400: "#729894",
+          500: "#356C66",
+          600: "#30615C",
+          700: "#28514D",
+          800: "#20413D",
+          900: "#223B41",
+        },
+        red: {
+          50: "#FFF5F5",
+          100: "#FFE3E2",
+          200: "#FFC9C9",
+          300: "#FEA8A8",
+          400: "#FF8787",
+          500: "#FF6B6B",
+          600: "#FA5352",
+          700: "#F03E3F",
+          800: "#E03130",
+          900: "#C92B2B",
+        },
+        orange: {
+          50: "#FFF4E5",
+          100: "#FFE8CC",
+          200: "#FFD8A8",
+          300: "#FFBF78",
+          400: "#FFA94E",
+          500: "#FF922B",
+          600: "#FD7E14",
+          700: "#F76706",
+          800: "#E8580C",
+          900: "#D94810",
+        },
+        green: {
+          50: "#EBFCEE",
+          100: "#D2F9D9",
+          200: "#B1F2BA",
+          300: "#8CE99A",
+          400: "#69DB7C",
+          500: "#51CF66",
+          600: "#40C057",
+          700: "#36B24D",
+          800: "#2F9E44",
+          900: "#2B8A3E",
+        },
+        blue: {
+          50: "#E7F5FF",
+          100: "#D0EBFF",
+          200: "#A4D8FF",
+          300: "#74C0FC",
+          400: "#4DABF7",
+          500: "#339AF0",
+          600: "#238BE6",
+          700: "#1C7ED7",
+          800: "#1971C2",
+          900: "#1763AB",
+        },
+      },
+      fontFamily: {
+        cal: ["inter", "sans-serif"],
+        mono: ["Roboto Mono", "monospace"],
+      },
+      maxHeight: (theme) => ({
+        0: "0",
+        97: "25rem",
+        ...theme("spacing"),
+        full: "100%",
+        screen: "100vh",
+      }),
+      minHeight: (theme) => ({
+        0: "0",
+        ...theme("spacing"),
+        full: "100%",
+        screen: "100vh",
+      }),
+      minWidth: (theme) => ({
+        0: "0",
+        ...theme("spacing"),
+        full: "100%",
+        screen: "100vw",
+      }),
+      maxWidth: (theme, { breakpoints }) => ({
+        0: "0",
+        ...theme("spacing"),
+        ...breakpoints(theme("screens")),
+        full: "100%",
+        screen: "100vw",
+      }),
+    },
+  },
+};

apps/storybook/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "extends": "@calcom/tsconfig/nextjs.json",
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "noImplicitAny": false,
+    "baseUrl": "."
+  }
+}

apps/swagger/package.json

@@ -3,14 +3,18 @@
   "version": "1.0.0",
   "private": true,
   "scripts": {
-    "dev": "PORT=4200 next dev",
     "build": "next build",
+    "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
+    "dev": "PORT=4200 next dev",
+    "lint": "next lint",
+    "lint:fix": "eslint . --ext .ts,.js,.tsx,.jsx --fix",
+    "lint:report": "eslint . --format json --output-file ../../lint-results/swagger.json",
     "start": "PORT=4200 next start"
   },
   "dependencies": {
     "highlight.js": "^11.5.1",
     "isarray": "2.0.5",
-    "next": "12.1.6",
+    "next": "12.2.0",
     "openapi-snippet": "^0.13.0",
     "react": "18.1.0",
     "react-dom": "18.1.0",

apps/swagger/tsconfig.json

@@ -1,24 +1,17 @@
 {
+  "extends": "@calcom/tsconfig/nextjs.json",
   "compilerOptions": {
-    "target": "es5",
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "strict": false,
-    "forceConsistentCasingInFileNames": true,
-    "noEmit": true,
-    "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "jsx": "preserve",
-    "incremental": true,
     "baseUrl": ".",
     "paths": {
       "@lib/*": ["lib/*"]
     }
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
+  "include": [
+    "next-env.d.ts",
+    "../../packages/types/*.d.ts",
+    "../../packages/types/next-auth.d.ts",
+    "**/*.ts",
+    "**/*.tsx"
+  ],
   "exclude": ["node_modules"]
 }

apps/web/components/AddToHomescreen.tsx

@@ -1,7 +1,7 @@
-import { XIcon } from "@heroicons/react/outline";
 import { useState } from "react";
 
-import { useLocale } from "@lib/hooks/useLocale";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Icon } from "@calcom/ui/Icon";
 
 export default function AddToHomescreen() {
   const { t } = useLocale();
@@ -40,7 +40,7 @@ export default function AddToHomescreen() {
                 type="button"
                 className="-mr-1 flex rounded-md p-2 hover:bg-gray-800 focus:outline-none focus:ring-2 focus:ring-white">
                 <span className="sr-only">{t("dismiss")}</span>
-                <XIcon className="h-6 w-6 text-white" aria-hidden="true" />
+                <Icon.X className="h-6 w-6 text-white" aria-hidden="true" />
               </button>
             </div>
           </div>

apps/web/components/AdditionalCalendarSelector.tsx

@@ -4,11 +4,11 @@ import { OptionProps } from "react-select";
 
 import { InstallAppButton } from "@calcom/app-store/components";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { trpc } from "@calcom/trpc/react";
 import type { App } from "@calcom/types/App";
 import { Button } from "@calcom/ui";
 
 import { QueryCell } from "@lib/QueryCell";
-import { trpc } from "@lib/trpc";
 
 interface AdditionalCalendarSelectorProps {
   isLoading?: boolean;
@@ -50,7 +50,7 @@ const AdditionalCalendarSelector = ({ isLoading }: AdditionalCalendarSelectorPro
         }));
         return (
           <Select
-            name={"additionalCalendar"}
+            name="additionalCalendar"
             placeholder={t("connect_additional_calendar")}
             options={options}
             styles={{
@@ -73,7 +73,7 @@ const AdditionalCalendarSelector = ({ isLoading }: AdditionalCalendarSelectorPro
               },
             }}
             isSearchable={false}
-            className="mt-1 mb-2 block w-full min-w-0 flex-1 rounded-none rounded-r-sm border-gray-300 font-medium text-gray-700 sm:text-sm"
+            className="mt-1 mb-2 block w-full min-w-0 flex-1 rounded-none rounded-r-sm border-gray-300 text-sm font-medium text-gray-700"
             isLoading={isLoading}
             components={{ Option: ImageOption }}
           />

apps/web/components/App.tsx

@@ -1,26 +1,19 @@
-import {
-  BookOpenIcon,
-  CheckIcon,
-  DocumentTextIcon,
-  ExternalLinkIcon,
-  FlagIcon,
-  MailIcon,
-  PlusIcon,
-  ShieldCheckIcon,
-} from "@heroicons/react/outline";
-import { ChevronLeftIcon } from "@heroicons/react/solid";
 import Link from "next/link";
 import React, { useEffect, useState } from "react";
 
+import useAddAppMutation from "@calcom/app-store/_utils/useAddAppMutation";
 import { InstallAppButton } from "@calcom/app-store/components";
+import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import showToast from "@calcom/lib/notification";
+import { trpc } from "@calcom/trpc/react";
 import { App as AppType } from "@calcom/types/App";
 import { Button, SkeletonButton } from "@calcom/ui";
+import Badge from "@calcom/ui/Badge";
+import { Icon } from "@calcom/ui/Icon";
+import Shell from "@calcom/ui/Shell";
 
-import Shell from "@components/Shell";
-import Badge from "@components/ui/Badge";
-
-export default function App({
+const Component = ({
   name,
   type,
   logo,
@@ -36,25 +29,19 @@ export default function App({
   email,
   tos,
   privacy,
-}: {
-  name: string;
-  type: AppType["type"];
-  isGlobal?: AppType["isGlobal"];
-  logo: string;
-  body: React.ReactNode;
-  categories: string[];
-  author: string;
-  pro?: boolean;
-  price?: number;
-  commission?: number;
-  feeType?: AppType["feeType"];
-  docs?: string;
-  website?: string;
-  email: string; // required
-  tos?: string;
-  privacy?: string;
-}) {
+  isProOnly,
+}: Parameters<typeof App>[0]) => {
   const { t } = useLocale();
+  const { data: user } = trpc.useQuery(["viewer.me"]);
+
+  const mutation = useAddAppMutation(null, {
+    onSuccess: () => {
+      showToast("App successfully installed", "success");
+    },
+    onError: (error) => {
+      if (error instanceof Error) showToast(error.message || "App could not be installed", "error");
+    },
+  });
 
   const priceInDollar = Intl.NumberFormat("en-US", {
     style: "currency",
@@ -90,176 +77,238 @@ export default function App({
     getInstalledApp(type);
   }, [type]);
   const allowedMultipleInstalls = categories.indexOf("calendar") > -1;
-  return (
-    <>
-      <Shell large isPublic>
-        <div className="-mx-4 md:-mx-8">
-          <div className="bg-gray-50 px-8">
-            <Link href="/apps">
-              <a className="mt-2 inline-flex px-1 py-2 text-sm text-gray-500 hover:bg-gray-100 hover:text-gray-800">
-                <ChevronLeftIcon className="h-5 w-5" /> {t("browse_apps")}
-              </a>
-            </Link>
-            <div className="items-center justify-between py-4 sm:flex sm:py-8">
-              <div className="flex">
-                <img className="h-16 w-16 rounded-sm" src={logo} alt={name} />
-                <header className="px-4 py-2">
-                  <h1 className="font-cal text-xl text-gray-900">{name}</h1>
-                  <h2 className="text-sm text-gray-500">
-                    <span className="capitalize">{categories[0]}</span> • {t("published_by", { author })}
-                  </h2>
-                </header>
-              </div>
 
-              <div className="mt-4 sm:mt-0 sm:text-right">
-                {!isLoading ? (
-                  isGlobal || (installedAppCount > 0 && allowedMultipleInstalls) ? (
-                    <div className="space-x-3">
-                      <Button StartIcon={CheckIcon} color="secondary" disabled>
-                        {installedAppCount > 0
-                          ? t("active_install", { count: installedAppCount })
-                          : t("globally_install")}
-                      </Button>
-                      <InstallAppButton
-                        type={type}
-                        render={(buttonProps) => (
-                          <Button StartIcon={PlusIcon} data-testid="install-app-button" {...buttonProps}>
-                            {t("add_another")}
-                          </Button>
-                        )}
-                      />
-                    </div>
-                  ) : (
+  return (
+    <div className="-mx-4 md:-mx-8">
+      <div className="bg-gray-50 px-8">
+        <Link href="/apps">
+          <a className="mt-2 inline-flex px-1 py-2 text-sm text-gray-500 hover:bg-gray-100 hover:text-gray-800">
+            <Icon.ChevronLeft className="h-5 w-5" /> {t("browse_apps")}
+          </a>
+        </Link>
+        <div className="items-center justify-between py-4 sm:flex sm:py-8">
+          <div className="flex">
+            <img className="h-16 w-16 rounded-sm" src={logo} alt={name} />
+            <header className="px-4 py-2">
+              <div className="flex items-center">
+                <h1 className="font-cal text-xl text-gray-900">{name}</h1>
+                {isProOnly && user?.plan === "FREE" ? (
+                  <Badge className="ml-2" variant="default">
+                    PRO
+                  </Badge>
+                ) : null}
+              </div>
+              <h2 className="text-sm text-gray-500">
+                <span className="capitalize">{categories[0]}</span> • {t("published_by", { author })}
+              </h2>
+            </header>
+          </div>
+
+          <div className="mt-4 sm:mt-0 sm:text-right">
+            {!isLoading ? (
+              isGlobal || (installedAppCount > 0 && allowedMultipleInstalls) ? (
+                <div className="flex space-x-3">
+                  <Button StartIcon={Icon.Check} color="secondary" disabled>
+                    {installedAppCount > 0
+                      ? t("active_install", { count: installedAppCount })
+                      : t("globally_install")}
+                  </Button>
+                  {!isGlobal && (
                     <InstallAppButton
                       type={type}
-                      render={(buttonProps) => (
-                        <Button data-testid="install-app-button" {...buttonProps}>
-                          {t("install_app")}
-                        </Button>
-                      )}
+                      isProOnly={isProOnly}
+                      render={({ useDefaultComponent, ...props }) => {
+                        if (useDefaultComponent) {
+                          props = {
+                            onClick: () => {
+                              mutation.mutate({ type });
+                            },
+                            loading: mutation.isLoading,
+                          };
+                        }
+                        return (
+                          <Button StartIcon={Icon.Plus} {...props} data-testid="install-app-button">
+                            {t("add_another")}
+                          </Button>
+                        );
+                      }}
                     />
-                  )
-                ) : (
-                  <SkeletonButton width="24" height="10" />
-                )}
-                {price !== 0 && (
-                  <small className="block text-right">
-                    {feeType === "usage-based"
-                      ? commission + "% + " + priceInDollar + "/booking"
-                      : priceInDollar}
-                    {feeType === "monthly" && "/" + t("month")}
-                  </small>
-                )}
-              </div>
-            </div>
-            {/* reintroduce once we show permissions and features
-            <NavTabs tabs={tabs} linkProps={{ shallow: true }} /> */}
-          </div>
-
-          <div className="justify-between px-8 py-10 md:flex">
-            <div className="prose-sm prose mb-6">{body}</div>
-            <div className="md:max-w-80 flex-1 md:ml-8">
-              <h4 className="font-medium text-gray-900 ">{t("categories")}</h4>
-              <div className="space-x-2">
-                {categories.map((category) => (
-                  <Link href={"/apps/categories/" + category} key={category}>
-                    <a>
-                      <Badge variant="success">{category}</Badge>
-                    </a>
-                  </Link>
-                ))}
-              </div>
-              <h4 className="mt-8 font-medium text-gray-900 ">{t("pricing")}</h4>
-              <small>
-                {price === 0 ? (
-                  "Free"
-                ) : (
-                  <>
-                    {Intl.NumberFormat("en-US", {
-                      style: "currency",
-                      currency: "USD",
-                      useGrouping: false,
-                    }).format(price)}
-                    {feeType === "monthly" && "/" + t("month")}
-                  </>
-                )}
+                  )}
+                </div>
+              ) : installedAppCount > 0 ? (
+                <Button color="secondary" disabled title="App already installed">
+                  {t("installed")}
+                </Button>
+              ) : (
+                <InstallAppButton
+                  type={type}
+                  isProOnly={isProOnly}
+                  render={({ useDefaultComponent, ...props }) => {
+                    if (useDefaultComponent) {
+                      props = {
+                        onClick: () => {
+                          mutation.mutate({ type });
+                        },
+                        loading: mutation.isLoading,
+                      };
+                    }
+                    return (
+                      <Button data-testid="install-app-button" {...props}>
+                        {t("install_app")}
+                      </Button>
+                    );
+                  }}
+                />
+              )
+            ) : (
+              <SkeletonButton width="24" height="10" />
+            )}
+            {price !== 0 && (
+              <small className="block text-right">
+                {feeType === "usage-based" ? commission + "% + " + priceInDollar + "/booking" : priceInDollar}
+                {feeType === "monthly" && "/" + t("month")}
               </small>
-              <h4 className="mt-8 mb-2 font-medium text-gray-900 ">{t("learn_more")}</h4>
-              <ul className="prose -ml-1 -mr-1 text-xs leading-5">
-                {docs && (
-                  <li>
-                    <a
-                      target="_blank"
-                      rel="noreferrer"
-                      className="text-blue-500 no-underline hover:underline"
-                      href={docs}>
-                      <BookOpenIcon className="mr-1 -mt-1 inline h-4 w-4" />
-                      {t("documentation")}
-                    </a>
-                  </li>
-                )}
-                {website && (
-                  <li>
-                    <a
-                      target="_blank"
-                      rel="noreferrer"
-                      className="text-blue-500 no-underline hover:underline"
-                      href={website}>
-                      <ExternalLinkIcon className="mr-1 -mt-px inline h-4 w-4" />
-                      {website.replace("https://", "")}
-                    </a>
-                  </li>
-                )}
-                {email && (
-                  <li>
-                    <a
-                      target="_blank"
-                      rel="noreferrer"
-                      className="text-blue-500 no-underline hover:underline"
-                      href={"mailto:" + email}>
-                      <MailIcon className="mr-1 -mt-px inline h-4 w-4" />
-                      {email}
-                    </a>
-                  </li>
-                )}
-                {tos && (
-                  <li>
-                    <a
-                      target="_blank"
-                      rel="noreferrer"
-                      className="text-blue-500 no-underline hover:underline"
-                      href={tos}>
-                      <DocumentTextIcon className="mr-1 -mt-px inline h-4 w-4" />
-                      {t("terms_of_service")}
-                    </a>
-                  </li>
-                )}
-                {privacy && (
-                  <li>
-                    <a
-                      target="_blank"
-                      rel="noreferrer"
-                      className="text-blue-500 no-underline hover:underline"
-                      href={privacy}>
-                      <ShieldCheckIcon className="mr-1 -mt-px inline h-4 w-4" />
-                      {t("privacy_policy")}
-                    </a>
-                  </li>
-                )}
-              </ul>
-              <hr className="my-6" />
-              <small className="leading-1 block text-gray-500">
-                Every app published on the Cal.com App Store is open source and thoroughly tested via peer
-                reviews. Nevertheless, Cal.com, Inc. does not endorse or certify these apps unless they are
-                published by Cal.com. If you encounter inappropriate content or behaviour please report it.
-              </small>
-              <a className="mt-2 block text-xs text-red-500" href="mailto:help@cal.com">
-                <FlagIcon className="inline h-3 w-3" /> Report App
-              </a>
-            </div>
+            )}
           </div>
         </div>
-      </Shell>
-    </>
+      </div>
+
+      <div className="justify-between px-8 py-10 md:flex">
+        <div className="prose-sm prose mb-6">{body}</div>
+        <div className="md:max-w-80 flex-1 md:ml-8">
+          <h4 className="font-medium text-gray-900 ">{t("categories")}</h4>
+          <div className="space-x-2">
+            {categories.map((category) => (
+              <Link href={"/apps/categories/" + category} key={category}>
+                <a>
+                  <Badge variant="success">{category}</Badge>
+                </a>
+              </Link>
+            ))}
+          </div>
+          <h4 className="mt-8 font-medium text-gray-900 ">{t("pricing")}</h4>
+          <small>
+            {price === 0 ? (
+              "Free"
+            ) : (
+              <>
+                {Intl.NumberFormat("en-US", {
+                  style: "currency",
+                  currency: "USD",
+                  useGrouping: false,
+                }).format(price)}
+                {feeType === "monthly" && "/" + t("month")}
+              </>
+            )}
+          </small>
+          <h4 className="mt-8 mb-2 font-medium text-gray-900 ">{t("learn_more")}</h4>
+          <ul className="prose -ml-1 -mr-1 text-xs leading-5">
+            {docs && (
+              <li>
+                <a
+                  target="_blank"
+                  rel="noreferrer"
+                  className="text-blue-500 no-underline hover:underline"
+                  href={docs}>
+                  <Icon.BookOpen className="mr-1 -mt-1 inline h-4 w-4" />
+                  {t("documentation")}
+                </a>
+              </li>
+            )}
+            {website && (
+              <li>
+                <a
+                  target="_blank"
+                  rel="noreferrer"
+                  className="text-blue-500 no-underline hover:underline"
+                  href={website}>
+                  <Icon.ExternalLink className="mr-1 -mt-px inline h-4 w-4" />
+                  {website.replace("https://", "")}
+                </a>
+              </li>
+            )}
+            {email && (
+              <li>
+                <a
+                  target="_blank"
+                  rel="noreferrer"
+                  className="text-blue-500 no-underline hover:underline"
+                  href={"mailto:" + email}>
+                  <Icon.Mail className="mr-1 -mt-px inline h-4 w-4" />
+
+                  {email}
+                </a>
+              </li>
+            )}
+            {tos && (
+              <li>
+                <a
+                  target="_blank"
+                  rel="noreferrer"
+                  className="text-blue-500 no-underline hover:underline"
+                  href={tos}>
+                  <Icon.File className="mr-1 -mt-px inline h-4 w-4" />
+                  {t("terms_of_service")}
+                </a>
+              </li>
+            )}
+            {privacy && (
+              <li>
+                <a
+                  target="_blank"
+                  rel="noreferrer"
+                  className="text-blue-500 no-underline hover:underline"
+                  href={privacy}>
+                  <Icon.Shield className="mr-1 -mt-px inline h-4 w-4" />
+                  {t("privacy_policy")}
+                </a>
+              </li>
+            )}
+          </ul>
+          <hr className="my-6" />
+          <small className="leading-1 block text-gray-500">
+            Every app published on the Cal.com App Store is open source and thoroughly tested via peer
+            reviews. Nevertheless, Cal.com, Inc. does not endorse or certify these apps unless they are
+            published by Cal.com. If you encounter inappropriate content or behaviour please report it.
+          </small>
+          <a className="mt-2 block text-xs text-red-500" href="mailto:help@cal.com">
+            <Icon.Flag className="inline h-3 w-3" /> Report App
+          </a>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default function App(props: {
+  name: string;
+  type: AppType["type"];
+  isGlobal?: AppType["isGlobal"];
+  logo: string;
+  body: React.ReactNode;
+  categories: string[];
+  author: string;
+  pro?: boolean;
+  price?: number;
+  commission?: number;
+  feeType?: AppType["feeType"];
+  docs?: string;
+  website?: string;
+  email: string; // required
+  tos?: string;
+  privacy?: string;
+  licenseRequired: AppType["licenseRequired"];
+  isProOnly: AppType["isProOnly"];
+}) {
+  return (
+    <Shell large isPublic>
+      {props.licenseRequired ? (
+        <LicenseRequired>
+          <Component {...props} />
+        </LicenseRequired>
+      ) : (
+        <Component {...props} />
+      )}
+    </Shell>
   );
 }

apps/web/components/BookingsShell.tsx

@@ -24,7 +24,7 @@ const tabs = [
 export default function BookingsShell({ children }: { children: React.ReactNode }) {
   return (
     <>
-      <NavTabs tabs={tabs} linkProps={{ shallow: true }} />
+      <NavTabs tabs={tabs} />
       <main>{children}</main>
     </>
   );

apps/web/components/DestinationCalendarSelector.tsx

@@ -3,8 +3,7 @@ import React, { useEffect, useState } from "react";
 import Select from "react-select";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-
-import { trpc } from "@lib/trpc";
+import { trpc } from "@calcom/trpc/react";
 
 interface Props {
   onChange: (value: { externalId: string; integration: string }) => void;
@@ -61,15 +60,17 @@ const DestinationCalendarSelector = ({
     query.data.connectedCalendars.map((selectedCalendar) => ({
       key: selectedCalendar.credentialId,
       label: `${selectedCalendar.integration.title} (${selectedCalendar.primary?.name})`,
-      options: (selectedCalendar.calendars ?? []).map((cal) => ({
-        label: cal.name || "",
-        value: `${cal.integration}:${cal.externalId}`,
-      })),
+      options: (selectedCalendar.calendars ?? [])
+        .filter((cal) => cal.readOnly === false)
+        .map((cal) => ({
+          label: cal.name || "",
+          value: `${cal.integration}:${cal.externalId}`,
+        })),
     })) ?? [];
   return (
     <div className="relative" title={`${t("select_destination_calendar")}: ${selectedOption?.label || ""}`}>
       <Select
-        name={"primarySelectedCalendar"}
+        name="primarySelectedCalendar"
         placeholder={!hidePlaceholder ? `${t("select_destination_calendar")}:` : undefined}
         options={options}
         styles={{
@@ -98,7 +99,7 @@ const DestinationCalendarSelector = ({
         }}
         isSearchable={false}
         className={classNames(
-          "mt-1 mb-2 block w-full min-w-0 flex-1 rounded-none rounded-r-sm border-gray-300 sm:text-sm",
+          "mt-1 mb-2 block w-full min-w-0 flex-1 rounded-none rounded-r-sm border-gray-300 text-sm",
           !hidePlaceholder && "font-medium"
         )}
         onChange={(option) => {

apps/web/components/Embed.tsx

@@ -1,4 +1,3 @@
-import { ArrowLeftIcon, ChevronRightIcon, CodeIcon, EyeIcon, SunIcon } from "@heroicons/react/solid";
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@radix-ui/react-collapsible";
 import classNames from "classnames";
 import { useRouter } from "next/router";
@@ -8,12 +7,14 @@ import { components, ControlProps } from "react-select";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import showToast from "@calcom/lib/notification";
 import { EventType } from "@calcom/prisma/client";
+import { trpc } from "@calcom/trpc/react";
+import { SVGComponent } from "@calcom/types/SVGComponent";
 import { Button, Switch } from "@calcom/ui";
 import { Dialog, DialogClose, DialogContent } from "@calcom/ui/Dialog";
+import { Icon } from "@calcom/ui/Icon";
 import { InputLeading, Label, TextArea, TextField } from "@calcom/ui/form/fields";
 
 import { EMBED_LIB_URL, WEBAPP_URL } from "@lib/config/constants";
-import { trpc } from "@lib/trpc";
 
 import NavTabs from "@components/NavTabs";
 import ColorPicker from "@components/ui/colorpicker";
@@ -143,7 +144,7 @@ function MyComponent() {
       const cal = await getCalApi();
       ${uiInstructionCode}
     })();
-  }, []) 
+  }, [])
   return <Cal calLink="${calLink}" style={{width:"${width}",height:"${height}",overflow:"scroll"}} />;
 };`;
     },
@@ -164,7 +165,7 @@ function MyComponent() {
       Cal("floatingButton", ${floatingButtonArg});
       ${uiInstructionCode}
     })();
-  }, [])     
+  }, [])
 };`;
     },
     "element-click": ({ calLink, uiInstructionCode }: { calLink: string; uiInstructionCode: string }) => {
@@ -177,7 +178,7 @@ function MyComponent() {
       const cal = await getCalApi();
       ${uiInstructionCode}
     })();
-  }, []) 
+  }, [])
   return <button data-cal-link="${calLink}" />;
 };`;
     },
@@ -452,7 +453,7 @@ const tabs = [
   {
     name: "HTML",
     tabName: "embed-code",
-    icon: CodeIcon,
+    icon: Icon.Code,
     type: "code",
     Component: forwardRef<
       HTMLTextAreaElement | HTMLIFrameElement | null,
@@ -467,12 +468,15 @@ const tabs = [
       }
       return (
         <>
-          <small className="flex py-4 text-neutral-500">{t("place_where_cal_widget_appear")}</small>
+          <div>
+            <small className="flex py-4 text-neutral-500">{t("place_where_cal_widget_appear")}</small>
+          </div>
           <TextArea
             data-testid="embed-code"
             ref={ref as typeof ref & MutableRefObject<HTMLTextAreaElement>}
             name="embed-code"
-            className="h-[36rem]"
+            className="h-[calc(100%-50px)] font-mono"
+            style={{ resize: "none", overflow: "auto" }}
             readOnly
             value={
               `<!-- Cal ${embedType} embed code begins -->\n` +
@@ -486,7 +490,8 @@ ${getEmbedSnippetString()}
 ${getEmbedTypeSpecificString({ embedFramework: "HTML", embedType, calLink, previewState })}
 </script>
 <!-- Cal ${embedType} embed code ends -->`
-            }></TextArea>
+            }
+          />
           <p className="hidden text-sm text-gray-500">
             {t(
               "Need help? See our guides for embedding Cal on Wix, Squarespace, or WordPress, check our common questions, or explore advanced embed options."
@@ -499,7 +504,7 @@ ${getEmbedTypeSpecificString({ embedFramework: "HTML", embedType, calLink, previ
   {
     name: "React",
     tabName: "embed-react",
-    icon: CodeIcon,
+    icon: Icon.Code,
     type: "code",
     Component: forwardRef<
       HTMLTextAreaElement | HTMLIFrameElement | null,
@@ -519,8 +524,9 @@ ${getEmbedTypeSpecificString({ embedFramework: "HTML", embedType, calLink, previ
             data-testid="embed-react"
             ref={ref as typeof ref & MutableRefObject<HTMLTextAreaElement>}
             name="embed-react"
-            className="h-[36rem]"
+            className="h-[calc(100%-50px)] font-mono"
             readOnly
+            style={{ resize: "none", overflow: "auto" }}
             value={`/* First make sure that you have installed the package */
 
 /* If you are using yarn */
@@ -529,7 +535,8 @@ ${getEmbedTypeSpecificString({ embedFramework: "HTML", embedType, calLink, previ
 /* If you are using npm */
 // npm install @calcom/embed-react
 ${getEmbedTypeSpecificString({ embedFramework: "react", embedType, calLink, previewState })}
-`}></TextArea>
+`}
+          />
         </>
       );
     }),
@@ -537,7 +544,7 @@ ${getEmbedTypeSpecificString({ embedFramework: "react", embedType, calLink, prev
   {
     name: "Preview",
     tabName: "embed-preview",
-    icon: EyeIcon,
+    icon: Icon.Eye,
     type: "iframe",
     Component: forwardRef<
       HTMLIFrameElement | HTMLTextAreaElement | null,
@@ -573,7 +580,7 @@ Cal("init", {origin:"${WEBAPP_URL}"});
 const ThemeSelectControl = ({ children, ...props }: ControlProps<{ value: Theme; label: string }, false>) => {
   return (
     <components.Control {...props}>
-      <SunIcon className="h-[32px] w-[32px] text-gray-500" />
+      <Icon.Sun className="ml-2 h-4 w-4 text-gray-500" />
       {children}
     </components.Control>
   );
@@ -592,10 +599,10 @@ const ChooseEmbedTypesDialogContent = () => {
           <p className="text-sm text-gray-500">{t("choose_ways_put_cal_site")}</p>
         </div>
       </div>
-      <div className="flex">
+      <div className="flex items-start">
         {embeds.map((embed, index) => (
           <button
-            className="mr-2 w-1/3 p-3 text-left hover:rounded-md hover:border hover:bg-neutral-100"
+            className="mr-2 w-1/3 border border-transparent p-3 text-left hover:rounded-md hover:border-gray-200 hover:bg-neutral-100"
             key={index}
             data-testid={embed.type}
             onClick={() => {
@@ -800,11 +807,11 @@ const EmbedTypeCodeAndPreviewDialogContent = ({
                   },
                 });
               }}>
-              <ArrowLeftIcon className="mr-4 w-4"></ArrowLeftIcon>
+              <Icon.ArrowLeft className="mr-4 w-4" />
             </button>
             {embed.title}
           </h3>
-          <hr className={classNames("mt-4", embedType === "element-click" ? "hidden" : "")}></hr>
+          <hr className={classNames("mt-4", embedType === "element-click" ? "hidden" : "")} />
           <div className={classNames("mt-4 font-medium", embedType === "element-click" ? "hidden" : "")}>
             <Collapsible
               open={isEmbedCustomizationOpen}
@@ -819,7 +826,7 @@ const EmbedTypeCodeAndPreviewDialogContent = ({
                     ? "Floating Popup Customization"
                     : "Element Click Customization"}
                 </div>
-                <ChevronRightIcon
+                <Icon.ChevronRight
                   className={`${
                     isEmbedCustomizationOpen ? "rotate-90 transform" : ""
                   } ml-auto h-5 w-5 text-neutral-500`}
@@ -850,7 +857,7 @@ const EmbedTypeCodeAndPreviewDialogContent = ({
                       }}
                       addOnLeading={<InputLeading>W</InputLeading>}
                     />
-                    <span className="p-2">x</span>
+                    <span className="p-2">×</span>
                     <TextField
                       labelProps={{ className: "hidden" }}
                       name="height"
@@ -916,7 +923,8 @@ const EmbedTypeCodeAndPreviewDialogContent = ({
                           },
                         };
                       });
-                    }}></Switch>
+                    }}
+                  />
                 </div>
                 <div
                   className={classNames(
@@ -937,7 +945,8 @@ const EmbedTypeCodeAndPreviewDialogContent = ({
                       });
                     }}
                     defaultValue={FloatingPopupPositionOptions[0]}
-                    options={FloatingPopupPositionOptions}></Select>
+                    options={FloatingPopupPositionOptions}
+                  />
                 </div>
                 <div
                   className={classNames(
@@ -958,7 +967,8 @@ const EmbedTypeCodeAndPreviewDialogContent = ({
                             },
                           };
                         });
-                      }}></ColorPicker>
+                      }}
+                    />
                   </div>
                 </div>
                 <div
@@ -980,20 +990,21 @@ const EmbedTypeCodeAndPreviewDialogContent = ({
                             },
                           };
                         });
-                      }}></ColorPicker>
+                      }}
+                    />
                   </div>
                 </div>
               </CollapsibleContent>
             </Collapsible>
           </div>
-          <hr className="mt-4"></hr>
+          <hr className="mt-4" />
           <div className="mt-4 font-medium">
             <Collapsible
               open={isBookingCustomizationOpen}
               onOpenChange={() => setIsBookingCustomizationOpen((val) => !val)}>
               <CollapsibleTrigger className="flex w-full" type="button">
                 <div className="text-base  font-medium text-neutral-900">Cal Booking Customization</div>
-                <ChevronRightIcon
+                <Icon.ChevronRight
                   className={`${
                     isBookingCustomizationOpen ? "rotate-90 transform" : ""
                   } ml-auto h-5 w-5 text-neutral-500`}
@@ -1020,7 +1031,8 @@ const EmbedTypeCodeAndPreviewDialogContent = ({
                           };
                         });
                       }}
-                      options={ThemeOptions}></Select>
+                      options={ThemeOptions}
+                    />
                   </Label>
                   {[
                     { name: "brandColor", title: "Brand Color" },
@@ -1063,7 +1075,8 @@ const EmbedTypeCodeAndPreviewDialogContent = ({
                         embedType={embedType}
                         calLink={calLink}
                         previewState={previewState}
-                        ref={refOfEmbedCodesRefs.current[tab.name]}></tab.Component>
+                        ref={refOfEmbedCodesRefs.current[tab.name]}
+                      />
                     ) : (
                       <tab.Component
                         embedType={embedType}
@@ -1073,7 +1086,7 @@ const EmbedTypeCodeAndPreviewDialogContent = ({
                       />
                     )}
                   </div>
-                  <div className={router.query.tabName == "embed-preview" ? "block" : "hidden"}></div>
+                  <div className={router.query.tabName == "embed-preview" ? "block" : "hidden"} />
                 </div>
                 <div className="mt-8 flex flex-row-reverse gap-x-2">
                   {tab.type === "code" ? (
@@ -1122,13 +1135,15 @@ export const EmbedDialog = () => {
 
 export const EmbedButton = ({
   eventTypeId,
+  StartIcon,
+  children,
   className = "",
-  dark,
   ...props
 }: {
   eventTypeId: EventType["id"];
+  StartIcon?: SVGComponent;
+  children?: React.ReactNode;
   className: string;
-  dark?: boolean;
 }) => {
   const { t } = useLocale();
   const router = useRouter();
@@ -1153,15 +1168,14 @@ export const EmbedButton = ({
     <Button
       type="button"
       color="minimal"
+      StartIcon={StartIcon}
       size="sm"
       className={className}
       {...props}
       data-test-eventtype-id={eventTypeId}
-      data-testid={"event-type-embed"}
+      data-testid="event-type-embed"
       onClick={() => openEmbedModal()}>
-      <CodeIcon
-        className={classNames("h-4 w-4 ltr:mr-2 rtl:ml-2", dark ? "" : "text-neutral-500")}></CodeIcon>
-      {t("Embed")}
+      {children}
     </Button>
   );
 };

apps/web/components/I18nLanguageHandler.tsx

@@ -1,11 +1,16 @@
 import { useTranslation } from "next-i18next";
 import { useEffect } from "react";
 
-import { trpc } from "@lib/trpc";
+import { trpc } from "@calcom/trpc/react";
 
 export function useViewerI18n() {
   return trpc.useQuery(["viewer.public.i18n"], {
     staleTime: Infinity,
+    /**
+     * i18n should never be clubbed with other queries, so that it's caching can be managed independently.
+     * We intend to not cache i18n query
+     **/
+    context: { skipBatch: true },
   });
 }
 

apps/web/components/ImageUploader.tsx

@@ -142,7 +142,7 @@ export default function ImageUploader({
               </div>
             )}
             {result && <CropContainer imageSrc={result as string} onCropComplete={setCroppedAreaPixels} />}
-            <label className="mt-8 rounded-sm border border-gray-300 bg-white px-3 py-1 text-xs font-medium leading-4 text-gray-700 hover:bg-gray-50 hover:text-gray-900 hover:shadow-sm focus:outline-none focus:ring-2 focus:ring-neutral-900 focus:ring-offset-1 dark:border-gray-800 dark:bg-transparent dark:text-white dark:hover:bg-gray-900">
+            <label className="mt-8 rounded-sm border border-gray-300 bg-white px-3 py-1 text-xs font-medium leading-4 text-gray-700 hover:bg-gray-50 hover:text-gray-900 focus:outline-none focus:ring-2 focus:ring-neutral-900 focus:ring-offset-1 dark:border-gray-800 dark:bg-transparent dark:text-white dark:hover:bg-gray-900">
               <input
                 onInput={onInputFile}
                 type="file"

apps/web/components/NavTabs.tsx

@@ -18,6 +18,7 @@ export interface NavTabProps {
     tabName?: string;
     icon?: SVGComponent;
     adminRequired?: boolean;
+    className?: string;
   }[];
   linkProps?: Omit<LinkProps, "href">;
 }
@@ -58,7 +59,7 @@ const NavTabs: FC<NavTabProps> = ({ tabs, linkProps, ...props }) => {
             : noop;
 
           const Component = tab.adminRequired ? AdminRequired : Fragment;
-
+          const className = tab.className || "";
           return (
             <Component key={tab.name}>
               <Link key={tab.name} href={href} {...linkProps}>
@@ -68,14 +69,15 @@ const NavTabs: FC<NavTabProps> = ({ tabs, linkProps, ...props }) => {
                     isCurrent
                       ? "border-neutral-900 text-neutral-900"
                       : "border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700",
-                    "group inline-flex items-center border-b-2 py-4 px-1 text-sm font-medium"
+                    "group inline-flex items-center border-b-2 py-4 px-1 text-sm font-medium",
+                    className
                   )}
                   aria-current={isCurrent ? "page" : undefined}>
                   {tab.icon && (
                     <tab.icon
                       className={classNames(
                         isCurrent ? "text-neutral-900" : "text-gray-400 group-hover:text-gray-500",
-                        "-ml-0.5 hidden h-5 w-5 ltr:mr-2 rtl:ml-2 sm:inline-block"
+                        "-ml-0.5 hidden h-4 w-4 ltr:mr-2 rtl:ml-2 sm:inline-block"
                       )}
                       aria-hidden="true"
                     />

apps/web/components/SettingsShell.tsx

@@ -1,48 +1,41 @@
-import {
-  CreditCardIcon,
-  KeyIcon,
-  LockClosedIcon,
-  UserGroupIcon,
-  UserIcon,
-  CodeIcon,
-} from "@heroicons/react/solid";
 import React, { ComponentProps } from "react";
 
-import ErrorBoundary from "@lib/ErrorBoundary";
+import ErrorBoundary from "@calcom/ui/ErrorBoundary";
+import { Icon } from "@calcom/ui/Icon";
+import Shell from "@calcom/ui/Shell";
 
 import NavTabs from "./NavTabs";
-import Shell from "./Shell";
 
 const tabs = [
   {
     name: "profile",
     href: "/settings/profile",
-    icon: UserIcon,
+    icon: Icon.User,
   },
   {
     name: "teams",
     href: "/settings/teams",
-    icon: UserGroupIcon,
+    icon: Icon.Users,
   },
   {
     name: "security",
     href: "/settings/security",
-    icon: KeyIcon,
+    icon: Icon.Key,
   },
   {
     name: "developer",
     href: "/settings/developer",
-    icon: CodeIcon,
+    icon: Icon.Terminal,
   },
   {
     name: "billing",
     href: "/settings/billing",
-    icon: CreditCardIcon,
+    icon: Icon.CreditCard,
   },
   {
     name: "admin",
     href: "/settings/admin",
-    icon: LockClosedIcon,
+    icon: Icon.Lock,
     adminRequired: true,
   },
 ];

apps/web/components/UpgradeToProDialog.tsx

@@ -1,10 +1,9 @@
-import { InformationCircleIcon } from "@heroicons/react/outline";
 import { Trans } from "next-i18next";
 
+import { useLocale } from "@calcom/lib/hooks/useLocale";
 import Button from "@calcom/ui/Button";
 import { Dialog, DialogClose, DialogContent } from "@calcom/ui/Dialog";
-
-import { useLocale } from "@lib/hooks/useLocale";
+import { Icon } from "@calcom/ui/Icon";
 
 export function UpgradeToProDialog({
   modalOpen,
@@ -20,7 +19,7 @@ export function UpgradeToProDialog({
     <Dialog open={modalOpen}>
       <DialogContent>
         <div className="mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-full bg-yellow-100">
-          <InformationCircleIcon className="h-6 w-6 text-yellow-400" aria-hidden="true" />
+          <Icon.AlertTriangle className="h-6 w-6 text-yellow-400" aria-hidden="true" />
         </div>
         <div className="mb-4 sm:flex sm:items-start">
           <div className="mt-3 sm:mt-0 sm:text-left">
@@ -43,7 +42,7 @@ export function UpgradeToProDialog({
         </div>
         <div className="mt-5 gap-x-2 sm:mt-4 sm:flex sm:flex-row-reverse">
           <DialogClose asChild>
-            <Button className="btn-wide table-cell text-center" onClick={() => setModalOpen(false)}>
+            <Button className="table-cell w-full text-center" onClick={() => setModalOpen(false)}>
               {t("dismiss")}
             </Button>
           </DialogClose>

apps/web/components/apps/AllApps.tsx

@@ -19,6 +19,7 @@ export default function AllApps({ apps }: { apps: App[] }) {
             logo={app.logo}
             rating={app.rating}
             reviews={app.reviews}
+            isProOnly={app.isProOnly}
           />
         ))}
       </div>

apps/web/components/apps/AppCard.tsx

@@ -1,5 +1,7 @@
 import Link from "next/link";
 
+import { trpc } from "@calcom/trpc/react";
+import Badge from "@calcom/ui/Badge";
 import Button from "@calcom/ui/Button";
 
 interface AppCardProps {
@@ -10,9 +12,11 @@ interface AppCardProps {
   description: string;
   rating: number;
   reviews?: number;
+  isProOnly?: boolean;
 }
 
 export default function AppCard(props: AppCardProps) {
+  const { data: user } = trpc.useQuery(["viewer.me"]);
   return (
     <Link href={"/apps/" + props.slug}>
       <a
@@ -32,7 +36,14 @@ export default function AppCard(props: AppCardProps) {
             Add
           </Button>
         </div>
-        <h3 className="font-medium">{props.name}</h3>
+        <div className="flex items-center">
+          <h3 className="font-medium">{props.name}</h3>
+          {props.isProOnly && user?.plan === "FREE" ? (
+            <Badge className="ml-2" variant="default">
+              PRO
+            </Badge>
+          ) : null}
+        </div>
         {/* TODO: add reviews <div className="flex text-sm text-gray-800">
           <span>{props.rating} stars</span> <StarIcon className="ml-1 mt-0.5 h-4 w-4 text-yellow-600" />
           <span className="pl-1 text-gray-500">{props.reviews} reviews</span>

apps/web/components/apps/Slider.tsx

@@ -1,9 +1,10 @@
 import Glide, { Options } from "@glidejs/glide";
 import "@glidejs/glide/dist/css/glide.core.min.css";
 import "@glidejs/glide/dist/css/glide.theme.min.css";
-import { ArrowLeftIcon, ArrowRightIcon } from "@heroicons/react/solid";
 import { useEffect, useRef } from "react";
 
+import { Icon } from "@calcom/ui/Icon";
+
 const Slider = <T extends string | unknown>({
   title = "",
   className = "",
@@ -51,10 +52,10 @@ const Slider = <T extends string | unknown>({
           )}
           <div className="glide__arrows ml-auto" data-glide-el="controls">
             <button data-glide-dir="<" className="mr-4">
-              <ArrowLeftIcon className="h-5 w-5 text-gray-600 hover:text-black" />
+              <Icon.ArrowLeft className="h-5 w-5 text-gray-600 hover:text-black" />
             </button>
             <button data-glide-dir=">">
-              <ArrowRightIcon className="h-5 w-5 text-gray-600 hover:text-black" />
+              <Icon.ArrowRight className="h-5 w-5 text-gray-600 hover:text-black" />
             </button>
           </div>
         </div>

apps/web/components/apps/TrendingAppsSlider.tsx

@@ -30,6 +30,7 @@ const TrendingAppsSlider = <T extends App>({ items }: { items: T[] }) => {
           logo={app.logo}
           rating={app.rating}
           reviews={app.reviews}
+          isProOnly={app.isProOnly}
         />
       )}
     />

apps/web/components/auth/SAMLLogin.tsx

@@ -2,11 +2,11 @@ import { signIn } from "next-auth/react";
 import { Dispatch, SetStateAction } from "react";
 import { useFormContext } from "react-hook-form";
 
+import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
+import { trpc } from "@calcom/trpc/react";
 import Button from "@calcom/ui/Button";
 
 import { useLocale } from "@lib/hooks/useLocale";
-import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@lib/telemetry";
-import { trpc } from "@lib/trpc";
 
 interface Props {
   email: string;
@@ -34,7 +34,7 @@ export default function SAMLLogin(props: Props) {
     <div className="mt-5">
       <Button
         color="secondary"
-        data-testid={"saml"}
+        data-testid="saml"
         className="flex w-full justify-center"
         onClick={async (event) => {
           event.preventDefault();

apps/web/components/availability/NewScheduleButton.tsx

@@ -1,15 +1,15 @@
-import { PlusIcon } from "@heroicons/react/solid";
 import { useRouter } from "next/router";
 import { useForm } from "react-hook-form";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import showToast from "@calcom/lib/notification";
+import { trpc } from "@calcom/trpc/react";
 import { Button } from "@calcom/ui";
 import { Dialog, DialogClose, DialogContent, DialogTrigger } from "@calcom/ui/Dialog";
+import { Icon } from "@calcom/ui/Icon";
 import { Form } from "@calcom/ui/form/fields";
 
 import { HttpError } from "@lib/core/http/error";
-import { trpc } from "@lib/trpc";
 
 export function NewScheduleButton({ name = "new-schedule" }: { name?: string }) {
   const router = useRouter();
@@ -41,7 +41,7 @@ export function NewScheduleButton({ name = "new-schedule" }: { name?: string })
   return (
     <Dialog name={name} clearQueryParamsOnClose={["copy-schedule-id"]}>
       <DialogTrigger asChild>
-        <Button data-testid={name} StartIcon={PlusIcon}>
+        <Button data-testid={name} StartIcon={Icon.Plus}>
           {t("new_schedule_btn")}
         </Button>
       </DialogTrigger>
@@ -65,7 +65,7 @@ export function NewScheduleButton({ name = "new-schedule" }: { name?: string })
                 type="text"
                 id="name"
                 required
-                className="block w-full rounded-sm border-gray-300 text-sm shadow-sm"
+                className="block w-full rounded-sm border-gray-300 text-sm"
                 placeholder={t("default_schedule_name")}
                 {...register("name")}
               />

apps/web/components/availability/Schedule.tsx

@@ -1,16 +1,14 @@
-import { PlusIcon, TrashIcon } from "@heroicons/react/outline";
-import { DuplicateIcon } from "@heroicons/react/solid";
 import classNames from "classnames";
-import dayjs, { Dayjs, ConfigType } from "dayjs";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import { Controller, useFieldArray, useFormContext } from "react-hook-form";
 import { GroupBase, Props } from "react-select";
 
+import dayjs, { Dayjs, ConfigType } from "@calcom/dayjs";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import Button from "@calcom/ui/Button";
-import Dropdown, { DropdownMenuTrigger, DropdownMenuContent } from "@calcom/ui/Dropdown";
+import Dropdown, { DropdownMenuContent } from "@calcom/ui/Dropdown";
+import { Icon } from "@calcom/ui/Icon";
+import { Tooltip } from "@calcom/ui/Tooltip";
 
 import { defaultDayRange } from "@lib/availability";
 import { weekdayNames } from "@lib/core/i18n/weekday";
@@ -19,9 +17,6 @@ import { TimeRange } from "@lib/types/schedule";
 
 import Select from "@components/ui/form/Select";
 
-dayjs.extend(utc);
-dayjs.extend(timezone);
-
 /** Begin Time Increments For Select */
 const increment = 15;
 
@@ -207,7 +202,7 @@ export const DayRanges = ({
   const { setValue, watch } = useFormContext();
   // XXX: Hack to make copying times work; `fields` is out of date until save.
   const watcher = watch(name);
-
+  const { t } = useLocale();
   const { fields, replace, append, remove } = useFieldArray({
     name,
   });
@@ -235,36 +230,38 @@ export const DayRanges = ({
     <div className="space-y-2">
       {fields.map((field, index) => (
         <div key={field.id} className="flex items-center rtl:space-x-reverse">
-          <div className="flex flex-grow sm:flex-grow-0">
+          <div className="flex flex-grow space-x-1 sm:flex-grow-0">
             <TimeRangeField name={`${name}.${index}`} />
             <Button
+              type="button"
               size="icon"
               color="minimal"
-              StartIcon={TrashIcon}
-              type="button"
+              StartIcon={Icon.Trash}
               onClick={() => remove(index)}
             />
           </div>
           {index === 0 && (
             <div className="absolute top-2 right-0 text-right sm:relative sm:top-0 sm:flex-grow">
-              <Button
-                className="text-neutral-400"
-                type="button"
-                color="minimal"
-                size="icon"
-                StartIcon={PlusIcon}
-                onClick={handleAppend}
-              />
+              <Tooltip content={t("add_time_availability") as string}>
+                <Button
+                  className="text-neutral-400"
+                  type="button"
+                  color="minimal"
+                  size="icon"
+                  StartIcon={Icon.Plus}
+                  onClick={handleAppend}
+                />
+              </Tooltip>
               <Dropdown>
-                <DropdownMenuTrigger asChild>
+                <Tooltip content={t("duplicate") as string}>
                   <Button
                     type="button"
                     color="minimal"
                     size="icon"
-                    StartIcon={DuplicateIcon}
+                    StartIcon={Icon.Copy}
                     onClick={handleAppend}
                   />
-                </DropdownMenuTrigger>
+                </Tooltip>
                 <DropdownMenuContent>
                   <CopyTimes
                     disabled={[parseInt(name.substring(name.lastIndexOf(".") + 1), 10)]}

apps/web/components/availability/ScheduleListItem.tsx

@@ -1,14 +1,13 @@
-import { DotsHorizontalIcon, TrashIcon } from "@heroicons/react/solid";
 import Link from "next/link";
 import { Fragment } from "react";
 
 import { availabilityAsString } from "@calcom/lib/availability";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Availability } from "@calcom/prisma/client";
+import { inferQueryOutput } from "@calcom/trpc/react";
 import { Button } from "@calcom/ui";
 import Dropdown, { DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@calcom/ui/Dropdown";
-
-import { inferQueryOutput } from "@lib/trpc";
+import { Icon } from "@calcom/ui/Icon";
 
 export function ScheduleListItem({
   schedule,
@@ -48,7 +47,7 @@ export function ScheduleListItem({
         </div>
         <Dropdown>
           <DropdownMenuTrigger className="group mr-5 h-10 w-10 border border-transparent p-0 text-neutral-500 hover:border-gray-200">
-            <DotsHorizontalIcon className="h-5 w-5 group-hover:text-gray-800" />
+            <Icon.MoreHorizontal className="h-5 w-5 group-hover:text-gray-800" />
           </DropdownMenuTrigger>
           <DropdownMenuContent>
             <DropdownMenuItem>
@@ -62,7 +61,7 @@ export function ScheduleListItem({
                 type="button"
                 color="warn"
                 className="w-full font-normal"
-                StartIcon={isDeleting ? undefined : TrashIcon}
+                StartIcon={isDeleting ? undefined : Icon.Trash}
                 loading={isDeleting}>
                 {isDeleting ? t("deleting") : t("delete_schedule")}
               </Button>

apps/web/components/availability/SkeletonLoader.tsx

@@ -19,13 +19,13 @@ function SkeletonItem() {
     <li className="group flex w-full items-center justify-between px-2 py-[23px] sm:px-6">
       <div className="flex-grow truncate text-sm">
         <div className="flex flex-col space-y-2">
-          <SkeletonText width="32" height="4"></SkeletonText>
-          <SkeletonText width="32" height="2"></SkeletonText>
+          <SkeletonText width="32" height="4" />
+          <SkeletonText width="32" height="2" />
         </div>
       </div>
       <div className="mt-4 hidden flex-shrink-0 sm:mt-0 sm:ml-5 lg:flex">
         <div className="flex justify-between space-x-2 rtl:space-x-reverse">
-          <SkeletonText width="12" height="6"></SkeletonText>
+          <SkeletonText width="12" height="6" />
         </div>
       </div>
     </li>
@@ -37,8 +37,8 @@ export const AvailabilitySelectSkeletonLoader = () => {
     <li className="group flex w-full items-center justify-between rounded-sm border border-gray-200 px-[10px] py-3">
       <div className="flex-grow truncate text-sm">
         <div className="flex justify-between">
-          <SkeletonText width="32" height="4"></SkeletonText>
-          <SkeletonText width="4" height="4"></SkeletonText>
+          <SkeletonText width="32" height="4" />
+          <SkeletonText width="4" height="4" />
         </div>
       </div>
     </li>

apps/web/components/booking/AvailableTimes.tsx

@@ -1,18 +1,17 @@
 import { SchedulingType } from "@prisma/client";
-import dayjs, { Dayjs } from "dayjs";
 import Link from "next/link";
 import { useRouter } from "next/router";
 import { FC, useEffect, useState } from "react";
 
+import dayjs, { Dayjs } from "@calcom/dayjs";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { nameOfDay } from "@calcom/lib/weekday";
+import type { Slot } from "@calcom/trpc/server/routers/viewer/slots";
 import { SkeletonContainer, SkeletonText } from "@calcom/ui";
 
 import classNames from "@lib/classNames";
 import { timeZone } from "@lib/clock";
 
-import type { Slot } from "@server/routers/viewer/slots";
-
 type AvailableTimesProps = {
   timeFormat: string;
   eventTypeId: number;
@@ -102,10 +101,10 @@ const AvailableTimes: FC<AvailableTimesProps> = ({
                       brand === "#fff" || brand === "#ffffff" ? "border-brandcontrast" : "border-brand"
                     )}>
                     {dayjs(slot.time).tz(timeZone()).format(timeFormat)}
-                    {!!seatsPerTimeSlot && <p className={`text-sm`}>{t("booking_full")}</p>}
+                    {!!seatsPerTimeSlot && <p className="text-sm">{t("booking_full")}</p>}
                   </div>
                 ) : (
-                  <Link href={bookingUrl}>
+                  <Link href={bookingUrl} prefetch={false}>
                     <a
                       className={classNames(
                         "text-primary-500 hover:bg-brand hover:text-brandcontrast dark:hover:bg-darkmodebrand dark:hover:text-darkmodebrandcontrast mb-2 block rounded-sm border bg-white py-4 font-medium hover:text-white dark:border-transparent dark:bg-gray-600 dark:text-neutral-200 dark:hover:border-black",

apps/web/components/booking/BookingListItem.tsx

@@ -1,26 +1,17 @@
-import {
-  BanIcon,
-  CheckIcon,
-  ClockIcon,
-  LocationMarkerIcon,
-  PaperAirplaneIcon,
-  PencilAltIcon,
-  XIcon,
-} from "@heroicons/react/outline";
-import { RefreshIcon } from "@heroicons/react/solid";
 import { BookingStatus } from "@prisma/client";
-import dayjs from "dayjs";
 import { useRouter } from "next/router";
 import { useState } from "react";
 import { useMutation } from "react-query";
 
-import { parseRecurringEvent } from "@calcom/lib";
+import dayjs from "@calcom/dayjs";
 import classNames from "@calcom/lib/classNames";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import showToast from "@calcom/lib/notification";
 import { getEveryFreqFor } from "@calcom/lib/recurringStrings";
+import { inferQueryInput, inferQueryOutput, trpc } from "@calcom/trpc/react";
 import Button from "@calcom/ui/Button";
 import { Dialog, DialogClose, DialogContent, DialogFooter, DialogHeader } from "@calcom/ui/Dialog";
+import { Icon } from "@calcom/ui/Icon";
 import { Tooltip } from "@calcom/ui/Tooltip";
 import { TextArea } from "@calcom/ui/form/fields";
 
@@ -28,8 +19,7 @@ import { HttpError } from "@lib/core/http/error";
 import useMeQuery from "@lib/hooks/useMeQuery";
 import { linkValueToString } from "@lib/linkValueToString";
 import { LocationType } from "@lib/location";
-import { parseRecurringDates } from "@lib/parseDate";
-import { inferQueryInput, inferQueryOutput, trpc } from "@lib/trpc";
+import { extractRecurringDates } from "@lib/parseDate";
 
 import { EditLocationDialog } from "@components/dialog/EditLocationDialog";
 import { RescheduleDialog } from "@components/dialog/RescheduleDialog";
@@ -41,7 +31,7 @@ type BookingItem = inferQueryOutput<"viewer.bookings">["bookings"][number];
 
 type BookingItemProps = BookingItem & {
   listingStatus: BookingListingStatus;
-  recurringCount?: number;
+  recurringBookings?: BookingItem[];
 };
 
 function BookingListItem(booking: BookingItemProps) {
@@ -102,7 +92,7 @@ function BookingListItem(booking: BookingItemProps) {
       onClick: () => {
         setRejectionDialogIsOpen(true);
       },
-      icon: BanIcon,
+      icon: Icon.Slash,
       disabled: mutation.isLoading,
     },
     {
@@ -114,7 +104,7 @@ function BookingListItem(booking: BookingItemProps) {
       onClick: () => {
         mutation.mutate(true);
       },
-      icon: CheckIcon,
+      icon: Icon.Check,
       disabled: mutation.isLoading,
       color: "primary",
     },
@@ -127,23 +117,29 @@ function BookingListItem(booking: BookingItemProps) {
         booking.listingStatus === "recurring" && booking.recurringEventId !== null
           ? t("cancel_all_remaining")
           : t("cancel"),
-      href: `/cancel/${booking.uid}`,
-      icon: XIcon,
+      /* When cancelling we need to let the UI and the API know if the intention is to
+         cancel all remaining bookings or just that booking instance. */
+      href: `/cancel/${booking.uid}${
+        booking.listingStatus === "recurring" && booking.recurringEventId !== null
+          ? "?allRemainingBookings=true"
+          : ""
+      }`,
+      icon: Icon.X,
     },
     {
       id: "edit_booking",
       label: t("edit_booking"),
-      icon: PencilAltIcon,
+      icon: Icon.Edit,
       actions: [
         {
           id: "reschedule",
-          icon: ClockIcon,
+          icon: Icon.Clock,
           label: t("reschedule_booking"),
           href: `/reschedule/${booking.uid}`,
         },
         {
           id: "reschedule_request",
-          icon: PaperAirplaneIcon,
+          icon: Icon.Send,
           iconClassName: "rotate-45 w-[18px] -ml-[2px]",
           label: t("send_reschedule_request"),
           onClick: () => {
@@ -156,7 +152,7 @@ function BookingListItem(booking: BookingItemProps) {
           onClick: () => {
             setIsOpenLocationDialog(true);
           },
-          icon: LocationMarkerIcon,
+          icon: Icon.MapPin,
         },
       ],
     },
@@ -169,7 +165,7 @@ function BookingListItem(booking: BookingItemProps) {
   const RequestSentMessage = () => {
     return (
       <div className="ml-1 mr-8 flex text-gray-500" data-testid="request_reschedule_sent">
-        <PaperAirplaneIcon className="-mt-[1px] w-4 rotate-45" />
+        <Icon.Send className="-mt-[1px] w-4 rotate-45" />
         <p className="ml-2 ">{t("reschedule_request_sent")}</p>
       </div>
     );
@@ -202,13 +198,10 @@ function BookingListItem(booking: BookingItemProps) {
   let recurringStrings: string[] = [];
   let recurringDates: Date[] = [];
   const today = new Date();
-  if (booking.recurringCount && booking.eventType.recurringEvent?.freq !== undefined) {
-    [recurringStrings, recurringDates] = parseRecurringDates(
-      {
-        startDate: booking.startTime,
-        recurringEvent: parseRecurringEvent(booking.eventType.recurringEvent),
-        recurringCount: booking.recurringCount,
-      },
+  if (booking.recurringBookings && booking.eventType.recurringEvent?.freq !== undefined) {
+    [recurringStrings, recurringDates] = extractRecurringDates(
+      booking.recurringBookings,
+      user?.timeZone,
       i18n
     );
     if (booking.status === BookingStatus.PENDING) {
@@ -307,7 +300,7 @@ function BookingListItem(booking: BookingItemProps) {
               {dayjs(booking.endTime).format(user && user.timeFormat === 12 ? "h:mma" : "HH:mm")}
             </div>
             <div className="text-sm text-gray-400">
-              {booking.recurringCount &&
+              {booking.recurringBookings &&
                 booking.eventType?.recurringEvent?.freq &&
                 (booking.listingStatus === "recurring" || booking.listingStatus === "cancelled") && (
                   <div className="underline decoration-gray-400 decoration-dashed underline-offset-2">
@@ -317,7 +310,7 @@ function BookingListItem(booking: BookingItemProps) {
                           <p key={key}>{aDate}</p>
                         ))}>
                         <div className="text-gray-600 dark:text-white">
-                          <RefreshIcon className="float-left mr-1 mt-[2px] inline-block h-4 w-4 text-gray-400" />
+                          <Icon.RefreshCcw className="float-left mr-1 mt-[2px] inline-block h-4 w-4 text-gray-400" />
                           <p className="pl-[21px]">
                             {booking.status === BookingStatus.ACCEPTED
                               ? `${t("event_remaining", {
@@ -326,7 +319,7 @@ function BookingListItem(booking: BookingItemProps) {
                               : getEveryFreqFor({
                                   t,
                                   recurringEvent: booking.eventType.recurringEvent,
-                                  recurringCount: booking.recurringCount,
+                                  recurringCount: booking.recurringBookings.length,
                                 })}
                           </p>
                         </div>

apps/web/components/booking/CancelBooking.tsx

@@ -1,13 +1,12 @@
-import { XIcon } from "@heroicons/react/solid";
 import { useRouter } from "next/router";
 import { useState } from "react";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { RecurringEvent } from "@calcom/types/Calendar";
+import useTheme from "@calcom/lib/hooks/useTheme";
+import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
+import type { RecurringEvent } from "@calcom/types/Calendar";
 import { Button } from "@calcom/ui/Button";
-
-import useTheme from "@lib/hooks/useTheme";
-import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@lib/telemetry";
+import { Icon } from "@calcom/ui/Icon";
 
 type Props = {
   booking: {
@@ -32,90 +31,86 @@ export default function CancelBooking(props: Props) {
   const [loading, setLoading] = useState(false);
   const telemetry = useTelemetry();
   const [error, setError] = useState<string | null>(booking ? null : t("booking_already_cancelled"));
-  const { isReady, Theme } = useTheme(props.theme);
+  useTheme(props.theme);
 
-  if (isReady) {
-    return (
-      <>
-        <Theme />
-        {error && (
-          <div>
-            <div className="mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-red-100">
-              <XIcon className="h-6 w-6 text-red-600" />
-            </div>
-            <div className="mt-3 text-center sm:mt-5">
-              <h3 className="text-lg font-medium leading-6 text-gray-900" id="modal-title">
-                {error}
-              </h3>
-            </div>
+  return (
+    <>
+      {error && (
+        <div>
+          <div className="mx-auto flex h-12 w-12 items-center justify-center rounded-full bg-red-100">
+            <Icon.X className="h-6 w-6 text-red-600" />
           </div>
-        )}
-        {!error && (
-          <div className="mt-5 sm:mt-6">
-            <label className="text-bookingdark font-medium dark:text-white">{t("cancellation_reason")}</label>
-            <textarea
-              placeholder={t("cancellation_reason_placeholder")}
-              value={cancellationReason}
-              onChange={(e) => setCancellationReason(e.target.value)}
-              className="mt-2 mb-3 w-full dark:border-gray-900 dark:bg-gray-700 dark:text-white sm:mb-3 "
-              rows={3}
-            />
-            <div className="flex rtl:space-x-reverse">
-              {!props.recurringEvent && (
-                <div className="w-full">
-                  <Button color="secondary" onClick={() => router.push("/reschedule/" + booking?.uid)}>
-                    {t("reschedule_this")}
-                  </Button>
-                </div>
-              )}
-              <div className="w-full space-x-2 text-right">
-                <Button color="secondary" onClick={() => props.setIsCancellationMode(false)}>
-                  {t("nevermind")}
-                </Button>
-                <Button
-                  data-testid="cancel"
-                  onClick={async () => {
-                    setLoading(true);
-
-                    const payload = {
-                      uid: booking?.uid,
-                      reason: cancellationReason,
-                    };
-
-                    telemetry.event(telemetryEventTypes.bookingCancelled, collectPageParameters());
-
-                    const res = await fetch("/api/cancel", {
-                      body: JSON.stringify(payload),
-                      headers: {
-                        "Content-Type": "application/json",
-                      },
-                      method: "DELETE",
-                    });
-
-                    if (res.status >= 200 && res.status < 300) {
-                      await router.push(
-                        `/cancel/success?name=${props.profile.name}&title=${booking?.title}&eventPage=${
-                          profile.slug
-                        }&team=${team ? 1 : 0}&recurring=${!!props.recurringEvent}`
-                      );
-                    } else {
-                      setLoading(false);
-                      setError(
-                        `${t("error_with_status_code_occured", { status: res.status })} ${t(
-                          "please_try_again"
-                        )}`
-                      );
-                    }
-                  }}
-                  loading={loading}>
-                  {t("cancel_event")}
+          <div className="mt-3 text-center sm:mt-5">
+            <h3 className="text-lg font-medium leading-6 text-gray-900" id="modal-title">
+              {error}
+            </h3>
+          </div>
+        </div>
+      )}
+      {!error && (
+        <div className="mt-5 sm:mt-6">
+          <label className="text-bookingdark font-medium dark:text-white">{t("cancellation_reason")}</label>
+          <textarea
+            placeholder={t("cancellation_reason_placeholder")}
+            value={cancellationReason}
+            onChange={(e) => setCancellationReason(e.target.value)}
+            className="mt-2 mb-3 w-full dark:border-gray-900 dark:bg-gray-700 dark:text-white sm:mb-3 "
+            rows={3}
+          />
+          <div className="flex rtl:space-x-reverse">
+            {!props.recurringEvent && (
+              <div className="w-full">
+                <Button color="secondary" onClick={() => router.push("/reschedule/" + booking?.uid)}>
+                  {t("reschedule_this")}
                 </Button>
               </div>
+            )}
+            <div className="w-full space-x-2 text-right">
+              <Button color="secondary" onClick={() => props.setIsCancellationMode(false)}>
+                {t("nevermind")}
+              </Button>
+              <Button
+                data-testid="cancel"
+                onClick={async () => {
+                  setLoading(true);
+
+                  const payload = {
+                    uid: booking?.uid,
+                    reason: cancellationReason,
+                  };
+
+                  telemetry.event(telemetryEventTypes.bookingCancelled, collectPageParameters());
+
+                  const res = await fetch("/api/cancel", {
+                    body: JSON.stringify(payload),
+                    headers: {
+                      "Content-Type": "application/json",
+                    },
+                    method: "DELETE",
+                  });
+
+                  if (res.status >= 200 && res.status < 300) {
+                    await router.push(
+                      `/cancel/success?name=${props.profile.name}&title=${booking?.title}&eventPage=${
+                        profile.slug
+                      }&team=${team ? 1 : 0}&recurring=${!!props.recurringEvent}`
+                    );
+                  } else {
+                    setLoading(false);
+                    setError(
+                      `${t("error_with_status_code_occured", { status: res.status })} ${t(
+                        "please_try_again"
+                      )}`
+                    );
+                  }
+                }}
+                loading={loading}>
+                {t("cancel_event")}
+              </Button>
             </div>
           </div>
-        )}
-      </>
-    );
-  }
-  return <></>;
+        </div>
+      )}
+    </>
+  );
 }

apps/web/components/booking/DatePicker.tsx

@@ -1,269 +0,0 @@
-import { ChevronLeftIcon, ChevronRightIcon } from "@heroicons/react/solid";
-import { PeriodType } from "@prisma/client";
-import dayjs, { Dayjs } from "dayjs";
-import dayjsBusinessTime from "dayjs-business-days2";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
-import { memoize } from "lodash";
-import { useEffect, useRef, useState } from "react";
-
-import { useEmbedStyles } from "@calcom/embed-core/embed-iframe";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-
-import classNames from "@lib/classNames";
-import { timeZone } from "@lib/clock";
-import { weekdayNames } from "@lib/core/i18n/weekday";
-import { doWorkAsync } from "@lib/doWorkAsync";
-import isOutOfBounds from "@lib/isOutOfBounds";
-import getSlots from "@lib/slots";
-import { WorkingHours } from "@lib/types/schedule";
-
-import Loader from "@components/Loader";
-
-dayjs.extend(dayjsBusinessTime);
-dayjs.extend(utc);
-dayjs.extend(timezone);
-
-type DatePickerProps = {
-  weekStart: string;
-  onDatePicked: (pickedDate: Dayjs) => void;
-  workingHours: WorkingHours[];
-  eventLength: number;
-  date: Dayjs | null;
-  periodType: PeriodType;
-  periodStartDate: Date | null;
-  periodEndDate: Date | null;
-  periodDays: number | null;
-  periodCountCalendarDays: boolean | null;
-  minimumBookingNotice: number;
-};
-
-function DatePicker({
-  weekStart,
-  onDatePicked,
-  workingHours,
-  eventLength,
-  date,
-  periodType = PeriodType.UNLIMITED,
-  periodStartDate,
-  periodEndDate,
-  periodDays,
-  periodCountCalendarDays,
-  minimumBookingNotice,
-}: DatePickerProps): JSX.Element {
-  const { i18n } = useLocale();
-  const [browsingDate, setBrowsingDate] = useState<Dayjs | null>(date);
-  const enabledDateButtonEmbedStyles = useEmbedStyles("enabledDateButton");
-  const disabledDateButtonEmbedStyles = useEmbedStyles("disabledDateButton");
-  const [month, setMonth] = useState<string>("");
-  const [year, setYear] = useState<string>("");
-  const [isFirstMonth, setIsFirstMonth] = useState<boolean>(false);
-  const [daysFromState, setDays] = useState<
-    | {
-        disabled: boolean;
-        date: number;
-      }[]
-    | null
-  >(null);
-  useEffect(() => {
-    if (!browsingDate || (date && browsingDate.utcOffset() !== date?.utcOffset())) {
-      setBrowsingDate(date || dayjs().tz(timeZone()));
-    }
-  }, [date, browsingDate]);
-
-  useEffect(() => {
-    if (browsingDate) {
-      setMonth(browsingDate.toDate().toLocaleString(i18n.language, { month: "long" }));
-      setYear(browsingDate.format("YYYY"));
-      setIsFirstMonth(browsingDate.startOf("month").isBefore(dayjs()));
-      setDays(null);
-    }
-  }, [browsingDate, i18n.language]);
-
-  const isDisabled = (
-    day: number,
-    {
-      browsingDate,
-      periodType,
-      periodStartDate,
-      periodEndDate,
-      periodCountCalendarDays,
-      periodDays,
-      eventLength,
-      minimumBookingNotice,
-      workingHours,
-    }: Omit<DatePickerProps, "weekStart" | "onDatePicked" | "date"> & {
-      browsingDate: Dayjs;
-    }
-  ) => {
-    const date = browsingDate.startOf("day").date(day);
-    return (
-      isOutOfBounds(date, {
-        periodType,
-        periodStartDate,
-        periodEndDate,
-        periodCountCalendarDays,
-        periodDays,
-      }) ||
-      !getSlots({
-        inviteeDate: date,
-        frequency: eventLength,
-        minimumBookingNotice,
-        workingHours,
-        eventLength,
-      }).length
-    );
-  };
-
-  const isDisabledRef = useRef(
-    memoize(isDisabled, (day, { browsingDate }) => {
-      // Make a composite cache key
-      return day + "_" + browsingDate.toString();
-    })
-  );
-
-  const days = (() => {
-    if (!browsingDate) {
-      return [];
-    }
-    if (daysFromState) {
-      return daysFromState;
-    }
-    // Create placeholder elements for empty days in first week
-    let weekdayOfFirst = browsingDate.date(1).day();
-    if (weekStart === "Monday") {
-      weekdayOfFirst -= 1;
-      if (weekdayOfFirst < 0) weekdayOfFirst = 6;
-    }
-
-    const days = Array(weekdayOfFirst).fill(null);
-
-    const isDisabledMemoized = isDisabledRef.current;
-
-    const daysInMonth = browsingDate.daysInMonth();
-    const daysInitialOffset = days.length;
-
-    // Build UI with All dates disabled
-    for (let i = 1; i <= daysInMonth; i++) {
-      days.push({
-        disabled: true,
-        date: i,
-      });
-    }
-
-    // Update dates with their availability
-    doWorkAsync({
-      batch: 1,
-      name: "DatePicker",
-      length: daysInMonth,
-      callback: (i: number) => {
-        const day = i + 1;
-        days[daysInitialOffset + i] = {
-          disabled: isDisabledMemoized(day, {
-            browsingDate,
-            periodType,
-            periodStartDate,
-            periodEndDate,
-            periodCountCalendarDays,
-            periodDays,
-            eventLength,
-            minimumBookingNotice,
-            workingHours,
-          }),
-          date: day,
-        };
-      },
-      batchDone: () => {
-        setDays([...days]);
-      },
-    });
-
-    return days;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  })();
-
-  if (!browsingDate) {
-    return <Loader />;
-  }
-
-  // Handle month changes
-  const incrementMonth = () => {
-    setBrowsingDate(browsingDate?.add(1, "month"));
-  };
-
-  const decrementMonth = () => {
-    setBrowsingDate(browsingDate?.subtract(1, "month"));
-  };
-
-  return (
-    <div
-      className={
-        "mt-8 sm:mt-0 sm:min-w-[455px] " +
-        (date
-          ? "w-full sm:w-1/2 sm:border-r sm:pl-4 sm:pr-6 sm:dark:border-gray-700 md:w-1/3 "
-          : "w-full sm:pl-4")
-      }>
-      <div className="mb-4 flex text-xl font-light">
-        <span className="w-1/2 dark:text-white">
-          <strong className="text-bookingdarker dark:text-white">{month}</strong>{" "}
-          <span className="text-bookinglight">{year}</span>
-        </span>
-        <div className="w-1/2 text-right dark:text-gray-400">
-          <button
-            onClick={decrementMonth}
-            className={classNames(
-              "group p-1 ltr:mr-2 rtl:ml-2",
-              isFirstMonth && "text-bookinglighter dark:text-gray-600"
-            )}
-            disabled={isFirstMonth}
-            data-testid="decrementMonth">
-            <ChevronLeftIcon className="h-5 w-5 group-hover:text-black dark:group-hover:text-white" />
-          </button>
-          <button className="group p-1" onClick={incrementMonth} data-testid="incrementMonth">
-            <ChevronRightIcon className="h-5 w-5 group-hover:text-black dark:group-hover:text-white" />
-          </button>
-        </div>
-      </div>
-      <div className="border-bookinglightest grid grid-cols-7 gap-4 border-t border-b text-center dark:border-gray-800 sm:border-0">
-        {weekdayNames(i18n.language, weekStart === "Sunday" ? 0 : 1, "short").map((weekDay) => (
-          <div key={weekDay} className="text-bookinglight my-4 text-xs uppercase tracking-widest">
-            {weekDay}
-          </div>
-        ))}
-      </div>
-      <div className="grid grid-cols-7 gap-2 text-center">
-        {days.map((day, idx) => (
-          <div
-            key={day === null ? `e-${idx}` : `day-${day.date}`}
-            style={{
-              paddingTop: "100%",
-            }}
-            className="relative w-full">
-            {day === null ? (
-              <div key={`e-${idx}`} />
-            ) : (
-              <button
-                onClick={() => onDatePicked(browsingDate.date(day.date))}
-                disabled={day.disabled}
-                style={
-                  day.disabled ? { ...disabledDateButtonEmbedStyles } : { ...enabledDateButtonEmbedStyles }
-                }
-                className={classNames(
-                  "hover:border-brand disabled:text-bookinglighter absolute top-0 left-0 right-0 bottom-0 mx-auto w-full rounded-sm text-center font-medium hover:border disabled:cursor-default disabled:font-light disabled:hover:border-0 dark:hover:border-white",
-                  date && date.isSame(browsingDate.date(day.date), "day")
-                    ? "bg-brand text-brandcontrast dark:bg-darkmodebrand dark:text-darkmodebrandcontrast disabled:bg-gray-100 disabled:dark:bg-gray-600 disabled:dark:text-white"
-                    : ""
-                )}
-                data-testid="day"
-                data-disabled={day.disabled}>
-                {day.date}
-              </button>
-            )}
-          </div>
-        ))}
-      </div>
-    </div>
-  );
-}
-
-export default DatePicker;

apps/web/components/booking/TimeOptions.tsx

@@ -1,21 +1,20 @@
 import { FC, useEffect, useState } from "react";
 
+import { useLocale } from "@calcom/lib/hooks/useLocale";
 import Switch from "@calcom/ui/Switch";
-
-import { useLocale } from "@lib/hooks/useLocale";
-
-import TimezoneSelect, { ITimezoneOption } from "@components/ui/form/TimezoneSelect";
+import TimezoneSelect, { ITimezoneOption } from "@calcom/ui/form/TimezoneSelect";
 
 import { is24h, timeZone } from "../../lib/clock";
 
 type Props = {
   onSelectTimeZone: (selectedTimeZone: string) => void;
   onToggle24hClock: (is24hClock: boolean) => void;
+  timeFormat: string;
 };
 
-const TimeOptions: FC<Props> = ({ onToggle24hClock, onSelectTimeZone }) => {
+const TimeOptions: FC<Props> = ({ onToggle24hClock, onSelectTimeZone, timeFormat }) => {
   const [selectedTimeZone, setSelectedTimeZone] = useState("");
-  const [is24hClock, setIs24hClock] = useState(false);
+  const [is24hClock, setIs24hClock] = useState(timeFormat === "HH:mm" && true);
   const { t } = useLocale();
 
   useEffect(() => {
@@ -53,7 +52,7 @@ const TimeOptions: FC<Props> = ({ onToggle24hClock, onSelectTimeZone }) => {
         id="timeZone"
         value={selectedTimeZone}
         onChange={(tz: ITimezoneOption) => setSelectedTimeZone(tz.value)}
-        className="focus:border-brand mt-1 mb-2 block w-full rounded-md border-gray-300 shadow-sm focus:ring-black sm:text-sm"
+        className="focus:border-brand mt-1 mb-2 block w-full rounded-md border-gray-300 text-sm focus:ring-black"
       />
     </div>
   ) : null;

apps/web/components/booking/pages/AvailabilityPage.tsx

@@ -1,24 +1,6 @@
 // Get router variables
-import {
-  ArrowLeftIcon,
-  ChevronDownIcon,
-  ChevronUpIcon,
-  ClipboardCheckIcon,
-  ClockIcon,
-  CreditCardIcon,
-  GlobeIcon,
-  InformationCircleIcon,
-  LocationMarkerIcon,
-  RefreshIcon,
-  VideoCameraIcon,
-} from "@heroicons/react/solid";
 import { EventType } from "@prisma/client";
 import * as Collapsible from "@radix-ui/react-collapsible";
-import { useContracts } from "contexts/contractsContext";
-import dayjs, { Dayjs } from "dayjs";
-import customParseFormat from "dayjs/plugin/customParseFormat";
-import timeZone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
 import { TFunction } from "next-i18next";
 import { useRouter } from "next/router";
 import { useEffect, useMemo, useState } from "react";
@@ -26,31 +8,32 @@ import { FormattedNumber, IntlProvider } from "react-intl";
 import { z } from "zod";
 
 import { AppStoreLocationType, LocationObject, LocationType } from "@calcom/app-store/locations";
+import dayjs, { Dayjs } from "@calcom/dayjs";
 import {
-  useEmbedNonStylesConfig,
-  useEmbedStyles,
-  useIsBackgroundTransparent,
   useIsEmbed,
+  useEmbedStyles,
+  useEmbedNonStylesConfig,
+  useIsBackgroundTransparent,
 } from "@calcom/embed-core/embed-iframe";
+import { useContracts } from "@calcom/features/ee/web3/contexts/contractsContext";
+import CustomBranding from "@calcom/lib/CustomBranding";
 import classNames from "@calcom/lib/classNames";
-import { CAL_URL, WEBAPP_URL } from "@calcom/lib/constants";
-import { yyyymmdd } from "@calcom/lib/date-fns";
+import { CAL_URL, WEBSITE_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import useTheme from "@calcom/lib/hooks/useTheme";
 import { getRecurringFreq } from "@calcom/lib/recurringStrings";
+import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
+import { detectBrowserTimeFormat } from "@calcom/lib/timeFormat";
 import { localStorage } from "@calcom/lib/webstorage";
+import { trpc } from "@calcom/trpc/react";
+import { Icon } from "@calcom/ui/Icon";
 import DatePicker from "@calcom/ui/booker/DatePicker";
 
-import { asStringOrUndefined } from "@lib/asStringOrNull";
 import { timeZone as localStorageTimeZone } from "@lib/clock";
 // import { timeZone } from "@lib/clock";
 import { useExposePlanGlobally } from "@lib/hooks/useExposePlanGlobally";
-import useTheme from "@lib/hooks/useTheme";
 import { isBrandingHidden } from "@lib/isBrandingHidden";
-import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@lib/telemetry";
-import { detectBrowserTimeFormat } from "@lib/timeFormat";
-import { trpc } from "@lib/trpc";
 
-import CustomBranding from "@components/CustomBranding";
 import AvailableTimes from "@components/booking/AvailableTimes";
 import TimeOptions from "@components/booking/TimeOptions";
 import { HeadSeo } from "@components/seo/head-seo";
@@ -61,10 +44,6 @@ import type { AvailabilityPageProps } from "../../../pages/[user]/[type]";
 import type { DynamicAvailabilityPageProps } from "../../../pages/d/[link]/[slug]";
 import type { AvailabilityTeamPageProps } from "../../../pages/team/[slug]/[type]";
 
-dayjs.extend(utc);
-dayjs.extend(timeZone);
-dayjs.extend(customParseFormat);
-
 type Props = AvailabilityTeamPageProps | AvailabilityPageProps | DynamicAvailabilityPageProps;
 
 export const locationKeyToString = (location: LocationObject, t: TFunction) => {
@@ -96,23 +75,19 @@ export const locationKeyToString = (location: LocationObject, t: TFunction) => {
   }
 };
 
-const GoBackToPreviousPage = ({ slug }: { slug: string }) => {
+const GoBackToPreviousPage = ({ t }: { t: TFunction }) => {
   const router = useRouter();
-  const [previousPage, setPreviousPage] = useState<string>();
-  useEffect(() => {
-    setPreviousPage(document.referrer);
-  }, []);
-
-  return previousPage === `${WEBAPP_URL}/${slug}` ? (
+  const path = router.asPath.split("/");
+  path.pop(); // Remove the last item (where we currently are)
+  path.shift(); // Removes first item e.g. if we were visitng "/teams/test/30mins" the array will new look like ["teams","test"]
+  const slug = path.join("/");
+  return (
     <div className="flex h-full flex-col justify-end">
-      <ArrowLeftIcon
-        className="h-4 w-4 text-black transition-opacity hover:cursor-pointer dark:text-white"
-        onClick={() => router.back()}
-      />
-      <p className="sr-only">Go Back</p>
+      <button title={t("profile")} onClick={() => router.replace(`${WEBSITE_URL}/${slug}`)}>
+        <Icon.ArrowLeft className="h-4 w-4 text-black transition-opacity hover:cursor-pointer dark:text-white" />
+        <p className="sr-only">Go Back</p>
+      </button>
     </div>
-  ) : (
-    <></>
   );
 };
 
@@ -125,16 +100,16 @@ const useSlots = ({
   eventTypeId: number;
   startTime?: Dayjs;
   endTime?: Dayjs;
-  timeZone: string;
+  timeZone?: string;
 }) => {
-  const { data, isLoading } = trpc.useQuery(
+  const { data, isLoading, isIdle } = trpc.useQuery(
     [
       "viewer.public.slots.getSchedule",
       {
         eventTypeId,
         startTime: startTime?.toISOString() || "",
-        timeZone,
         endTime: endTime?.toISOString() || "",
+        timeZone,
       },
     ],
     { enabled: !!startTime && !!endTime }
@@ -148,12 +123,12 @@ const useSlots = ({
     }
   }, [data]);
 
-  return { slots: cachedSlots, isLoading };
+  // The very first time isIdle is set if auto-fetch is disabled, so isIdle should also be considered a loading state.
+  return { slots: cachedSlots, isLoading: isLoading || isIdle };
 };
 
 const SlotPicker = ({
   eventType,
-  timezoneDropdown,
   timeFormat,
   timeZone,
   recurringEventCount,
@@ -161,45 +136,44 @@ const SlotPicker = ({
   weekStart = 0,
 }: {
   eventType: Pick<EventType, "id" | "schedulingType" | "slug">;
-  timezoneDropdown: JSX.Element;
   timeFormat: string;
-  timeZone: string;
+  timeZone?: string;
   seatsPerTimeSlot?: number;
   recurringEventCount?: number;
   weekStart?: 0 | 1 | 2 | 3 | 4 | 5 | 6;
 }) => {
   const [selectedDate, setSelectedDate] = useState<Dayjs>();
   const [browsingDate, setBrowsingDate] = useState<Dayjs>();
-
+  const { date, setQuery: setDate } = useRouterQuery("date");
+  const { month, setQuery: setMonth } = useRouterQuery("month");
   const router = useRouter();
 
   useEffect(() => {
-    if (!router.isReady) {
-      return;
-    }
-    const month = asStringOrUndefined(router.query.month);
-    const date = asStringOrUndefined(router.query.date);
+    if (!router.isReady) return;
 
     // Etc/GMT is not actually a timeZone, so handle this select option explicitly to prevent a hard crash.
     if (timeZone === "Etc/GMT") {
-      setBrowsingDate(dayjs.utc(month).startOf("month"));
+      setBrowsingDate(dayjs.utc(month).set("date", 1).set("hour", 0).set("minute", 0).set("second", 0));
       if (date) {
         setSelectedDate(dayjs.utc(date));
       }
     } else {
-      setBrowsingDate(dayjs(month).tz(timeZone, true).startOf("month"));
+      // Set the start of the month without shifting time like startOf() may do.
+      setBrowsingDate(
+        dayjs.tz(month, timeZone).set("date", 1).set("hour", 0).set("minute", 0).set("second", 0)
+      );
       if (date) {
-        setSelectedDate(dayjs(date).tz(timeZone, true));
+        // It's important to set the date immediately to the timeZone, dayjs(date) will convert to browsertime.
+        setSelectedDate(dayjs.tz(date, timeZone));
       }
     }
-  }, [router.isReady, router.query.month, router.query.date, timeZone]);
+  }, [router.isReady, month, date, timeZone]);
 
   const { i18n, isLocaleReady } = useLocale();
-
   const { slots: _1 } = useSlots({
     eventTypeId: eventType.id,
-    startTime: selectedDate?.startOf("month"),
-    endTime: selectedDate?.endOf("month"),
+    startTime: selectedDate?.startOf("day"),
+    endTime: selectedDate?.endOf("day"),
     timeZone,
   });
   const { slots: _2, isLoading } = useSlots({
@@ -215,38 +189,18 @@ const SlotPicker = ({
     <>
       <DatePicker
         isLoading={isLoading}
-        className={
-          "mt-8 w-full sm:mt-0 sm:min-w-[455px] " +
-          (selectedDate
-            ? "sm:w-1/2 sm:border-r sm:pl-4 sm:pr-6 sm:dark:border-gray-700 md:w-1/3 "
-            : "sm:pl-4")
-        }
+        className={classNames(
+          "mt-8 w-full sm:mt-0 sm:min-w-[455px]",
+          selectedDate ? "sm:w-1/2 sm:border-r sm:pl-4 sm:pr-6 sm:dark:border-gray-700 md:w-1/3 " : "sm:pl-4"
+        )}
         includedDates={Object.keys(slots).filter((k) => slots[k].length > 0)}
         locale={isLocaleReady ? i18n.language : "en"}
         selected={selectedDate}
-        onChange={(selectedDate) => {
-          router.replace(
-            {
-              query: {
-                ...router.query,
-                date: selectedDate.format("YYYY-MM-DD"),
-              },
-            },
-            undefined,
-            { shallow: true }
-          );
+        onChange={(newDate) => {
+          setDate(newDate.format("YYYY-MM-DD"));
         }}
-        onMonthChange={(browsingDate) => {
-          router.replace(
-            {
-              query: {
-                ...router.query,
-                month: browsingDate.format("YYYY-MM"),
-              },
-            },
-            undefined,
-            { shallow: true }
-          );
+        onMonthChange={(newMonth) => {
+          setMonth(newMonth.format("YYYY-MM"));
         }}
         browsingDate={browsingDate}
         weekStart={weekStart}
@@ -255,7 +209,7 @@ const SlotPicker = ({
       {selectedDate && (
         <AvailableTimes
           isLoading={isLoading}
-          slots={slots[yyyymmdd(selectedDate.toDate())]}
+          slots={slots[selectedDate.format("YYYY-MM-DD")]}
           date={selectedDate}
           timeFormat={timeFormat}
           eventTypeId={eventType.id}
@@ -274,15 +228,18 @@ function TimezoneDropdown({
   onChangeTimeFormat,
   onChangeTimeZone,
   timeZone,
+  timeFormat,
 }: {
   onChangeTimeFormat: (newTimeFormat: string) => void;
   onChangeTimeZone: (newTimeZone: string) => void;
   timeZone?: string;
+  timeFormat: string;
 }) {
   const [isTimeOptionsOpen, setIsTimeOptionsOpen] = useState(false);
 
   useEffect(() => {
     handleToggle24hClock(localStorage.getItem("timeOption.is24hClock") === "true");
+
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
@@ -299,16 +256,22 @@ function TimezoneDropdown({
   return (
     <Collapsible.Root open={isTimeOptionsOpen} onOpenChange={setIsTimeOptionsOpen}>
       <Collapsible.Trigger className="min-w-32 text-bookinglight mb-1 -ml-2 px-2 py-1 text-left dark:text-white">
-        <GlobeIcon className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
-        {timeZone || dayjs.tz.guess()}
-        {isTimeOptionsOpen ? (
-          <ChevronUpIcon className="ml-1 -mt-1 inline-block h-4 w-4" />
-        ) : (
-          <ChevronDownIcon className="ml-1 -mt-1 inline-block h-4 w-4" />
-        )}
+        <p className="text-gray-600 dark:text-white">
+          <Icon.Globe className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
+          {timeZone}
+          {isTimeOptionsOpen ? (
+            <Icon.ChevronUp className="ml-1 -mt-1 inline-block h-4 w-4 text-gray-400" />
+          ) : (
+            <Icon.ChevronDown className="ml-1 -mt-1 inline-block h-4 w-4 text-gray-400" />
+          )}
+        </p>
       </Collapsible.Trigger>
       <Collapsible.Content>
-        <TimeOptions onSelectTimeZone={handleSelectTimeZone} onToggle24hClock={handleToggle24hClock} />
+        <TimeOptions
+          onSelectTimeZone={handleSelectTimeZone}
+          onToggle24hClock={handleToggle24hClock}
+          timeFormat={timeFormat}
+        />
       </Collapsible.Content>
     </Collapsible.Root>
   );
@@ -320,12 +283,25 @@ const dateQuerySchema = z.object({
   timeZone: z.string().optional().default(""),
 });
 
+const useRouterQuery = <T extends string>(name: T) => {
+  const router = useRouter();
+  const query = z.object({ [name]: z.string().optional() }).parse(router.query);
+
+  const setQuery = (newValue: string | number | null | undefined) => {
+    router.replace({ query: { ...router.query, [name]: newValue } }, undefined, { shallow: true });
+  };
+
+  return { [name]: query[name], setQuery } as {
+    [K in T]: string | undefined;
+  } & { setQuery: typeof setQuery };
+};
+
 const AvailabilityPage = ({ profile, eventType }: Props) => {
   const router = useRouter();
   const isEmbed = useIsEmbed();
   const query = dateQuerySchema.parse(router.query);
   const { rescheduleUid } = query;
-  const { Theme } = useTheme(profile.theme);
+  useTheme(profile.theme);
   const { t } = useLocale();
   const { contracts } = useContracts();
   const availabilityDatePickerEmbedStyles = useEmbedStyles("availabilityDatePicker");
@@ -378,10 +354,10 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
     : recurringEventCount
     ? "max-w-4xl"
     : "max-w-3xl";
-
   const timezoneDropdown = useMemo(
     () => (
       <TimezoneDropdown
+        timeFormat={timeFormat}
         onChangeTimeFormat={setTimeFormat}
         timeZone={timeZone}
         onChangeTimeZone={setTimeZone}
@@ -389,15 +365,21 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
     ),
     [timeZone]
   );
+  const rawSlug = profile.slug ? profile.slug.split("/") : [];
+  if (rawSlug.length > 1) rawSlug.pop(); //team events have team name as slug, but user events have [user]/[type] as slug.
+  const slug = rawSlug.join("/");
 
   return (
     <>
-      <Theme />
       <HeadSeo
         title={`${rescheduleUid ? t("reschedule") : ""} ${eventType.title} | ${profile.name}`}
         description={`${rescheduleUid ? t("reschedule") : ""} ${eventType.title}`}
         name={profile.name || undefined}
-        username={profile.slug || undefined}
+        username={slug || undefined}
+        nextSeoProps={{
+          nofollow: eventType.hidden,
+          noindex: eventType.hidden,
+        }}
       />
       <CustomBranding lightVal={profile.brandColor} darkVal={profile.darkBrandColor} />
       <div>
@@ -444,13 +426,13 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                     <div className="flex flex-col space-y-4">
                       {eventType?.description && (
                         <p className="text-gray-600 dark:text-white">
-                          <InformationCircleIcon className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4" />
+                          <Icon.Info className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
                           {eventType.description}
                         </p>
                       )}
                       {eventType?.requiresConfirmation && (
                         <p className="text-gray-600 dark:text-white">
-                          <ClipboardCheckIcon className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4" />
+                          <Icon.CheckSquare className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
                           {t("requires_confirmation")}
                         </p>
                       )}
@@ -459,9 +441,9 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                           {Object.values(AppStoreLocationType).includes(
                             eventType.locations[0].type as unknown as AppStoreLocationType
                           ) ? (
-                            <VideoCameraIcon className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
+                            <Icon.Video className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
                           ) : (
-                            <LocationMarkerIcon className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
+                            <Icon.MapPin className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
                           )}
 
                           {locationKeyToString(eventType.locations[0], t)}
@@ -470,7 +452,7 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                       {eventType.locations.length > 1 && (
                         <div className="flex-warp flex text-gray-600 dark:text-white">
                           <div className="mr-[10px] ml-[2px] -mt-1 ">
-                            <LocationMarkerIcon className="inline-block h-4 w-4 text-gray-400" />
+                            <Icon.MapPin className="inline-block h-4 w-4 text-gray-400" />
                           </div>
                           <p>
                             {eventType.locations.map((el, i, arr) => {
@@ -487,12 +469,12 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                         </div>
                       )}
                       <p className="text-gray-600 dark:text-white">
-                        <ClockIcon className="mr-[10px] -mt-1 ml-[2px] inline-block h-4 w-4 text-gray-400" />
+                        <Icon.Clock className="mr-[10px] -mt-1 ml-[2px] inline-block h-4 w-4 text-gray-400" />
                         {eventType.length} {t("minutes")}
                       </p>
                       {eventType.price > 0 && (
                         <div className="text-gray-600 dark:text-white">
-                          <CreditCardIcon className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 dark:text-gray-400" />
+                          <Icon.CreditCard className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 dark:text-gray-400" />
                           <IntlProvider locale="en">
                             <FormattedNumber
                               value={eventType.price / 100.0}
@@ -504,7 +486,7 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                       )}
                       {!rescheduleUid && eventType.recurringEvent && (
                         <div className="text-gray-600 dark:text-white">
-                          <RefreshIcon className="float-left mr-[10px] mt-1 ml-[2px] inline-block h-4 w-4 text-gray-400" />
+                          <Icon.RefreshCcw className="float-left mr-[10px] mt-1 ml-[2px] inline-block h-4 w-4 text-gray-400" />
                           <div className="ml-[27px]">
                             <p className="mb-1 -ml-2 inline px-2 py-1">
                               {getRecurringFreq({ t, recurringEvent: eventType.recurringEvent })}
@@ -513,7 +495,7 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                               type="number"
                               min="1"
                               max={eventType.recurringEvent.count}
-                              className="w-15 h-7 rounded-sm border-gray-300 bg-white text-gray-600 shadow-sm [appearance:textfield] ltr:mr-2 rtl:ml-2 dark:border-gray-500 dark:bg-gray-600 dark:text-white sm:text-sm"
+                              className="w-15 h-7 rounded-sm border-gray-300 bg-white text-sm text-gray-600 [appearance:textfield] ltr:mr-2 rtl:ml-2 dark:border-gray-500 dark:bg-gray-600 dark:text-white"
                               defaultValue={eventType.recurringEvent.count}
                               onChange={(event) => {
                                 setRecurringEventCount(parseInt(event?.target.value));
@@ -584,7 +566,7 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                   {eventType?.description && (
                     <div className="flex text-gray-600 dark:text-white">
                       <div>
-                        <InformationCircleIcon className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
+                        <Icon.Info className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
                       </div>
                       <p>{eventType.description}</p>
                     </div>
@@ -592,7 +574,7 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                   {eventType?.requiresConfirmation && (
                     <div className="flex text-gray-600 dark:text-white">
                       <div>
-                        <ClipboardCheckIcon className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
+                        <Icon.CheckSquare className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
                       </div>
                       {t("requires_confirmation")}
                     </div>
@@ -602,9 +584,9 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                       {Object.values(AppStoreLocationType).includes(
                         eventType.locations[0].type as unknown as AppStoreLocationType
                       ) ? (
-                        <VideoCameraIcon className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
+                        <Icon.Video className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
                       ) : (
-                        <LocationMarkerIcon className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
+                        <Icon.MapPin className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
                       )}
 
                       {locationKeyToString(eventType.locations[0], t)}
@@ -613,7 +595,7 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                   {eventType.locations.length > 1 && (
                     <div className="flex-warp flex text-gray-600 dark:text-white">
                       <div className="mr-[10px] ml-[2px] -mt-1 ">
-                        <LocationMarkerIcon className="inline-block h-4 w-4 text-gray-400" />
+                        <Icon.MapPin className="inline-block h-4 w-4 text-gray-400" />
                       </div>
                       <p>
                         {eventType.locations.map((el, i, arr) => {
@@ -630,12 +612,12 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                     </div>
                   )}
                   <p className="text-gray-600 dark:text-white">
-                    <ClockIcon className="mr-[10px] -mt-1 ml-[2px] inline-block h-4 w-4 text-gray-400" />
+                    <Icon.Clock className="mr-[10px] -mt-1 ml-[2px] inline-block h-4 w-4 text-gray-400" />
                     {eventType.length} {t("minutes")}
                   </p>
                   {!rescheduleUid && eventType.recurringEvent && (
                     <div className="text-gray-600 dark:text-white">
-                      <RefreshIcon className="float-left mr-[10px] mt-1 ml-[2px] inline-block h-4 w-4 text-gray-400" />
+                      <Icon.RefreshCcw className="float-left mr-[10px] mt-1 ml-[2px] inline-block h-4 w-4 text-gray-400" />
                       <div className="ml-[27px]">
                         <p className="mb-1 -ml-2 inline px-2 py-1">
                           {getRecurringFreq({ t, recurringEvent: eventType.recurringEvent })}
@@ -644,7 +626,7 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                           type="number"
                           min="1"
                           max={eventType.recurringEvent.count}
-                          className="w-15 h-7 rounded-sm border-gray-300 bg-white text-gray-600 shadow-sm [appearance:textfield] ltr:mr-2 rtl:ml-2 dark:border-gray-500 dark:bg-gray-600 dark:text-white sm:text-sm"
+                          className="w-15 h-7 rounded-sm border-gray-300 bg-white text-sm text-gray-600 [appearance:textfield] ltr:mr-2 rtl:ml-2 dark:border-gray-500 dark:bg-gray-600 dark:text-white"
                           defaultValue={eventType.recurringEvent.count}
                           onChange={(event) => {
                             setRecurringEventCount(parseInt(event?.target.value));
@@ -660,7 +642,7 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                   )}
                   {eventType.price > 0 && (
                     <p className="-ml-2 px-2 py-1 text-gray-600 dark:text-white">
-                      <CreditCardIcon className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
+                      <Icon.CreditCard className="mr-[10px] ml-[2px] -mt-1 inline-block h-4 w-4 text-gray-400" />
                       <IntlProvider locale="en">
                         <FormattedNumber
                           value={eventType.price / 100.0}
@@ -673,7 +655,7 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                   {timezoneDropdown}
                 </div>
 
-                <GoBackToPreviousPage slug={profile.slug || ""} />
+                {!isEmbed && <GoBackToPreviousPage t={t} />}
 
                 {/* Temporarily disabled - booking?.startTime && rescheduleUid && (
                     <div>
@@ -689,29 +671,20 @@ const AvailabilityPage = ({ profile, eventType }: Props) => {
                     </div>
                   )*/}
               </div>
-              {timeZone && (
-                <SlotPicker
-                  weekStart={
-                    typeof profile.weekStart === "string"
-                      ? ([
-                          "Sunday",
-                          "Monday",
-                          "Tuesday",
-                          "Wednesday",
-                          "Thursday",
-                          "Friday",
-                          "Saturday",
-                        ].indexOf(profile.weekStart) as 0 | 1 | 2 | 3 | 4 | 5 | 6)
-                      : profile.weekStart /* Allows providing weekStart as number */
-                  }
-                  eventType={eventType}
-                  timezoneDropdown={timezoneDropdown}
-                  timeFormat={timeFormat}
-                  timeZone={timeZone}
-                  seatsPerTimeSlot={eventType.seatsPerTimeSlot || undefined}
-                  recurringEventCount={recurringEventCount}
-                />
-              )}
+              <SlotPicker
+                weekStart={
+                  typeof profile.weekStart === "string"
+                    ? (["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"].indexOf(
+                        profile.weekStart
+                      ) as 0 | 1 | 2 | 3 | 4 | 5 | 6)
+                    : profile.weekStart /* Allows providing weekStart as number */
+                }
+                eventType={eventType}
+                timeFormat={timeFormat}
+                timeZone={timeZone}
+                seatsPerTimeSlot={eventType.seatsPerTimeSlot || undefined}
+                recurringEventCount={recurringEventCount}
+              />
             </div>
           </div>
           {(!eventType.users[0] || !isBrandingHidden(eventType.users[0])) && !isEmbed && <PoweredByCal />}