Commit Graph

239 Commits (8f6689cfc121439ab8fc96cd6b81f1c7584b9734)

Author SHA1 Message Date
Alex Johansson 9f2cfffce4
fix loading spinner flicker (#800) 2021-09-27 23:42:04 +01:00
Alex van Andel dc7b084bdf
Remove Moment dependency by changing implementation of DateRangePicker to something leaner (#798)
* chore: extracted all DateRangePicker logic from event-types/[type].tsx

* Minor alignment fixes + Date.now() instead of 1970.

* Removes react-dates, implements wojtekmaj/react-daterange-picker
2021-09-27 22:12:55 +01:00
Syed Ali Shahbaz 78c78a6981
added relative position to placeholder parent (#797) 2021-09-27 18:59:50 +01:00
Alex Johansson 34300650e4
add tRPC (#614)
* add trpc

* trpc specific

* fix deps

* lint fix

* upgrade prisma

* nativeTypes

* nope, not needed

* fix app propviders

* Revert "upgrade prisma"

This reverts commit e6f2d2542a.

* rev

* up trpc

* simplify

* wip - bookings page with trpc

* bookings using trpc

* fix `Shell` props

* call it viewerRouter instead

* cleanuop

* ssg helper

* fix lint

* fix types

* skip

* add `useRedirectToLoginIfUnauthenticated`

* exhaustive-deps

* fix callbackUrl

* rewrite `/availability` using trpc

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-09-27 14:47:55 +00:00
Peer Richelsen 6d2f89fc32 Cale to Cal 2021-09-26 15:04:01 +01:00
Peer Richelsen ee5cc32936 renamed PoweredByCalendso 2021-09-25 17:03:08 +01:00
Peer Richelsen b125ece57b gave powered by absolute path 2021-09-25 16:55:13 +01:00
Chris 97cb7bdc83
Show raw secret during two-factor setup (#775) 2021-09-25 16:53:12 +01:00
Alex van Andel 515c548acd
Fixes theme flickering on booking & availability select page (#771) 2021-09-24 23:11:30 +01:00
Omar López 9e7cb2c0b8
CAL-469 Adds intercom dynamically (#762)
* Adds react-use-intercom

* Adds intercom env var

* Loads intercom dynamically if env is set

* CAL-473 Fixes client-side routing for authed pages

* Moves intercom code to ee

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-09-24 21:02:03 +01:00
Peer Richelsen 889b3f36ae fixed mobile booking layout for long descriptions 2021-09-24 18:03:09 +01:00
Peer Richelsen 63930c1817
Fix/event type button alignment (#765)
* fixed event-type buttons on mobile, added more font-cal classes

* remove 1-on-1 on mobile event types

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-24 15:11:15 +00:00
Peer Richelsen a8ec6e7060
replaced window.location with NEXT_PUBLIC_APP_URL (#769)
* replaced window.location with process.env.NEXT_PUBLIC_APP_URL, removed empty classNames

* wip
2021-09-24 09:03:28 -06:00
Alex Johansson f709972f86
ui bug: alert looking funky (#766)
* tweak alert text to be growing
* fix alert looking funky
* get rid of `typeof window` dirt
2021-09-24 06:52:00 -06:00
Peer Richelsen bb1da8150f
fixed event-type buttons on mobile, added more font-cal classes (#764) 2021-09-24 11:28:57 +00:00
Peer Richelsen f5a7ed2e36 minor changes to powered by badge 2021-09-23 23:56:13 +01:00
Bailey Pumfleet 9e785c01fd The tiniest linting fix ever 2021-09-23 23:31:16 +01:00
Peer Richelsen b741559dbc added more font-cal classes 2021-09-23 21:48:27 +01:00
Peer Richelsen 235e74440c
hotfix for powered by badge (#758)
* minor fix to powered by

* fixed powered by logo
2021-09-23 21:19:11 +01:00
Peer Richelsen 6dfd3f4aba
minor fix to powered by (#757) 2021-09-23 21:05:24 +01:00
Omar López bcacc1d166
More availability fixes (#755)
* Abstracts MinutesField

* Adds missing Minimum booking notice

* Refactoring

* Fixes int field sent as string

* Sorts slots by time

* Fixes availability page

* Fixes available days

* Type fixes

* More availability bugfixes
2021-09-23 18:18:29 +01:00
Alex Johansson 790ed3e6b1
fix: branding is always disabled for pro (#754)
* add jwt secret

* fix `isBrandingHidden`

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-09-23 15:25:34 +00:00
Omar López cb4a1e031e
Fixes user event availability page (#749)
* Abstracts MinutesField

* Adds missing Minimum booking notice

* Refactoring

* Fixes int field sent as string

* Sorts slots by time

* Fixes availability page

* Fixes available days
2021-09-23 15:08:44 +01:00
Peer Richelsen 4f964533cf
closes #726 (#728) 2021-09-22 21:38:20 +00:00
Peer Richelsen 51752bd2bd
added Cal Sans (#709)
* added Cal Sans

* Delete EmptyScreen.tsx
2021-09-22 21:23:19 +00:00
Omar López d194878bb2
Suggestion: let prettier sort imports order (#673)
* Suggestion: let prettier sort imports order

# Conflicts:
#	yarn.lock

* AUTO SORT ALL THE IMPORTS

* Linting

* Fixes test
2021-09-22 13:52:38 -06:00
Omar López 3add84a279
Adds Stripe integration (#717)
* Adds Stripe integration

* Moves Stripe instrucctions to ee

* Adds NEXT_PUBLIC_APP_URL variable

* Adds fallback for NEXT_PUBLIC_APP_URL

* Throws error objects instead

* Improved error handling

* Removes deprecated method

* Bug fixing

* Payment refactoring

* PaymentPage fixes

* Fixes preview links

* More preview link fixes

* Fixes client links

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-09-22 19:36:13 +01:00
Peer Richelsen 43563bc8d5
made it easier to see if there are more times available to scroll (#722)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-09-22 14:44:38 +00:00
Omar López e1f1386332
Feat disable guests for events (#719)
* Abstracts CheckboxField

* Allows disabling the guests field while booking

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-22 12:04:32 +01:00
Omar López 48bc4c64f4
[CAL-463] Validates required checkboxes (#713) 2021-09-21 20:42:44 +01:00
Peer Richelsen 3c089af58a
new EmptyScreen component, using it in /bookings (#708)
* new EmptyScreen component, using it in /bookings

* Linting fixes

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-21 11:36:29 +01:00
Chris c0330acd83
Add two-factor authentication (#692)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-21 10:29:20 +01:00
Peer_Rich a4b1264db1
removed arrow from dropdown (#685) 2021-09-19 20:48:15 +01:00
Nico 961f297ba8
No confirmation shall be needed when rescheduling events that need confirmation (#440)
* No reconfirmation needed when rescheduling

* adapted success page

* Parse query as string

Co-authored-by: nicolas <privat@nicolasjessen.de>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: Peer_Rich <peeroke@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-09-17 22:31:44 +01:00
Peer Richelsen b2f10eb528 renamed in-person to link or in-person meeting 2021-09-15 21:54:40 +01:00
Alex van Andel cf7f5ae53c
Replace all instances of calendso.com with cal.com and add a new logo for Cal.com emails (#662) 2021-09-15 21:35:55 +01:00
Peer_Rich 9fcd458d25
renamed more calendso to cal.com (#659) 2021-09-15 19:18:16 +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
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
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
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
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