commonscomputer/cal.diy
5
0 Fork 0
Code Issues Pull Requests Actions 2.2k Packages Projects Releases Wiki Activity
2,707 Commits 2 Branches 621 Tags
3605fca9a48afa1fda45037110ea65f72f464dce
Commit Graph
321 Commits
Author SHA1 Message Date
Joe Au-YeungOmar LópezBailey Pumfleet
 		02e5ec37e7 Broken Integration Alarm System (#3135) 
* Create broken integration email

* Send video on broken video link

* Add translations

* Add Trans components

* Remove calendars file

* Type fixes

* Add translations

* Fix type errors

* Fix Spanish translation

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

* Remove iCal event

* Locale fixes

* Clean up trans tag

* Apply suggested translation

Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>

* Change email to en

* Fix type error

* Type fix

* Fix e2e

* Fix e2e

* Fix e2e

* Fix e2e

* Fix e2e

* Update webhookResponse-chromium.txt

Co-authored-by: Omar López <zomars@me.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2022-06-24 23:16:20 -06:00
sean-brydonandPeer Richelsen 13b5618a71 Teams skeleton loader (#3148) 
* Teams skeleton loader

* [id] skeleton

* Fix mt

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
 2022-06-25 00:44:49 +02:00
alannnc 43f1e86322 Remove spacebooking from app-store (#3119) 
* Remove spacebooking from app-store

* Remove missing spacebooking variable
 2022-06-21 22:58:07 +02:00
Hariom Balhara 2f5928be84 Fix ordering of event-types (#3126) 2022-06-21 11:00:14 -06:00
Carina WollendorferandCarinaWolli d7cd6e011e fix redirect to upcoming booking (#3129) 
Co-authored-by: CarinaWolli <wollencarina@gmail.com>
 2022-06-21 14:57:04 +00:00
Hariom Balharaandkodiakhq[bot] 993bd18a73 HotFix - Background not being transparent for [user]/[type] in embed (#3121) 
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
 2022-06-21 09:38:59 +00:00
Joe Au-YeungandOmar López 89ef6c3f13 When deleting video app, change locations to Cal Video (#3022) 
* tRPC endpoint to delete credentials

* Replace deleted app with daily

* Updated Jitisi logo

* Update logo size

* Update logo size

* Fix type error

* Remove type as prop

* Add isPrismaArray to lib

* Address feedback

* Remove connect calednar

* Expire payment sessions and cancel payment intent

* Expire payment sessions and cancel payment intent

* Refactor input

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

* Remove console.log

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

* Address feedback

* Find connected account on Stripe

* Fix type error

* Add interactive transactions

* Remove console.logs

* Remove console.log

Co-authored-by: Omar López <zomars@me.com>
 2022-06-20 17:52:50 +00:00
Alex van Andel 5ca914b32e Fix weekStart passThrough + allow all days (#3108) 2022-06-20 10:01:57 +01:00
Omar López 2d28ca61a4 Feature/parallel booking availability (#3087) 2022-06-19 16:02:00 +01:00
Alex van AndelPeer RichelsenOmar López
 		159c026533 As Google Meet is always installed, this fixes the doubling (#3093) 
* As Google Meet is always installed, this fixes the doubling

* Make entire Google link clickable, fix extraData

* Attempt at type fixing :)

* AdditionalInformation for the booking page?

* Update packages/emails/src/components/LocationInfo.tsx

Being explicit :)

* Exclude AdditionalInformation as it is irrelevant here

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Omar López <zomars@me.com>
 2022-06-17 18:34:41 +00:00
zomars b38991fd25 Fixes 404 for trial users 2022-06-17 10:06:49 -06:00
sean-brydonOmar LópezPeer Richelsenkodiakhq[bot]
 		d44c8f7912 Stops users who are not in getting the "Requires confirmation" email (#3084) 
* Update Email

* Remove console.debug

* Remove redundant assignment

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

* Update apps/web/pages/api/book/confirm.ts

* Fix E2E test

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>
 2022-06-17 09:02:29 +00:00
Syed Ali Shahbaz 6253216484 Webhook polishing (#2987) 2022-06-16 17:21:48 +01:00
zomars 56e61c8d7c Type fixes 2022-06-15 21:35:16 -06:00
zomars 34cae662f3 Revert "Update troubleshoot.tsx" 
This reverts commit 5dcd439901.
 2022-06-15 21:27:14 -06:00
zomars 5dcd439901 Update troubleshoot.tsx 2022-06-15 21:21:20 -06:00
zomars 4eec01e2ad Frontend fixes 2022-06-15 21:19:13 -06:00
zomars 3ae35a3b5d Let's just build at runtime 2022-06-15 21:19:13 -06:00
Alex van AndelPeer Richelsenkodiakhq[bot]zomars
 		e9f3248fc0 Feature/booking page refactor (#3035) 
* Extracted UI related logic on the DatePicker, stripped out all logic

* wip

* fixed small regression due to merge

* Fix alignment of the chevrons

* Added isToday dot, added onMonthChange so we can fetch this month slots

* Added includedDates to inverse excludedDates

* removed trpcState

* Improvements to the state

* All params are now dynamic

* This builds the flat map so not all paths block on every new build

* Added requiresConfirmation

* Correctly take into account getFilteredTimes to make the calendar function

* Rewritten team availability, seems to work

* Circumvent i18n flicker by showing the loader instead

* 'You can remove this code. Its not being used now' - Hariom

* Nailed a persistent little bug, new Date() caused the current day to flicker on and off

* TS fixes

* Fix some eventType details in AvailableTimes

* '5 / 6 Seats Available' instead of '6 / Seats Available'

* More type fixes

* Removed unrelated merge artifact

* Use WEBAPP_URL instead of hardcoded

* Next round of TS fixes

* I believe this was mistyped

* Temporarily disabled rescheduling 'this is when you originally scheduled', so removed dep

* Sorting some dead code

* This page has a lot of red, not all related to this PR

* A PR to your PR (#3067)

* Cleanup

* Cleanup

* Uses zod to parse params

* Type fixes

* Fixes ISR

* E2E fixes

* Disabled dynamic bookings until post v1.7

* More test fixes

* Fixed border position (transparent border) to prevent dot from jumping - and possibly fix spacing

* Disabled style nitpicks

* Delete useSlots.ts

Removed early design artifact

* Unlock DatePicker locale

* Adds mini spinner to DatePicker

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
 2022-06-15 14:54:31 -06:00
Peer Richelsen 6959eb2d27 fixed flickering of more event name variables (#3069) 2022-06-15 22:12:11 +02:00
zomars 833adaf7e9 Revert "The booker get’s the Ui option to reschedule but can’t reschedule (#3061)" 
This reverts commit 8cfc91df95.
 2022-06-15 09:24:12 -06:00
GitStart 8cfc91df95 The booker get’s the Ui option to reschedule but can’t reschedule (#3061) 2022-06-15 13:51:53 +01:00
GitStart ecea455b7f Flicker on booking success page (#3063) 2022-06-15 13:50:22 +01:00
Omar LópezJoe Au-YeungJoe Au-YeungPeer RichelsenLeo Giovanetti
 		1960046994 App/exchange v2 (#2493) 
* Create 2013 package

* Create 2016 package

* Add ews

* Update package.json

* Translate 2013 app to new structure

* Translate 2013 app to new structure

* Translate 2016 app to new structure

* Add appId

* Move setup to a seperate page

* RHF dependency version mismatch

* Move exchange 2016 setup to new page

* Add translations

* Relying on AppSetupMap not defined static pages

* Console build fixes

* Resolved node version to 16

* Prisma errors can't be handled on client

* Fixes node version mismatches

* Improvements

* Endpoint fixes

* Revert "Endpoint fixes"

This reverts commit c0320e3f3d320091ee9a049e3abaf285169ed555.

* Fixes

Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com>
Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Leo Giovanetti <hello@leog.me>
 2022-06-13 16:12:27 -06:00
Joe Au-Yeungandzomars f9d05f7a0e Add helpscout to billing page (#3054) 
* Add helpscout to billing page

* Upgrades CI node to 16

Co-authored-by: zomars <zomars@me.com>
 2022-06-13 13:05:05 -06:00
Hariom Balharaandkodiakhq[bot] 5653282dea Fix Event-Type 404 in case of unintentional duplicates. (#3049) 
* Fix sort order to ensure correct event-type is picked when duplicates

* Refetch after mutation to ensure that after positioning is changed, UI is updated

* Dont rely on hashmap for ordering.

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
 2022-06-13 14:25:05 +01:00
Hariom BalharaandPeer Richelsen 624a7a036d Make absolute URL and consider if its a team event or non team event (#3047) 
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
 2022-06-13 12:18:51 +00:00
alannnc 2faf7e6806 Fix onboarding calendar connection (#3036) 2022-06-12 16:19:35 +01:00
sean-brydonPeer Richelsenzomarskodiakhq[bot]
 		c03ff0a543 Fixes slack verification and timeout errors (#2972) 
* Fixing slack create event

* Fixes verify working 90% of the time :S

* Verify V2

* Fixing verify - not needed on interaction payload

* Fixing verifcation + response

* Fix verifcation

* DM user error/success

* Remove random 200

* Timeout return

* Adding Zod schema verification

* Added validations, cleanup

* Type fixes

* Update event.ts

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
 2022-06-11 22:30:52 +01:00
sean-brydon 567a7c8f12 Adding UI for Requires Confirmation (#3017) 2022-06-10 17:32:54 -06:00
Leo GiovanettiPeer RichelsenBailey Pumfleetkodiakhq[bot]
 		514fca7a53 Recurring event improvements (#2750) 
* Loading state and rejected bookings gone

* Listing fixes

* Tweaking upcoming vs recurring bookings tabs

* Tweaking new emails to avoid recurringEvent param

* Tweaks to support recurring events in common flows

* Missed one renderEmail

* Removing uneeded references

* Reverting manual plural fixes

* Refactoring recurring event strings

* Correcting merge issues

* Relying on newly introduced obj

* Fixing mobile

* Final tweaks

* Latest fixes

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
 2022-06-10 17:38:06 -03:00
alannncPeer Richelsenkodiakhq[bot]
 		0df0b6a0f2 Fix/wipe vital app revision (#2983) 
* Fixes for both apps regarding event update/delete

* Added wipe my cal test

* Added eslint ignore

* Fix test

* Merge both test into a single test

* remove duplicated line

* Using prisma from calcom pkg and removing optional chaining from current invocations

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
 2022-06-10 19:16:10 +00:00
Omar López 22d2bae46b Availabilty consolitadion (#3010) 2022-06-10 12:38:46 -06:00
GitStartgitstartBailey PumfleetPeer Richelsen
 		65d8b2d45c You have no {{status}} bookings unexpectedly capitalized (#3021) 
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
 2022-06-10 11:36:07 +02:00
Omar LópezandLeo Giovanetti b11398f551 Recurring event fixes (#3030) 
* Incorporates recurringEvent into calEvent

* Recurrent event fixes

* Update event.ts

* type fixes

* Update zod-utils.ts

* Adding more recurringEvent to calEvent and other fixes

* Moving away from heavy 3rd party enum

* Fixing test

* Renaming as suggested and fixes

Co-authored-by: Leo Giovanetti <hello@leog.me>
 2022-06-09 18:32:34 -06:00
Carina WollendorferCarinaWollikodiakhq[bot]
 		abe5d53fc1 Disable dark mode on the success page only for the organizer (#3001) 
* disable darkmode only for organizer

* disable dark mode when user comes from user dashboard

* move Theme to shell

* fix build errors

* sort dates for recurring bookings

* new parameter if user comes from booking an event

Co-authored-by: CarinaWolli <wollencarina@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
 2022-06-08 16:02:09 +02:00
GitStart 7151c65f1a [CAL-1277]: When clicking a deleted type event while it's "deleting", it sends you to 500 error (#2968) 2022-06-08 09:42:00 +01:00
Omar López 3a2224a4e4 Update bookingReminder.ts (#3007) 2022-06-08 09:37:06 +01:00
Peer Richelsen d1cd83acea renaming "opt-in" to "requires confirmation #2 attempt (#2999) 
* second try

* nit

* nit
 2022-06-07 18:22:37 +02:00
Hariom Balharaandkodiakhq[bot] 18e0f13605 [Feature] App Store CLI - Make it super easy to add an app. (#2917) 
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
 2022-06-07 11:43:32 +05:30
zomars 13f20dd7cf additionInformation => additionalInformation 2022-06-06 13:49:10 -06:00
zomars 67b96d990c Update invite.ts 2022-06-06 12:59:57 -06:00
Alex van AndelPeer Richelsenzomarskodiakhq[bot]
 		ba04533de3 Linting fixes round #1 (#2906) 
* Fixes round #1

* disabled any warning for intentional typing of AsyncReturnType

* Whacked MetaMask add / remove button

* types, not great, not terrible, better than any

* Fixed typo in CheckboxField and wrapped description in <label>

* Feedback

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
 2022-06-06 18:24:37 +00:00
Omar Lópezandkodiakhq[bot] 15d5333cf6 Refactor emails to use JSX as templating engine (#2915) 
* Init Maizzle

* Initial template JSX conversion and testing

* WIP

* WIP

* WIP

* WIP

* WIP

* Migrated AttendeeRescheduledEmail

* WIP

* WIP

* DRY

* Cleanup

* Cleanup

* Cleanup

* Migrate feedback email

* Migrates ForgotPasswordEmail

* Migrates OrganizerCancelledEmail

* Migrated OrganizerLocationChangeEmail

* Formatting

* Migrated AttendeeRequestRescheduledEmail

* Migrates OrganizerPaymentRefundFailedEmail

* Migrates OrganizerRequestEmail

* Migrates OrganizerRequestReminderEmail

* Fixes type-check

* Moved email-manager to package

* Import fixes

* Removed duplicate email code from vital app

* Removed duplicate email code from wipemycal

* Build/type fixes

* Fixes web email imports

* Fixes build

* Embed build fixes

* Update AttendeeAwaitingPaymentEmail.tsx

* Update default-cookies.ts

* Revert "Embed build fixes"

This reverts commit 8d693e99aca6dfe92d5cbb27ffa962545c3e9389.

* Embed build fixes

# Conflicts:
#	packages/embeds/embed-core/package.json

* dep and email date fixes

* Update attendee-scheduled-email.ts

* Update package.json

* Update [...nextauth].tsx

* Update email.ts

* Prevents /api/email on production builds

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
 2022-06-06 17:49:56 +00:00
Omar Lópezandkodiakhq[bot] 12d66cb9df Booking confirm endpoint refactoring (#2949) 
* Adds new default handler and responder

* Moved confirm endpoint

* Fixes availability for unconfirmed bookings

* Cleanup

* Update _patch.ts

* Prevent too much diffs

* Adds missing BookingStatus

* Migrates confirmed & rejected to status

* Adds requiresConfirmation icon to listing

* Adds booking status migration

* Adds migrations to remove confirmed/rejected

* Undo refactor

* Sets the organizer as "accepted" in gCal

* Update getBusyTimes.ts

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
 2022-06-06 10:54:47 -06:00
Carina Wollendorfer d0ac4d41ed fix language issue on booking page (#2973) 2022-06-06 14:30:41 +01:00
Joe Au-Yeungkodiakhq[bot]AlanBailey Pumfleet
 		983c970069 Add more variables to event names and a dynamic field (#2898) 
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: Bailey Pumfleet <pumfleet@hey.com>
 2022-06-06 08:48:13 -04:00
Hariom Balhara f0a5b7734f [Hotfix]Fixes 3 issues related to 404 links (#2977) 2022-06-06 09:41:11 +00:00
Syed Ali Shahbaz b9428301b6 Hotfix: fixed callback URL for team invite email (#2975) 2022-06-06 14:07:53 +05:30
aar2dee2kodiakhq[bot]Peer Richelsen
 		864a873c57 Images in slider will have fixed height, variable width (#2916) 
* Images in slider will have fixed height, variable width

* fix spacing

* remove extra whitespace

* fix whitespace lint errors

* fix whitespace lint error

* fix width for images in app store slider

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
 2022-06-03 22:01:00 +02:00