Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

more consistency for dropdown #2173

Merged
merged 2 commits into from Mar 17, 2022
Merged

more consistency for dropdown #2173

merged 2 commits into from Mar 17, 2022

Conversation

PeerRich
Copy link
Member

event-types

before:

image

after:

image

team

before:
image

after:
image

@PeerRich PeerRich requested a review from leog March 16, 2022 22:55
@vercel
Copy link

vercel bot commented Mar 16, 2022 •
edited

This pull request is being automatically deployed with Vercel (learn more).
To see the status of your deployments, click below or on the icon next to each commit.

docs – ./apps/docs

🔍 Inspect: https://vercel.com/cal/docs/2ty2RVMzEuYxeUYPosEdiu2nFXrB
✅ Preview: Canceled

[Deployment for e74acee canceled]

calendso – ./apps/web

🔍 Inspect: https://vercel.com/cal/calendso/8VsnTLcEkcSD37nDp8Qwb1vP5isr
✅ Preview: Failed

[Deployment in progress for e74acee]

PeerRich
PeerRich commented Mar 16, 2022
View reviewed changes
apps/web/components/team/TeamListItem.tsx
@@ -126,10 +132,9 @@ export default function TeamListItem(props: Props) {
<Link href={"/settings/teams/" + team.id}>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should probably use a component here to DRY

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, checking with @zomars JIC. I can create a follow up PR for it

PeerRich
PeerRich commented Mar 16, 2022
View reviewed changes
apps/web/pages/event-types/index.tsx
@@ -258,9 +258,9 @@ export const EventTypeList = ({ group, readOnly, types }: EventTypeListProps): J
<Link href={"/event-types/" + type.id} passHref={true}>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we should turn this into a component as its recurring

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@leog

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

heh was just gonna mention about componenting it out! Great candidate for first ui component to reuse

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for the Link? GH diff shows me just that for this comment

agustif
agustif approved these changes Mar 16, 2022
View reviewed changes
Copy link
Contributor

@agustif agustif left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, great candidate to extract out to component

@vercel vercel bot temporarily deployed to Preview – docs March 17, 2022 00:17 Inactive
@vercel vercel bot temporarily deployed to Preview – calendso March 17, 2022 00:17 Inactive
@zomars zomars merged commit faa74da into main Mar 17, 2022
@zomars zomars deleted the fix/smaller-dropdown branch March 17, 2022 01:09
zomars added a commit that referenced this pull request Mar 17, 2022
@zomars
Squashed commit of the following:
01687fa 
commit 8664438
Merge: 2deb52d bcbf839
Author: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Date:   Thu Mar 17 13:22:40 2022 +0000

    Merge branch 'main' into feature/multiple-schedules-post-turbo

commit bcbf839
Author: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Date:   Thu Mar 17 18:50:49 2022 +0530

    Refactor old dialog to radix Dialog (#2151)

    * --init

    * refactored more dialogs --WIP

    * more modals replaced by dialogs --WIP

    * fix for new dialog location import

    * --WIP

    * lint fix

    * final dialog refactor

    * added more width to max-w for dialog in sm screen

    * clean-up

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

commit 2deb52d
Merge: 8eadc12 df64af2
Author: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Date:   Thu Mar 17 12:59:29 2022 +0000

    Merge branch 'main' into feature/multiple-schedules-post-turbo

commit df64af2
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Mar 17 12:57:48 2022 +0000

    New Crowdin translations by Github Action (#2179)

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

commit 8eadc12
Merge: abfa1a8 39ecf91
Author: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
Date:   Thu Mar 17 12:48:16 2022 +0000

    Merge branch 'main' into feature/multiple-schedules-post-turbo

commit 39ecf91
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu Mar 17 12:46:34 2022 +0000

    New Crowdin translations by Github Action (#2165)

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

commit abfa1a8
Author: zomars <zomars@me.com>
Date:   Wed Mar 16 19:38:08 2022 -0700

    Update NewScheduleButton.tsx

commit 74e4557
Merge: e2448b9 82ab6f7
Author: Omar López <zomars@me.com>
Date:   Wed Mar 16 19:29:39 2022 -0700

    Merge branch 'main' into feature/multiple-schedules-post-turbo

commit 82ab6f7
Author: Omar López <zomars@me.com>
Date:   Wed Mar 16 18:23:13 2022 -0700

    Update submodules (#2174)

commit e2448b9
Author: zomars <zomars@me.com>
Date:   Wed Mar 16 18:14:38 2022 -0700

    Type fixes

commit bf50829
Merge: 02cd4e4 faa74da
Author: Omar López <zomars@me.com>
Date:   Wed Mar 16 18:09:58 2022 -0700

    Merge branch 'main' into feature/multiple-schedules-post-turbo

commit faa74da
Author: Peer Richelsen <peeroke@gmail.com>
Date:   Thu Mar 17 01:09:17 2022 +0000

    more consistency for dropdown (#2173)

    Co-authored-by: zomars <zomars@me.com>

commit 02cd4e4
Merge: 5f071da 558897f
Author: zomars <zomars@me.com>
Date:   Wed Mar 16 16:43:06 2022 -0700

    Merge branch 'main' into feature/multiple-schedules-post-turbo

commit 558897f
Author: Omar López <zomars@me.com>
Date:   Wed Mar 16 16:36:43 2022 -0700

    Migrates components and libs to packages (#2172)

    * Migrates Dialog to ui package

    * Migrates Alert to ui

    * Migrate Button to ui

    * UI and lib migrations

    * Add missing imports

    * Update Error.tsx

commit 5f071da
Merge: 6b06fea f9f856d
Author: zomars <zomars@me.com>
Date:   Wed Mar 16 15:24:46 2022 -0700

    Merge branch 'main' into feature/multiple-schedules-post-turbo

commit f9f856d
Author: sean-brydon <55134778+sean-brydon@users.noreply.github.com>
Date:   Wed Mar 16 21:04:12 2022 +0000

    Fixing Ghost Input (#2161)

    * Fixing Ghost Input

    * Removing form import

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

commit 6e4f8e6
Author: Leo Giovanetti <hello@leog.me>
Date:   Wed Mar 16 16:55:18 2022 -0300

    Event type dropdown (#2081)

commit c948417
Author: Omar López <zomars@me.com>
Date:   Wed Mar 16 12:40:47 2022 -0700

    Re-enables tailwind purge (#2171)

commit fdc99b3
Author: alannnc <alannnc@gmail.com>
Date:   Wed Mar 16 12:33:20 2022 -0700

    fix/handle-premium-on-google-signup (#2160)

    * checking if username is premium on google sign up

    * Removed test validating query input value, but it's no longer required

    * undo code that was moved to a function for reuse

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

commit 6b06fea
Merge: 40dc76d 06cec35
Author: zomars <zomars@me.com>
Date:   Wed Mar 16 10:12:58 2022 -0700

    Merge branch 'main' into feature/multiple-schedules-post-turbo

commit 40dc76d
Merge: 87b4133 18c21d9
Author: Omar López <zomars@me.com>
Date:   Wed Mar 16 09:41:10 2022 -0700

    Merge branch 'main' into feature/multiple-schedules-post-turbo

commit 87b4133
Merge: 3eca9dd e94594d
Author: Omar López <zomars@me.com>
Date:   Wed Mar 16 09:20:22 2022 -0700

    Merge branch 'main' into feature/multiple-schedules-post-turbo

commit 3eca9dd
Merge: aa2268c c8505cd
Author: Bailey Pumfleet <pumfleet@hey.com>
Date:   Wed Mar 16 13:09:59 2022 +0000

    Merge branch 'main' into feature/multiple-schedules-post-turbo

commit aa2268c
Author: zomars <zomars@me.com>
Date:   Tue Mar 15 19:01:13 2022 -0700

    Removed index renames

commit 612dc33
Merge: f2f9941 9831845
Author: Alex van Andel <me@alexvanandel.com>
Date:   Wed Mar 16 01:37:58 2022 +0100

    Merged with main

commit f2f9941
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 23:37:25 2022 +0100

    Added correct created message + hotfix reload hard on delete to refresh state

commit c7766e6
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 23:28:10 2022 +0100

    Added empty state for when no schedules are configured

commit 0fe87e4
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 23:04:31 2022 +0100

    schedule deleted translation added

commit 2fe15cc
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 22:06:24 2022 +0100

    Fixed broken 'radio' buttons.

commit 57e1232
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 21:53:13 2022 +0100

    Titlecase 'default' by providing translation

commit 92adb3a
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 21:45:47 2022 +0100

    Fixed type error coming from main

commit 4b7f374
Merge: 97fc7df 04cd821
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 20:43:58 2022 +0100

    Merged with main, removed padding change when subtitle missing (not necessary)

commit 97fc7df
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 20:40:33 2022 +0100

    Migrated getting-started to new availability system + updated translations + updated seed

commit ff7d1e0
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 17:43:32 2022 +0100

    Bringing back the Availability section temporarily to teams to allow configuration

commit 6de0d22
Merge: 1064a7a fae714b
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 17:13:02 2022 +0100

    Merge branch 'main' into feature/multiple-schedules-post-turbo

commit 1064a7a
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 17:12:36 2022 +0100

    Remove Availability section for teams

commit a2a08cc
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 04:04:05 2022 +0100

    Ditch outdated remnant from before packages/prisma

commit 01e1c07
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 03:55:31 2022 +0100

    Fixed some type errors I missed

commit 9d5e980
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 03:46:43 2022 +0100

    Add missing translations

commit 5b432ec
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 03:40:57 2022 +0100

    Reduce one refresh; hotfix state inconsistency with forced refresh for now

commit 8de15b1
Merge: 635bb6b b25e6c2
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Mar 15 03:08:53 2022 +0100

    Merge branch 'main' into feature/multiple-schedules-post-turbo

commit 635bb6b
Author: Alex van Andel <me@alexvanandel.com>
Date:   Mon Mar 14 23:08:08 2022 +0100

    Added schedule to availability endpoint

commit ad02e05
Author: Alex van Andel <me@alexvanandel.com>
Date:   Mon Mar 14 04:36:21 2022 +0100

    Remove console.log + set schedule to null as it is unneeded

commit 797c4b2
Author: Alex van Andel <me@alexvanandel.com>
Date:   Mon Mar 14 04:31:11 2022 +0100

    Availability dropdown works

commit 2044d90
Author: Alex van Andel <me@alexvanandel.com>
Date:   Mon Mar 14 03:13:29 2022 +0100

    Undo vscode changes

commit e9aeded
Author: Alex van Andel <me@alexvanandel.com>
Date:   Mon Mar 14 03:04:52 2022 +0100

    WIP

commit ebc96ae
Author: Alex van Andel <me@alexvanandel.com>
Date:   Mon Mar 14 02:35:18 2022 +0100

    Set eventTypeId to @unique

commit ad6f48d
Author: Alex van Andel <me@alexvanandel.com>
Date:   Mon Mar 14 02:31:48 2022 +0100

    Merged with main p2

commit 5b40078
Merge: d6dee7a 4244826
Author: Alex van Andel <me@alexvanandel.com>
Date:   Mon Mar 14 02:24:21 2022 +0100

    Merged with main p1

commit d6dee7a
Author: Alex van Andel <me@alexvanandel.com>
Date:   Sun Mar 6 21:37:57 2022 +0100

    Added named dialog to replace new=1

commit 34f0558
Merge: 2ae3881 c8ba5e1
Author: Alex van Andel <me@alexvanandel.com>
Date:   Sun Feb 27 23:53:35 2022 +0100

    Merge branch 'main' into feature/multiple-schedules-post-turbo

commit 2ae3881
Merge: 196c94c 546f6271
Author: Alex van Andel <me@alexvanandel.com>
Date:   Thu Feb 24 22:43:54 2022 +0100

    Updated to main

commit 196c94c
Merge: bcb2d5d 8b625e3
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Feb 22 20:02:59 2022 +0100

    Merge branch 'bugfix/prisma-seed-always-disconnect' into feature/multiple-schedules-post-turbo

commit 8b625e3
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Feb 22 19:50:45 2022 +0100

    Always disconnect + remove redundant success message

commit bcb2d5d
Merge: 10cf649 97550a3
Author: Alex van Andel <me@alexvanandel.com>
Date:   Tue Feb 22 18:39:17 2022 +0100

    Completed merge

commit 10cf649
Author: Alex van Andel <me@alexvanandel.com>
Date:   Fri Feb 18 21:52:16 2022 +0100

    Applied stash to newly merged

commit 801fd6d
Merge: 3a256e4 4f89205
Author: Alex van Andel <me@alexvanandel.com>
Date:   Fri Feb 18 20:40:27 2022 +0100

    Merged with main

commit 3a256e4
Author: Alex van Andel <me@alexvanandel.com>
Date:   Sat Feb 12 23:42:07 2022 +0100

    Concluded merge
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@leog leog leog approved these changes

@agustif agustif agustif approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@PeerRich @leog @agustif @zomars