Commit Graph

7356 Commits (ef7f3e790023c4811ef8e0a132356a42008408e8)

Author SHA1 Message Date
Alex van Andel 478b90a27d
Fixes eventtype listing (#653)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-15 15:23:50 +01:00
Syed Ali Shahbaz 0d60052c88
added publicRuntimeConfig in nextjs config for upgrade URL (#651)
* added publicRuntimeConfig in nextjs config for upgrade URL (merge conflict fix)

* removed debug remnants

* merge-conflict further fix

* change request applied
2021-09-15 14:17:04 +01:00
Omar López 820c25f948
[CAL-394] Dropdown refactoring (#644)
* [CAL-394] WIP: Dropdown refactoring

* Formatting

* Prepares Button to pass refs for radix-ui

* [CAL-394] Upgrades @radix-ui/react-dropdown-menu

* Fixes Dialog crash by upgrading

* Uses radux Dropdown

* radix-ui fix for Dodal cancel button

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-09-15 13:33:00 +01:00
Alex van Andel d3fa6cec80
Fixes timeZone() by no longer needing timeZone() (#646)
* Fixes timeZone() by no longer needing timeZone()

* Added simple testcase to demonstrate the behaviour of parseZone() vs dayjs()

* Fixed eslint errors
2021-09-15 03:58:29 +01:00
Bailey Pumfleet eb25ef266a Remove API key from integrations 2021-09-14 19:20:12 +01:00
Peer_Rich 52e3b78875
minor style changes to team pages (#639)
* minor style changes to team pages

* more minor changes to team dashboard, added badge variant = gray

* added border to dropdown and removed blue focus ring on hover
2021-09-14 14:27:41 +01:00
Femi Odugbesan 47b6e29333
clarify necessity for app password when connecting apple calendar (#634)
support react element in dialog header props
2021-09-14 14:21:18 +01:00
Peer_Rich 16f15a2f16
added readme and license for /ee folder (#633)
* added readme and license for /ee folder

* fixed company typo
2021-09-14 14:05:03 +01:00
Alex van Andel 6ab741b927
Feature/round robin (#613)
* Heavy WIP

* More WIP

* Playing with backwards compat

* Moar wip

* wip

* Email changes for group feature

* Committing in redundant migrations for reference

* Combine all WIP migrations into a single feature migration

* Make backup of current version of radio area pending refactor

* Improved accessibility through keyboard

* Cleanup in seperate commit so I can cherrypick later

* Added RadioArea component

* wip

* Ignore .yarn file

* Kinda stable

* Getting closer...

* Hide header when there are only personal events

* Added uid to event create, updated EventTypeDescription

* Delete redundant migration

* Committing new team related migrations

* Optimising & implemented backwards compatibility

* Removed now redundant pages

* Undid prototyping to calendarClient I did not end up using

* Properly typed Select & fixed lint throughout

* How'd that get here, removed.

* TODO: investigate why userData is not compatible with passed type

* This likely matches the event type that is created for a user

* Few bugfixes

* Adding datepicker optimisations

* Fixed new event type spacing, initial profile should always be there

* Gave NEXT_PUBLIC_BASE_URL a try but I think it's not the right solution

* Updated EventTypeDescription to account for long titles, added logo to team page.

* Added logo to team query

* Added cancel Cypress test because an upcoming merge contains changes

* Fix for when the event type description is long

* Turned Theme into the useTheme hook, and made it fully compatible with teams pages

* Built AvatarGroup ui component + moved Avatar to ui

* Give the avatar some space fom the description

* Fixed timeZone selector

* Disabled tooltip +1-...

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-14 09:45:28 +01:00
Peer_Rich e9ff62109d
upgraded radix-ui as to asChild, refactored <button className=""> to <Button color="secondary"> (#632) 2021-09-14 09:20:24 +01:00
Peer_Rich 8ae43ea990
fixed Dialog action buttons (#630)
* fixed Dialog action

* added asChild
2021-09-13 12:28:17 +01:00
Peer_Rich d37ca84ebe
fixed "Disband Team" Button (likely Radix upgrade) (#631)
* applied same fix for as={Button}, likely radix upgrade bug

* using asChild to prevent <button><button></button></button>
2021-09-13 12:26:08 +01:00
Alex Johansson ab78bb3802
move calendso branding into pro (#629)
* badge

* mv branding to paid plan

* upgrade ts

* hideBranding check

* user.plan

* lint fixes

* `isBrandingHidden` helper

* hide pro for non-pros
2021-09-13 10:48:55 +01:00
Alex van Andel 8ee68e2ace
Converts booking deletion to soft-delete + more robust cancellation (#581)
* Converts booking deletion to soft-delete + more robust cancellation

* Update pages/api/cancel.ts

infer type :)

Co-authored-by: Alex Johansson <alexander@n1s.se>

Co-authored-by: Alex Johansson <alexander@n1s.se>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-13 09:57:56 +01:00
Peer_Rich e48318a34b
copy of #561 ensure callbackUrl exists when submitting login form (#609) 2021-09-12 09:51:59 +01:00
Peer_Rich 2574006f07
fixed mobile layout for event types advanced settings (#627) 2021-09-11 09:45:34 +01:00
Femi Odugbesan bc79f24fd4
integrate apple icalendar (#623) 2021-09-11 08:54:13 +01:00
Peer_Rich 5a9401bd28
added 404 for event types (#604)
* added 404 for event types

* removed link for 404 event types

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-10 22:46:26 +01:00
Guillaume RODRIGUEZ 13180fd807
Fix breaking word style on location informations (#616) 2021-09-10 22:12:38 +01:00
Femi Odugbesan 6b4cea2f30
Copy of #560 Parallel CalDav (#621)
* Make the caldav queries run in parallel when querying availability

* improvements to caldav operations

run queries in parallel

if no selected calendars get availability from all calendars

* fix: busyTimes not properly resolved

Co-authored-by: Kuba Orlik <kontakt@kuba-orlik.name>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-09-09 14:03:07 -05:00
Alex van Andel 6f56ff8f87
Updated jsxBracketSameLine to bracketSameLine (#620) 2021-09-09 19:43:40 +02:00
Alex Johansson 872319e83c
fix e2e tests for hidden events (#619) 2021-09-09 15:28:07 +01:00
Alex van Andel a49b1736db
Hidden should hide it from the listing, but not the actual event (#618) 2021-09-09 16:16:49 +02:00
Mihai C 903f7729c7
feat: add better error handling (#605)
* feat: add better error handling

* refactor: update after review

* refactor: remove unnecessary code

* refactor: better path structure

* refactor: fetch-wrapper after code review

Co-authored-by: Mihai Colceriu <colceriumi@gmail.com>
2021-09-09 16:51:06 +03:00
Bailey Pumfleet 70f595ec08
Change event types to use slug instead of ID (#612)
* Temporarily disable checking video busy times

* Add fix for create event type modal
2021-09-08 20:43:51 +01:00
Alex van Andel 1269c43c99
Username is now @unique in main, so we can now catch Prisma conflicts (#610) 2021-09-08 19:21:23 +02:00
Peer_Rich 766cdd7123
changed api docs link (#606) 2021-09-08 15:01:42 +01:00
Alex van Andel aff45e3451
Fixed #598 - handleLegacyConfirmationMail (#601)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-08 11:21:19 +00:00
Alex Johansson a9a6d69ba6
tweak `inferSSRProps` to not need `as const` (#591) 2021-09-08 11:03:43 +00:00
Syed Ali Shahbaz e587432894
Bug fix (#592) 2021-09-08 12:00:34 +01:00
dependabot[bot] ee24ee5518
⬆️ Bump @radix-ui/react-dialog from 0.0.20 to 0.1.0 (#600)
Bumps [@radix-ui/react-dialog](https://github.com/radix-ui/primitives) from 0.0.20 to 0.1.0.
- [Release notes](https://github.com/radix-ui/primitives/releases)
- [Changelog](https://github.com/radix-ui/primitives/blob/main/release-process.md)
- [Commits](https://github.com/radix-ui/primitives/commits)

---
updated-dependencies:
- dependency-name: "@radix-ui/react-dialog"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-08 08:23:59 +00:00
Bailey Pumfleet 50d727cbbb
Temporarily disable checking video busy times (#603) 2021-09-08 10:14:13 +02:00
Alex Johansson 375256084b
update kodiak to approve dependabot automatically (#593) 2021-09-07 09:58:00 +01:00
dependabot[bot] 3d0429d172
⬆️ Bump @headlessui/react from 1.4.0 to 1.4.1 (#590)
Bumps [@headlessui/react](https://github.com/tailwindlabs/headlessui/tree/HEAD/packages/@headlessui-react) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/tailwindlabs/headlessui/releases)
- [Changelog](https://github.com/tailwindlabs/headlessui/blob/main/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/headlessui/commits/@headlessui/react@v1.4.1/packages/@headlessui-react)

---
updated-dependencies:
- dependency-name: "@headlessui/react"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-06 17:11:37 +02:00
Alex Johansson 7e6e935ed3
add free plan (#549)
- add new fields to support this
- when free:
  - fade out all event types after first
  - hide events after first on booking page
  - make booking page after the first one 404 if accessed directly
- add e2e tests
2021-09-06 13:51:15 +00:00
Syed Ali Shahbaz fa35af7bd8
Cal 262 refactor edit teams according to the design reference (#516)
* refactored settings/team landing page

* changed team edit flow, WIP

* merge conflict fix for teams.tsx

* minor fixes to edit team, WIP

* invite-member and disband team APIs attached inside edit-team page

* added remove-member API in edit-team page, minor fixes

* minor code fix, WIP

* WIP

* add logo, bio, branding to team schema

* bio, logo, branding, slug patch API and minor code fix-- WIP

* fn to Disband team directly from the dropdown menu in settings/teams page, removed debug remnants --WIP

* Pull latest data after an action in settings/teams-edit page

* added slug conflict check at Patch time

* code clean-up

* initial change request fixes --WIP

* prop type fix and add warn button color theme --WIP

* added warn Button to Dialog

* remaining change request fixes

* added noop from react-query

* updated invited team-list design

* prettier fix for api/teams/profile

* removed noop import and added custom noop

* minor Button fix

* requested changes addressed
2021-09-06 14:22:22 +01:00
Alex van Andel 43b275bc30
Implemented Button, hide 'Prev step' on first step (#583)
* Implemented Button, hide 'Prev step' on first step

* Changed 00:00:00 -> 00:00 whilst keeping values unchanged

* Updated to localizedFormat (future i18n) + remove unused const

* Going native for now, can revisit later

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-06 09:14:01 +00:00
Alex van Andel d9aff72220
Prepares the email system for Calendso Teams (#586)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-06 09:06:33 +00:00
Syed Ali Shahbaz 19f5b9d6c6
added BASE_URL in nextjs config (#587) 2021-09-06 09:58:17 +01:00
Bailey Pumfleet 4d3b258bf2
Adds the rest of the bodies and responses for API docs (#585)
* Added bodies and responses for availability calls

* Finished the rest of the bodies and responses

Co-authored-by: bailey <bailey@calendso.com>
2021-09-05 11:03:26 +01:00
Peer_Rich 1d22c32904
reverting App Store naming back to Integrations, closes #576 (#584) 2021-09-05 01:27:19 +02:00
Adam Spiers 9077640983
Fix the text of the requiresConfirmation option (#571) 2021-09-04 18:41:39 +01:00
Bailey Pumfleet 9195ef41f3
Added bodies and responses for availability calls (#569)
Co-authored-by: bailey <bailey@calendso.com>
2021-09-04 11:28:05 +01:00
Alex Johansson 2f1ede9bcd
use `getSession()` from `@lib/auth` everywhere (#563) 2021-09-03 21:51:21 +01:00
dependabot[bot] 1cdb449ecc
⬆️ Bump eslint-plugin-react from 7.24.0 to 7.25.1 (#567)
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.24.0 to 7.25.1.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.24.0...v7.25.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-03 17:33:00 +00:00
Alex Johansson 8999829490
inverted logic on `ONBOARDING_INTRODUCED_AT` (#566) 2021-09-03 17:24:11 +00:00
Alex Johansson ab33cbde4c
fix: `<Button/>` types of `StartIcon`/`EndIcon` (#562) 2021-09-03 16:34:57 +01:00
Alex Johansson adff0d0176
improve typings on "getting started" (#554) 2021-09-03 09:45:57 +02:00
dependabot[bot] 0953c6b541
⬆️ Bump @typescript-eslint/eslint-plugin from 4.29.2 to 4.30.0 (#550)
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.29.2 to 4.30.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.30.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-02 16:54:09 +00:00
Alex Johansson d88ebd233d
add cypress e2e testing (#534) 2021-09-02 16:41:15 +00:00