Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit e344050
Author: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Date:   Tue Sep 13 20:18:29 2022 +0100

    Adds radix tailwind + dropdown focus style (#4424)

    Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

commit cefb46d
Author: Nafees Nazik <84864519+G3root@users.noreply.github.com>
Date:   Wed Sep 14 00:37:10 2022 +0530

    fix: add translation in getServerSideProps (#4390)

commit b22786d
Author: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Date:   Tue Sep 13 14:57:23 2022 -0400

    Fixing design issues /workflows {empty state}  (#4446)

    * fixes design issues in empty screen for worklfows

    * fix font weight and add new text for examples

    Co-authored-by: CarinaWolli <wollencarina@gmail.com>

commit 735254d
Author: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Date:   Tue Sep 13 13:55:39 2022 -0400

    fixing settings layout for teams (#4444)

    Co-authored-by: CarinaWolli <wollencarina@gmail.com>

commit 404168f
Author: Jeroen Reumkens <hello@jeroenreumkens.nl>
Date:   Tue Sep 13 18:35:14 2022 +0200

    Feat/3796 new UI for signin (#4369)

    Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
    Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

commit 6c4a372
Author: zomars <zomars@me.com>
Date:   Tue Sep 13 11:15:37 2022 -0500

    Adds v2 launch instructions

commit 3c60b4f
Author: zomars <zomars@me.com>
Date:   Tue Sep 13 11:11:37 2022 -0500

    V2 Layout fixes

commit 2292343
Author: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Date:   Tue Sep 13 15:14:27 2022 +0100

    Tidyup app cards (#4428)

commit 5db525a
Author: hexcowboy <accounts@cowboy.dev>
Date:   Tue Sep 13 03:59:53 2022 -0700

    dynamic import rainbow (only if installed) (#4409)

commit b2d3432
Author: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Date:   Tue Sep 13 15:02:27 2022 +0530

    Fix/daterangepicker css (#4418)

    * added styles from external stylesheet

    * fixed a border color

    * codacy improvements

    * more codacy fix

    * codacy why u be so dumb

commit 140bb38
Author: zomars <zomars@me.com>
Date:   Mon Sep 12 17:12:38 2022 -0500

    v1.9.5

commit 6b2d675
Author: hexcowboy <accounts@cowboy.dev>
Date:   Mon Sep 12 15:11:20 2022 -0700

    add rainbowkit form to v2 event-types (#4349)

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

commit 7e917cd
Author: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Date:   Mon Sep 12 18:04:33 2022 -0400

    V2 settings teams (Profil, Members, Appearance View) (#4350)

    * add team profile

    * first version for team members page

    * finish up design of member list item

    * fix dialog buttons

    * add missing seats and upgrading information

    * add v2 dialog for changing role

    * finish basic version of member's schedule

    * remove modalContainer

    * design fixes team profile page

    * show only team info to non admins

    * allow all member to check availabilities

    * make time available heading sticky

    * add dropdown for mobile view

    * create team appearance view

    * finish appearance page

    * use settings layout and add danger zone for member

    * add fallback logo

    * Add teams to sidebar and fix UI

    * add team invitations

    * Clean up

    * code clean up

    * add impersontation and disable autofocus on calendar

    * improve team info

    * refactor teaminvitelist code and fix leaving a team

    * add team pages to settings shell

    * add link to create new team

    * small fixes

    * clean up comments

    * V2 Multi-select (Team Select) (#4324)

    * --init

    * design improved

    * further fine tuning

    * more fixes

    * removed extra JSX tag

    * added story

    * NIT

    * revert to use of CheckedTeamSelect

    * Removes comments

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

    * fix: toggle alligment (#4361)

    * fix: add checked tranform for switch (#4357)

    * fixed input size on mobile, fixed settings (#4360)

    * fix image uploader button in safari

    * code clean up

    * fixing type errors

    * Moved v2 team components to features

    Adds deprecation notices

    * Update SettingsLayout.tsx

    * Migrated to features and build fixes

    Co-authored-by: CarinaWolli <wollencarina@gmail.com>
    Co-authored-by: Joe Au-Yeung <j.auyeung419@gmail.com>
    Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
    Co-authored-by: Peer Richelsen <peeroke@gmail.com>
    Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
    Co-authored-by: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
    Co-authored-by: zomars <zomars@me.com>

commit 50f63ef
Author: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Date:   Mon Sep 12 17:51:36 2022 -0400

    Adds skeleton loader to workflows (#4402)

    * fix event types skeleton loader

    * fix margin in event types

    * fix skeleton loader in bookings

    * add skeleton loader for workflow list

    * add skeleton loader for editing page

    * fix border radius of skeleton loader

    * fix mobile view workflow list

    * add mobile view for skeleton list

    * make multi select full with in mobile view

    * mobile view for edit skeleton loader

    Co-authored-by: CarinaWolli <wollencarina@gmail.com>
    Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

commit 1deca81
Author: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Date:   Tue Sep 13 02:11:59 2022 +0530

    Feat/team owner booking (#3999)

    * WIP: testing queries

    * feat: add badge

    * fix: get only id

    * refactor: get bookings query

    * WIP: display attendees added

    * fix: add type

commit 7e52e3d
Author: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Date:   Mon Sep 12 16:26:42 2022 -0400

    V2 Settings Shell - Add Teams Section & UI fixes (#4347)

    * Add teams to sidebar and fix UI

    * Clean up

    * V2 Multi-select (Team Select) (#4324)

    * --init

    * design improved

    * further fine tuning

    * more fixes

    * removed extra JSX tag

    * added story

    * NIT

    * revert to use of CheckedTeamSelect

    * Removes comments

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

    * fix: toggle alligment (#4361)

    * fix: add checked tranform for switch (#4357)

    * fixed input size on mobile, fixed settings (#4360)

    * fixing type errors

    * Mobile fixes

    * Tests fixes

    Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
    Co-authored-by: Peer Richelsen <peeroke@gmail.com>
    Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
    Co-authored-by: CarinaWolli <wollencarina@gmail.com>
    Co-authored-by: zomars <zomars@me.com>

commit ded1fce
Author: Joe Au-Yeung <65426560+joeauyeung@users.noreply.github.com>
Date:   Mon Sep 12 15:07:52 2022 -0400

    V2 settings - developer view (#4085)

    * 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

    * Clean up appearance page

    * Draft shell on md screen

    * fixed slots availability by fixing buffertime (#3756)

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

    * Hidding import features from other services (#3970)

    * Update PULL_REQUEST_TEMPLATE.md

    * 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>

    * New Crowdin translations by Github Action (#3954)

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

    * 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>

    * 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>

    * AppStore CLI: Making video app creation a breeze with major cleanup of locations code throughout (#3825)

    * 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

    * Add Embed ModalBox for routing forms

    * Mian bulk of Booking Page.

    * Few updates to components

    * Fix chormatic feedback

    * Add duplicate form support

    * Fix duplication logic

    * Change to feathericons everywhere and other fixes

    * Dont allow routes for fallback route

    * Fix banner

    * Fix Empty Screen

    * Text area + embded window fixes

    * Semi fix avatar

    * Fix all TS issues

    * Fix tests

    * Troubleshoot container + Active on count

    * Support routing using query params

    * Improve mobile

    * NITS

    * Fix padding on input

    * Support multiselect in router endpoint

    * Fix the issue where app goes in embed mode after viewing embed once

    * Fix icons

    * Add router url tests

    * Add Responses download and form toggling tests

    * Add required validation test

    * Change Icons everywhere

    * App typeform app

    * Improvements in cli

    * 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

    * Add typeform how-to-use page

    * Add typeform how-to-use page and screenshots

    * Most of advanced tab

    * Solved RHF mismtach

    * Build fixes

    * RHF conditionals fixes

    * Improved legibility

    * Fix TS error

    * Add missing image

    * Update CliApp.tsx

    * 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

    * Major locations cleanup, 10s of bug fixes and app-store improvements

    * Fix missing pieces

    * More fixes

    * Fix embed URL

    * Fix app toggles + number of active apps

    * Fix container padding on disabledBorder prop

    * Removes strict

    * more fixes

    * 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

    * Revert console

    * Revert api

    * Fix Embed TS errors

    * Fix TS errors

    * Fix Eslint errors

    * Fix TS errors for UI

    * Fix ESLINT error

    * Fix TS errors

    * Add missing import

    * Fix CLI

    * Add a default placeholder

    * Remove hardcoded daily:integrations

    * Fix message for payment page

    * Revert api and console to main

    * Update README

    * Fix TS errors

    * Fix Lint warnings

    * Fix Tests

    * Fix conflict issues

    * Fix conflict issues

    Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
    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>

    * Button to test a workflow action (#3873)

    * add Test action button + UI improvements

    * add test action functionality

    * add confirmation dialog before sending SMS

    * code clean up

    * show error message if test action fails

    * disable test action button in edit mode

    * fixes SMS testing

    * use updated values

    * fix wrongly updated data in useEffect

    * fix typo

    * code clean up

    * fix UI issue in mobile view

    * small design fix

    Co-authored-by: CarinaWolli <wollencarina@gmail.com>
    Co-authored-by: Peer Richelsen <peeroke@gmail.com>
    Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

    * Improve CLI App Help Text (#3982)

    * Adds deprecation notice to QueryCell (#3977)

    Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

    * added campfire.to app (#3984)

    * fixed file size campfire (#3985)

    * added campfire.to app

    * fixed file size

    * Draft shell on md screen

    * Draft small settings bar

    * Add padding to dropdown menu

    * WIP

    * Create mobile settings nav

    * Fix conferencing render

    * Only display mobile settings nav

    * Clean up my account section

    * Clean up

    * Remove old draft shell

    * Remove old draft shell

    * Implement changes from #3817

    * WIP

    * Create webhooks page

    * WIP Webhook form

    * WIP

    * WIP Webhook

    * WIP

    * Create edit webhook page

    * Edit webhooks

    * Edit API keys

    * Update API key name

    * Create embeds page

    * Fix type errors

    * Remove embeds page

    * Improves Zapier response and payload (#3892)

    * improve listBookings API call

    * improve payload for zapier call

    * use more readable location for integrations

    * remove cancellation reason

    * convert location to readbale string

    * code clean up

    * code clean up

    * updated expected webhook response for e2e tests

    * fix failing e2e

    * revert webhook response

    Co-authored-by: CarinaWolli <wollencarina@gmail.com>
    Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

    * fixed dark mode team page (#4315)

    * Checkly formatting

    * Move hidden label to toggle on events page (#4320)

    * Add events for routing forms

    * Bring shell changes from main

    * Clean up

    * WIP

    * V2 Multi-select (Team Select) (#4324)

    * --init

    * design improved

    * further fine tuning

    * more fixes

    * removed extra JSX tag

    * added story

    * NIT

    * revert to use of CheckedTeamSelect

    * Removes comments

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

    * fix: toggle alligment (#4361)

    * fix: add checked tranform for switch (#4357)

    * fixed input size on mobile, fixed settings (#4360)

    * fixed input size on mobile, fixed settings (#4360)

    * Fix merge errors

    * Fix API key page

    * Fix type error

    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: Kszemi <mkrzemien11@gmail.com>
    Co-authored-by: Leo Giovanetti <hello@leog.me>
    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: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
    Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
    Co-authored-by: CarinaWolli <wollencarina@gmail.com>
    Co-authored-by: Noah <hi@noahflk.com>
    Co-authored-by: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
    Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>

commit 27f58c7
Author: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Date:   Mon Sep 12 14:43:09 2022 +0100

    Fix px on suffix/prefix (#4395)

commit 869ebb0
Author: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Date:   Mon Sep 12 19:00:05 2022 +0530

    fix: add fit to height (#4372)

commit 5f3e9ef
Author: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Date:   Mon Sep 12 11:55:41 2022 +0100

    Oooops (#4386)

commit 078ca46
Author: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Date:   Mon Sep 12 06:27:35 2022 -0400

    Fixes design issues in settings/appearance (#4375)

commit ef7863a
Author: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Date:   Mon Sep 12 11:15:30 2022 +0100

    Simple animations (#4378)

commit 9557c18
Author: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Date:   Mon Sep 12 15:34:42 2022 +0530

    Fixes Dynamic Link description Logic (#4351)

    * fixes logic

    * fixes description

    Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

commit 20fd45a
Author: Peer Richelsen <peeroke@gmail.com>
Date:   Mon Sep 12 11:25:54 2022 +0200

    V2 password reset design (#4327)

    * using new v2 buttons in password reset

    * Forgot password UI

    * Logo updates

    * change error copy

    * Fix tests

    Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
    Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
    Co-authored-by: Hariom Balhara <hariombalhara@gmail.com>

commit e684917
Author: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com>
Date:   Mon Sep 12 03:15:58 2022 -0400

    Fixes security vulnerability in workflows  (#4376)

commit a9b79ea
Author: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Date:   Sun Sep 11 20:54:05 2022 +0100

    Add automanimate page transitions (#4368)

commit e50bc0f
Author: Peer Richelsen <peeroke@gmail.com>
Date:   Sun Sep 11 11:09:23 2022 +0200

    fixed input size on mobile, fixed settings (#4360)

commit 63aae60
Author: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Date:   Sat Sep 10 23:22:35 2022 +0530

    fix: add checked tranform for switch (#4357)

commit c215f7d
Author: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Date:   Sat Sep 10 23:04:38 2022 +0530

    fix: toggle alligment (#4361)

commit 3ce687c
Author: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Date:   Sat Sep 10 15:27:55 2022 +0530

    V2 Multi-select (Team Select) (#4324)

    * --init

    * design improved

    * further fine tuning

    * more fixes

    * removed extra JSX tag

    * added story

    * NIT

    * revert to use of CheckedTeamSelect

    * Removes comments

    Co-authored-by: Peer Richelsen <peeroke@gmail.com>
  • Loading branch information
@joeauyeung
joeauyeung committed Sep 13, 2022
1 parent 8fe1d7c commit 853b324
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 28 deletions.
43 changes: 27 additions & 16 deletions packages/features/ee/teams/components/MemberInvitationModal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { Button, Dialog, DialogContent, DialogFooter, Select, TextField } from "

type MemberInvitationModalProps = {
isOpen: boolean;
team: TeamWithMembers | undefined;
currentMember: MembershipRole | undefined;
team: TeamWithMembers | null;
currentMember: MembershipRole;
onExit: () => void;
};

Expand All @@ -19,7 +19,7 @@ type MembershipRoleOption = {
label?: string;
};

const _options: MembershipRoleOption[] = [{ value: "MEMBER" }, { value: "ADMIN" }];
const _options: MembershipRoleOption[] = [{ value: "MEMBER" }, { value: "ADMIN" }, { value: "OWNER" }];

export default function MemberInvitationModal(props: MemberInvitationModalProps) {
const [errorMessage, setErrorMessage] = useState("");
Expand Down Expand Up @@ -66,19 +66,20 @@ export default function MemberInvitationModal(props: MemberInvitationModalProps)

return (
<Dialog open={props.isOpen} onOpenChange={props.onExit}>
<DialogContent
type="creation"
useOwnActionButtons
title={t("invite_new_member")}
description={
<span className="text-sm leading-tight text-gray-500">
Note: This will <span className="font-medium text-gray-900">cost an extra seat ($12/m)</span> on
your subscription if this invitee does not have a pro account.{" "}
<a href="#" className="underline">
Learn More
</a>
</span>
}>
<DialogContent type="creation" useOwnActionButtons>
<div className="mb-4 sm:flex sm:items-start">
<div className="bg-brand text-brandcontrast dark:bg-darkmodebrand dark:text-darkmodebrandcontrast mx-auto flex h-12 w-12 flex-shrink-0 items-center justify-center rounded-full bg-opacity-5 sm:mx-0 sm:h-10 sm:w-10">
<Icon.FiUser className="text-brandcontrast h-6 w-6" />
</div>
<div className="mt-3 text-center sm:mt-0 sm:ml-4 sm:text-left">
<h3 className="text-lg font-medium leading-6 text-gray-900" id="modal-title">
{t("invite_new_member")}
</h3>
<div>
<p className="text-sm text-gray-400">{t("invite_new_team_member")}</p>
</div>
</div>
</div>
<form onSubmit={inviteMember}>
<div className="space-y-4">
<TextField
Expand Down Expand Up @@ -116,6 +117,16 @@ export default function MemberInvitationModal(props: MemberInvitationModalProps)
</label>
</div>
</div>
<div className="flex flex-row rounded-md bg-gray-50 px-3 py-2">
<Icon.FiInfo className="h-5 w-5 flex-shrink-0 fill-gray-400" aria-hidden="true" />
<span className="ml-2 text-sm leading-tight text-gray-500">
Note: This will cost an extra seat ($12/m) on your subscription if this invitee does not have
a pro account.{" "}
{/* <a href="#" className="underline">
Learn More
</a> */}
</span>
</div>
</div>
{errorMessage && (
<p className="text-sm text-red-700">
Expand Down
20 changes: 8 additions & 12 deletions packages/ui/v2/core/layouts/SettingsLayout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import Button from "@calcom/ui/v2/core/Button";

import ErrorBoundary from "../../../ErrorBoundary";
import { Icon } from "../../../Icon";
import Badge from "../Badge";
import { Badge } from "../Badge";
import { useMeta } from "../Meta";
import Shell from "../Shell";
import { VerticalTabItemProps } from "../navigation/tabs/VerticalTabItem";
Expand Down Expand Up @@ -151,9 +151,9 @@ const SettingsSidebarContainer = ({ className = "" }) => {
) : (
<React.Fragment key={tab.href}>
<div>
<div className="group flex h-9 w-64 flex-row items-center rounded-md px-3 py-[10px] text-sm font-medium leading-none text-gray-600 hover:bg-gray-100 group-hover:text-gray-700 [&[aria-current='page']]:bg-gray-200 [&[aria-current='page']]:text-gray-900">
<div className="group mt-2 flex h-9 w-64 flex-row items-center rounded-md px-3 py-[10px] text-sm font-medium leading-none text-gray-600 hover:bg-gray-100 group-hover:text-gray-700 [&[aria-current='page']]:bg-gray-200 [&[aria-current='page']]:text-gray-900">
{tab && tab.icon && (
<tab.icon className="mt-2 mr-[12px] h-[16px] w-[16px] self-start stroke-[2px] md:mt-0" />
<tab.icon className="mr-[12px] h-[16px] w-[16px] self-start stroke-[2px] md:mt-0" />
)}
<p>{t(tab.name)}</p>
</div>
Expand Down Expand Up @@ -194,11 +194,10 @@ const SettingsSidebarContainer = ({ className = "" }) => {
{team.logo && (
<img
src={team.logo}
className=" ml-[12px] mr-[8px] h-[16px] w-[16px] self-start stroke-[2px] md:mt-0"
className="mt-2 ml-[12px] mr-[8px] h-[16px] w-[16px] self-start stroke-[2px] md:mt-0"
alt={team.name || "Team logo"}
/>
)}

<p>{team.name}</p>
{!team.accepted && (
<Badge className="ml-3" variant="orange">
Expand Down Expand Up @@ -249,13 +248,10 @@ const SettingsSidebarContainer = ({ className = "" }) => {
</CollapsibleContent>
</Collapsible>
))}
<VerticalTabItem
name={t("add_a_team")}
href={`${WEBAPP_URL}/settings/teams/new`}
textClassNames="px-3 text-gray-900 font-medium text-sm"
icon={Icon.FiPlus}
disableChevron
/>
<div className="group flex h-9 w-64 flex-row items-center rounded-md px-3 py-[10px] text-sm font-medium leading-none hover:bg-gray-100 group-hover:text-gray-700 [&[aria-current='page']]:bg-gray-200 [&[aria-current='page']]:text-gray-900">
<Icon.FiPlus className="mt-2 mr-[10px] h-[16px] w-[16px] self-start stroke-[2px] md:mt-0" />
<p>{t("add_a_team")}</p>
</div>
</div>
</React.Fragment>
);
Expand Down

0 comments on commit 853b324

Please sign in to comment.