Commit Graph

821 Commits

Author SHA1 Message Date
Edward Fernandez 20beb961c6 Add web3app validation using user settings 2022-01-10 15:19:53 -05:00
Peer Richelsen 1f65bc77f5 merge 2022-01-07 23:05:20 +00:00
Yuval Drori 38886e81ca convert axios to fetch, change scAddress to smartContractAddress, load bloxy from next_public_env 2022-01-07 22:18:49 +01:00
Omar López 84d75cf693
Upgrades next-auth to v4 (#1185)
* Upgrades next-auth to v4

* Fixes next-auth session types

* Type fixes

* Fixes login issue

* Team page fixes

* Type fixes

* Fixes secret

* Adds test for forgotten password

* Skips if pw secret is undefined

* Prevents error if PW secret is undefined

* Adds PLAYWRIGHT_SECRET explainer

* Adds pending auth TODOs

* Adds missing secret

* Fixed imports

* Fixed imports

* Type fixes

* Test fixes

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-01-07 20:23:37 +00:00
Peer Richelsen e93b7d942a
hide slug event-types on mobile (#1426) 2022-01-06 22:13:38 +00:00
Edward Fernández 6e7359ae96
fix code validation when the google calendar integration does not have all permission (#1425)
Co-authored-by: Edward Fernandez <edward.fernandez@rappi.com>
2022-01-06 15:06:31 -07:00
Edward Fernández bd2a795d7a
[CAL-770] add new integration architecture revamp (#1369)
* [CAL-770] add new integration architecture revamp

* Type fixes

* Type fixes

* [CAL-770] Remove tsconfig.tsbuildinfo

* [CAL-770] add integration test

* Improve google calendar test integration

* Remove console.log

* Change response any to void in the deleteEvent method

* Remove unnecesary const

* Add tsconfig.tsbuildinfo to the .gitignore

* Remove process env variables as const

Co-authored-by: Edward Fernández <edwardfernandez@Edwards-Mac-mini.local>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Edward Fernandez <edward.fernandez@rappi.com>
2022-01-06 12:28:31 -05:00
Peer Richelsen 8a70ea66e9
added url to event-types preview (#1420)
* added url to event-types preview

* wip

* wip
2022-01-06 10:39:16 +00:00
Peer Richelsen 46df4c048e
hide order buttons on mobile event types (#1421)
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2022-01-06 10:24:19 +00:00
Omar López a66610d9c2
Zomars/cal 777 switching off paid mode bug (#1401)
* Adds Form component

* Disabling price sets it to 0
2022-01-03 23:19:05 +00:00
kodiakhq[bot] cb2842c695
Merge branch 'main' into web3 2022-01-03 22:51:34 +00:00
Omar López 4cd7a4ce5b
Adds trial banner and in-app upgrade (#1402)
* WIP trial banner

* Fixes days left count

* Defers stripe loading until needed

* Fixes auth issues

* Checkout fixes

* Allows for signup testing

* Debugging checkout

* Adds tests for trial banner

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-01-03 22:50:59 +00:00
kodiakhq[bot] a5e37fe8b6
Merge branch 'main' into web3 2021-12-30 18:17:32 +00:00
Yuval Drori 9ed4295b28 Merge branch 'web3' of https://github.com/calendso/calendso into web3
extract api response to const
2021-12-30 19:09:22 +01:00
Yuval Drori cf75791823 extract to api 2021-12-30 19:09:07 +01:00
Omar López 2ada162c90
Update eventType.ts 2021-12-30 09:40:09 -07:00
Syed Ali Shahbaz 4be4a01968
Blank success page in January bookings (#1399)
* added 1 to UTC month conversion to make it 1 to 12

* with as numtype
2021-12-30 09:04:08 -07:00
Peer Richelsen f670cc23f2 added web3 wrapper, needs connection to user_settings db 2021-12-30 14:36:27 +01:00
Peer Richelsen 59720b8ca7 added web3 section to integrations 2021-12-30 14:28:08 +01:00
Yuval Drori 45eb4422e3
Crypto events (#1390)
* update schemas, functions & ui to allow creating and updating events with a smart contract property

* remove adding sc address in the dialog that first pops-up when creating a new event, since its an advanced option

* add sc to booking ui

* some more ts && error handling

* fetch erc20s and nfts list in event-type page

* some cleanup within time limit

* ts fix 1

* more ts fixes
2021-12-30 13:32:59 +01:00
Adrien La 1567feb75e
i18n - Translate booking status when empty screen (#1219)
* i18n translate booking status when empty screen

* i18n - status key added to fr & en

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-12-27 13:29:43 +01:00
Alex van Andel 9d7dc09974
Use the matched user email to send the password reset to (#1366) 2021-12-21 18:31:32 +01:00
Omar López 7bc7b241ac
Zomars/cal 794 normalize emails in db (#1361)
* Email input UX improvements

* Makes email queries case insensitive

* Lowercases all emails

* Type fixes

* Re adds lowercase email to login

* Removes citext dependency

* Updates schema

* Migration fixes

* Added failsafes to team invites

* Team invite improvements

* Deleting the index, lowercasing 

```
calendso=> UPDATE users SET email=LOWER(email);
ERROR:  duplicate key value violates unique constraint "users.email_unique"
DETAIL:  Key (email)=(free@example.com) already exists.
```

vs.

```
calendso=> CREATE UNIQUE INDEX "users.email_unique" ON "users" (email);
ERROR:  could not create unique index "users.email_unique"
DETAIL:  Key (email)=(Free@example.com) is duplicated.
```

I think it'll be easier to rectify for users if they try to run the migrations if the index stays in place.

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-12-21 00:59:06 +00:00
Syed Ali Shahbaz 0dd72888a9
removed team from profile url (#1359) 2021-12-20 17:26:35 +01:00
Peer Richelsen d95e26d55c
fixes 404 for subpaths, adds prefilled url to sign up form (#1355)
* fixes 404 for subpaths, adds prefilled url to sign up form

* Added tweak to support BASE_URL for self hosted (#1356)

* Added tweak to support BASE_URL for self hosted (without linking to our signup)
* also hides the signup popular page

Co-authored-by: Alex van Andel <me@alexvanandel.com>
2021-12-20 09:11:39 +00:00
Omar López 3bc659af44
Let email case sensitive (#1357) 2021-12-19 21:01:25 +00:00
Alex van Andel cbf528c33e
Allows setting the event frequency to other than event length (#1349) 2021-12-19 12:11:31 +00:00
Joel Lu 38f762f7b2
fix: refresh UserDropdown after update (#1352)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-12-18 15:06:05 +00:00
Omar López 21103580f7
Zomars/cal 748 paid bookings are failing (#1335)
* E2E video adjustments

* Adds test to add Stripe integration

* Type fix

* WIP: Payment troubleshooting

* Paid bookings shouldn't be confirmed by default

* Runs stripe test only if installed

* BookingListItem Adjustments

* Pending paid bookings should be unconfirmed

* Attempt to fix paid bookings

* Type fixes

* Type fixes

* Tests fixes

* Adds paid booking to seeder

* Moves stripe tests to own file

* Matches app locale to Stripe's

* Fixes minimun price for testing

* Stripe test fixes

* Fixes stripe frame test

* Added some Stripe TODOs
2021-12-17 16:58:23 +00:00
Jamie Pine c21f0c2d49
Even Better Teams (#1304)
- dropdown improvements
- Improve performance of team availability
- Fix default timezone
- Allow team admins to edit event types
- Change team availability slot input to dropdown select (15,30,60)
- Prevent teams from access if not pro user
2021-12-17 00:16:59 +00:00
Jamie Pine 4ce879e5dc
UX improvement to public facing team pages
- Added default member avatars
- Fixed member item spacing
- Added team description (#1305)
2021-12-17 00:12:06 +00:00
Jamie Pine 25372b3c9e
- fix border radius (#1339)
- upgrade button / input components
- clean up markup
2021-12-16 17:03:32 -07:00
Alex van Andel a3bd226347
Bugfix/year change (#1323) 2021-12-16 15:20:38 +00:00
Omar López e6f71c81bb
E2E tests refactoring (#1318)
* Adds test todos

* Can't seem to change locales

* WIP playwright test refactoring

* jest-playwright cleanup

* Test fixes

* Test fixes

* More test fixes

* WIP: Testing fixes

* More test fixes

* Removes unused files

* Installs missing browsers for e2e

* ts-node fixes

* ts-check fixes

* Type fixes

* Fixes e2e

* FFS

* Renamex webhook snapshot

* Fixes webhook cross-platform

* Renamed webhook snapshot

* Apply suggestions from code review

Co-authored-by: Max Schmitt <max@schmitt.mx>

* Removes kont dependency

* Cleanup playwright options

* Next.js cache optimizations on CI

* Uses cache on e2e as well

* Fixme is introducing side-effects

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: Max Schmitt <max@schmitt.mx>
2021-12-15 16:25:49 +00:00
Alex van Andel 5c5d9d3406
Fixes zoom expiry date (#1315)
* Fixes zoom expiry date

* Ensure backwards compatibility with old zoom connections

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-12-15 14:02:39 +00:00
Syed Ali Shahbaz d2965627d0
added brand color to dark mode timepicker (#1307) 2021-12-15 10:26:39 +00:00
Omar López 5deea2c5f6
Fixing items readded to location dropdown issue (#1316)
Co-authored-by: Manoj <yogeshwaranmanoharan@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-12-14 22:14:35 +00:00
Alex Johansson ad8ffd3de4
prevent i18n flickering on pages (#1308)
* prevent i18n flickering on pages

- 404
- `/cancel`
- `/success`

* ssg for 404

* comments

* tweak

* 404

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2021-12-14 12:31:54 +00:00
Peer Richelsen 8e447ea4b5
fixed border on success (#1310) 2021-12-14 12:29:15 +00:00
Syed Ali Shahbaz 8bbfc0c7f0
Adds complementing text color for various brand colors that the user might choose (#1289)
* added contrast evaluator

* added brandtext --WIP

* further changes and fixes

* fixed type err

* fixed datepicker bug

* changed brandtext to brandcontrast

* further dark mode changes

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-12-14 10:39:32 +00:00
Omar López b6518b9ce1
Fixes cancel booking page (#1301) 2021-12-13 23:10:10 +00:00
Omar López 3587e1ac9c
Uses vercel url on integration endpoints for staging (#1293)
* Legibility and base url fixes

* Uses vercel url on integration endpoints for staging

* We validate the user before creating credentials
2021-12-10 21:14:54 +00:00
Jamie Pine c1d90eb438
Improvement/teams (#1285)
* [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
Alex Johansson 850497ea80
add select primary calendar (#1133)
* add primary

* fix

* refactor eventmanager to take `CalendarDestination`

* `DestinationCalendar`

* fix

* wip

* wip

* Minor fixes (#1156)

* Followup for #1242

* Updates schema

* Renames fields to destinationCalendar

* Migration fixes

* Updates user destination calendar

* Abstracts convertDate to BaseCalendarApiAdapter

* Type fixes

* Uses abstracted convertDate method

* Abstracts getDuration and getAttendees

* Fixes circular dependecy issue

* Adds notEmpty util

* Reverts empty location string

* Fixes property name

* Removes deprecated code

* WIP

* AppleCal is basically CalDav

* Fixes missing destinationCalendar

* Type fixes

* Select primary calendar on Office and gCal

* Adds pretty basic instructions for destination calendar

* Cleanup

* Type fix

* Test fixes

* Updates test snapshot

* Local test fixes

* Type fixes

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2021-12-09 15:51:37 +00:00
Nathan 1890d5daf7
Update event.ts (#1280) 2021-12-09 12:25:38 +00:00
Alex van Andel 878c8b8248
Reversed order of custom inputs & notes (#1268) 2021-12-07 21:05:29 +00:00
Bill Gale db7711869f
fix: add team bio to public page (#1265) 2021-12-07 16:11:43 +00:00
Joel Lu c43e6783a7
Fix: duplicate team name no prompt (#1267)
* Fix: duplicate team name no prompt

* Fix syntax error for error message
2021-12-07 15:04:34 +00:00
Rory Hughes c109ab1e30
Ensure credential objects come oldest first (#1258)
Given the credentials are loaded based on userId, sort is not consistent.
Without this, events are booked on whichever calendar credential is loaded first. 
813eaa83b7/lib/events/EventManager.ts (L240-L244)

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
2021-12-06 13:25:22 +00:00
Peer Richelsen e8af9110a7
fixed border color of daily video (#1255) 2021-12-06 09:49:56 +00:00