Commit Graph

794 Commits (9022e6b556f90af7ca7e1cb2b6f431ba02ecb5ab)

Author SHA1 Message Date
kodiakhq[bot] 33cca1c574
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-07 15:05:19 +00:00
Joel Lu c43e6783a7
Fix: duplicate team name no prompt (#1267)
* Fix: duplicate team name no prompt

* Fix syntax error for error message
2021-12-07 15:04:34 +00:00
kodiakhq[bot] b39922f2b9
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-06 13:25:37 +00:00
Rory Hughes c109ab1e30
Ensure credential objects come oldest first (#1258)
Given the credentials are loaded based on userId, sort is not consistent.
Without this, events are booked on whichever calendar credential is loaded first. 
813eaa83b7/lib/events/EventManager.ts (L240-L244)

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-12-06 13:25:22 +00:00
kodiakhq[bot] c250ae9e0e
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-06 09:50:36 +00:00
Peer Richelsen e8af9110a7
fixed border color of daily video (#1255) 2021-12-06 09:49:56 +00:00
kodiakhq[bot] 6f0a8f5d0f
Merge branch 'main' into katt/cal-620-edge-fns 2021-12-03 16:19:19 +00:00
Alex van Andel 22aa083883
Adds eventTypeId as a parameter (#1217) 2021-12-03 16:18:31 +00:00
Alex van Andel 6b2a4d00e1 Merge branch 'main' into katt/cal-620-edge-fns 2021-12-03 12:49:20 +01:00
Alex van Andel 8c1b69cc0f
Feature/field prefills (#1249)
* Needs more testing, but looks functional

* Add metadata feature to booking create payload

* Forward URL parameters given in link

* Moved stringifying of custom inputs to backend
2021-12-03 10:15:20 +00:00
Peer Richelsen 8d1d3fcc7a
fixed subtitle for event-types (#1247) 2021-12-02 22:32:38 +00:00
Peer Richelsen 813eaa83b7
minor design changes to tablet navigation (#1240) 2021-12-02 09:52:59 +00:00
Syed Ali Shahbaz ec2d0a89ba
Bugfix/event types buggy view on tablet (#1238) 2021-12-01 14:56:25 +00:00
Flemming 5773d064c2
Prevent user form entering negative numbers into event duration (#1231)
* Add Docker Compose as requirement to run the quick start

* Add basic frontend validation/needs for event duration

* Only add min prop to the duration field

* Don't allow negative value for the event buffer time

* Increase min duration of a event type

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-11-30 19:18:28 +00:00
Syed Ali Shahbaz 529f3027cd
replaced btn-primary, btn-secondary, btn-white with respective Button equivalents (#1218)
* replaced btn primary, secondary, white with Button

* removed unused Link var

* replaced <button> in settings/security

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: Peer Richelsen <peeroke@richelsen.net>
2021-11-29 06:37:31 +00:00
Peer Richelsen 20cbab1c15
fixed edit icon for event-type details (#1230) 2021-11-28 08:54:45 +00:00
Mihai C 8322e5c8d1
Emails Revamp (#1201)
* refactor: emails (WIP)

* wip

* wip

* refactor: calendarClient

* chore: remove comment

* feat: new templates

* feat: more templates (wip)

* feat: email templates wip

* feat: email templates wip

* feat: prepare for testing

* For testing stripe integration

* Uses imported BASE_URL

* Fixes types

* use BASE_URL

Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-11-26 11:03:43 +00:00
Alex van Andel 396355e350
Call setSelectedTimeZone as we don't want to refactor Scheduler (#1213)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-11-25 16:03:37 +00:00
Syed Ali Shahbaz d8b3c42c28
Improvement/cal 639 turn edit location dialog into radix uu (#1055)
* replaced disclosure with collapsible

* added radix radio-group

* removed radix-UI radio group

* more fix

* --WIP

* --WIP

* react-hook-formify --WIP

* radix ui radio replaces headless ui radio

* further fixes --WIP

* --WIP

* form handling and availability wrapping

* minuteField fix

* availability fix

* fixed react-select menu overflow in dialog

* --WIP

* added default value for custom inputs

* fixed locations

* fixed daterangepicker

* fixed team eventType

* basic cleanup --wip

* fixed locations removal bug

* removed old locations state remnants

* some cleanup --wip

* rebase conflict resolution

* removed debug rem and fixed radio text size

* further requested changes

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: Omar López <zomars@me.com>
2021-11-24 10:07:49 -07:00
kodiakhq[bot] 4f7175edc0
Merge branch 'main' into katt/cal-620-edge-fns 2021-11-24 11:45:56 +00:00
Alex Johansson 644b0f1b0e
re-enable batching (#1199)
This reverts commit 58f55f84e2. /  #1197
2021-11-24 11:45:09 +00:00
kodiakhq[bot] d3cdd02612
Merge branch 'main' into katt/cal-620-edge-fns 2021-11-24 10:43:48 +00:00
Alex Johansson deb97fdab0
get rid of circular references in `viewer.eventTypes` (#1198) 2021-11-24 10:42:55 +00:00
kodiakhq[bot] c225b5ffe4
Merge branch 'main' into katt/cal-620-edge-fns 2021-11-24 09:53:53 +00:00
Alex Johansson 58f55f84e2
temporarily disable batching (#1197) 2021-11-24 09:53:03 +00:00
kodiakhq[bot] 180afa08de
Merge branch 'main' into katt/cal-620-edge-fns 2021-11-22 11:38:00 +00:00
Alex van Andel 5b3dd02747
Webhook tweaks + Support added for "Custom payload templates" / x-www-form-urlencoded / json (#1193)
* Changed styling of webhook test & updated <Form> component

* Implements custom webhook formats

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-11-22 11:37:07 +00:00
Omar López 27b9b57d17 Simplified locale redirect logic 2021-11-19 11:38:51 -07:00
KATT 9d74d371f2 fix 2021-11-19 12:57:37 +01:00
KATT f2e92f830f tweak 2021-11-19 12:54:23 +01:00
KATT 3f54cb04af tweak 2021-11-19 11:50:01 +01:00
KATT fbc5ac4c14 Merge remote-tracking branch 'origin/main' into katt/cal-620-edge-fns
# Conflicts:
#	components/booking/DatePicker.tsx
#	pages/[locale]/[user].tsx
#	pages/[user]/[type].tsx
2021-11-19 11:37:56 +01:00
Alex van Andel d6dd13a9d8
Updated team to also use getWorkingHours (#1188) 2021-11-18 10:20:48 +00:00
Alex van Andel e0d1b6b5ea
Working availability Schedule for every timezone (few things TODO) (#1187) 2021-11-18 03:29:36 +00:00
Alex van Andel ffdf0b9217
Fixes user availability to be contextual to the user timezone (#1166)
* WIP, WIP, WIP, WIP

* Adds missing types

* Type fixes for useSlots

* Type fixes

* Fixes periodType 500 error when updating

* Adds missing dayjs plugin and type fixes

* An attempt was made to fix tests

* Save work in progress

* Added UTC overflow to days

* Update lib/availability.ts

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

* No more magic numbers

* Fixed slots.test & added getWorkingHours.test

* Tests pass, simpler logic, profit?

* Timezone shifting!

* Forgot to unskip tests

* Updated the user page

* Added American seed user, some fixes

* tmp fix so to continue testing availability

* Removed timeZone parameter, fix defaultValue auto-scroll

Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Alex Johansson <alexander@n1s.se>
2021-11-18 01:03:19 +00:00
Alex Johansson f3c95fa3de
fix i18n flicker on auth pages (#1183)
* fix flicker on `/auth/login`

* fix flicker on logout

* fix flicker on error

* fix i18n flicker on signup
2021-11-16 18:12:08 +01:00
Syed Ali Shahbaz 4e01b13133
Feature/cal 677 brand color in settingsprofile (#1158)
* added CSS variable --brand-color

* added CustomBranding component

* prisma update for brand color

* added brandcolor to user context in viewer.me

* conflict resolution

* added brandColor input and mutation

* custom brand color to availability

* brandColor added to BookingPage

* fixed availability, booking for team and added customBranding to success

* brandColor added to cancel/uid

* requested changes

* lint fix

* further changes

* lint fix
2021-11-16 14:21:46 +05:30
Alex Johansson 0a34512e3b
availability timezone fix (#1180) 2021-11-15 20:32:10 +00:00
Alex Johansson 11269229ae
add happy path test for booking an event (#1177) 2021-11-15 15:03:04 +00:00
Bailey Pumfleet 6b171a6f87
Manually reorder event types (#1142)
* Add event type reordering

* Add migration for position field

* hack on a hack

* can edit

* fix ordering

* Remove console.log

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

Co-authored-by: KATT <alexander@n1s.se>
2021-11-15 12:25:49 +00:00
KATT 1bd9780f27 add happy path book an event 2021-11-15 11:03:18 +01:00
KATT 8ec0c30afd Merge remote-tracking branch 'origin/main' into katt/cal-620-edge-fns
# Conflicts:
#	pages/[user]/[type].tsx
#	yarn.lock
2021-11-15 10:06:38 +01:00
Alex van Andel fd2adae10f
Tweak my-4 to mb-4 (#1164)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-11-13 09:53:01 +00:00
Alex van Andel bf659c0b16
Fixed #1015 - Teams user registration is broken (#1090)
* Fixed #1015 - Teams user registration is broken

* Type fixes for avilability form in onboarding

* Re adds missing strings

* Updates user availability in one query

Tested and working correctly

* Fixes seeder and tests

Co-authored-by: Omar López <zomars@me.com>
2021-11-11 05:44:53 +00:00
Ciarán Hanrahan 16fba702fb
typography fixes (#1163) 2021-11-10 23:18:39 +00:00
Alex van Andel 8664d217c9
Feature/availability page revamp (#1032)
* Refactored Schedule component

* Merge branch 'main' into feature/availability-page-revamp

* wip

* Turned value into number, many other TS tweaks

* NodeJS 16x works 100% on my local, but out of scope for this already massive PR

* Fixed TS errors in viewer.tsx and schedule/index.ts

* Reverted next.config.js

* Fixed minor remnant from moving types to @lib/types

* schema comment

* some changes to form handling

* add comments

* Turned ConfigType into number; which seems to be the value preferred by tRPC

* Fixed localized time display during onboarding

* Update components/ui/form/Schedule.tsx

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

* Added showToast to indicate save success

* Converted number to Date, and also always establish time based on current date

* prevent height flickering of availability

by removing mb-2 of input field

* availabilty: re-added mb-2 but added min-height

* Quite a few bugs discovered, but this seems functional

Co-authored-by: KATT <alexander@n1s.se>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-11-10 11:16:32 +00:00
Mihai C 559ccb8ca7
hotfix: zoom location on emails (#1153)
* fix: zoom location on emails

* test: fix

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-11-09 16:27:33 +00:00
Peer Richelsen 55a7cc928f
removed api docs button from integrations (#1149) 2021-11-09 10:07:02 +00:00
Peer Richelsen 528c620aa7
fixed dark mode for booking (#1150) 2021-11-08 21:57:32 +00:00
KATT 1b099036f5 more fixes 2021-11-08 18:26:56 +01:00