Commit Graph

766 Commits (9d74d371f2b3ee5712d870a67941dd7d2357993d)

Author SHA1 Message Date
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
Syed Ali Shahbaz a404ca847c
updated event title message (#1132)
* updated event title message

* 4 arguments replaced by an object

* translations

* requested changes

* further requested changes

* test fix and other minor changes

* lint fix
2021-11-08 16:34:12 +05:30
Peer Richelsen 0ef6d8b452
added key_strings for /integrations (#1144) 2021-11-07 15:52:48 +00:00
KATT 60867a98ed Merge remote-tracking branch 'origin/main' into katt/cal-620-edge-fns
# Conflicts:
#	lib/app-providers.tsx
#	next.config.js
#	package.json
#	yarn.lock
2021-11-05 11:25:37 +00:00
Mihai C debef8119e
Rejected bookings should be displayed in cancelled bookings tab (#1100)
* fix: rejected bookings should be displayed in cancelled bookings tab

* fix: add migration to update status of rejected bookings

* unrelated fix

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-11-04 22:24:15 +00:00
Peer Richelsen 773e9ac57e
replaced black color with new brand variable to make styling easier (#1125) 2021-11-04 14:30:37 +00:00
Peer Richelsen 401016772e
added missing roboto weights (#1130) 2021-11-04 13:56:02 +00:00
Alex Johansson a002b194da
Fix onboarding OAuth callback glitch (#1079) 2021-11-03 10:47:52 +00:00
Syed Ali Shahbaz 4f75b94d88
mobile view improvement added (#1093)
* mobile view improvement added

* improved max-w
2021-11-01 14:25:43 +05:30
Alex van Andel b7435b5b93
Fixed orphaning team event types (#1086) 2021-10-31 10:41:42 +00:00
Alex Johansson a0c2e57891
suspense follow-up fixes (#1080) 2021-10-30 17:03:49 +01:00
Alex Johansson 1790aeb577
refactor `/integrations` with `<Suspense />` (#1078)
* suspense

* iframe embeds

* calendar list container

* rename things as a container

* use list container on onboarding

* fix

* rm code

* newer alpha

* make it work in react 17

* fix

* fix

* make components handle error state through `QueryCell`

* fix constant

* fix type error

* type error

* type fixes

* fix package.lock

* fix webhook invalidate

* fix mt

* fix typo

* pr comment
2021-10-30 15:54:21 +00:00
Alex van Andel a5eb3fce28
Allow confirming COLLECTIVE types (#1069) 2021-10-29 01:50:52 +01:00
Alex van Andel 91fca7477d
Fixed opt-in layout plus some tweaks (#1067) 2021-10-28 23:06:37 +00:00
Mihai C 98829d23d3
fix: type errors and translate ee pages (#1050)
* fix: type errors and translate ee pages

* fix: translation key for composed string

* type fixes

Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-10-28 22:58:26 +00:00
Alex Johansson dddb494071
rewrite webhooks to trpc (#1065) 2021-10-28 22:52:39 +00:00
Alex van Andel 41382caa6c
Fixed invalid types of i18n locales (string[]) (#1068)
* Fixed invalid types of i18n locales (string[])

* Remaining typefixes done
2021-10-28 22:45:58 +00:00
Omar López 265b76083a
Fixes integrations api endpoint (#1066) 2021-10-28 22:30:42 +01:00
Alex Johansson 5af159cf4e
fix loading flicker on `/bookings` (#1062) 2021-10-28 16:12:30 +00:00
Mihai C f91de82daf
feat: add infinite scroll on bookings tabs (#1059)
* feat: add infinite scroll on bookings tabs

* bookings page infinite scroll PR comments (#1060)

* check if `InteractionObserver` is supported

* revert query cell and use bespoke behaviour

* Update pages/bookings/[status].tsx

Co-authored-by: Mihai C <34626017+mihaic195@users.noreply.github.com>

* load more button

* make inview as a callback

Co-authored-by: Mihai C <34626017+mihaic195@users.noreply.github.com>

* mt-6

* fix: translation strings and remove unnecessary stuff

Co-authored-by: Alex Johansson <alexander@n1s.se>
2021-10-28 15:02:22 +00:00
KATT c888a18bd2 might fix middleware 2021-10-27 04:24:43 +02:00
KATT 87cd589112 edge functions init 2021-10-27 01:16:31 +02:00
Omar López e38086b8fe
Refactors video integrations (#1037)
* Fixes error types

* Type fixes

* Refactors video meeting handling

* More type fixes

* Type fixes

* More fixes

* Makes language non optional

* Adds missing translations

* Apply suggestions from code review

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

* Feedback

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Alex Johansson <alexander@n1s.se>
2021-10-26 10:17:24 -06:00
Bailey Pumfleet eabb096e14
Ensure you can only delete your own credentials 2021-10-26 16:21:08 +01:00
Lola 9879f9910a
Add Modals for Daily Video Calls and updates to Video Call colors (#1027)
* ⬆️ Bump tailwindcss from 2.2.14 to 2.2.15

Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 2.2.14 to 2.2.15.
- [Release notes](https://github.com/tailwindlabs/tailwindcss/releases)
- [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v2.2.14...v2.2.15)

---
updated-dependencies:
- dependency-name: tailwindcss
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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

* updating cal will provide a zoom meeting url

* updating cal will provide a zoom meeting url

* modifying how daily emails send

* modifying how daily emails send

* daily table

* migration updates

* rebasing updates

* updating Daily references to a new table

* merge updates, adding Daily references to book/events.ts

* updated video email templates to remove Daily specific references

* updating the events.ts and refactoring in the event manager

* removing the package-lock

* updating some of the internal Daily notes

* removing handle errors raw from the Daily video client

* prettier formatting fixes

* Added the Daily location to calendar events and updated Cal video references to Daily.co video

* updating references to create in event manager to check for Daily video

* adding a daily interface in the event manager

* adding daily to the location labels

* resolving yarn merge conflicts

* removing prettier auto and refactoring integrations: daily in the event manager

* removing changes to estlintrc.json

* updating message when daily video call meeting has not started

* updated modal time buffer

* changed video calls to Cal colors

* removing change to undoing change to lodash/merge on the event manager

* removing change on the event-types to match the main repo

* updating the border color in daily video calls

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Lola-Ojabowale <lola.ojabowale@gmail.com>
2021-10-26 14:10:55 +01:00
Syed Ali Shahbaz baba307a9f
Feature/cal 605 add webhook test check during webhook (#1035)
* starting point

* lint fix

* add mock placeholder

* simplified a bit

* add some placeholder ui

* err handling

* multiple fixes

* post rebase fixes

* removed extra webhook enabled button

* finishing touches

* added translations

* removed debug remnants

* requested changes

Co-authored-by: KATT <alexander@n1s.se>
2021-10-25 21:45:52 +05:30
Alex Johansson a9df3b9ad0
Move cron jobs into GitHub actions (#1006) 2021-10-25 18:16:42 +03:00
Mihai C 8d6fec79d3
feat: add translations for emails and type error fixes overall (#994)
* feat: add translations for forgot password email and misc

* fix: type fixes

* feat: translate invitation email

* fix: e2e tests

* fix: lint

* feat: type fixes and i18n for emails

* Merge main

* fix: jest import on server path

* Merge

* fix: playwright tests

* fix: lint

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-10-25 14:05:21 +01:00
Mihai C 356d470e16
fix: lowercase email on signup (#1039) 2021-10-25 09:29:54 +00:00