Commit graph

707 commits

Author SHA1 Message Date
Alex Johansson
abe4f38a5e
<QueryCell /> type inference improvement (#849)
* asserts that `query.data` is never `null` when using `<QueryCell />`
2021-10-04 10:48:40 +01:00
Peer Richelsen
f70d92df7e
added edit icon to event-type title input to make editing more obvious (#848) 2021-10-03 13:32:04 +01:00
Alex van Andel
89e5da15df
Fixes weekStart & automatic theme adjust checkbox (#847) 2021-10-02 20:16:51 +00:00
Chris
33273b18d3
Use id to look up user (#843) 2021-10-02 17:53:13 +01:00
Alex Johansson
eb93e778bd
simplify /bookings/[status] logic (#845) 2021-10-02 13:29:26 +00:00
Omar López
342ea3e5d2
Adds specfific empty copy by status (#842)
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-10-02 12:08:35 +01:00
Alex van Andel
e12c879242
Bugfix/image upload fuzzy (#844) 2021-10-02 12:04:47 +01:00
Alex Johansson
4879479981
add <QueryCell /> to remove bespoke loading/error/empty/success logic (#835) 2021-10-01 15:12:47 +00:00
Alex Johansson
5bed09218a
add some query client defaults (#838) 2021-10-01 15:33:14 +01:00
Alex Johansson
08f83dd85c
fix login sometimes having to login twice (#839) 2021-10-01 13:20:28 +01:00
Peer Richelsen
3d3e99272a
replaced another location.hostname, deleted DonateBanner (#834)
* replaced another location.hostname, deleted DonateBanner

* wip
2021-10-01 09:44:53 +00:00
Alex Johansson
30163f0a78
refactor availability times form using react-hook-form (#824)
* use toast

* use `Button`

* make fn

* rewrite with react-hook-form

* add comment

* fix deps

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-09-30 22:37:52 +01:00
Alex Johansson
60298f6eeb
resize image before storing (#831)
* resize image fn

* wip

* simplify transform

* comment

* fix

* rm log

* allow pass-through for non-base-64

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-09-30 21:37:29 +01:00
Alex Johansson
c80992aa1c
move withTRPC-HOC to _app.tsx (#822) 2021-09-30 06:28:30 -06:00
Peer Richelsen
8ac56fbf4a
bring back h-screen in user page (#829) 2021-09-30 11:41:13 +00:00
Peer Richelsen
378cf25521
turned teams page into flex from grid to center it (#828)
* turned teams page into flex from grid to center it, removed h-screen from user page

* new icon button

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-09-30 12:31:04 +01:00
Omar López
dc6841e761
Bookings UI improvements (#826) 2021-09-30 11:46:39 +01:00
Bailey Pumfleet
033c4835f7
Fix: Remove 0s from team page (#827)
* Remove 0s from team page

* damn it
2021-09-30 10:24:02 +01:00
Omar López
a04336ba06
Added booking tabs, type fixing and refactoring (#825)
* More type fixes

* More type fixes

* Type fixes

* Adds inputMode to email fields

* Added booking tabs

* Adds aditional notes to bookings
2021-09-29 22:33:18 +01:00
Bailey Pumfleet
079a920c2c
CTA on success page (#818) 2021-09-29 15:36:29 +00:00
Alex Johansson
e684824c79
yarn lint --fix (#812) 2021-09-28 20:12:48 +01:00
Malte Delfs
3b71c86b1e
prevent cancellation of past events (#568)
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: Peer_Rich <peeroke@gmail.com>
2021-09-28 18:23:50 +01:00
Peer Richelsen
b8c4dfb9e1 minor style changes to billing page 2021-09-28 15:07:33 +01:00
Alex Johansson
a4fbe7b2b4
downgrade users when trial ends (#767)
* wip

* wip

* wip

* wtf

* should be all the logic

* comment

* fix receiver name

* safeguard a bit more

* downgrade users cron job

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-09-28 14:00:19 +01:00
Bailey Pumfleet
5478c135d1
Set tabIndex for forgot password & add loader (#807) 2021-09-28 10:43:15 +00:00
Bailey Pumfleet
a3abdac33b
Update billing tab UI (#806) 2021-09-28 11:27:46 +01:00
Alex Johansson
7779c098dc
confirming event gives no visual (#803) 2021-09-28 09:16:02 +00:00
Omar López
dd9f801872
cal 485 prevent users from changing their username to premium ones (#799)
* Makes userRequired middleware

* Prevent users from changing usernames to premium ones

* refactor on zomars' branch (#801)

* rename `profile` -> `mutation`

* `createProtectedRouter()` helper

* move profile mutation to `viewer.`

* simplify checkUsername

* Auto scrolls to error when there is one

* Renames username helpers

* Follows db convention

Co-authored-by: Alex Johansson <alexander@n1s.se>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-28 09:57:30 +01:00
Omar López
f23e4f2b9d
Fixes customer portal return url (#802) 2021-09-28 09:04:30 +01:00
Alex Johansson
dcea723ea4
confirming event gives no visual feedback (#804) 2021-09-27 18:11:52 -06:00
Peer Richelsen
58dde562a3
switching to stripes customer portal (#772) 2021-09-27 23:57:23 +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
Alex Johansson
649e79bdc7
statically render profile pages (#615) 2021-09-27 17:09:19 +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 e6f2d2542a01ec82c80aa2fe367ae12c68ded1a5.

* 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
0938f6f4b2
added z-index for event types dropdown (#791) 2021-09-27 10:19:11 +00:00
Omar López
7ab49acebe
Fixes eventype form (#777)
* Type fixes

* Uses all integrations and session fixes on getting started page

* eventtype form fixes

* Update pages/event-types/[type].tsx

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-09-26 21:49:16 +00:00
Alex Johansson
22b050b9e7
yarn lint --fix (#783) 2021-09-26 14:08:40 +00:00
Alex van Andel
515c548acd
Fixes theme flickering on booking & availability select page (#771) 2021-09-24 23:11:30 +01:00
Eduardo M
727793af02
Fix link ignoring app url on even-type (#773) 2021-09-24 23:09: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
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
c152e43b82 minor changes to event type edit input 2021-09-24 12:23:06 +01:00
Alex van Andel
2b2fde179a
Fixes #701: User's page shows Team events with broken links (#761) 2021-09-24 10:23:08 +00:00
Omar López
420daec147
CAL-473 Fixes client-side routing for authed pages (#763) 2021-09-24 11:16:46 +01:00
Peer Richelsen
b741559dbc added more font-cal classes 2021-09-23 21:48:27 +01:00
Omar López
2c50781084
Makes every day available for events that don't have availability set (#756)
* 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

* Makes every day available for events that don't have availability set

* Type fixes
2021-09-23 12:03:07 -06: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
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
Nico
2bc4678ef0
Fixed bug that old credentials were used to create a zoom booking (#729)
Co-authored-by: nicolas <privat@nicolasjessen.de>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-23 10:35:39 +01:00
Bailey Pumfleet
bb3362f2ef
Add JWT secret to next-auth.js (#730) 2021-09-23 10:02:53 +01:00
Mihai C
82e7e51fca
Setup i18n and locale detection (#712)
* feat: setup translations

* feat: i18n setup

* Update pages/settings/profile.tsx

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

* fix: abstract locale hook

* fix: set default locale if preferred locale is not supported

* Revert "fix: set default locale if preferred locale is not supported"

This reverts commit e2a3d81371ee02a033520058a1d7d61cffeffc94.

* fix: set default locale if preferred locale is not supported

* fix: use 1 namespace and remove unnecessary logs

* fix: yarn.lock

* fix: linting errors

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Alex Johansson <alexander@n1s.se>
2021-09-23 09:49:17 +01: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
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
Chris
1c2998fc13
Ensure users cannot delete teams they don’t own (#720)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-22 11:43:32 +01:00
Heaust Azure
8eb3a31af4
Default to slug when Full Name isn't set (#721)
When Full Name isn't set and a new team is created,
The part of the now drop-down add new event type (previously button)
that's supposed to be personal or non-team
appears as an empty div.
This commit makes it default to slug / username in such a case.
2021-09-22 11:43:08 +01:00
Femi Odugbesan
a047177e72
Fix/duplicate events on onboarding (#716) 2021-09-22 08:25:33 +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
Conor Meagher
96fd7ecf41
chore: change calendso strings to cal.com (#707)
* chore: change calendso strings to cal.com

* rebase LICENSE

* rebase LICENSE

* strings that were missed

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-21 10:59:34 +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
Cassidy Williams
c7874dee29
Rename link share from Calendso to Cal (#702) 2021-09-20 13:04:53 +01:00
Peer_Rich
a4b1264db1
removed arrow from dropdown (#685) 2021-09-19 20:48:15 +01:00
Chris
f281c49e76
Remove password reset data from response (#699)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-19 15:31:45 +01:00
Chris
7eed1b2fa6
Prevent unauthorized event type access (#694)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-18 23:32:07 +01:00
Omar López
f6005b8c70
[CAL-409] Prevents usernames with special characters (#668) 2021-09-18 00:08:02 +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_Rich
4c6bf96213
fixed booking buttons on mobile (#682)
* fixed booking buttons on mobile

* fixed mobile layout for reject and confirm booking
2021-09-17 20:25:23 +01:00
Bailey Pumfleet
06f5559ca0 Fix user update API call 2021-09-17 15:41:28 +01:00
Chris S
13486d9988
Fix issues in multiple endpoints (#679) 2021-09-17 12:25:48 +01:00
Charlie Harrington
537e2951dc
Replace another calendso with cal (#670) 2021-09-16 11:13:32 +01:00
Peer Richelsen
e3d3fc5a11 calendso to cal 2021-09-16 00:24:54 +01:00
Alex van Andel
ebf49ca79e
Fixes 404 pages (#664) 2021-09-15 22:58:47 +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
113d18d84e
Only show alert to upgrade when applicable and fix button (#661)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-15 21:36:55 +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 Richelsen
f6fe519c4c calendso to cal 2021-09-15 19:21:58 +01:00
Peer_Rich
9fcd458d25
renamed more calendso to cal.com (#659) 2021-09-15 19:18:16 +01:00
Peer Richelsen
264ccc2f48 fixed 404 billing page 2021-09-15 16:55:04 +01:00
Alex van Andel
738ee5d992
OOPS, sorry guys (#655) 2021-09-15 16:47:49 +01:00
Alex van Andel
9980dcad6b
Fixed booking page not rendering due to missing linked event type (#654) 2021-09-15 15:27:55 +01:00
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
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
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
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