Commit graph

68 commits

Author SHA1 Message Date
Peer Richelsen
8bb3e9c0be
RTL (right-to-left) layout ()
* 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
Arnab Tarwani
509e0b0a39
Bugfix/minor email fix ()
* added new line fix, minor email validation

* fix: reorder controls hidden on more than 1 events 

Signed-off-by: arnabtarwani <arnab.tarwani@gmail.com>

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2022-01-29 19:22:02 +00:00
Omar López
2fbdb93efb
Allows for in-app upgrade () 2022-01-28 17:46:35 -07:00
Syed Ali Shahbaz
24182625bb
redirect to cancellation survey () 2022-01-20 09:32:24 +00:00
Syed Ali Shahbaz
e52e1e3e23
Survey at account deletion ()
* redirect to /cancellation

* relative path

* base URL check added
2022-01-19 09:03:51 -07:00
Syed Ali Shahbaz
fac4de1144
Enhancement/cal 708 delete account ()
* --WIP

* --WIP

* --WIP

* added prisma migration and delete cascade for user

* stripe customer removal and other --wip

* --wip

* added stripe user delete

* removed log remnants

* fixed signout import

* cleanup

* Changes requested

* fixed common-json apostrophe

* Simplifies account deletion logic and add e2e tests

* Cleanup

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Omar López <zomars@me.com>
2022-01-14 13:49:15 +00:00
Bailey Pumfleet
f7fda47534
Add ability to change email () 2022-01-12 21:54:48 +00:00
Syed Ali Shahbaz
e24d8889fc
Cal 710 turn dataimagejpegbase64 avatar into ()
* --wip

* added next-config custom header path

* added avatar endpoint

* cleanup --wip

* adding gravatar fallback support --wip

* added endpoint rewrite and avatar access

* gravatar support added

* build err fix

* updated HeadSEO with new avatar logic

* --wip

* adds og compat

* added truncated bio

* cleanup

* changed truncate of body from 24 chars to 32 chars

* removed unused, commented code

* removed trailing whitespace

* requested changes

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-01-11 08:54:02 +00:00
Syed Ali Shahbaz
0dd72888a9
removed team from profile url () 2021-12-20 17:26:35 +01:00
Joel Lu
38f762f7b2
fix: refresh UserDropdown after update ()
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-12-18 15:06:05 +00:00
Jamie Pine
c1d90eb438
Improvement/teams ()
* [WIP] checkpoint before pull & merge

- Added teams to sidebar
- Refactored team settings
- Improved team list UI

This code will be partly reverted next commit.

* [WIP]
- Moved team code back to components
- Removed team link from sidebar
- Built new team manager screen based on Event Type designs
- Component-ized frequently reused code (SettingInputContainer, FlatIconButton)

* [WIP]
- Created LinkIconButton as standalone component
- Added functionality to sidebar of team settings
- Fixed type bug on public team page induced by my normalization of members array in team query
- Removed teams-old which was kept as refrence
- Cleaned up loose ends

* [WIP]
- added create team model
- fixed profile missing label due to my removal of default label from component

* [WIP]
- Fixed TeamCreateModal trigger
- removed TeamShell, it didn't make the cut
- added getPlaceHolderAvatar
- renamed TeamCreate to TeamCreateModal
- removed deprecated UsernameInput and replaced uses with suggested TextField

* fix save button

* [WIP]
- Fixed drop down actions on team list
- Cleaned up state updates

* [WIP] converting teams to tRPC

* [WIP] Finished refactor to tRPC

* [WIP] Finishing touches

* [WIP] Team availability beginning

* team availability mvp

* - added validation to change role
- modified layout of team availability
- corrected types

* fix ui issue on team availability screen

* - added virtualization to team availability
- added flexChildrenContainer boolean to Shell to allow for flex on children

* availability style fix

* removed hard coded team type as teams now use inferred type from tRPC

* Removed unneeded vscode settings

* Reverted prisma schema

* Fixed migrations

* Removes unused dayjs plugins

* Reverts type regression

* Type fix

* Type fixes

* Type fixes

* Moves team availability code to ee

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
2021-12-09 23:51:30 +00:00
Syed Ali Shahbaz
529f3027cd
replaced btn-primary, btn-secondary, btn-white with respective Button equivalents ()
* replaced btn primary, secondary, white with Button

* removed unused Link var

* replaced <button> in settings/security

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: Peer Richelsen <peeroke@richelsen.net>
2021-11-29 06:37:31 +00:00
Syed Ali Shahbaz
4e01b13133
Feature/cal 677 brand color in settingsprofile ()
* added CSS variable --brand-color

* added CustomBranding component

* prisma update for brand color

* added brandcolor to user context in viewer.me

* conflict resolution

* added brandColor input and mutation

* custom brand color to availability

* brandColor added to BookingPage

* fixed availability, booking for team and added customBranding to success

* brandColor added to cancel/uid

* requested changes

* lint fix

* further changes

* lint fix
2021-11-16 14:21:46 +05:30
Alex van Andel
41382caa6c
Fixed invalid types of i18n locales (string[]) ()
* Fixed invalid types of i18n locales (string[])

* Remaining typefixes done
2021-10-28 22:45:58 +00:00
Omar López
85d7122e43
Fixes Apple Calendar onboarding and type fixes ()
* 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
Alex van Andel
ce8e9c126b
I18n's the i18n language dropdown & weekday using Intl ()
* I18n's the i18n language dropdown & weekday using Intl

* Some type fixes

* Trigger locale changes instantly ()

* Trigger locale changes instantly

* Restored types

* Capitalize languages across the board

Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-10-15 12:32:09 +01:00
Omar López
0861d7cc61
Ends the war between tRPC and next-i18next ()
* Ends the war between tRPC and next-i18next

* Locale fixes

* Linting

* Linting

* trpc i18n (not working) ()

* simplify i18n handler and remove redundant(?) fn check

* split up viewer to a "logged in only" and "public"

* wip -- skip first render

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

* Linting

* I18n fixes

* We don't need serverSideTranslations in every page anymore

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Alex Johansson <alexander@n1s.se>
2021-10-14 13:57:49 +03:00
Mihai C
bee41b242b
chore: extract more strings () 2021-10-13 10:34:55 +01:00
Anton Podviaznikov
f9e315d10a
renamed "paid plan" to "pro" () 2021-10-12 19:51:46 +00:00
Anton Podviaznikov
0871f5edf8
Refactor two modals ()
* refactor one modal into dialog. save profile
2021-10-12 20:43:22 +01:00
Omar López
cfd70172f0
Refactors useLocale ()
* Removes unused component

* Refactors useLocale

We don't need to pass the locale prop everywhere

* Fixes syntax error

* Adds warning for missing localeProps

* Simplify i18n utils

* Update components/I18nLanguageHandler.tsx

Co-authored-by: Mihai C <34626017+mihaic195@users.noreply.github.com>

* Type fixes

Co-authored-by: Mihai C <34626017+mihaic195@users.noreply.github.com>
2021-10-12 13:11:33 +00:00
Mihai C
2c9b301b77
Feat/i18n crowdin ()
* feat: add crowdin and supported languages

* fix: main branch name

* feat: test crowdin integration

* feat: add crowdin config skeleton

* feat: update crowdin.yml

* fix: remove ro translation

* test: en translation

* test: en translation

* New Crowdin translations by Github Action ()

Co-authored-by: Crowdin Bot <support+bot@crowdin.com>

* test: en translation

* fix: separate upload/download workflows

* wip

* New Crowdin translations by Github Action ()

Co-authored-by: Crowdin Bot <support+bot@crowdin.com>

* wip

* wip

* wip

* wip

* wip

* typo

* wip

* wip

* update crowdin config

* update

* chore: support i18n de,es,fr,it,pt,ru,ro,en

* chore: extract i18n strings

* chore: extract booking components strings for i18n

* wip

* extract more strings

* wip

* fallback to getServerSideProps for now

* New Crowdin translations by Github Action ()

Co-authored-by: Crowdin Bot <support+bot@crowdin.com>

* fix: minor fixes on the datepicker

* fix: add dutch lang

* fix: linting issues

* fix: string

* fix: update GHA

* cleanup trpc

* fix linting

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-10-08 14:43:48 +03:00
Peer Richelsen
785058558c
added disabled email input box to settings, contact help@cal.com () 2021-10-04 22:13:46 +01:00
Alex van Andel
89e5da15df
Fixes weekStart & automatic theme adjust checkbox () 2021-10-02 20:16:51 +00:00
Alex van Andel
e12c879242
Bugfix/image upload fuzzy () 2021-10-02 12:04:47 +01:00
Omar López
a04336ba06
Added booking tabs, type fixing and refactoring ()
* More type fixes

* More type fixes

* Type fixes

* Adds inputMode to email fields

* Added booking tabs

* Adds aditional notes to bookings
2021-09-29 22:33:18 +01:00
Omar López
dd9f801872
cal 485 prevent users from changing their username to premium ones ()
* Makes userRequired middleware

* Prevent users from changing usernames to premium ones

* refactor on zomars' branch ()

* rename `profile` -> `mutation`

* `createProtectedRouter()` helper

* move profile mutation to `viewer.`

* simplify checkUsername

* Auto scrolls to error when there is one

* Renames username helpers

* Follows db convention

Co-authored-by: Alex Johansson <alexander@n1s.se>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-28 09:57:30 +01:00
Omar López
420daec147
CAL-473 Fixes client-side routing for authed pages () 2021-09-24 11:16:46 +01:00
Mihai C
82e7e51fca
Setup i18n and locale detection ()
* 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 e2a3d81371ee02a033520058a1d7d61cffeffc94.

* 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
Omar López
d194878bb2
Suggestion: let prettier sort imports order ()
* 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
Conor Meagher
96fd7ecf41
chore: change calendso strings to cal.com ()
* 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
Charlie Harrington
537e2951dc
Replace another calendso with cal () 2021-09-16 11:13:32 +01:00
Alex van Andel
cf7f5ae53c
Replace all instances of calendso.com with cal.com and add a new logo for Cal.com emails () 2021-09-15 21:35:55 +01:00
Alex van Andel
6ab741b927
Feature/round robin ()
* 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
Alex Johansson
ab78bb3802
move calendso branding into pro ()
* 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 Johansson
2f1ede9bcd
use getSession() from @lib/auth everywhere () 2021-09-03 21:51:21 +01:00
Mihai C
a37411b8af
refactor: add next-seo ()
* refactor: add next-seo

* refactor: change naming of seo component
2021-08-27 15:35:20 +03:00
Alex van Andel
bc97237858
Remove image from session, add /api/me, update Avatar component ()
* 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
Alex Johansson
f63aa5d550
add linting in CI + fix lint errors ()
* 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
Syed Ali Shahbaz
867e582342 code improvement and accept image only for image uploader input 2021-08-12 16:08:01 +05:30
Syed Ali Shahbaz
0c3ec98062 added image-uploader component and refactored profile settings page 2021-08-12 10:14:11 +05:30
Bailey Pumfleet
fd535fc308
Merge pull request 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
Peer Richelsen
6ae1be6912 minor change on profile 2021-08-02 19:22:35 +02:00
Peer Richelsen
4c2b8f5b6f styled teams section 2021-08-02 17:36:28 +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
Bailey Pumfleet
a608f94590 Initial restyling 2021-07-31 00:05:38 +01:00
mihaic195
394be8612b
fix: settings page was missing value prop and restyled dark theme elements on booking page 2021-07-22 15:16:21 +03:00
Alex van Andel
4d7427ad91 Fixes some linting + codacy issues 2021-07-11 19:43:28 +00:00
Alex van Andel
5206fb4f88 Implemented theme through user preferences 2021-07-09 23:13:34 +00:00
Bailey Pumfleet
51c0556d30 Hide Calendso branding 2021-06-29 17:08:55 +01:00