Skip to content

fix: position of badges#4657

Merged
PeerRich merged 13 commits into
calcom:mainfrom
Udit-takkar:fix/badges
Sep 27, 2022
Merged

fix: position of badges#4657
PeerRich merged 13 commits into
calcom:mainfrom
Udit-takkar:fix/badges

Conversation

@Udit-takkar
Copy link
Copy Markdown
Contributor

fixes: #4649

Screenshot 2022-09-22 at 2 00 22 AM

@vercel
Copy link
Copy Markdown

vercel Bot commented Sep 21, 2022

@Udit-takkar is attempting to deploy a commit to the cal Team on Vercel.

A member of the Team first needs to authorize it.

@hariombalhara
Copy link
Copy Markdown
Member

Screenshot 2022-09-22 at 10 06 38 AM

I think we should show the label in mobile mode as well. cc @Jaibles for the design

@hariombalhara hariombalhara requested a review from a team September 22, 2022 04:37
@hariombalhara hariombalhara added the 🎨 needs design Before engineering kick-off, a designer needs to submit a mockup label Sep 22, 2022
@ciaranha
Copy link
Copy Markdown
Member

ciaranha commented Sep 22, 2022

We should definitely show the label on mobile. As well as the date & time. We have designs for this here.

CleanShot 2022-09-22 at 09 17 13@2x

It would be great to also test this with recurring bookings.

@Udit-takkar
Copy link
Copy Markdown
Contributor Author

ok

@Udit-takkar
Copy link
Copy Markdown
Contributor Author

Screenshot 2022-09-24 at 6 11 28 PM

should i also change the button(Edit booking) like you have done here ?

@Udit-takkar
Copy link
Copy Markdown
Contributor Author

Udit-takkar commented Sep 24, 2022

Screenshot 2022-09-24 at 6 56 41 PM

build this for mobile view

@vercel
Copy link
Copy Markdown

vercel Bot commented Sep 24, 2022

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated
cal ✅ Ready (Inspect) Visit Preview Sep 27, 2022 at 0:26AM (UTC)

Comment thread apps/web/components/booking/BookingListItem.tsx Outdated
@PeerRich
Copy link
Copy Markdown
Member

@Udit-takkar left a comment re: not using <br> for layouting

auto-merge was automatically disabled September 24, 2022 17:22

Head branch was pushed to by a user without write access

@Udit-takkar
Copy link
Copy Markdown
Contributor Author

done

@PeerRich PeerRich enabled auto-merge (squash) September 24, 2022 18:00
Copy link
Copy Markdown
Member

@PeerRich PeerRich left a comment

Choose a reason for hiding this comment

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

great stuff! thank you @Udit-takkar

@PeerRich PeerRich disabled auto-merge September 24, 2022 19:26
@PeerRich PeerRich requested a review from zomars September 24, 2022 19:28
@PeerRich PeerRich removed the 🎨 needs design Before engineering kick-off, a designer needs to submit a mockup label Sep 24, 2022
@hariombalhara hariombalhara added ♻️ autoupdate tells kodiak to keep this branch up-to-date automerge labels Sep 26, 2022
@PeerRich PeerRich merged commit 699313a into calcom:main Sep 27, 2022
@zomars
Copy link
Copy Markdown
Contributor

zomars commented Sep 29, 2022

Just a FYI @Udit-takkar @PeerRich this PR is what currently breaking our E2E tests. We're introducing duplicate markdown and displaying it with breakpoints and Playwright doesn't like that.

Comment on lines +368 to +379
<div className="flex justify-end sm:hidden">
<div className="whitespace-nowrap pt-2 pb-4 text-right text-sm font-medium ltr:pr-4 rtl:pl-4">
{isUpcoming && !isCancelled ? (
<>
{isPending && user?.id === booking.user?.id && <TableActions actions={pendingActions} />}
{isConfirmed && <TableActions actions={bookedActions} />}
{isRejected && <div className="text-sm text-gray-500">{t("rejected")}</div>}
</>
) : null}
{isPast && isPending && !isConfirmed ? <TableActions actions={bookedActions} /> : null}
</div>
</div>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This code block specifically is what is breaking our tests:

image

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

cc @emrysal for context

zomars added a commit that referenced this pull request Sep 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automerge ♻️ autoupdate tells kodiak to keep this branch up-to-date

Projects

None yet

Development

Successfully merging this pull request may close these issues.

/booking: move all badges below the time

5 participants