Skip to content

fix: event list overflow #249

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

Merged
n0izn0iz merged 4 commits into from
Mar 11, 2025
Merged

fix: event list overflow #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72be716
fix: augment breakpoint to md to fix event-list overflows
clegirar Mar 11, 2025
5a77d19
fix: augment breakpoint to md in Header to fix Avatar that overlap He…
clegirar Mar 11, 2025
293b29e
fix: replace breakpoint sm to md in all EventListLayout
clegirar Mar 11, 2025
7b18c14
Merge branch 'main' into fix/event-list-overflow
n0izn0iz Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ export function Header() {
const { data: user } = useSuspenseQuery(userOptions(address));

return (
<div className="flex sm:justify-center sm:p-2 w-full">
<div className="flex md:justify-center md:p-2 w-full">
{/* Desktop */}
<div className="max-sm:hidden flex flex-row w-full items-center justify-center">
<div className="max-md:hidden flex flex-row w-full items-center justify-center">
<Card className="flex flex-row items-center px-3 py-2 gap-7 rounded-xl">
<Link href="/" className="flex flex-row gap-2 items-center">
<Image
Expand All @@ -85,7 +85,7 @@ export function Header() {
</div>

{/* Mobile */}
<div className="sm:hidden flex flex-row justify-between w-full p-3 px-4 py-3 bg-secondary/80 backdrop-blur-sm">
<div className="md:hidden flex flex-row justify-between w-full p-3 px-4 py-3 bg-secondary/80 backdrop-blur-sm">
<Link href="/" className="flex flex-row items-center">
<Image
src="/zenao-logo.png"
Expand Down
12 changes: 6 additions & 6 deletions components/cards/EventCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ export function EventCard({ evt }: { evt: EventInfo }) {
location = evt.location?.address.value.uri;
}
return (
<div className="flex flex-col sm:flex-row sm:justify-between">
<div className="min-w-32 left-6 relative sm:left-0 sm:flex">
<div className="flex flex-row items-center gap-[6px] mb-3 sm:items-start sm:mb-0 sm:gap-0 sm:flex-col">
<div className="flex flex-col md:flex-row md:justify-between">
<div className="min-w-32 left-6 relative md:left-0 md:flex">
<div className="flex flex-row items-center gap-[6px] mb-3 md:items-start md:mb-0 md:gap-0 md:flex-col">
<Text>{format(fromUnixTime(Number(evt.startDate)), "MMM d")}</Text>
<SmallText variant="secondary">
{format(fromUnixTime(Number(evt.startDate)), "iiii")}
Expand All @@ -40,7 +40,7 @@ export function EventCard({ evt }: { evt: EventInfo }) {
className="w-full flex"
href={`/event/${idFromPkgPath(evt.pkgPath)}`}
>
<Card className="sm:h-[185px] w-full min-w-full max-w-full flex flex-row justify-between mb-3 hover:bg-secondary/100">
<Card className="md:h-[185px] w-full min-w-full max-w-full flex flex-row justify-between mb-3 hover:bg-secondary/100">
<div className="flex flex-col gap-2">
<Text variant="secondary">
{format(fromUnixTime(Number(evt.startDate)), "h:mm a")}
Expand All @@ -54,13 +54,13 @@ export function EventCard({ evt }: { evt: EventInfo }) {
<Users width={iconSize} height={iconSize} />
<Text className="truncate">{evt.participants} going</Text>
</div>
<div className="hidden sm:flex sm:flex-row sm:gap-4 sm:items-center">
<div className="hidden md:flex md:flex-row md:gap-4 md:items-center">
<CircleUserRound width={iconSize} height={iconSize} />
<Text className="truncate">{evt.creator}</Text>
</div>
</div>
<div>
<div className="min-w-[80px] min-h-[80px] w-[80px] h-[80px] sm:w-[120px] sm:h-[120px] relative">
<div className="min-w-[80px] min-h-[80px] w-[80px] h-[80px] md:w-[120px] md:h-[120px] relative">
<Image
src={evt.imageUri}
width={80}
Expand Down
4 changes: 2 additions & 2 deletions components/layout/EventsListLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ const HeaderEventsList: React.FC<{
const t = useTranslations("events-list");
return (
<div className="flex flex-col gap-2 mb-3">
<div className="flex flex-col gap-2 sm:gap-0 sm:flex-row sm:justify-between">
<div className="flex flex-col sm:flex-row gap-2 sm:items-center">
<div className="flex flex-col gap-2 md:gap-0 md:flex-row md:justify-between">
<div className="flex flex-col md:flex-row gap-2 md:items-center">
<VeryLargeText className="truncate">{title}</VeryLargeText>
<GnowebButton
href={`${process.env.NEXT_PUBLIC_GNOWEB_URL}/r/zenao/eventreg`}
Expand Down