Commit graph

101 commits

Author SHA1 Message Date
Alex van Andel
89e5da15df
Fixes weekStart & automatic theme adjust checkbox () 2021-10-02 20:16:51 +00:00
Chris
33273b18d3
Use id to look up user () 2021-10-02 17:53:13 +01: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
Peer Richelsen
b8c4dfb9e1 minor style changes to billing page 2021-09-28 15:07:33 +01:00
Bailey Pumfleet
a3abdac33b
Update billing tab UI () 2021-09-28 11:27:46 +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
f23e4f2b9d
Fixes customer portal return url () 2021-09-28 09:04:30 +01:00
Peer Richelsen
58dde562a3
switching to stripes customer portal () 2021-09-27 23:57:23 +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
Peer Richelsen
51752bd2bd
added Cal Sans ()
* added Cal Sans

* Delete EmptyScreen.tsx
2021-09-22 21:23:19 +00: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
Chris
c0330acd83
Add two-factor authentication ()
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-09-21 10:29:20 +01:00
Nico
961f297ba8
No confirmation shall be needed when rescheduling events that need confirmation ()
* 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
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
Peer Richelsen
264ccc2f48 fixed 404 billing page 2021-09-15 16:55:04 +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
Peer_Rich
766cdd7123
changed api docs link () 2021-09-08 15:01:42 +01:00
Syed Ali Shahbaz
fa35af7bd8
Cal 262 refactor edit teams according to the design reference ()
* 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 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
35fc5964eb
Merge branch 'main' into bugfix/unify-email-sending 2021-08-08 22:21:53 +01:00
Peer Richelsen
3bfee8a7bf replaced Loading... with Loader component 2021-08-08 22:31:08 +02:00
nicolas
560bd19472 Merge branch 'main' into bugfix/unify-email-sending 2021-08-08 21:21:33 +02:00
Peer Richelsen
7ef29453bf minor changes to integrations type eslint 2021-08-05 13:36:24 +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
b9125a54c8 ignore unused response ESLint error 2021-08-03 12:29:51 +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
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
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
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
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
Bailey Pumfleet
a608f94590 Initial restyling 2021-07-31 00:05:38 +01:00
nicolas
86e2add30f Resolved conflicts; included reference creation into EventManager; use EventManager everywhere 2021-07-24 22:24:00 +02: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