mythic-insight/calcom
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5
1015 commits 1 branch 0 tags 57 MiB
Commit graph

607 commits

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