Commit Graph
94 Commits
Author SHA1 Message Date
Peer RichelsenGitHubkodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>zomars
51d553559f tailwind prettier (#1646)
* tailwind prettier

* Minor fixes

* Sorts components and pages

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2022-02-09 00:05:13 +00:00
20d2955e68 Add Jitsi Meet Integration (#1674)
* basic integration structure

* jitsi logo

* add jitsi meet description to event settings page

* add JitsiVideoApiAdapter

ref #1445

* add LocationType.Jitsi to BookingPage

ref #1445

* add LocationType.Jitsi to event-types

ref #1445

* add meet.jit.si/cal/uuid support to BookingPage

ref #1445

* add basic "cal_provide_jitsi_meeting_url" translation strings

ref #1445

* generate meeting id

ref #1445

* implement direct jitsi link in /success page

ref #1445

* cleanup location link duplicate

ref #1445

* full JitsiVideoApiAdapter implementation

ref #1445

* check integration availability in /pages/event-types/[type]

ref #1445

* add video conferencing link as calendar event location

ref #1445

* PR feedback

* Update components/booking/pages/BookingPage.tsx

don't know - wouldn't do this myself for future proofing but fine...

Co-authored-by: Omar López <zomars@me.com>

* Update components/booking/pages/BookingPage.tsx

🤷‍♂️

Co-authored-by: Omar López <zomars@me.com>

* cleanup: props.type === "jitsi_video"

ref #1445

Co-authored-by: zomars <zomars@me.com>
2022-02-08 15:12:28 -07:00
64db8d1cd4 Add Huddle01 integration (#1675)
* Add Huddle01 integration

* updated huddle01 locale strings

Co-authored-by: deepso <deeps.o7o8.y@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-02-03 11:59:02 +00:00
8bb3e9c0be RTL (right-to-left) layout (#1654)
* added rtl to body

* added locale checkker in _document.tsx to check for ar or he locale

* added rtl modifiers for event-types

* added rtl classes

* wip

* wip

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-02-01 22:17:37 +00:00
Peer RichelsenandGitHub aa28cf0641 using button loading props vs Loader component (#1677) 2022-02-01 21:52:54 +00:00
1d10874890 Web3 App (#1603)
* Crypto events (#1390)

* update schemas, functions & ui to allow creating and updating events with a smart contract property

* remove adding sc address in the dialog that first pops-up when creating a new event, since its an advanced option

* add sc to booking ui

* some more ts && error handling

* fetch erc20s and nfts list in event-type page

* some cleanup within time limit

* ts fix 1

* more ts fixes

* added web3 section to integrations

* added web3 wrapper, needs connection to user_settings db

* extract to api

* Update eventType.ts

* Update components/CryptoSection.tsx

Change comment from // to /** as @zomars suggested

Co-authored-by: Omar López <zomars@me.com>

* convert axios to fetch, change scAddress to smartContractAddress, load bloxy from next_public_env

* Fix branch conflict

* add enable/disable btn web3

* fixed away user causing duplicate entries

* Remove web3 validation

* renamed web3 button in integrations

* remove unused variable

* Add metadata column

* added loader and showToast to the web3 btn

* fix: remove smartContractAddress from info sended

* send to user events when the contract is missing

* use window.web3 instead of web3

* use NEXT_PUBLIC_WEB3_AUTH_MSG

* remove web3 auth from .env

* wip

* wip

* Add metamask not installed msg and success redirect

* add redirect when verified

* styled web3 button and added i18n to web3

* fixed redirect after verification

* wip

* wip

* moved crypto section to ee

Co-authored-by: Yuval Drori <53199044+yuvd@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@richelsen.net>
Co-authored-by: Yuval Drori <yuvald29@protonmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Edward Fernandez <edward.fernandez@rappi.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-02-01 21:48:40 +00:00
Jamie PineandGitHub 70683a89b9 Added "New Event Type" button on Team settings (#1411)
- Moved CreateNewEventButton in pages/event-types/index to dedicated component as this is used in two places now.
- Implemented CreateEventType button on Team settings screen and replaced old markup in on event types page with new component.
- Upgrade vanilla JS inputs to library primitives.
- Created TextArea & TextAreaField components in components/form.
- [Bugfix] Changed back button behavior in Shell to have a specified back path as CreateEventType's modal interfered with the router.goBack behavior.
- Ensure modal data is preserved in URL params for router accuracy and removed on exit.
2022-01-12 01:29:20 -08:00
Omar LópezandGitHub 21103580f7 Zomars/cal 748 paid bookings are failing (#1335)
* E2E video adjustments

* Adds test to add Stripe integration

* Type fix

* WIP: Payment troubleshooting

* Paid bookings shouldn't be confirmed by default

* Runs stripe test only if installed

* BookingListItem Adjustments

* Pending paid bookings should be unconfirmed

* Attempt to fix paid bookings

* Type fixes

* Type fixes

* Tests fixes

* Adds paid booking to seeder

* Moves stripe tests to own file

* Matches app locale to Stripe's

* Fixes minimun price for testing

* Stripe test fixes

* Fixes stripe frame test

* Added some Stripe TODOs
2021-12-17 16:58:23 +00:00
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
Peer RichelsenandGitHub 55a7cc928f removed api docs button from integrations (#1149) 2021-11-09 10:07:02 +00:00
Peer RichelsenandGitHub 0ef6d8b452 added key_strings for /integrations (#1144) 2021-11-07 15:52:48 +00:00
Peer RichelsenandGitHub 773e9ac57e replaced black color with new brand variable to make styling easier (#1125) 2021-11-04 14:30:37 +00:00
Syed Ali ShahbazandGitHub 4f75b94d88 mobile view improvement added (#1093)
* mobile view improvement added

* improved max-w
2021-11-01 14:25:43 +05:30
Alex JohanssonandGitHub a0c2e57891 suspense follow-up fixes (#1080) 2021-10-30 17:03:49 +01:00
Alex JohanssonandGitHub 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 JohanssonandGitHub dddb494071 rewrite webhooks to trpc (#1065) 2021-10-28 22:52:39 +00:00
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
Syed Ali ShahbazandGitHub a6eed6ffcc Enhancement/webhooks redesign (#1005) 2021-10-20 18:23:15 +00:00
Omar LópezGitHubkodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
85d7122e43 Fixes Apple Calendar onboarding and type fixes (#988)
* Type fixes

* Type fixes

* Attemp to prevent unknown error in prod

* Type fixes

* Type fixes for onboarding

* Extracts ConnectIntegration

* Extracts IntegrationListItem

* Extracts CalendarsList

* Uses CalendarList on onboarding

* Removes deprecated Alert

* Extracts DisconnectIntegration

* Extracts CalendarSwitch

* Extracts ConnectedCalendarsList

* Extracted connectedCalendar logic for reuse

* Extracted SubHeadingTitleWithConnections

* Type fixes

* Fetched connected calendars in onboarding

* Refreshes data on when adding/removing calendars on onboarding

* Removed testing code

* Type fixes

* Feedback

* Moved integration helpers

* I was sleepy

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-10-20 15:42:40 +00:00
Bailey PumfleetandGitHub 687af03cc3 Improve iframe embed UI (#990) 2021-10-19 11:35:52 +01:00
Alex JohanssonandGitHub 9e69029943 add e2e testing on webhooks and booking happy-path (#936) 2021-10-18 22:07:06 +01:00
Alex JohanssonandGitHub d8dac426eb refactor webhooks UI (#982) 2021-10-18 08:02:25 +01:00
Peer RichelsenandGitHub 656d58b94f moved embed and webhooks from settings into /integrations (#978) 2021-10-17 10:35:25 +01:00
Ciarán HanrahanandGitHub e1f4ba06d8 ui updates to integrations page (#962) 2021-10-15 12:01:49 +02:00
Alex JohanssonandGitHub 59e25ad04e remove unnecessary fetches of api (#960)
* skip repeating fetch of user on session changes
* fix some issues on integrations
2021-10-14 16:00:50 -06:00
Alex JohanssonandGitHub ec6b897191 integration page follow ups (#912)
### Internals

- Replace `lodash.*` packages with plain `lodash` & replace `lodash.*` imports with `lodash/` - should have no impact on bundle size and opens up for us to use all of lodash
- Update `viewer.me` to cherry-pick what we actually need on that query to avoid leaking extra context info
- Update `getIntegrations` to never include `.key`-property to avoid leaking 

### Visual

- Update calendars so `primary` is displayed last
- Update connected calendars so they are in ascending order in which you connected them
2021-10-13 13:35:25 +02:00
Peer RichelsenandGitHub 7dd6fdde7a full width list idems on mobile (#915) 2021-10-12 13:50:43 +01:00
Peer RichelsenandGitHub 6f204ca521 more layout changes to /integrations (#914)
* added truncate to list
2021-10-12 12:06:12 +00:00
Peer RichelsenandGitHub 392c8e8da4 minor layout changes to /integrations (#913) 2021-10-12 11:39:02 +00:00
Alex JohanssonandGitHub c3dc18643e /integrations facelift (#858) 2021-10-12 11:35:44 +02:00
015b7c18af fix #582: send user back to onboarding after adding integration (#635)
* fix #582: send user back to onboarding after adding integration if incomplete

* use more accurate, descriptive typings

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-10-08 14:10:57 +01:00
Peer RichelsenandGitHub bb1da8150f fixed event-type buttons on mobile, added more font-cal classes (#764) 2021-09-24 11:28:57 +00:00
Omar LópezandGitHub 420daec147 CAL-473 Fixes client-side routing for authed pages (#763) 2021-09-24 11:16:46 +01:00
Peer RichelsenandGitHub 51752bd2bd added Cal Sans (#709)
* added Cal Sans

* Delete EmptyScreen.tsx
2021-09-22 21:23:19 +00:00
Omar LópezandGitHub 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ópezGitHubkodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>Peer Richelsen
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
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
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
Alex van AndelandGitHub 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
Alex van AndelandGitHub 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
Femi OdugbesanandGitHub 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
Peer_RichandGitHub e9ff62109d upgraded radix-ui as to asChild, refactored <button className=""> to <Button color="secondary"> (#632) 2021-09-14 09:20:24 +01:00
Femi OdugbesanandGitHub bc79f24fd4 integrate apple icalendar (#623) 2021-09-11 08:54:13 +01:00
Peer_RichandGitHub 1d22c32904 reverting App Store naming back to Integrations, closes #576 (#584) 2021-09-05 01:27:19 +02:00
Alex JohanssonandGitHub 2f1ede9bcd use getSession() from @lib/auth everywhere (#563) 2021-09-03 21:51:21 +01:00
2d23a8b7db Onboarding Flow (#503)
* wip

* wip

* db: schedule schema

* fix adding time goes into new day

fix adding new time not keeping updating ranges

fix updating ranges not maintaining changed values

* remove photo upload

* remove unused code

* remove more unused code

* undo time lib

* didnt actually change this

* dont show onboardi
ng flow for users created before sept 1 2021

* use more consistent max-widths

* align all inputs in scheduler component

* allow overriding of default styles

* match figma designs

implement goto previous step

* add more types, match figma

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-02 13:13:19 +01:00
Bennet Robin FabianandGitHub 5c1d46aa25 Changed button text on Select calendars modal (#535) 2021-08-27 23:13:27 +02:00
Mihai CandGitHub a37411b8af refactor: add next-seo (#531)
* refactor: add next-seo

* refactor: change naming of seo component
2021-08-27 15:35:20 +03:00
Peer Richelsen 21b3134e1f closes #476 Google Calendar Modal not scrollable 2021-08-23 17:28:28 +02:00