Commit Graph

3197 Commits

Author SHA1 Message Date
kodiakhq[bot] ea3e2396ef
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-26 00:14:52 +00:00
Joe Au-Yeung 87cce8eab6
2.0 Settings / My Account {View} (#3874)
* Fix breadcrumb colors

* HorizontalTabs

* Team List Item WIP

* Horizontal Tabs

* Cards

* Remove team list item WIP

* Login Page

* Add welcome back i118n

* EventType page work

* Update EventType Icons

* WIP Availability

* Horizontal Tab Work

* Add build command for in root

* Update build DIr/command

* Add Edit Button + change buttons to v2

* Availablitiy page

* Fix IPAD

* Make mobile look a little nicer

* WIP bookingshell

* Remove list items from breaking build

* Mian bulk of Booking Page.

* Few updates to components

* Fix chormatic feedback

* Fix banner

* Fix Empty Screen

* Text area + embded window fixes

* Semi fix avatar

* Troubleshoot container + Active on count

* Improve mobile

* NITS

* Fix padding on input

* Fix icons

* Starting to move event types settings to tabs

* Begin migration to single page form

* Single page tabs

* Limits Page

* Advanced tab

* Add RHF to dependancies

* Most of advanced tab

* Solved RHF mismtach

* Build fixes

* RHF conditionals fixes

* Improved legibility

* Major refactor/organisation into optional V2 UI

* Portal EditLocationModal

* Fix dialoug form

* Update imports

* Auto Animate + custom inputs WIP

* Custom Inputs

* WIP Apps

* Fixing stories imports

* Stripe app

* Remove duplicate dialog

* Remove duplicate dialog

* Fix embed URL

* Fix app toggles + number of active apps

* Fix container padding on disabledBorder prop

* Removes strict

* EventType Team page WIP

* Fix embed

* NIT

* Add Darkmode gray color

* V2 Shell WIP

* Create my account folder

* Add profile section

* Fix headings on shell V2

* Fix mobile layout with V2 shell

* V2 create event type button

* Checked Team Select

* Hidden to happen on save - not on toggle

* Team Attendee Select animation

* WIP

* Fix scheduling type and remove multi select label

* Fix overflow on teams url

* Finish profile fields

* Show toast on success

* General tab WIP

* Even Type move order handles

* Add switching of destination calendar

* List calendar and delete

* Render empty screenwhen no calendars

* Fix Embed TS errors

* Fix TS errors

* Fix Eslint errors

* Fix TS errors for UI

* Fix ESLINT error

* added SidebarCard for promo to v2 and storybook (#3906)

Co-authored-by: Julian Benegas <julianbenegas99@gmail.com>
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>

* Tooltip Provider - Wrapper due to dep upgrade

* public event type list darkmode

* V2 Color changes to public booking

* Remove unused component

* Fix typecheck

* Transfer to SSR

* Appearance screen made

* V2 image uploader

* WIP appearance page

* Remove unnecessary data from viewer.me

* Add profile translations

* Add translations to general page

* Add calendar switch

* Add calendar switch

* Add translations to appearance page

* Clean up conferencing page

* Settings sidebar fixes

* Updates middleware

* Update SettingsLayout.tsx

* Settings layout improvements

* Type fix

Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Julian Benegas <julianbenegas99@gmail.com>
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
2022-08-25 18:11:41 -06:00
kodiakhq[bot] 853edc52b3
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-25 21:30:02 +00:00
alannnc 11dc9c668e
Adding continue button to connectCalendar on getting-started view (#3971)
* Adding continue button to connectCalendar view getting-started

* Fixing extra space

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Co-authored-by: Leo Giovanetti <hello@leog.me>
2022-08-25 21:27:37 +00:00
kodiakhq[bot] 614e9362ed
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-25 20:56:05 +00:00
github-actions[bot] 8f6ba440b7
New Crowdin translations by Github Action (#3954)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-08-25 22:51:58 +02:00
Peer Richelsen 499d503627
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-25 22:51:33 +02:00
Omar López 18c949207e
Fixes CLS when loading Avatars (#3973)
* Fixes CLS when loading Avatars

* Update packages/ui/v2/core/Avatar.tsx

Co-authored-by: Leo Giovanetti <hello@leog.me>

Co-authored-by: Leo Giovanetti <hello@leog.me>
2022-08-25 19:35:01 +00:00
Omar López b84c8d9e82
Update PULL_REQUEST_TEMPLATE.md 2022-08-25 12:29:19 -06:00
alannnc 4feda21d22
Hidding import features from other services (#3970) 2022-08-25 20:25:00 +02:00
Kszemi 45f16333a8
fixed slots availability by fixing buffertime (#3756)
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-08-25 18:57:15 +02:00
Leo Giovanetti 9c3cea512f
Fixing back reference to recurring event when rescheduled (#3967)
* fix: pass recurring count value

* fix: show dates for pending booking

* Restoring recurringEventId on reschedule

* Reverting other changes from a different PR

Co-authored-by: Udit Takkar <udit.07814802719@cse.mait.ac.in>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2022-08-25 15:18:03 +00:00
Syed Ali Shahbaz 7f94ce0605
Fix availability free-busy data pull, location change and status in CALDAV | new branch (attempt#2) (#3958) 2022-08-25 14:48:30 +05:30
alannnc 1b541ff214
Fix/connected calendar component (#3956)
* Fix for displaying connected calendars alert with test

* Fix default calendar display string when externalId its too long

* Update apps/web/components/ui/LinkText.tsx

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

Co-authored-by: Omar López <zomars@me.com>
2022-08-24 19:44:14 -06:00
zomars 5950b62b02 Create add-PRs-to-project.yml 2022-08-24 16:46:43 -06:00
Carina Wollendorfer 46f0d9d22b
Merge branch 'main' into fix/after-meeting-ends-migration 2022-08-24 17:24:19 -04:00
CarinaWolli db4aa9e626 fixing migration issue with postgres 11 2022-08-24 16:58:08 -04:00
sean-brydon 436f88a48e
V2 Main (#3549)
* Fix breadcrumb colors

* HorizontalTabs

* Team List Item WIP

* Horizontal Tabs

* Cards

* Remove team list item WIP

* Login Page

* Add welcome back i118n

* EventType page work

* Update EventType Icons

* WIP Availability

* Horizontal Tab Work

* Add build command for in root

* Update build DIr/command

* Add Edit Button + change buttons to v2

* Availablitiy page

* Fix IPAD

* Make mobile look a little nicer

* WIP bookingshell

* Remove list items from breaking build

* Mian bulk of Booking Page.

* Few updates to components

* Fix chormatic feedback

* Fix banner

* Fix Empty Screen

* Text area + embded window fixes

* Semi fix avatar

* Troubleshoot container + Active on count

* Improve mobile

* NITS

* Fix padding on input

* Fix icons

* Starting to move event types settings to tabs

* Begin migration to single page form

* Single page tabs

* Limits Page

* Advanced tab

* Add RHF to dependancies

* Most of advanced tab

* Solved RHF mismtach

* Build fixes

* RHF conditionals fixes

* Improved legibility

* Major refactor/organisation into optional V2 UI

* Portal EditLocationModal

* Fix dialoug form

* Update imports

* Auto Animate + custom inputs WIP

* Custom Inputs

* WIP Apps

* Fixing stories imports

* Stripe app

* Remove duplicate dialog

* Remove duplicate dialog

* Fix embed URL

* Fix app toggles + number of active apps

* Fix container padding on disabledBorder prop

* Removes strict

* EventType Team page WIP

* Fix embed

* NIT

* Add Darkmode gray color

* V2 Shell WIP

* Fix headings on shell V2

* Fix mobile layout with V2 shell

* V2 create event type button

* Checked Team Select

* Hidden to happen on save - not on toggle

* Team Attendee Select animation

* Fix scheduling type and remove multi select label

* Fix overflow on teams url

* Even Type move order handles

* Fix Embed TS errors

* Fix TS errors

* Fix Eslint errors

* Fix TS errors for UI

* Fix ESLINT error

* added SidebarCard for promo to v2 and storybook (#3906)

Co-authored-by: Julian Benegas <julianbenegas99@gmail.com>
Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>

* Tooltip Provider - Wrapper due to dep upgrade

* public event type list darkmode

* V2 Color changes to public booking

* Remove unused component

* Fix typecheck

* Removed extra buttons on create ET dialog

* ET edit page refactoring

* Avoids form wrapping the whole Shell

* Nitpicks

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Julian Benegas <julianbenegas99@gmail.com>
Co-authored-by: Alan <alannnc@gmail.com>
2022-08-24 14:18:42 -06:00
zomars c17e949cd6 Implements quick ip banlist
Debugs IP banlist

Adds explainer for getIP util

Adds collect-events to middleware filter

Fixes middleware
2022-08-24 10:57:23 -06:00
github-actions[bot] b88f0617d8
New Crowdin translations by Github Action (#3935)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-08-24 13:41:51 +02:00
Peer Richelsen 6413bb399e
hide desktop download link on tablet and mobile (#3939) 2022-08-24 12:38:43 +02:00
Agusti Fernandez Pardo bfe780e0af
fix add endIconClassName in button (#3893)
* fix add tooltip provider to tooltip

* fix: add endIconClassNames support for button as startIcon has

* fix: undo tooltip provder

Co-authored-by: Agusti Fernandez Pardo <git@agusti.me>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-08-24 08:37:46 +00:00
zomars 4e73c4f7fb v1.9.1 2022-08-23 09:23:08 -07:00
Omar López f4ea385c7f
Fixes collective availability for teams with overlapping day timezones (#3898)
* WIP

* Fix for team availability with time offsets

* Prevent empty schedule from opening up everything

* When no utcOffset or timeZone's are given, default to 0 utcOffset (UTC)

* timeZone should not be part of getUserAvailability

* Prevents {days:[X],startTime:0,endTime:0} error entry

* Added getAggregateWorkingHours() (#3913)

* Added test for getAggregateWorkingHours

* Timezone isn't used here anymore

* fix: developer docs url (#3914)

* fix: developer docs url added

* chore : remove /

* chore : import url

Co-authored-by: Zach Waterfield <zlwaterfield@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>

* Test fixes

* Reinstate prisma (generate only) and few comments

* Test fixes

* Skipping getSchedule again

* Added await to expect() as it involves async logic causing the promise to timeout

* Test cleanup

* Update jest.config.ts

Co-authored-by: Alan <alannnc@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Co-authored-by: Zach Waterfield <zlwaterfield@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-08-22 23:53:51 +00:00
Udit Takkar cb1d881cc0
fix: developer docs url (#3914)
* fix: developer docs url added

* chore : remove /

* chore : import url

Co-authored-by: Zach Waterfield <zlwaterfield@gmail.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-08-22 22:56:55 +02:00
GitStart 27c5bf9dbc
Design issues on success page in some languages (#3900)
Co-authored-by: gitstart <gitstart@users.noreply.github.com>
Co-authored-by: Nitesh Singh <nitesh.singh@gitstart.dev>
Co-authored-by: Júlio Piubello da Silva Cabral <julio.piubello@gitstart.dev>
Co-authored-by: Matheus Muniz <87545749+matheusmuniz03@users.noreply.github.com>
Co-authored-by: Matheus Benini <matheus_benini@hotmail.com>
Co-authored-by: Grace Nshokano <grace.devolop@gmail.com>
Co-authored-by: Matheus Muniz <matheusmuniz100@hotmail.com>
Co-authored-by: gitstart <gitstart@gitstart.com>
Co-authored-by: Murilo Amaral <87545137+MuriloAmarals@users.noreply.github.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-08-22 22:40:35 +02:00
github-actions[bot] ef7dd5102b
New Crowdin translations by Github Action (#3929)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-08-22 22:36:49 +02:00
github-actions[bot] 0c3e309596
New Crowdin translations by Github Action (#3927)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-08-22 22:28:56 +02:00
Peer Richelsen 1b942c4003
redesigned cancel page to new design (#3923)
Co-authored-by: Alex van Andel <me@alexvanandel.com>
2022-08-22 19:48:33 +00:00
alannnc b328527434
fix/auto-connect-calendar-3582 (#3891)
* Added alert when there isn't default calendar connected

* Add default calendar externalId to select placeholder

* Fix typos

* Fixes prisma import

Co-authored-by: Peer Richelsen <peeroke@gmail.com>
Co-authored-by: zomars <zomars@me.com>
2022-08-22 19:34:28 +00:00
Omar López 662b437a18
Merge branch 'production' into main 2022-08-22 10:32:25 -07:00
github-actions[bot] e7f1413ed8
New Crowdin translations by Github Action (#3926)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-08-22 17:09:42 +02:00
github-actions[bot] 071b20b6ec
New Crowdin translations by Github Action (#3924)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-08-22 16:09:29 +02:00
github-actions[bot] bf6dd6cb32
New Crowdin translations by Github Action (#3909)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-08-22 12:59:20 +02:00
Peer Richelsen c44e444271
Revert " cancel booking new design added" (#3922)
This reverts commit a06c564517.
2022-08-22 12:40:41 +02:00
Udit Takkar a06c564517
cancel booking new design added (#3660)
* feat:  cancel booking new design added

* style: add space-y in button

* style: ui fixed for recurring booking

* fix: scroll in recurring event and use translation

* style: text 2xl instead of text-[24px]

* fix: typo, spacing

* fix: replaced multiple h2 tags with div

* fix: padding and Icon name
2022-08-22 12:32:06 +02:00
Julian Benegas 02b5a2bc1f
Revert "adjust react version"
This reverts commit 6e161da35b.
2022-08-19 13:23:34 -03:00
Julian Benegas 6e161da35b
adjust react version 2022-08-19 13:22:07 -03:00
github-actions[bot] b257cdbf1e
New Crowdin translations by Github Action (#3897)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-08-18 20:18:03 +02:00
zomars 9de723d557 Sync submodules 2022-08-18 11:54:58 -06:00
zomars 081d5ae9c8 NEXTAUTH_DOMAIN isn't used 2022-08-18 11:53:29 -06:00
github-actions[bot] cddca2b10d
New Crowdin translations by Github Action (#3890)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-08-18 18:10:03 +02:00
Peer Richelsen 6ed0e5e281
use default cursor on desktop (#3876) 2022-08-17 22:50:25 +02:00
github-actions[bot] 1fd8d50e52
New Crowdin translations by Github Action (#3878)
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2022-08-17 22:50:01 +02:00
Peer Richelsen 5206a37fe4
temporally removed missing calendar badge on event-types (#3889) 2022-08-17 13:51:45 -06:00
Peer Richelsen 025019f789
Update [uid].tsx (#3888) 2022-08-17 19:32:46 +01:00
zomars d58bd02cab Submodule sync 2022-08-17 11:41:08 -06:00
depfu[bot] b8acf1e180
Update all Yarn dependencies (2022-07-29) (#3599)
* Update all Yarn dependencies (2022-07-29)

* Adds syncpack config

* Fixes mismatches

* Update yarn.lock

* RRule fixes

* Locking dayjs to fix build

* Type fixes

* Fixes mismatches

* Submodule sync

* Update yarn.lock

* Update event.ts

* Conflict fixes

* Fixes prisma warnings

* Liting

* Upgrade next, zod

* Prevents articfact overwriting

* Yarn fixes

* Jest fixes

* Submodule sync

* Formatting

* Submodule sync

* Adds provider for react-tooltip

* Removed dotenv-cli

* Readds dotenv-cli

* Skips getSchedule tests

Until prisma is mocked properly

* Fixes

* Revert prisma seed script

* E2E fixes

* test

* Removed deprecated req.page in middleware

* Make tests stable

* Unskip getSchedule tests

* fixed 404 logo on cal video (#3885)

* Removed PW aliases as aren't needed anymore

Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com>
Co-authored-by: zomars <zomars@me.com>
Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>
Co-authored-by: Alex van Andel <me@alexvanandel.com>
Co-authored-by: Peer Richelsen <peeroke@gmail.com>
2022-08-17 11:38:21 -06:00
Peer Richelsen d8fab68edd
fixed 404 logo on cal video (#3885) 2022-08-17 16:59:00 +02:00
Hariom Balhara 592d46f758
Fix desktop app link (#3883) 2022-08-17 11:07:19 +02:00