Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

INT-2383 Migrate d/* page group #158

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
04cad3a
chore: remove scrollbar-gutter (#12936)
PeerRich Dec 22, 2023
c4792c5
chore: minor changes to instant meetings (#12931)
PeerRich Dec 22, 2023
55c9efe
fix: Flakiness in tests (#12929)
hariombalhara Dec 23, 2023
412e7ec
fixes to org email (#12937)
PeerRich Dec 27, 2023
5de77e3
fix:Remove fixed height and overflow (#12959)
sean-brydon Dec 28, 2023
1f036bf
feat: pipedrive crm app on cal (#12316)
jatinsandilya Dec 29, 2023
bdc36ac
fix: updated the bg-emphasis style in dark mode (#12933)
jaswalsaurabh Dec 29, 2023
16d1adf
fix: dark mode improvements for signup (#12965)
PeerRich Dec 29, 2023
7579417
chore: allow disabling source map generation with env var (#12899)
DmytroHryshyn Dec 29, 2023
6f942cf
chore: removed isSignup for 404 page (#12967)
PeerRich Dec 30, 2023
1c2fff5
fix: ui bugs in settings page (#12975)
Udit-takkar Jan 1, 2024
ffefb34
fix: check your email page flickers (#12969)
WongChoice Jan 2, 2024
cbee4ff
added macos styles to global.css (#12981)
PeerRich Jan 2, 2024
7015c89
fix: fix-animations on event-types/[type] page (#12900)
DmytroHryshyn Jan 2, 2024
8c84013
fix: preview url for booking page (#12973)
Udit-takkar Jan 2, 2024
2181731
docs: Add Tunnelmole as an open source alternative to ngrok (#12925)
robbie-cahill Jan 2, 2024
f848a44
feat: integrate formbricks in help feedback box (#12276)
ShubhamPalriwala Jan 2, 2024
1a3e4d1
chore: Update permissions used for assigning team labels (#12984)
keithwillcode Jan 2, 2024
218f6a8
fix: layout for settings/teams (#12979)
PeerRich Jan 2, 2024
e39e6cc
chore: Merge PR labeler actions (#12987)
keithwillcode Jan 2, 2024
299a866
fix: dynamic booking duration (#12951)
Amit91848 Jan 2, 2024
e61be78
test: Check the recurring event tab and your funtionalities (teste2e-…
gitstart-app[bot] Jan 2, 2024
4dba72f
fix: Permissions issue with team labeler (#12992)
keithwillcode Jan 2, 2024
c7b6295
fix: cal video link on booking confirmation (#12944)
kart1ka Jan 3, 2024
6dec981
fix: bad request in webhook route (#13008)
Udit-takkar Jan 3, 2024
7d7e74c
fix: skeleton width for settings menu in sidebar (#13017)
riddhesh-mahajan Jan 3, 2024
c4b296d
chore: replace global.css with todesktop tailwind variant (#12991)
PeerRich Jan 3, 2024
71e57ba
chore: Remove need for force merges (#13021)
keithwillcode Jan 3, 2024
f201266
chore: [app-router-migration-7] Migrate `/teams` page (#12622)
hbjORbj Jan 3, 2024
574a4a8
chore: Allow labeler action to use workflow_dispatch (#12993)
keithwillcode Jan 3, 2024
6a13258
fix: Fix all TS warnings (fix-tsWarnings) (#12139)
gitstart-app[bot] Jan 4, 2024
de1c9d0
feat: orgMigration - Support moving users as an option when moving a …
hariombalhara Jan 4, 2024
0f707a5
chore: Upgrade upload-artifact action to v4 (#13025)
keithwillcode Jan 4, 2024
2220778
chore: Upgrade buildjet cache action to v3 (#13026)
keithwillcode Jan 4, 2024
4c4fc9e
chore: Fix NODE_OPTIONS error (#13024)
keithwillcode Jan 4, 2024
c19799e
chore: Remove invalid DATABASE_URL 'with' value (#13027)
keithwillcode Jan 4, 2024
3791af8
feat: Make private URLs easier to copy-paste from web app (#13018)
riddhesh-mahajan Jan 4, 2024
ef7f0e2
feat: Organization Add member to a team email communication (#12946)
SomayChauhan Jan 4, 2024
3c6fdfe
chore: removed old booker feature flag (#13040)
PeerRich Jan 4, 2024
ecb693c
chore: [app-router-migration 8.6] reorganize future pages file struct…
DmytroHryshyn Jan 4, 2024
49eaea4
Migrate d/* page group
hbjORbj Jan 4, 2024
b8398cc
Fix metadata
hbjORbj Jan 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .env.appStore.example
Original file line number Diff line number Diff line change
Expand Up @@ -127,4 +127,12 @@ ZOHOCRM_CLIENT_ID=""
ZOHOCRM_CLIENT_SECRET=""


# - REVERT
# Used for the Pipedrive integration (via/ Revert (https://revert.dev))
# @see https://github.com/calcom/cal.com/#obtaining-revert-api-keys
REVERT_API_KEY=
REVERT_PUBLIC_TOKEN=

# NOTE: If you're self hosting Revert, update this URL to point to your own instance.
REVERT_API_URL=https://api.revert.dev/
# *********************************************************************************************************
9 changes: 9 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ NEXT_PUBLIC_SENDGRID_SENDER_NAME=
# Used for capturing exceptions and logging messages
NEXT_PUBLIC_SENTRY_DSN=

# Formbricks Experience Management Integration
FORMBRICKS_HOST_URL=https://app.formbricks.com
FORMBRICKS_ENVIRONMENT_ID=
FORMBRICKS_FEEDBACK_SURVEY_ID=

# Twilio
# Used to send SMS reminders in workflows
TWILIO_SID=
Expand Down Expand Up @@ -322,3 +327,7 @@ APP_ROUTER_SETTINGS_TEAMS_ENABLED=0
APP_ROUTER_GETTING_STARTED_STEP_ENABLED=0
APP_ROUTER_APPS_ENABLED=0
APP_ROUTER_VIDEO_ENABLED=0
APP_ROUTER_TEAMS_ENABLED=0

# disable setry server source maps
SENTRY_DISABLE_SERVER_WEBPACK_PLUGIN=1
1 change: 0 additions & 1 deletion .github/actions/cache-db/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ runs:
with:
path: ${{ inputs.path }}
key: ${{ runner.os }}-${{ env.cache-name }}-${{ inputs.path }}-${{ env.key-1 }}-${{ env.key-2 }}
DATABASE_URL: ${{ inputs.DATABASE_URL }}
- run: echo ${{ env.E2E_TEST_CALCOM_QA_GCAL_CREDENTIALS }} && yarn db-seed
if: steps.cache-db.outputs.cache-hit != 'true'
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/yarn-playwright-install/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ runs:
steps:
- name: Cache playwright binaries
id: playwright-cache
uses: buildjet/cache@v2
uses: buildjet/cache@v3
with:
path: |
~/Library/Caches/ms-playwright
Expand Down
74 changes: 0 additions & 74 deletions .github/workflows/apply-issue-labels-to-pr.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/check-types.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Check types
on:
workflow_call:
env:
NODE_OPTIONS: "--max-old-space-size=8192"
NODE_OPTIONS: --max-old-space-size=4096
jobs:
check-types:
runs-on: buildjet-4vcpu-ubuntu-2204
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/e2e-app-store.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: E2E App-Store Apps Tests
on:
workflow_call:

env:
NODE_OPTIONS: --max-old-space-size=4096
jobs:
e2e-app-store:
timeout-minutes: 20
Expand Down Expand Up @@ -29,11 +30,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/dangerous-git-checkout
- run: echo 'NODE_OPTIONS="--max_old_space_size=4096"' >> $GITHUB_ENV
- uses: ./.github/actions/yarn-install
- uses: ./.github/actions/yarn-playwright-install
- uses: ./.github/actions/cache-db
env:
env:
DATABASE_URL: ${{ secrets.CI_DATABASE_URL }}
E2E_TEST_CALCOM_QA_EMAIL: ${{ secrets.E2E_TEST_CALCOM_QA_EMAIL }}
E2E_TEST_CALCOM_QA_PASSWORD: ${{ secrets.E2E_TEST_CALCOM_QA_PASSWORD }}
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
- name: Upload Test Results
if: ${{ always() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: app-store-results-${{ matrix.shard }}_${{ strategy.job-total }}
path: test-results
6 changes: 3 additions & 3 deletions .github/workflows/e2e-embed-react.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: E2E Embed React tests and booking flow (for non-embed as well)
on:
workflow_call:

env:
NODE_OPTIONS: --max-old-space-size=4096
jobs:
e2e-embed:
timeout-minutes: 20
Expand All @@ -24,7 +25,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/dangerous-git-checkout
- run: echo 'NODE_OPTIONS="--max_old_space_size=4096"' >> $GITHUB_ENV
- uses: ./.github/actions/yarn-install
- uses: ./.github/actions/yarn-playwright-install
- uses: ./.github/actions/cache-db
Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
- name: Upload Test Results
if: ${{ always() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: embed-react-results-${{ matrix.shard }}_${{ strategy.job-total }}
path: test-results
6 changes: 3 additions & 3 deletions .github/workflows/e2e-embed.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: E2E Embed Core tests and booking flow (for non-embed as well)
on:
workflow_call:

env:
NODE_OPTIONS: --max-old-space-size=4096
jobs:
e2e-embed:
timeout-minutes: 20
Expand Down Expand Up @@ -29,7 +30,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/dangerous-git-checkout
- run: echo 'NODE_OPTIONS="--max_old_space_size=4096"' >> $GITHUB_ENV
- uses: ./.github/actions/yarn-install
- uses: ./.github/actions/yarn-playwright-install
- uses: ./.github/actions/cache-db
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
- name: Upload Test Results
if: ${{ always() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: embed-core-results-${{ matrix.shard }}_${{ strategy.job-total }}
path: test-results
7 changes: 3 additions & 4 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: E2E tests

on:
workflow_call:

env:
NODE_OPTIONS: --max-old-space-size=4096
jobs:
e2e:
timeout-minutes: 20
Expand All @@ -28,7 +28,6 @@ jobs:
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/dangerous-git-checkout
- run: echo 'NODE_OPTIONS="--max_old_space_size=4096"' >> $GITHUB_ENV
- uses: ./.github/actions/yarn-install
- uses: ./.github/actions/yarn-playwright-install
- uses: ./.github/actions/cache-db
Expand Down Expand Up @@ -68,7 +67,7 @@ jobs:
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}
- name: Upload Test Results
if: ${{ always() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: test-results-${{ matrix.shard }}_${{ strategy.job-total }}
path: test-results
81 changes: 80 additions & 1 deletion .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: "Pull Request Labeler"
on:
- pull_request_target
pull_request_target:
workflow_dispatch:
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
Expand All @@ -16,3 +17,81 @@ jobs:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
# https://github.com/actions/labeler/issues/442#issuecomment-1297359481
sync-labels: ""
team-labels:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: equitybee/team-label-action@main
with:
repo-token: ${{ secrets.EQUITY_BEE_TEAM_LABELER_ACTION_TOKEN }}
organization-name: calcom
ignore-labels: "app-store, ai, authentication, automated-testing, platform, billing, bookings, caldav, calendar-apps, ci, console, crm-apps, docs, documentation, emails, embeds, event-types, i18n, impersonation, manual-testing, ui, performance, ops-stack, organizations, public-api, routing-forms, seats, teams, webhooks, workflows, zapier"
apply-labels-from-issue:
runs-on: ubuntu-latest

permissions:
contents: none
issues: read
pull-requests: write

steps:
- name: Apply labels from linked issue to PR
uses: actions/github-script@v5
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
async function getLinkedIssues(owner, repo, prNumber) {
const query = `query GetLinkedIssues($owner: String!, $repo: String!, $prNumber: Int!) {
repository(owner: $owner, name: $repo) {
pullRequest(number: $prNumber) {
closingIssuesReferences(first: 10) {
nodes {
number
labels(first: 10) {
nodes {
name
}
}
}
}
}
}
}`;

const variables = {
owner: owner,
repo: repo,
prNumber: prNumber,
};

const result = await github.graphql(query, variables);
return result.repository.pullRequest.closingIssuesReferences.nodes;
}

const pr = context.payload.pull_request;
const linkedIssues = await getLinkedIssues(
context.repo.owner,
context.repo.repo,
pr.number
);

const labelsToAdd = new Set();
for (const issue of linkedIssues) {
if (issue.labels && issue.labels.nodes) {
for (const label of issue.labels.nodes) {
labelsToAdd.add(label.name);
}
}
}

if (labelsToAdd.size) {
await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: pr.number,
labels: Array.from(labelsToAdd),
});
}
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- name: Upload ESLint report
if: ${{ always() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: lint-results
path: lint-results
2 changes: 1 addition & 1 deletion .github/workflows/nextjs-bundle-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
npx -p [email protected] report

- name: Upload bundle
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: bundle
path: apps/web/.next/analyze/__bundle_analysis.json
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/pr-assign-team-label.yml

This file was deleted.

Loading
Loading