Commit Graph

3264 Commits

Author SHA1 Message Date
kodiakhq[bot] afc930b596
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-30 13:51:05 +00:00
sean-brydon fe12a83898
Fixing padding + heading sizes (#4032)
* Fixing padding + heading sizes

* Fix title position
2022-08-30 15:47:43 +02:00
kodiakhq[bot] 7e776c9749
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-30 11:52:07 +00:00
sean-brydon 7d611c5527
Border color - brand color - mobile 1 colum times (#4025) 2022-08-30 13:51:08 +02:00
Alex van Andel 0bd8c23be7
Proposal to turn off eslint during 'yarn / next build' (#4027) 2022-08-30 13:50:34 +02:00
kodiakhq[bot] 8ed6e0e863
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-30 11:47:27 +00:00
Alex van Andel fdc8a839b4
Fix linting error (#4026) 2022-08-30 13:46:03 +02:00
kodiakhq[bot] abe23eb4ac
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-30 09:40:53 +00:00
Jeroen Reumkens 3da3e6ec38
feat: Adds new v2 design for app detail page. Fixes #3779 (#3997)
* feat: Adds new v2 design for app detail page. Fixes #3779

* fix: Made app images 90% width on mobile to show indication for scrolling. #3779

* Update apps/web/components/v2/apps/App.tsx

Co-authored-by: Leo Giovanetti <hello@leog.me>

Co-authored-by: Jeroen Reumkens <jeroen.reumkens@deptagency.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Leo Giovanetti <hello@leog.me>
Co-authored-by: Peer Richelsen <peer@cal.com>
2022-08-30 11:37:40 +02:00
kodiakhq[bot] 476fe83f9b
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-30 08:59:26 +00:00
sean-brydon fb3c481235
V2 colors - Public Booking (#4022)
* V2 colors

* Fix border right

* Fixing spacing
2022-08-30 10:56:30 +02:00
kodiakhq[bot] 1987e1352a
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-30 00:08:46 +00:00
alannnc 3527c5126a
Added Syntax error case and also default error returning (#4015) 2022-08-29 18:05:35 -06:00
kodiakhq[bot] 4424d717b6
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-29 23:58:36 +00:00
depfu[bot] d75a8910f6
Update all Yarn dependencies (2022-08-17) (#3887)
* Update all Yarn dependencies (2022-08-17)

* Fix package mismatches

* Submodule sync

* Type fixes

Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
2022-08-29 17:55:27 -06:00
kodiakhq[bot] aecee5efda
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-29 22:36:56 +00:00
Omar López 037410aea7
One jest to rule them all (#3957)
* WIP

* Consolidates jest deps

* Test fixes

* Moves jest to root

* Test fixes

* Update CalendarService.test.ts

* Cleanup

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-08-29 22:33:53 +00:00
kodiakhq[bot] 4d9e50ffd2
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-29 22:23:45 +00:00
zomars 54bd1436b1 v1.9.2 2022-08-29 16:20:20 -06:00
zomars a262d261a7 Submodule sync 2022-08-29 16:20:06 -06:00
kodiakhq[bot] 3029d761f5
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-29 16:03:14 +00:00
Leo Giovanetti e4e4ec5ffc
Availability and booking info text format fixes (#4000)
* Recurring info format

* More mismatch visual bugs when booking

* More tweaks

* Prettier

* Prettier cont

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-08-29 13:01:45 -03:00
kodiakhq[bot] 63d67d0a0e
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-29 13:07:26 +00:00
Udit Takkar 00c00a9aee
fix: add required property on input (#3934)
* fix: add required property on input

* chore: remove console

* fix: add check in /api/book for custom inputs

* chore: var name

* wip:try zod

* fix: change zod validation

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-08-29 13:04:22 +00:00
kodiakhq[bot] 3ff5e5c414
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-29 12:07:52 +00:00
Peer Richelsen 85cc62d0cb
temp remove <Tips> card from sidebar till 2.1 (#4010) 2022-08-29 14:04:39 +02:00
kodiakhq[bot] 5a97893a6a
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-29 11:59:46 +00:00
Udit Takkar ac50492fbc
fix: add warn and trash icon (#4008)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-08-29 13:57:01 +02:00
kodiakhq[bot] 9ff2d01786
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-28 16:34:45 +00:00
Edgar Allan Glez 4b771a5bde
fixing cursor for Default badge svg, from text type to default (#3994)
Co-authored-by: alannnc <alannnc@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-08-28 18:31:56 +02:00
kodiakhq[bot] 2b33541f88
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-27 13:15:14 +00:00
Udit Takkar 944f4dc43b
fix: pass recurring count value (#3844)
* fix: pass recurring count value

* fix: show dates for pending booking

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Leo Giovanetti <hello@leog.me>
2022-08-27 10:12:38 -03:00
kodiakhq[bot] 64f5ed333a
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-26 23:23:54 +00:00
Leo Giovanetti cfe7c7a5b3
Fixing CalendarService tests (#3993) 2022-08-26 17:21:12 -06:00
kodiakhq[bot] 6afa5f0951
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-26 22:51:21 +00:00
Edgar Allan Glez d1c5268ef0
Feature 3976/fix label (#3992)
* changing username label placeholder to Apple ID text in apple calendar setup

* reset yarn.lock

* remove translate function for apple id label, not necessary

Co-authored-by: alannnc <alannnc@gmail.com>
2022-08-26 16:49:38 -06:00
kodiakhq[bot] c114fa8837
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-26 22:00:48 +00:00
Omar López 02ac593ebf
Migrate legacy api endpoints to tRPC II (#3865) (#3991)
* Migrate legacy api endpoints to tRPC II (#3865)

* fix: delete api route /api/availability/day

* fix: delete api route /api/availability/eventtype (#3573)

* fix: delete api route /api/event-type (#3573)

* migrate /api/book/confirm to viewer.bookings.confirm

* Merge branch 'main' into pr/3865

Co-authored-by: hussamkhatib <hussamkhatib@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>

* Import fixes

* Import fixes

Co-authored-by: mohammed hussam <52914487+hussamkhatib@users.noreply.github.com>
Co-authored-by: hussamkhatib <hussamkhatib@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-08-26 15:58:08 -06:00
kodiakhq[bot] 6b200a616d
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-26 21:12:51 +00:00
Leo Giovanetti 1d927a8b33
chore: Sync Services to update external tools (#3814)
* WIP close.com app

* Removing leaked dev key (now invalid)

* Misspelled env variable

* Making progress still WIP

* Progress + tests

* Final touches

* More unit tests

* Finished up tests

* Merge main

* Removing unneeded stuff + submodules

* Removing static props, fields fix

* Removing unneeded stuff p2

* Commenting

* Refactoring Close.com Calendar Service + initial structure

* Progress con CloseComService

* Standarizing APIs

* Zodifying

* Expanding sync services

* Sendgrid Sync Service

* using own request for sendgrid + debug logs

* Making get last booking work for console

* Helpscout dynamic app API

* Standarizing calls + adding call from booking creation

* Strategy change for last booking

* Strategy change for last booking on help scout api

* Fixing failing build

* Implementing user deletion

* Fix linting + slight cleaning

* Undoing eslint disable

* Removing more unsupported eslint properties

* Closecom as non-standard sync service

* Finishing closecom lead operations

* Fixing lint

* Guarding app from sync services

* Reverting submodules

* Applying PR feedback

* Reverting API to be plain handler

* Cleaning notes

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-08-26 15:10:12 -06:00
kodiakhq[bot] 009a949cb6
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-26 19:07:43 +00:00
sean-brydon 090a977f72
AppsTab UX + fixes warptext on horizontal tabs (#3966)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-08-26 13:04:45 -06:00
kodiakhq[bot] 716a6b15e5
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-26 19:03:02 +00:00
Udit Takkar 2d3a6fb4ca
fix: add team model in prisma middleware (#3947)
* fix: add team model in prisma middleware

* refactor: move to getParsedResults function

* fix: add eventtype

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-08-26 12:59:58 -06:00
kodiakhq[bot] fd32fc14f3
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-26 18:53:37 +00:00
GitStart 974ff03127
REPLY_TO in hello@cal.com emails (#3959)
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: gitstart <gitstart@gitstart.com>
Co-authored-by: Nitesh Singh <nitesh.singh@gitstart.dev>
Co-authored-by: Matheus Muniz <87545749+matheusmuniz03@users.noreply.github.com>
Co-authored-by: hustle-ps <grace.devolop@gmail.com>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
Co-authored-by: Matheus Benini <matheus_benini@hotmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-08-26 12:51:32 -06:00
kodiakhq[bot] 2d701554ab
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-26 18:45:38 +00:00
Hariom Balhara 4ef666a610
Zoom/Hubspot Tests with MSW mocking of requests initiated from Next.js server (#3210)
* Add code from previous PR

* Remove env variables from wrong place

* Fix tests

* Remove dead code

* Package.json updates

* Fix eslint error

* Fix issue due to conflict resolution

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-08-26 12:44:02 -06:00
kodiakhq[bot] 91764960c3
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-26 18:16:10 +00:00
Alex van Andel e0744a4857
Fixed a typo in notifications->showToast & updated all imports (#3990) 2022-08-26 12:13:49 -06:00