Commit Graph

177 Commits (b9dd90b9986e1058de15f69699444551b0f1efd2)

Author SHA1 Message Date
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
Nico 3764a9d462
Bugfix/include zoom location (#715)
* Store video data in event location; fixed several types

* fixed malformed id

* Insert Zoom data when updating as well

* Add columns to store (video) meetings

* Store meeting data

* fixed type

* Use stored videoCallData

* Store location in field as well

* Use meta field for booking reference

* Introduced meta field in code

* Revert "Introduced meta field in code"

This reverts commit 535baccee3.

* Revert "Use meta field for booking reference"

This reverts commit 174c252f67.

* Linting fixes

Co-authored-by: nicolas <privat@nicolasjessen.de>
Co-authored-by: Peer_Rich <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-22 23:43:10 +01: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
Femi Odugbesan a047177e72
Fix/duplicate events on onboarding (#716) 2021-09-22 08:25:33 +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
Femi Odugbesan ed8241ac1b
Fix/events from caldav not taken into consideration when checking availability (#637)
* use version 1.0.6

* use logger over console log

fix typing issue

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-18 17:49:18 +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
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
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 6f56ff8f87
Updated jsxBracketSameLine to bracketSameLine (#620) 2021-09-09 19:43:40 +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
dependabot[bot] ee24ee5518
⬆️ Bump @radix-ui/react-dialog from 0.0.20 to 0.1.0 (#600)
Bumps [@radix-ui/react-dialog](https://github.com/radix-ui/primitives) from 0.0.20 to 0.1.0.
- [Release notes](https://github.com/radix-ui/primitives/releases)
- [Changelog](https://github.com/radix-ui/primitives/blob/main/release-process.md)
- [Commits](https://github.com/radix-ui/primitives/commits)

---
updated-dependencies:
- dependency-name: "@radix-ui/react-dialog"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-08 08:23:59 +00:00
dependabot[bot] 3d0429d172
⬆️ Bump @headlessui/react from 1.4.0 to 1.4.1 (#590)
Bumps [@headlessui/react](https://github.com/tailwindlabs/headlessui/tree/HEAD/packages/@headlessui-react) from 1.4.0 to 1.4.1.
- [Release notes](https://github.com/tailwindlabs/headlessui/releases)
- [Changelog](https://github.com/tailwindlabs/headlessui/blob/main/CHANGELOG.md)
- [Commits](https://github.com/tailwindlabs/headlessui/commits/@headlessui/react@v1.4.1/packages/@headlessui-react)

---
updated-dependencies:
- dependency-name: "@headlessui/react"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-06 17:11:37 +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
dependabot[bot] 1cdb449ecc
⬆️ Bump eslint-plugin-react from 7.24.0 to 7.25.1 (#567)
Bumps [eslint-plugin-react](https://github.com/yannickcr/eslint-plugin-react) from 7.24.0 to 7.25.1.
- [Release notes](https://github.com/yannickcr/eslint-plugin-react/releases)
- [Changelog](https://github.com/yannickcr/eslint-plugin-react/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yannickcr/eslint-plugin-react/compare/v7.24.0...v7.25.1)

---
updated-dependencies:
- dependency-name: eslint-plugin-react
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-03 17:33:00 +00:00
dependabot[bot] 0953c6b541
⬆️ Bump @typescript-eslint/eslint-plugin from 4.29.2 to 4.30.0 (#550)
Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.29.2 to 4.30.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.30.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-09-02 16:54:09 +00:00
Alex Johansson d88ebd233d
add cypress e2e testing (#534) 2021-09-02 16:41:15 +00:00
Alex Johansson c6fa712b10
add `yarn dx` for easier local development (#553) 2021-09-02 15:20:36 +00: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
dependabot[bot] 995f8eea26
⬆️ Bump next from 10.2.3 to 11.1.1 (#548)
* ⬆️ Bump next from 10.2.3 to 11.1.1

Bumps [next](https://github.com/vercel/next.js) from 10.2.3 to 11.1.1.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](https://github.com/vercel/next.js/compare/v10.2.3...v11.1.1)

---
updated-dependencies:
- dependency-name: next
  dependency-type: direct:production
...

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

* Remove future webpack5 property

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-01 22:36:56 +01: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
Femi Odugbesan 2d127a5316
improve speed of caldav event fetching (#501)
* improve speed of caldav event fetching

use forked version of tsDav

* use dayjs to format timerange

* apply calendar timezone to event dates
2021-08-23 16:15:03 +00: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
dependabot[bot] f372520016
⬆️ Bump react-timezone-select from 1.0.6 to 1.0.7 (#489)
Bumps [react-timezone-select](https://github.com/ndom91/react-timezone-select) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/ndom91/react-timezone-select/releases)
- [Commits](https://github.com/ndom91/react-timezone-select/commits)

---
updated-dependencies:
- dependency-name: react-timezone-select
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-18 15:35:31 +02:00
dependabot[bot] 287747e320
⬆️ Bump @heroicons/react from 1.0.3 to 1.0.4 (#483)
Bumps [@heroicons/react](https://github.com/tailwindlabs/heroicons) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/tailwindlabs/heroicons/releases)
- [Commits](https://github.com/tailwindlabs/heroicons/commits)

---
updated-dependencies:
- dependency-name: "@heroicons/react"
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-08-18 13:10:04 +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
Alex Johansson beff23f402
bump almost all dependencies (#477)
* bump all dependencies
* downgrade next.js as it causes build errors
2021-08-18 08:08:33 +00:00
Peer Richelsen 6e14a03cc8 reversed tailwind config 2021-08-16 22:48:06 +02:00
Syed Ali Shahbaz 2fb510723c radix-ui-slider added 2021-08-15 16:57:06 +05:30
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
Syed Ali Shahbaz 0c3ec98062 added image-uploader component and refactored profile settings page 2021-08-12 10:14:11 +05:30
Alex van Andel 4759aed51d Fixed dismiss on toggle + implemented switch component 2021-08-09 22:43:57 +00:00
Peer Richelsen c9cb36d24e added ToolTip component and added to EventTypes 2021-08-07 14:02:01 +02: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
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 c02eaf2486 Implemented @radix-ui/dialog for creating new event types 2021-08-03 17:36:55 +00:00
Pedro Duarte c745416a6a Make collapsible time options accessible to screen readers 2021-07-22 14:16:54 +02:00
Femi Odugbesan 45689059c7
Feat/cal 95/date range on event types (#353)
* add edit links to events on dashboard

* fit elements on screen for mobile

* initialize components for consistent text styles

* add more fine grained width/height settings

* add higher level setting for when an event is available

- db: add supporting values to period allow setting an amount of days,
 a range, or unlimited number days an event is available

* fix issue where periodDates are null

* return minimal required data, handle date parsing

* [ui] limit booking days based on user period settings

* api: validate user period settings

* [db] migration for event type period settings
2021-07-15 09:10:26 -05:00
Femi Odugbesan 5c4a9c32d1
Add application logger (#332)
* add application logger

* use logger
2021-07-09 10:49:42 -05:00
Alex van Andel 90e4091b06 Rehydrated yarn.lock file 2021-06-30 01:55:06 +00:00
Alex van Andel 7030851efb Merged with main, fixed issue that caused multiple AvailableTimes refreshes. 2021-06-27 21:34:38 +00:00
Alex van Andel ef3274d8f3 Working version ready for testing
* More tests to be added to verify slots logic
* Adds Jest
* Implements logic to the booking code to take into account grayed days
* Slots take workhours into account

TODO: Improve the tests, evaluate the structure, small re-orgs here and
there for improved readability / better code
2021-06-24 22:15:18 +00:00
femyeda ab1298e2ca Allow user to reset password 2021-06-24 11:01:41 -05:00
femyeda 173d4cda77 dep: nodemailer types 2021-06-23 16:16:41 -05:00
femyeda 2ccbd61a31 dep: handlebars 2021-06-23 16:11:38 -05:00
Femi Odugbesan 2f7e303bcf
Revert "dep: superjson, plays nice with prisma dates" (#305) 2021-06-23 14:15:52 -05:00
femyeda 7a8222a5ca dep: superjson 2021-06-23 09:42:52 -05:00
Femi Odugbesan bc8f2980d3
Add linting and precommits (#295)
* chore: prefer yarn

* dx: linting configurations, and pre-commit hook
2021-06-21 12:34:01 -05:00
Peer Richelsen 39fde7874d upgraded tailwindcss to support jit https://tailwindcss.com/docs/just-in-time-mode, moved css components into global.css to support jit 2021-06-20 10:57:33 +01:00
nicolas 6c92e2fe1b Implemented short UUID as UID 2021-06-10 00:51:09 +02:00
nicolas af08c74c8a Implemented rescheduling and concurrent usage of all integrations 2021-06-09 21:46:41 +02:00
Alex van Andel cf3713d3a1 Implemented mailing for Calendso instances
added two templates, confirm-booked (sent to invitee) and new-event (sent to agent, for the time being only when no calendar integrations exist).
2021-05-27 22:10:20 +00:00
Bailey Pumfleet 752aad342e Update prisma 2021-05-21 21:03:36 +01:00
Bailey Pumfleet dc09fc833b
Merge pull request #176 from emrysal/feature/implement-phone-and-physical-locations
Implemented configurable eventType phone or physical locations.
2021-05-08 20:49:04 +01:00
Alex van Andel a6c3c7fbb3 Implemented configurable eventType phone or physical locations. 2021-05-08 19:03:47 +00:00
Alex van Andel caabdd2659 Upgraded prisma to v2.22.1 2021-05-07 21:57:55 +00:00
Leonardo Stenico 926a37c31b Updated react-timezone-select 2021-05-06 19:34:33 +02:00
vklimontovich ca1979fac2 - Updated jitsu to 2.0.1
- Mask sensitive information (such as page title and IP address)
2021-05-05 18:04:53 +03:00
Bailey Pumfleet 5cb0e44b00
Merge branch 'main' into fix/calendar-style 2021-05-05 15:42:36 +01:00
Bailey Pumfleet f7295afaa2
Merge branch 'main' into main 2021-05-05 15:18:58 +01:00
Choongkyu Kim e036e9b216 fix calendar style and resolve some TS lint errors 2021-05-04 20:42:01 -07:00
Alex van Andel c4635646ba Updated Next.js to 10.2 2021-04-29 10:30:30 +00:00
vklimontovich 2894be8689 Added telemetry collection (through jitsu.com)
- Introduced useTelemetry() hook
 - Telemetry events are sent for page_view, booking_confirmed, time_selected, date_selected events
 - Telemetry is configured (and can be disabled) with NEXT_PUBLIC_TELEMETRY_KEY env variable
2021-04-27 17:19:12 +03:00
Alex van Andel d482b54fda Implemented react-timezone-select library, required the installation of 'next-transpile-modules', due to import and export not being natively supported within Next.js. 2021-04-26 12:14:23 +00:00
Bailey Pumfleet 35f7b30097 Add success modal 2021-04-20 13:56:50 +01:00
Carlos Panato 004ae22050
dependencies: update prisma to version 2.21.2
Signed-off-by: Carlos Panato <ctadeu@gmail.com>
2021-04-20 08:43:30 +02:00
dependabot[bot] 13deab520f
Bump jose from 1.28.0 to 1.28.1
Bumps [jose](https://github.com/panva/jose) from 1.28.0 to 1.28.1.
- [Release notes](https://github.com/panva/jose/releases)
- [Changelog](https://github.com/panva/jose/blob/v1.28.1/CHANGELOG.md)
- [Commits](https://github.com/panva/jose/compare/v1.28.0...v1.28.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-19 15:29:51 +00:00
Bailey Pumfleet 388ff394c7 Add base admin interface 2021-03-24 15:03:04 +00:00
Bailey Pumfleet d769c3943c Add booking flow 2021-03-22 13:48:48 +00:00
Bailey Pumfleet f260e295f5 Initial commit from Create Next App 2021-03-10 10:02:39 +00:00