maronato/cal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,472 Commits 866 Branches 211 Tags 815 MiB
Commit Graph

821 Commits

Author SHA1 Message Date
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 e2a3d81371.

* 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
Mihai C 903f7729c7
feat: add better error handling (#605) 
* feat: add better error handling

* refactor: update after review

* refactor: remove unnecessary code

* refactor: better path structure

* refactor: fetch-wrapper after code review

Co-authored-by: Mihai Colceriu <colceriumi@gmail.com>
 2021-09-09 16:51:06 +03:00
Bailey Pumfleet 70f595ec08
Change event types to use slug instead of ID (#612) 
* Temporarily disable checking video busy times

* Add fix for create event type modal
 2021-09-08 20:43:51 +01:00
Alex van Andel 1269c43c99
Username is now @unique in main, so we can now catch Prisma conflicts (#610) 2021-09-08 19:21:23 +02:00
Peer_Rich 766cdd7123
changed api docs link (#606) 2021-09-08 15:01:42 +01:00
Alex van Andel aff45e3451
Fixed #598 - handleLegacyConfirmationMail (#601) 
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-09-08 11:21:19 +00:00
Alex Johansson a9a6d69ba6
tweak `inferSSRProps` to not need `as const` (#591) 2021-09-08 11:03:43 +00:00
Bailey Pumfleet 50d727cbbb
Temporarily disable checking video busy times (#603) 2021-09-08 10:14:13 +02:00
Alex Johansson 7e6e935ed3
add free plan (#549) 
- add new fields to support this
- when free:
  - fade out all event types after first
  - hide events after first on booking page
  - make booking page after the first one 404 if accessed directly
- add e2e tests
 2021-09-06 13:51:15 +00:00
Syed Ali Shahbaz fa35af7bd8
Cal 262 refactor edit teams according to the design reference (#516) 
* refactored settings/team landing page

* changed team edit flow, WIP

* merge conflict fix for teams.tsx

* minor fixes to edit team, WIP

* invite-member and disband team APIs attached inside edit-team page

* added remove-member API in edit-team page, minor fixes

* minor code fix, WIP

* WIP

* add logo, bio, branding to team schema

* bio, logo, branding, slug patch API and minor code fix-- WIP

* fn to Disband team directly from the dropdown menu in settings/teams page, removed debug remnants --WIP

* Pull latest data after an action in settings/teams-edit page

* added slug conflict check at Patch time

* code clean-up

* initial change request fixes --WIP

* prop type fix and add warn button color theme --WIP

* added warn Button to Dialog

* remaining change request fixes

* added noop from react-query

* updated invited team-list design

* prettier fix for api/teams/profile

* removed noop import and added custom noop

* minor Button fix

* requested changes addressed
 2021-09-06 14:22:22 +01:00
Alex van Andel 43b275bc30
Implemented Button, hide 'Prev step' on first step (#583) 
* Implemented Button, hide 'Prev step' on first step

* Changed 00:00:00 -> 00:00 whilst keeping values unchanged

* Updated to localizedFormat (future i18n) + remove unused const

* Going native for now, can revisit later

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-09-06 09:14:01 +00:00
Alex van Andel d9aff72220
Prepares the email system for Calendso Teams (#586) 
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-09-06 09:06:33 +00:00
Peer_Rich 1d22c32904
reverting App Store naming back to Integrations, closes #576 (#584) 2021-09-05 01:27:19 +02:00
Adam Spiers 9077640983
Fix the text of the requiresConfirmation option (#571) 2021-09-04 18:41:39 +01:00
Alex Johansson 2f1ede9bcd
use `getSession()` from `@lib/auth` everywhere (#563) 2021-09-03 21:51:21 +01:00
Alex Johansson 8999829490
inverted logic on `ONBOARDING_INTRODUCED_AT` (#566) 2021-09-03 17:24:11 +00:00
Alex Johansson adff0d0176
improve typings on "getting started" (#554) 2021-09-03 09:45:57 +02:00
Alex Johansson 8eaa94d3c1
mv `ONBOARDING_INTRODUCED_AT` to new file (#557) 
otherwise will the `/event-types`-route probably unnecessarily import the whole `getting_started`-page
 2021-09-02 16:36:58 +00:00
Alex Johansson 72c43cc44e
mv `/getting_started` to `/getting-started` (#556) 2021-09-02 16:26:21 +00:00
Alex Johansson 52f95eb1c3
add `inferSSRProps` utility (#551) 2021-09-02 18:10:44 +02:00
Alex Johansson da7986c1f9
bare minimum to fix lint error on `main` (#555) 2021-09-02 16:17:24 +01:00
Femi Odugbesan 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
Femi Odugbesan 8e9703545a
fix: error when description is null (#536) 2021-08-28 19:04:09 +02:00
Bennet Robin Fabian 5c1d46aa25
Changed button text on Select calendars modal (#535) 2021-08-27 23:13:27 +02:00
Alex van Andel 252179f3be
Add 'Button' component & update to current best practise (#523) 
* Add 'Button' component & update to current best practise

* Use literal string for type, renamed alert -> variety

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-08-27 14:22:49 +00:00
Mihai C a37411b8af
refactor: add next-seo (#531) 
* refactor: add next-seo

* refactor: change naming of seo component
 2021-08-27 15:35:20 +03:00
Mihai C fc50821282
feat: add react-query and navigate to edit after event-type creation (#528) 
* feat: add react-query and navigate to edit after event-type creation

* fix: add types/toasts and add react-query mutations on event-types

Co-authored-by: Mihai Colceriu <colceriumi@gmail.com>
 2021-08-27 15:11:24 +03:00
Alex Johansson a44bc63304
fix linting issue introduced in 9844cf9 (#529) 2021-08-26 13:42:40 +02:00
Alex van Andel 160727c0e2
Extracted PhoneInput, fixed styling (#520) 2021-08-25 11:18:37 +01:00
Bailey Pumfleet 9844cf92a8 Temporarily disable checking video busy times 2021-08-24 22:44:29 +01:00
Alex van Andel 47d28756b6
Fixed import (#515) 2021-08-24 10:38:37 +02:00
Peer Richelsen 5fe4a37908 added floating action button props to <Button> and using it in event types on mobile 2021-08-23 22:42:24 +02:00
Peer Richelsen 21b3134e1f closes #476 Google Calendar Modal not scrollable 2021-08-23 17:28:28 +02:00
Alex Johansson a77a15056a
`<Button>`-component (#480) 
-`<Button/>` component
- Uses `next/link` + `<a/>` if you supply a `href` otherwise `<button/>`
- Add UI sandbox
- Change the `event-types/index` to use a query param for deciding if modal is open or not
 2021-08-23 14:45:25 +02:00
Alex van Andel bc97237858
Remove image from session, add /api/me, update Avatar component (#493) 
* Remove image from session, add /api/me, update Avatar component

* Fixed Avatar on Desktop

* Added emailMd5 to session + load md5 from props on /settings/profile

* Explicitly select which fields to expose in /api/me

* Abstracted Gravatar, defaults avatar for /api/me, removed session dep from UserDropdown

* Delete md5.js :)

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-08-22 14:16:42 +01:00
Mihai C 3894ee12d1
feat: CustomEventType placeholder and API fixes (#446) 
* feat: add optional placeholder for text/multi-line text custom inputs on event types

* fix: delete associations of event type first

* fix: remove unneeded check

* fix: minor tweak

Co-authored-by: mihaic195 <mihai@sortlist.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-08-22 14:06:26 +01:00
Alex van Andel 44e0af9641
Small fixes to darkmode on teams page & event type select (#509) 
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2021-08-22 13:48:33 +01:00
Mihai C eaaa36c4a4
fix: clickable checkbox/label and minor styling (#442) 
* fix: clickable checkbox/label

* fix: change location radiogroup color to dark

* fix: same classes for labels

Co-authored-by: mihaic195 <mihai@sortlist.com>
 2021-08-20 14:11:08 +02:00
Alex Johansson 6d158e0c50
fix google auth callback (#500) 
* maybe fix?

* fix

* Update pages/api/integrations/googlecalendar/callback.ts

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

Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2021-08-19 15:37:18 +01:00
Peer_Rich f8a3f73a25
added dark mode to ics icon (#498) 2021-08-19 14:46:12 +02:00
Alex Johansson a8ef195546
add query params parser util (#496) 2021-08-19 12:32:51 +00:00
Alex Johansson f63aa5d550
add linting in CI + fix lint errors (#473) 
* run `yarn lint --fix`

* Revert "Revert "add linting to ci""

This reverts commit 0bbbbee4be.

* Fixed some errors

* remove unused code - not sure why this was here?

* assert env var

* more type fixes

* fix typings og gcal callback - needs testing

* rename `md5.ts` to `md5.js`

it is js.

* fix types

* fix types

* fix lint errors

* fix last lint error

Co-authored-by: Alex van Andel <me@alexvanandel.com>
 2021-08-19 14:27:01 +02:00
Alex Johansson 5a9961f608
quick fix for location error (#492) 2021-08-18 22:07:59 +02:00
Alex Johansson 2af160a13e
make `pages/[user]/[type].tsx` type-safe (#484) 
* make `pages/[user]/[type].tsx` type-safe
* deprecate `whereAndSelect`
 2021-08-18 12:21:52 +00:00
Alex Johansson aed9757409
fix bad auth commit (#487) 2021-08-18 12:15:22 +00:00
Alex Johansson a0a0ec86f0
add type-safe `getSession()` (#486) 
* fix types for auth
* implement safer to use `getSession`
 2021-08-18 11:52:25 +00:00
Peer_Rich a162949cf1
added useNotification @lib, using it in EventType (#468) 2021-08-18 10:18:18 +02:00
Bailey Pumfleet 77ada9667a
Merge pull request #430 from mihaic195/fix/next-auth-issues 
Fix next-auth issues
 2021-08-17 09:52:11 +01:00
Bailey Pumfleet c9ea8fd624
Merge pull request #445 from mihaic195/fix/feedback-on-event-type-update 
fix: add success modal on event-type update
 2021-08-17 09:41:19 +01:00
Peer_Rich 52ca44a3a2
Merge pull request #464 from emrysal/hotfix/inclusive-exclusive-should-be-other-way 2021-08-17 06:12:00 +02:00
Alex van Andel 3a00ab0d0e Switched exclusivity, initial bugfix was incorrect 2021-08-16 22:51:52 +00:00
Peer Richelsen bf598a21d4 dark mode for add to calendar buttons 2021-08-16 23:10:06 +02:00
femyeda 49e7cbf803 fix issue where user could not connect to caldav 
Uses base caldav adapter to ensure connectivity

rethrows all errors on CalDavCalendarAdapter
 2021-08-16 09:34:49 -05:00
Peer_Rich dcb619af1f
Merge pull request #434 from joshsny/bugfix/cancel 
Fix 500 error when trying to cancel a booking that was already cancelled.
 2021-08-16 13:31:13 +02:00
Bailey Pumfleet 06dce130b2
Merge pull request #450 from emrysal/bugfix/custom-inputs 2021-08-16 10:35:28 +01:00
Bailey Pumfleet ceacf02383
Merge pull request #449 from kanji-keraliya/office-365-integration-domain 
Fixed: Office 365 integration redirection URL issue
 2021-08-16 10:23:45 +01:00
Bailey Pumfleet 3d725a9573
Merge pull request #412 from emrysal/bugfix/eventType-merge-artifacts 
Removed selectedEventType + fixed missing booking.eventTypeId
 2021-08-16 10:22:38 +01:00
Peer_Rich 83bef7d95e
Merge pull request #448 from femyeda/team-pages 
Team pages
 2021-08-15 18:44:42 +02:00
Peer Richelsen b1c2db91e7 Merge branch 'main' of github.com:calendso/calendso 2021-08-15 18:38:15 +02:00
Peer Richelsen 73bec6287d replaced caldav icon 2021-08-15 18:37:50 +02:00
femyeda 19ef588fa5 fix issue where client side vali 
dation not happening

show error message from server
 2021-08-15 09:22:05 -05:00
femyeda 420839bcf5 fix issue where user cant cancel caldav dialog 2021-08-15 08:49:30 -05:00
Peer Richelsen a15d05be86 tried fixing the layout of new CalDav integration 2021-08-15 13:10:01 +02:00
Peer_Rich 610ea6c9ef
Merge branch 'main' into main 2021-08-15 12:48:48 +02:00
Femi Odugbesan 65366b7c5b
cal-101-caldav-integration (#419) 
* add generic calendar icon for caldav

* module for symmetric encrypt/decrypt

* caldav integration

* use Radix dialog

* Move caldav components to /caldav

* remove duplicate cancel button, unused function

* ensure app can connect to caldav server before adding

* fix calendar clients can possibly return null

* fix: add caldav dialog does not close when submitted

* safely attempt all caldav operations

* clarify variable name, fix typo

* use common helper for stripping html

* remove usage of request lib until "completed"

* add types and usage comments to crypto lib

* add encryption key to example env file
 2021-08-14 20:53:59 -05:00
Alex van Andel 252a329f09 Fixed issues relating to custom-inputs 
* Don't duplicate custom input when editing before db persist
* Remove correct custom input during delete pre db persist (id undefined)
* Moved typings to prisma, keeping backwards compatibility with @map
* Updated all usages of the enum
 2021-08-14 17:03:50 +00:00
Alex van Andel 3a5e7dd61c Delete old redundant page 2021-08-14 16:43:34 +00:00
Alex van Andel 03cfd4ba8b Detect conflicts when the time is the same as startTime 2021-08-14 15:01:05 +00:00
Alex van Andel 92d3f08f70 Merge branch 'main' into bugfix/eventType-merge-artifacts 2021-08-14 14:56:34 +00:00
Kanji Keraliya 4c48410e2d Fixed: Office 365 integration redirection url issue 2021-08-14 11:55:43 +05:30
femyeda 216a7c0c48 prevent duplicate team names 2021-08-13 14:50:11 -05:00
femyeda 60a4b8b29e add page for teams 2021-08-13 14:46:42 -05:00
mihaic195 5193b723a4
fix: add success modal on event-type update 2021-08-13 12:48:20 +03:00
Bailey Pumfleet da98a1ff1d
Merge pull request #413 from emrysal/bugfix/fix-zoom-calendar-conflict 2021-08-13 09:08:04 +01:00
Peer Richelsen 99e003153e moved og:image outside of isReady scope so it renders on the server 2021-08-12 19:05:46 +02:00
Peer Richelsen 7b2b75c25c wip 2021-08-12 15:55:09 +02:00
Peer Richelsen 655b2b18e8 another booking page design revision 2021-08-12 15:51:40 +02:00
Syed Ali Shahbaz 867e582342 code improvement and accept image only for image uploader input 2021-08-12 16:08:01 +05:30
joshsny bcb2835648 fixed bug when eventType does not exist for booking 2021-08-12 12:23:10 +02:00
Joshua Snyder 6415b561b7
Update pages/availability/troubleshoot.tsx 
Co-authored-by: Nico <spam@nicolasjessen.de>
 2021-08-12 06:54:01 +02:00
Syed Ali Shahbaz 0c3ec98062 added image-uploader component and refactored profile settings page 2021-08-12 10:14:11 +05:30
Alex van Andel abdfd1d412 Resolved errors on the pages/event-types/[type].tsx page 2021-08-10 22:25:26 +00:00
joshsny 03407a3738 removed empty array from useEffect 2021-08-10 11:00:05 +02:00
joshsny 747d8f56d3 fix cancelled bookings error 2021-08-10 10:46:02 +02:00
Alex van Andel 4759aed51d Fixed dismiss on toggle + implemented switch component 2021-08-09 22:43:57 +00:00
Peer Richelsen 5d5a90d4f8 Merge branch 'main' of github.com:calendso/calendso 2021-08-09 12:35:28 +02:00
mihaic195 aa8f11d72c
fix: fix next-auth issues 2021-08-09 13:35:06 +03:00
joshsny 7874e17b1c fixed bugs on availability 2021-08-09 11:24:39 +02:00
Peer Richelsen 6e7893d1a8 fixed add guest input for darkmode 2021-08-08 23:44:11 +02:00
Bailey Pumfleet 35fc5964eb
Merge branch 'main' into bugfix/unify-email-sending 2021-08-08 22:21:53 +01:00
Peer_Rich f664afb371
Merge branch 'main' into main 2021-08-08 23:19:31 +02:00
Peer_Rich 42865dba36
Merge pull request #423 from philippdormann/main 
fix: add missing mailto: in pages/integrations
 2021-08-08 23:16:09 +02:00
Peer Richelsen c83152abe8 Merge branch 'main' of github.com:calendso/calendso 2021-08-08 22:31:24 +02:00
Peer Richelsen 3bfee8a7bf replaced Loading... with Loader component 2021-08-08 22:31:08 +02:00
nicolas 5a5e61739b Removed faulty check 2021-08-08 21:41:02 +02:00
nicolas 560bd19472 Merge branch 'main' into bugfix/unify-email-sending 2021-08-08 21:21:33 +02:00
Alex van Andel 9cbfd2cda9 Was able to remove one level + improve bottom padding 2021-08-08 16:51:00 +00:00
Peer Richelsen ded399e8f6 removed unused import 2021-08-08 18:17:17 +02:00
Peer Richelsen d32d8ea4c3 more minor styling changes to booking 2021-08-08 17:46:21 +02:00
Peer Richelsen b263970b4f padding to powered by and svg fixes 2021-08-08 17:13:31 +02:00
Peer Richelsen d562e83c9e route into event types after deleting an event type 2021-08-07 23:06:13 +02:00
Peer Richelsen 418649fc02 removed unused imports 2021-08-07 23:02:04 +02:00
Peer Richelsen e2d88f1a55 Merge branch 'main' of github.com:calendso/calendso 2021-08-07 22:51:25 +02:00
Peer Richelsen c9cb36d24e added ToolTip component and added to EventTypes 2021-08-07 14:02:01 +02:00
Philipp Dormann f391ad4d2a
fix: add missing mailto: in pages/integrations 2021-08-07 01:08:55 +02:00
Bailey Pumfleet d4fdce5a96 Success page dark mode fixes 2021-08-06 23:45:44 +01:00
Bailey Pumfleet d5c77c42a3 Partial implementation of the confirmation page redesign 2021-08-06 23:14:35 +01:00
Bailey Pumfleet f3a780188f Redesign date & time selection page 2021-08-06 16:29:09 +01:00
Peer Richelsen bf935130ab eslint session comment 2021-08-06 15:09:44 +02:00
Peer Richelsen 2b19a28f89 removed unused imports and function in integrations 2021-08-06 14:32:08 +02:00
joshsny a764b960b2 changed preview link to open in new tab 2021-08-06 07:30:17 +02:00
Peer Richelsen 3fd3e9ad83 truncate event type description on mobile 2021-08-05 21:14:58 +02:00
Peer Richelsen 9b9db3565a hide preview and copy link button on mobile 2021-08-05 21:03:33 +02:00
Peer Richelsen 6fd7eee070 Merge branch 'main' of github.com:calendso/calendso 2021-08-05 20:49:15 +02:00
Peer Richelsen 68b0c4b8b0 removed unused imports 2021-08-05 20:49:05 +02:00
Femi Odugbesan 18eb32a576
fix issue where rescheduleUid missing when updating date (#418) 2021-08-05 12:35:08 -05:00
Peer_Rich eb1572fc37
Merge branch 'main' into renaming-integrations 2021-08-05 17:23:53 +02:00
Bailey Pumfleet 0229c8a2fb Dark mode fixes for user page 2021-08-05 15:00:15 +01:00
Bailey Pumfleet 20954259be Merge branch 'main' of https://github.com/calendso/calendso 2021-08-05 13:44:42 +01:00
Bailey Pumfleet d7f39e9ed6 Redesign profile screen 2021-08-05 13:41:20 +01:00
Peer Richelsen 6ca094f4b2 added launch your own app panel to app store 2021-08-05 14:13:34 +02:00
Peer Richelsen a92ee0f149 renamed integrations to apps 2021-08-05 14:02:59 +02:00
Peer Richelsen 7ef29453bf minor changes to integrations type eslint 2021-08-05 13:36:24 +02:00
Peer Richelsen 2a18516d19 first half of revisions 2021-08-05 12:02:06 +02:00
Syed Ali Shahbaz 81a3f7f3fc cleaned up code 2021-08-05 10:31:32 +05:30
Syed Ali Shahbaz 6102feec1f improved styling and dark mode for add-guest button 2021-08-05 10:03:08 +05:30
Alex van Andel 8bc209f6d0 Attempts to fix conflict with zoom 2021-08-04 21:04:23 +00:00
Alex van Andel 72b62cd49a Removed selectedEventType + fixed missing booking.eventTypeId 2021-08-04 20:03:20 +00:00
Peer_Rich 6977b74f35
Merge pull request #411 from alishaz-polymath/main 
Added 'Add Guest' button at the confirm booking step
 2021-08-04 20:17:30 +02:00
Bailey Pumfleet 721b874bed Re-add auto slug population 2021-08-04 17:06:05 +01:00
Bailey Pumfleet a1720a05b4
Merge pull request #409 from emrysal/feature/radix-ui-dialog 
Implemented @radix-ui/dialog for creating new event types
 2021-08-04 16:47:31 +01:00
Bailey Pumfleet 206c4837ed
Merge pull request #406 from emrysal/bugfix/fixes-for-implementing-calendarView 
Missing dayjs().isBetween plugin + format Z explicitly
 2021-08-04 16:45:57 +01:00
Syed Ali Shahbaz 183386848a cleaning up code 2021-08-04 16:20:38 +05:30
Syed Ali Shahbaz 8e277ef800 fixed merge conflict in globals.css 2021-08-04 16:16:53 +05:30
Syed Ali Shahbaz 00069fa9a7 Added -Add guest- button at confirm booking step, and minor code improvement 2021-08-04 16:09:43 +05:30
Alex van Andel 97d727c620 Minor style improvements + fixed nested button, DialogTrigger is a button 2021-08-03 23:28:12 +00:00
Alex van Andel 4225016829 Changed the mechanism by which we center the dialog 2021-08-03 22:17:12 +00:00
Alex van Andel c3f5abe68f Fixes no-document-viewport-meta + adds lang='en' to <html> tag, little global fixes 2021-08-03 18:15:24 +00:00
Alex van Andel 972a8dcb76 Merged with main 2021-08-03 17:52:10 +00:00
Alex van Andel c02eaf2486 Implemented @radix-ui/dialog for creating new event types 2021-08-03 17:36:55 +00:00
Peer Richelsen 60d8b05422 temporally removed backdrop for event type dialog until @emrysal implements radix 2021-08-03 13:43:00 +02:00
Peer Richelsen 60242d3237 trying to figure out why event types modal is not working correctly on mobile safari 2021-08-03 13:34:46 +02:00
Peer Richelsen 57b4e25647 changed zIndex of modal backfrop to 0 2021-08-03 13:23:19 +02:00
Peer Richelsen ae836321c9 changed zIndex of modal backfrop to 10 2021-08-03 13:21:21 +02:00
Peer Richelsen 39ee723dc5 moved zIndex for modal to 50 from 10 2021-08-03 13:19:32 +02:00
Peer Richelsen 49777eb05b full width event types list on mobile 2021-08-03 13:16:25 +02:00
Malte Delfs a99e709caa
Merge pull request #407 from Malte-D/bugfix/bool-input 
fixed boolean custom input bug #398
 2021-08-03 12:49:05 +02:00
Malte Delfs ea22741153 fixed #398 2021-08-03 12:45:19 +02:00
Peer Richelsen b9125a54c8 ignore unused response ESLint error 2021-08-03 12:29:51 +02:00
Alex van Andel 78de56b7f5 Missing dayjs().isBetween plugin + format Z explicitly 2021-08-03 10:14:20 +00:00
Peer Richelsen 5b48b26111 fixed layout for event type detail view on mobile 2021-08-03 12:01:12 +02:00
Peer Richelsen 062d9a9935 added new favicon 2021-08-03 11:39:06 +02:00
Peer Richelsen 90aed4a2b9 removed zoom (caused some issues with dialogs) and removed lorem ipsum (whoopsie) 2021-08-03 11:32:37 +02:00
Peer Richelsen 927d7a4bb0 /booking truncate event name for mobile 2021-08-03 11:09:21 +02:00
Peer Richelsen 2d36b5d229 /booking truncate event name for mobile 2021-08-03 11:09:15 +02:00
Peer Richelsen a4c1ac8275 added icons to buttons, added mailto to /booking, moved date into one column 2021-08-03 10:47:01 +02:00
Peer Richelsen a151dcfd01 removed unused imports 2021-08-03 10:34:43 +02:00
Peer Richelsen 8340fce157 extracted classNames into helpers 2021-08-03 10:30:35 +02:00
Peer Richelsen 0bc0119362 Merge branch 'main' of github.com:calendso/calendso 2021-08-03 10:12:17 +02:00
Peer Richelsen 3119c35749 removed unused code 2021-08-03 10:07:39 +02:00
Bailey Pumfleet fd535fc308
Merge pull request #379 from mihaic195/fix/settings-page-and-theme-on-booking-page 
Fix: Settings page bug and dark theme adjustments
 2021-08-03 08:27:29 +01:00
Bailey Pumfleet de5571c8b6
Merge pull request #380 from peduarte/feature/make-collapsible-time-options-accessible 
Make collapsible time options accessible to screen readers
 2021-08-03 08:25:31 +01:00
Bailey Pumfleet 874b33ab04
Merge pull request #403 from emrysal/feature/create-first-eventtype-mobile-first 
Improved 'Create your first event type' layouting
 2021-08-03 08:11:32 +01:00
Bailey Pumfleet 59a1346325
Merge branch 'main' into main 2021-08-03 08:05:03 +01:00
Syed Ali Shahbaz 4becb21d53 Cleaned up the code 2021-08-03 05:59:38 +05:30
Syed Ali Shahbaz 5388ea0610 Added date and time to booking entries 2021-08-03 05:52:17 +05:30
Alex van Andel 81bcd021df Improved 'Create your first event type' layouting 2021-08-02 22:11:36 +00:00
Peer Richelsen e5550b72ba added <Loader> component 2021-08-02 22:57:58 +02:00
nicolas 40938bdf6a Merged main into current branch; lots of linting 2021-08-02 22:51:57 +02:00
Peer Richelsen 71fc0ba437 trying a different redirect for home to event-types 2021-08-02 20:04:06 +02:00
Peer Richelsen 9051a0d60e added loader for / redirect to eventTypes 2021-08-02 19:57:35 +02:00
Peer Richelsen f48e604db3 removed dashboard, redirecting to eventTypes as new default page 2021-08-02 19:37:25 +02:00
Peer Richelsen 0568e7250c fixed mobile tabs in settings 2021-08-02 19:29:34 +02:00
Peer Richelsen 6ae1be6912 minor change on profile 2021-08-02 19:22:35 +02:00
Peer Richelsen f71c5d2075 fixed integrations button absolute positioning 2021-08-02 19:16:20 +02:00
Peer Richelsen a35ac3487b fixed layout for bookings on mobile 2021-08-02 18:54:27 +02:00
Peer Richelsen b11cace4fa fixed integration CTA 2021-08-02 18:40:39 +02:00
Peer Richelsen d549c0321d fixed integration CTA 2021-08-02 18:38:26 +02:00
Peer Richelsen 0eb7cea1e1 fixed integration CTA 2021-08-02 18:38:02 +02:00
Peer Richelsen d08b4ba0f3 changed colors of password reset 2021-08-02 18:32:45 +02:00
Peer Richelsen aaa86888db added create account link for hosted 2021-08-02 18:31:49 +02:00
Peer Richelsen 60b9f7ee15 replaced logo at login 2021-08-02 18:30:30 +02:00
Peer Richelsen 4c2b8f5b6f styled teams section 2021-08-02 17:36:28 +02:00
Peer Richelsen bd7443017a fixed layout for react-select 2021-08-02 17:24:01 +02:00
Peer Richelsen 64961cada1 added bottom nav, replaced png with svg integration icons, added subtitle to shell component 2021-08-02 16:10:24 +02:00
Syed Ali Shahbaz e734b5f5de Entering Title autogenerates Slug 2021-08-02 12:42:46 +05:30
nicolas c8a53d7f29 Merge branch 'main' into bugfix/unify-email-sending 2021-08-01 22:59:43 +02:00